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

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: fixes 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
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 17 matching lines...) Expand all
28 '<(DEPTH)/webkit/webkit_resources.gyp:webkit_resources', 28 '<(DEPTH)/webkit/webkit_resources.gyp:webkit_resources',
29 ], 29 ],
30 30
31 'include_dirs': [ 31 'include_dirs': [
32 '<(INTERMEDIATE_DIR)', 32 '<(INTERMEDIATE_DIR)',
33 '<(SHARED_INTERMEDIATE_DIR)/ui', 33 '<(SHARED_INTERMEDIATE_DIR)/ui',
34 '<(SHARED_INTERMEDIATE_DIR)/webkit', 34 '<(SHARED_INTERMEDIATE_DIR)/webkit',
35 ], 35 ],
36 36
37 'sources': [ 37 'sources': [
38 'cursors/webcursor.cc',
39 'cursors/webcursor.h',
40 'cursors/webcursor_android.cc',
41 'cursors/webcursor_aura.cc',
42 'cursors/webcursor_aurawin.cc',
43 'cursors/webcursor_aurax11.cc',
44 'cursors/webcursor_gtk.cc',
45 'cursors/webcursor_gtk_data.h',
46 'cursors/webcursor_mac.mm',
47 'cursors/webcursor_null.cc',
48 'cursors/webcursor_win.cc',
49 'data_element.cc', 38 'data_element.cc',
50 'data_element.h', 39 'data_element.h',
51 'resource_devtools_info.cc', 40 'resource_devtools_info.cc',
52 'resource_devtools_info.h', 41 'resource_devtools_info.h',
53 'resource_response_info.cc', 42 'resource_response_info.cc',
54 'resource_response_info.h', 43 'resource_response_info.h',
55 'resource_type.cc', 44 'resource_type.cc',
56 'resource_type.h', 45 'resource_type.h',
57 'webkit_common_export.h', 46 'webkit_common_export.h',
58 'webpreferences.cc', 47 'webpreferences.cc',
59 'webpreferences.h', 48 'webpreferences.h',
60 ], 49 ],
61 50
62 'conditions': [ 51 'conditions': [
63 ['toolkit_uses_gtk == 1', { 52 ['toolkit_uses_gtk == 1', {
64 'dependencies': [ 53 'dependencies': [
65 '<(DEPTH)/build/linux/system.gyp:gtk', 54 '<(DEPTH)/build/linux/system.gyp:gtk',
66 ], 55 ],
67 'sources/': [['exclude', '_x11\\.cc$']], 56 'sources/': [['exclude', '_x11\\.cc$']],
68 }], 57 }],
69 ['use_aura==1', {
70 'sources!': [
71 'cursors/webcursor_mac.mm',
72 'cursors/webcursor_win.cc',
73 ],
74 }],
75 ['use_aura==1 and use_x11==1', { 58 ['use_aura==1 and use_x11==1', {
76 'dependencies': [ 59 'dependencies': [
77 '<(DEPTH)/build/linux/system.gyp:xcursor', 60 '<(DEPTH)/build/linux/system.gyp:xcursor',
78 ], 61 ],
79 }], 62 }],
80 ['use_ozone==0', {
81 'sources!': [
82 'cursors/webcursor_null.cc',
83 ],
84 }],
85 ['OS=="mac"', { 63 ['OS=="mac"', {
86 'link_settings': { 64 'link_settings': {
87 'libraries': [ 65 'libraries': [
88 '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework', 66 '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework',
89 ], 67 ],
90 }, 68 },
91 }], 69 }],
92 ['OS=="win"', { 70 ['OS=="win"', {
93 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 71 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
94 'msvs_disabled_warnings': [ 4800, 4267 ], 72 'msvs_disabled_warnings': [ 4800, 4267 ],
95 }], 73 }],
96 ], 74 ],
97 }, 75 },
98 ], 76 ],
99 } 77 }
OLDNEW
« content/common/cursors/webcursor.h ('K') | « webkit/common/cursors/webcursor_win.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698