| Index: third_party/WebKit/Source/core/layout/line/InlineFlowBox.cpp
|
| diff --git a/third_party/WebKit/Source/core/layout/line/InlineFlowBox.cpp b/third_party/WebKit/Source/core/layout/line/InlineFlowBox.cpp
|
| index a1430388bf8475a8e5cd9407ad76a34896d45d6d..4a7f9c9785e55e1a97d52e9b8cd19a08c5a87a27 100644
|
| --- a/third_party/WebKit/Source/core/layout/line/InlineFlowBox.cpp
|
| +++ b/third_party/WebKit/Source/core/layout/line/InlineFlowBox.cpp
|
| @@ -1236,7 +1236,7 @@ LayoutUnit InlineFlowBox::computeUnderAnnotationAdjustment(LayoutUnit allowedPos
|
| return result;
|
| }
|
|
|
| -void InlineFlowBox::collectLeafBoxesInLogicalOrder(Vector<InlineBox*>& leafBoxesInLogicalOrder, CustomInlineBoxRangeReverse customReverseImplementation, void* userData) const
|
| +void InlineFlowBox::collectLeafBoxesInLogicalOrder(Vector<InlineBox*>& leafBoxesInLogicalOrder, CustomInlineBoxRangeReverse customReverseImplementation) const
|
| {
|
| InlineBox* leaf = firstLeafChild();
|
|
|
| @@ -1279,12 +1279,10 @@ void InlineFlowBox::collectLeafBoxesInLogicalOrder(Vector<InlineBox*>& leafBoxes
|
| ++it;
|
| }
|
| Vector<InlineBox*>::iterator last = it;
|
| - if (customReverseImplementation) {
|
| - ASSERT(userData);
|
| - (*customReverseImplementation)(userData, first, last);
|
| - } else {
|
| + if (customReverseImplementation)
|
| + (*customReverseImplementation)(first, last);
|
| + else
|
| std::reverse(first, last);
|
| - }
|
| }
|
| ++minLevel;
|
| }
|
|
|