Title: [99628] trunk/Source/WebKit/mac
- Revision
- 99628
- Author
- [email protected]
- Date
- 2011-11-08 16:13:13 -0800 (Tue, 08 Nov 2011)
Log Message
Move NSRange / DOMRange functions back to WebFrameInternal
https://bugs.webkit.org/show_bug.cgi?id=71844
Patch by Joseph Pecoraro <[email protected]> on 2011-11-08
Reviewed by Alexey Proskuryakov.
* WebView/WebFrame.mm:
(-[WebFrame _convertNSRangeToDOMRange:]):
(-[WebFrame _convertDOMRangeToNSRange:]):
* WebView/WebFrameInternal.h:
* WebView/WebFramePrivate.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (99627 => 99628)
--- trunk/Source/WebKit/mac/ChangeLog 2011-11-09 00:12:35 UTC (rev 99627)
+++ trunk/Source/WebKit/mac/ChangeLog 2011-11-09 00:13:13 UTC (rev 99628)
@@ -1,3 +1,16 @@
+2011-11-08 Joseph Pecoraro <[email protected]>
+
+ Move NSRange / DOMRange functions back to WebFrameInternal
+ https://bugs.webkit.org/show_bug.cgi?id=71844
+
+ Reviewed by Alexey Proskuryakov.
+
+ * WebView/WebFrame.mm:
+ (-[WebFrame _convertNSRangeToDOMRange:]):
+ (-[WebFrame _convertDOMRangeToNSRange:]):
+ * WebView/WebFrameInternal.h:
+ * WebView/WebFramePrivate.h:
+
2011-11-08 Michael Saboff <[email protected]>
Towards 8 Bit Strings: Templatize JSC::Parser class by Lexer type
Modified: trunk/Source/WebKit/mac/WebView/WebFrame.mm (99627 => 99628)
--- trunk/Source/WebKit/mac/WebView/WebFrame.mm 2011-11-09 00:12:35 UTC (rev 99627)
+++ trunk/Source/WebKit/mac/WebView/WebFrame.mm 2011-11-09 00:13:13 UTC (rev 99628)
@@ -688,6 +688,16 @@
return TextIterator::rangeFromLocationAndLength(_private->coreFrame->selection()->rootEditableElementOrDocumentElement(), nsrange.location, nsrange.length);
}
+- (DOMRange *)_convertNSRangeToDOMRange:(NSRange)nsrange
+{
+ return kit([self _convertToDOMRange:nsrange].get());
+}
+
+- (NSRange)_convertDOMRangeToNSRange:(DOMRange *)range
+{
+ return [self _convertToNSRange:core(range)];
+}
+
- (DOMRange *)_markDOMRange
{
return kit(_private->coreFrame->editor()->mark().toNormalizedRange().get());
@@ -903,16 +913,6 @@
_private->coreFrame->selection()->setSelection(VisibleSelection(domRange.get(), SEL_DEFAULT_AFFINITY));
}
-- (DOMRange *)_convertNSRangeToDOMRange:(NSRange)nsrange
-{
- return kit([self _convertToDOMRange:nsrange].get());
-}
-
-- (NSRange)_convertDOMRangeToNSRange:(DOMRange *)range
-{
- return [self _convertToNSRange:core(range)];
-}
-
- (BOOL)_isDisplayingStandaloneImage
{
Document* document = _private->coreFrame->document();
Modified: trunk/Source/WebKit/mac/WebView/WebFrameInternal.h (99627 => 99628)
--- trunk/Source/WebKit/mac/WebView/WebFrameInternal.h 2011-11-09 00:12:35 UTC (rev 99627)
+++ trunk/Source/WebKit/mac/WebView/WebFrameInternal.h 2011-11-09 00:13:13 UTC (rev 99628)
@@ -130,6 +130,9 @@
- (NSString *)_selectedString;
- (NSString *)_stringForRange:(DOMRange *)range;
+- (DOMRange *)_convertNSRangeToDOMRange:(NSRange)range;
+- (NSRange)_convertDOMRangeToNSRange:(DOMRange *)range;
+
- (NSString *)_markupStringFromRange:(DOMRange *)range nodes:(NSArray **)nodes;
- (NSRect)_caretRectAtPosition:(const WebCore::Position&)pos affinity:(NSSelectionAffinity)affinity;
Modified: trunk/Source/WebKit/mac/WebView/WebFramePrivate.h (99627 => 99628)
--- trunk/Source/WebKit/mac/WebView/WebFramePrivate.h 2011-11-09 00:12:35 UTC (rev 99627)
+++ trunk/Source/WebKit/mac/WebView/WebFramePrivate.h 2011-11-09 00:13:13 UTC (rev 99628)
@@ -83,9 +83,6 @@
- (NSRange)_selectedNSRange;
- (void)_selectNSRange:(NSRange)range;
-- (DOMRange *)_convertNSRangeToDOMRange:(NSRange)range;
-- (NSRange)_convertDOMRangeToNSRange:(DOMRange *)range;
-
- (BOOL)_isDisplayingStandaloneImage;
- (unsigned)_pendingFrameUnloadEventCount;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
