Diff
Modified: trunk/ChangeLog (121773 => 121774)
--- trunk/ChangeLog 2012-07-03 15:53:31 UTC (rev 121773)
+++ trunk/ChangeLog 2012-07-03 16:00:22 UTC (rev 121774)
@@ -1,5 +1,14 @@
2012-07-03 George Staikos <[email protected]>
+ [BlackBerry] Enable Custom Scheme Handlers for BlackBerry.
+ https://bugs.webkit.org/show_bug.cgi?id=90422
+
+ Reviewed by Rob Buis.
+
+ * Source/cmake/OptionsBlackBerry.cmake:
+
+2012-07-03 George Staikos <[email protected]>
+
[BlackBerry] Enable RegisterProtocolHandler for BlackBerry.
https://bugs.webkit.org/show_bug.cgi?id=90422
Modified: trunk/Source/WebCore/ChangeLog (121773 => 121774)
--- trunk/Source/WebCore/ChangeLog 2012-07-03 15:53:31 UTC (rev 121773)
+++ trunk/Source/WebCore/ChangeLog 2012-07-03 16:00:22 UTC (rev 121774)
@@ -1,3 +1,14 @@
+2012-07-03 George Staikos <[email protected]>
+
+ [BlackBerry] Enable Custom Scheme Handlers for BlackBerry.
+ https://bugs.webkit.org/show_bug.cgi?id=90422
+
+ Reviewed by Rob Buis.
+
+ * page/NavigatorRegisterProtocolHandler.cpp:
+ (WebCore::initProtocolHandlerWhitelist): Disable the overrides as
+ they're undesired by BlackBerry
+
2012-07-03 Eugene Klyuchnikov <[email protected]>
Web Inspector: Forward message loop instrumentation data to frontend.
Modified: trunk/Source/WebCore/page/NavigatorRegisterProtocolHandler.cpp (121773 => 121774)
--- trunk/Source/WebCore/page/NavigatorRegisterProtocolHandler.cpp 2012-07-03 15:53:31 UTC (rev 121773)
+++ trunk/Source/WebCore/page/NavigatorRegisterProtocolHandler.cpp 2012-07-03 16:00:22 UTC (rev 121774)
@@ -46,6 +46,7 @@
{
protocolWhitelist = new HashSet<String>;
static const char* protocols[] = {
+#if !PLATFORM(BLACKBERRY)
"irc",
"mailto",
"mms",
@@ -56,6 +57,7 @@
"tel",
"urn",
"webcal",
+#endif
};
for (size_t i = 0; i < WTF_ARRAY_LENGTH(protocols); ++i)
protocolWhitelist->add(protocols[i]);
Modified: trunk/Source/WebKit/blackberry/ChangeLog (121773 => 121774)
--- trunk/Source/WebKit/blackberry/ChangeLog 2012-07-03 15:53:31 UTC (rev 121773)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2012-07-03 16:00:22 UTC (rev 121774)
@@ -1,5 +1,19 @@
2012-07-03 George Staikos <[email protected]>
+ [BlackBerry] Enable Custom Scheme Handlers for BlackBerry.
+ https://bugs.webkit.org/show_bug.cgi?id=90422
+
+ Reviewed by Rob Buis.
+
+ * WebCoreSupport/ChromeClientBlackBerry.cpp:
+ (WebCore):
+ (WebCore::ChromeClientBlackBerry::isProtocolHandlerRegistered):
+ (WebCore::ChromeClientBlackBerry::unregisterProtocolHandler):
+ * WebCoreSupport/ChromeClientBlackBerry.h:
+ (ChromeClientBlackBerry):
+
+2012-07-03 George Staikos <[email protected]>
+
[BlackBerry] Enable RegisterProtocolHandler for BlackBerry.
https://bugs.webkit.org/show_bug.cgi?id=90422
Modified: trunk/Source/WebKit/blackberry/WebCoreSupport/ChromeClientBlackBerry.cpp (121773 => 121774)
--- trunk/Source/WebKit/blackberry/WebCoreSupport/ChromeClientBlackBerry.cpp 2012-07-03 15:53:31 UTC (rev 121773)
+++ trunk/Source/WebKit/blackberry/WebCoreSupport/ChromeClientBlackBerry.cpp 2012-07-03 16:00:22 UTC (rev 121774)
@@ -809,7 +809,17 @@
return nullptr;
}
+#if ENABLE(CUSTOM_SCHEME_HANDLER)
+CustomHandlersState ChromeClientBlackBerry::isProtocolHandlerRegistered(const String&, const String&, const String&)
+{
+ return CustomHandlersDeclined;
+}
+void ChromeClientBlackBerry::unregisterProtocolHandler(const String&, const String&, const String&)
+{
+}
+#endif
+
#if ENABLE(REGISTER_PROTOCOL_HANDLER)
void ChromeClientBlackBerry::registerProtocolHandler(const WTF::String&, const WTF::String&, const WTF::String&, const WTF::String&)
{
Modified: trunk/Source/WebKit/blackberry/WebCoreSupport/ChromeClientBlackBerry.h (121773 => 121774)
--- trunk/Source/WebKit/blackberry/WebCoreSupport/ChromeClientBlackBerry.h 2012-07-03 15:53:31 UTC (rev 121773)
+++ trunk/Source/WebKit/blackberry/WebCoreSupport/ChromeClientBlackBerry.h 2012-07-03 16:00:22 UTC (rev 121774)
@@ -159,6 +159,11 @@
virtual void registerProtocolHandler(const WTF::String&, const WTF::String&, const WTF::String&, const WTF::String&);
#endif
+#if ENABLE(CUSTOM_SCHEME_HANDLER)
+ virtual CustomHandlersState isProtocolHandlerRegistered(const String&, const String&, const String&);
+ virtual void unregisterProtocolHandler(const String&, const String&, const String&);
+#endif
+
BlackBerry::WebKit::WebPagePrivate* webPagePrivate() const { return m_webPagePrivate; }
private:
Modified: trunk/Source/cmake/OptionsBlackBerry.cmake (121773 => 121774)
--- trunk/Source/cmake/OptionsBlackBerry.cmake 2012-07-03 15:53:31 UTC (rev 121773)
+++ trunk/Source/cmake/OptionsBlackBerry.cmake 2012-07-03 16:00:22 UTC (rev 121774)
@@ -141,6 +141,7 @@
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ASSEMBLER_WX_EXCLUSIVE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_BATTERY_STATUS ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_BLOB ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CUSTOM_SCHEME_HANDLER ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DEVICE_ORIENTATION ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DRAG_SUPPORT OFF)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DOWNLOAD_ATTRIBUTE ON)
Modified: trunk/Tools/ChangeLog (121773 => 121774)
--- trunk/Tools/ChangeLog 2012-07-03 15:53:31 UTC (rev 121773)
+++ trunk/Tools/ChangeLog 2012-07-03 16:00:22 UTC (rev 121774)
@@ -1,5 +1,14 @@
2012-07-03 George Staikos <[email protected]>
+ [BlackBerry] Enable Custom Scheme Handlers for BlackBerry.
+ https://bugs.webkit.org/show_bug.cgi?id=90422
+
+ Reviewed by Rob Buis.
+
+ * Scripts/webkitperl/FeatureList.pm:
+
+2012-07-03 George Staikos <[email protected]>
+
[BlackBerry] Enable RegisterProtocolHandler for BlackBerry.
https://bugs.webkit.org/show_bug.cgi?id=90422
Modified: trunk/Tools/Scripts/webkitperl/FeatureList.pm (121773 => 121774)
--- trunk/Tools/Scripts/webkitperl/FeatureList.pm 2012-07-03 15:53:31 UTC (rev 121773)
+++ trunk/Tools/Scripts/webkitperl/FeatureList.pm 2012-07-03 16:00:22 UTC (rev 121774)
@@ -178,7 +178,7 @@
define => "ENABLE_CSS_VARIABLES", default => 0, value => \$cssVariablesSupport },
{ option => "custom-scheme-handler", desc => "Toggle Custom Scheme Handler support",
- define => "ENABLE_CUSTOM_SCHEME_HANDLER", default => 0, value => \$customSchemeHandlerSupport },
+ define => "ENABLE_CUSTOM_SCHEME_HANDLER", default => isBlackBerry(), value => \$customSchemeHandlerSupport },
{ option => "datalist", desc => "Toggle Datalist support",
define => "ENABLE_DATALIST", default => isEfl(), value => \$datalistSupport },
