Bug 112850 – [Qt][WK2] Remove direct references to WebPageProxy from QQuickWebPage.

• Status: RESOLVED
• Resolution: FIXED
• Component: New Bugs

[Michael Brüning]

[Qt][WK2] Remove direct references to WebPageProxy from QQuickWebPage.

[Michael Brüning]

Created attachment 194133 [details]
Patch

[Michael Brüning]

Created attachment 194229 [details]
Disassembly.

[Michael Brüning]

Comment on attachment 194229 [details]
Disassembly.

Please disregard disassembly - wrong window...

[Jocelyn Turcotte]

Comment on attachment 194133 [details]
Patch

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

> Source/WebKit2/UIProcess/API/qt/qquickwebpage.cpp:56
>  QQuickWebPagePrivate::QQuickWebPagePrivate(QQuickWebPage* q, QQuickWebView* viewportItem)
>      : q(q)
>      , viewportItem(viewportItem)
> -    , webPageProxy(0)
> +    , webViewPrivate(0)

We already have a pointer to viewportItem, so maybe we could either replace it everywhere with your webViewPrivate->q_func() or access the webViewPrivate through viewportItem->d_func()?
Whichever is more convenient.

> Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp:946
> +    if (!webPageProxy)
> +        return 0;
> +    if (!webPageProxy->drawingArea() || !webPageProxy->drawingArea()->coordinatedLayerTreeHostProxy())
> +        return 0;

Those can be merged I believe.

> Source/WebKit2/UIProcess/API/qt/qquickwebview_p_p.h:142
> +    // FIXME: The following three methods are only here for splitting the webview move into several patches.
> +    // They be removed then and their counterparts in QRawWebView will be used.

This should rather be written in the ChangeLog.

> Source/WebKit2/UIProcess/API/qt/qquickwebview_p_p.h:146
> +    void setIntrinsicDeviceScaleFactor(float);
>  protected:

Missing empty line.

[Michael Brüning]

Created attachment 194280 [details]
Patch

[Jocelyn Turcotte]

Comment on attachment 194280 [details]
Patch

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

> Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp:942
> +    if (!webPageProxy || !webPageProxy->drawingArea() || !webPageProxy->drawingArea()->coordinatedLayerTreeHostProxy())
> +        return 0;

Nit: It would read slightly better to move the return 0; at the end, remove the negations and return the correct pointer here.

LGTM otherwise.

[Michael Brüning]

Created attachment 194311 [details]
Patch

[Michael Brüning]

Committed r148011: <http://trac.webkit.org/changeset/148011>