Index: Source/web/PinchViewports.cpp |
diff --git a/Source/web/PinchViewports.cpp b/Source/web/PinchViewports.cpp |
index 4e612b0de91f269034b3a727973577cc912eb28a..c2fc7e9eb94558cecf8a4500ce25b5e18f015c9f 100644 |
--- a/Source/web/PinchViewports.cpp |
+++ b/Source/web/PinchViewports.cpp |
@@ -67,13 +67,6 @@ PinchViewports::PinchViewports(WebViewImpl* owner) |
m_innerViewportScrollLayer->platformLayer()->setScrollable(true); |
-#ifndef NDEBUG |
- m_innerViewportContainerLayer->setName("inner viewport container layer"); |
- m_pageScaleLayer->setName("page scale layer"); |
- m_innerViewportScrollLayer->setName("inner viewport scroll layer"); |
- m_overlayScrollbarHorizontal->setName("overlay scrollbar horizontal"); |
- m_overlayScrollbarVertical->setName("overlay scrollbar vertical"); |
-#endif |
m_innerViewportContainerLayer->addChild(m_pageScaleLayer.get()); |
m_pageScaleLayer->addChild(m_innerViewportScrollLayer.get()); |
@@ -186,4 +179,24 @@ void PinchViewports::paintContents(const GraphicsLayer*, WebCore::GraphicsContex |
{ |
} |
+String PinchViewports::debugName(const GraphicsLayer* graphicsLayer) |
+{ |
+ String name; |
+ if (graphicsLayer == m_innerViewportContainerLayer.get()) { |
+ name = "Inner Viewport Container Layer"; |
+ } else if (graphicsLayer == m_pageScaleLayer.get()) { |
+ name = "Page Scale Layer"; |
+ } else if (graphicsLayer == m_innerViewportScrollLayer.get()) { |
+ name = "Inner Viewport Scroll Layer"; |
+ } else if (graphicsLayer == m_overlayScrollbarHorizontal.get()) { |
+ name = "Overlay Scrollbar Horizontal Layer"; |
+ } else if (graphicsLayer == m_overlayScrollbarVertical.get()) { |
+ name = "Overlay Scrollbar Vertical Layer"; |
+ } else { |
+ ASSERT_NOT_REACHED(); |
+ } |
+ |
+ return name; |
+} |
+ |
} // namespace WebKit |