Title: [245231] branches/safari-608.1.24-branch/Source/WebKit
- Revision
- 245231
- Author
- [email protected]
- Date
- 2019-05-12 23:51:22 -0700 (Sun, 12 May 2019)
Log Message
Cherry-pick r245195. rdar://problem/46548586
Returning incorrect marked text rects
https://bugs.webkit.org/show_bug.cgi?id=197758
<rdar://problem/46548586>
Reviewed by Tim Horton.
We are not returning marked text rects in the correct view coordinate space.
This is the same translation we are applying to the caret rects.
* WebProcess/WebPage/ios/WebPageIOS.mm:
(WebKit::WebPage::platformEditorState const):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@245195 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-608.1.24-branch/Source/WebKit/ChangeLog (245230 => 245231)
--- branches/safari-608.1.24-branch/Source/WebKit/ChangeLog 2019-05-13 06:51:20 UTC (rev 245230)
+++ branches/safari-608.1.24-branch/Source/WebKit/ChangeLog 2019-05-13 06:51:22 UTC (rev 245231)
@@ -1,5 +1,38 @@
2019-05-12 Babak Shafiei <[email protected]>
+ Cherry-pick r245195. rdar://problem/46548586
+
+ Returning incorrect marked text rects
+ https://bugs.webkit.org/show_bug.cgi?id=197758
+ <rdar://problem/46548586>
+
+ Reviewed by Tim Horton.
+
+ We are not returning marked text rects in the correct view coordinate space.
+ This is the same translation we are applying to the caret rects.
+
+ * WebProcess/WebPage/ios/WebPageIOS.mm:
+ (WebKit::WebPage::platformEditorState const):
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@245195 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2019-05-10 Megan Gardner <[email protected]>
+
+ Returning incorrect marked text rects
+ https://bugs.webkit.org/show_bug.cgi?id=197758
+ <rdar://problem/46548586>
+
+ Reviewed by Tim Horton.
+
+ We are not returning marked text rects in the correct view coordinate space.
+ This is the same translation we are applying to the caret rects.
+
+ * WebProcess/WebPage/ios/WebPageIOS.mm:
+ (WebKit::WebPage::platformEditorState const):
+
+2019-05-12 Babak Shafiei <[email protected]>
+
Cherry-pick r245189. rdar://problem/50646747
Let WebKit clients supply an application name for user agent in modern compatibility mode
Modified: branches/safari-608.1.24-branch/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm (245230 => 245231)
--- branches/safari-608.1.24-branch/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm 2019-05-13 06:51:20 UTC (rev 245230)
+++ branches/safari-608.1.24-branch/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm 2019-05-13 06:51:22 UTC (rev 245231)
@@ -193,6 +193,7 @@
void WebPage::platformEditorState(Frame& frame, EditorState& result, IncludePostLayoutDataHint shouldIncludePostLayoutData) const
{
+ FrameView* view = frame.view();
if (frame.editor().hasComposition()) {
RefPtr<Range> compositionRange = frame.editor().compositionRange();
Vector<WebCore::SelectionRect> compositionRects;
@@ -199,9 +200,9 @@
if (compositionRange) {
compositionRange->collectSelectionRects(compositionRects);
if (compositionRects.size())
- result.firstMarkedRect = compositionRects[0].rect();
+ result.firstMarkedRect = view->contentsToRootView(compositionRects[0].rect());
if (compositionRects.size() > 1)
- result.lastMarkedRect = compositionRects.last().rect();
+ result.lastMarkedRect = view->contentsToRootView(compositionRects.last().rect());
else
result.lastMarkedRect = result.firstMarkedRect;
result.markedText = plainTextReplacingNoBreakSpace(compositionRange.get());
@@ -223,7 +224,7 @@
}
auto& postLayoutData = result.postLayoutData();
- FrameView* view = frame.view();
+
const VisibleSelection& selection = frame.selection().selection();
postLayoutData.isStableStateUpdate = m_isInStableState;
bool startNodeIsInsideFixedPosition = false;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
