Changeset 187304 in webkit

Timestamp:

Jul 24, 2015, 12:02:10 AM (11 years ago)

Author:

Lucas Forschler

Message:

Merged r187130. rdar://problem/21630806

Location:

branches/safari-601.1-branch/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• editing/cocoa/EditorCocoa.mm (modified) (2 diffs)

branches/safari-601.1-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2015-07-23  Lucas Forschler  <lforschler@apple.com>
+
+        Merge r187130
+
+    2015-07-21  Jon Honeycutt  <jhoneycutt@apple.com>
+
+            [iOS] Keyboard bold/italic/underline keys don't highlight after being
+            tapped to style a selection
+            https://bugs.webkit.org/show_bug.cgi?id=147164
+            <rdar://problem/21630806>
+
+            Reviewed by Ryosuke Niwa.
+
+            * editing/cocoa/EditorCocoa.mm:
+            (WebCore::Editor::styleForSelectionStart):
+            Use adjustedSelectionStartForStyleComputation(), which will ensure that
+            we're at the start of the selected node, not at the end of the node
+            before the selection.
+
 2015-07-23  Lucas Forschler  <lforschler@apple.com>
 

branches/safari-601.1-branch/Source/WebCore/editing/cocoa/EditorCocoa.mm

@@ -37 +37 @@
 #import "SoftLinking.h"
 #import "Text.h"
+#import "htmlediting.h"
 
 namespace WebCore {
@@ -48 +49 @@
         return nullptr;
 
-    Position position = frame->selection().selection().visibleStart().deepEquivalent();
+    Position position = adjustedSelectionStartForStyleComputation(frame->selection().selection());
     if (!position.isCandidate() || position.isNull())
         return nullptr;