summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/platform/graphics/android/rendering
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/rendering
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/rendering')
-rw-r--r--Source/WebCore/platform/graphics/android/rendering/Surface.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/WebCore/platform/graphics/android/rendering/Surface.cpp b/Source/WebCore/platform/graphics/android/rendering/Surface.cpp
index 1898910..96a4a16 100644
--- a/Source/WebCore/platform/graphics/android/rendering/Surface.cpp
+++ b/Source/WebCore/platform/graphics/android/rendering/Surface.cpp
@@ -218,7 +218,7 @@ void Surface::prepareGL(bool layerTilesDisabled, bool updateWithBlit)
ALOGV("prepareGL on Surf %p with SurfBack %p, %d layers, first layer %s (%d) "
"prepareArea(%d, %d - %d x %d) fullArea(%d, %d - %d x %d)",
this, m_surfaceBacking, m_layers.size(),
- getFirstLayer()->subclassName().ascii().data(),
+ getFirstLayer()->subclassName(),
getFirstLayer()->uniqueId(),
prepareArea.x(), prepareArea.y(), prepareArea.width(), prepareArea.height(),
fullArea.x(), fullArea.y(), fullArea.width(), fullArea.height());
@@ -253,7 +253,7 @@ bool Surface::drawGL(bool layerTilesDisabled)
bool askRedraw = false;
if (m_surfaceBacking && !tilesDisabled) {
ALOGV("drawGL on Surf %p with SurfBack %p, first layer %s (%d)", this, m_surfaceBacking,
- getFirstLayer()->subclassName().ascii().data(), getFirstLayer()->uniqueId());
+ getFirstLayer()->subclassName(), getFirstLayer()->uniqueId());
bool force3dContentVisible = true;
IntRect drawArea = visibleContentArea(force3dContentVisible);