Upstream version 7.36.149.0

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

diff --git a/src/third_party/WebKit/Source/core/rendering/InlineFlowBox.h b/src/third_party/WebKit/Source/core/rendering/InlineFlowBox.h
index b9b0d4f..795cab5 100644 (file)
--- a/src/third_party/WebKit/Source/core/rendering/InlineFlowBox.h
+++ b/src/third_party/WebKit/Source/core/rendering/InlineFlowBox.h
@@ -52,6 +52,9 @@ public:
         , m_baselineType(AlphabeticBaseline)
         , m_hasAnnotationsBefore(false)
         , m_hasAnnotationsAfter(false)
+        , m_lineBreakBidiStatusEor(WTF::Unicode::LeftToRight)
+        , m_lineBreakBidiStatusLastStrong(WTF::Unicode::LeftToRight)
+        , m_lineBreakBidiStatusLast(WTF::Unicode::LeftToRight)
 #ifndef NDEBUG
         , m_hasBadChildList(false)
 #endif
@@ -197,7 +200,7 @@ public:
 
     void computeOverflow(LayoutUnit lineTop, LayoutUnit lineBottom, GlyphOverflowAndFallbackFontsMap&);
 
-    void removeChild(InlineBox* child);
+    void removeChild(InlineBox* child, MarkLineBoxes);
 
     virtual RenderObject::SelectionState selectionState() OVERRIDE;