WebKit merge 40722:40785 (part 1)

third_party/WebKit/WebCore/rendering/InlineBox.h

Index: third_party/WebKit/WebCore/rendering/InlineBox.h
===================================================================
--- third_party/WebKit/WebCore/rendering/InlineBox.h	(revision 9391)
+++ third_party/WebKit/WebCore/rendering/InlineBox.h	(working copy)
@@ -21,7 +21,7 @@
 #ifndef InlineBox_h
 #define InlineBox_h
 
-#include "RenderBox.h"
+#include "RenderBoxModelObject.h"
 #include "TextDirection.h"
 
 namespace WebCore {
@@ -50,9 +50,6 @@
         , m_bidiEmbeddingLevel(0)
         , m_dirty(false)
         , m_extracted(false)
-        , m_includeLeftEdge(false)
-        , m_includeRightEdge(false)
-        , m_hasTextChildren(true)
         , m_endsWithBreak(false)
         , m_hasSelectedChildren(false)
         , m_hasEllipsisBox(false)
@@ -85,9 +82,6 @@
         , m_bidiEmbeddingLevel(0)
         , m_dirty(dirty)
         , m_extracted(extracted)
-        , m_includeLeftEdge(false)
-        , m_includeRightEdge(false)
-        , m_hasTextChildren(true)
         , m_endsWithBreak(false)
         , m_hasSelectedChildren(false)   
         , m_hasEllipsisBox(false)
@@ -204,8 +198,6 @@
     void setBaseline(int b) { m_baseline = b; }
     int baseline() const { return m_baseline; }
 
-    bool hasTextChildren() const { return m_hasTextChildren; }
-
     virtual int topOverflow() { return yPos(); }
     virtual int bottomOverflow() { return yPos() + height(); }
     virtual int leftOverflow() { return xPos(); }
@@ -240,7 +232,12 @@
     bool visibleToHitTesting() const { return object()->style()->visibility() == VISIBLE && object()->style()->pointerEvents() != PE_NONE; }
     
     // Use with caution! The type is not checked!
-    RenderBox* renderBox() const { return toRenderBox(m_object); }
+    RenderBoxModelObject* boxModelObject() const
+    { 
+        if (!m_object->isText())
+            return static_cast<RenderBoxModelObject*>(m_object);
+        return 0;
+    }
 
 public:
     RenderObject* m_object;
@@ -269,11 +266,6 @@
     bool m_dirty : 1;
     bool m_extracted : 1;
 
-    // for InlineFlowBox
-    bool m_includeLeftEdge : 1;
-    bool m_includeRightEdge : 1;
-    bool m_hasTextChildren : 1;
-
     // for RootInlineBox
     bool m_endsWithBreak : 1;  // Whether the line ends with a <br>.
     bool m_hasSelectedChildren : 1; // Whether we have any children selected (this bit will also be set if the <br> that terminates our line is selected).