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

Side by Side Diff: content/content_common.gypi

Issue 802113002: Revert "Revert of Extract WebGraphicsContext3DImpl from webkit/common/gpu. (patchset #12 id:220001 … (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: REBASE Created 6 years 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
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 'dependencies': [ 6 'dependencies': [
7 '../base/base.gyp:base', 7 '../base/base.gyp:base',
8 '../components/tracing.gyp:tracing', 8 '../components/tracing.gyp:tracing',
9 '../gpu/command_buffer/command_buffer.gyp:gles2_utils', 9 '../gpu/command_buffer/command_buffer.gyp:gles2_utils',
10 '../net/net.gyp:net', 10 '../net/net.gyp:net',
(...skipping 540 matching lines...) Expand 10 before | Expand all | Expand 10 after
551 ['include', '^common/media/media_stream_options\\.cc$'], 551 ['include', '^common/media/media_stream_options\\.cc$'],
552 ['include', '^common/net/url_fetcher\\.cc$'], 552 ['include', '^common/net/url_fetcher\\.cc$'],
553 ['include', '^common/net/url_request_user_data\\.cc$'], 553 ['include', '^common/net/url_request_user_data\\.cc$'],
554 ['include', '^common/page_state_serialization\\.cc$'], 554 ['include', '^common/page_state_serialization\\.cc$'],
555 ['include', '^common/savable_url_schemes\\.cc$'], 555 ['include', '^common/savable_url_schemes\\.cc$'],
556 ['include', '^common/url_schemes\\.cc$'], 556 ['include', '^common/url_schemes\\.cc$'],
557 ], 557 ],
558 }, { # OS!="ios" 558 }, { # OS!="ios"
559 'dependencies': [ 559 'dependencies': [
560 '../cc/cc.gyp:cc', 560 '../cc/cc.gyp:cc',
561 '../gpu/blink/gpu_blink.gyp:gpu_blink',
561 '../gpu/gpu.gyp:command_buffer_service', 562 '../gpu/gpu.gyp:command_buffer_service',
562 '../gpu/gpu.gyp:gles2_c_lib', 563 '../gpu/gpu.gyp:gles2_c_lib',
563 '../gpu/gpu.gyp:gles2_implementation', 564 '../gpu/gpu.gyp:gles2_implementation',
564 # TODO: the dependency on gl_in_process_context should be decoupled from 565 # TODO: the dependency on gl_in_process_context should be decoupled from
565 # content and moved to android_webview. See crbug.com/365797. 566 # content and moved to android_webview. See crbug.com/365797.
566 '../gpu/gpu.gyp:gl_in_process_context', 567 '../gpu/gpu.gyp:gl_in_process_context',
567 '../gpu/gpu.gyp:gpu_ipc', 568 '../gpu/gpu.gyp:gpu_ipc',
568 '../gpu/skia_bindings/skia_bindings.gyp:gpu_skia_bindings', 569 '../gpu/skia_bindings/skia_bindings.gyp:gpu_skia_bindings',
569 '../ipc/ipc.gyp:ipc', 570 '../ipc/ipc.gyp:ipc',
570 '../ipc/mojo/ipc_mojo.gyp:ipc_mojo', 571 '../ipc/mojo/ipc_mojo.gyp:ipc_mojo',
(...skipping 360 matching lines...) Expand 10 before | Expand all | Expand 10 after
931 'common/gpu/client/gpu_memory_buffer_impl_ozone.cc', 932 'common/gpu/client/gpu_memory_buffer_impl_ozone.cc',
932 'common/gpu/client/gpu_memory_buffer_impl_ozone_native_buffer.cc', 933 'common/gpu/client/gpu_memory_buffer_impl_ozone_native_buffer.cc',
933 'common/gpu/client/gpu_memory_buffer_impl_ozone_native_buffer.h', 934 'common/gpu/client/gpu_memory_buffer_impl_ozone_native_buffer.h',
934 'common/gpu/gpu_memory_buffer_factory_ozone.cc', 935 'common/gpu/gpu_memory_buffer_factory_ozone.cc',
935 'common/gpu/gpu_memory_buffer_factory_ozone_native_buffer.cc', 936 'common/gpu/gpu_memory_buffer_factory_ozone_native_buffer.cc',
936 'common/gpu/gpu_memory_buffer_factory_ozone_native_buffer.h', 937 'common/gpu/gpu_memory_buffer_factory_ozone_native_buffer.h',
937 ], 938 ],
938 }], 939 }],
939 ], 940 ],
940 } 941 }
OLDNEW
« no previous file with comments | « content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h ('k') | content/content_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698