Title: [187304] branches/safari-601.1-branch/Source/WebCore
- Revision
- 187304
- Author
- [email protected]
- Date
- 2015-07-24 00:02:10 -0700 (Fri, 24 Jul 2015)
Log Message
Merged r187130. rdar://problem/21630806
Modified Paths
Diff
Modified: branches/safari-601.1-branch/Source/WebCore/ChangeLog (187303 => 187304)
--- branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-07-24 06:56:46 UTC (rev 187303)
+++ branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-07-24 07:02:10 UTC (rev 187304)
@@ -1,5 +1,24 @@
2015-07-23 Lucas Forschler <[email protected]>
+ Merge r187130
+
+ 2015-07-21 Jon Honeycutt <[email protected]>
+
+ [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 <[email protected]>
+
Merge r187116
2015-07-21 Said Abou-Hallawa <[email protected]>
Modified: branches/safari-601.1-branch/Source/WebCore/editing/cocoa/EditorCocoa.mm (187303 => 187304)
--- branches/safari-601.1-branch/Source/WebCore/editing/cocoa/EditorCocoa.mm 2015-07-24 06:56:46 UTC (rev 187303)
+++ branches/safari-601.1-branch/Source/WebCore/editing/cocoa/EditorCocoa.mm 2015-07-24 07:02:10 UTC (rev 187304)
@@ -36,6 +36,7 @@
#import "RenderStyle.h"
#import "SoftLinking.h"
#import "Text.h"
+#import "htmlediting.h"
namespace WebCore {
@@ -47,7 +48,7 @@
if (frame->selection().isNone())
return nullptr;
- Position position = frame->selection().selection().visibleStart().deepEquivalent();
+ Position position = adjustedSelectionStartForStyleComputation(frame->selection().selection());
if (!position.isCandidate() || position.isNull())
return nullptr;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
