Bug 74080 – Upsteam the Qt changes to the EditorState

• Status: RESOLVED
• Resolution: FIXED
• Component: WebKit2

[Kenneth Rohde Christiansen]

SSIA

[Kenneth Rohde Christiansen]

Created attachment 118369 [details]
Patch

[Collabora GTK+ EWS bot]

Comment on attachment 118369 [details]
Patch

Attachment 118369 [details] did not pass gtk-ews (gtk):
Output: http://queues.webkit.org/results/10800213

[Kenneth Rohde Christiansen]

kling help me you xcode expert you...

[Kenneth Rohde Christiansen]

Created attachment 118373 [details]
Patch

Forgot to add the file :-)

[Simon Hausmann]

Comment on attachment 118373 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=118373&action=review

r=me with one change

> Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp:193
> +    EditorState state = m_page->editorState();
>  
> -        ExceptionCode ec = 0;
> -        RefPtr<Range> tempRange = range->cloneRange(ec);
> -        tempRange->setStart(tempRange->startContainer(ec), tempRange->startOffset(ec) + location, ec);
> -        IntRect caretRect = frame->view()->contentsToWindow(frame->editor()->firstRectForRange(tempRange.get()));
> -        IntRect nodeRect = frame->view()->contentsToWindow(scope->getRect());
> -
> -        m_page->send(Messages::WebPageProxy::FocusEditableArea(caretRect, nodeRect));
> -    }
> +#if PLATFORM(QT)
> +    if (Element* scope = frame->selection()->rootEditableElement())
> +        m_page->send(Messages::WebPageProxy::FocusEditableArea(state.microFocus, scope->getRect()));
>  #endif
>  
>      m_page->send(Messages::WebPageProxy::EditorStateChanged(m_page->editorState()));

The last call there should use the newly introduced state variable instead of requesting editorState() again.

[Kenneth Rohde Christiansen]

Comment on attachment 118373 [details]
Patch

Landed in r102334

[Csaba Osztrogonác]

It made 9 editing tests crash: http://build.webkit.sed.hu/results/x86-32%20Linux%20Qt%20Release%20WebKit2/r102334%20%2816707%29/results.html

[Simon Hausmann]

I think I fixed that in http://trac.webkit.org/changeset/102341

Gotta run. Can somebody close this bug report after checking the bot results? thanks :)

[Csaba Osztrogonác]

(In reply to comment #8)
> I think I fixed that in http://trac.webkit.org/changeset/102341
> 
> Gotta run. Can somebody close this bug report after checking the bot results? thanks :)

Yes, it fixed the bug.

[Kenneth Rohde Christiansen]

(In reply to comment #7)
> It made 9 editing tests crash: http://build.webkit.sed.hu/results/x86-32%20Linux%20Qt%20Release%20WebKit2/r102334%20%2816707%29/results.html

I wonder if those are due to full document editing... need to have a look at that some time.