• file
• revisions
• annotate
• diff
• comparison
• raw

gfx/skia/trunk/src/animator/SkDisplayBounds.cpp@deefc01c0e14 (annotated)

gfx/skia/trunk/src/animator/SkDisplayBounds.cpp

Thu, 15 Jan 2015 21:03:48 +0100

author

Michael Schloh von Bennewitz <michael@schloh.com>

date

Thu, 15 Jan 2015 21:03:48 +0100

branch

TOR_BUG_9701

changeset 11

deefc01c0e14

permissions

-rw-r--r--

Integrate friendly tips from Tor colleagues to make (or not) 4.5 alpha 3;
This includes removal of overloaded (but unused) methods, and addition of
a overlooked call to DataStruct::SetData(nsISupports, uint32_t, bool.)

michael@0	1
michael@0	2	/*
michael@0	3	* Copyright 2006 The Android Open Source Project
michael@0	4	*
michael@0	5	* Use of this source code is governed by a BSD-style license that can be
michael@0	6	* found in the LICENSE file.
michael@0	7	*/
michael@0	8
michael@0	9
michael@0	10	#include "SkDisplayBounds.h"
michael@0	11	#include "SkAnimateMaker.h"
michael@0	12
michael@0	13	#if SK_USE_CONDENSED_INFO == 0
michael@0	14
michael@0	15	const SkMemberInfo SkDisplayBounds::fInfo[] = {
michael@0	16	SK_MEMBER_INHERITED,
michael@0	17	SK_MEMBER(inval, Boolean)
michael@0	18	};
michael@0	19
michael@0	20	#endif
michael@0	21
michael@0	22	DEFINE_GET_MEMBER(SkDisplayBounds);
michael@0	23
michael@0	24	SkDisplayBounds::SkDisplayBounds() : inval(false) {
michael@0	25	}
michael@0	26
michael@0	27	bool SkDisplayBounds::draw(SkAnimateMaker& maker) {
michael@0	28	maker.fDisplayList.fUnionBounds = SkToBool(inval);
michael@0	29	maker.fDisplayList.fDrawBounds = false;
michael@0	30	fBounds.setEmpty();
michael@0	31	bool result = INHERITED::draw(maker);
michael@0	32	maker.fDisplayList.fUnionBounds = false;
michael@0	33	maker.fDisplayList.fDrawBounds = true;
michael@0	34	if (inval && fBounds.isEmpty() == false) {
michael@0	35	SkIRect& rect = maker.fDisplayList.fInvalBounds;
michael@0	36	maker.fDisplayList.fHasUnion = true;
michael@0	37	if (rect.isEmpty())
michael@0	38	rect = fBounds;
michael@0	39	else
michael@0	40	rect.join(fBounds);
michael@0	41	}
michael@0	42	return result;
michael@0	43	}