| Index: Source/WebKit/chromium/src/PinchViewports.cpp
|
| diff --git a/Source/WebKit/chromium/src/PinchViewports.cpp b/Source/WebKit/chromium/src/PinchViewports.cpp
|
| index 935080480b5594657915ec99d4991de796f8a00a..37bb1aa5b4142b088dd1aab5bd7dc7ae32bf435b 100644
|
| --- a/Source/WebKit/chromium/src/PinchViewports.cpp
|
| +++ b/Source/WebKit/chromium/src/PinchViewports.cpp
|
| @@ -64,14 +64,6 @@ PinchViewports::PinchViewports(WebViewImpl* owner)
|
|
|
| m_innerViewportScrollLayer->platformLayer()->setScrollable(true);
|
|
|
| -#ifndef NDEBUG
|
| - m_innerViewportClipLayer->setName("inner viewport clip 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_innerViewportClipLayer->addChild(m_pageScaleLayer.get());
|
| m_pageScaleLayer->addChild(m_innerViewportScrollLayer.get());
|
| m_innerViewportClipLayer->addChild(m_overlayScrollbarHorizontal.get());
|
| @@ -183,4 +175,22 @@ void PinchViewports::paintContents(const GraphicsLayer*, WebCore::GraphicsContex
|
| {
|
| }
|
|
|
| +String PinchViewports::debugName(const GraphicsLayer* graphicsLayer)
|
| +{
|
| + String name;
|
| + if (graphicsLayer == m_innerViewportClipLayer.get()) {
|
| + name = "Inner Viewport Clip 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";
|
| + }
|
| +
|
| + return name;
|
| +}
|
| +
|
| } // namespace WebKit
|
|
|