diff options
| author | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-06 09:48:28 +0000 |
|---|---|---|
| committer | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-06 09:48:28 +0000 |
| commit | ba91a797de94b0ed95c180e7b9c3e0d8546915e2 (patch) | |
| tree | e328459748d4767c89cbe7de8bc5e4649b550d1f /webkit | |
| parent | b9cdd7d3627f24485722552323eb7fd4be8dbd98 (diff) | |
| download | chromium_src-ba91a797de94b0ed95c180e7b9c3e0d8546915e2.zip chromium_src-ba91a797de94b0ed95c180e7b9c3e0d8546915e2.tar.gz chromium_src-ba91a797de94b0ed95c180e7b9c3e0d8546915e2.tar.bz2 | |
Construct and initialize compositor view in content
This extracts the WebLayerTreeView initialization code out of RenderWidget
and creates a new class, RenderWidgetCompositor, to handle initialization.
BUG=
Review URL: https://chromiumcodereview.appspot.com/12210005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@180947 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/compositor_bindings/web_layer_impl.h | 4 | ||||
| -rw-r--r-- | webkit/compositor_bindings/web_to_ccinput_handler_adapter.h | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/webkit/compositor_bindings/web_layer_impl.h b/webkit/compositor_bindings/web_layer_impl.h index 5e159d9..af77caf 100644 --- a/webkit/compositor_bindings/web_layer_impl.h +++ b/webkit/compositor_bindings/web_layer_impl.h @@ -24,6 +24,8 @@ public: WEBKIT_COMPOSITOR_BINDINGS_EXPORT explicit WebLayerImpl(scoped_refptr<cc::Layer>); virtual ~WebLayerImpl(); + WEBKIT_COMPOSITOR_BINDINGS_EXPORT cc::Layer* layer() const; + // WebLayer implementation. virtual int id() const OVERRIDE; virtual void invalidateRect(const WebFloatRect&) OVERRIDE; @@ -95,8 +97,6 @@ public: virtual bool fixedToContainerLayer() const; virtual void setScrollClient(WebLayerScrollClient*) OVERRIDE; - cc::Layer* layer() const; - protected: scoped_refptr<cc::Layer> m_layer; }; diff --git a/webkit/compositor_bindings/web_to_ccinput_handler_adapter.h b/webkit/compositor_bindings/web_to_ccinput_handler_adapter.h index f8462c7..cf2c112 100644 --- a/webkit/compositor_bindings/web_to_ccinput_handler_adapter.h +++ b/webkit/compositor_bindings/web_to_ccinput_handler_adapter.h @@ -8,12 +8,13 @@ #include "base/memory/scoped_ptr.h" #include "cc/input_handler.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebInputHandler.h" +#include "webkit/compositor_bindings/webkit_compositor_bindings_export.h" namespace WebKit { class WebToCCInputHandlerAdapter : public cc::InputHandler { public: - static scoped_ptr<WebToCCInputHandlerAdapter> create(scoped_ptr<WebInputHandler>); + WEBKIT_COMPOSITOR_BINDINGS_EXPORT static scoped_ptr<WebToCCInputHandlerAdapter> create(scoped_ptr<WebInputHandler>); virtual ~WebToCCInputHandlerAdapter(); // cc::InputHandler implementation. |