Title: [99139] trunk/Source/WebKit/mac
- Revision
- 99139
- Author
- [email protected]
- Date
- 2011-11-02 22:28:16 -0700 (Wed, 02 Nov 2011)
Log Message
Move NSRange / DOMRange conversion functions to WebFramePrivate
https://bugs.webkit.org/show_bug.cgi?id=71435
Patch by Joseph Pecoraro <[email protected]> on 2011-11-02
Reviewed by Sam Weinig.
Move conversion functions to WebFramePrivate,
and remove the no longer used versions.
* WebView/WebFrame.mm:
(-[WebFrame _convertNSRangeToDOMRange:]):
(-[WebFrame _convertDOMRangeToNSRange:]):
* WebView/WebFrameInternal.h:
* WebView/WebFramePrivate.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (99138 => 99139)
--- trunk/Source/WebKit/mac/ChangeLog 2011-11-03 04:39:32 UTC (rev 99138)
+++ trunk/Source/WebKit/mac/ChangeLog 2011-11-03 05:28:16 UTC (rev 99139)
@@ -1,3 +1,19 @@
+2011-11-02 Joseph Pecoraro <[email protected]>
+
+ Move NSRange / DOMRange conversion functions to WebFramePrivate
+ https://bugs.webkit.org/show_bug.cgi?id=71435
+
+ Reviewed by Sam Weinig.
+
+ Move conversion functions to WebFramePrivate,
+ and remove the no longer used versions.
+
+ * WebView/WebFrame.mm:
+ (-[WebFrame _convertNSRangeToDOMRange:]):
+ (-[WebFrame _convertDOMRangeToNSRange:]):
+ * WebView/WebFrameInternal.h:
+ * WebView/WebFramePrivate.h:
+
2011-11-02 Dean Jackson <[email protected]>
Add ENABLE_CSS_SHADERS flag
Modified: trunk/Source/WebKit/mac/WebView/WebFrame.mm (99138 => 99139)
--- trunk/Source/WebKit/mac/WebView/WebFrame.mm 2011-11-03 04:39:32 UTC (rev 99138)
+++ trunk/Source/WebKit/mac/WebView/WebFrame.mm 2011-11-03 05:28:16 UTC (rev 99139)
@@ -688,28 +688,6 @@
return TextIterator::rangeFromLocationAndLength(_private->coreFrame->selection()->rootEditableElementOrDocumentElement(), nsrange.location, nsrange.length);
}
-- (DOMRange *)convertNSRangeToDOMRange:(NSRange)nsrange
-{
- // This method exists to maintain compatibility with Leopard's Dictionary.app. <rdar://problem/6002160>
- return [self _convertNSRangeToDOMRange:nsrange];
-}
-
-- (DOMRange *)_convertNSRangeToDOMRange:(NSRange)nsrange
-{
- return kit([self _convertToDOMRange:nsrange].get());
-}
-
-- (NSRange)convertDOMRangeToNSRange:(DOMRange *)range
-{
- // This method exists to maintain compatibility with Leopard's Dictionary.app. <rdar://problem/6002160>
- return [self _convertDOMRangeToNSRange:range];
-}
-
-- (NSRange)_convertDOMRangeToNSRange:(DOMRange *)range
-{
- return [self _convertToNSRange:core(range)];
-}
-
- (DOMRange *)_markDOMRange
{
return kit(_private->coreFrame->editor()->mark().toNormalizedRange().get());
@@ -925,6 +903,16 @@
_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 (99138 => 99139)
--- trunk/Source/WebKit/mac/WebView/WebFrameInternal.h 2011-11-03 04:39:32 UTC (rev 99138)
+++ trunk/Source/WebKit/mac/WebView/WebFrameInternal.h 2011-11-03 05:28:16 UTC (rev 99139)
@@ -138,8 +138,6 @@
- (DOMRange *)_rangeByAlteringCurrentSelection:(WebCore::FrameSelection::EAlteration)alteration direction:(WebCore::SelectionDirection)direction granularity:(WebCore::TextGranularity)granularity;
- (NSRange)_convertToNSRange:(WebCore::Range*)range;
-- (DOMRange *)_convertNSRangeToDOMRange:(NSRange)range;
-- (NSRange)_convertDOMRangeToNSRange:(DOMRange *)range;
- (PassRefPtr<WebCore::Range>)_convertToDOMRange:(NSRange)nsrange;
- (DOMDocumentFragment *)_documentFragmentWithMarkupString:(NSString *)markupString baseURLString:(NSString *)baseURLString;
Modified: trunk/Source/WebKit/mac/WebView/WebFramePrivate.h (99138 => 99139)
--- trunk/Source/WebKit/mac/WebView/WebFramePrivate.h 2011-11-03 04:39:32 UTC (rev 99138)
+++ trunk/Source/WebKit/mac/WebView/WebFramePrivate.h 2011-11-03 05:28:16 UTC (rev 99139)
@@ -83,6 +83,9 @@
- (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
