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

Side by Side Diff: webkit/glue/webkit_glue.gypi

Issue 10918037: Implementation of WebCompositorSupport when use_libcc_for_compositor=1 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 3 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 (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 'conditions': [ 7 'conditions': [
8 ['inside_chromium_build==0', { 8 ['inside_chromium_build==0', {
9 'webkit_src_dir': '../../../../..', 9 'webkit_src_dir': '../../../../..',
10 },{ 10 },{
11 'webkit_src_dir': '../../third_party/WebKit', 11 'webkit_src_dir': '../../third_party/WebKit',
12 }], 12 }],
13 ], 13 ],
14
15 'use_libcc_for_compositor%': 0,
14 }, 16 },
15 'target_defaults': { 17 'target_defaults': {
16 # Disable narrowing-conversion-in-initialization-list warnings in that we 18 # Disable narrowing-conversion-in-initialization-list warnings in that we
17 # do not want to fix it in data file "webcursor_gtk_data.h". 19 # do not want to fix it in data file "webcursor_gtk_data.h".
18 'cflags+': ['-Wno-narrowing'], 20 'cflags+': ['-Wno-narrowing'],
19 'cflags_cc+': ['-Wno-narrowing'], 21 'cflags_cc+': ['-Wno-narrowing'],
20 }, 22 },
21 'targets': [ 23 'targets': [
22 { 24 {
23 'target_name': 'webkit_resources', 25 'target_name': 'webkit_resources',
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 '<(DEPTH)/ppapi/ppapi.gyp:ppapi_c', 135 '<(DEPTH)/ppapi/ppapi.gyp:ppapi_c',
134 '<(DEPTH)/ppapi/ppapi_internal.gyp:ppapi_shared', 136 '<(DEPTH)/ppapi/ppapi_internal.gyp:ppapi_shared',
135 '<(DEPTH)/printing/printing.gyp:printing', 137 '<(DEPTH)/printing/printing.gyp:printing',
136 '<(DEPTH)/skia/skia.gyp:skia', 138 '<(DEPTH)/skia/skia.gyp:skia',
137 '<(DEPTH)/third_party/icu/icu.gyp:icui18n', 139 '<(DEPTH)/third_party/icu/icu.gyp:icui18n',
138 '<(DEPTH)/third_party/icu/icu.gyp:icuuc', 140 '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
139 '<(DEPTH)/third_party/npapi/npapi.gyp:npapi', 141 '<(DEPTH)/third_party/npapi/npapi.gyp:npapi',
140 '<(DEPTH)/ui/gl/gl.gyp:gl', 142 '<(DEPTH)/ui/gl/gl.gyp:gl',
141 '<(DEPTH)/ui/ui.gyp:ui', 143 '<(DEPTH)/ui/ui.gyp:ui',
142 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8', 144 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
145 '<(DEPTH)/webkit/compositor/compositor.gyp:webkit_compositor_support',
143 '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit', 146 '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
144 'blob', 147 'blob',
145 'fileapi', 148 'fileapi',
146 'webkit_base', 149 'webkit_base',
147 'webkit_media', 150 'webkit_media',
148 'webkit_resources', 151 'webkit_resources',
149 'webkit_strings', 152 'webkit_strings',
150 'webkit_user_agent', 153 'webkit_user_agent',
151 ], 154 ],
152 'include_dirs': [ 155 'include_dirs': [
(...skipping 377 matching lines...) Expand 10 before | Expand all | Expand 10 after
530 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8', 533 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
531 ], 534 ],
532 }], 535 }],
533 ], 536 ],
534 }], 537 }],
535 ['inside_chromium_build==0', { 538 ['inside_chromium_build==0', {
536 'dependencies': [ 539 'dependencies': [
537 '<(DEPTH)/webkit/support/setup_third_party.gyp:third_party_headers', 540 '<(DEPTH)/webkit/support/setup_third_party.gyp:third_party_headers',
538 ], 541 ],
539 }], 542 }],
543 ['use_libcc_for_compositor==1', {
544 'defines': [
545 'USE_LIBCC_FOR_COMPOSITOR',
546 ],
547 }],
540 ], 548 ],
541 }, 549 },
542 ], 550 ],
543 'conditions': [ 551 'conditions': [
544 ['use_third_party_translations==1', { 552 ['use_third_party_translations==1', {
545 'targets': [ 553 'targets': [
546 { 554 {
547 'target_name': 'inspector_strings', 555 'target_name': 'inspector_strings',
548 'type': 'none', 556 'type': 'none',
549 'variables': { 557 'variables': {
550 'grit_out_dir': '<(PRODUCT_DIR)/resources/inspector/l10n', 558 'grit_out_dir': '<(PRODUCT_DIR)/resources/inspector/l10n',
551 }, 559 },
552 'actions': [ 560 'actions': [
553 { 561 {
554 'action_name': 'inspector_strings', 562 'action_name': 'inspector_strings',
555 'variables': { 563 'variables': {
556 'grit_grd_file': 'inspector_strings.grd', 564 'grit_grd_file': 'inspector_strings.grd',
557 }, 565 },
558 'includes': [ '../../build/grit_action.gypi' ], 566 'includes': [ '../../build/grit_action.gypi' ],
559 }, 567 },
560 ], 568 ],
561 'includes': [ '../../build/grit_target.gypi' ], 569 'includes': [ '../../build/grit_target.gypi' ],
562 }, 570 },
563 ], 571 ],
564 }], 572 }],
565 ], 573 ],
566 } 574 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698