Changeset 68292 in webkit

Timestamp:

Sep 24, 2010 2:54:25 PM (14 years ago)

Author:

luiz@webkit.org

Message:

2010-09-24 Luiz Agostini <​luiz.agostini@openbossa.org>

Reviewed by Kenneth Rohde Christiansen.

Keep viewport information in Document
​https://bugs.webkit.org/show_bug.cgi?id=46385

The viewport meta data (layout viewport, scale) needs to be set again when bringing
back a page from the page cache. As the viewport metadata is only retrieved while parsing
the document, we need to store it in the Document class.

• fast/viewport/viewport-128-expected.txt: Copied from LayoutTests/fast/viewport/viewport-19-expected.txt.
• fast/viewport/viewport-128.html: Added.

2010-09-24 Luiz Agostini <​luiz.agostini@openbossa.org>

Reviewed by Kenneth Rohde Christiansen.

Keep viewport information in Document
​https://bugs.webkit.org/show_bug.cgi?id=46385

The viewport meta data (layout viewport, scale) needs to be set again when bringing
back a page from the page cache. As the viewport metadata is only retrieved while parsing
the document, we need to store it in the Document class.

Test: fast/viewport/viewport-128.html

• WebCore.xcodeproj/project.pbxproj:
• dom/Document.cpp: (WebCore::Document::processViewport): (WebCore::Document::setInPageCache):
• dom/Document.h: (WebCore::Document::viewportArguments):

2010-09-24 Luiz Agostini <​luiz.agostini@openbossa.org>

Reviewed by Kenneth Rohde Christiansen.

Keep viewport information in Document
​https://bugs.webkit.org/show_bug.cgi?id=46385

The viewport meta data (layout viewport, scale) needs to be set again when bringing
back a page from the page cache. As the viewport metadata is only retrieved while parsing
the document, we need to store it in the Document class.

• Api/qwebframe.cpp: (QWebFramePrivate::viewportArguments):
• Api/qwebframe_p.h:
• Api/qwebpage.cpp: (QWebPage::viewportConfigurationForSize):
• WebCoreSupport/ChromeClientQt.cpp: (WebCore::ChromeClientQt::didReceiveViewportArguments):
• WebCoreSupport/DumpRenderTreeSupportQt.cpp: (DumpRenderTreeSupportQt::viewportAsText):
• WebCoreSupport/FrameLoaderClientQt.cpp: (WebCore::FrameLoaderClientQt::dispatchDidCommitLoad):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/viewport/viewport-128-expected.txt (added)
• LayoutTests/fast/viewport/viewport-128.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.xcodeproj/project.pbxproj (modified) (1 diff)
• WebCore/dom/Document.cpp (modified) (3 diffs)
• WebCore/dom/Document.h (modified) (3 diffs)
• WebKit/qt/Api/qwebframe.cpp (modified) (1 diff)
• WebKit/qt/Api/qwebframe_p.h (modified) (2 diffs)
• WebKit/qt/Api/qwebpage.cpp (modified) (1 diff)
• WebKit/qt/ChangeLog (modified) (1 diff)
• WebKit/qt/WebCoreSupport/ChromeClientQt.cpp (modified) (1 diff)
• WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp (modified) (1 diff)
• WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-09-24  Luiz Agostini  <luiz.agostini@openbossa.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Keep viewport information in Document
+        https://bugs.webkit.org/show_bug.cgi?id=46385
+
+        The viewport meta data (layout viewport, scale) needs to be set again when bringing
+        back a page from the page cache. As the viewport metadata is only retrieved while parsing
+        the document, we need to store it in the Document class.
+
+        * fast/viewport/viewport-128-expected.txt: Copied from LayoutTests/fast/viewport/viewport-19-expected.txt.
+        * fast/viewport/viewport-128.html: Added.
+
 2010-09-24  Stephen White  <senorblanco@chromium.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-09-24  Luiz Agostini  <luiz.agostini@openbossa.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Keep viewport information in Document
+        https://bugs.webkit.org/show_bug.cgi?id=46385
+
+        The viewport meta data (layout viewport, scale) needs to be set again when bringing
+        back a page from the page cache. As the viewport metadata is only retrieved while parsing
+        the document, we need to store it in the Document class.
+
+        Test: fast/viewport/viewport-128.html
+
+        * WebCore.xcodeproj/project.pbxproj:
+        * dom/Document.cpp:
+        (WebCore::Document::processViewport):
+        (WebCore::Document::setInPageCache):
+        * dom/Document.h:
+        (WebCore::Document::viewportArguments):
+
 2010-09-24  David Hyatt  <hyatt@apple.com>
 

trunk/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -5173 +5173 @@
                 CEA3949D11D45CDA003094CF /* StaticHashSetNodeList.h in Headers */ = {isa = PBXBuildFile; fileRef = CEA3949B11D45CDA003094CF /* StaticHashSetNodeList.h */; };
                 CEF418CE1179678C009D112C /* ViewportArguments.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEF418CC1179678C009D112C /* ViewportArguments.cpp */; };
-                CEF418CF1179678C009D112C /* ViewportArguments.h in Headers */ = {isa = PBXBuildFile; fileRef = CEF418CD1179678C009D112C /* ViewportArguments.h */; };
+                CEF418CF1179678C009D112C /* ViewportArguments.h in Headers */ = {isa = PBXBuildFile; fileRef = CEF418CD1179678C009D112C /* ViewportArguments.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 D000EBA211BDAFD400C47726 /* FrameLoaderStateMachine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D000EBA011BDAFD400C47726 /* FrameLoaderStateMachine.cpp */; };
                 D000EBA311BDAFD400C47726 /* FrameLoaderStateMachine.h in Headers */ = {isa = PBXBuildFile; fileRef = D000EBA111BDAFD400C47726 /* FrameLoaderStateMachine.h */; settings = {ATTRIBUTES = (Private, ); }; };

trunk/WebCore/dom/Document.cpp

@@ -130 +130 @@
 #include "UIEvent.h"
 #include "UserContentURLPattern.h"
-#include "ViewportArguments.h"
 #include "WebKitAnimationEvent.h"
 #include "WebKitTransitionEvent.h"
@@ -2591 +2590 @@
     ASSERT(!features.isNull());
 
+    m_viewportArguments = ViewportArguments();
+    processArguments(features, (void*)&m_viewportArguments, &setViewportFeature);
+
     Frame* frame = this->frame();
-    if (!frame)
-        return;
-
-    if (frame->page()) {
-        ViewportArguments arguments;
-        processArguments(features, (void*)&arguments, &setViewportFeature);
-
-        frame->page()->chrome()->client()->didReceiveViewportArguments(frame, arguments);
-    }
+    if (!frame || !frame->page())
+        return;
+
+    frame->page()->chrome()->client()->didReceiveViewportArguments(frame, m_viewportArguments);
 }
 
@@ -3816 +3813 @@
         setRenderer(m_savedRenderer);
         m_savedRenderer = 0;
+
+        if (frame() && frame()->page())
+            frame()->page()->chrome()->client()->didReceiveViewportArguments(frame(), m_viewportArguments);
+
         if (childNeedsStyleRecalc())
             scheduleStyleRecalc();

trunk/WebCore/dom/Document.h

@@ -37 +37 @@
 #include "ScriptExecutionContext.h"
 #include "Timer.h"
+#include "ViewportArguments.h"
 #include <wtf/FixedArray.h>
 #include <wtf/HashCountedSet.h>
@@ -277 +278 @@
 #endif
 
+    ViewportArguments viewportArguments() const { return m_viewportArguments; }
+
     DocumentType* doctype() const { return m_docType.get(); }
 
@@ -1315 +1318 @@
 
     int m_loadEventDelayCount;
+
+    ViewportArguments m_viewportArguments;
 };
 

trunk/WebKit/qt/Api/qwebframe.cpp

@@ -231 +231 @@
 }
 
+WebCore::ViewportArguments QWebFramePrivate::viewportArguments()
+{
+    if (!frame || !frame->document())
+        return WebCore::ViewportArguments();
+
+    return frame->document()->viewportArguments();
+}
+
 void QWebFramePrivate::setPage(QWebPage* newPage)
 {

trunk/WebKit/qt/Api/qwebframe_p.h

@@ -91 +91 @@
 #endif
 
+    WebCore::ViewportArguments viewportArguments();
+
     QWebFrame *q;
     Qt::ScrollBarPolicy horizontalScrollBarPolicy;
@@ -102 +104 @@
     int marginHeight;
     bool zoomTextOnly;
-    WebCore::ViewportArguments viewportArguments;
 };
 

trunk/WebKit/qt/Api/qwebpage.cpp

@@ -2349 +2349 @@
     int deviceHeight = rect.height();
 
-    WebCore::ViewportConfiguration conf = WebCore::findConfigurationForViewportData(mainFrame()->d->viewportArguments, desktopWidth, deviceWidth, deviceHeight, deviceDPI, availableSize);
+    WebCore::ViewportConfiguration conf = WebCore::findConfigurationForViewportData(mainFrame()->d->viewportArguments(), desktopWidth, deviceWidth, deviceHeight, deviceDPI, availableSize);
 
     ViewportConfiguration result;

trunk/WebKit/qt/ChangeLog

@@ +1 @@
+2010-09-24  Luiz Agostini  <luiz.agostini@openbossa.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Keep viewport information in Document
+        https://bugs.webkit.org/show_bug.cgi?id=46385
+
+        The viewport meta data (layout viewport, scale) needs to be set again when bringing
+        back a page from the page cache. As the viewport metadata is only retrieved while parsing
+        the document, we need to store it in the Document class.
+
+        * Api/qwebframe.cpp:
+        (QWebFramePrivate::viewportArguments):
+        * Api/qwebframe_p.h:
+        * Api/qwebpage.cpp:
+        (QWebPage::viewportConfigurationForSize):
+        * WebCoreSupport/ChromeClientQt.cpp:
+        (WebCore::ChromeClientQt::didReceiveViewportArguments):
+        * WebCoreSupport/DumpRenderTreeSupportQt.cpp:
+        (DumpRenderTreeSupportQt::viewportAsText):
+        * WebCoreSupport/FrameLoaderClientQt.cpp:
+        (WebCore::FrameLoaderClientQt::dispatchDidCommitLoad):
+
 2010-09-23  Ademar de Souza Reis Jr  <ademar.reis@openbossa.org>
 

trunk/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp

@@ -645 +645 @@
 void ChromeClientQt::didReceiveViewportArguments(Frame* frame, const ViewportArguments& arguments) const
 {
-    m_webPage->mainFrame()->d->viewportArguments = arguments;
-
     emit m_webPage->viewportChangeRequested();
 }

trunk/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp

@@ -632 +632 @@
 QString DumpRenderTreeSupportQt::viewportAsText(QWebPage* page, const QSize& availableSize)
 {
-    WebCore::ViewportArguments args = page->mainFrame()->d->viewportArguments;
+    WebCore::ViewportArguments args = page->mainFrame()->d->viewportArguments();
     WebCore::ViewportConfiguration conf = WebCore::findConfigurationForViewportData(args,
         /* desktop-width */ 980,

trunk/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp

@@ -443 +443 @@
         return;
 
-    // Clear the viewport arguments.
-    m_webFrame->d->viewportArguments = WebCore::ViewportArguments();
-
     emit m_webFrame->urlChanged(m_webFrame->url());
     m_webFrame->page()->d->updateNavigationActions();