| Index: content/shell/renderer/test_runner/TestPlugin.h
|
| diff --git a/content/shell/renderer/test_runner/TestPlugin.h b/content/shell/renderer/test_runner/TestPlugin.h
|
| index 8c1f06b775c2f02371389e0b97f6a7df1239f4f9..6d05ed8c4c16a1cbb82bf296e8785520acf52cab 100644
|
| --- a/content/shell/renderer/test_runner/TestPlugin.h
|
| +++ b/content/shell/renderer/test_runner/TestPlugin.h
|
| @@ -11,15 +11,17 @@
|
| #include "base/memory/scoped_ptr.h"
|
| #include "cc/layers/texture_layer.h"
|
| #include "cc/layers/texture_layer_client.h"
|
| +#include "content/public/test/layouttest_support.h"
|
| #include "third_party/WebKit/public/platform/WebExternalTextureLayer.h"
|
| #include "third_party/WebKit/public/platform/WebExternalTextureLayerClient.h"
|
| #include "third_party/WebKit/public/platform/WebExternalTextureMailbox.h"
|
| +#include "third_party/WebKit/public/platform/WebLayer.h"
|
| #include "third_party/WebKit/public/web/WebPlugin.h"
|
| #include "third_party/WebKit/public/web/WebPluginContainer.h"
|
| -#include "webkit/renderer/compositor_bindings/web_layer_impl.h"
|
|
|
| namespace blink {
|
| class WebFrame;
|
| +class WebLayer;
|
| }
|
|
|
| namespace content {
|
| @@ -138,7 +140,7 @@ private:
|
| unsigned m_framebuffer;
|
| Scene m_scene;
|
| scoped_refptr<cc::TextureLayer> m_layer;
|
| - scoped_ptr<webkit::WebLayerImpl> m_webLayer;
|
| + scoped_ptr<blink::WebLayer> m_webLayer;
|
|
|
| blink::WebPluginContainer::TouchEventRequestType m_touchEventRequest;
|
| // Requests touch events from the WebPluginContainerImpl multiple times to tickle webkit.org/b/108381
|
|
|