Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / rendering / line / BreakingContextInlineHeaders.h

diff --git a/src/third_party/WebKit/Source/core/rendering/line/BreakingContextInlineHeaders.h b/src/third_party/WebKit/Source/core/rendering/line/BreakingContextInlineHeaders.h
index c240563..5d74124 100644 (file)
--- a/src/third_party/WebKit/Source/core/rendering/line/BreakingContextInlineHeaders.h
+++ b/src/third_party/WebKit/Source/core/rendering/line/BreakingContextInlineHeaders.h
@@ -351,7 +351,7 @@ inline void BreakingContext::handleOutOfFlowPositioned(Vector<RenderBox*>& posit
     RenderBox* box = toRenderBox(m_current.object());
     bool isInlineType = box->style()->isOriginalDisplayInlineType();
     if (!isInlineType) {
-        m_block->setStaticInlinePositionForChild(box, m_block->logicalHeight(), m_block->startOffsetForContent(m_block->logicalHeight()));
+        m_block->setStaticInlinePositionForChild(box, m_block->logicalHeight(), m_block->startOffsetForContent());
     } else {
         // If our original display was an INLINE type, then we can go ahead
         // and determine our static y position now.
@@ -644,7 +644,7 @@ inline bool BreakingContext::handleText(WordMeasurements& wordMeasurements, bool
 
     // Non-zero only when kerning is enabled, in which case we measure
     // words with their trailing space, then subtract its width.
-    float wordTrailingSpaceWidth = (font.typesettingFeatures() & Kerning) ?
+    float wordTrailingSpaceWidth = (font.fontDescription().typesettingFeatures() & Kerning) ?
         font.width(RenderBlockFlow::constructTextRun(
             renderText, font, &space, 1, style,
             textDirectionFromUnicode(m_resolver.position().direction()))) + wordSpacing