diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-06-20 13:01:08 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-06-20 13:01:08 +0200 |
| commit | 49233e234e5c787396cadb2cea33b31ae0cd65c1 (patch) | |
| tree | 5410cb9a8fd53168bb60d62c54b654d86f03c38d /Source/WebCore/plugins | |
| parent | b211c645d8ab690f713515dfdc84d80b11c27d2c (diff) | |
| download | qtwebkit-49233e234e5c787396cadb2cea33b31ae0cd65c1.tar.gz | |
Imported WebKit commit 3a8c29f35d00659d2ce7a0ccdfa8304f14e82327 (http://svn.webkit.org/repository/webkit/trunk@120813)
New snapshot with Windows build fixes
Diffstat (limited to 'Source/WebCore/plugins')
| -rw-r--r-- | Source/WebCore/plugins/PluginData.cpp | 6 | ||||
| -rw-r--r-- | Source/WebCore/plugins/win/PluginViewWin.cpp | 9 |
2 files changed, 9 insertions, 6 deletions
diff --git a/Source/WebCore/plugins/PluginData.cpp b/Source/WebCore/plugins/PluginData.cpp index fea5f8091..b8e751df3 100644 --- a/Source/WebCore/plugins/PluginData.cpp +++ b/Source/WebCore/plugins/PluginData.cpp @@ -67,20 +67,14 @@ String PluginData::pluginNameForMimeType(const String& mimeType) const #if USE(PLATFORM_STRATEGIES) void PluginData::refresh() { -#if ENABLE(NETSCAPE_PLUGIN_API) platformStrategies()->pluginStrategy()->refreshPlugins(); -#endif } void PluginData::initPlugins(const Page* page) { -#if ENABLE(NETSCAPE_PLUGIN_API) ASSERT(m_plugins.isEmpty()); platformStrategies()->pluginStrategy()->getPluginInfo(page, m_plugins); -#else - UNUSED_PARAM(page); -#endif } #endif diff --git a/Source/WebCore/plugins/win/PluginViewWin.cpp b/Source/WebCore/plugins/win/PluginViewWin.cpp index a0a2e988f..c857a4010 100644 --- a/Source/WebCore/plugins/win/PluginViewWin.cpp +++ b/Source/WebCore/plugins/win/PluginViewWin.cpp @@ -88,8 +88,12 @@ #if PLATFORM(QT) #include "QWebPageClient.h" +#if HAVE(QT5) +#include <QWindow> +#else #include <QWidget> #endif +#endif #if PLATFORM(WX) #include <wx/defs.h> @@ -101,8 +105,13 @@ static inline HWND windowHandleForPageClient(PlatformPageClient client) #if PLATFORM(QT) if (!client) return 0; +#if HAVE(QT5) + if (QWindow* window = client->ownerWindow()) + return reinterpret_cast<HWND>(window->winId()); +#else if (QWidget* pluginParent = qobject_cast<QWidget*>(client->pluginParent())) return pluginParent->winId(); +#endif return 0; #elif PLATFORM(WX) if (!client) |