[webkit-changes] [119749] trunk/Source/WebKit/chromium

Thu, 07 Jun 2012 13:08:31 -0700

Title: [119749] trunk/Source/WebKit/chromium
Revision
119749
Author
[email protected]
Date
2012-06-07 13:07:59 -0700 (Thu, 07 Jun 2012)

Log Message

[Chromium] features.gypi should have the correct definitions for Android
https://bugs.webkit.org/show_bug.cgi?id=88533

Reviewed by Adam Barth.

Make all features which are enabled on Android but disabled on other platforms,
or are disabled on Android while enabled on other platforms, conditional. This
also means that the selection of code compiled for Android will slightly change.

This change also removes the enable_viewport variable as the value of this is
no longer respected by WebKit - it's enabled by default for all of Chromium.
Furthermore, ENABLE_OVERFLOW_SCROLLING is now listed in features.gypi again.

* features.gypi:

Modified Paths

Diff

Modified: trunk/Source/WebKit/chromium/ChangeLog (119748 => 119749)


--- trunk/Source/WebKit/chromium/ChangeLog	2012-06-07 20:06:57 UTC (rev 119748)
+++ trunk/Source/WebKit/chromium/ChangeLog	2012-06-07 20:07:59 UTC (rev 119749)
@@ -1,3 +1,20 @@
+2012-06-07  Peter Beverloo  <[email protected]>
+
+        [Chromium] features.gypi should have the correct definitions for Android
+        https://bugs.webkit.org/show_bug.cgi?id=88533
+
+        Reviewed by Adam Barth.
+
+        Make all features which are enabled on Android but disabled on other platforms,
+        or are disabled on Android while enabled on other platforms, conditional. This
+        also means that the selection of code compiled for Android will slightly change.
+
+        This change also removes the enable_viewport variable as the value of this is
+        no longer respected by WebKit - it's enabled by default for all of Chromium.
+        Furthermore, ENABLE_OVERFLOW_SCROLLING is now listed in features.gypi again.
+
+        * features.gypi:
+
 2012-06-07  Dana Jansens  <[email protected]>
 
         [chromium] Free texture from CCIOSurfaceLayerImpl when it is destroyed

Modified: trunk/Source/WebKit/chromium/features.gypi (119748 => 119749)


--- trunk/Source/WebKit/chromium/features.gypi	2012-06-07 20:06:57 UTC (rev 119748)
+++ trunk/Source/WebKit/chromium/features.gypi	2012-06-07 20:07:59 UTC (rev 119749)
@@ -63,29 +63,18 @@
       'ENABLE_ICONDATABASE=0',
       'ENABLE_IFRAME_SEAMLESS=1',
       'ENABLE_INDEXED_DATABASE=1',
-      'ENABLE_INPUT_SPEECH=1',
       'ENABLE_INPUT_TYPE_DATE=1',
-      'ENABLE_INPUT_TYPE_DATETIME=0',
-      'ENABLE_INPUT_TYPE_DATETIMELOCAL=0',
-      'ENABLE_INPUT_TYPE_MONTH=0',
-      'ENABLE_INPUT_TYPE_TIME=0',
-      'ENABLE_INPUT_TYPE_WEEK=0',
       'ENABLE_JAVASCRIPT_DEBUGGER=1',
-      'ENABLE_JAVASCRIPT_I18N_API=1',
       'ENABLE_LEGACY_CSS_VENDOR_PREFIXES=0',
-      'ENABLE_LEGACY_NOTIFICATIONS=1',
       'ENABLE_LEGACY_WEBKIT_BLOB_BUILDER=1',
       'ENABLE_LINK_PREFETCH=1',
       'ENABLE_LINK_PRERENDER=1',
       'ENABLE_MEDIA_SOURCE=1',
       'ENABLE_MEDIA_STATISTICS=1',
-      'ENABLE_MEDIA_STREAM=1',
       'ENABLE_METER_TAG=1',
       'ENABLE_MHTML=1',
       'ENABLE_MICRODATA=0',
       'ENABLE_MUTATION_OBSERVERS=<(enable_mutation_observers)',
-      'ENABLE_NOTIFICATIONS=1',
-      'ENABLE_ORIENTATION_EVENTS=0',
       'ENABLE_PAGE_VISIBILITY_API=1',
       'ENABLE_POINTER_LOCK=1',
       'ENABLE_PROGRESS_TAG=1',
@@ -96,7 +85,6 @@
       'ENABLE_SANDBOX=1',
       'ENABLE_SCRIPTED_SPEECH=1',
       'ENABLE_SHADOW_DOM=1',
-      'ENABLE_SHARED_WORKERS=1',
       'ENABLE_SMOOTH_SCROLLING=1',
       'ENABLE_SQL_DATABASE=1',
       'ENABLE_STYLE_SCOPED=1',
@@ -133,7 +121,6 @@
       'use_accelerated_compositing%': 1,
       'enable_skia_text%': 1,
       'enable_svg%': 1,
-      'enable_viewport%': 0,
       'enable_touch_events%': 1,
       'enable_touch_icon_loading%' : 0,
       'enable_mutation_observers%': 1,
@@ -147,17 +134,44 @@
         'feature_defines': [
           'ENABLE_CALENDAR_PICKER=0',
           'ENABLE_FONT_BOOSTING=1',
+          'ENABLE_INPUT_SPEECH=0',
+          'ENABLE_INPUT_TYPE_DATETIME=1',
+          'ENABLE_INPUT_TYPE_DATETIMELOCAL=1',
+          'ENABLE_INPUT_TYPE_MONTH=1',
+          'ENABLE_INPUT_TYPE_TIME=1',
+          'ENABLE_INPUT_TYPE_WEEK=1',
+          'ENABLE_JAVASCRIPT_I18N_API=0',
+          'ENABLE_LEGACY_NOTIFICATIONS=0',
           'ENABLE_MEDIA_CAPTURE=1',
+          'ENABLE_MEDIA_STREAM=0',
+          'ENABLE_NOTIFICATIONS=0',
+          'ENABLE_ORIENTATION_EVENTS=1',
+          'ENABLE_OVERFLOW_SCROLLING=1',
           'ENABLE_PAGE_POPUP=0',
+          'ENABLE_SHARED_WORKERS=0',
           'ENABLE_WEB_AUDIO=0',
           'WTF_USE_NATIVE_FULLSCREEN_VIDEO=1',
         ],
+        'enable_touch_icon_loading': 1,
       }, {
         'feature_defines': [
           'ENABLE_CALENDAR_PICKER=1',
           'ENABLE_FONT_BOOSTING=0',
+          'ENABLE_INPUT_SPEECH=1',
+          'ENABLE_INPUT_TYPE_DATETIME=0',
+          'ENABLE_INPUT_TYPE_DATETIMELOCAL=0',
+          'ENABLE_INPUT_TYPE_MONTH=0',
+          'ENABLE_INPUT_TYPE_TIME=0',
+          'ENABLE_INPUT_TYPE_WEEK=0',
+          'ENABLE_JAVASCRIPT_I18N_API=1',
+          'ENABLE_LEGACY_NOTIFICATIONS=1',
           'ENABLE_MEDIA_CAPTURE=0',
+          'ENABLE_MEDIA_STREAM=1',
+          'ENABLE_NOTIFICATIONS=1',
+          'ENABLE_ORIENTATION_EVENTS=0',
+          'ENABLE_OVERFLOW_SCROLLING=0',
           'ENABLE_PAGE_POPUP=1',
+          'ENABLE_SHARED_WORKERS=1',
           'ENABLE_WEB_AUDIO=1',
         ],
       }],

_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to