Merge remote-tracking branch 'origin/5.3' into 5.4

Change-Id: Ideed7a2c21b448633c32f690918eb1ae40355819

6 files changed, 10 insertions, 7 deletions

diff --git a/Source/WebCore/bridge/qt/qt_runtime.cpp b/Source/WebCore/bridge/qt/qt_runtime.cpp
index e6a3e6b9f..58259ff3e 100644
--- a/Source/WebCore/bridge/qt/qt_runtime.cpp
+++ b/Source/WebCore/bridge/qt/qt_runtime.cpp
@@ -638,7 +638,7 @@ QVariant convertValueToQVariant(JSContextRef context, JSValueRef value, QMetaTyp
                         *distance = 1;
                     return QVariant();
                 }
-                if (type == Object) {
+                if (JSValueIsObject(context, value)) {
                     // Since we haven't really visited this object yet, we remove it
                     visitedObjects->remove(object);
                 }
diff --git a/Source/WebCore/platform/qt/PlatformKeyboardEventQt.cpp b/Source/WebCore/platform/qt/PlatformKeyboardEventQt.cpp
index 67b85ceef..f6c4df777 100644
--- a/Source/WebCore/platform/qt/PlatformKeyboardEventQt.cpp
+++ b/Source/WebCore/platform/qt/PlatformKeyboardEventQt.cpp
@@ -140,7 +140,7 @@ String keyIdentifierForQtKeyCode(int keyCode)
     case Qt::Key_Zoom:
         return ASCIILiteral("Zoom");
     case Qt::Key_Comma:
-        return ASCIILiteral("Seperator");
+        return ASCIILiteral("Separator");
     case Qt::Key_Plus:
         return ASCIILiteral("Add");
     case Qt::Key_Minus:
diff --git a/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp b/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp
index 13fbe88d3..ca0f7d371 100644
--- a/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp
+++ b/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp
@@ -258,8 +258,10 @@ void QWebPageAdapter::initializeWebCorePage()
         m_deviceMotionClient = new DeviceMotionClientQt;
     }
 #endif
-    WebCore::provideDeviceOrientationTo(page, m_deviceOrientationClient);
-    WebCore::provideDeviceMotionTo(page, m_deviceMotionClient);
+    if (m_deviceOrientationClient)
+        WebCore::provideDeviceOrientationTo(page, m_deviceOrientationClient);
+    if (m_deviceMotionClient)
+        WebCore::provideDeviceMotionTo(page, m_deviceMotionClient);
 #endif
 
     // By default each page is put into their own unique page group, which affects popup windows
diff --git a/Source/WebKit/qt/docs/qtwebkit-bridge.qdoc b/Source/WebKit/qt/docs/qtwebkit-bridge.qdoc
index c7b3c27e7..5db9e931c 100644
--- a/Source/WebKit/qt/docs/qtwebkit-bridge.qdoc
+++ b/Source/WebKit/qt/docs/qtwebkit-bridge.qdoc
@@ -360,8 +360,8 @@
     \snippet webkitsnippets/qtwebkit_bridge_snippets.cpp 1
 
     The JavaScript environment can then use the pixmap from Qt and display it inside the HTML environment,
-    by assigning it to an existing \c{<img>} element with \c{assignToHTMLImageElement()}. It can also use the \c{toDataURL()} function,
-    which allows using the pixmap as the \c{src} attribute of an image or as a \c{background-image} URL. Note that the \c{toDataURL()}
+    by assigning it to an existing \c{<img>} element with \c{assignToHTMLImageElement()}. It can also use the \c{toDataUrl()} function,
+    which allows using the pixmap as the \c{src} attribute of an image or as a \c{background-image} URL. Note that the \c{toDataUrl()}
     function is costly and should be used with caution.
     It can also use the \c{toImageData()} function to convert the pixmap to a JavaScript \c{ImageData} object.
 
diff --git a/Source/WebKit/qt/docs/webkitsnippets/qtwebkit_bridge_snippets.cpp b/Source/WebKit/qt/docs/webkitsnippets/qtwebkit_bridge_snippets.cpp
index 27018af33..14331d195 100644
--- a/Source/WebKit/qt/docs/webkitsnippets/qtwebkit_bridge_snippets.cpp
+++ b/Source/WebKit/qt/docs/webkitsnippets/qtwebkit_bridge_snippets.cpp
@@ -13,7 +13,7 @@ void wrapInFunction()
     {
         width: ...,
         height: ...,
-        toDataURL: function() { ... },
+        toDataUrl: function() { ... },
         assignToHTMLImageElement: function(element) { ... }
         toImageData: function() { ... }
     }
diff --git a/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp b/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp
index 86b8cb4d4..e260bb56f 100644
--- a/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp
+++ b/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp
@@ -527,6 +527,7 @@ void QQuickWebViewPrivate::didChangeBackForwardList(WKPageRef, WKBackForwardList
 void QQuickWebViewPrivate::setTransparentBackground(bool enable)
 {
     webPageProxy->setDrawsTransparentBackground(enable);
+    webPageProxy->setDrawsBackground(!enable);
 }
 
 bool QQuickWebViewPrivate::transparentBackground() const