Title: [107135] trunk/Source/WebCore
Revision
107135
Author
[email protected]
Date
2012-02-08 14:44:00 -0800 (Wed, 08 Feb 2012)

Log Message

Dispatch updateViewportArguments(), when Document is finished
restoring from page cache.

https://bugs.webkit.org/show_bug.cgi?id=77943

Patch by Zalan Bujtas <[email protected]> on 2012-02-08
Reviewed by Kenneth Rohde Christiansen.

Move updateViewportArguments() call from setPageInCache() to
documentDidResumeFromPageCache() to ensure, that the Document is
fully resumed from the page cache and attached to the mainframe,
when the viewport arguments are updated.

No tests. No change in behaviour.

* dom/Document.cpp:
(WebCore::Document::setInPageCache):
(WebCore::Document::documentDidResumeFromPageCache):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (107134 => 107135)


--- trunk/Source/WebCore/ChangeLog	2012-02-08 22:38:24 UTC (rev 107134)
+++ trunk/Source/WebCore/ChangeLog	2012-02-08 22:44:00 UTC (rev 107135)
@@ -1,3 +1,23 @@
+2012-02-08  Zalan Bujtas  <[email protected]>
+
+        Dispatch updateViewportArguments(), when Document is finished
+        restoring from page cache.
+
+        https://bugs.webkit.org/show_bug.cgi?id=77943
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Move updateViewportArguments() call from setPageInCache() to
+        documentDidResumeFromPageCache() to ensure, that the Document is
+        fully resumed from the page cache and attached to the mainframe,
+        when the viewport arguments are updated.
+
+        No tests. No change in behaviour.
+
+        * dom/Document.cpp:
+        (WebCore::Document::setInPageCache):
+        (WebCore::Document::documentDidResumeFromPageCache):
+
 2012-02-08  Shawn Singh  <[email protected]>
 
         [chromium] Remove incorrect early exit in CCDamageTracker

Modified: trunk/Source/WebCore/dom/Document.cpp (107134 => 107135)


--- trunk/Source/WebCore/dom/Document.cpp	2012-02-08 22:38:24 UTC (rev 107134)
+++ trunk/Source/WebCore/dom/Document.cpp	2012-02-08 22:44:00 UTC (rev 107135)
@@ -4085,8 +4085,6 @@
         setRenderer(m_savedRenderer);
         m_savedRenderer = 0;
 
-        updateViewportArguments();
-
         if (childNeedsStyleRecalc())
             scheduleStyleRecalc();
     }
@@ -4127,6 +4125,8 @@
 
     ASSERT(m_frame);
     m_frame->loader()->client()->dispatchDidBecomeFrameset(isFrameSet());
+
+    updateViewportArguments();
 }
 
 void Document::registerForPageCacheSuspensionCallbacks(Element* e)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to