Title: [196489] trunk/Source/WebKit/mac
- Revision
- 196489
- Author
- bda...@apple.com
- Date
- 2016-02-12 11:43:10 -0800 (Fri, 12 Feb 2016)
Log Message
NSRangeIsRelativeTo should not have NS prefix
https://bugs.webkit.org/show_bug.cgi?id=154174
Reviewed by Tim Horton.
NSRangeIsRelativeTo -> WebRangeIsRelativeTo
* WebView/WebFrame.mm:
(-[WebFrame _convertToDOMRange:]):
(-[WebFrame _convertToDOMRange:rangeIsRelativeTo:]):
* WebView/WebFrameInternal.h:
* WebView/WebHTMLView.mm:
(-[WebHTMLView insertText:]):
Modified Paths
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (196488 => 196489)
--- trunk/Source/WebKit/mac/ChangeLog 2016-02-12 19:28:29 UTC (rev 196488)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-02-12 19:43:10 UTC (rev 196489)
@@ -1,3 +1,18 @@
+2016-02-12 Beth Dakin <bda...@apple.com>
+
+ NSRangeIsRelativeTo should not have NS prefix
+ https://bugs.webkit.org/show_bug.cgi?id=154174
+
+ Reviewed by Tim Horton.
+
+ NSRangeIsRelativeTo -> WebRangeIsRelativeTo
+ * WebView/WebFrame.mm:
+ (-[WebFrame _convertToDOMRange:]):
+ (-[WebFrame _convertToDOMRange:rangeIsRelativeTo:]):
+ * WebView/WebFrameInternal.h:
+ * WebView/WebHTMLView.mm:
+ (-[WebHTMLView insertText:]):
+
2016-02-11 Beth Dakin <bda...@apple.com>
EditingRangeIsRelativeTo::Document and NSRangeIsRelativeTo::Document should
Modified: trunk/Source/WebKit/mac/WebView/WebFrame.mm (196488 => 196489)
--- trunk/Source/WebKit/mac/WebView/WebFrame.mm 2016-02-12 19:28:29 UTC (rev 196488)
+++ trunk/Source/WebKit/mac/WebView/WebFrame.mm 2016-02-12 19:43:10 UTC (rev 196489)
@@ -793,17 +793,17 @@
- (PassRefPtr<Range>)_convertToDOMRange:(NSRange)nsrange
{
- return [self _convertToDOMRange:nsrange rangeIsRelativeTo:NSRangeIsRelativeTo::EditableRoot];
+ return [self _convertToDOMRange:nsrange rangeIsRelativeTo:WebRangeIsRelativeTo::EditableRoot];
}
-- (PassRefPtr<Range>)_convertToDOMRange:(NSRange)nsrange rangeIsRelativeTo:(NSRangeIsRelativeTo)rangeIsRelativeTo
+- (PassRefPtr<Range>)_convertToDOMRange:(NSRange)nsrange rangeIsRelativeTo:(WebRangeIsRelativeTo)rangeIsRelativeTo
{
if (nsrange.location > INT_MAX)
return 0;
if (nsrange.length > INT_MAX || nsrange.location + nsrange.length > INT_MAX)
nsrange.length = INT_MAX - nsrange.location;
- if (rangeIsRelativeTo == NSRangeIsRelativeTo::EditableRoot) {
+ if (rangeIsRelativeTo == WebRangeIsRelativeTo::EditableRoot) {
// Our critical assumption is that this code path is 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
@@ -816,7 +816,7 @@
return TextIterator::rangeFromLocationAndLength(element, nsrange.location, nsrange.length);
}
- ASSERT(rangeIsRelativeTo == NSRangeIsRelativeTo::Paragraph);
+ ASSERT(rangeIsRelativeTo == WebRangeIsRelativeTo::Paragraph);
const VisibleSelection& selection = _private->coreFrame->selection().selection();
RefPtr<Range> selectedRange = selection.toNormalizedRange();
Modified: trunk/Source/WebKit/mac/WebView/WebFrameInternal.h (196488 => 196489)
--- trunk/Source/WebKit/mac/WebView/WebFrameInternal.h 2016-02-12 19:28:29 UTC (rev 196488)
+++ trunk/Source/WebKit/mac/WebView/WebFrameInternal.h 2016-02-12 19:43:10 UTC (rev 196489)
@@ -63,7 +63,7 @@
typedef WebCore::HistoryItem WebCoreHistoryItem;
-enum class NSRangeIsRelativeTo : uint8_t {
+enum class WebRangeIsRelativeTo : uint8_t {
EditableRoot,
Paragraph,
};
@@ -165,7 +165,7 @@
#endif
- (NSRange)_convertToNSRange:(WebCore::Range*)range;
- (PassRefPtr<WebCore::Range>)_convertToDOMRange:(NSRange)nsrange;
-- (PassRefPtr<WebCore::Range>)_convertToDOMRange:(NSRange)nsrange rangeIsRelativeTo:(NSRangeIsRelativeTo)rangeIsRelativeTo;
+- (PassRefPtr<WebCore::Range>)_convertToDOMRange:(NSRange)nsrange rangeIsRelativeTo:(WebRangeIsRelativeTo)rangeIsRelativeTo;
- (DOMDocumentFragment *)_documentFragmentWithMarkupString:(NSString *)markupString baseURLString:(NSString *)baseURLString;
- (DOMDocumentFragment *)_documentFragmentWithNodesAsParagraphs:(NSArray *)nodes;
Modified: trunk/Source/WebKit/mac/WebView/WebHTMLView.mm (196488 => 196489)
--- trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2016-02-12 19:28:29 UTC (rev 196488)
+++ trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2016-02-12 19:43:10 UTC (rev 196489)
@@ -7114,7 +7114,7 @@
#endif
if (replacementRange.location != NSNotFound) {
- NSRangeIsRelativeTo rangeIsRelativeTo = needToRemoveSoftSpace ? NSRangeIsRelativeTo::Paragraph : NSRangeIsRelativeTo::EditableRoot;
+ WebRangeIsRelativeTo rangeIsRelativeTo = needToRemoveSoftSpace ? WebRangeIsRelativeTo::Paragraph : WebRangeIsRelativeTo::EditableRoot;
RefPtr<Range> domRange = [[self _frame] _convertToDOMRange:replacementRange rangeIsRelativeTo:rangeIsRelativeTo];
if (domRange)
coreFrame->selection().setSelection(VisibleSelection(*domRange, SEL_DEFAULT_AFFINITY));
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
