Imported WebKit commit 080af0beaa6f0ba8ff8f44cb8bd8b5dcf75ac0af (http://svn.webkit.org/repository/webkit/trunk@129119)

New snapshot with prospective build fix for incorrect QtWebKit master module header file creation

4 files changed, 10 insertions, 23 deletions

diff --git a/Source/WebKit/chromium/public/WebFrame.h b/Source/WebKit/chromium/public/WebFrame.h
index 56cbe1ea4..f38c73934 100644
--- a/Source/WebKit/chromium/public/WebFrame.h
+++ b/Source/WebKit/chromium/public/WebFrame.h
@@ -472,30 +472,12 @@ public:
     // there is ranged selection.
     virtual bool selectWordAroundCaret() = 0;
 
-    // DEPRECATED: Use moveSelectionStart / moveSelectionEnd / moveCaret
-    // This method is intended for touch-based UIs, but it's missing some
-    // functionality needed on Android, like preventing collapsed selections.
-    virtual void selectRange(const WebPoint& start, const WebPoint& end) = 0;
+    // Select a range of text, as if by drag-selecting from base to extent
+    // with character granularity.
+    virtual void selectRange(const WebPoint& base, const WebPoint& extent) = 0;
 
     virtual void selectRange(const WebRange&) = 0;
 
-    // The methods below are for adjusting the start and/or end of the current
-    // selection by direct manipulation on a touch-based UI. To enter selection
-    // mode in the first place, call selectRange() or send a fake mouse event.
-
-    // Moves the start of the current selection, keeping the end fixed.
-    // Returns true on success, false if there is no selection to modify.
-    virtual bool moveSelectionStart(const WebPoint&, bool allowCollapsedSelection) = 0;
-
-    // Moves the end of the current selection, keeping the start fixed.
-    // Returns true on success, false if there is no selection to modify.
-    virtual bool moveSelectionEnd(const WebPoint&, bool allowCollapsedSelection) = 0;
-
-    // Move both endpoints of the current selection to the given position.
-    // The caret will remain pinned inside the current editable region.
-    // Returns true on success, false if there is no selection or if we're not editing.
-    virtual bool moveCaret(const WebPoint&) = 0;
-
     // Printing ------------------------------------------------------------
 
     // Reformats the WebFrame for printing. WebPrintParams specifies the printable
diff --git a/Source/WebKit/chromium/public/WebRuntimeFeatures.h b/Source/WebKit/chromium/public/WebRuntimeFeatures.h
index 012efe82d..6d0629fea 100644
--- a/Source/WebKit/chromium/public/WebRuntimeFeatures.h
+++ b/Source/WebKit/chromium/public/WebRuntimeFeatures.h
@@ -112,6 +112,8 @@ public:
 
     WEBKIT_EXPORT static void enablePeerConnection(bool);
     WEBKIT_EXPORT static bool isPeerConnectionEnabled();
+    WEBKIT_EXPORT static void enableDeprecatedPeerConnection(bool);
+    WEBKIT_EXPORT static bool isDeprecatedPeerConnectionEnabled();
 
     WEBKIT_EXPORT static void enableFullScreenAPI(bool);
     WEBKIT_EXPORT static bool isFullScreenAPIEnabled();
diff --git a/Source/WebKit/chromium/public/WebViewClient.h b/Source/WebKit/chromium/public/WebViewClient.h
index 839ed0d17..88da1416b 100644
--- a/Source/WebKit/chromium/public/WebViewClient.h
+++ b/Source/WebKit/chromium/public/WebViewClient.h
@@ -142,6 +142,9 @@ public:
     // Called to retrieve the provider of desktop notifications.
     virtual WebNotificationPresenter* notificationPresenter() { return 0; }
 
+    // Called when a gesture event is handled.
+    virtual void didHandleGestureEvent(const WebGestureEvent& event, bool eventSwallowed) { }
+
     // Called to request an icon for the specified filenames.
     // The icon is shown in a file upload control.
     virtual bool queryIconForFiles(const WebVector<WebString>& filenames, WebIconLoadingCompletion*) { return false; }
diff --git a/Source/WebKit/chromium/public/WebWidget.h b/Source/WebKit/chromium/public/WebWidget.h
index ac1658140..fa456238a 100644
--- a/Source/WebKit/chromium/public/WebWidget.h
+++ b/Source/WebKit/chromium/public/WebWidget.h
@@ -194,9 +194,9 @@ public:
     // FIXME: Remove this method. It's redundant with textInputInfo().
     virtual WebTextInputType textInputType() { return WebTextInputTypeNone; }
 
-    // Returns the start and end bounds of the current selection.
+    // Returns the anchor and focus bounds of the current selection.
     // If the selection range is empty, it returns the caret bounds.
-    virtual bool selectionBounds(WebRect& start, WebRect& end) const { return false; }
+    virtual bool selectionBounds(WebRect& anchor, WebRect& focus) const { return false; }
 
     // Returns the text direction at the start and end bounds of the current selection.
     // If the selection range is empty, it returns false.