Bug 81368 – [Qt][WK2] Avoid usage of manual scaling in the Qt scenegraph integration

• Status: RESOLVED
• Resolution: FIXED
• Component: Platform

[Noam Rosenthal]

[Qt][WK2] Avoid usage of manual scaling in the Qt scenegraph integration

[Noam Rosenthal]

Created attachment 132316 [details]
Patch

[Simon Hausmann]

Comment on attachment 132316 [details]
Patch

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

> Source/WebKit2/UIProcess/qt/QtWebPageSGNode.cpp:58
> +    void setScale(float scale) { m_scale = scale; }

m_scale as well as this setScale method seems unused, now that we have the transform node as a parent of this item.

> Source/WebKit2/UIProcess/qt/QtWebPageSGNode.cpp:131
> +    if (m_contentsNode)

I think you can remove the if() here :)

[Noam Rosenthal]

Created attachment 132494 [details]
Patch for landing

[WebKit Review Bot]

Comment on attachment 132494 [details]
Patch for landing

Rejecting attachment 132494 [details] from commit-queue.

Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 2

Last 500 characters of output:
get.pri
patching file Source/WebKit2/UIProcess/API/qt/qquickwebpage.cpp
Hunk #1 FAILED at 23.
Hunk #2 FAILED at 81.
Hunk #3 FAILED at 191.
3 out of 3 hunks FAILED -- saving rejects to file Source/WebKit2/UIProcess/API/qt/qquickwebpage.cpp.rej
patching file Source/WebKit2/UIProcess/qt/QtWebPageSGNode.cpp
patching file Source/WebKit2/UIProcess/qt/QtWebPageSGNode.h

Failed to run "[u'/mnt/git/webkit-commit-queue/Tools/Scripts/svn-apply', u'--force']" exit_code: 1 cwd: /mnt/git/webkit-commit-queue/

Full output: http://queues.webkit.org/results/11976635

[Noam Rosenthal]

Created attachment 132497 [details]
Patch

[Noam Rosenthal]

Created attachment 132499 [details]
Patch

[WebKit Review Bot]

Comment on attachment 132499 [details]
Patch

Rejecting attachment 132499 [details] from commit-queue.

Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 2

Last 500 characters of output:
get.pri
patching file Source/WebKit2/UIProcess/API/qt/qquickwebpage.cpp
Hunk #1 FAILED at 23.
Hunk #2 FAILED at 81.
Hunk #3 FAILED at 191.
3 out of 3 hunks FAILED -- saving rejects to file Source/WebKit2/UIProcess/API/qt/qquickwebpage.cpp.rej
patching file Source/WebKit2/UIProcess/qt/QtWebPageSGNode.cpp
patching file Source/WebKit2/UIProcess/qt/QtWebPageSGNode.h

Failed to run "[u'/mnt/git/webkit-commit-queue/Tools/Scripts/svn-apply', u'--force']" exit_code: 1 cwd: /mnt/git/webkit-commit-queue/

Full output: http://queues.webkit.org/results/11975718

[Noam Rosenthal]

Comment on attachment 132499 [details]
Patch

Patch should now apply.

[WebKit Review Bot]

Comment on attachment 132499 [details]
Patch

Clearing flags on attachment: 132499

Committed r111138: <http://trac.webkit.org/changeset/111138>

[WebKit Review Bot]

All reviewed patches have been landed.  Closing bug.