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

Side by Side Diff: webkit/common/webkit_common.gyp

Issue 201473002: Move webcursors code from webkit/ to content. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: gfx image include Created 6 years, 9 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 | « webkit/common/cursors/webcursor_win.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'enable_wexit_time_destructors': 1, 7 'enable_wexit_time_destructors': 1,
8 'chromium_code': 1 8 'chromium_code': 1
9 }, 9 },
10 'targets': [ 10 'targets': [
(...skipping 21 matching lines...) Expand all
32 '<(DEPTH)/third_party/WebKit/public/blink_headers.gyp:blink_headers', 32 '<(DEPTH)/third_party/WebKit/public/blink_headers.gyp:blink_headers',
33 ], 33 ],
34 34
35 'include_dirs': [ 35 'include_dirs': [
36 '<(INTERMEDIATE_DIR)', 36 '<(INTERMEDIATE_DIR)',
37 '<(SHARED_INTERMEDIATE_DIR)/ui', 37 '<(SHARED_INTERMEDIATE_DIR)/ui',
38 '<(SHARED_INTERMEDIATE_DIR)/webkit', 38 '<(SHARED_INTERMEDIATE_DIR)/webkit',
39 ], 39 ],
40 40
41 'sources': [ 41 'sources': [
42 'cursors/webcursor.cc',
43 'cursors/webcursor.h',
44 'cursors/webcursor_android.cc',
45 'cursors/webcursor_aura.cc',
46 'cursors/webcursor_aurawin.cc',
47 'cursors/webcursor_aurax11.cc',
48 'cursors/webcursor_gtk.cc',
49 'cursors/webcursor_gtk_data.h',
50 'cursors/webcursor_mac.mm',
51 'cursors/webcursor_null.cc',
52 'cursors/webcursor_win.cc',
53 'data_element.cc', 42 'data_element.cc',
54 'data_element.h', 43 'data_element.h',
55 'resource_devtools_info.cc', 44 'resource_devtools_info.cc',
56 'resource_devtools_info.h', 45 'resource_devtools_info.h',
57 'resource_response_info.cc', 46 'resource_response_info.cc',
58 'resource_response_info.h', 47 'resource_response_info.h',
59 'resource_type.cc', 48 'resource_type.cc',
60 'resource_type.h', 49 'resource_type.h',
61 'webkit_common_export.h', 50 'webkit_common_export.h',
62 'webpreferences.cc', 51 'webpreferences.cc',
63 'webpreferences.h', 52 'webpreferences.h',
64 ], 53 ],
65 54
66 'conditions': [ 55 'conditions': [
67 ['toolkit_uses_gtk == 1', { 56 ['toolkit_uses_gtk == 1', {
68 'dependencies': [ 57 'dependencies': [
69 '<(DEPTH)/build/linux/system.gyp:gtk', 58 '<(DEPTH)/build/linux/system.gyp:gtk',
70 ], 59 ],
71 'sources/': [['exclude', '_x11\\.cc$']], 60 'sources/': [['exclude', '_x11\\.cc$']],
72 }], 61 }],
73 ['use_aura==1', {
74 'sources!': [
75 'cursors/webcursor_mac.mm',
76 'cursors/webcursor_win.cc',
77 ],
78 }],
79 ['use_aura==1 and use_x11==1', { 62 ['use_aura==1 and use_x11==1', {
80 'dependencies': [ 63 'dependencies': [
81 '<(DEPTH)/build/linux/system.gyp:xcursor', 64 '<(DEPTH)/build/linux/system.gyp:xcursor',
82 ], 65 ],
83 }], 66 }],
84 ['use_ozone==0', {
85 'sources!': [
86 'cursors/webcursor_null.cc',
87 ],
88 }],
89 ['OS=="mac"', { 67 ['OS=="mac"', {
90 'link_settings': { 68 'link_settings': {
91 'libraries': [ 69 'libraries': [
92 '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework', 70 '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework',
93 ], 71 ],
94 }, 72 },
95 }], 73 }],
96 ['OS=="win"', { 74 ['OS=="win"', {
97 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 75 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
98 'msvs_disabled_warnings': [ 4800, 4267 ], 76 'msvs_disabled_warnings': [ 4800, 4267 ],
99 }], 77 }],
100 ], 78 ],
101 }, 79 },
102 ], 80 ],
103 } 81 }
OLDNEW
« no previous file with comments | « webkit/common/cursors/webcursor_win.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698