Changeset 188659 in webkit

Timestamp:

Aug 19, 2015 4:06:03 PM (9 years ago)

Author:

Brent Fulgham

Message:

Scrollable area container is not properly cleared when page is going into the PageCache
​https://bugs.webkit.org/show_bug.cgi?id=148182
<rdar://problem/21969170>

Reviewed by Dean Jackson.

Must be tested manually going back and forth in history several times.

• history/CachedFrame.cpp:

(WebCore::CachedFrame::CachedFrame): Clear the cached ScrollableAreas from the FrameView.

• page/FrameView.cpp:

(WebCore::FrameView::clearScrollableAreas): Added.

• 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 @@
+2015-08-19  Brent Fulgham  <bfulgham@apple.com>
+
+        Scrollable area container is not properly cleared when page is going into the PageCache
+        https://bugs.webkit.org/show_bug.cgi?id=148182
+        <rdar://problem/21969170>
+
+        Reviewed by Dean Jackson.
+
+        Must be tested manually going back and forth in history several times.
+
+        * history/CachedFrame.cpp:
+        (WebCore::CachedFrame::CachedFrame): Clear the cached ScrollableAreas from the FrameView.
+        * page/FrameView.cpp:
+        (WebCore::FrameView::clearScrollableAreas): Added.
+        * page/FrameView.h:
+
 2015-08-19  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/history/CachedFrame.cpp

@@ -178 +178 @@
         frame.view()->clearBackingStores();
 
+    frame.view()->clearScrollableAreas();
+
     // documentWillSuspendForPageCache() can set up a layout timer on the FrameView, so clear timers after that.
     frame.clearTimers();

trunk/Source/WebCore/page/FrameView.cpp

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

trunk/Source/WebCore/page/FrameView.h

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