Merge notifyComponentsOnChangedSelection into respondToSelectionChange

https://bugs.webkit.org/show_bug.cgi?id=128993

Reviewed by Andreas Kling.

Merged notifyComponentsOnChangedSelection into respondToSelectionChange since notifyComponentsOnChangedSelection
was only added in iOS codebase in response to the code added for continuous spellchecking and alternative text controller
in respondToChangedSelection but they should have been called inside setIgnoreCompositionSelectionChange.

So merge these two functions and make respondToChangedSelection behave like setIgnoreCompositionSelectionChange.

* editing/Editor.cpp:
(WebCore::Editor::setIgnoreCompositionSelectionChange):
(WebCore::Editor::respondToChangedSelection):
* editing/Editor.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@164320 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 327f13c13a8c65dc2428560383e5754e49959d0a..bc64b8fae9fadf2e9fbd6afd4f045989dd532006 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,21 @@
+2014-02-18 Ryosuke Niwa <rniwa@webkit.org>
+
+        Merge notifyComponentsOnChangedSelection into respondToSelectionChange
+        https://bugs.webkit.org/show_bug.cgi?id=128993
+
+        Reviewed by Andreas Kling.
+
+        Merged notifyComponentsOnChangedSelection into respondToSelectionChange since notifyComponentsOnChangedSelection
+        was only added in iOS codebase in response to the code added for continuous spellchecking and alternative text controller
+        in respondToChangedSelection but they should have been called inside setIgnoreCompositionSelectionChange.
+
+        So merge these two functions and make respondToChangedSelection behave like setIgnoreCompositionSelectionChange.
+
+        * editing/Editor.cpp:
+        (WebCore::Editor::setIgnoreCompositionSelectionChange):
+        (WebCore::Editor::respondToChangedSelection):
+        * editing/Editor.h:
+
 2014-02-18  Ryosuke Niwa  <rniwa@webkit.org>
 
         FrameSelection::textWasReplaced and setSelectedRange shouldn't trigger synchronous layout

diff --git a/Source/WebCore/editing/Editor.cpp b/Source/WebCore/editing/Editor.cpp
index ac4c4efe2736ef11ea27b863c181cd47756ec190..3e15dac45d5360a3c352c73680a1d94365cc0b05 100644 (file)
--- a/Source/WebCore/editing/Editor.cpp
+++ b/Source/WebCore/editing/Editor.cpp
@@ -756,7 +756,7 @@ bool Editor::shouldInsertText(const String& text, Range* range, EditorInsertActi
 void Editor::notifyComponentsOnChangedSelection(const VisibleSelection& oldSelection, FrameSelection::SetSelectionOptions options)
 {
 #if PLATFORM(IOS)
-    // FIXME: Merge this to open source https://bugs.webkit.org/show_bug.cgi?id=38830
+    // FIXME: Should suppress selection change notifications during a composition change <https://webkit.org/b/38830>
     if (m_ignoreCompositionSelectionChange)
         return;
 #endif
@@ -2949,7 +2949,7 @@ void Editor::changeSelectionAfterCommand(const VisibleSelection& newSelection,
     // does not call EditorClient::respondToChangedSelection(), which, on the Mac, sends selection change notifications and
     // starts a new kill ring sequence, but we want to do these things (matches AppKit).
 #if PLATFORM(IOS)
-    // FIXME: Merge this to open source https://bugs.webkit.org/show_bug.cgi?id=38830
+    // FIXME: Should suppress selection change notifications during a composition change <https://webkit.org/b/38830>
     if (m_ignoreCompositionSelectionChange)
         return;
 #endif