| Index: third_party/WebKit/Source/core/layout/line/TrailingObjects.cpp
|
| diff --git a/third_party/WebKit/Source/core/layout/line/TrailingObjects.cpp b/third_party/WebKit/Source/core/layout/line/TrailingObjects.cpp
|
| index c856ae8ec522257888775d53bcefc527aa1f5c92..605d37d4a8dafeca4729dcc3f822d625c320736d 100644
|
| --- a/third_party/WebKit/Source/core/layout/line/TrailingObjects.cpp
|
| +++ b/third_party/WebKit/Source/core/layout/line/TrailingObjects.cpp
|
| @@ -1,6 +1,7 @@
|
| /*
|
| * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
|
| - * Copyright (C) 2003, 2004, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All right reserved.
|
| + * Copyright (C) 2003, 2004, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc.
|
| + * All right reserved.
|
| * Copyright (C) 2010 Google Inc. All rights reserved.
|
| * Copyright (C) 2014 Adobe Systems Inc.
|
| *
|
| @@ -36,8 +37,10 @@ void TrailingObjects::updateMidpointsForTrailingObjects(
|
| if (!m_whitespace)
|
| return;
|
|
|
| - // This object is either going to be part of the last midpoint, or it is going to be the actual endpoint.
|
| - // In both cases we just decrease our pos by 1 level to exclude the space, allowing it to - in effect - collapse into the newline.
|
| + // This object is either going to be part of the last midpoint, or it is going
|
| + // to be the actual endpoint. In both cases we just decrease our pos by 1
|
| + // level to exclude the space, allowing it to - in effect - collapse into the
|
| + // newline.
|
| if (lineMidpointState.numMidpoints() % 2) {
|
| // Find the trailing space object's midpoint.
|
| int trailingSpaceMidpoint = lineMidpointState.numMidpoints() - 1;
|
| @@ -51,8 +54,8 @@ void TrailingObjects::updateMidpointsForTrailingObjects(
|
| lineMidpointState.midpoints()[trailingSpaceMidpoint].setOffset(
|
| lineMidpointState.midpoints()[trailingSpaceMidpoint].offset() - 1);
|
|
|
| - // Now make sure every single trailingPositionedBox following the trailingSpaceMidpoint properly stops and starts
|
| - // ignoring spaces.
|
| + // Now make sure every single trailingPositionedBox following the
|
| + // trailingSpaceMidpoint properly stops and starts ignoring spaces.
|
| size_t currentMidpoint = trailingSpaceMidpoint + 1;
|
| for (size_t i = 0; i < m_objects.size(); ++i) {
|
| if (currentMidpoint >= lineMidpointState.numMidpoints()) {
|
|
|