Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (196455 => 196456)
--- trunk/Source/WebKit/mac/ChangeLog 2016-02-12 00:17:18 UTC (rev 196455)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-02-12 00:31:53 UTC (rev 196456)
@@ -1,5 +1,21 @@
2016-02-11 Beth Dakin <[email protected]>
+ EditingRangeIsRelativeTo::Document and NSRangeIsRelativeTo::Document should
+ be called EditableRoot instead
+ https://bugs.webkit.org/show_bug.cgi?id=154138
+
+ Reviewed by Alexey Proskuryakov.
+
+ EditableRoot is much more accurate than Document.
+ * WebView/WebFrame.mm:
+ (-[WebFrame _convertToDOMRange:]):
+ (-[WebFrame _convertToDOMRange:rangeIsRelativeTo:]):
+ * WebView/WebFrameInternal.h:
+ * WebView/WebHTMLView.mm:
+ (-[WebHTMLView insertText:]):
+
+2016-02-11 Beth Dakin <[email protected]>
+
Soft spaces are often tracked in the wrong spot
https://bugs.webkit.org/show_bug.cgi?id=154127
-and corresponding-
Modified: trunk/Source/WebKit/mac/WebView/WebFrame.mm (196455 => 196456)
--- trunk/Source/WebKit/mac/WebView/WebFrame.mm 2016-02-12 00:17:18 UTC (rev 196455)
+++ trunk/Source/WebKit/mac/WebView/WebFrame.mm 2016-02-12 00:31:53 UTC (rev 196456)
@@ -793,7 +793,7 @@
- (PassRefPtr<Range>)_convertToDOMRange:(NSRange)nsrange
{
- return [self _convertToDOMRange:nsrange rangeIsRelativeTo:NSRangeIsRelativeTo::Document];
+ return [self _convertToDOMRange:nsrange rangeIsRelativeTo:NSRangeIsRelativeTo::EditableRoot];
}
- (PassRefPtr<Range>)_convertToDOMRange:(NSRange)nsrange rangeIsRelativeTo:(NSRangeIsRelativeTo)rangeIsRelativeTo
@@ -803,7 +803,7 @@
if (nsrange.length > INT_MAX || nsrange.location + nsrange.length > INT_MAX)
nsrange.length = INT_MAX - nsrange.location;
- if (rangeIsRelativeTo == NSRangeIsRelativeTo::Document) {
+ if (rangeIsRelativeTo == NSRangeIsRelativeTo::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
Modified: trunk/Source/WebKit/mac/WebView/WebFrameInternal.h (196455 => 196456)
--- trunk/Source/WebKit/mac/WebView/WebFrameInternal.h 2016-02-12 00:17:18 UTC (rev 196455)
+++ trunk/Source/WebKit/mac/WebView/WebFrameInternal.h 2016-02-12 00:31:53 UTC (rev 196456)
@@ -64,7 +64,7 @@
typedef WebCore::HistoryItem WebCoreHistoryItem;
enum class NSRangeIsRelativeTo : uint8_t {
- Document,
+ EditableRoot,
Paragraph,
};
Modified: trunk/Source/WebKit/mac/WebView/WebHTMLView.mm (196455 => 196456)
--- trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2016-02-12 00:17:18 UTC (rev 196455)
+++ trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2016-02-12 00:31:53 UTC (rev 196456)
@@ -7114,7 +7114,7 @@
#endif
if (replacementRange.location != NSNotFound) {
- NSRangeIsRelativeTo rangeIsRelativeTo = needToRemoveSoftSpace ? NSRangeIsRelativeTo::Paragraph : NSRangeIsRelativeTo::Document;
+ NSRangeIsRelativeTo rangeIsRelativeTo = needToRemoveSoftSpace ? NSRangeIsRelativeTo::Paragraph : NSRangeIsRelativeTo::EditableRoot;
RefPtr<Range> domRange = [[self _frame] _convertToDOMRange:replacementRange rangeIsRelativeTo:rangeIsRelativeTo];
if (domRange)
coreFrame->selection().setSelection(VisibleSelection(*domRange, SEL_DEFAULT_AFFINITY));
Modified: trunk/Source/WebKit2/ChangeLog (196455 => 196456)
--- trunk/Source/WebKit2/ChangeLog 2016-02-12 00:17:18 UTC (rev 196455)
+++ trunk/Source/WebKit2/ChangeLog 2016-02-12 00:31:53 UTC (rev 196456)
@@ -1,3 +1,21 @@
+2016-02-11 Beth Dakin <[email protected]>
+
+ EditingRangeIsRelativeTo::Document and NSRangeIsRelativeTo::Document should
+ be called EditableRoot instead
+ https://bugs.webkit.org/show_bug.cgi?id=154138
+
+ Reviewed by Alexey Proskuryakov.
+
+ EditableRoot is much more accurate than Document.
+ * Shared/EditingRange.h:
+ * UIProcess/Cocoa/WebViewImpl.mm:
+ (WebKit::WebViewImpl::insertText):
+ (WebKit::WebViewImpl::selectedRangeWithCompletionHandler):
+ * UIProcess/WebPageProxy.h:
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::rangeFromEditingRange):
+ * WebProcess/WebPage/WebPage.h:
+
2016-02-11 Alex Christensen <[email protected]>
Move Download authentication code to AuthenticationManager
Modified: trunk/Source/WebKit2/Shared/EditingRange.h (196455 => 196456)
--- trunk/Source/WebKit2/Shared/EditingRange.h 2016-02-12 00:17:18 UTC (rev 196455)
+++ trunk/Source/WebKit2/Shared/EditingRange.h 2016-02-12 00:31:53 UTC (rev 196456)
@@ -32,7 +32,7 @@
namespace WebKit {
enum class EditingRangeIsRelativeTo : uint8_t {
- Document,
+ EditableRoot,
Paragraph,
};
Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm (196455 => 196456)
--- trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm 2016-02-12 00:17:18 UTC (rev 196455)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm 2016-02-12 00:31:53 UTC (rev 196456)
@@ -3556,7 +3556,7 @@
if (!dictationAlternatives.isEmpty())
m_page->insertDictatedTextAsync(eventText, replacementRange, dictationAlternatives, registerUndoGroup);
else
- m_page->insertTextAsync(eventText, replacementRange, registerUndoGroup, needToRemoveSoftSpace ? EditingRangeIsRelativeTo::Paragraph : EditingRangeIsRelativeTo::Document);
+ m_page->insertTextAsync(eventText, replacementRange, registerUndoGroup, needToRemoveSoftSpace ? EditingRangeIsRelativeTo::Paragraph : EditingRangeIsRelativeTo::EditableRoot);
}
void WebViewImpl::selectedRangeWithCompletionHandler(void(^completionHandlerPtr)(NSRange selectedRange))
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (196455 => 196456)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2016-02-12 00:17:18 UTC (rev 196455)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2016-02-12 00:31:53 UTC (rev 196456)
@@ -561,7 +561,7 @@
void setAcceleratedCompositingRootLayer(LayerOrView*);
LayerOrView* acceleratedCompositingRootLayer() const;
- void insertTextAsync(const String& text, const EditingRange& replacementRange, bool registerUndoGroup = false, EditingRangeIsRelativeTo = EditingRangeIsRelativeTo::Document);
+ void insertTextAsync(const String& text, const EditingRange& replacementRange, bool registerUndoGroup = false, EditingRangeIsRelativeTo = EditingRangeIsRelativeTo::EditableRoot);
void getMarkedRangeAsync(std::function<void (EditingRange, CallbackBase::Error)>);
void getSelectedRangeAsync(std::function<void (EditingRange, CallbackBase::Error)>);
void characterIndexForPointAsync(const WebCore::IntPoint&, std::function<void (uint64_t, CallbackBase::Error)>);
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (196455 => 196456)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-02-12 00:17:18 UTC (rev 196455)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-02-12 00:31:53 UTC (rev 196456)
@@ -5038,7 +5038,7 @@
else
length = INT_MAX - range.location;
- if (editingRangeIsRelativeTo == EditingRangeIsRelativeTo::Document) {
+ if (editingRangeIsRelativeTo == EditingRangeIsRelativeTo::EditableRoot) {
// Our critical assumption is that this code path is 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
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (196455 => 196456)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2016-02-12 00:17:18 UTC (rev 196455)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2016-02-12 00:31:53 UTC (rev 196456)
@@ -647,7 +647,7 @@
void sendComplexTextInputToPlugin(uint64_t pluginComplexTextInputIdentifier, const String& textInput);
- void insertTextAsync(const String& text, const EditingRange& replacementRange, bool registerUndoGroup = false, uint32_t editingRangeIsRelativeTo = (uint32_t)EditingRangeIsRelativeTo::Document);
+ void insertTextAsync(const String& text, const EditingRange& replacementRange, bool registerUndoGroup = false, uint32_t editingRangeIsRelativeTo = (uint32_t)EditingRangeIsRelativeTo::EditableRoot);
void getMarkedRangeAsync(uint64_t callbackID);
void getSelectedRangeAsync(uint64_t callbackID);
void characterIndexForPointAsync(const WebCore::IntPoint&, uint64_t callbackID);
@@ -1136,7 +1136,7 @@
static PluginView* focusedPluginViewForFrame(WebCore::Frame&);
static PluginView* pluginViewForFrame(WebCore::Frame*);
- static PassRefPtr<WebCore::Range> rangeFromEditingRange(WebCore::Frame&, const EditingRange&, EditingRangeIsRelativeTo = EditingRangeIsRelativeTo::Document);
+ static PassRefPtr<WebCore::Range> rangeFromEditingRange(WebCore::Frame&, const EditingRange&, EditingRangeIsRelativeTo = EditingRangeIsRelativeTo::EditableRoot);
void reportUsedFeatures();
