Title: [183286] trunk/Source/WebCore
- Revision
- 183286
- Author
- [email protected]
- Date
- 2015-04-24 15:22:05 -0700 (Fri, 24 Apr 2015)
Log Message
Make rangeExpandedAroundPositionByCharacters to all platforms.
https://bugs.webkit.org/show_bug.cgi?id=144161
Reviewed by Tim Horton.
No change in functionality, simply making this available
to all platforms.
* editing/VisibleUnits.cpp:
(WebCore::rangeExpandedAroundPositionByCharacters):
* editing/VisibleUnits.h:
* editing/mac/DataDetection.mm:
* editing/mac/DictionaryLookup.h:
* editing/mac/DictionaryLookup.mm:
(WebCore::rangeExpandedAroundPositionByCharacters): Deleted.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (183285 => 183286)
--- trunk/Source/WebCore/ChangeLog 2015-04-24 22:05:30 UTC (rev 183285)
+++ trunk/Source/WebCore/ChangeLog 2015-04-24 22:22:05 UTC (rev 183286)
@@ -1,3 +1,21 @@
+2015-04-24 Enrica Casucci <[email protected]>
+
+ Make rangeExpandedAroundPositionByCharacters to all platforms.
+ https://bugs.webkit.org/show_bug.cgi?id=144161
+
+ Reviewed by Tim Horton.
+
+ No change in functionality, simply making this available
+ to all platforms.
+
+ * editing/VisibleUnits.cpp:
+ (WebCore::rangeExpandedAroundPositionByCharacters):
+ * editing/VisibleUnits.h:
+ * editing/mac/DataDetection.mm:
+ * editing/mac/DictionaryLookup.h:
+ * editing/mac/DictionaryLookup.mm:
+ (WebCore::rangeExpandedAroundPositionByCharacters): Deleted.
+
2015-04-24 Andreas Kling <[email protected]>
Purge PassRefPtr from NamedNodeMap.
Modified: trunk/Source/WebCore/editing/VisibleUnits.cpp (183285 => 183286)
--- trunk/Source/WebCore/editing/VisibleUnits.cpp 2015-04-24 22:05:30 UTC (rev 183285)
+++ trunk/Source/WebCore/editing/VisibleUnits.cpp 2015-04-24 22:22:05 UTC (rev 183286)
@@ -1921,4 +1921,16 @@
return result;
}
+PassRefPtr<Range> rangeExpandedAroundPositionByCharacters(const VisiblePosition& position, int numberOfCharactersToExpand)
+{
+ Position start = position.deepEquivalent();
+ Position end = position.deepEquivalent();
+ for (int i = 0; i < numberOfCharactersToExpand; ++i) {
+ start = start.previous(Character);
+ end = end.next(Character);
+ }
+
+ return makeRange(start, end);
+}
+
}
Modified: trunk/Source/WebCore/editing/VisibleUnits.h (183285 => 183286)
--- trunk/Source/WebCore/editing/VisibleUnits.h 2015-04-24 22:05:30 UTC (rev 183285)
+++ trunk/Source/WebCore/editing/VisibleUnits.h 2015-04-24 22:22:05 UTC (rev 183286)
@@ -105,6 +105,8 @@
WEBCORE_EXPORT PassRefPtr<Range> wordRangeFromPosition(const VisiblePosition& position);
WEBCORE_EXPORT VisiblePosition closestWordBoundaryForPosition(const VisiblePosition& position);
WEBCORE_EXPORT void charactersAroundPosition(const VisiblePosition&, UChar32& oneAfter, UChar32& oneBefore, UChar32& twoBefore);
+WEBCORE_EXPORT PassRefPtr<Range> rangeExpandedAroundPositionByCharacters(const VisiblePosition&, int numberOfCharactersToExpand);
+
} // namespace WebCore
#endif // VisibleUnits_h
Modified: trunk/Source/WebCore/editing/mac/DataDetection.mm (183285 => 183286)
--- trunk/Source/WebCore/editing/mac/DataDetection.mm 2015-04-24 22:05:30 UTC (rev 183285)
+++ trunk/Source/WebCore/editing/mac/DataDetection.mm 2015-04-24 22:22:05 UTC (rev 183286)
@@ -29,7 +29,6 @@
#if PLATFORM(MAC)
#import "DataDetectorsSPI.h"
-#import "DictionaryLookup.h"
#import "FrameView.h"
#import "HitTestResult.h"
#import "Node.h"
@@ -37,6 +36,7 @@
#import "RenderObject.h"
#import "TextIterator.h"
#import "VisiblePosition.h"
+#import "VisibleUnits.h"
#import "htmlediting.h"
namespace WebCore {
Modified: trunk/Source/WebCore/editing/mac/DictionaryLookup.h (183285 => 183286)
--- trunk/Source/WebCore/editing/mac/DictionaryLookup.h 2015-04-24 22:05:30 UTC (rev 183285)
+++ trunk/Source/WebCore/editing/mac/DictionaryLookup.h 2015-04-24 22:22:05 UTC (rev 183286)
@@ -45,7 +45,6 @@
bool isPositionInRange(const VisiblePosition&, Range*);
bool shouldUseSelection(const VisiblePosition&, const VisibleSelection&);
-PassRefPtr<Range> rangeExpandedAroundPositionByCharacters(const VisiblePosition&, int numberOfCharactersToExpand);
WEBCORE_EXPORT PassRefPtr<Range> rangeForDictionaryLookupForSelection(const VisibleSelection&, NSDictionary **options);
WEBCORE_EXPORT PassRefPtr<Range> rangeForDictionaryLookupAtHitTestResult(const HitTestResult&, NSDictionary **options);
WEBCORE_EXPORT NSString *dictionaryLookupForPDFSelection(PDFSelection *, NSDictionary **options);
Modified: trunk/Source/WebCore/editing/mac/DictionaryLookup.mm (183285 => 183286)
--- trunk/Source/WebCore/editing/mac/DictionaryLookup.mm 2015-04-24 22:05:30 UTC (rev 183285)
+++ trunk/Source/WebCore/editing/mac/DictionaryLookup.mm 2015-04-24 22:22:05 UTC (rev 183286)
@@ -78,18 +78,6 @@
return isPositionInRange(position, selectedRange.get());
}
-PassRefPtr<Range> rangeExpandedAroundPositionByCharacters(const VisiblePosition& position, int numberOfCharactersToExpand)
-{
- Position start = position.deepEquivalent();
- Position end = position.deepEquivalent();
- for (int i = 0; i < numberOfCharactersToExpand; ++i) {
- start = start.previous(Character);
- end = end.next(Character);
- }
-
- return makeRange(start, end);
-}
-
PassRefPtr<Range> rangeForDictionaryLookupForSelection(const VisibleSelection& selection, NSDictionary **options)
{
RefPtr<Range> selectedRange = selection.toNormalizedRange();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
