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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: Source/WebCore/rendering/RenderLineBoxList.cpp

Issue 6591048: Merge 79689 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/648/
Patch Set: Created 9 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « LayoutTests/fast/text/word-break-next-linebox-not-dirty-crash-main-expected.txt ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/rendering/RenderLineBoxList.cpp
===================================================================
--- Source/WebCore/rendering/RenderLineBoxList.cpp (revision 79909)
+++ Source/WebCore/rendering/RenderLineBoxList.cpp (working copy)
@@ -363,11 +363,9 @@
adjacentBox = box->prevRootBox();
if (adjacentBox)
adjacentBox->markDirty();
- if (child->isBR() || (curr && curr->isBR())) {
- adjacentBox = box->nextRootBox();
- if (adjacentBox)
- adjacentBox->markDirty();
- }
+ adjacentBox = box->nextRootBox();
+ if (adjacentBox && (adjacentBox->lineBreakObj() == child || child->isBR() || (curr && curr->isBR())))
+ adjacentBox->markDirty();
}
}
« no previous file with comments | « LayoutTests/fast/text/word-break-next-linebox-not-dirty-crash-main-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698