Changeset 97462 in webkit

Timestamp:

Oct 14, 2011 7:09:43 AM (13 years ago)

Author:

kenneth@webkit.org

Message:

Do not cache m_resizesToContentsLayoutSize on WebKit2's WebPage
​https://bugs.webkit.org/show_bug.cgi?id=66134

Reviewed by Simon Hausmann.

Do the resize to contents on the web process side.

Based on patch by Zalan Bujtas.

• WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:

(WebKit::WebFrameLoaderClient::transitionToCommittedForNewPage):

• WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::setSize):
(WebKit::WebPage::setResizesToContentsUsingLayoutSize):
(WebKit::WebPage::resizeToContentsIfNeeded):

• WebProcess/WebPage/WebPage.h:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (modified) (1 diff)
• WebProcess/WebPage/WebPage.cpp (modified) (3 diffs)
• WebProcess/WebPage/WebPage.h (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-10-14  Kenneth Rohde Christiansen  <kenneth@webkit.org>
+
+        Do not cache m_resizesToContentsLayoutSize on WebKit2's WebPage
+        https://bugs.webkit.org/show_bug.cgi?id=66134
+
+        Reviewed by Simon Hausmann.
+
+        Do the resize to contents on the web process side.
+
+        Based on patch by Zalan Bujtas.
+
+        * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+        (WebKit::WebFrameLoaderClient::transitionToCommittedForNewPage):
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::setSize):
+        (WebKit::WebPage::setResizesToContentsUsingLayoutSize):
+        (WebKit::WebPage::resizeToContentsIfNeeded):
+        * WebProcess/WebPage/WebPage.h:
+
 2011-10-14  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp

@@ -1114 +1114 @@
     WebPage* webPage = m_frame->page();
     Color backgroundColor = webPage->drawsTransparentBackground() ? Color::transparent : Color::white;
+    FrameView* view = m_frame->coreFrame()->view();
 
     bool isMainFrame = webPage->mainWebFrame() == m_frame;
 
 #if ENABLE(TILED_BACKING_STORE)
-    IntSize currentVisibleContentSize = m_frame->coreFrame()->view() ? m_frame->coreFrame()->view()->visibleContentRect().size() : IntSize();
-    m_frame->coreFrame()->createView(webPage->size(), backgroundColor, false, webPage->resizesToContentsLayoutSize(), isMainFrame && webPage->resizesToContentsEnabled());
-
-    if (isMainFrame && webPage->resizesToContentsEnabled()) {
+    IntSize currentVisibleContentSize;
+    IntSize fixedLayoutSize;
+
+    if (view) {
+        currentVisibleContentSize = view->visibleContentRect().size();
+        fixedLayoutSize = view->fixedLayoutSize();
+    }
+
+    m_frame->coreFrame()->createView(webPage->size(), backgroundColor, false, fixedLayoutSize, !fixedLayoutSize.isEmpty());
+
+    if (isMainFrame && !fixedLayoutSize.isEmpty()) {
         m_frame->coreFrame()->view()->setDelegatesScrolling(true);
         m_frame->coreFrame()->view()->setPaintsEntireContents(true);

trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp

@@ -666 +666 @@
 void WebPage::setSize(const WebCore::IntSize& viewSize)
 {
+    FrameView* view = m_page->mainFrame()->view();
+
 #if ENABLE(TILED_BACKING_STORE)
     // If we are resizing to content ignore external attempts.
-    if (!m_resizesToContentsLayoutSize.isEmpty())
+    if (view->useFixedLayout())
         return;
 #endif
@@ -675 +677 @@
         return;
 
-    Frame* frame = m_page->mainFrame();
-    
-    frame->view()->resize(viewSize);
-    frame->view()->setNeedsLayout();
+    view->resize(viewSize);
+    view->setNeedsLayout();
     m_drawingArea->setNeedsDisplay(IntRect(IntPoint(0, 0), viewSize));
     
@@ -694 +694 @@
 void WebPage::setResizesToContentsUsingLayoutSize(const IntSize& targetLayoutSize)
 {
-    if (m_resizesToContentsLayoutSize == targetLayoutSize)
-        return;
-
-    m_resizesToContentsLayoutSize = targetLayoutSize;
-
-    Frame* frame = m_page->mainFrame();
-    if (m_resizesToContentsLayoutSize.isEmpty()) {
-        frame->view()->setDelegatesScrolling(false);
-        frame->view()->setUseFixedLayout(false);
-        frame->view()->setPaintsEntireContents(false);
-    } else {
-        frame->view()->setDelegatesScrolling(true);
-        frame->view()->setUseFixedLayout(true);
-        frame->view()->setPaintsEntireContents(true);
-        frame->view()->setFixedLayoutSize(m_resizesToContentsLayoutSize);
-    }
-    frame->view()->forceLayout();
+    FrameView* view = m_page->mainFrame()->view();
+
+    if (view->fixedLayoutSize() == targetLayoutSize)
+        return;
+
+    bool fixedLayout = !targetLayoutSize.isEmpty();
+
+    if (fixedLayout)
+        view->setFixedLayoutSize(targetLayoutSize);
+
+    // Set view attributes based on whether fixed layout is used.
+    view->setDelegatesScrolling(fixedLayout);
+    view->setUseFixedLayout(fixedLayout);
+    view->setPaintsEntireContents(fixedLayout);
+
+    // Schedule a layout to use the new target size.
+    if (!view->layoutPending()) {
+        view->setNeedsLayout();
+        view->scheduleRelayout();
+    }
 }
 
 void WebPage::resizeToContentsIfNeeded()
 {
-    if (m_resizesToContentsLayoutSize.isEmpty())
-        return;
-
-    Frame* frame = m_page->mainFrame();
-
-    IntSize contentSize = frame->view()->contentsSize();
+    FrameView* view = m_page->mainFrame()->view();
+
+    if (!view->useFixedLayout())
+        return;
+
+    IntSize contentSize = view->contentsSize();
     if (contentSize == m_viewSize)
         return;
 
     m_viewSize = contentSize;
-    frame->view()->resize(m_viewSize);
-    frame->view()->setNeedsLayout();
+    view->resize(m_viewSize);
+    view->setNeedsLayout();
 }
 #endif

trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h

@@ -309 +309 @@
     void pageDidRequestScroll(const WebCore::IntPoint&);
     void setFixedVisibleContentRect(const WebCore::IntRect&);
-
-    bool resizesToContentsEnabled() const { return !m_resizesToContentsLayoutSize.isEmpty(); }
-    WebCore::IntSize resizesToContentsLayoutSize() const { return m_resizesToContentsLayoutSize; }
     void setResizesToContentsUsingLayoutSize(const WebCore::IntSize& targetLayoutSize);
     void resizeToContentsIfNeeded();