diff options
Diffstat (limited to 'Source/WebCore/plugins/win')
-rw-r--r-- | Source/WebCore/plugins/win/PluginPackageWin.cpp | 5 | ||||
-rw-r--r-- | Source/WebCore/plugins/win/PluginViewWin.cpp | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/Source/WebCore/plugins/win/PluginPackageWin.cpp b/Source/WebCore/plugins/win/PluginPackageWin.cpp index e06d1f4..e835e3c 100644 --- a/Source/WebCore/plugins/win/PluginPackageWin.cpp +++ b/Source/WebCore/plugins/win/PluginPackageWin.cpp @@ -74,6 +74,9 @@ bool PluginPackage::isPluginBlacklisted() } else if (fileName() == "npmozax.dll") { // Bug 15217: Mozilla ActiveX control complains about missing xpcom_core.dll return true; + } else if (fileName() == "npwpf.dll") { + // Bug 57119: Microsoft Windows Presentation Foundation (WPF) plug-in complains about missing xpcom.dll + return true; } else if (name() == "Yahoo Application State Plugin") { // https://bugs.webkit.org/show_bug.cgi?id=26860 // Bug in Yahoo Application State plug-in earlier than 1.0.0.6 leads to heap corruption. @@ -312,7 +315,7 @@ unsigned PluginPackage::hash() const m_mimeToExtensions.size() }; - return WTF::StringHasher::createBlobHash<sizeof(hashCodes)>(hashCodes); + return StringHasher::hashMemory<sizeof(hashCodes)>(hashCodes); } bool PluginPackage::equal(const PluginPackage& a, const PluginPackage& b) diff --git a/Source/WebCore/plugins/win/PluginViewWin.cpp b/Source/WebCore/plugins/win/PluginViewWin.cpp index 208121e..f575709 100644 --- a/Source/WebCore/plugins/win/PluginViewWin.cpp +++ b/Source/WebCore/plugins/win/PluginViewWin.cpp @@ -83,6 +83,7 @@ #endif #if PLATFORM(CAIRO) +#include "PlatformContextCairo.h" #include <cairo-win32.h> #endif @@ -572,8 +573,7 @@ void PluginView::paintWindowedPluginIntoContext(GraphicsContext* context, const // Must flush drawings up to this point to the backing metafile, otherwise the // plugin region will be overwritten with any clear regions specified in the // cairo-controlled portions of the rendering. - PlatformGraphicsContext* ctx = context->platformContext(); - cairo_show_page(ctx); + cairo_show_page(context->platformContext()->cr()); #endif HDC hdc = windowsContext.hdc(); |