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

Unified Diff: content/shell/renderer/test_runner/TestPlugin.h

Issue 317163002: Moving compositor_bindings from webkit to content (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Changing dependencies due to failing ios bots Created 6 years, 6 months 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
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
« no previous file with comments | « content/renderer/renderer_webkitplatformsupport_impl.h ('k') | content/shell/renderer/test_runner/TestPlugin.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698