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

Unified Diff: sky/engine/core/frame/FrameView.cpp

Issue 688433003: Remove viewportConstrained plumbing. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: 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
« no previous file with comments | « sky/engine/core/frame/FrameView.h ('k') | sky/engine/core/page/scrolling/ScrollingCoordinator.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/frame/FrameView.cpp
diff --git a/sky/engine/core/frame/FrameView.cpp b/sky/engine/core/frame/FrameView.cpp
index 5a10ad52bef5d9eae54368842e7c383bc5a2775f..687e8ea040f4ebd19271a1dc1f6ac4093f0ccccd 100644
--- a/sky/engine/core/frame/FrameView.cpp
+++ b/sky/engine/core/frame/FrameView.cpp
@@ -151,7 +151,6 @@ void FrameView::reset()
m_lastPaintTime = 0;
m_paintBehavior = PaintBehaviorNormal;
m_isPainting = false;
- m_viewportConstrainedObjects.clear();
}
void FrameView::init()
@@ -205,8 +204,6 @@ void FrameView::setFrameRect(const IntRect& newRect)
if (renderView->usesCompositing())
renderView->compositor()->frameViewDidChangeSize();
}
-
- viewportConstrainedVisibleContentSizeChanged(newRect.width() != oldRect.width(), newRect.height() != oldRect.height());
}
Page* FrameView::page() const
@@ -716,38 +713,6 @@ void FrameView::removeSlowRepaintObject()
}
}
-void FrameView::addViewportConstrainedObject(RenderObject* object)
-{
- if (!m_viewportConstrainedObjects)
- m_viewportConstrainedObjects = adoptPtr(new ViewportConstrainedObjectSet);
-
- if (!m_viewportConstrainedObjects->contains(object)) {
- m_viewportConstrainedObjects->add(object);
-
- if (Page* page = m_frame->page()) {
- if (ScrollingCoordinator* scrollingCoordinator = page->scrollingCoordinator())
- scrollingCoordinator->frameViewFixedObjectsDidChange(this);
- }
- }
-}
-
-void FrameView::removeViewportConstrainedObject(RenderObject* object)
-{
- if (m_viewportConstrainedObjects && m_viewportConstrainedObjects->contains(object)) {
- m_viewportConstrainedObjects->remove(object);
-
- if (Page* page = m_frame->page()) {
- if (ScrollingCoordinator* scrollingCoordinator = page->scrollingCoordinator())
- scrollingCoordinator->frameViewFixedObjectsDidChange(this);
- }
- }
-}
-
-void FrameView::viewportConstrainedVisibleContentSizeChanged(bool widthChanged, bool heightChanged)
-{
- // FIXME(sky): Remove
-}
-
IntPoint FrameView::lastKnownMousePosition() const
{
return m_frame->eventHandler().lastKnownMousePosition();
@@ -824,29 +789,6 @@ void FrameView::didScrollTimerFired(Timer<FrameView>*)
}
}
-void FrameView::updateLayersAndCompositingAfterScrollIfNeeded()
-{
- // Nothing to do after scrolling if there are no fixed position elements.
- if (!hasViewportConstrainedObjects())
- return;
-
- RefPtr<FrameView> protect(this);
-
- // If there fixed position elements, scrolling may cause compositing layers to change.
- // Update widget and layer positions after scrolling, but only if we're not inside of
- // layout.
- if (!m_nestedLayoutCount) {
- updateWidgetPositions();
- if (RenderView* renderView = this->renderView())
- renderView->layer()->setNeedsCompositingInputsUpdate();
- }
-}
-
-void FrameView::updateFixedElementPaintInvalidationRectsAfterScroll()
-{
- // FIXME(sky): Remove
-}
-
void FrameView::updateCompositedSelectionBoundsIfNeeded()
{
if (!RuntimeEnabledFeatures::compositedSelectionUpdatesEnabled())
« no previous file with comments | « sky/engine/core/frame/FrameView.h ('k') | sky/engine/core/page/scrolling/ScrollingCoordinator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698