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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: Source/core/frame/PinchViewport.cpp

Issue 1215973002: Oilpan: improve ScrollableArea handling. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: remove too conservative null check Created 5 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
« no previous file with comments | « Source/core/frame/PinchViewport.h ('k') | Source/core/frame/RootFrameViewport.h » ('j') | Source/core/page/scrolling/ScrollingCoordinator.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/frame/PinchViewport.cpp
diff --git a/Source/core/frame/PinchViewport.cpp b/Source/core/frame/PinchViewport.cpp
index 4bf57b5f645b9af7b020a791c6e63a6f6956ec30..1c1fc2e51ca7c89b5e717cf2f347645d4679169b 100644
--- a/Source/core/frame/PinchViewport.cpp
+++ b/Source/core/frame/PinchViewport.cpp
@@ -68,7 +68,7 @@ using blink::GraphicsLayerFactory;
namespace blink {
PinchViewport::PinchViewport(FrameHost& owner)
- : m_frameHost(owner)
+ : m_frameHost(&owner)
, m_scale(1)
, m_topControlsAdjustment(0)
{
@@ -79,6 +79,12 @@ PinchViewport::~PinchViewport()
{
}
+DEFINE_TRACE(PinchViewport)
+{
+ visitor->trace(m_frameHost);
+ ScrollableArea::trace(visitor);
+}
+
void PinchViewport::setSize(const IntSize& size)
{
// When the main frame is remote, we won't have an associated frame.
« no previous file with comments | « Source/core/frame/PinchViewport.h ('k') | Source/core/frame/RootFrameViewport.h » ('j') | Source/core/page/scrolling/ScrollingCoordinator.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698