diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-12 14:45:04 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-12 14:45:05 +0200 |
| commit | cabbad3ff6732e07d614eb743a59496d73aabb28 (patch) | |
| tree | 0799683696ef54345680a799e9a5e5586082bf9e /Source/WebCore/plugins/PluginView.cpp | |
| parent | 289da5616df56912fa6f8c319d61fb4489c51add (diff) | |
| parent | 1810e3848d15ffbe9529f53866fc0ede8d947fef (diff) | |
| download | qtwebkit-cabbad3ff6732e07d614eb743a59496d73aabb28.tar.gz | |
Merge remote-tracking branch 'origin/release' into stable
Change-Id: I66f94d7e3dea401f7a89a00fb474532377baf6c4
Diffstat (limited to 'Source/WebCore/plugins/PluginView.cpp')
| -rw-r--r-- | Source/WebCore/plugins/PluginView.cpp | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/Source/WebCore/plugins/PluginView.cpp b/Source/WebCore/plugins/PluginView.cpp index 8a31103af..cdf8a78bb 100644 --- a/Source/WebCore/plugins/PluginView.cpp +++ b/Source/WebCore/plugins/PluginView.cpp @@ -646,11 +646,7 @@ NPError PluginView::setValue(NPPVariable variable, void* value) NPDrawingModel newDrawingModel = NPDrawingModel(uintptr_t(value)); switch (newDrawingModel) { case NPDrawingModelCoreGraphics: - m_drawingModel = newDrawingModel; return NPERR_NO_ERROR; -#ifndef NP_NO_QUICKDRAW - case NPDrawingModelQuickDraw: -#endif case NPDrawingModelCoreAnimation: default: LOG(Plugins, "Plugin asked for unsupported drawing model: %s", @@ -666,13 +662,8 @@ NPError PluginView::setValue(NPPVariable variable, void* value) NPEventModel newEventModel = NPEventModel(uintptr_t(value)); switch (newEventModel) { -#ifndef NP_NO_CARBON - case NPEventModelCarbon: -#endif case NPEventModelCocoa: - m_eventModel = newEventModel; return NPERR_NO_ERROR; - default: LOG(Plugins, "Plugin asked for unsupported event model: %s", prettyNameForEventModel(newEventModel)); @@ -856,14 +847,11 @@ PluginView::PluginView(Frame* parentFrame, const IntSize& size, PluginPackage* p , m_wmPrintHDC(0) , m_haveUpdatedPluginWidget(false) #endif -#if (PLATFORM(QT) && OS(WINDOWS)) || defined(XP_MACOSX) || PLATFORM(EFL) +#if (PLATFORM(QT) && OS(WINDOWS)) || PLATFORM(EFL) , m_window(0) #endif #if defined(XP_MACOSX) - , m_drawingModel(NPDrawingModel(-1)) - , m_eventModel(NPEventModel(-1)) , m_contextRef(0) - , m_fakeWindow(0) #endif #if defined(XP_UNIX) && ENABLE(NETSCAPE_PLUGIN_API) , m_hasPendingGeometryChange(true) |