1 files changed, 17 insertions, 6 deletions
diff --git a/WebKit/chromium/src/WebPluginContainerImpl.h b/WebKit/chromium/src/WebPluginContainerImpl.h
index 27f5f2e..ebe6983 100644
--- a/WebKit/chromium/src/WebPluginContainerImpl.h
+++ b/WebKit/chromium/src/WebPluginContainerImpl.h
@@ -31,9 +31,10 @@
 #ifndef WebPluginContainerImpl_h
 #define WebPluginContainerImpl_h
 
+#include "PluginViewBase.h"
 #include "WebPluginContainer.h"
-
 #include "Widget.h"
+
 #include <wtf/PassRefPtr.h>
 #include <wtf/Vector.h>
 
@@ -43,7 +44,9 @@ namespace WebCore {
 class HTMLPlugInElement;
 class IntRect;
 class KeyboardEvent;
+class LayerChromium;
 class MouseEvent;
+class PluginLayerChromium;
 class ResourceError;
 class ResourceResponse;
 class WheelEvent;
@@ -54,7 +57,7 @@ namespace WebKit {
 class WebPlugin;
 class WebPluginLoadObserver;
 
-class WebPluginContainerImpl : public WebCore::Widget, public WebPluginContainer {
+class WebPluginContainerImpl : public WebCore::PluginViewBase, public WebPluginContainer {
 public:
     static PassRefPtr<WebPluginContainerImpl> create(WebCore::HTMLPlugInElement* element, WebPlugin* webPlugin)
     {
@@ -79,12 +82,14 @@ public:
     virtual WebElement element();
     virtual void invalidate();
     virtual void invalidateRect(const WebRect&);
+    virtual void scrollRect(int dx, int dy, const WebRect&);
     virtual void reportGeometry();
+    virtual void commitBackingTexture();
     virtual void clearScriptObjects();
     virtual NPObject* scriptableObjectForElement();
     virtual WebString executeScriptURL(const WebURL&, bool popupsAllowed);
     virtual void loadFrameRequest(const WebURLRequest&, const WebString& target, bool notifyNeeded, void* notifyData);
-    virtual void zoomLevelChanged(double zoomLevel);
+    virtual void zoomLevelChanged(double zoomLevel);    
 
     // This cannot be null.
     WebPlugin* plugin() { return m_webPlugin; }
@@ -117,10 +122,12 @@ public:
 
     void willDestroyPluginLoadObserver(WebPluginLoadObserver*);
 
+#if USE(ACCELERATED_COMPOSITING)
+    virtual WebCore::LayerChromium* platformLayer() const;
+#endif
+
 private:
-    WebPluginContainerImpl(WebCore::HTMLPlugInElement* element, WebPlugin* webPlugin)
-        : m_element(element)
-        , m_webPlugin(webPlugin) { }
+    WebPluginContainerImpl(WebCore::HTMLPlugInElement* element, WebPlugin* webPlugin);
     ~WebPluginContainerImpl();
 
     void handleMouseEvent(WebCore::MouseEvent*);
@@ -138,6 +145,10 @@ private:
     WebCore::HTMLPlugInElement* m_element;
     WebPlugin* m_webPlugin;
     Vector<WebPluginLoadObserver*> m_pluginLoadObservers;
+
+#if USE(ACCELERATED_COMPOSITING)
+    RefPtr<WebCore::PluginLayerChromium> m_platformLayer;
+#endif
 };
 
 } // namespace WebKit