Bug 99534

Summary: Move handling of CSSPropertyWebkitLineClamp from StyleResolver into StyleBuilder.
Product: WebKit Reporter: Luke Macpherson <macpherson>
Component: New BugsAssignee: Luke Macpherson <macpherson>
Status: RESOLVED FIXED    
Severity: Normal CC: allan.jensen, cmarcelo, menard, webkit.review.bot
Priority: P2    
Version: 528+ (Nightly build)   
Hardware: Unspecified   
OS: Unspecified   
Attachments:
Description Flags
Patch
none
Patch for landing none

Luke Macpherson
Reported 2012-10-16 19:49:09 PDT
Move handling of CSSPropertyWebkitLineClamp from StyleResolver into StyleBuilder.
Attachments
Patch (3.76 KB, patch)
2012-10-16 19:53 PDT, Luke Macpherson 		no flags
DetailsFormatted DiffDiff
Patch for landing (3.78 KB, patch)
2012-10-17 16:25 PDT, Luke Macpherson 		no flags
DetailsFormatted DiffDiff
Show Obsolete (1) View All Add attachment proposed patch, testcase, etc.
Luke Macpherson
Comment 1 2012-10-16 19:53:49 PDT
Created attachment 169078 [details] Patch
WebKit Review Bot
Comment 2 2012-10-17 04:31:08 PDT
Comment on attachment 169078 [details] Patch Rejecting attachment 169078 [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: rce/WebCore/ChangeLog CONFLICT (content): Merge conflict in Source/WebCore/ChangeLog Failed to merge in the changes. Patch failed at 0001 Localized date should be based on LDML 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 164. Full output: http://queues.webkit.org/results/14412097
Luke Macpherson
Comment 3 2012-10-17 16:25:32 PDT
Created attachment 169294 [details] Patch for landing
WebKit Review Bot
Comment 4 2012-10-17 17:18:21 PDT
Comment on attachment 169294 [details] Patch for landing Clearing flags on attachment: 169294 Committed r131677: <http://trac.webkit.org/changeset/131677>
WebKit Review Bot
Comment 5 2012-10-17 17:18:25 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.