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

Side by Side Diff: sky/engine/core/rendering/RenderLayerScrollableArea.cpp

Issue 646273006: Get rid of ScrollView. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: merge to ToT Created 6 years, 1 month 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) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
3 * 3 *
4 * Portions are Copyright (C) 1998 Netscape Communications Corporation. 4 * Portions are Copyright (C) 1998 Netscape Communications Corporation.
5 * 5 *
6 * Other contributors: 6 * Other contributors:
7 * Robert O'Callahan <roc+@cs.cmu.edu> 7 * Robert O'Callahan <roc+@cs.cmu.edu>
8 * David Baron <dbaron@fas.harvard.edu> 8 * David Baron <dbaron@fas.harvard.edu>
9 * Christian Biesinger <cbiesinger@web.de> 9 * Christian Biesinger <cbiesinger@web.de>
10 * Randall Jesup <rjesup@wgate.com> 10 * Randall Jesup <rjesup@wgate.com>
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 updateResizerAreaSet(); 97 updateResizerAreaSet();
98 } 98 }
99 99
100 RenderLayerScrollableArea::~RenderLayerScrollableArea() 100 RenderLayerScrollableArea::~RenderLayerScrollableArea()
101 { 101 {
102 if (inResizeMode() && !box().documentBeingDestroyed()) { 102 if (inResizeMode() && !box().documentBeingDestroyed()) {
103 if (LocalFrame* frame = box().frame()) 103 if (LocalFrame* frame = box().frame())
104 frame->eventHandler().resizeScrollableAreaDestroyed(); 104 frame->eventHandler().resizeScrollableAreaDestroyed();
105 } 105 }
106 106
107 if (LocalFrame* frame = box().frame()) {
108 if (FrameView* frameView = frame->view()) {
109 frameView->removeScrollableArea(this);
110 }
111 }
112
113 if (box().frame() && box().frame()->page()) { 107 if (box().frame() && box().frame()->page()) {
114 if (ScrollingCoordinator* scrollingCoordinator = box().frame()->page()-> scrollingCoordinator()) 108 if (ScrollingCoordinator* scrollingCoordinator = box().frame()->page()-> scrollingCoordinator())
115 scrollingCoordinator->willDestroyScrollableArea(this); 109 scrollingCoordinator->willDestroyScrollableArea(this);
116 } 110 }
117 111
118 if (!box().documentBeingDestroyed()) { 112 if (!box().documentBeingDestroyed()) {
119 Node* node = box().node(); 113 Node* node = box().node();
120 if (node && node->isElementNode()) 114 if (node && node->isElementNode())
121 toElement(node)->setSavedLayerScrollOffset(m_scrollOffset); 115 toElement(node)->setSavedLayerScrollOffset(m_scrollOffset);
122 } 116 }
(...skipping 1213 matching lines...) Expand 10 before | Expand all | Expand 10 after
1336 void RenderLayerScrollableArea::setTopmostScrollChild(RenderLayer* scrollChild) 1330 void RenderLayerScrollableArea::setTopmostScrollChild(RenderLayer* scrollChild)
1337 { 1331 {
1338 // We only want to track the topmost scroll child for scrollable areas with 1332 // We only want to track the topmost scroll child for scrollable areas with
1339 // overlay scrollbars. 1333 // overlay scrollbars.
1340 if (!hasOverlayScrollbars()) 1334 if (!hasOverlayScrollbars())
1341 return; 1335 return;
1342 m_nextTopmostScrollChild = scrollChild; 1336 m_nextTopmostScrollChild = scrollChild;
1343 } 1337 }
1344 1338
1345 } // namespace blink 1339 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698