Index: third_party/WebKit/Source/core/frame/VisualViewport.cpp |
diff --git a/third_party/WebKit/Source/core/frame/VisualViewport.cpp b/third_party/WebKit/Source/core/frame/VisualViewport.cpp |
index cd084315dbc2d67e73b76e8f9d61c6c8ca7a5581..85c73df4a0db2517f8a404a18985d24c889f91ff 100644 |
--- a/third_party/WebKit/Source/core/frame/VisualViewport.cpp |
+++ b/third_party/WebKit/Source/core/frame/VisualViewport.cpp |
@@ -55,6 +55,7 @@ |
#include "public/platform/WebLayerTreeView.h" |
#include "public/platform/WebScrollbar.h" |
#include "public/platform/WebScrollbarLayer.h" |
+#include <memory> |
using blink::WebLayer; |
using blink::WebLayerTreeView; |
@@ -375,7 +376,7 @@ void VisualViewport::attachToLayerTree(GraphicsLayer* currentLayerTreeRoot) |
return; |
} |
- if (currentLayerTreeRoot->parent() && currentLayerTreeRoot->parent() == m_innerViewportScrollLayer) |
+ if (currentLayerTreeRoot->parent() && currentLayerTreeRoot->parent() == m_innerViewportScrollLayer.get()) |
return; |
if (!m_innerViewportScrollLayer) { |
@@ -447,7 +448,7 @@ void VisualViewport::setupScrollbar(WebScrollbar::Orientation orientation) |
bool isHorizontal = orientation == WebScrollbar::Horizontal; |
GraphicsLayer* scrollbarGraphicsLayer = isHorizontal ? |
m_overlayScrollbarHorizontal.get() : m_overlayScrollbarVertical.get(); |
- OwnPtr<WebScrollbarLayer>& webScrollbarLayer = isHorizontal ? |
+ std::unique_ptr<WebScrollbarLayer>& webScrollbarLayer = isHorizontal ? |
m_webOverlayScrollbarHorizontal : m_webOverlayScrollbarVertical; |
ScrollbarThemeOverlay& theme = ScrollbarThemeOverlay::mobileTheme(); |
@@ -832,7 +833,7 @@ String VisualViewport::debugName(const GraphicsLayer* graphicsLayer) const |
name = "Overlay Scrollbar Horizontal Layer"; |
} else if (graphicsLayer == m_overlayScrollbarVertical.get()) { |
name = "Overlay Scrollbar Vertical Layer"; |
- } else if (graphicsLayer == m_rootTransformLayer) { |
+ } else if (graphicsLayer == m_rootTransformLayer.get()) { |
name = "Root Transform Layer"; |
} else { |
ASSERT_NOT_REACHED(); |