WebKit merge 40722:40785 (part 1)

third_party/WebKit/WebCore/rendering/InlineBox.h

 /*
  * Copyright (C) 2003, 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  *
  */
 
 #ifndef InlineBox_h
 #define InlineBox_h
 
-#include "RenderBox.h"
+#include "RenderBoxModelObject.h"
 #include "TextDirection.h"
 
 namespace WebCore {
 
 class HitTestRequest;
 class HitTestResult;
 class RootInlineBox;
 
 
 // InlineBox represents a rectangle that occurs on a line.  It corresponds to
 // some RenderObject (i.e., it represents a portion of that RenderObject).
 class InlineBox {
 public:
     InlineBox(RenderObject* obj)
         : m_object(obj)
         , m_x(0)
         , m_y(0)
         , m_width(0)
         , m_height(0)
         , m_baseline(0)
         , m_next(0)
         , m_prev(0)
         , m_parent(0)
         , m_firstLine(false)
         , m_constructed(false)
         , 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)
         , m_dirOverride(false)
         , m_treatAsText(true)
         , m_determinedIfNextOnLineExists(false)
         , m_determinedIfPrevOnLineExists(false)
         , m_nextOnLineExists(false)
         , m_prevOnLineExists(false)
         , m_toAdd(0)
@@ skipping 12 matching lines @@
         , m_height(height)
         , m_baseline(baseline)
         , m_next(next)
         , m_prev(prev)
         , m_parent(parent)
         , m_firstLine(firstLine)
         , m_constructed(constructed)
         , 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)
         , m_dirOverride(false)
         , m_treatAsText(true)
         , m_determinedIfNextOnLineExists(false)
         , m_determinedIfPrevOnLineExists(false)
         , m_nextOnLineExists(false)
         , m_prevOnLineExists(false)
         , m_toAdd(0)
@@ skipping 96 matching lines @@
 
     void setYPos(int y) { m_y = y; }
     int yPos() const { return m_y; }
 
     void setHeight(int h) { m_height = h; }
     int height() const { return m_height; }
     
     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(); }
     virtual int rightOverflow() { return xPos() + width(); }
 
     virtual int caretMinOffset() const;
     virtual int caretMaxOffset() const;
     virtual unsigned caretMaxRenderedOffset() const;
 
     unsigned char bidiLevel() const { return m_bidiEmbeddingLevel; }
@@ skipping 14 matching lines @@
     virtual bool canAccommodateEllipsis(bool ltr, int blockEdge, int ellipsisWidth);
     virtual int placeEllipsisBox(bool ltr, int blockEdge, int ellipsisWidth, bool&);
 
     void setHasBadParent();
 
     int toAdd() const { return m_toAdd; }
     
     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;
 
     int m_x;
     int m_y;
     int m_width;
     int m_height;
     int m_baseline;
 
 private:
     InlineBox* m_next; // The next element on the same line as us.
     InlineBox* m_prev; // The previous element on the same line as us.
 
     InlineFlowBox* m_parent; // The box that contains us.
     
     // Some of these bits are actually for subclasses and moved here to compact the structures.
 
     // for this class
 protected:
     bool m_firstLine : 1;
 private:
     bool m_constructed : 1;
     unsigned char m_bidiEmbeddingLevel : 6;
 protected:
     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).
     bool m_hasEllipsisBox : 1; 
 
     // for InlineTextBox
 public:
     bool m_dirOverride : 1;
     bool m_treatAsText : 1; // Whether or not to treat a <br> as text for the purposes of line height.
 protected:
@@ skipping 23 matching lines @@
 }
 
 } // namespace WebCore
 
 #ifndef NDEBUG
 // Outside the WebCore namespace for ease of invocation from gdb.
 void showTree(const WebCore::InlineBox*);
 #endif
 
 #endif // InlineBox_h