I tried the follow Levi's logic on Blink's nextSegmentBreak refactoring (https://chromiumcodereview.appspot.com/25054004). I mostly did the same changes, but the code is too diverged at this point to just apply that patch on our trunk. The patch introduces BreakingContext as a separate class. I added new methods for each condition. I also removed the goto-s from the code. All the new methods are inline in order to avoid introducing any performance regression. The change makes the code so much cleaner and understandable.
Created attachment 214602 [details] bullet for EWS bots
Attachment 214602 [details] did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCore/rendering/RenderBlockFlow.h', u'Source/WebCore/rendering/RenderBlockLineLayout.cpp', u'Source/WebCore/rendering/shapes/ShapeInsideInfo.h']" exit_code: 1 Source/WebCore/rendering/RenderBlockLineLayout.cpp:1468: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Source/WebCore/rendering/RenderBlockLineLayout.cpp:1471: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Source/WebCore/rendering/RenderBlockLineLayout.cpp:1472: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Total errors found: 3 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style.
Comment on attachment 214602 [details] bullet for EWS bots Attachment 214602 [details] did not pass mac-wk2-ews (mac-wk2): Output: http://webkit-queues.appspot.com/results/6448005 New failing tests: editing/selection/after-line-wrap.html
Created attachment 214608 [details] Archive of layout-test-results from webkit-ews-09 for mac-mountainlion-wk2 The attached test failures were seen while running run-webkit-tests on the mac-wk2-ews. Bot: webkit-ews-09 Port: mac-mountainlion-wk2 Platform: Mac OS X 10.8.5
Comment on attachment 214602 [details] bullet for EWS bots Attachment 214602 [details] did not pass mac-ews (mac): Output: http://webkit-queues.appspot.com/results/6428012 New failing tests: editing/selection/after-line-wrap.html
Created attachment 214609 [details] Archive of layout-test-results from webkit-ews-06 for mac-mountainlion The attached test failures were seen while running run-webkit-tests on the mac-ews. Bot: webkit-ews-06 Port: mac-mountainlion Platform: Mac OS X 10.8.5
Comment on attachment 214602 [details] bullet for EWS bots Attachment 214602 [details] did not pass mac-ews (mac): Output: http://webkit-queues.appspot.com/results/6398021 New failing tests: editing/selection/after-line-wrap.html
Created attachment 214617 [details] Archive of layout-test-results from webkit-ews-05 for mac-mountainlion The attached test failures were seen while running run-webkit-tests on the mac-ews. Bot: webkit-ews-05 Port: mac-mountainlion Platform: Mac OS X 10.8.5
Created attachment 214626 [details] 2nd bullet for EWSs
Comment on attachment 214626 [details] 2nd bullet for EWSs r=me
Created attachment 214893 [details] Patch
Created attachment 214901 [details] Patch
Comment on attachment 214901 [details] Patch Rejecting attachment 214901 [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-01', 'land-attachment', '--force-clean', '--non-interactive', '--parent-command=commit-queue', 214901, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit Last 500 characters of output: 57827 = e94c2c982ba63ffbf3cdb559e1b4ce761a2bd1ee r157828 = 12840dc1a7bdcec0407f02b3f48f65c65cc4fd4a Done rebuilding .git/svn/refs/remotes/origin/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc M Source/WebKit2/ChangeLog M Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp r157829 = b113269736701107fca2829964c8b46b7e565d96 (refs/remotes/origin/master) First, rewinding head to replay your work on top of it... Fast-forwarded master to refs/remotes/origin/master. Full output: http://webkit-queues.appspot.com/results/9428030
I'm updating the patch after r157828.
Created attachment 214931 [details] Patch
Comment on attachment 214931 [details] Patch Clearing flags on attachment: 214931 Committed r157851: <http://trac.webkit.org/changeset/157851>
All reviewed patches have been landed. Closing bug.