From 1bf1084f2b10c3b47fd1a588d85d21ed0eb41d0c Mon Sep 17 00:00:00 2001 From: Lorry Tar Creator Date: Tue, 27 Jun 2017 06:07:23 +0000 Subject: webkitgtk-2.16.5 --- Source/WebCore/plugins/PluginViewBase.h | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) (limited to 'Source/WebCore/plugins/PluginViewBase.h') diff --git a/Source/WebCore/plugins/PluginViewBase.h b/Source/WebCore/plugins/PluginViewBase.h index 84cd5f81b..5d8e321b6 100644 --- a/Source/WebCore/plugins/PluginViewBase.h +++ b/Source/WebCore/plugins/PluginViewBase.h @@ -22,9 +22,10 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef PluginWidget_h -#define PluginWidget_h +#pragma once +#include "AudioHardwareListener.h" +#include "BridgeJSC.h" #include "PlatformLayer.h" #include "ScrollTypes.h" #include "Widget.h" @@ -44,13 +45,11 @@ class Scrollbar; // It's intended as a stopgap measure until we can merge all plug-in views into a single plug-in view. class PluginViewBase : public Widget { public: -#if USE(ACCELERATED_COMPOSITING) virtual PlatformLayer* platformLayer() const { return 0; } #if PLATFORM(IOS) virtual bool willProvidePluginLayer() const { return false; } virtual void attachPluginLayer() { } virtual void detachPluginLayer() { } -#endif #endif virtual JSC::JSObject* scriptObject(JSC::JSGlobalObject*) { return 0; } @@ -73,15 +72,21 @@ public: virtual bool shouldAllowNavigationFromDrags() const { return false; } - virtual bool isPluginViewBase() const { return true; } + bool isPluginViewBase() const override { return true; } virtual bool shouldNotAddLayer() const { return false; } + virtual AudioHardwareActivityType audioHardwareActivity() const { return AudioHardwareActivityType::Unknown; } + + virtual void setJavaScriptPaused(bool) { } + + virtual RefPtr bindingInstance() { return nullptr; } + + virtual void willDetatchRenderer() { } + protected: explicit PluginViewBase(PlatformWidget widget = 0) : Widget(widget) { } }; -WIDGET_TYPE_CASTS(PluginViewBase, isPluginViewBase()); - } // namespace WebCore -#endif // PluginWidget_h +SPECIALIZE_TYPE_TRAITS_WIDGET(PluginViewBase, isPluginViewBase()) -- cgit v1.2.1