Bug 81368 - [Qt][WK2] Avoid usage of manual scaling in the Qt scenegraph integration
Summary: [Qt][WK2] Avoid usage of manual scaling in the Qt scenegraph integration
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: Platform (show other bugs)
Version: 528+ (Nightly build)
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Noam Rosenthal
URL:
Keywords: Qt
Depends on:
Blocks:
 
Reported: 2012-03-16 10:35 PDT by Noam Rosenthal
Modified: 2012-03-18 15:52 PDT (History)
7 users (show)

See Also:

Attachments
Patch (14.34 KB, patch)
2012-03-16 10:39 PDT, Noam Rosenthal 		no flags Details | Formatted Diff | Diff
Patch for landing (13.57 KB, patch)
2012-03-18 09:43 PDT, Noam Rosenthal 		webkit.review.bot: commit-queue-
Details | Formatted Diff | Diff
Patch (4.49 KB, patch)
2012-03-18 11:42 PDT, Noam Rosenthal 		no flags Details | Formatted Diff | Diff
Patch (13.21 KB, patch)
2012-03-18 11:44 PDT, Noam Rosenthal 		no flags Details | Formatted Diff | Diff
Show Obsolete (3) View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Noam Rosenthal 2012-03-16 10:35:28 PDT 
[Qt][WK2] Avoid usage of manual scaling in the Qt scenegraph integration
Comment 1 Noam Rosenthal 2012-03-16 10:39:35 PDT 
Created attachment 132316 [details]
Patch
Comment 2 Simon Hausmann 2012-03-18 03:49:21 PDT 
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 :)
Comment 3 Noam Rosenthal 2012-03-18 09:43:06 PDT 
Created attachment 132494 [details]
Patch for landing
Comment 4 WebKit Review Bot 2012-03-18 09:47:44 PDT 
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
Comment 5 Noam Rosenthal 2012-03-18 11:42:06 PDT 
Created attachment 132497 [details]
Patch
Comment 6 Noam Rosenthal 2012-03-18 11:44:04 PDT 
Created attachment 132499 [details]
Patch
Comment 7 WebKit Review Bot 2012-03-18 11:51:18 PDT 
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
Comment 8 Noam Rosenthal 2012-03-18 15:06:16 PDT 
Comment on attachment 132499 [details]
Patch

Patch should now apply.
Comment 9 WebKit Review Bot 2012-03-18 15:52:19 PDT 
Comment on attachment 132499 [details]
Patch

Clearing flags on attachment: 132499

Committed r111138: <http://trac.webkit.org/changeset/111138>
Comment 10 WebKit Review Bot 2012-03-18 15:52:25 PDT 
All reviewed patches have been landed.  Closing bug.