Changeset 93622 in webkit

Timestamp:

Aug 23, 2011 12:21:05 PM (13 years ago)

Author:

fsamuel@chromium.org

Message:

New MainFrame views should inherit fixed layout settings from existing MainFrame view in Chromium.
​https://bugs.webkit.org/show_bug.cgi?id=66780

Fixed layout mode is set from WebViewImpl, but new main FrameViews are created on loading new pages. The new page's FrameView should get its
fixed layout settings from the current page.

Reviewed by Darin Fisher.

• src/WebFrameImpl.cpp:

(WebKit::WebFrameImpl::createFrameView):

Location:

trunk/Source/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• src/WebFrameImpl.cpp (modified) (2 diffs)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2011-08-23  Fady Samuel  <fsamuel@chromium.org>
+
+        New MainFrame views should inherit fixed layout settings from existing MainFrame view in Chromium.
+        https://bugs.webkit.org/show_bug.cgi?id=66780
+
+        Fixed layout mode is set from WebViewImpl, but new main FrameViews are created on loading new pages. The new page's FrameView should get its
+        fixed layout settings from the current page.
+
+        Reviewed by Darin Fisher.
+
+        * src/WebFrameImpl.cpp:
+        (WebKit::WebFrameImpl::createFrameView):
+
 2011-08-23  Matt Falkenhagen  <falken@chromium.org>
 

trunk/Source/WebKit/chromium/src/WebFrameImpl.cpp

@@ -1980 +1980 @@
 
     bool isMainFrame = m_frame == page->mainFrame();
-    if (isMainFrame && m_frame->view())
+    bool useFixedLayout = false;
+    IntSize fixedLayoutSize;
+    if (isMainFrame && m_frame->view()) {
         m_frame->view()->setParentVisible(false);
+        // Save the fixed layout information before destroying the
+        // existing FrameView of this frame.
+        useFixedLayout = m_frame->view()->useFixedLayout();
+        fixedLayoutSize = m_frame->view()->fixedLayoutSize();
+    }
 
     m_frame->setView(0);
@@ -2012 +2019 @@
     webView->resetGestureRecognizer();
 #endif
+
+    // Restore the saved fixed layout information.
+    view->setUseFixedLayout(useFixedLayout);
+    view->setFixedLayoutSize(fixedLayoutSize);
 }