summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/platform/graphics/android/layers/LayerAndroid.h
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2012-06-14 14:42:34 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-06-14 14:42:40 -0700
commit462daef330d6d963124ce4d5535b80ba9acea2b6 (patch)
tree05e405519accdd4395e83ffa7393202727d3bfd8 /Source/WebCore/platform/graphics/android/layers/LayerAndroid.h
parent736e83761cd309092370bb9f7842826186c32722 (diff)
parentcc6ffa0710f304fbcaa43953b0dc89e1d9b931a2 (diff)
downloadexternal_webkit-462daef330d6d963124ce4d5535b80ba9acea2b6.zip
external_webkit-462daef330d6d963124ce4d5535b80ba9acea2b6.tar.gz
external_webkit-462daef330d6d963124ce4d5535b80ba9acea2b6.tar.bz2
Merge "Show layer tree in hierarchyviewer"
Diffstat (limited to 'Source/WebCore/platform/graphics/android/layers/LayerAndroid.h')
-rw-r--r--Source/WebCore/platform/graphics/android/layers/LayerAndroid.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/WebCore/platform/graphics/android/layers/LayerAndroid.h b/Source/WebCore/platform/graphics/android/layers/LayerAndroid.h
index 79c84b4..312ad7b 100644
--- a/Source/WebCore/platform/graphics/android/layers/LayerAndroid.h
+++ b/Source/WebCore/platform/graphics/android/layers/LayerAndroid.h
@@ -73,6 +73,7 @@ class IFrameLayerAndroid;
class LayerMergeState;
class RenderLayer;
class PaintedSurface;
+class LayerDumper;
class TexturesResult {
public:
@@ -100,7 +101,7 @@ public:
CanvasLayer, BaseLayer } SubclassType;
typedef enum { InvalidateNone = 0, InvalidateLayers } InvalidateFlags;
- String subclassName()
+ const char* subclassName() const
{
switch (subclassType()) {
case LayerAndroid::StandardLayer:
@@ -195,9 +196,7 @@ public:
bool hasAnimations() const;
void addDirtyArea();
- virtual void dumpLayer(FILE*, int indentLevel) const;
- void dumpLayers(FILE*, int indentLevel) const;
- void dumpToLog() const;
+ void dumpLayers(LayerDumper*) const;
virtual IFrameLayerAndroid* updatePosition(SkRect viewport,
IFrameLayerAndroid* parentIframeLayer);
@@ -290,6 +289,7 @@ public:
}
protected:
+ virtual void dumpLayer(LayerDumper*) const;
/** Call this with the current viewport (scrolling, zoom) to update
the position of the fixed layers.