From 3f0f86b0caed75241fa71c95a5d73bc0164348c5 Mon Sep 17 00:00:00 2001 From: Andras Becsi Date: Tue, 18 Mar 2014 13:16:26 +0100 Subject: Update to new stable branch 1750 This also includes an updated ninja and chromium dependencies needed on Windows. Change-Id: Icd597d80ed3fa4425933c9f1334c3c2e31291c42 Reviewed-by: Zoltan Arvai Reviewed-by: Zeno Albisser --- .../third_party/WebKit/Source/core/rendering/RootInlineBox.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'chromium/third_party/WebKit/Source/core/rendering/RootInlineBox.h') diff --git a/chromium/third_party/WebKit/Source/core/rendering/RootInlineBox.h b/chromium/third_party/WebKit/Source/core/rendering/RootInlineBox.h index f6ddc5fdda9..7dfde5faf5b 100644 --- a/chromium/third_party/WebKit/Source/core/rendering/RootInlineBox.h +++ b/chromium/third_party/WebKit/Source/core/rendering/RootInlineBox.h @@ -21,13 +21,14 @@ #ifndef RootInlineBox_h #define RootInlineBox_h -#include "core/platform/text/BidiContext.h" #include "core/rendering/InlineFlowBox.h" +#include "platform/text/BidiContext.h" namespace WebCore { class EllipsisBox; class HitTestResult; +class RenderBlockFlow; class RenderRegion; struct BidiStatus; @@ -35,7 +36,7 @@ struct GapRects; class RootInlineBox : public InlineFlowBox { public: - explicit RootInlineBox(RenderBlock*); + explicit RootInlineBox(RenderBlockFlow*); virtual void destroy() OVERRIDE FINAL; @@ -128,7 +129,7 @@ public: GapRects lineSelectionGap(RenderBlock* rootBlock, const LayoutPoint& rootBlockPhysicalPosition, const LayoutSize& offsetFromRootBlock, LayoutUnit selTop, LayoutUnit selHeight, const PaintInfo*); - RenderBlock* block() const; + RenderBlockFlow* block() const; InlineBox* closestLeafChildForPoint(const IntPoint&, bool onlyEditableLeaves); InlineBox* closestLeafChildForLogicalLeftPosition(int, bool onlyEditableLeaves = false); @@ -181,10 +182,8 @@ public: return InlineFlowBox::logicalBottomLayoutOverflow(lineBottom()); } -#if ENABLE(CSS3_TEXT) // Used to calculate the underline offset for TextUnderlinePositionUnder. float maxLogicalTop() const; -#endif // CSS3_TEXT Node* getLogicalStartBoxWithNode(InlineBox*&) const; Node* getLogicalEndBoxWithNode(InlineBox*&) const; -- cgit v1.2.1