Summary: | [Qt] ImageDiff sometimes hangs | ||||||
---|---|---|---|---|---|---|---|
Product: | WebKit | Reporter: | Csaba Osztrogonác <ossy> | ||||
Component: | Tools / Tests | Assignee: | Csaba Osztrogonác <ossy> | ||||
Status: | RESOLVED FIXED | ||||||
Severity: | Normal | CC: | ariya.hidayat, cmarcelo, commit-queue, hausmann, kling | ||||
Priority: | P2 | Keywords: | Qt, QtTriaged | ||||
Version: | 528+ (Nightly build) | ||||||
Hardware: | All | ||||||
OS: | All | ||||||
Attachments: |
|
Description
Csaba Osztrogonác
2011-02-17 05:39:59 PST
Created attachment 82816 [details]
proposed fix
ImageDiff was written by Ariya and reviewed by Simon: https://bugs.webkit.org/show_bug.cgi?id=27813 ImageDiff is able to compare pairs of images. actualImage and baselineImage should be cleared after all comparison: + actualImage = QImage(); + baselineImage = QImage(); Comment on attachment 82816 [details] proposed fix View in context: https://bugs.webkit.org/attachment.cgi?id=82816&action=review > Tools/DumpRenderTree/qt/ImageDiff.cpp:146 > + actualImage = QImage(); > + baselineImage = QImage(); This should be below the next } so they get cleared if one of them isNull(), too. Comment on attachment 82816 [details]
proposed fix
Superficial review fail, didn't realize this was an FSM. r=me, motherlover :)
The commit-queue encountered the following flaky tests while processing attachment 82816 [details]: media/invalid-media-url-crash.html bug 51138 (author: inferno@chromium.org) The commit-queue is continuing to process your patch. Comment on attachment 82816 [details] proposed fix Clearing flags on attachment: 82816 Committed r78840: <http://trac.webkit.org/changeset/78840> All reviewed patches have been landed. Closing bug. Revision r78840 cherry-picked into qtwebkit-2.1 with commit 3d8aeee68ff7943cc50e4b321b1071195b671d0a <http://gitorious.org/webkit/qtwebkit/commit/3d8aeee68ff7943cc50e4b321b1071195b671d0a> Also merged into qtwebkit-2.1.x |