| Index: Source/core/rendering/RenderBlockLineLayout.cpp
|
| diff --git a/Source/core/rendering/RenderBlockLineLayout.cpp b/Source/core/rendering/RenderBlockLineLayout.cpp
|
| index 7567b5255dad35201e5a90866013aaa52793cca6..901efa2feb2fcd26160dcf608fd38fc5034e25ac 100644
|
| --- a/Source/core/rendering/RenderBlockLineLayout.cpp
|
| +++ b/Source/core/rendering/RenderBlockLineLayout.cpp
|
| @@ -1064,7 +1064,7 @@ void RenderBlockFlow::layoutRunsAndFloatsInRange(LineLayoutState& layoutState, I
|
| it = lastFloatIterator;
|
| }
|
| for (; it != end; ++it) {
|
| - FloatingObject* f = (*it).get();
|
| + FloatingObject* f = it->get();
|
| appendFloatingObjectToLastLine(f);
|
| ASSERT(f->renderer() == layoutState.floats()[layoutState.floatIndex()].object);
|
| // If a float's geometry has changed, give up on syncing with clean lines.
|
| @@ -1208,7 +1208,7 @@ void RenderBlockFlow::linkToEndLineIfNeeded(LineLayoutState& layoutState)
|
| it = lastFloatIterator;
|
| }
|
| for (; it != end; ++it)
|
| - appendFloatingObjectToLastLine((*it).get());
|
| + appendFloatingObjectToLastLine(it->get());
|
| layoutState.setLastFloat(!floatingObjectSet.isEmpty() ? floatingObjectSet.last().get() : 0);
|
| }
|
| }
|
| @@ -1982,7 +1982,7 @@ bool RenderBlockFlow::checkPaginationAndFloatsAtEndLine(LineLayoutState& layoutS
|
| const FloatingObjectSet& floatingObjectSet = m_floatingObjects->set();
|
| FloatingObjectSetIterator end = floatingObjectSet.end();
|
| for (FloatingObjectSetIterator it = floatingObjectSet.begin(); it != end; ++it) {
|
| - FloatingObject* floatingObject = (*it).get();
|
| + FloatingObject* floatingObject = it->get();
|
| if (logicalBottomForFloat(floatingObject) >= logicalTop && logicalBottomForFloat(floatingObject) < logicalBottom)
|
| return false;
|
| }
|
| @@ -2155,7 +2155,7 @@ bool RenderBlockFlow::positionNewFloatOnLine(FloatingObject* newFloat, FloatingO
|
| FloatingObjectSetIterator begin = floatingObjectSet.begin();
|
| while (it != begin) {
|
| --it;
|
| - FloatingObject* floatingObject = (*it).get();
|
| + FloatingObject* floatingObject = it->get();
|
| if (floatingObject == lastFloatFromPreviousLine)
|
| break;
|
| if (logicalTopForFloat(floatingObject) == logicalHeight() + lineInfo.floatPaginationStrut()) {
|
|
|