Source/WebKit/chromium/features.gypi - Issue 12250029: Merge 141193

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 12250029: Merge 141193 (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:

Index: Source/WebKit/chromium/features.gypi

===================================================================

--- Source/WebKit/chromium/features.gypi (revision 142708)

+++ Source/WebKit/chromium/features.gypi (working copy)

@@ -34,7 +34,6 @@

'feature_defines': [

'ENABLE_3D_PLUGIN=1',

'ENABLE_BATTERY_STATUS=0',

- 'ENABLE_BINDING_INTEGRITY=0',

'ENABLE_BLOB=1',

'ENABLE_BLOB_SLICE=1',

'ENABLE_CHANNEL_MESSAGING=1',

@@ -202,6 +201,15 @@

'ENABLE_WEB_AUDIO=1',

}],

+ ['OS=="linux"', {

+ 'feature_defines': [

+ 'ENABLE_BINDING_INTEGRITY=1',

+ ],

+ }, { # OS!="linux"

+ 'feature_defines': [

+ 'ENABLE_BINDING_INTEGRITY=0',

+ ],

+ }],

['use_accelerated_compositing==1', {

'feature_defines': [

'ENABLE_3D_RENDERING=1',

« no previous file with comments | « no previous file | no next file » | no next file with comments »