Title: [143917] trunk/Source/WebKit/chromium
Revision
143917
Author
[email protected]
Date
2013-02-25 06:06:37 -0800 (Mon, 25 Feb 2013)

Log Message

[Chromium] Disable registerProtocolHandler on Android
https://bugs.webkit.org/show_bug.cgi?id=110481

Patch by Anton Vayvod <[email protected]> on 2013-02-25
Reviewed by Julien Chaffraix.

Chromium for Android has been exposing registerProtocolHandler, but the feature wasn't
actually wired up internally. Disable the feature to avoid breaking feature detection until
we can implement it properly. Previous attempt is at http://trac.webkit.org/changeset/133465
See the discussion of the future implementation at http://crbug.com/156386

* features.gypi: Disable the flag for Android, enable it only for non-Android platforms.

* src/ChromeClientImpl.h: Declaration is now guarded by the flag, not to break Android.

Modified Paths

Diff

Modified: trunk/Source/WebKit/chromium/ChangeLog (143916 => 143917)


--- trunk/Source/WebKit/chromium/ChangeLog	2013-02-25 14:06:23 UTC (rev 143916)
+++ trunk/Source/WebKit/chromium/ChangeLog	2013-02-25 14:06:37 UTC (rev 143917)
@@ -1,3 +1,19 @@
+2013-02-25  Anton Vayvod  <[email protected]>
+
+        [Chromium] Disable registerProtocolHandler on Android
+        https://bugs.webkit.org/show_bug.cgi?id=110481
+
+        Reviewed by Julien Chaffraix.
+
+        Chromium for Android has been exposing registerProtocolHandler, but the feature wasn't
+        actually wired up internally. Disable the feature to avoid breaking feature detection until
+        we can implement it properly. Previous attempt is at http://trac.webkit.org/changeset/133465
+        See the discussion of the future implementation at http://crbug.com/156386
+
+        * features.gypi: Disable the flag for Android, enable it only for non-Android platforms.
+
+        * src/ChromeClientImpl.h: Declaration is now guarded by the flag, not to break Android.
+
 2013-02-24  Hajime Morrita  <[email protected]>
 
         [Custom Elements] Implement bare-bone document.register()

Modified: trunk/Source/WebKit/chromium/features.gypi (143916 => 143917)


--- trunk/Source/WebKit/chromium/features.gypi	2013-02-25 14:06:23 UTC (rev 143916)
+++ trunk/Source/WebKit/chromium/features.gypi	2013-02-25 14:06:37 UTC (rev 143917)
@@ -95,7 +95,6 @@
       'ENABLE_MHTML=1',
       'ENABLE_MICRODATA=0',
       'ENABLE_MOUSE_CURSOR_SCALE=1',
-      'ENABLE_NAVIGATOR_CONTENT_UTILS=1',
       'ENABLE_NOSNIFF=1',
       'ENABLE_PAGE_VISIBILITY_API=1',
       'ENABLE_PERFORMANCE_TIMELINE=1',
@@ -178,7 +177,7 @@
           'ENABLE_ORIENTATION_EVENTS=1',
           'ENABLE_PAGE_POPUP=0',
           'ENABLE_PRINTING=0',
-          'ENABLE_REGISTER_PROTOCOL_HANDLER=0',
+          'ENABLE_NAVIGATOR_CONTENT_UTILS=0',
           # FIXME: Disable once the linking error has been resolved.
           # https://bugs.webkit.org/show_bug.cgi?id=88636
           'ENABLE_SHARED_WORKERS=1',
@@ -196,6 +195,7 @@
           'ENABLE_INPUT_MULTIPLE_FIELDS_UI=1',
           'ENABLE_LEGACY_NOTIFICATIONS=1',
           'ENABLE_MEDIA_CAPTURE=0',
+          'ENABLE_NAVIGATOR_CONTENT_UTILS=1',
           'ENABLE_NOTIFICATIONS=1',
           'ENABLE_ORIENTATION_EVENTS=0',
           'ENABLE_PAGE_POPUP=1',

Modified: trunk/Source/WebKit/chromium/src/ChromeClientImpl.h (143916 => 143917)


--- trunk/Source/WebKit/chromium/src/ChromeClientImpl.h	2013-02-25 14:06:23 UTC (rev 143916)
+++ trunk/Source/WebKit/chromium/src/ChromeClientImpl.h	2013-02-25 14:06:37 UTC (rev 143917)
@@ -253,6 +253,7 @@
 #endif
 };
 
+#if ENABLE(NAVIGATOR_CONTENT_UTILS)
 class NavigatorContentUtilsClientImpl : public WebCore::NavigatorContentUtilsClient {
 public:
     static PassOwnPtr<NavigatorContentUtilsClientImpl> create(WebViewImpl*);
@@ -265,6 +266,7 @@
 
     WebViewImpl* m_webView;
 };
+#endif
 
 } // namespace WebKit
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to