| Summary: | Switch Inline rendering classes to new layout types | ||||||
|---|---|---|---|---|---|---|---|
| Product: | WebKit | Reporter: | Levi Weintraub <leviw> | ||||
| Component: | Layout and Rendering | Assignee: | Levi Weintraub <leviw> | ||||
| Status: | RESOLVED FIXED | ||||||
| Severity: | Normal | CC: | eae, eric, webkit.review.bot | ||||
| Priority: | P2 | ||||||
| Version: | 528+ (Nightly build) | ||||||
| Hardware: | Unspecified | ||||||
| OS: | Unspecified | ||||||
| Bug Depends on: | |||||||
| Bug Blocks: | 63567 | ||||||
| Attachments: |
|
||||||
|
Description
Levi Weintraub
2011-08-15 10:53:53 PDT
Created attachment 103940 [details]
Patch
Comment on attachment 103940 [details] Patch Rejecting attachment 103940 [details] from commit-queue. Failed to run "['./Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '--bot-id=ec2-cq-03', '--port..." exit_code: 2 Last 500 characters of output: LICT (content): Merge conflict in Tools/ChangeLog Failed to merge in the changes. Patch failed at 0001 Tell Trac logs always to display all specified revisions in a single page When you have resolved this problem run "git rebase --continue". If you would prefer to skip this patch, instead run "git rebase --skip". To restore the original branch and stop rebasing run "git rebase --abort". rebase refs/remotes/origin/master: command returned error: 1 Died at Tools/Scripts/update-webkit line 146. Full output: http://queues.webkit.org/results/9422089 Comment on attachment 103940 [details] Patch Rejecting attachment 103940 [details] from commit-queue. Failed to run "['./Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '--bot-id=ec2-cq-03', '--port..." exit_code: 2 Last 500 characters of output: Log CONFLICT (content): Merge conflict in Tools/ChangeLog Failed to merge in the changes. Patch failed at 0001 [chromium] Crash if compositing is disabled during updateLayers() When you have resolved this problem run "git rebase --continue". If you would prefer to skip this patch, instead run "git rebase --skip". To restore the original branch and stop rebasing run "git rebase --abort". rebase refs/remotes/origin/master: command returned error: 1 Died at Tools/Scripts/update-webkit line 146. Full output: http://queues.webkit.org/results/9424161 Comment on attachment 103940 [details] Patch Clearing flags on attachment: 103940 Committed r93333: <http://trac.webkit.org/changeset/93333> All reviewed patches have been landed. Closing bug. |