Changeset 82185 in webkit

Timestamp:

Mar 28, 2011 7:39:33 PM (13 years ago)

Author:

Beth Dakin

Message:

Fix for ​https://bugs.webkit.org/show_bug.cgi?id=57286 Alternative fix for:
Horizontal scroller stops appearing after going Forward
-and corresponding-
<rdar://problem/9026946>

Reviewed by Darin Adler.

This patch rolls out revision 79053 and fixes the same bug in a better way.

New function resetScrollbarsAndClearContentsSize() calls resetScrollbars() and then
sets the contents size to 0. This is called when a document is going into the page
cache.

• dom/Document.cpp:

(WebCore::Document::setInPageCache):
(WebCore::FrameView::resetScrollbarsAndClearContentsSize):

Roll-out of 79053.

• history/CachedFrame.cpp:

(WebCore::CachedFrameBase::restore):

• page/FrameView.cpp:

(WebCore::FrameView::FrameView):
(WebCore::FrameView::reset):
(WebCore::FrameView::layout):

• page/FrameView.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Document.cpp (modified) (1 diff)
• history/CachedFrame.cpp (modified) (1 diff)
• page/FrameView.cpp (modified) (4 diffs)
• page/FrameView.h (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-03-28  Beth Dakin  <bdakin@apple.com>
+
+        Reviewed by Darin Adler.
+
+        Fix for https://bugs.webkit.org/show_bug.cgi?id=57286 Alternative fix for: 
+        Horizontal scroller stops appearing after going Forward
+        -and corresponding-
+        <rdar://problem/9026946>
+
+        This patch rolls out revision 79053 and fixes the same bug in a  better way.
+
+        New function resetScrollbarsAndClearContentsSize() calls resetScrollbars() and then 
+        sets the contents size to 0. This is called when a document is going into the page 
+        cache.
+        * dom/Document.cpp:
+        (WebCore::Document::setInPageCache):
+        (WebCore::FrameView::resetScrollbarsAndClearContentsSize):
+
+        Roll-out of 79053.
+        * history/CachedFrame.cpp:
+        (WebCore::CachedFrameBase::restore):
+        * page/FrameView.cpp:
+        (WebCore::FrameView::FrameView):
+        (WebCore::FrameView::reset):
+        (WebCore::FrameView::layout):
+        * page/FrameView.h:
+
 2011-03-28  Ojan Vafai  <ojan@chromium.org>
 

trunk/Source/WebCore/dom/Document.cpp

@@ -3945 +3945 @@
         m_savedRenderer = renderer();
         if (FrameView* v = view())
-            v->resetScrollbars();
+            v->resetScrollbarsAndClearContentsSize();
         m_styleRecalcTimer.stop();
     } else {

trunk/Source/WebCore/history/CachedFrame.cpp

@@ -84 +84 @@
     ASSERT(m_document->view() == m_view);
 
-    m_view->setIsRestoringFromBackForward(true);
-
     Frame* frame = m_view->frame();
     m_cachedFrameScriptData->restore(frame);

trunk/Source/WebCore/page/FrameView.cpp

@@ -133 +133 @@
     , m_deferSetNeedsLayouts(0)
     , m_setNeedsLayoutWasDeferred(false)
-    , m_isRestoringFromBackForward(false)
     , m_scrollCorner(0)
 {
@@ -228 +227 @@
     m_isVisuallyNonEmpty = false;
     m_firstVisuallyNonEmptyLayoutCallbackPending = true;
-    m_isRestoringFromBackForward = false;
     m_maintainScrollPositionAnchor = 0;
 }
@@ -251 +249 @@
     else
         setScrollbarModes(ScrollbarAlwaysOff, ScrollbarAlwaysOff);
+    setScrollbarsSuppressed(false);
+}
+
+void FrameView::resetScrollbarsAndClearContentsSize()
+{
+    resetScrollbars();
+
+    setScrollbarsSuppressed(true);
+    setContentsSize(IntSize());
     setScrollbarsSuppressed(false);
 }
@@ -848 +855 @@
         if (m_firstLayout || (hMode != currentHMode || vMode != currentVMode)) {
             if (m_firstLayout) {
-                if (!m_isRestoringFromBackForward)
-                    setScrollbarsSuppressed(true);
-                else {
-                    setScrollbarsSuppressed(false);
-                    m_isRestoringFromBackForward = false;
-                }
+                setScrollbarsSuppressed(true);
 
                 m_firstLayout = false;

trunk/Source/WebCore/page/FrameView.h

@@ -132 +132 @@
 
     void resetScrollbars();
+    void resetScrollbarsAndClearContentsSize();
     void detachCustomScrollbars();
 
@@ -269 +270 @@
     void flushAnyPendingPostLayoutTasks();
 
-    void setIsRestoringFromBackForward(bool isRestoring) { m_isRestoringFromBackForward = isRestoring; }
-    bool isRestoringFromBackForward() const { return m_isRestoringFromBackForward; }
-
     virtual bool shouldSuspendScrollAnimations() const;
 
@@ -416 +414 @@
     bool m_firstVisuallyNonEmptyLayoutCallbackPending;
 
-    bool m_isRestoringFromBackForward;
-
     RefPtr<Node> m_maintainScrollPositionAnchor;