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

Unified Diff: sky/engine/core/page/scrolling/ScrollingCoordinator.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, 2 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: sky/engine/core/page/scrolling/ScrollingCoordinator.cpp
diff --git a/sky/engine/core/page/scrolling/ScrollingCoordinator.cpp b/sky/engine/core/page/scrolling/ScrollingCoordinator.cpp
index 3fc5fe03fd36b166b2f18b7445cdf518b10040a0..eb7b19f26d2c16922af147f9cf9e03bf00b230b0 100644
--- a/sky/engine/core/page/scrolling/ScrollingCoordinator.cpp
+++ b/sky/engine/core/page/scrolling/ScrollingCoordinator.cpp
@@ -151,8 +151,7 @@ void ScrollingCoordinator::updateAfterCompositingChangeIfNeeded()
// The mainFrame view doesn't get included in the FrameTree below, so we
// update its size separately.
if (WebLayer* scrollingWebLayer = frameView ? toWebLayer(frameView->layerForScrolling()) : 0) {
- scrollingWebLayer->setBounds(frameView->contentsSize());
- scrollingWebLayer->setScrollClipLayer(toWebLayer(frameView->layerForContainer()));
+ scrollingWebLayer->setBounds(frameView->size());
}
}
@@ -757,7 +756,8 @@ void ScrollingCoordinator::frameViewFixedObjectsDidChange(FrameView* frameView)
bool ScrollingCoordinator::isForMainFrame(ScrollableArea* scrollableArea) const
{
- return scrollableArea == m_page->mainFrame()->view();
+ // FIXME(sky): Remove
+ return false;
}
void ScrollingCoordinator::frameViewRootLayerDidChange(FrameView* frameView)
@@ -858,13 +858,7 @@ String ScrollingCoordinator::mainThreadScrollingReasonsAsText() const
bool ScrollingCoordinator::frameViewIsDirty() const
{
- FrameView* frameView = m_page->mainFrame()->view();
- bool frameIsScrollable = frameView && frameView->isScrollable();
- if (frameIsScrollable != m_wasFrameScrollable)
- return true;
-
- if (WebLayer* scrollLayer = frameView ? toWebLayer(frameView->layerForScrolling()) : 0)
- return blink::WebSize(frameView->contentsSize()) != scrollLayer->bounds();
+ // FIXME(sky): Remove
return false;
}

Powered by Google App Engine
This is Rietveld 408576698