Index: third_party/WebKit/Source/web/WebPluginContainerImpl.h |
diff --git a/third_party/WebKit/Source/web/WebPluginContainerImpl.h b/third_party/WebKit/Source/web/WebPluginContainerImpl.h |
index ef1ac551dfa4c49f1fb59354fade16e5bc7de3a3..39eb25ba79c3729b1e19a2fd46f4ec527b652619 100644 |
--- a/third_party/WebKit/Source/web/WebPluginContainerImpl.h |
+++ b/third_party/WebKit/Source/web/WebPluginContainerImpl.h |
@@ -33,7 +33,7 @@ |
#define WebPluginContainerImpl_h |
#include "core/dom/ContextLifecycleObserver.h" |
-#include "core/plugins/PluginView.h" |
+#include "core/exported/WebPluginContainerBase.h" |
#include "platform/heap/Handle.h" |
#include "platform/wtf/Compiler.h" |
#include "platform/wtf/PassRefPtr.h" |
@@ -60,14 +60,7 @@ class WheelEvent; |
struct WebPrintParams; |
struct WebPrintPresetOptions; |
-class WEB_EXPORT WebPluginContainerImpl final |
- : public GarbageCollectedFinalized<WebPluginContainerImpl>, |
- public PluginView, |
- NON_EXPORTED_BASE(public WebPluginContainer), |
- public ContextClient { |
- USING_GARBAGE_COLLECTED_MIXIN(WebPluginContainerImpl); |
- USING_PRE_FINALIZER(WebPluginContainerImpl, Dispose); |
- |
+class WEB_EXPORT WebPluginContainerImpl final : public WebPluginContainerBase { |
public: |
static WebPluginContainerImpl* Create(HTMLPlugInElement* element, |
WebPlugin* web_plugin) { |
@@ -147,34 +140,37 @@ class WEB_EXPORT WebPluginContainerImpl final |
// (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; |
+ bool SupportsPaginatedPrint() const override; |
// If the plugin content should not be scaled to the printable area of |
// the page, then this method should return true. |
- bool IsPrintScalingDisabled() const; |
+ bool IsPrintScalingDisabled() const override; |
// Returns true on success and sets the out parameter to the print preset |
// options for the document. |
- bool GetPrintPresetOptionsFromDocument(WebPrintPresetOptions*) const; |
+ bool GetPrintPresetOptionsFromDocument(WebPrintPresetOptions*) const override; |
// Sets up printing at the specified WebPrintParams. Returns the number of |
// pages to be printed at these settings. |
- int PrintBegin(const WebPrintParams&) const; |
+ int PrintBegin(const WebPrintParams&) const override; |
// Prints the page specified by pageNumber (0-based index) into the supplied |
// canvas. |
- void PrintPage(int page_number, GraphicsContext&, const IntRect& paint_rect); |
+ void PrintPage(int page_number, |
+ GraphicsContext&, |
+ const IntRect& paint_rect) override; |
// Ends the print operation. |
- void PrintEnd(); |
+ void PrintEnd() override; |
// Copy the selected text. |
void Copy(); |
// Pass the edit command to the plugin. |
- bool ExecuteEditCommand(const WebString& name); |
- bool ExecuteEditCommand(const WebString& name, const WebString& value); |
+ bool ExecuteEditCommand(const WebString& name) override; |
+ bool ExecuteEditCommand(const WebString& name, |
+ const WebString& value) override; |
// Resource load events for the plugin's source data: |
void DidReceiveResponse(const ResourceResponse&) override; |
void DidReceiveData(const char* data, int data_length) override; |
- void DidFinishLoading(); |
- void DidFailLoading(const ResourceError&); |
+ void DidFinishLoading() override; |
+ void DidFailLoading(const ResourceError&) override; |
DECLARE_VIRTUAL_TRACE(); |
void Dispose() override; |
@@ -212,7 +208,7 @@ class WEB_EXPORT WebPluginContainerImpl final |
void CalculateGeometry(IntRect& window_rect, |
IntRect& clip_rect, |
- IntRect& unobscured_rect); |
+ IntRect& unobscured_rect) override; |
friend class WebPluginContainerTest; |