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

Unified Diff: Source/core/rendering/line/BreakingContext.cpp

Issue 209443007: Remove shape-inside support (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fix Zoltan's comments Created 6 years, 9 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
Index: Source/core/rendering/line/BreakingContext.cpp
diff --git a/Source/core/rendering/line/BreakingContext.cpp b/Source/core/rendering/line/BreakingContext.cpp
index 95bd0a781eb870a5ac36082e9f1bfbf93f25ce70..10a6e87468e4408e2053ea21c3a66673cd301935 100644
--- a/Source/core/rendering/line/BreakingContext.cpp
+++ b/Source/core/rendering/line/BreakingContext.cpp
@@ -28,10 +28,7 @@ namespace WebCore {
InlineIterator BreakingContext::handleEndOfLine()
{
- ShapeInsideInfo* shapeInfo = m_block->layoutShapeInsideInfo();
- bool segmentAllowsOverflow = !shapeInfo || !shapeInfo->hasSegments();
-
- if (m_lineBreak == m_resolver.position() && (!m_lineBreak.object() || !m_lineBreak.object()->isBR()) && segmentAllowsOverflow) {
+ if (m_lineBreak == m_resolver.position() && (!m_lineBreak.object() || !m_lineBreak.object()->isBR())) {
// we just add as much as possible
if (m_blockStyle->whiteSpace() == PRE && !m_current.offset()) {
m_lineBreak.moveTo(m_lastObject, m_lastObject->isText() ? m_lastObject->length() : 0);
@@ -46,7 +43,7 @@ InlineIterator BreakingContext::handleEndOfLine()
// FIXME Bug 100049: We do not need to consume input in a multi-segment line
// unless no segment will.
// make sure we consume at least one char/object.
Bem Jones-Bey (adobe) 2014/03/27 00:09:47 This comment is obsolete, it should be removed.
- if (m_lineBreak == m_resolver.position() && segmentAllowsOverflow)
+ if (m_lineBreak == m_resolver.position())
m_lineBreak.increment();
// Sanity check our midpoints.

Powered by Google App Engine
This is Rietveld 408576698