Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(520)

Issue 19275016: Merge 152812 "Breaking whitespace in a white-space:pre-wrap shou..." (Closed)

Created:
7 years, 5 months ago by ojan
Modified:
7 years, 5 months ago
Reviewers:
ojan
CC:
blink-reviews, jchaffraix+rendering
Visibility:
Public.

Description

Merge 152812 "Breaking whitespace in a white-space:pre-wrap shou..." > Breaking whitespace in a white-space:pre-wrap should never go on the new line. > > This broke in https://src.chromium.org/viewvc/blink?revision=147837&view=revision. > From that patch, currentCharacterIsWS does not get reset when currentCharacterIsSpace > does, so previousCharacterIsSpace is now the wrong thing for checking what to do > with a white-space:pre-wrap space. > > Specifically, it's the following line at the end of RenderBlock::LineBreaker::nextSegmentBreak > where we reset currentCharacterIsSpace, but not currentCharacterShouldCollapseIfPreWap: > if (!collapseWhiteSpace) > currentCharacterIsSpace = false; > > This code brings that bool back. It's a bit gross, but I couldn't come up with a cleaner > way to do this. At some point, someone needs to take a hacksaw to > RenderBlock::LineBreaker::nextSegmentBreak to break it up into digestible pieces. > > BUG=246127, 247959 > > Review URL: https://chromiumcodereview.appspot.com/17434006 TBR=ojan@chromium.org Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=154316

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+5 lines, -3 lines) Patch
A + LayoutTests/fast/text/whitespace/pre-wrap-no-space-at-start-of-line.html View 0 chunks +-1 lines, --1 lines 0 comments Download
A + LayoutTests/fast/text/whitespace/pre-wrap-no-space-at-start-of-line-expected.html View 0 chunks +-1 lines, --1 lines 0 comments Download
M Source/core/rendering/RenderBlockLineLayout.cpp View 6 chunks +7 lines, -5 lines 0 comments Download

Messages

Total messages: 2 (0 generated)
ojan
7 years, 5 months ago (2013-07-16 20:18:04 UTC) #1
ojan
7 years, 5 months ago (2013-07-16 20:18:22 UTC) #2
Message was sent while issue was closed.
Committed patchset #1 manually as r154316.

Powered by Google App Engine
This is Rietveld 408576698