Changeset 93669 in webkit

Timestamp:

Aug 23, 2011 5:29:27 PM (13 years ago)

Author:

Beth Dakin

Message:

​https://bugs.webkit.org/show_bug.cgi?id=66244
Cached pages don't fully update when going back after changing the display scale
factor
-and corresponding-
<rdar://problem/9955656>

Reviewed by Darin Adler.

This patch adds a generalized concept of needing a full style recalc to the
BackForwardController. So when the display scale factor is changed, the
BackForwardController can be informed that all pages will need a full style recalc
when they come out of the cache. This same mechanism is also used to fix a long-
standing bug with full-page/text zoom.

Iterate through the HistoryItems and mark all CachedPages as needing a full style
recalc.

• history/BackForwardController.cpp:

(WebCore::BackForwardController::markPagesForFullStyleRecalc):

• history/BackForwardController.h:

ChachedPage has a new bool -- m_needsFullStyleRecalc -- to track whether a full
style recalc is needed when the CachedPage is restored.

• history/CachedPage.cpp:

(WebCore::CachedPage::CachedPage):
(WebCore::CachedPage::restore):
(WebCore::CachedPage::clear):

• history/CachedPage.h:

(WebCore::CachedPage::markForFullStyleRecalc):

HistoryItem actually takes care of calling into CachedPage.

• history/HistoryItem.cpp:

(WebCore::HistoryItem::markForFullStyleRecalc):

• history/HistoryItem.h:

Fix style recalc issues for full-page/text zoom by calling our new function on
PageCache.

• page/Frame.cpp:

(WebCore::Frame::setPageAndTextZoomFactors):

Fix style recalc issues for display scale factor changes by calling our new
function on PageCache.

• page/Page.cpp:

(WebCore::Page::setDeviceScaleFactor):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• history/BackForwardController.cpp (modified) (1 diff)
• history/BackForwardController.h (modified) (1 diff)
• history/CachedPage.cpp (modified) (3 diffs)
• history/CachedPage.h (modified) (2 diffs)
• history/HistoryItem.cpp (modified) (1 diff)
• history/HistoryItem.h (modified) (1 diff)
• page/Frame.cpp (modified) (2 diffs)
• page/Page.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-08-23  Beth Dakin  <bdakin@apple.com>
+
+        https://bugs.webkit.org/show_bug.cgi?id=66244
+        Cached pages don't fully update when going back after changing the display scale 
+        factor
+        -and corresponding-
+        <rdar://problem/9955656>
+
+        Reviewed by Darin Adler.
+
+        This patch adds a generalized concept of needing a full style recalc to the 
+        BackForwardController. So when the display scale factor is changed, the 
+        BackForwardController can be informed that all pages will need a full style recalc 
+        when they come out of the cache. This same mechanism is also used to fix a long-
+        standing bug with full-page/text zoom.
+
+        Iterate through the HistoryItems and mark all CachedPages as needing a full style 
+        recalc.
+        * history/BackForwardController.cpp:
+        (WebCore::BackForwardController::markPagesForFullStyleRecalc):
+        * history/BackForwardController.h:
+
+        ChachedPage has a new bool -- m_needsFullStyleRecalc -- to track whether a full 
+        style recalc is needed when the CachedPage is restored.
+        * history/CachedPage.cpp:
+        (WebCore::CachedPage::CachedPage):
+        (WebCore::CachedPage::restore):
+        (WebCore::CachedPage::clear):
+        * history/CachedPage.h:
+        (WebCore::CachedPage::markForFullStyleRecalc):
+
+        HistoryItem actually takes care of calling into CachedPage.
+        * history/HistoryItem.cpp:
+        (WebCore::HistoryItem::markForFullStyleRecalc):
+        * history/HistoryItem.h:
+
+        Fix style recalc issues for full-page/text zoom by calling our new function on 
+        PageCache.
+        * page/Frame.cpp:
+        (WebCore::Frame::setPageAndTextZoomFactors):
+
+        Fix style recalc issues for display scale factor changes by calling our new 
+        function on PageCache.
+        * page/Page.cpp:
+        (WebCore::Page::setDeviceScaleFactor):
+
 2011-08-23  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebCore/history/BackForwardController.cpp

@@ -105 +105 @@
 }
 
+void BackForwardController::markPagesForFullStyleRecalc()
+{
+    int first = -backCount();
+    int last = forwardCount();
+    for (int i = first; i <= last; i++) {
+        if (!i)
+            continue;
+        itemAtIndex(i)->markForFullStyleRecalc();
+    }
+}
+
 } // namespace WebCore

trunk/Source/WebCore/history/BackForwardController.h

@@ -68 +68 @@
     HistoryItem* forwardItem() { return itemAtIndex(1); }
 
+    void markPagesForFullStyleRecalc();
+
 private:
     Page* m_page;

trunk/Source/WebCore/history/CachedPage.cpp

@@ -55 +55 @@
     , m_cachedMainFrame(CachedFrame::create(page->mainFrame()))
     , m_needStyleRecalcForVisitedLinks(false)
+    , m_needsFullStyleRecalc(false)
 {
 #ifndef NDEBUG
@@ -94 +95 @@
     }
 
+    if (m_needsFullStyleRecalc)
+        page->setNeedsRecalcStyleInAllFrames();
+
     clear();
 }
@@ -103 +107 @@
     m_cachedMainFrame = 0;
     m_needStyleRecalcForVisitedLinks = false;
+    m_needsFullStyleRecalc = false;
 }
 

trunk/Source/WebCore/history/CachedPage.h

@@ -52 +52 @@
 
     void markForVistedLinkStyleRecalc() { m_needStyleRecalcForVisitedLinks = true; }
+    void markForFullStyleRecalc() { m_needsFullStyleRecalc = true; }
 
 private:
@@ -59 +60 @@
     RefPtr<CachedFrame> m_cachedMainFrame;
     bool m_needStyleRecalcForVisitedLinks;
+    bool m_needsFullStyleRecalc;
 };
 

trunk/Source/WebCore/history/HistoryItem.cpp

@@ -846 +846 @@
 }
 
+void HistoryItem::markForFullStyleRecalc()
+{
+    // Children are guaranteed not to have CachedPages.
+    if (m_cachedPage)
+        m_cachedPage->markForFullStyleRecalc();
+}
+
 #ifndef NDEBUG
 

trunk/Source/WebCore/history/HistoryItem.h

@@ -208 +208 @@
     const Vector<int>& weeklyVisitCounts() const { return m_weeklyVisitCounts; }
 
+    void markForFullStyleRecalc();
+
 private:
     HistoryItem();

trunk/Source/WebCore/page/Frame.cpp

@@ -31 +31 @@
 
 #include "ApplyStyleCommand.h"
+#include "BackForwardController.h"
 #include "CSSComputedStyleDeclaration.h"
 #include "CSSMutableStyleDeclaration.h"
@@ -1070 +1071 @@
             view->layout();
     }
+
+    if (page->mainFrame() == this)
+        page->backForward()->markPagesForFullStyleRecalc();
 }
 

trunk/Source/WebCore/page/Page.cpp

@@ -597 +597 @@
     m_mainFrame->deviceOrPageScaleFactorChanged();
 #endif
+
+    backForward()->markPagesForFullStyleRecalc();
 }