Changeset 126232 in webkit

Timestamp:

Aug 21, 2012 5:18:43 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[BlackBerry] Add option to only add JavaScript object 'qnx' to private webviews
​https://bugs.webkit.org/show_bug.cgi?id=94621

Patch by Benjamin C Meyer <​bmeyer@rim.com> on 2012-08-21
Reviewed by Yong Li.

• Api/WebPage.cpp:

(BlackBerry::WebKit::WebPage::enableQnxJavaScriptObject):
(WebKit):
(BlackBerry::WebKit::WebPagePrivate::WebPagePrivate):

• Api/WebPage.h:
• Api/WebPage_p.h:

(WebPagePrivate):

• WebCoreSupport/FrameLoaderClientBlackBerry.cpp:

(WebCore::FrameLoaderClientBlackBerry::dispatchDidClearWindowObjectInWorld):

Location:

trunk/Source/WebKit/blackberry

Files:

• Api/WebPage.cpp (modified) (2 diffs)
• Api/WebPage.h (modified) (1 diff)
• Api/WebPage_p.h (modified) (1 diff)
• ChangeLog (modified) (1 diff)
• WebCoreSupport/FrameLoaderClientBlackBerry.cpp (modified) (1 diff)

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

@@ -332 +332 @@
 }
 
+void WebPage::enableQnxJavaScriptObject(bool enabled)
+{
+    d->m_enableQnxJavaScriptObject = enabled;
+}
+
 WebPagePrivate::WebPagePrivate(WebPage* webPage, WebPageClient* client, const IntRect& rect)
     : m_webPage(webPage)
@@ -405 +410 @@
     , m_hasInRegionScrollableAreas(false)
     , m_updateDelegatedOverlaysDispatched(false)
+    , m_enableQnxJavaScriptObject(true)
     , m_deferredTasksTimer(this, &WebPagePrivate::deferredTasksTimerFired)
     , m_selectPopup(0)

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

@@ -381 +381 @@
     void autofillTextField(const std::string&);
 
+    void enableQnxJavaScriptObject(bool);
+
 private:
     virtual ~WebPage();

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

@@ -616 +616 @@
     bool m_cachedFocused;
 
+    bool m_enableQnxJavaScriptObject;
+
     class DeferredTaskBase {
     public:

trunk/Source/WebKit/blackberry/ChangeLog

@@ +1 @@
+2012-08-21  Benjamin C Meyer  <bmeyer@rim.com>
+
+        [BlackBerry] Add option to only add JavaScript object 'qnx' to private webviews
+        https://bugs.webkit.org/show_bug.cgi?id=94621
+
+        Reviewed by Yong Li.
+
+        * Api/WebPage.cpp:
+        (BlackBerry::WebKit::WebPage::enableQnxJavaScriptObject):
+        (WebKit):
+        (BlackBerry::WebKit::WebPagePrivate::WebPagePrivate):
+        * Api/WebPage.h:
+        * Api/WebPage_p.h:
+        (WebPagePrivate):
+        * WebCoreSupport/FrameLoaderClientBlackBerry.cpp:
+        (WebCore::FrameLoaderClientBlackBerry::dispatchDidClearWindowObjectInWorld):
+
 2012-08-21  Robin Cao  <robin.cao@torchmobile.com.cn>
 

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

@@ -904 +904 @@
 
     // Provide the extension object first in case the client or others want to use it.
-    // FIXME: Conditionally attach extension object based on some flag or whether or not we
-    // are browser or something else.
-    attachExtensionObjectToFrame(m_frame, m_webPagePrivate->m_client);
+    if (m_webPagePrivate->m_enableQnxJavaScriptObject)
+        attachExtensionObjectToFrame(m_frame, m_webPagePrivate->m_client);
 
     m_webPagePrivate->m_client->notifyWindowObjectCleared();