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

Side by Side Diff: Source/core/core.gypi

Issue 25825003: Move ANGLEWebKitBridge to platform/graphics/angle/ANGLEPlatformBridge. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fixed bad merge Created 7 years, 2 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/core.gyp ('k') | Source/core/platform/graphics/ANGLEWebKitBridge.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 { 1 {
2 'variables': { 2 'variables': {
3 'core_idl_files': [ 3 'core_idl_files': [
4 'css/CSS.idl', 4 'css/CSS.idl',
5 'css/CSSCharsetRule.idl', 5 'css/CSSCharsetRule.idl',
6 'css/CSSFontFaceLoadEvent.idl', 6 'css/CSSFontFaceLoadEvent.idl',
7 'css/CSSFontFaceRule.idl', 7 'css/CSSFontFaceRule.idl',
8 'css/CSSHostRule.idl', 8 'css/CSSHostRule.idl',
9 'css/CSSImportRule.idl', 9 'css/CSSImportRule.idl',
10 'css/CSSKeyframeRule.idl', 10 'css/CSSKeyframeRule.idl',
(...skipping 2770 matching lines...) Expand 10 before | Expand all | Expand 10 after
2781 'platform/chromium/MemoryUsageSupportChromium.cpp', 2781 'platform/chromium/MemoryUsageSupportChromium.cpp',
2782 'platform/chromium/MIMETypeRegistryChromium.cpp', 2782 'platform/chromium/MIMETypeRegistryChromium.cpp',
2783 'platform/chromium/PasteMode.h', 2783 'platform/chromium/PasteMode.h',
2784 'platform/chromium/PlatformKeyboardEventChromium.cpp', 2784 'platform/chromium/PlatformKeyboardEventChromium.cpp',
2785 'platform/chromium/PlatformScreenChromium.cpp', 2785 'platform/chromium/PlatformScreenChromium.cpp',
2786 'platform/chromium/PlatformThemeChromiumDefault.cpp', 2786 'platform/chromium/PlatformThemeChromiumDefault.cpp',
2787 'platform/chromium/PlatformThemeChromiumDefault.h', 2787 'platform/chromium/PlatformThemeChromiumDefault.h',
2788 'platform/chromium/PlatformSpeechSynthesizerChromium.cpp', 2788 'platform/chromium/PlatformSpeechSynthesizerChromium.cpp',
2789 'platform/chromium/SSLKeyGeneratorChromium.cpp', 2789 'platform/chromium/SSLKeyGeneratorChromium.cpp',
2790 'platform/chromium/StatsCounterChromium.cpp', 2790 'platform/chromium/StatsCounterChromium.cpp',
2791 'platform/graphics/ANGLEWebKitBridge.cpp',
2792 'platform/graphics/ANGLEWebKitBridge.h',
2793 'platform/graphics/BitmapImage.cpp', 2791 'platform/graphics/BitmapImage.cpp',
2794 'platform/graphics/ContentDecryptionModule.cpp', 2792 'platform/graphics/ContentDecryptionModule.cpp',
2795 'platform/graphics/ContentDecryptionModule.h', 2793 'platform/graphics/ContentDecryptionModule.h',
2796 'platform/graphics/ContentDecryptionModuleSession.cpp', 2794 'platform/graphics/ContentDecryptionModuleSession.cpp',
2797 'platform/graphics/ContentDecryptionModuleSession.h', 2795 'platform/graphics/ContentDecryptionModuleSession.h',
2798 'platform/graphics/Color.cpp', 2796 'platform/graphics/Color.cpp',
2799 'platform/graphics/CrossfadeGeneratedImage.cpp', 2797 'platform/graphics/CrossfadeGeneratedImage.cpp',
2800 'platform/graphics/CrossfadeGeneratedImage.h', 2798 'platform/graphics/CrossfadeGeneratedImage.h',
2801 'platform/graphics/DrawLooper.cpp', 2799 'platform/graphics/DrawLooper.cpp',
2802 'platform/graphics/DrawLooper.h', 2800 'platform/graphics/DrawLooper.h',
(...skipping 983 matching lines...) Expand 10 before | Expand all | Expand 10 after
3786 'bison_exe': 'bison', 3784 'bison_exe': 'bison',
3787 # We specify a preprocess so it happens locally and won't get 3785 # We specify a preprocess so it happens locally and won't get
3788 # distributed to goma. 3786 # distributed to goma.
3789 # FIXME: /usr/bin/gcc won't exist on OSX forever. We want to 3787 # FIXME: /usr/bin/gcc won't exist on OSX forever. We want to
3790 # use /usr/bin/clang once we require Xcode 4.x. 3788 # use /usr/bin/clang once we require Xcode 4.x.
3791 'preprocessor': '--preprocessor "/usr/bin/gcc -E -P -x c++"' 3789 'preprocessor': '--preprocessor "/usr/bin/gcc -E -P -x c++"'
3792 }], 3790 }],
3793 ], 3791 ],
3794 } 3792 }
3795 } 3793 }
OLDNEW
« no previous file with comments | « Source/core/core.gyp ('k') | Source/core/platform/graphics/ANGLEWebKitBridge.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698