summaryrefslogtreecommitdiff
path: root/libs/hwui/TreeInfo.h
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2014-06-11 18:39:44 -0700
committerJohn Reck <jreck@google.com>2014-06-12 09:13:45 -0700
commita447d29c65fb811cd184775a3476101a1cede929 (patch)
tree0be082c0fdf19035551bf3671208fd606b430ab2 /libs/hwui/TreeInfo.h
parentf8333cc38126c7efb1b95958ca7d7c825253bc58 (diff)
Fix DA bugs
* Now aware of transform of DrawDisplayListOp * Supports projection Bug: 15539677 Bug: 15506680 Change-Id: Ic16f482cd48c3add12e49eca529281be12b93491
Diffstat (limited to 'libs/hwui/TreeInfo.h')
-rw-r--r--libs/hwui/TreeInfo.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/libs/hwui/TreeInfo.h b/libs/hwui/TreeInfo.h
index 2096f98e0c00..fd78f8e3a4d6 100644
--- a/libs/hwui/TreeInfo.h
+++ b/libs/hwui/TreeInfo.h
@@ -18,6 +18,7 @@
#include <utils/Timers.h>
+#include "DamageAccumulator.h"
#include "utils/Macros.h"
namespace android {
@@ -25,7 +26,6 @@ namespace uirenderer {
class BaseRenderNodeAnimator;
class AnimationListener;
-class DamageAccumulator;
class AnimationHook {
public:
@@ -62,7 +62,7 @@ public:
, frameTimeMs(0)
, animationHook(NULL)
, prepareTextures(mode == MODE_FULL)
- , damageAccumulator(0)
+ , damageAccumulator(NullDamageAccumulator::instance())
{}
const TraversalMode mode;
@@ -71,7 +71,8 @@ public:
// TODO: Remove this? Currently this is used to signal to stop preparing
// textures if we run out of cache space.
bool prepareTextures;
- DamageAccumulator* damageAccumulator;
+ // Must not be null
+ IDamageAccumulator* damageAccumulator;
struct Out {
Out()