Bug 66239

Summary: Switch Inline rendering classes to new layout types
Product: WebKit Reporter: Levi Weintraub <leviw>
Component: Layout and RenderingAssignee: 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 Flags
Patch none

Levi Weintraub
Reported 2011-08-15 10:53:53 PDT
Ongoing conversion.
Attachments
Patch (24.12 KB, patch)
2011-08-15 12:20 PDT, Levi Weintraub 		no flags
DetailsFormatted DiffDiff
View All Add attachment proposed patch, testcase, etc.
Levi Weintraub
Comment 1 2011-08-15 12:20:01 PDT
Created attachment 103940 [details] Patch
WebKit Review Bot
Comment 2 2011-08-17 13:26:14 PDT
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
WebKit Review Bot
Comment 3 2011-08-17 15:59:19 PDT
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
WebKit Review Bot
Comment 4 2011-08-18 12:23:37 PDT
Comment on attachment 103940 [details] Patch Clearing flags on attachment: 103940 Committed r93333: <http://trac.webkit.org/changeset/93333>
WebKit Review Bot
Comment 5 2011-08-18 12:23:41 PDT
All reviewed patches have been landed. Closing bug.
Note You need to log in before you can comment on or make changes to this bug.