The final CSS Shapes level 1 spec (http://dev.w3.org/csswg/css-shapes-1/) does not include shape-inside only allows shape-outside to be specified on floats. In light of this, the RasterShape class can be substantially simplified. The support for shape-inside has already been removed, see https://bugs.webkit.org/show_bug.cgi?id=130740 Since only floats can specify shape-outside, the RasterShapeIntervals class need only track the first and last above threshold pixel column (x1 and x2 in the implementation) for each row.
Created attachment 228090 [details] Patch
Attachment 228090 [details] did not pass style-queue: ERROR: Source/WebCore/rendering/shapes/Shape.cpp:200: Multi line control clauses should use braces. [whitespace/braces] [4] ERROR: Source/WebCore/rendering/shapes/Shape.cpp:200: One space before end of line comments [whitespace/comments] [5] Total errors found: 2 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style.
Created attachment 228092 [details] Patch Removed a comment that offended the style checker.
Comment on attachment 228092 [details] Patch Rejecting attachment 228092 [details] from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.appspot.com', '--bot-id=webkit-cq-02', 'apply-attachment', '--no-update', '--non-interactive', 228092, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit Last 500 characters of output: Hunk #2 succeeded at 83 with fuzz 1. 1 out of 2 hunks FAILED -- saving rejects to file Source/WebCore/rendering/shapes/RasterShape.h.rej patching file Source/WebCore/rendering/shapes/Shape.cpp Hunk #1 succeeded at 195 (offset -2 lines). Hunk #2 succeeded at 204 (offset -2 lines). patching file Source/WebCore/rendering/shapes/ShapeInterval.h Failed to run "[u'/Volumes/Data/EWS/WebKit/Tools/Scripts/svn-apply', '--force', '--reviewer', u'Dean Jackson']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Full output: http://webkit-queues.appspot.com/results/5748843891130368
Created attachment 228192 [details] Patch Resync.
Comment on attachment 228192 [details] Patch Rejecting attachment 228192 [details] from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.appspot.com', '--bot-id=webkit-cq-03', 'validate-changelog', '--check-oops', '--non-interactive', 228192, '--port=mac']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit ChangeLog entry in Source/WebCore/ChangeLog contains OOPS!. Full output: http://webkit-queues.appspot.com/results/4773537348845568
Created attachment 228197 [details] Patch Fixed ChangeLog "reviewed by" entry.
Comment on attachment 228197 [details] Patch Clearing flags on attachment: 228197 Committed r166522: <http://trac.webkit.org/changeset/166522>
All reviewed patches have been landed. Closing bug.