1 files changed, 45 insertions, 12 deletions

diff --git a/WebKit/chromium/src/WebPluginContainerImpl.h b/WebKit/chromium/src/WebPluginContainerImpl.h
index 00450bb..ebe6983 100644
--- a/WebKit/chromium/src/WebPluginContainerImpl.h
+++ b/WebKit/chromium/src/WebPluginContainerImpl.h
@@ -31,11 +31,10 @@
 #ifndef WebPluginContainerImpl_h
 #define WebPluginContainerImpl_h
 
-// FIXME: This relative path is a temporary hack to support using this
-// header from webkit/glue.
-#include "../public/WebPluginContainer.h"
-
+#include "PluginViewBase.h"
+#include "WebPluginContainer.h"
 #include "Widget.h"
+
 #include <wtf/PassRefPtr.h>
 #include <wtf/Vector.h>
 
@@ -45,9 +44,12 @@ namespace WebCore {
 class HTMLPlugInElement;
 class IntRect;
 class KeyboardEvent;
+class LayerChromium;
 class MouseEvent;
+class PluginLayerChromium;
 class ResourceError;
 class ResourceResponse;
+class WheelEvent;
 }
 
 namespace WebKit {
@@ -55,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)
     {
@@ -66,22 +68,49 @@ public:
     virtual void setFrameRect(const WebCore::IntRect&);
     virtual void paint(WebCore::GraphicsContext*, const WebCore::IntRect&);
     virtual void invalidateRect(const WebCore::IntRect&);
-    virtual void setFocus();
+    virtual void setFocus(bool);
     virtual void show();
     virtual void hide();
     virtual void handleEvent(WebCore::Event*);
     virtual void frameRectsChanged();
     virtual void setParentVisible(bool);
     virtual void setParent(WebCore::ScrollView*);
+    virtual void widgetPositionsUpdated();
+    virtual bool isPluginContainer() const { return true; }
 
     // WebPluginContainer methods
+    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);    
+
+    // This cannot be null.
+    WebPlugin* plugin() { return m_webPlugin; }
+    void setPlugin(WebPlugin* plugin) { m_webPlugin = plugin; }
+
+    // Printing interface. The plugin can support custom printing
+    // (which means it controls the layout, number of pages etc).
+    // Whether the plugin supports its own paginated print. The other print
+    // interface methods are called only if this method returns true.
+    bool supportsPaginatedPrint() const;
+    // Sets up printing at the given print rect and printer DPI. printableArea
+    // is in points (a point is 1/72 of an inch).Returns the number of pages to
+    // be printed at these settings.
+    int printBegin(const WebCore::IntRect& printableArea, int printerDPI) const;
+    // Prints the page specified by pageNumber (0-based index) into the supplied canvas.
+    bool printPage(int pageNumber, WebCore::GraphicsContext* gc);
+    // Ends the print operation.
+    void printEnd();
+
+    // Copy the selected text.
+    void copy();
 
     // Resource load events for the plugin's source data:
     void didReceiveResponse(const WebCore::ResourceResponse&);
@@ -91,18 +120,18 @@ public:
 
     NPObject* scriptableObject();
 
-    // This cannot be null.
-    WebPlugin* plugin() { return m_webPlugin; }
-
     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*);
+    void handleWheelEvent(WebCore::WheelEvent*);
     void handleKeyboardEvent(WebCore::KeyboardEvent*);
 
     void calculateGeometry(const WebCore::IntRect& frameRect,
@@ -116,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