Remove more frame-level scrolling machinery.

sky/engine/core/frame/FrameView.cpp

 /*
  * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
  *                     1999 Lars Knoll <knoll@kde.org>
  *                     1999 Antti Koivisto <koivisto@kde.org>
  *                     2000 Dirk Mueller <mueller@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
  *           (C) 2006 Graham Dennis (graham.dennis@gmail.com)
  *           (C) 2006 Alexey Proskuryakov (ap@nypop.com)
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
@@ skipping 50 matching lines @@
 #include "platform/scroll/Scrollbar.h"
 #include "platform/text/TextStream.h"
 #include "wtf/CurrentTime.h"
 #include "wtf/TemporaryChange.h"
 
 namespace blink {
 
 double FrameView::s_currentFrameTimeStamp = 0.0;
 bool FrameView::s_inPaintContents = false;
 
-static const double resourcePriorityUpdateDelayAfterScroll = 0.250;
-
 FrameView::FrameView(LocalFrame* frame)
     : m_frame(frame)
     , m_hasPendingLayout(false)
     , m_layoutSubtreeRoot(0)
     , m_inSynchronousPostLayout(false)
     , m_postLayoutTasksTimer(this, &FrameView::postLayoutTimerFired)
     , m_isTransparent(false)
     , m_baseBackgroundColor(Color::white)
     , m_mediaType("screen")
     , m_overflowStatusDirty(true)
     , m_viewportRenderer(0)
     , m_wasScrolledByUser(false)
     , m_inProgrammaticScroll(false)
     , m_isTrackingPaintInvalidations(false)
     , m_hasSoftwareFilters(false)
     , m_visibleContentScaleFactor(1)
     , m_inputEventsScaleFactorForEmulation(1)
     , m_layoutSizeFixedToFrameSize(true)
-    , m_didScrollTimer(this, &FrameView::didScrollTimerFired)
 {
     ASSERT(m_frame);
     init();
 }
 
 PassRefPtr<FrameView> FrameView::create(LocalFrame* frame)
 {
     RefPtr<FrameView> view = adoptRef(new FrameView(frame));
     return view.release();
 }
 
 PassRefPtr<FrameView> FrameView::create(LocalFrame* frame, const IntSize& initialSize)
 {
     RefPtr<FrameView> view = adoptRef(new FrameView(frame));
     view->Widget::setFrameRect(IntRect(view->location(), initialSize));
     view->setLayoutSizeInternal(initialSize);
     return view.release();
 }
 
 FrameView::~FrameView()
 {
     if (m_postLayoutTasksTimer.isActive())
         m_postLayoutTasksTimer.stop();
 
-    if (m_didScrollTimer.isActive())
-        m_didScrollTimer.stop();
-
     ASSERT(m_frame);
     ASSERT(m_frame->view() != this || !m_frame->contentRenderer());
-    // FIXME: Do we need to do something here for OOPI?
 }
 
 void FrameView::reset()
 {
     m_hasPendingLayout = false;
     m_layoutSubtreeRoot = 0;
     m_doFullPaintInvalidation = false;
     m_layoutSchedulingEnabled = true;
     m_inPerformLayout = false;
     m_canInvalidatePaintDuringPerformLayout = false;
@@ skipping 421 matching lines @@
     return m_layoutSize;
 }
 
 void FrameView::setLayoutSize(const IntSize& size)
 {
     ASSERT(!layoutSizeFixedToFrameSize());
 
     setLayoutSizeInternal(size);
 }
 
-void FrameView::scrollPositionChanged()
-{
-    setWasScrolledByUser(true);
-
-    Document* document = m_frame->document();
-    document->enqueueScrollEventForNode(document);
-
-    m_frame->eventHandler().dispatchFakeMouseMoveEventSoon();
-
-    if (RenderView* renderView = document->renderView()) {
-        if (renderView->usesCompositing())
-            renderView->compositor()->frameViewDidScroll();
-    }
-
-    if (m_didScrollTimer.isActive())
-        m_didScrollTimer.stop();
-    m_didScrollTimer.startOneShot(resourcePriorityUpdateDelayAfterScroll, FROM_HERE);
-}
-
-void FrameView::didScrollTimerFired(Timer<FrameView>*)
-{
-    if (m_frame->document() && m_frame->document()->renderView()) {
-        ResourceLoadPriorityOptimizer::resourceLoadPriorityOptimizer()->updateAllImageResourcePriorities();
-    }
-}
-
 void FrameView::updateCompositedSelectionBoundsIfNeeded()
 {
     if (!RuntimeEnabledFeatures::compositedSelectionUpdatesEnabled())
         return;
 
     Page* page = frame().page();
     ASSERT(page);
 
     LocalFrame* frame = page->focusController().focusedOrMainFrame();
     if (!frame || !frame->selection().isCaretOrRange()) {
@@ skipping 10 matching lines @@
     if (!page)
         return 0;
     return &page->chrome();
 }
 
 void FrameView::contentRectangleForPaintInvalidation(const IntRect& r)
 {
     ASSERT(paintInvalidationIsAllowed());
 
     if (m_isTrackingPaintInvalidations) {
-        IntRect paintInvalidationRect = r;
-        paintInvalidationRect.move(-scrollOffset());
-        m_trackedPaintInvalidationRects.append(paintInvalidationRect);
+        m_trackedPaintInvalidationRects.append(r);
         // FIXME: http://crbug.com/368518. Eventually, invalidateContentRectangleForPaint
         // is going away entirely once all layout tests are FCM. In the short
         // term, no code should be tracking non-composited FrameView paint invalidations.
         RELEASE_ASSERT_NOT_REACHED();
     }
 
     IntRect paintRect = r;
     if (clipsPaintInvalidations() && !paintsEntireContents())
         paintRect.intersect(visibleContentRect());
     if (paintRect.isEmpty())
@@ skipping 459 matching lines @@
     lifecycle().advanceTo(DocumentLifecycle::PaintInvalidationClean);
 }
 
 void FrameView::forceLayout(bool allowSubtree)
 {
     layout(allowSubtree);
 }
 
 IntRect FrameView::convertFromRenderer(const RenderObject& renderer, const IntRect& rendererRect) const
 {
-    IntRect rect = pixelSnappedIntRect(enclosingLayoutRect(renderer.localToAbsoluteQuad(FloatRect(rendererRect)).boundingBox()));
-
-    // Convert from page ("absolute") to FrameView coordinates.
-    rect.moveBy(-scrollPosition());
-
-    return rect;
+    return pixelSnappedIntRect(enclosingLayoutRect(renderer.localToAbsoluteQuad(FloatRect(rendererRect)).boundingBox()));
 }
 
 IntRect FrameView::convertToRenderer(const RenderObject& renderer, const IntRect& viewRect) const
 {
     IntRect rect = viewRect;
-
-    // Convert from FrameView coords into page ("absolute") coordinates.
-    rect.moveBy(scrollPosition());
-
     // FIXME: we don't have a way to map an absolute rect down to a local quad, so just
     // move the rect for now.
     rect.setLocation(roundedIntPoint(renderer.absoluteToLocal(rect.location(), UseTransforms)));
     return rect;
 }
 
 IntPoint FrameView::convertFromRenderer(const RenderObject& renderer, const IntPoint& rendererPoint) const
 {
-    IntPoint point = roundedIntPoint(renderer.localToAbsolute(rendererPoint, UseTransforms));
-
-    // Convert from page ("absolute") to FrameView coordinates.
-    point.moveBy(-scrollPosition());
-    return point;
+    return roundedIntPoint(renderer.localToAbsolute(rendererPoint, UseTransforms));
 }
 
 IntPoint FrameView::convertToRenderer(const RenderObject& renderer, const IntPoint& viewPoint) const
 {
     return roundedIntPoint(renderer.absoluteToLocal(viewPoint, UseTransforms));
 }
 
 IntRect FrameView::convertToContainingView(const IntRect& localRect) const
 {
     return localRect;
@@ skipping 116 matching lines @@
 void FrameView::setLayoutSizeInternal(const IntSize& size)
 {
     if (m_layoutSize == size)
         return;
 
     m_layoutSize = size;
     contentsResized();
 }
 
 } // namespace blink