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

Side by Side 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 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 <memory> 43 #include "wtf/OwnPtr.h"
44 #include "wtf/PassOwnPtr.h"
44 45
45 namespace blink { 46 namespace blink {
46 class WebLayerTreeView; 47 class WebLayerTreeView;
47 class WebScrollbarLayer; 48 class WebScrollbarLayer;
48 } 49 }
49 50
50 namespace blink { 51 namespace blink {
51 52
52 class FrameHost; 53 class FrameHost;
53 class GraphicsContext; 54 class GraphicsContext;
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
240 241
241 LocalFrame* mainFrame() const; 242 LocalFrame* mainFrame() const;
242 243
243 FrameHost& frameHost() const 244 FrameHost& frameHost() const
244 { 245 {
245 ASSERT(m_frameHost); 246 ASSERT(m_frameHost);
246 return *m_frameHost; 247 return *m_frameHost;
247 } 248 }
248 249
249 Member<FrameHost> m_frameHost; 250 Member<FrameHost> m_frameHost;
250 std::unique_ptr<GraphicsLayer> m_rootTransformLayer; 251 OwnPtr<GraphicsLayer> m_rootTransformLayer;
251 std::unique_ptr<GraphicsLayer> m_innerViewportContainerLayer; 252 OwnPtr<GraphicsLayer> m_innerViewportContainerLayer;
252 std::unique_ptr<GraphicsLayer> m_overscrollElasticityLayer; 253 OwnPtr<GraphicsLayer> m_overscrollElasticityLayer;
253 std::unique_ptr<GraphicsLayer> m_pageScaleLayer; 254 OwnPtr<GraphicsLayer> m_pageScaleLayer;
254 std::unique_ptr<GraphicsLayer> m_innerViewportScrollLayer; 255 OwnPtr<GraphicsLayer> m_innerViewportScrollLayer;
255 std::unique_ptr<GraphicsLayer> m_overlayScrollbarHorizontal; 256 OwnPtr<GraphicsLayer> m_overlayScrollbarHorizontal;
256 std::unique_ptr<GraphicsLayer> m_overlayScrollbarVertical; 257 OwnPtr<GraphicsLayer> m_overlayScrollbarVertical;
257 std::unique_ptr<WebScrollbarLayer> m_webOverlayScrollbarHorizontal; 258 OwnPtr<WebScrollbarLayer> m_webOverlayScrollbarHorizontal;
258 std::unique_ptr<WebScrollbarLayer> m_webOverlayScrollbarVertical; 259 OwnPtr<WebScrollbarLayer> m_webOverlayScrollbarVertical;
259 260
260 // Offset of the visual viewport from the main frame's origin, in CSS pixels . 261 // Offset of the visual viewport from the main frame's origin, in CSS pixels .
261 FloatPoint m_offset; 262 FloatPoint m_offset;
262 float m_scale; 263 float m_scale;
263 IntSize m_size; 264 IntSize m_size;
264 float m_topControlsAdjustment; 265 float m_topControlsAdjustment;
265 float m_maxPageScale; 266 float m_maxPageScale;
266 bool m_trackPinchZoomStatsForPage; 267 bool m_trackPinchZoomStatsForPage;
267 }; 268 };
268 269
269 } // namespace blink 270 } // namespace blink
270 271
271 #endif // VisualViewport_h 272 #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