Merge 'wip/next' into dev

Change-Id: Iff9ee5e23bb326c4371ec8ed81d56f2f05d680e9

3 files changed, 10 insertions, 5 deletions

diff --git a/Source/WebKit2/UIProcess/API/cpp/qt/WKStringQt.cpp b/Source/WebKit2/UIProcess/API/cpp/qt/WKStringQt.cpp
index 4ae448e62..6fad021f6 100644
--- a/Source/WebKit2/UIProcess/API/cpp/qt/WKStringQt.cpp
+++ b/Source/WebKit2/UIProcess/API/cpp/qt/WKStringQt.cpp
@@ -39,8 +39,13 @@ QString WKStringCopyQString(WKStringRef stringRef)
 {
     if (!stringRef)
         return QString();
-    const WTF::String& string = toImpl(stringRef)->string();
-    return QString(reinterpret_cast<const QChar*>(string.characters()), string.length());
+
+    auto stringView = toImpl(stringRef)->stringView();
+
+    if (stringView.is8Bit())
+        return QString::fromLatin1(reinterpret_cast<const char*>(stringView.characters8()), stringView.length());
+
+    return QString(reinterpret_cast<const QChar*>(stringView.characters16()), stringView.length());
 }
 
 namespace WebKit {
diff --git a/Source/WebKit2/UIProcess/API/cpp/qt/WKStringQt.h b/Source/WebKit2/UIProcess/API/cpp/qt/WKStringQt.h
index ff2cfa837..3c2fda240 100644
--- a/Source/WebKit2/UIProcess/API/cpp/qt/WKStringQt.h
+++ b/Source/WebKit2/UIProcess/API/cpp/qt/WKStringQt.h
@@ -22,7 +22,7 @@
 #define WKStringQt_h
 
 #include <QString>
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
 
 WK_EXPORT WKStringRef WKStringCreateWithQString(const QString& string);
 WK_EXPORT QString WKStringCopyQString(WKStringRef string);
diff --git a/Source/WebKit2/UIProcess/API/cpp/qt/WKURLQt.h b/Source/WebKit2/UIProcess/API/cpp/qt/WKURLQt.h
index b12f97459..6cef82f7c 100644
--- a/Source/WebKit2/UIProcess/API/cpp/qt/WKURLQt.h
+++ b/Source/WebKit2/UIProcess/API/cpp/qt/WKURLQt.h
@@ -22,8 +22,8 @@
 #define WKURLQt_h
 
 #include <QUrl>
-#include <WebKit2/WKBase.h>
-#include <WebKit2/WKURL.h>
+#include <WebKit/WKBase.h>
+#include <WebKit/WKURL.h>
 
 WK_EXPORT WKURLRef WKURLCreateWithQString(const QString& url);
 WK_EXPORT QString WKURLCopyQString(WKURLRef url);