diff options
| author | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-19 02:47:18 +0000 |
|---|---|---|
| committer | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-19 02:48:29 +0000 |
| commit | 38564621b3363efe786f4f24000e663d832e4b9b (patch) | |
| tree | 24e1efd151b4c718682a6cc3dc6a30cc829889cd /content/test/layouttest_support.cc | |
| parent | 5d19fee72e4c6147fee799406b6b438002162b1f (diff) | |
| download | chromium_src-38564621b3363efe786f4f24000e663d832e4b9b.zip chromium_src-38564621b3363efe786f4f24000e663d832e4b9b.tar.gz chromium_src-38564621b3363efe786f4f24000e663d832e4b9b.tar.bz2 | |
Move blink<->cc bindings to cc/blink
These files provide the implementations of the public Blink API that
bind to the cc implementation. This moves them out of content/ into a
subdirectory of cc/ so that we can reuse these files in mojo which
can depend on cc/ and on blink but not on content/. To make sure we
don't introduce dependencies from cc/ on blink proper, cc/DEPS forbids
including cc/blink/ and cc/blink/DEPS allows using the blink headers.
cc_blink is built as a separate component to avoid linking anything from
blink into targets that don't care about the blink bindings (such as
the browser compositor).
R=darin@chromium.org
Review URL: https://codereview.chromium.org/470983004
Cr-Commit-Position: refs/heads/master@{#290464}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@290464 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/test/layouttest_support.cc')
| -rw-r--r-- | content/test/layouttest_support.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/content/test/layouttest_support.cc b/content/test/layouttest_support.cc index 016d459..b2effb5 100644 --- a/content/test/layouttest_support.cc +++ b/content/test/layouttest_support.cc @@ -6,10 +6,10 @@ #include "base/callback.h" #include "base/lazy_instance.h" +#include "cc/blink/web_layer_impl.h" #include "content/browser/renderer_host/render_widget_host_impl.h" #include "content/common/gpu/image_transport_surface.h" #include "content/public/common/page_state.h" -#include "content/renderer/compositor_bindings/web_layer_impl.h" #include "content/renderer/history_entry.h" #include "content/renderer/history_serialization.h" #include "content/renderer/render_frame_impl.h" @@ -353,7 +353,7 @@ std::string DumpBackForwardList(std::vector<PageState>& page_state, } blink::WebLayer* InstantiateWebLayer(scoped_refptr<cc::TextureLayer> layer) { - return new WebLayerImpl(layer); + return new cc_blink::WebLayerImpl(layer); } } // namespace content |