[Chromium] Expose setLayoutFallbackWidth as a WebSetting
Created attachment 124720 [details]
Attachment 124720 [details] did not pass style-queue:
Failed to run "['Tools/Scripts/update-webkit']" exit_code: 9
First, rewinding head to replay your work on top of it...
Applying: Fix compilation errors on build-webkit --debug --no-workers on mac.
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
CONFLICT (content): Merge conflict in LayoutTests/ChangeLog
CONFLICT (content): Merge conflict in LayoutTests/platform/qt/Skipped
CONFLICT (content): Merge conflict in Source/WebCore/ChangeLog
Failed to merge in the changes.
Patch failed at 0001 Fix compilation errors on build-webkit --debug --no-workers on mac.
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.
If any of these errors are false positives, please file a bug against check-webkit-style.
Comment on attachment 124720 [details]
Clearing flags on attachment: 124720
Committed r106394: <http://trac.webkit.org/changeset/106394>
All reviewed patches have been landed. Closing bug.