Changeset 196641 in webkit

Timestamp:

Feb 16, 2016 10:48:36 AM (8 years ago)

Author:

Simon Fraser

Message:

Rollout r188659. This broke scrolling of iframes and overflow when
navigating back to a page in the page cache.

The fix was overly agressive and had no layout test. I will fix the original
issue a different way.

• history/CachedFrame.cpp:

(WebCore::CachedFrame::CachedFrame):

• page/FrameView.cpp:

(WebCore::FrameView::clearScrollableAreas): Deleted.

• page/FrameView.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• history/CachedFrame.cpp (modified) (1 diff)
• page/FrameView.cpp (modified) (1 diff)
• page/FrameView.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-02-16  Simon Fraser  <simon.fraser@apple.com>
+
+        Rollout r188659. This broke scrolling of iframes and overflow when
+        navigating back to a page in the page cache.
+        
+        The fix was overly agressive and had no layout test. I will fix the original
+        issue a different way.
+
+        * history/CachedFrame.cpp:
+        (WebCore::CachedFrame::CachedFrame):
+        * page/FrameView.cpp:
+        (WebCore::FrameView::clearScrollableAreas): Deleted.
+        * page/FrameView.h:
+
 2016-02-16  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebCore/history/CachedFrame.cpp

@@ -172 +172 @@
         frame.view()->clearBackingStores();
 
-    frame.view()->clearScrollableAreas();
+    // documentWillSuspendForPageCache() can set up a layout timer on the FrameView, so clear timers after that.
+    frame.clearTimers();
 
     // Deconstruct the FrameTree, to restore it later.

trunk/Source/WebCore/page/FrameView.cpp

@@ -4524 +4524 @@
 }
 
-void FrameView::clearScrollableAreas()
-{
-    if (m_scrollableAreas)
-        m_scrollableAreas->clear();
-}
-
 void FrameView::scrollableAreaSetChanged()
 {

trunk/Source/WebCore/page/FrameView.h

@@ -457 +457 @@
     bool containsScrollableArea(ScrollableArea*) const;
     const ScrollableAreaSet* scrollableAreas() const { return m_scrollableAreas.get(); }
-    void clearScrollableAreas();
 
     virtual void removeChild(Widget&) override;