diff options
| author | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-13 03:06:49 +0000 |
|---|---|---|
| committer | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-13 03:06:49 +0000 |
| commit | 231d7b5bd1aaea6d64d2e38bceb7e9b031f0f045 (patch) | |
| tree | faf378e4827de330908bbb5adc497f1ed9f9e717 /cc | |
| parent | df98a4b45125fcd0f7bbcc9a881ba306f6c46e28 (diff) | |
| download | chromium_src-231d7b5bd1aaea6d64d2e38bceb7e9b031f0f045.zip chromium_src-231d7b5bd1aaea6d64d2e38bceb7e9b031f0f045.tar.gz chromium_src-231d7b5bd1aaea6d64d2e38bceb7e9b031f0f045.tar.bz2 | |
Tweak cc gyps to work in a pure WebKit checkout
When we're in a WebKit checkout our stubs things don't work since the third_party/WebKit...
trick only works for public API headers. This just uses the real WebCore/etc headers in that
configuration.
BUG=
Review URL: https://chromiumcodereview.appspot.com/10908230
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@156485 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc')
| -rw-r--r-- | cc/CCActiveAnimation.cpp | 3 | ||||
| -rw-r--r-- | cc/CCRendererGL.cpp | 1 | ||||
| -rw-r--r-- | cc/cc.gyp | 12 | ||||
| -rw-r--r-- | cc/cc.gypi | 38 |
4 files changed, 46 insertions, 8 deletions
diff --git a/cc/CCActiveAnimation.cpp b/cc/CCActiveAnimation.cpp index 8c2f739..1bf4033 100644 --- a/cc/CCActiveAnimation.cpp +++ b/cc/CCActiveAnimation.cpp @@ -8,6 +8,9 @@ #include "CCAnimationCurve.h" #include "TraceEvent.h" +#ifdef LOG +#undef LOG +#endif #include "base/string_util.h" #include <cmath> #include <wtf/Assertions.h> diff --git a/cc/CCRendererGL.cpp b/cc/CCRendererGL.cpp index 73a2c0c..974683d 100644 --- a/cc/CCRendererGL.cpp +++ b/cc/CCRendererGL.cpp @@ -33,6 +33,7 @@ #undef LOG #endif #include "base/string_split.h" +#include "base/string_util.h" #include <public/WebGraphicsContext3D.h> #include <public/WebSharedGraphicsContext3D.h> #include <public/WebVideoFrame.h> @@ -209,18 +209,14 @@ 'VideoLayerChromium.cpp', 'VideoLayerChromium.h', ], - 'conditions': [ - ['inside_chromium_build==0', { - 'webkit_src_dir': '../../../..', - },{ - 'webkit_src_dir': '../third_party/WebKit', - }], - ], }, 'targets': [ { 'target_name': 'cc', 'type': 'static_library', + 'includes': [ + 'cc.gypi', + ], 'conditions': [ ['use_libcc_for_compositor==1', { 'dependencies': [ @@ -237,8 +233,8 @@ 'WTF_USE_ACCELERATED_COMPOSITING=1', ], 'include_dirs': [ - 'stubs', '<(webkit_src_dir)/Source/Platform/chromium', + '<@(cc_stubs_dirs)', ], 'sources': [ '<@(cc_source_files)', diff --git a/cc/cc.gypi b/cc/cc.gypi new file mode 100644 index 0000000..979b418 --- /dev/null +++ b/cc/cc.gypi @@ -0,0 +1,38 @@ +# Copyright (c) 2012 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. + +{ + 'variables': { + 'variables': { + 'conditions': [ + ['inside_chromium_build==1', { + 'webkit_src_dir': '<(DEPTH)/third_party/WebKit', + }, { + 'webkit_src_dir': '<(DEPTH)/../../..', + }], + ], + }, + 'webkit_src_dir': '<(webkit_src_dir)', + 'conditions': [ + ['inside_chromium_build==1', { + 'cc_stubs_dirs': ['stubs'], + }, { + 'cc_stubs_dirs': [ + '<(SHARED_INTERMEDIATE_DIR)/webkit', + '<(webkit_src_dir)/Source/WebCore/platform', + '<(webkit_src_dir)/Source/WebCore/platform/animation', + '<(webkit_src_dir)/Source/WebCore/platform/chromium', + '<(webkit_src_dir)/Source/WebCore/platform/graphics', + '<(webkit_src_dir)/Source/WebCore/platform/graphics/chromium', + '<(webkit_src_dir)/Source/WebCore/platform/graphics/filters', + '<(webkit_src_dir)/Source/WebCore/platform/graphics/gpu', + '<(webkit_src_dir)/Source/WebCore/platform/graphics/skia', + '<(webkit_src_dir)/Source/WebCore/platform/graphics/transforms', + '<(webkit_src_dir)/Source/WebCore/rendering', + '<(webkit_src_dir)/Source/WebCore/rendering/style', + ], + }], + ], + }, +} |