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

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: ignore c4800 in webkit_glue 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_bindings/compositor_bindings.gyp:webkit_comp ositor_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 360 matching lines...) Expand 10 before | Expand all | Expand 10 after
513 'webthemeengine_impl_win.cc', 516 'webthemeengine_impl_win.cc',
514 ], 517 ],
515 }, { # else: OS=="win" 518 }, { # else: OS=="win"
516 'sources/': [['exclude', '_posix\\.cc$']], 519 'sources/': [['exclude', '_posix\\.cc$']],
517 'include_dirs': [ 520 'include_dirs': [
518 '<(DEPTH)/third_party/wtl/include', 521 '<(DEPTH)/third_party/wtl/include',
519 ], 522 ],
520 'sources!': [ 523 'sources!': [
521 'plugins/plugin_stubs.cc', 524 'plugins/plugin_stubs.cc',
522 ], 525 ],
526 'msvs_disabled_warnings': [ 4800 ],
523 'conditions': [ 527 'conditions': [
524 ['inside_chromium_build==1 and component=="shared_library"', { 528 ['inside_chromium_build==1 and component=="shared_library"', {
525 'dependencies': [ 529 'dependencies': [
526 '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit', 530 '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
527 ], 531 ],
528 'export_dependent_settings': [ 532 'export_dependent_settings': [
529 '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit', 533 '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
530 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8', 534 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
531 ], 535 ],
532 }], 536 }],
533 ], 537 ],
534 }], 538 }],
535 ['inside_chromium_build==0', { 539 ['inside_chromium_build==0', {
536 'dependencies': [ 540 'dependencies': [
537 '<(DEPTH)/webkit/support/setup_third_party.gyp:third_party_headers', 541 '<(DEPTH)/webkit/support/setup_third_party.gyp:third_party_headers',
538 ], 542 ],
539 }], 543 }],
544 ['use_libcc_for_compositor==1', {
545 'defines': [
546 'USE_LIBCC_FOR_COMPOSITOR',
547 ],
548 }],
540 ], 549 ],
541 }, 550 },
542 ], 551 ],
543 'conditions': [ 552 'conditions': [
544 ['use_third_party_translations==1', { 553 ['use_third_party_translations==1', {
545 'targets': [ 554 'targets': [
546 { 555 {
547 'target_name': 'inspector_strings', 556 'target_name': 'inspector_strings',
548 'type': 'none', 557 'type': 'none',
549 'variables': { 558 'variables': {
550 'grit_out_dir': '<(PRODUCT_DIR)/resources/inspector/l10n', 559 'grit_out_dir': '<(PRODUCT_DIR)/resources/inspector/l10n',
551 }, 560 },
552 'actions': [ 561 'actions': [
553 { 562 {
554 'action_name': 'inspector_strings', 563 'action_name': 'inspector_strings',
555 'variables': { 564 'variables': {
556 'grit_grd_file': 'inspector_strings.grd', 565 'grit_grd_file': 'inspector_strings.grd',
557 }, 566 },
558 'includes': [ '../../build/grit_action.gypi' ], 567 'includes': [ '../../build/grit_action.gypi' ],
559 }, 568 },
560 ], 569 ],
561 'includes': [ '../../build/grit_target.gypi' ], 570 'includes': [ '../../build/grit_target.gypi' ],
562 }, 571 },
563 ], 572 ],
564 }], 573 }],
565 ], 574 ],
566 } 575 }
OLDNEW
« no previous file with comments | « webkit/compositor_bindings/web_compositor_support_impl.cc ('k') | webkit/glue/webkitplatformsupport_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698