Changeset 15722 in webkit

Timestamp:

Jul 31, 2006 7:25:43 PM (18 years ago)

Author:

hyatt

Message:

Fix for bug 10179, digg.com scrolls slowly. Improve fixed positioning
and fixed backgrounds so that a count of them is kept on the FrameView.
This allows us to switch slow scrolling on and off as these objects come
and go.

• css/cssstyleselector.cpp: (WebCore::CSSStyleSelector::adjustRenderStyle): (WebCore::CSSStyleSelector::applyProperty):
• page/FrameView.cpp: (WebCore::FrameViewPrivate::reset): (WebCore::FrameView::layout): (WebCore::FrameView::useSlowRepaints): (WebCore::FrameView::setUseSlowRepaints): (WebCore::FrameView::addSlowRepaintObject): (WebCore::FrameView::removeSlowRepaintObject):
• page/FrameView.h:
• rendering/RenderBox.cpp: (WebCore::RenderBox::paintBackgroundExtended):
• rendering/RenderObject.cpp: (WebCore::RenderObject::setStyle):
• rendering/RenderView.cpp: (WebCore::RenderView::paintBoxDecorations):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/cssstyleselector.cpp (modified) (2 diffs)
• page/FrameView.cpp (modified) (4 diffs)
• page/FrameView.h (modified) (1 diff)
• rendering/RenderBox.cpp (modified) (1 diff)
• rendering/RenderObject.cpp (modified) (1 diff)
• rendering/RenderView.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2006-07-31  David Hyatt  <hyatt@apple.com>
+
+        Fix for bug 10179, digg.com scrolls slowly.  Improve fixed positioning
+        and fixed backgrounds so that a count of them is kept on the FrameView.
+        This allows us to switch slow scrolling on and off as these objects come
+        and go.
+
+        * css/cssstyleselector.cpp:
+        (WebCore::CSSStyleSelector::adjustRenderStyle):
+        (WebCore::CSSStyleSelector::applyProperty):
+        * page/FrameView.cpp:
+        (WebCore::FrameViewPrivate::reset):
+        (WebCore::FrameView::layout):
+        (WebCore::FrameView::useSlowRepaints):
+        (WebCore::FrameView::setUseSlowRepaints):
+        (WebCore::FrameView::addSlowRepaintObject):
+        (WebCore::FrameView::removeSlowRepaintObject):
+        * page/FrameView.h:
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::paintBackgroundExtended):
+        * rendering/RenderObject.cpp:
+        (WebCore::RenderObject::setStyle):
+        * rendering/RenderView.cpp:
+        (WebCore::RenderView::paintBoxDecorations):
+
 2006-07-31  David Hyatt  <hyatt@apple.com>
 

trunk/WebCore/css/cssstyleselector.cpp

@@ -1087 +1087 @@
             theme()->adjustStyle(this, style, e);
     }
-
-    // Only use slow repaints if we actually have a background image.
-    // FIXME: We only need to invalidate the fixed regions when scrolling.  It's total overkill to
-    // prevent the entire view from blitting on a scroll.
-    if (style->hasFixedBackgroundImage() && view)
-        view->useSlowRepaints();
 }
 
@@ -2212 +2206 @@
         {
         case CSS_VAL_STATIC:
-            p = StaticPosition; break;
+            p = StaticPosition;
+            break;
         case CSS_VAL_RELATIVE:
-            p = RelativePosition; break;
+            p = RelativePosition;
+            break;
         case CSS_VAL_ABSOLUTE:
-            p = AbsolutePosition; break;
+            p = AbsolutePosition;
+            break;
         case CSS_VAL_FIXED:
-            {
-                if (view)
-                    view->useSlowRepaints();
-                p = FixedPosition;
-                break;
-            }
+            p = FixedPosition;
+            break;
         default:
             return;

trunk/WebCore/page/FrameView.cpp

@@ -90 +90 @@
         linkPressed = false;
         useSlowRepaints = false;
+        slowRepaintObjectCount = 0;
         dragTarget = 0;
         borderTouched = false;
@@ -128 +129 @@
     bool linkPressed;
     bool useSlowRepaints;
+    unsigned slowRepaintObjectCount;
     bool ignoreWheelEvents;
 
@@ -513 +515 @@
         return;
     }
-    setStaticBackground(d->useSlowRepaints);
+    setStaticBackground(useSlowRepaints());
 
     if (document->hasListenerType(Document::OVERFLOWCHANGED_LISTENER))
@@ -1020 +1022 @@
 }
 
-void FrameView::useSlowRepaints()
+bool FrameView::useSlowRepaints() const
+{
+    return d->useSlowRepaints || d->slowRepaintObjectCount > 0;
+}
+
+void FrameView::setUseSlowRepaints()
 {
     d->useSlowRepaints = true;
     setStaticBackground(true);
+}
+
+void FrameView::addSlowRepaintObject()
+{
+    if (d->slowRepaintObjectCount == 0)
+        setStaticBackground(true);
+    d->slowRepaintObjectCount++;
+}
+
+void FrameView::removeSlowRepaintObject()
+{
+    d->slowRepaintObjectCount--;
+    if (d->slowRepaintObjectCount == 0)
+        setStaticBackground(d->useSlowRepaints);
 }
 

trunk/WebCore/page/FrameView.h

@@ -208 +208 @@
     void focusNextPrevNode(bool next);
 
-    void useSlowRepaints();
+    bool useSlowRepaints() const;
+    void setUseSlowRepaints();
+    void addSlowRepaintObject();
+    void removeSlowRepaintObject();
 
     void setIgnoreWheelEvents(bool e);

trunk/WebCore/rendering/RenderBox.cpp

@@ -500 +500 @@
         
         if (isTransparent)
-            view()->frameView()->useSlowRepaints(); // The parent must show behind the child.
+            view()->frameView()->setUseSlowRepaints(); // The parent must show behind the child.
         else
             bgColor = Color::white;

trunk/WebCore/rendering/RenderObject.cpp

@@ -2129 +2129 @@
     }
 
+    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 oldStyleSlowScroll = style && (style->position() == FixedPosition || style->hasFixedBackgroundImage());
+        bool newStyleSlowScroll = m_style && (m_style->position() == FixedPosition || m_style->hasFixedBackgroundImage());
+        if (oldStyleSlowScroll != newStyleSlowScroll) {
+            if (oldStyleSlowScroll)
+                view()->frameView()->removeSlowRepaintObject();
+            if (newStyleSlowScroll)
+                view()->frameView()->addSlowRepaintObject();
+        }
+    }
+
     RenderStyle *oldStyle = m_style;
     m_style = style;

trunk/WebCore/rendering/RenderView.cpp

@@ -189 +189 @@
         RenderLayer* layer = elt->renderer()->enclosingLayer();
         if (layer->isTransparent() || layer->transparentAncestor())
-            frameView()->useSlowRepaints();
+            frameView()->setUseSlowRepaints();
     }
     
@@ -199 +199 @@
     // no background in the child document should show the parent's background.
     if (elt || view()->isTransparent())
-        frameView()->useSlowRepaints(); // The parent must show behind the child.
+        frameView()->setUseSlowRepaints(); // The parent must show behind the child.
     else
         i.p->fillRect(i.r, Color(Color::white));