| Index: Source/web/WebPluginContainerImpl.h
|
| diff --git a/Source/web/WebPluginContainerImpl.h b/Source/web/WebPluginContainerImpl.h
|
| index b3509868d70f1cc735ae4783c237020761e7f5cd..207889d1e8b7d80d6c5e7cb65f5158f0cc631c05 100644
|
| --- a/Source/web/WebPluginContainerImpl.h
|
| +++ b/Source/web/WebPluginContainerImpl.h
|
| @@ -65,7 +65,7 @@ class WebPlugin;
|
| class WebPluginLoadObserver;
|
| class WebExternalTextureLayer;
|
|
|
| -class WebPluginContainerImpl : public WebCore::PluginView, public WebPluginContainer {
|
| +class WebPluginContainerImpl FINAL : public WebCore::PluginView, public WebPluginContainer {
|
| public:
|
| static PassRefPtr<WebPluginContainerImpl> create(WebCore::HTMLPlugInElement* element, WebPlugin* webPlugin)
|
| {
|
| @@ -82,46 +82,46 @@ public:
|
| virtual bool wantsWheelEvents() OVERRIDE;
|
|
|
| // Widget methods
|
| - virtual void setFrameRect(const WebCore::IntRect&);
|
| - virtual void paint(WebCore::GraphicsContext*, const WebCore::IntRect&);
|
| - virtual void invalidateRect(const WebCore::IntRect&);
|
| - 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::Widget*);
|
| - virtual void widgetPositionsUpdated();
|
| + virtual void setFrameRect(const WebCore::IntRect&) OVERRIDE;
|
| + virtual void paint(WebCore::GraphicsContext*, const WebCore::IntRect&) OVERRIDE;
|
| + virtual void invalidateRect(const WebCore::IntRect&) OVERRIDE;
|
| + virtual void setFocus(bool) OVERRIDE;
|
| + virtual void show() OVERRIDE;
|
| + virtual void hide() OVERRIDE;
|
| + virtual void handleEvent(WebCore::Event*) OVERRIDE;
|
| + virtual void frameRectsChanged() OVERRIDE;
|
| + virtual void setParentVisible(bool) OVERRIDE;
|
| + virtual void setParent(WebCore::Widget*) OVERRIDE;
|
| + virtual void widgetPositionsUpdated() OVERRIDE;
|
| virtual void clipRectChanged() OVERRIDE;
|
| - virtual bool isPluginContainer() const { return true; }
|
| + virtual bool isPluginContainer() const OVERRIDE { return true; }
|
| virtual void eventListenersRemoved() OVERRIDE;
|
|
|
| // 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 allowScriptObjects();
|
| - 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 bool isRectTopmost(const WebRect&);
|
| - virtual void requestTouchEventType(TouchEventRequestType);
|
| - virtual void setWantsWheelEvents(bool);
|
| - virtual WebPoint windowToLocalPoint(const WebPoint&);
|
| - virtual WebPoint localToWindowPoint(const WebPoint&);
|
| + virtual WebElement element() OVERRIDE;
|
| + virtual void invalidate() OVERRIDE;
|
| + virtual void invalidateRect(const WebRect&) OVERRIDE;
|
| + virtual void scrollRect(int dx, int dy, const WebRect&) OVERRIDE;
|
| + virtual void reportGeometry() OVERRIDE;
|
| + virtual void allowScriptObjects() OVERRIDE;
|
| + virtual void clearScriptObjects() OVERRIDE;
|
| + virtual NPObject* scriptableObjectForElement() OVERRIDE;
|
| + virtual WebString executeScriptURL(const WebURL&, bool popupsAllowed) OVERRIDE;
|
| + virtual void loadFrameRequest(const WebURLRequest&, const WebString& target, bool notifyNeeded, void* notifyData) OVERRIDE;
|
| + virtual void zoomLevelChanged(double zoomLevel) OVERRIDE;
|
| + virtual bool isRectTopmost(const WebRect&) OVERRIDE;
|
| + virtual void requestTouchEventType(TouchEventRequestType) OVERRIDE;
|
| + virtual void setWantsWheelEvents(bool) OVERRIDE;
|
| + virtual WebPoint windowToLocalPoint(const WebPoint&) OVERRIDE;
|
| + virtual WebPoint localToWindowPoint(const WebPoint&) OVERRIDE;
|
|
|
| // This cannot be null.
|
| - WebPlugin* plugin() { return m_webPlugin; }
|
| - void setPlugin(WebPlugin*);
|
| + virtual WebPlugin* plugin() OVERRIDE { return m_webPlugin; }
|
| + virtual void setPlugin(WebPlugin*) OVERRIDE;
|
|
|
| - virtual float deviceScaleFactor();
|
| - virtual float pageScaleFactor();
|
| - virtual float pageZoomFactor();
|
| + virtual float deviceScaleFactor() OVERRIDE;
|
| + virtual float pageScaleFactor() OVERRIDE;
|
| + virtual float pageZoomFactor() OVERRIDE;
|
|
|
| virtual void setWebLayer(WebLayer*);
|
|
|
| @@ -164,7 +164,7 @@ public:
|
|
|
| private:
|
| WebPluginContainerImpl(WebCore::HTMLPlugInElement* element, WebPlugin* webPlugin);
|
| - ~WebPluginContainerImpl();
|
| + virtual ~WebPluginContainerImpl();
|
|
|
| void handleMouseEvent(WebCore::MouseEvent*);
|
| void handleDragEvent(WebCore::MouseEvent*);
|
|
|