Title: [126232] trunk/Source/WebKit/blackberry
- Revision
- 126232
- Author
- [email protected]
- Date
- 2012-08-21 17:18:43 -0700 (Tue, 21 Aug 2012)
Log 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 <[email protected]> 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):
Modified Paths
Diff
Modified: trunk/Source/WebKit/blackberry/Api/WebPage.cpp (126231 => 126232)
--- trunk/Source/WebKit/blackberry/Api/WebPage.cpp 2012-08-22 00:18:39 UTC (rev 126231)
+++ trunk/Source/WebKit/blackberry/Api/WebPage.cpp 2012-08-22 00:18:43 UTC (rev 126232)
@@ -331,6 +331,11 @@
d->m_autofillManager->autofillTextField(item.c_str());
}
+void WebPage::enableQnxJavaScriptObject(bool enabled)
+{
+ d->m_enableQnxJavaScriptObject = enabled;
+}
+
WebPagePrivate::WebPagePrivate(WebPage* webPage, WebPageClient* client, const IntRect& rect)
: m_webPage(webPage)
, m_client(client)
@@ -404,6 +409,7 @@
, m_fullscreenVideoNode(0)
, m_hasInRegionScrollableAreas(false)
, m_updateDelegatedOverlaysDispatched(false)
+ , m_enableQnxJavaScriptObject(true)
, m_deferredTasksTimer(this, &WebPagePrivate::deferredTasksTimerFired)
, m_selectPopup(0)
, m_autofillManager(AutofillManager::create(this))
Modified: trunk/Source/WebKit/blackberry/Api/WebPage.h (126231 => 126232)
--- trunk/Source/WebKit/blackberry/Api/WebPage.h 2012-08-22 00:18:39 UTC (rev 126231)
+++ trunk/Source/WebKit/blackberry/Api/WebPage.h 2012-08-22 00:18:43 UTC (rev 126232)
@@ -380,6 +380,8 @@
void autofillTextField(const std::string&);
+ void enableQnxJavaScriptObject(bool);
+
private:
virtual ~WebPage();
Modified: trunk/Source/WebKit/blackberry/Api/WebPage_p.h (126231 => 126232)
--- trunk/Source/WebKit/blackberry/Api/WebPage_p.h 2012-08-22 00:18:39 UTC (rev 126231)
+++ trunk/Source/WebKit/blackberry/Api/WebPage_p.h 2012-08-22 00:18:43 UTC (rev 126232)
@@ -615,6 +615,8 @@
WebCore::KURL m_cachedManualScript;
bool m_cachedFocused;
+ bool m_enableQnxJavaScriptObject;
+
class DeferredTaskBase {
public:
void perform(WebPagePrivate* webPagePrivate)
Modified: trunk/Source/WebKit/blackberry/ChangeLog (126231 => 126232)
--- trunk/Source/WebKit/blackberry/ChangeLog 2012-08-22 00:18:39 UTC (rev 126231)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2012-08-22 00:18:43 UTC (rev 126232)
@@ -1,3 +1,20 @@
+2012-08-21 Benjamin C Meyer <[email protected]>
+
+ [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 <[email protected]>
[BlackBerry] Add support for getUserMedia
Modified: trunk/Source/WebKit/blackberry/WebCoreSupport/FrameLoaderClientBlackBerry.cpp (126231 => 126232)
--- trunk/Source/WebKit/blackberry/WebCoreSupport/FrameLoaderClientBlackBerry.cpp 2012-08-22 00:18:39 UTC (rev 126231)
+++ trunk/Source/WebKit/blackberry/WebCoreSupport/FrameLoaderClientBlackBerry.cpp 2012-08-22 00:18:43 UTC (rev 126232)
@@ -903,9 +903,8 @@
return;
// 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();
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
