diff options
| author | Michael Brüning <michael.bruning@digia.com> | 2013-11-14 18:49:17 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-16 17:43:07 +0100 |
| commit | c317e5d8d991537889d674f8ee8c0736ca4f268b (patch) | |
| tree | 2c9d0ec5de9c81bb38b11570c52cb4d0559be2a8 /Source/WebCore/html | |
| parent | 049fcfba58eb1a3e71859f27cbb6a8c62a99db02 (diff) | |
Add padding objects for classes with netscape plugin api conditionals.
When building with the Visual Studio Compiler on windows, we are facing
some problems because objects that are shared between WebKit1 and
WebKit2 have different memory maps for inlined accessors because the
Netscape Plugin API had to be disabled for the WebKit2 API on Windows
in the new snapshot for Qt 5.2.
This caused plugins not to be loaded because the wrong values for the
mime types and urls are returned and might lead to all kinds of bugs and
quirks.
This patch adds dummy pointers / data structures for the parts of the
build that do not have the Netscape Plugin API enabled.
Task-number: QTBUG-34280
Change-Id: Iaa2cd2b19d07eff71981f392d913ae5218495266
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
Reviewed-by: Michael Bruning <michael.bruning@digia.com>
Diffstat (limited to 'Source/WebCore/html')
| -rw-r--r-- | Source/WebCore/html/HTMLPlugInElement.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/Source/WebCore/html/HTMLPlugInElement.h b/Source/WebCore/html/HTMLPlugInElement.h index 83b9e6cf3..b5ccbb887 100644 --- a/Source/WebCore/html/HTMLPlugInElement.h +++ b/Source/WebCore/html/HTMLPlugInElement.h @@ -26,9 +26,7 @@ #include "HTMLFrameOwnerElement.h" #include "Image.h" -#if ENABLE(NETSCAPE_PLUGIN_API) struct NPObject; -#endif namespace JSC { namespace Bindings { @@ -109,9 +107,7 @@ private: virtual bool isPluginElement() const OVERRIDE; RefPtr<JSC::Bindings::Instance> m_instance; -#if ENABLE(NETSCAPE_PLUGIN_API) NPObject* m_NPObject; -#endif bool m_isCapturingMouseEvents; DisplayState m_displayState; |