diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-18 14:03:11 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-18 14:03:11 +0200 |
| commit | 8d473cf9743f1d30a16a27114e93bd5af5648d23 (patch) | |
| tree | cdca40d0353886b3ca52f33a2d7b8f1c0011aafc /Source/WebCore/plugins | |
| parent | 1b914638db989aaa98631a1c1e02c7b2d44805d8 (diff) | |
| download | qtwebkit-8d473cf9743f1d30a16a27114e93bd5af5648d23.tar.gz | |
Imported WebKit commit 1350e72f7345ced9da2bd9980deeeb5a8d62fab4 (http://svn.webkit.org/repository/webkit/trunk@117578)
Weekly snapshot
Diffstat (limited to 'Source/WebCore/plugins')
| -rw-r--r-- | Source/WebCore/plugins/PluginData.h | 21 | ||||
| -rw-r--r-- | Source/WebCore/plugins/qt/PluginViewQt.cpp | 2 |
2 files changed, 22 insertions, 1 deletions
diff --git a/Source/WebCore/plugins/PluginData.h b/Source/WebCore/plugins/PluginData.h index c6cde81ba..150273904 100644 --- a/Source/WebCore/plugins/PluginData.h +++ b/Source/WebCore/plugins/PluginData.h @@ -33,6 +33,16 @@ struct MimeClassInfo { String type; String desc; Vector<String> extensions; + + MimeClassInfo isolatedCopy() const + { + MimeClassInfo clone; + clone.type = type.isolatedCopy(); + clone.desc = desc.isolatedCopy(); + for (unsigned i = 0; i < extensions.size(); ++i) + clone.extensions.append(extensions[i].isolatedCopy()); + return clone; + } }; inline bool operator==(const MimeClassInfo& a, const MimeClassInfo& b) @@ -45,6 +55,17 @@ struct PluginInfo { String file; String desc; Vector<MimeClassInfo> mimes; + + PluginInfo isolatedCopy() const + { + PluginInfo clone; + clone.name = name.isolatedCopy(); + clone.file = file.isolatedCopy(); + clone.desc = desc.isolatedCopy(); + for (unsigned i = 0; i < mimes.size(); ++i) + clone.mimes.append(mimes[i].isolatedCopy()); + return clone; + } }; // FIXME: merge with PluginDatabase in the future diff --git a/Source/WebCore/plugins/qt/PluginViewQt.cpp b/Source/WebCore/plugins/qt/PluginViewQt.cpp index 6bafe0122..323c55156 100644 --- a/Source/WebCore/plugins/qt/PluginViewQt.cpp +++ b/Source/WebCore/plugins/qt/PluginViewQt.cpp @@ -84,7 +84,7 @@ #if HAVE(QT5) #include "QtX11ImageConversion.h" #include <QGuiApplication> -#include <QPlatformNativeInterface> +#include <qpa/qplatformnativeinterface.h> #include <QWindow> #else #include "PluginContainerQt.h" |