Changeset 107135 in webkit

Timestamp:

Feb 8, 2012 2:44:00 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

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

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

Patch by Zalan Bujtas <​zbujtas@gmail.com> 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):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Document.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-02-08  Zalan Bujtas  <zbujtas@gmail.com>
+
+        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  <shawnsingh@chromium.org>
 

trunk/Source/WebCore/dom/Document.cpp

@@ -4086 +4086 @@
         m_savedRenderer = 0;
 
-        updateViewportArguments();
-
         if (childNeedsStyleRecalc())
             scheduleStyleRecalc();
@@ -4128 +4126 @@
     ASSERT(m_frame);
     m_frame->loader()->client()->dispatchDidBecomeFrameset(isFrameSet());
+
+    updateViewportArguments();
 }