Changeset 140849 in webkit

Timestamp:

Jan 25, 2013 11:00:37 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[BlackBerry] Pop-up WebViews should not take ownership of the backing store.
​https://bugs.webkit.org/show_bug.cgi?id=107957

Patch by Andrew Lo <​anlo@rim.com> on 2013-01-25
Reviewed by Rob Buis.
Internally reviewed by Jakob Petsovits.

Internal PR 274581.
Add web setting for whether a WebPage should take the backing store.
Prevent pop-up WebView from taking ownership of the backing
store when it becomes visible.

• Api/WebPage.cpp:

(BlackBerry::WebKit::WebPage::setVisible):

• Api/WebSettings.cpp:

(WebKit):
(BlackBerry::WebKit::WebSettings::standardSettings):
(BlackBerry::WebKit::WebSettings::isBackingStoreEnabled):
(BlackBerry::WebKit::WebSettings::setBackingStoreEnabled):

• Api/WebSettings.h:
• WebCoreSupport/PagePopupBlackBerry.cpp:

(WebCore::PagePopupBlackBerry::PagePopupBlackBerry):
(WebCore::PagePopupBlackBerry::init):

Location:

trunk/Source/WebKit/blackberry

Files:

• Api/WebPage.cpp (modified) (1 diff)
• Api/WebSettings.cpp (modified) (3 diffs)
• Api/WebSettings.h (modified) (1 diff)
• ChangeLog (modified) (1 diff)
• WebCoreSupport/PagePopupBlackBerry.cpp (modified) (4 diffs)

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

@@ -3261 +3261 @@
 #endif
 
+    // We want to become visible but not get backing store ownership.
+    if (d->m_backingStore->d->isOpenGLCompositing() && !d->m_webSettings->isBackingStoreEnabled()) {
+        d->setCompositorDrawsRootLayer(true);
+#if USE(ACCELERATED_COMPOSITING)
+        d->setNeedsOneShotDrawingSynchronization();
+#endif
+        d->setShouldResetTilesWhenShown(true);
+        return;
+    }
+
     // Push this WebPage to the top of the visible pages list.
     if (!visibleWebPages()->isEmpty() && visibleWebPages()->last() != this) {

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

@@ -62 +62 @@
 DEFINE_STATIC_LOCAL(String, BlackBerryCredentialAutofillEnabled, (ASCIILiteral("BlackBerryCredentialAutofillEnabled")));
 DEFINE_STATIC_LOCAL(String, BlackBerryFormAutofillEnabled, (ASCIILiteral("BlackBerryFormAutofillEnabled")));
-DEFINE_STATIC_LOCAL(String, BlackBerryDevicePixelRatio, (ASCCIILiteral("BlackBerryDevicePixelRatio")));
+DEFINE_STATIC_LOCAL(String, BlackBerryDevicePixelRatio, (ASCIILiteral("BlackBerryDevicePixelRatio")));
+DEFINE_STATIC_LOCAL(String, BlackBerryBackingStoreEnabled, (ASCIILiteral("BlackBerryBackingStoreEnabled")));
 DEFINE_STATIC_LOCAL(String, SpatialNavigationEnabled, (ASCIILiteral("SpatialNavigationEnabled")));
 DEFINE_STATIC_LOCAL(String, WebKitDatabasePath, (ASCIILiteral("WebKitDatabasePath")));
@@ -162 +163 @@
     settings->m_private->setUnsigned(BlackBerryBackgroundColor, WebCore::Color::white);
     settings->m_private->setBoolean(BlackBerryCookiesEnabled, true);
+    settings->m_private->setBoolean(BlackBerryBackingStoreEnabled, true);
     settings->m_private->setDouble(BlackBerryInitialScale, -1);
     settings->m_private->setUnsigned(BlackBerryMaxPluginInstances, 1);
@@ -751 +753 @@
 }
 
+bool WebSettings::isBackingStoreEnabled() const
+{
+    return m_private->getBoolean(BlackBerryBackingStoreEnabled);
+}
+
+void WebSettings::setBackingStoreEnabled(bool enable)
+{
+    m_private->setBoolean(BlackBerryBackingStoreEnabled, enable);
+}
+
 unsigned WebSettings::maxPluginInstances() const
 {

trunk/Source/WebKit/blackberry/Api/WebSettings.h

@@ -242 +242 @@
     void setDevicePixelRatio(double);
 
+    bool isBackingStoreEnabled() const;
+    void setBackingStoreEnabled(bool);
+
 private:
     WebSettingsPrivate* m_private;

trunk/Source/WebKit/blackberry/ChangeLog

@@ +1 @@
+2013-01-25  Andrew Lo  <anlo@rim.com>
+
+        [BlackBerry] Pop-up WebViews should not take ownership of the backing store.
+        https://bugs.webkit.org/show_bug.cgi?id=107957
+
+        Reviewed by Rob Buis.
+        Internally reviewed by Jakob Petsovits.
+
+        Internal PR 274581.
+        Add web setting for whether a WebPage should take the backing store.
+        Prevent pop-up WebView from taking ownership of the backing
+        store when it becomes visible.
+
+        * Api/WebPage.cpp:
+        (BlackBerry::WebKit::WebPage::setVisible):
+        * Api/WebSettings.cpp:
+        (WebKit):
+        (BlackBerry::WebKit::WebSettings::standardSettings):
+        (BlackBerry::WebKit::WebSettings::isBackingStoreEnabled):
+        (BlackBerry::WebKit::WebSettings::setBackingStoreEnabled):
+        * Api/WebSettings.h:
+        * WebCoreSupport/PagePopupBlackBerry.cpp:
+        (WebCore::PagePopupBlackBerry::PagePopupBlackBerry):
+        (WebCore::PagePopupBlackBerry::init):
+
 2013-01-25  Arvid Nilsson  <anilsson@rim.com>
 

trunk/Source/WebKit/blackberry/WebCoreSupport/PagePopupBlackBerry.cpp

@@ -40 +40 @@
 #include <JavaScriptCore/JSValueRef.h>
 
-// Fixme: should get the height from runtime.
-#define URL_BAR_HEIGHT 70
 #define PADDING 80
 
@@ -53 +51 @@
     , m_sharedClientPointer(adoptRef(new PagePopupBlackBerry::SharedClientPointer(client)))
 {
-    m_rect = IntRect(rect.x(), rect.y() - URL_BAR_HEIGHT, client->contentSize().width(), client->contentSize().height());
+    m_rect = IntRect(rect.x(), rect.y(), client->contentSize().width(), client->contentSize().height());
 }
 
@@ -68 +66 @@
 bool PagePopupBlackBerry::init(WebPage* webpage)
 {
+    // Don't use backing store for the pop-up web page.
+    webpage->settings()->setBackingStoreEnabled(false);
+
     webpage->d->setLoadState(WebPagePrivate::Committed);
 
@@ -74 +75 @@
 
     webpage->d->setLoadState(WebPagePrivate::Finished);
+    webpage->client()->notifyLoadFinished(0);
+
     return true;
 }