Merge 'wip/next' into dev

Change-Id: Iff9ee5e23bb326c4371ec8ed81d56f2f05d680e9

1 files changed, 14 insertions, 14 deletions

diff --git a/Source/WebKit2/UIProcess/Plugins/qt/PluginProcessProxyQt.cpp b/Source/WebKit2/UIProcess/Plugins/qt/PluginProcessProxyQt.cpp
index 47b118a4b..ff5ed76de 100644
--- a/Source/WebKit2/UIProcess/Plugins/qt/PluginProcessProxyQt.cpp
+++ b/Source/WebKit2/UIProcess/Plugins/qt/PluginProcessProxyQt.cpp
@@ -44,15 +44,14 @@
 #include <QStringBuilder>
 #include <QVariant>
 #include <WebCore/FileSystem.h>
-#include <wtf/OwnPtr.h>
-#include <wtf/PassOwnPtr.h>
 
 namespace WebKit {
 
-class PluginProcessCreationParameters;
+struct PluginProcessCreationParameters;
 
 void PluginProcessProxy::platformGetLaunchOptions(ProcessLauncher::LaunchOptions& launchOptions, const PluginProcessAttributes& pluginProcessAttributes)
 {
+    launchOptions.processType = ProcessLauncher::ProcessType::Plugin64;
     launchOptions.extraInitializationData.add("plugin-path", pluginProcessAttributes.moduleInfo.path);
 }
 
@@ -60,23 +59,25 @@ void PluginProcessProxy::platformInitializePluginProcess(PluginProcessCreationPa
 {
 }
 
-static PassOwnPtr<QFile> cacheFile()
+#if PLUGIN_ARCHITECTURE(X11)
+
+static std::unique_ptr<QFile> cacheFile()
 {
     QString cachePath = QStandardPaths::writableLocation(QStandardPaths::CacheLocation);
     if (cachePath.isEmpty())
-        return PassOwnPtr<QFile>();
+        return std::make_unique<QFile>();
 
     // This should match the path set through WKContextSetDiskCacheDirectory.
     cachePath.append(QDir::separator()).append(QStringLiteral(".QtWebKit")).append(QDir::separator());
     QString cacheFilePath = cachePath % QStringLiteral("plugin_meta_data.json");
 
     QDir::root().mkpath(cachePath);
-    return adoptPtr(new QFile(cacheFilePath));
+    return std::make_unique<QFile>(cacheFilePath);
 }
 
 static void removeCacheFile()
 {
-    if (OwnPtr<QFile> file = cacheFile())
+    if (auto file = cacheFile())
         file->remove();
 }
 
@@ -90,7 +91,7 @@ struct ReadResult {
 
 static ReadResult::Tag readMetaDataFromCacheFile(QJsonDocument& result)
 {
-    OwnPtr<QFile> file = cacheFile();
+    auto file = cacheFile();
     if (!file || !file->open(QFile::ReadOnly))
         return ReadResult::Empty;
     QByteArray data = file->readAll();
@@ -110,7 +111,7 @@ static ReadResult::Tag readMetaDataFromCacheFile(QJsonDocument& result)
 
 static void writeToCacheFile(const QJsonArray& array)
 {
-    OwnPtr<QFile> file = cacheFile();
+    auto file = cacheFile();
     if (file && file->open(QFile::WriteOnly | QFile::Truncate))
         // Don't care about write error here. We will detect it later.
         file->write(QJsonDocument(array).toJson());
@@ -168,7 +169,7 @@ static MetaDataResult::Tag tryReadPluginMetaDataFromCacheFile(const QString& can
                 return MetaDataResult::NotAvailable;
             }
 
-            if (object.contains(QLatin1String("unloadable")))
+            if (object.contains(QStringLiteral("unloadable")))
                 return MetaDataResult::Unloadable;
 
             // Match.
@@ -213,11 +214,8 @@ bool PluginProcessProxy::scanPlugin(const String& pluginPath, RawPluginMetaData&
                            && process.exitCode() == EXIT_SUCCESS;
     if (ranSuccessfully) {
         QByteArray outputBytes = process.readAll();
-        ASSERT(!(outputBytes.size() % sizeof(UChar)));
-
-        String output(reinterpret_cast<const UChar*>(outputBytes.constData()), outputBytes.size() / sizeof(UChar));
         Vector<String> lines;
-        output.split(UChar('\n'), true, lines);
+        String::fromUTF8(outputBytes.data(), outputBytes.size()).split('\n', true, lines);
         ASSERT(lines.size() == 4 && lines.last().isEmpty());
 
         result.name.swap(lines[0]);
@@ -246,6 +244,8 @@ bool PluginProcessProxy::scanPlugin(const String& pluginPath, RawPluginMetaData&
     return true;
 }
 
+#endif // PLUGIN_ARCHITECTURE(X11)
+
 } // namespace WebKit
 
 #endif // ENABLE(PLUGIN_PROCESS)