Changeset 165767 in webkit

Timestamp:

Mar 17, 2014 3:28:25 PM (10 years ago)

Author:

ap@apple.com

Message:

Move convertToRange() helper to cross-platform WebPage.cpp
​https://bugs.webkit.org/show_bug.cgi?id=130365

Reviewed by Tim Horton.

Also renamed it to rangeFromEditingLocationAndLength().

• WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::rangeFromEditingLocationAndLength):

• WebProcess/WebPage/WebPage.h:
• WebProcess/WebPage/ios/WebPageIOS.mm:

(WebKit::WebPage::insertText):

• WebProcess/WebPage/mac/WebPageMac.mm:

(WebKit::WebPage::setComposition):
(WebKit::WebPage::insertText):
(WebKit::WebPage::insertDictatedText):
(WebKit::WebPage::getAttributedSubstringFromRange):
(WebKit::WebPage::characterIndexForPoint):
(WebKit::WebPage::firstRectForCharacterRange):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/WebPage/WebPage.cpp (modified) (1 diff)
• WebProcess/WebPage/WebPage.h (modified) (1 diff)
• WebProcess/WebPage/ios/WebPageIOS.mm (modified) (2 diffs)
• WebProcess/WebPage/mac/WebPageMac.mm (modified) (7 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-03-17  Alexey Proskuryakov  <ap@apple.com>
+
+        Move convertToRange() helper to cross-platform WebPage.cpp
+        https://bugs.webkit.org/show_bug.cgi?id=130365
+
+        Reviewed by Tim Horton.
+
+        Also renamed it to rangeFromEditingLocationAndLength().
+
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::rangeFromEditingLocationAndLength):
+        * WebProcess/WebPage/WebPage.h:
+        * WebProcess/WebPage/ios/WebPageIOS.mm:
+        (WebKit::WebPage::insertText):
+        * WebProcess/WebPage/mac/WebPageMac.mm:
+        (WebKit::WebPage::setComposition):
+        (WebKit::WebPage::insertText):
+        (WebKit::WebPage::insertDictatedText):
+        (WebKit::WebPage::getAttributedSubstringFromRange):
+        (WebKit::WebPage::characterIndexForPoint):
+        (WebKit::WebPage::firstRectForCharacterRange):
+
 2014-03-17  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp

@@ -4337 +4337 @@
 }
 
+PassRefPtr<Range> WebPage::rangeFromEditingLocationAndLength(Frame& frame, uint64_t location, uint64_t length)
+{
+    // Sanitize the input, because TextIterator::rangeFromLocationAndLength takes signed integers.
+    if (location > INT_MAX)
+        return 0;
+    if (length > INT_MAX || location + length > INT_MAX)
+        length = INT_MAX - location;
+
+    // Our critical assumption is that we are only called by input methods that
+    // concentrate on a given area containing the selection.
+    // We have to do this because of text fields and textareas. The DOM for those is not
+    // directly in the document DOM, so serialization is problematic. Our solution is
+    // to use the root editable element of the selection start as the positional base.
+    // That fits with AppKit's idea of an input context.
+    return TextIterator::rangeFromLocationAndLength(frame.selection().rootEditableElementOrDocumentElement(), location, length);
+}
+
 } // namespace WebKit

trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h

@@ -928 +928 @@
     static PluginView* pluginViewForFrame(WebCore::Frame*);
 
+    PassRefPtr<WebCore::Range> rangeFromEditingLocationAndLength(WebCore::Frame&, uint64_t location, uint64_t length);
+
     void reportUsedFeatures();
 

trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm

@@ -186 +186 @@
 }
 
-static PassRefPtr<Range> convertToRange(Frame* frame, NSRange nsrange)
-{
-    if (nsrange.location > INT_MAX)
-        return 0;
-    if (nsrange.length > INT_MAX || nsrange.location + nsrange.length > INT_MAX)
-        nsrange.length = INT_MAX - nsrange.location;
-    
-    // our critical assumption is that we are only called by input methods that
-    // concentrate on a given area containing the selection
-    // We have to do this because of text fields and textareas. The DOM for those is not
-    // directly in the document DOM, so serialization is problematic. Our solution is
-    // to use the root editable element of the selection start as the positional base.
-    // That fits with AppKit's idea of an input context.
-    return TextIterator::rangeFromLocationAndLength(frame->selection().rootEditableElementOrDocumentElement(), nsrange.location, nsrange.length);
-}
-
 void WebPage::insertText(const String& text, uint64_t replacementRangeStart, uint64_t replacementRangeLength)
 {
@@ -207 +191 @@
     
     if (replacementRangeStart != NSNotFound) {
-        RefPtr<Range> replacementRange = convertToRange(&frame, NSMakeRange(replacementRangeStart, replacementRangeLength));
+        RefPtr<Range> replacementRange = rangeFromEditingLocationAndLength(frame, replacementRangeStart, replacementRangeLength);
         if (replacementRange)
             frame.selection().setSelection(VisibleSelection(replacementRange.get(), SEL_DEFAULT_AFFINITY));

trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm

@@ -77 +77 @@
 namespace WebKit {
 
-static PassRefPtr<Range> convertToRange(Frame*, uint64_t location, uint64_t length);
-
 void WebPage::platformInitialize()
 {
@@ -255 +253 @@
         RefPtr<Range> replacementRange;
         if (replacementRangeStart != NSNotFound) {
-            replacementRange = convertToRange(&frame, replacementRangeStart, replacementRangeLength);
+            replacementRange = rangeFromEditingLocationAndLength(frame, replacementRangeStart, replacementRangeLength);
             frame.selection().setSelection(VisibleSelection(replacementRange.get(), SEL_DEFAULT_AFFINITY));
         }
@@ -284 +282 @@
 
     if (replacementRangeStart != NSNotFound) {
-        RefPtr<Range> replacementRange = convertToRange(&frame, replacementRangeStart, replacementRangeLength);
+        RefPtr<Range> replacementRange = rangeFromEditingLocationAndLength(frame, replacementRangeStart, replacementRangeLength);
         if (replacementRange)
             frame.selection().setSelection(VisibleSelection(replacementRange.get(), SEL_DEFAULT_AFFINITY));
@@ -306 +304 @@
 
     if (replacementRangeStart != NSNotFound) {
-        RefPtr<Range> replacementRange = convertToRange(&frame, replacementRangeStart, replacementRangeLength);
+        RefPtr<Range> replacementRange = rangeFromEditingLocationAndLength(frame, replacementRangeStart, replacementRangeLength);
         if (replacementRange)
             frame.selection().setSelection(VisibleSelection(replacementRange.get(), SEL_DEFAULT_AFFINITY));
@@ -356 +354 @@
         return;
 
-    RefPtr<Range> range = convertToRange(&frame, rangeStart, rangeLength);
+    RefPtr<Range> range = rangeFromEditingLocationAndLength(frame, rangeStart, rangeLength);
     if (!range)
         return;
@@ -389 +387 @@
         index = static_cast<uint64_t>(location);
 }
-
-PassRefPtr<Range> convertToRange(Frame* frame, uint64_t location, uint64_t length)
-{
-    if (location > INT_MAX)
-        return 0;
-    if (length > INT_MAX || location + length > INT_MAX)
-        length = INT_MAX - location;
-        
-    // our critical assumption is that we are only called by input methods that
-    // concentrate on a given area containing the selection
-    // We have to do this because of text fields and textareas. The DOM for those is not
-    // directly in the document DOM, so serialization is problematic. Our solution is
-    // to use the root editable element of the selection start as the positional base.
-    // That fits with AppKit's idea of an input context.
-    return TextIterator::rangeFromLocationAndLength(frame->selection().rootEditableElementOrDocumentElement(), location, length);
-}
     
 void WebPage::firstRectForCharacterRange(uint64_t location, uint64_t length, WebCore::IntRect& resultRect)
@@ -412 +394 @@
     resultRect.setSize(IntSize(0, 0));
     
-    RefPtr<Range> range = convertToRange(&frame, location, length);
+    RefPtr<Range> range = rangeFromEditingLocationAndLength(frame, location, length);
     if (!range)
         return;