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

Side by Side Diff: third_party/WebKit/Source/core/frame/VisualViewport.h

Issue 2050123002: Remove OwnPtr from Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: First attempt to land. 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 22 matching lines...) Expand all
33 33
34 #include "core/CoreExport.h" 34 #include "core/CoreExport.h"
35 #include "core/events/Event.h" 35 #include "core/events/Event.h"
36 #include "platform/geometry/FloatPoint.h" 36 #include "platform/geometry/FloatPoint.h"
37 #include "platform/geometry/FloatRect.h" 37 #include "platform/geometry/FloatRect.h"
38 #include "platform/geometry/IntSize.h" 38 #include "platform/geometry/IntSize.h"
39 #include "platform/graphics/GraphicsLayerClient.h" 39 #include "platform/graphics/GraphicsLayerClient.h"
40 #include "platform/scroll/ScrollableArea.h" 40 #include "platform/scroll/ScrollableArea.h"
41 #include "public/platform/WebScrollbar.h" 41 #include "public/platform/WebScrollbar.h"
42 #include "public/platform/WebSize.h" 42 #include "public/platform/WebSize.h"
43 #include "wtf/OwnPtr.h" 43 #include <memory>
44 #include "wtf/PassOwnPtr.h"
45 44
46 namespace blink { 45 namespace blink {
47 class WebLayerTreeView; 46 class WebLayerTreeView;
48 class WebScrollbarLayer; 47 class WebScrollbarLayer;
49 } 48 }
50 49
51 namespace blink { 50 namespace blink {
52 51
53 class FrameHost; 52 class FrameHost;
54 class GraphicsContext; 53 class GraphicsContext;
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
241 240
242 LocalFrame* mainFrame() const; 241 LocalFrame* mainFrame() const;
243 242
244 FrameHost& frameHost() const 243 FrameHost& frameHost() const
245 { 244 {
246 ASSERT(m_frameHost); 245 ASSERT(m_frameHost);
247 return *m_frameHost; 246 return *m_frameHost;
248 } 247 }
249 248
250 Member<FrameHost> m_frameHost; 249 Member<FrameHost> m_frameHost;
251 OwnPtr<GraphicsLayer> m_rootTransformLayer; 250 std::unique_ptr<GraphicsLayer> m_rootTransformLayer;
252 OwnPtr<GraphicsLayer> m_innerViewportContainerLayer; 251 std::unique_ptr<GraphicsLayer> m_innerViewportContainerLayer;
253 OwnPtr<GraphicsLayer> m_overscrollElasticityLayer; 252 std::unique_ptr<GraphicsLayer> m_overscrollElasticityLayer;
254 OwnPtr<GraphicsLayer> m_pageScaleLayer; 253 std::unique_ptr<GraphicsLayer> m_pageScaleLayer;
255 OwnPtr<GraphicsLayer> m_innerViewportScrollLayer; 254 std::unique_ptr<GraphicsLayer> m_innerViewportScrollLayer;
256 OwnPtr<GraphicsLayer> m_overlayScrollbarHorizontal; 255 std::unique_ptr<GraphicsLayer> m_overlayScrollbarHorizontal;
257 OwnPtr<GraphicsLayer> m_overlayScrollbarVertical; 256 std::unique_ptr<GraphicsLayer> m_overlayScrollbarVertical;
258 OwnPtr<WebScrollbarLayer> m_webOverlayScrollbarHorizontal; 257 std::unique_ptr<WebScrollbarLayer> m_webOverlayScrollbarHorizontal;
259 OwnPtr<WebScrollbarLayer> m_webOverlayScrollbarVertical; 258 std::unique_ptr<WebScrollbarLayer> m_webOverlayScrollbarVertical;
260 259
261 // Offset of the visual viewport from the main frame's origin, in CSS pixels . 260 // Offset of the visual viewport from the main frame's origin, in CSS pixels .
262 FloatPoint m_offset; 261 FloatPoint m_offset;
263 float m_scale; 262 float m_scale;
264 IntSize m_size; 263 IntSize m_size;
265 float m_topControlsAdjustment; 264 float m_topControlsAdjustment;
266 float m_maxPageScale; 265 float m_maxPageScale;
267 bool m_trackPinchZoomStatsForPage; 266 bool m_trackPinchZoomStatsForPage;
268 }; 267 };
269 268
270 } // namespace blink 269 } // namespace blink
271 270
272 #endif // VisualViewport_h 271 #endif // VisualViewport_h
OLDNEW
« 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