Changeset 53713 in webkit

Timestamp:

Jan 22, 2010 1:52:40 PM (14 years ago)

Author:

mitz@apple.com

Message:

Rubber-stamped by Darin Adler.

Revert r53693 because it broke scrolling of pages with fixed elements on
Mac OS X.

• page/FrameView.cpp:
• page/FrameView.h:
• platform/ScrollView.cpp:

(WebCore::ScrollView::scrollContents):

• platform/ScrollView.h:
• rendering/RenderObject.cpp:

(WebCore::RenderObject::styleWillChange):
(WebCore::RenderObject::destroy):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/FrameView.cpp (modified) (1 diff)
• page/FrameView.h (modified) (3 diffs)
• platform/ScrollView.cpp (modified) (2 diffs)
• platform/ScrollView.h (modified) (1 diff)
• rendering/RenderObject.cpp (modified) (3 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-01-22  Dan Bernstein  <mitz@apple.com>
+
+        Rubber-stamped by Darin Adler.
+
+        Revert r53693 because it broke scrolling of pages with fixed elements on
+        Mac OS X.
+
+        * page/FrameView.cpp:
+        * page/FrameView.h:
+        * platform/ScrollView.cpp:
+        (WebCore::ScrollView::scrollContents):
+        * platform/ScrollView.h:
+        * rendering/RenderObject.cpp:
+        (WebCore::RenderObject::styleWillChange):
+        (WebCore::RenderObject::destroy):
+
 2010-01-22  Alexey Proskuryakov  <ap@apple.com>
 

trunk/WebCore/page/FrameView.cpp

@@ -814 +814 @@
 }
 
-
-void FrameView::registerFixedPositionedObject(RenderObject* object)
-{
-    m_fixedPositionedObjects.add(object);
-}
-
-void FrameView::unregisterFixedPositionedObject(RenderObject* object)
-{
-    m_fixedPositionedObjects.remove(object);
-}
-
-void FrameView::scrollContentsFastPath(const IntSize& scrollDelta, const IntRect& rectToScroll, const IntRect& clipRect)
-{
-    const size_t fixedObjectNumberThreshold = 5;
-
-    if (m_fixedPositionedObjects.isEmpty())
-        hostWindow()->scroll(scrollDelta, rectToScroll, clipRect);
-    else {
-        Vector<RenderObject*> fixedObjectsInViewport;
-        fixedObjectsInViewport.reserveCapacity(m_fixedPositionedObjects.size());
-
-        bool updateInvalidatedSubRect = true;
-        // Get a list of fixed objects that are not in transformations
-        HashSet<RenderObject*>::const_iterator end = m_fixedPositionedObjects.end();
-        HashSet<RenderObject*>::const_iterator it = m_fixedPositionedObjects.begin();
-        for (; it != end; ++it) {
-            RenderObject* obj = *it;
-            // make sure the parent layer has not been transformed
-            if (obj->containingBlock() == obj->view()) {
-                fixedObjectsInViewport.append(obj);
-                if (fixedObjectsInViewport.size() > fixedObjectNumberThreshold) {
-                    updateInvalidatedSubRect = false;
-                    break;
-                }
-            }
-        }
-
-        // scroll the content
-        if (updateInvalidatedSubRect) {
-            // 1) scroll
-            hostWindow()->scroll(scrollDelta, rectToScroll, clipRect);
-
-            // 2) update the area of fixed objets that has been invalidated
-            for (size_t i = 0; i < fixedObjectsInViewport.size(); ++i) {
-                IntRect topLevelRect;
-                IntRect updateRect = fixedObjectsInViewport[i]->paintingRootRect(topLevelRect);
-                updateRect.move(-scrollX(), -scrollY());
-                IntRect scrolledRect = updateRect;
-                scrolledRect.move(scrollDelta);
-                updateRect.unite(scrolledRect);
-                updateRect.intersect(rectToScroll);
-                hostWindow()->repaint(updateRect, true, false, true);
-            }
-        } else {
-            // the number of fixed objects exceed the threshold, so we repaint everything.
-            IntRect updateRect = clipRect;
-            updateRect.intersect(rectToScroll);
-            hostWindow()->repaint(updateRect, true, false, true);
-        }
-    }
-}
-
 void FrameView::setIsOverlapped(bool isOverlapped)
 {

trunk/WebCore/page/FrameView.h

@@ -146 +146 @@
     void removeSlowRepaintObject();
 
-    // Methods to manage the objects that are fixed
-    // in the view when scrolling
-    void registerFixedPositionedObject(RenderObject* object);
-    void unregisterFixedPositionedObject(RenderObject* object);
-
     void beginDeferredRepaints();
     void endDeferredRepaints();
@@ -204 +199 @@
     bool isFrameViewScrollCorner(RenderScrollbarPart* scrollCorner) const { return m_scrollCorner == scrollCorner; }
     void invalidateScrollCorner();
-
-protected:
-    virtual void scrollContentsFastPath(const IntSize& scrollDelta, const IntRect& rectToScroll, const IntRect& clipRect);
 
 private:
@@ -277 +269 @@
     bool m_contentIsOpaque;
     unsigned m_slowRepaintObjectCount;
-    HashSet<RenderObject*> m_fixedPositionedObjects;
 
     int m_borderX, m_borderY;

trunk/WebCore/platform/ScrollView.cpp

@@ -516 +516 @@
     if (canBlitOnScroll()) { // The main frame can just blit the WebView window
        // FIXME: Find a way to blit subframes without blitting overlapping content
-       scrollContentsFastPath(-scrollDelta, scrollViewRect, clipRect);
+       hostWindow()->scroll(-scrollDelta, scrollViewRect, clipRect);
     } else { 
        // We need to go ahead and repaint the entire backing store.  Do it now before moving the
@@ -529 +529 @@
     // be very fast).
     hostWindow()->paint();
-}
-
-void ScrollView::scrollContentsFastPath(const IntSize& scrollDelta, const IntRect& rectToScroll, const IntRect& clipRect)
-{
-    hostWindow()->scroll(scrollDelta, rectToScroll, clipRect);
 }
 

trunk/WebCore/platform/ScrollView.h

@@ -250 +250 @@
     virtual void updateScrollCorner();
     virtual void paintScrollCorner(GraphicsContext*, const IntRect& cornerRect);
-
-    // Scroll the content by blitting the pixels
-    virtual void scrollContentsFastPath(const IntSize& scrollDelta, const IntRect& rectToScroll, const IntRect& clipRect);
     
 private:

trunk/WebCore/rendering/RenderObject.cpp

@@ -1648 +1648 @@
         s_affectsParentBlock = false;
 
-    FrameView* frameView = view()->frameView();
-    if (frameView) {
+    if (view()->frameView()) {
+        // FIXME: A better solution would be to only invalidate the fixed regions when scrolling.  It's overkill to
+        // prevent the entire view from blitting on a scroll.
+
         bool shouldBlitOnFixedBackgroundImage = false;
 #if ENABLE(FAST_MOBILE_SCROLLING)
@@ -1659 +1661 @@
 #endif
 
-        bool newStyleSlowScroll = newStyle && !shouldBlitOnFixedBackgroundImage && newStyle->hasFixedBackgroundImage();
-        bool oldStyleSlowScroll = m_style && !shouldBlitOnFixedBackgroundImage && m_style->hasFixedBackgroundImage();
-
+        bool newStyleSlowScroll = newStyle && (newStyle->position() == FixedPosition
+                                               || (!shouldBlitOnFixedBackgroundImage && newStyle->hasFixedBackgroundImage()));
+        bool oldStyleSlowScroll = m_style && (m_style->position() == FixedPosition
+                                               || (!shouldBlitOnFixedBackgroundImage && m_style->hasFixedBackgroundImage()));
         if (oldStyleSlowScroll != newStyleSlowScroll) {
             if (oldStyleSlowScroll)
-                frameView->removeSlowRepaintObject();
+                view()->frameView()->removeSlowRepaintObject();
             if (newStyleSlowScroll)
-                frameView->addSlowRepaintObject();
-        }
-
-        bool newStyleHasTransform = newStyle && (newStyle->hasTransformRelatedProperty());
-        if (!newStyleHasTransform) {
-            bool newStyleHasFixedPosition = newStyle && (newStyle->position() == FixedPosition);
-            bool oldStyleHasFixedPosition = m_style && (m_style->position() == FixedPosition);
-
-            if (oldStyleHasFixedPosition != newStyleHasFixedPosition) {
-                if (newStyleHasFixedPosition)
-                    frameView->registerFixedPositionedObject(this);
-                else
-                    frameView->unregisterFixedPositionedObject(this);
-            } else {
-                // if previously had a fix position, but had a transform, which has been removed
-                bool oldStyleHasTransform = m_style && (m_style->hasTransformRelatedProperty());
-                if (oldStyleHasTransform && newStyleHasFixedPosition)
-                    frameView->registerFixedPositionedObject(this);
-            }
+                view()->frameView()->addSlowRepaintObject();
         }
     }
@@ -1947 +1932 @@
 void RenderObject::destroy()
 {
-    // unregister from the view if the object had a fixed position
-    if (m_style && m_style->position() == FixedPosition) {
-        FrameView* frameView = document()->view();
-        if (frameView)
-            frameView->unregisterFixedPositionedObject(this);
-    }
-
     // Destroy any leftover anonymous children.
     RenderObjectChildList* children = virtualChildren();