| Index: sky/engine/core/rendering/InlineFlowBox.cpp
|
| diff --git a/sky/engine/core/rendering/InlineFlowBox.cpp b/sky/engine/core/rendering/InlineFlowBox.cpp
|
| index fb133ffea95c3a983c8b56e5e92d0ed9a56c4c3a..846c57fabd01d8627b003e5b51bbe01e0d19ef91 100644
|
| --- a/sky/engine/core/rendering/InlineFlowBox.cpp
|
| +++ b/sky/engine/core/rendering/InlineFlowBox.cpp
|
| @@ -638,8 +638,7 @@ void InlineFlowBox::placeBoxesInBlockDirection(LayoutUnit top, LayoutUnit maxHei
|
| newLogicalTop += curr->baselinePosition(baselineType) - fontMetrics.ascent(baselineType);
|
| if (curr->isInlineFlowBox()) {
|
| RenderBoxModelObject& boxObject = toRenderBoxModelObject(curr->renderer());
|
| - newLogicalTop -= boxObject.style(isFirstLineStyle())->isHorizontalWritingMode() ? boxObject.borderTop() + boxObject.paddingTop() :
|
| - boxObject.borderRight() + boxObject.paddingRight();
|
| + newLogicalTop -= boxObject.borderTop() + boxObject.paddingTop();
|
| borderPaddingHeight = boxObject.borderAndPaddingLogicalHeight();
|
| }
|
| newLogicalTopIncludingMargins = newLogicalTop;
|
| @@ -659,7 +658,7 @@ void InlineFlowBox::placeBoxesInBlockDirection(LayoutUnit top, LayoutUnit maxHei
|
| TextEmphasisPosition emphasisMarkPosition;
|
| if (toInlineTextBox(curr)->getEmphasisMarkPosition(curr->renderer().style(isFirstLineStyle()), emphasisMarkPosition)) {
|
| bool emphasisMarkIsOver = emphasisMarkPosition == TextEmphasisPositionOver;
|
| - if (emphasisMarkIsOver != curr->renderer().style(isFirstLineStyle())->isFlippedLinesWritingMode())
|
| + if (emphasisMarkIsOver)
|
| hasAnnotationsBefore = true;
|
| else
|
| hasAnnotationsAfter = true;
|
|
|