Summary: | Followup SubresourceLoader cleanup after r100311 | ||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Product: | WebKit | Reporter: | Nate Chapin <japhet> | ||||||||||
Component: | WebCore Misc. | Assignee: | Nate Chapin <japhet> | ||||||||||
Status: | RESOLVED FIXED | ||||||||||||
Severity: | Normal | CC: | abarth, ap, dglazkov, koivisto, webkit.review.bot | ||||||||||
Priority: | P2 | ||||||||||||
Version: | 528+ (Nightly build) | ||||||||||||
Hardware: | Unspecified | ||||||||||||
OS: | Unspecified | ||||||||||||
Attachments: |
|
Description
Nate Chapin
2012-01-09 13:35:57 PST
Created attachment 121723 [details]
patch
Comment on attachment 121723 [details]
patch
ChangeLog?
Created attachment 121726 [details]
Diffing from the right directory this time
Comment on attachment 121726 [details]
Diffing from the right directory this time
Very nice.
Comment on attachment 121726 [details] Diffing from the right directory this time Rejecting attachment 121726 [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: re/loader/SubresourceLoader.cpp Hunk #8 FAILED at 222. Hunk #9 succeeded at 307 (offset 7 lines). 1 out of 9 hunks FAILED -- saving rejects to file Source/WebCore/loader/SubresourceLoader.cpp.rej patching file Source/WebCore/loader/SubresourceLoader.h Hunk #2 FAILED at 72. 1 out of 2 hunks FAILED -- saving rejects to file Source/WebCore/loader/SubresourceLoader.h.rej Failed to run "[u'/mnt/git/webkit-commit-queue/Tools/Scripts/svn-apply', u'--reviewer', u'Adam Barth', u'--force']" exit_code: 1 Full output: http://queues.webkit.org/results/11113585 Created attachment 121738 [details]
Merged to trunk.
Requesting a new approval since the merge was non-trivial.
Comment on attachment 121738 [details] Merged to trunk. Rejecting attachment 121738 [details] from commit-queue. New failing tests: tables/mozilla/bugs/bug50695-2.html http/tests/multipart/invalid-image-data-standalone.html editing/pasteboard/copy-standalone-image.html editing/pasteboard/data-transfer-items-image-png.html fast/events/standalone-image-drag-to-editable.html Full output: http://queues.webkit.org/results/11188671 Comment on attachment 121738 [details] Merged to trunk. Attachment 121738 [details] did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/11183717 New failing tests: tables/mozilla/bugs/bug50695-2.html http/tests/multipart/invalid-image-data-standalone.html editing/pasteboard/copy-standalone-image.html editing/pasteboard/data-transfer-items-image-png.html fast/events/standalone-image-drag-to-editable.html Created attachment 122093 [details]
Patch for landing
Comment on attachment 122093 [details] Patch for landing Clearing flags on attachment: 122093 Committed r104756: <http://trac.webkit.org/changeset/104756> All reviewed patches have been landed. Closing bug. |