Changeset 21329 in webkit

Timestamp:

May 9, 2007 12:52:41 AM (17 years ago)

Author:

bdash

Message:

2007-05-09 Mitz Pettel <​mitz@webkit.org>

Reviewed by Dave Hyatt.

• fix ​http://bugs.webkit.org/show_bug.cgi?id=13037 REGRESSION: Copy-on-scroll not reset properly after back/forward navigation

• page/FrameView.cpp: (WebCore::FrameViewPrivate::FrameViewPrivate): Moved initialization of m_slowRepaintObjectCount here. (WebCore::FrameViewPrivate::reset): Do not reset the slow repaint object count here. (WebCore::FrameView::useSlowRepaints): (WebCore::FrameView::addSlowRepaintObject): (WebCore::FrameView::removeSlowRepaintObject): Added an assertion that the object count is positive.
• rendering/RenderObject.cpp: (WebCore::RenderObject::setStyle): Corrected a mix up between old and new style, which caused the object count to be decremented when it was supposed to be incremented and vice versa.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/FrameView.cpp (modified) (5 diffs)
• rendering/RenderObject.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-05-09  Mitz Pettel  <mitz@webkit.org>
+
+        Reviewed by Dave Hyatt.
+
+        - fix http://bugs.webkit.org/show_bug.cgi?id=13037
+          REGRESSION: Copy-on-scroll not reset properly after back/forward navigation
+
+        * page/FrameView.cpp:
+        (WebCore::FrameViewPrivate::FrameViewPrivate): Moved initialization of
+        m_slowRepaintObjectCount here.
+        (WebCore::FrameViewPrivate::reset): Do not reset the slow repaint object
+        count here.
+        (WebCore::FrameView::useSlowRepaints):
+        (WebCore::FrameView::addSlowRepaintObject):
+        (WebCore::FrameView::removeSlowRepaintObject): Added an assertion that the
+        object count is positive.
+        * rendering/RenderObject.cpp:
+        (WebCore::RenderObject::setStyle): Corrected a mix up between old and new
+        style, which caused the object count to be decremented when it was supposed
+        to be incremented and vice versa.
+
 2007-05-09  Peter Müller <pm@one.com>
 

trunk/WebCore/page/FrameView.cpp

@@ -55 +55 @@
 public:
     FrameViewPrivate(FrameView* view)
-        : layoutTimer(view, &FrameView::layoutTimerFired)
+        : m_slowRepaintObjectCount(0)
+        , layoutTimer(view, &FrameView::layoutTimerFired)
         , m_mediaType("screen")
         , m_enqueueEvents(0)
@@ -70 +71 @@
     {
         useSlowRepaints = false;
-        slowRepaintObjectCount = 0;
         borderX = 30;
         borderY = 30;
@@ -88 +88 @@
     ScrollbarMode hmode;
     bool useSlowRepaints;
-    unsigned slowRepaintObjectCount;
+    unsigned m_slowRepaintObjectCount;
 
     int borderX, borderY;
@@ -550 +550 @@
 bool FrameView::useSlowRepaints() const
 {
-    return d->useSlowRepaints || d->slowRepaintObjectCount > 0;
+    return d->useSlowRepaints || d->m_slowRepaintObjectCount > 0;
 }
 
@@ -561 +561 @@
 void FrameView::addSlowRepaintObject()
 {
-    if (d->slowRepaintObjectCount == 0)
+    if (!d->m_slowRepaintObjectCount)
         setStaticBackground(true);
-    d->slowRepaintObjectCount++;
+    d->m_slowRepaintObjectCount++;
 }
 
 void FrameView::removeSlowRepaintObject()
 {
-    d->slowRepaintObjectCount--;
-    if (d->slowRepaintObjectCount == 0)
+    ASSERT(d->m_slowRepaintObjectCount > 0);
+    d->m_slowRepaintObjectCount--;
+    if (!d->m_slowRepaintObjectCount)
         setStaticBackground(d->useSlowRepaints);
 }

trunk/WebCore/rendering/RenderObject.cpp

@@ -2256 +2256 @@
         // 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());
+        bool newStyleSlowScroll = style && (style->position() == FixedPosition || style->hasFixedBackgroundImage());
+        bool oldStyleSlowScroll = m_style && (m_style->position() == FixedPosition || m_style->hasFixedBackgroundImage());
         if (oldStyleSlowScroll != newStyleSlowScroll) {
             if (oldStyleSlowScroll)