Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2079)

Unified Diff: third_party/WebKit/Source/core/frame/VisualViewport.h

Issue 2080623002: Revert "Remove OwnPtr from Blink." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/frame/VisualViewport.h
diff --git a/third_party/WebKit/Source/core/frame/VisualViewport.h b/third_party/WebKit/Source/core/frame/VisualViewport.h
index 58b3d7b9df16ff40d285fec0e479cbaaf56371c1..d15d2345bc75053aadaea36228c1a0fb9e6614e1 100644
--- a/third_party/WebKit/Source/core/frame/VisualViewport.h
+++ b/third_party/WebKit/Source/core/frame/VisualViewport.h
@@ -40,7 +40,8 @@
#include "platform/scroll/ScrollableArea.h"
#include "public/platform/WebScrollbar.h"
#include "public/platform/WebSize.h"
-#include <memory>
+#include "wtf/OwnPtr.h"
+#include "wtf/PassOwnPtr.h"
namespace blink {
class WebLayerTreeView;
@@ -247,15 +248,15 @@ private:
}
Member<FrameHost> m_frameHost;
- std::unique_ptr<GraphicsLayer> m_rootTransformLayer;
- std::unique_ptr<GraphicsLayer> m_innerViewportContainerLayer;
- std::unique_ptr<GraphicsLayer> m_overscrollElasticityLayer;
- std::unique_ptr<GraphicsLayer> m_pageScaleLayer;
- std::unique_ptr<GraphicsLayer> m_innerViewportScrollLayer;
- std::unique_ptr<GraphicsLayer> m_overlayScrollbarHorizontal;
- std::unique_ptr<GraphicsLayer> m_overlayScrollbarVertical;
- std::unique_ptr<WebScrollbarLayer> m_webOverlayScrollbarHorizontal;
- std::unique_ptr<WebScrollbarLayer> m_webOverlayScrollbarVertical;
+ OwnPtr<GraphicsLayer> m_rootTransformLayer;
+ OwnPtr<GraphicsLayer> m_innerViewportContainerLayer;
+ OwnPtr<GraphicsLayer> m_overscrollElasticityLayer;
+ OwnPtr<GraphicsLayer> m_pageScaleLayer;
+ OwnPtr<GraphicsLayer> m_innerViewportScrollLayer;
+ OwnPtr<GraphicsLayer> m_overlayScrollbarHorizontal;
+ OwnPtr<GraphicsLayer> m_overlayScrollbarVertical;
+ OwnPtr<WebScrollbarLayer> m_webOverlayScrollbarHorizontal;
+ OwnPtr<WebScrollbarLayer> m_webOverlayScrollbarVertical;
// Offset of the visual viewport from the main frame's origin, in CSS pixels.
FloatPoint m_offset;
« no previous file with comments | « third_party/WebKit/Source/core/frame/UseCounter.h ('k') | third_party/WebKit/Source/core/frame/VisualViewport.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698