Changeset 110076 in webkit

Timestamp:

Mar 7, 2012 11:23:44 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[BlackBerry] WebKit rendering problem when show/hide VKB
​https://bugs.webkit.org/show_bug.cgi?id=80448
RIM PR: 141727

Patch by Jacky Jiang <​zhajiang@rim.com> on 2012-03-07
Reviewed by Antonio Gomes.

When setting viewport size, layout happens inside
WebPagePrivate::setDefaultLayoutSize(), in this way, the layout is
outside of the code path of "needsLayout" so that the contents are
not rendered into the backing store. This is a regression of r108718,
switch back to do the layout inside the public API
WebPage::setDefaultLayoutSize().

We haven't upstreamed the manual tests directory yet, therefore,
the new manual test case will be upstreamed later.

• Api/WebPage.cpp:

(BlackBerry::WebKit::WebPagePrivate::setDefaultLayoutSize):
(BlackBerry::WebKit::WebPage::setDefaultLayoutSize):

Location:

trunk/Source/WebKit/blackberry

Files:

• Api/WebPage.cpp (modified) (1 diff)
• ChangeLog (modified) (1 diff)

trunk/Source/WebKit/blackberry/Api/WebPage.cpp

@@ -3379 +3379 @@
 void WebPagePrivate::setDefaultLayoutSize(const IntSize& size)
 {
-    if (size == m_defaultLayoutSize)
-        return;
-
     IntSize screenSize = Platform::Graphics::Screen::primaryScreen()->size();
     ASSERT(size.width() <= screenSize.width() && size.height() <= screenSize.height());
     m_defaultLayoutSize = size.expandedTo(minimumLayoutSize).shrunkTo(screenSize);
-
-    bool needsLayout = setViewMode(viewMode());
+}
+
+void WebPage::setDefaultLayoutSize(int width, int height)
+{
+    IntSize size(width, height);
+    if (size == d->m_defaultLayoutSize)
+        return;
+
+    d->setDefaultLayoutSize(size);
+    bool needsLayout = d->setViewMode(d->viewMode());
     if (needsLayout) {
-        setNeedsLayout();
-        if (!isLoading())
-            requestLayoutIfNeeded();
-    }
-}
-
-void WebPage::setDefaultLayoutSize(int width, int height)
-{
-    IntSize size(width, height);
-    d->setDefaultLayoutSize(size);
+        d->setNeedsLayout();
+        if (!d->isLoading())
+            d->requestLayoutIfNeeded();
+    }
 }
 

trunk/Source/WebKit/blackberry/ChangeLog

@@ +1 @@
+2012-03-07  Jacky Jiang  <zhajiang@rim.com>
+
+        [BlackBerry] WebKit rendering problem when show/hide VKB
+        https://bugs.webkit.org/show_bug.cgi?id=80448
+        RIM PR: 141727
+
+        Reviewed by Antonio Gomes.
+
+        When setting viewport size, layout happens inside
+        WebPagePrivate::setDefaultLayoutSize(), in this way, the layout is
+        outside of the code path of "needsLayout" so that the contents are
+        not rendered into the backing store. This is a regression of r108718,
+        switch back to do the layout inside the public API
+        WebPage::setDefaultLayoutSize().
+
+        We haven't upstreamed the manual tests directory yet, therefore,
+        the new manual test case will be upstreamed later.
+
+        * Api/WebPage.cpp:
+        (BlackBerry::WebKit::WebPagePrivate::setDefaultLayoutSize):
+        (BlackBerry::WebKit::WebPage::setDefaultLayoutSize):
+
 2012-03-06  Lianghui Chen  <liachen@rim.com>