Source/core/layout/FloatingObjects.cpp - Issue 1164933006: Create LineLayout api

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: Source/core/layout/FloatingObjects.cpp

Issue 1164933006: Create LineLayout api (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: naming nits, remove unimplemented operators Created 5 years, 6 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/layout/FloatingObjects.cpp

diff --git a/Source/core/layout/FloatingObjects.cpp b/Source/core/layout/FloatingObjects.cpp

index ddf72ac167b47ac9fc8f512472f7ff2ae49472ad..b9e656233515ce202bde676c89e1f0d2bbff4d39 100644

--- a/Source/core/layout/FloatingObjects.cpp

+++ b/Source/core/layout/FloatingObjects.cpp

@@ -515,7 +515,7 @@ inline bool ComputeFloatOffsetForLineLayoutAdapter<FloatingObject::FloatLeft>::u

{

LayoutUnit logicalRight = m_layoutObject->logicalRightForFloat(&floatingObject);

if (ShapeOutsideInfo* shapeOutside = floatingObject.layoutObject()->shapeOutsideInfo()) {

- ShapeOutsideDeltas shapeDeltas = shapeOutside->computeDeltasForContainingBlockLine(*m_layoutObject, floatingObject, m_lineTop, m_lineBottom - m_lineTop);

+ ShapeOutsideDeltas shapeDeltas = shapeOutside->computeDeltasForContainingBlockLine(const_cast<LayoutBlockFlow*>(m_layoutObject), floatingObject, m_lineTop, m_lineBottom - m_lineTop);

if (!shapeDeltas.lineOverlapsShape())

return false;

@@ -534,7 +534,7 @@ inline bool ComputeFloatOffsetForLineLayoutAdapter<FloatingObject::FloatRight>::

{

LayoutUnit logicalLeft = m_layoutObject->logicalLeftForFloat(&floatingObject);

if (ShapeOutsideInfo* shapeOutside = floatingObject.layoutObject()->shapeOutsideInfo()) {

- ShapeOutsideDeltas shapeDeltas = shapeOutside->computeDeltasForContainingBlockLine(*m_layoutObject, floatingObject, m_lineTop, m_lineBottom - m_lineTop);

+ ShapeOutsideDeltas shapeDeltas = shapeOutside->computeDeltasForContainingBlockLine(const_cast<LayoutBlockFlow*>(m_layoutObject), floatingObject, m_lineTop, m_lineBottom - m_lineTop);

if (!shapeDeltas.lineOverlapsShape())

return false;

« no previous file with comments | « Source/core/core.gypi ('k') | Source/core/layout/LayoutBlockFlow.h » ('j') | Source/core/layout/api/LineLayoutItem.h » ('J')