+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>
[chromium] Update WebSettings to support per-script font settings
ASSERT(page->mainFrame());
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);
#if ENABLE(GESTURE_RECOGNIZER)
webView->resetGestureRecognizer();
#endif
+
+ // Restore the saved fixed layout information.
+ view->setUseFixedLayout(useFixedLayout);
+ view->setFixedLayoutSize(fixedLayoutSize);
}
WebFrameImpl* WebFrameImpl::fromFrame(Frame* frame)