Import Qt5x2 branch of QtWebkit for Qt 5.2

Importing a new snapshot of webkit.

Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>

1 files changed, 27 insertions, 25 deletions

diff --git a/Source/WebKit/qt/WidgetApi/qwebpage.cpp b/Source/WebKit/qt/WidgetApi/qwebpage.cpp
index d6cdb013b..0f3f14d39 100644
--- a/Source/WebKit/qt/WidgetApi/qwebpage.cpp
+++ b/Source/WebKit/qt/WidgetApi/qwebpage.cpp
@@ -834,32 +834,27 @@ void QWebPagePrivate::keyPressEvent(QKeyEvent *ev)
     // to trigger editor commands via triggerAction().
     bool handled = handleKeyEvent(ev);
 
+    if (!handled)
+        handled = handleScrolling(ev);
+
     if (!handled) {
         handled = true;
-        if (!handleScrolling(ev)) {
-            switch (ev->key()) {
-            case Qt::Key_Back:
-                q->triggerAction(QWebPage::Back);
-                break;
-            case Qt::Key_Forward:
-                q->triggerAction(QWebPage::Forward);
-                break;
-            case Qt::Key_Stop:
-                q->triggerAction(QWebPage::Stop);
-                break;
-            case Qt::Key_Refresh:
-                q->triggerAction(QWebPage::Reload);
-                break;
-            case Qt::Key_Backspace:
-                if (ev->modifiers() == Qt::ShiftModifier)
-                    q->triggerAction(QWebPage::Forward);
-                else
-                    q->triggerAction(QWebPage::Back);
-                break;
-            default:
-                handled = false;
-                break;
-            }
+        switch (ev->key()) {
+        case Qt::Key_Back:
+            q->triggerAction(QWebPage::Back);
+            break;
+        case Qt::Key_Forward:
+            q->triggerAction(QWebPage::Forward);
+            break;
+        case Qt::Key_Stop:
+            q->triggerAction(QWebPage::Stop);
+            break;
+        case Qt::Key_Refresh:
+            q->triggerAction(QWebPage::Reload);
+            break;
+        default:
+            handled = false;
+            break;
         }
     }
 
@@ -1051,6 +1046,13 @@ QWebInspector* QWebPagePrivate::getOrCreateInspector()
    was reached and the text was not found.
    \value HighlightAllOccurrences Highlights all existing occurrences of a specific string.
        (This value was introduced in 4.6.)
+   \value FindAtWordBeginningsOnly Searches for the sub-string only at the beginnings of words.
+       (This value was introduced in 5.2.)
+   \value TreatMedialCapitalAsWordBeginning Treats a capital letter occurring anywhere in the middle of a word
+   as the beginning of a new word.
+       (This value was introduced in 5.2.)
+   \value FindBeginsInSelection Begin searching inside the text selection first.
+       (This value was introduced in 5.2.)
 */
 
 /*!
@@ -1610,7 +1612,7 @@ void QWebPage::setFeaturePermission(QWebFrame* frame, Feature feature, Permissio
 #endif
         break;
     case Geolocation:
-#if ENABLE(GEOLOCATION)
+#if ENABLE(GEOLOCATION) && HAVE(QTLOCATION)
         if (policy != PermissionUnknown)
             d->setGeolocationEnabledForFrame(frame->d, (policy == PermissionGrantedByUser));
 #endif