Changeset 133667 in webkit

Timestamp:

Nov 6, 2012 2:00:23 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[BlackBerry] Pushing window.external.* events to webplatform
​https://bugs.webkit.org/show_bug.cgi?id=101386

Patch by Otto Derek Cheung <​otcheung@rim.com> on 2012-11-06
Reviewed by Rob Buis.

Adding calls to trigger window.external events so we can handle them on the
browser side.

PR 170059

• Api/WebPageClient.h:
• WebCoreSupport/ChromeClientBlackBerry.cpp:

(WebCore::ChromeClientBlackBerry::addSearchProvider):
(WebCore::ChromeClientBlackBerry::isSearchProviderInstalled):

Location:

trunk/Source/WebKit/blackberry

Files:

• Api/WebPageClient.h (modified) (1 diff)
• ChangeLog (modified) (1 diff)
• WebCoreSupport/ChromeClientBlackBerry.cpp (modified) (2 diffs)

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

@@ -263 +263 @@
     virtual void closePopupWebView() = 0;
 
+    virtual void addSearchProvider(const Platform::String&) = 0;
+    virtual int  isSearchProviderInstalled(const Platform::String&) = 0;
+
     // Match with ChromeClient::CustomHandlersState.
     enum ProtocolHandlersState {

trunk/Source/WebKit/blackberry/ChangeLog

@@ +1 @@
+2012-11-06  Otto Derek Cheung  <otcheung@rim.com>
+
+        [BlackBerry] Pushing window.external.* events to webplatform
+        https://bugs.webkit.org/show_bug.cgi?id=101386
+
+        Reviewed by Rob Buis.
+
+        Adding calls to trigger window.external events so we can handle them on the
+        browser side.
+
+        PR 170059
+
+        * Api/WebPageClient.h:
+        * WebCoreSupport/ChromeClientBlackBerry.cpp:
+        (WebCore::ChromeClientBlackBerry::addSearchProvider):
+        (WebCore::ChromeClientBlackBerry::isSearchProviderInstalled):
+
 2012-11-06  Otto Derek Cheung  <otcheung@rim.com>
 

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

@@ -839 +839 @@
 void ChromeClientBlackBerry::addSearchProvider(const BlackBerry::Platform::String& originURL, const BlackBerry::Platform::String& newURL)
 {
-    notImplemented();
+    // See if the input URL host matches of the origin host.
+    KURL originHost = KURL(KURL(), originURL);
+    KURL url = KURL(KURL(), newURL);
+    if (url.isValid() && originHost.host() == url.host())
+        m_webPagePrivate->client()->addSearchProvider(newURL);
 }
 
@@ -848 +852 @@
 //    1 - One or more installed search engines match url, but none are the user's default search engine.
 //    2 - The user's default search engine matches url.
+
+    // See if the input URL host matches of the origin host.
+    KURL originHost = KURL(KURL(), originURL);
+    KURL url = KURL(KURL(), newURL);
+    if (url.isValid() && originHost.host() == url.host())
+        return m_webPagePrivate->client()->isSearchProviderInstalled(newURL);
     return 0;
 }