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

Unified Diff: gpu/blink/gpu_blink.gyp

Issue 810273004: GPU/BLINK - WIP - TAKE 2 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: android_webview fix 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gpu/blink/DEPS ('k') | gpu/blink/gpu_blink_export.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/blink/gpu_blink.gyp
diff --git a/webkit/common/gpu/webkit_gpu.gyp b/gpu/blink/gpu_blink.gyp
similarity index 65%
copy from webkit/common/gpu/webkit_gpu.gyp
copy to gpu/blink/gpu_blink.gyp
index 2238538815ac2103126ef0f5dc384a0c0fffafe8..a1d3cb5f81da1b9a45082ab12a237656f41dd0de 100644
--- a/webkit/common/gpu/webkit_gpu.gyp
+++ b/gpu/blink/gpu_blink.gyp
@@ -1,17 +1,14 @@
-# Copyright (c) 2013 The Chromium Authors. All rights reserved.
+# Copyright 2014 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
{
'conditions': [
- # TODO(stuartmorgan): All dependencies from code built on iOS to
- # webkit/ should be removed, at which point this condition can be
- # removed.
['OS != "ios"', {
'targets': [
{
- # GN version: //webkit/common/gpu
- 'target_name': 'webkit_gpu',
+ # GN version: //gpu/blink
+ 'target_name': 'gpu_blink',
'type': '<(component)',
'variables': {
'chromium_code': 1,
@@ -35,19 +32,12 @@
'<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry',
],
'sources': [
- # This list contains all .h and .cc in gpu except for test code.
- 'context_provider_in_process.cc',
- 'context_provider_in_process.h',
- 'context_provider_web_context.h',
- 'grcontext_for_webgraphicscontext3d.cc',
- 'grcontext_for_webgraphicscontext3d.h',
+ 'gpu_blink_export.h',
'webgraphicscontext3d_impl.cc',
'webgraphicscontext3d_impl.h',
- 'webgraphicscontext3d_in_process_command_buffer_impl.cc',
- 'webgraphicscontext3d_in_process_command_buffer_impl.h',
],
'defines': [
- 'WEBKIT_GPU_IMPLEMENTATION',
+ 'GPU_BLINK_IMPLEMENTATION',
],
# TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
'msvs_disabled_warnings': [ 4267, ],
« no previous file with comments | « gpu/blink/DEPS ('k') | gpu/blink/gpu_blink_export.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698