Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(141)

Unified Diff: Source/WebKit/chromium/features.gypi

Issue 12254005: Merge 141769 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1364/
Patch Set: Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/WebKit/chromium/features.gypi
===================================================================
--- Source/WebKit/chromium/features.gypi (revision 142739)
+++ Source/WebKit/chromium/features.gypi (working copy)
@@ -159,7 +159,6 @@
'conditions': [
['OS=="android"', {
'feature_defines': [
- 'ENABLE_ACCELERATED_OVERFLOW_SCROLLING=1',
'ENABLE_CALENDAR_PICKER=0',
'ENABLE_DATALIST_ELEMENT=0',
'ENABLE_FAST_MOBILE_SCROLLING=1',
@@ -183,7 +182,6 @@
'enable_touch_icon_loading': 1,
}, { # OS!="android"
'feature_defines': [
- 'ENABLE_ACCELERATED_OVERFLOW_SCROLLING=0',
'ENABLE_CALENDAR_PICKER=1',
'ENABLE_DATALIST_ELEMENT=1',
'ENABLE_INPUT_SPEECH=1',

Powered by Google App Engine
This is Rietveld 408576698