WebKit merge 40722:40785 (part 1)

third_party/WebKit/WebCore/rendering/RenderObject.h

Index: third_party/WebKit/WebCore/rendering/RenderObject.h
===================================================================
--- third_party/WebKit/WebCore/rendering/RenderObject.h	(revision 9391)
+++ third_party/WebKit/WebCore/rendering/RenderObject.h	(working copy)
@@ -313,7 +313,7 @@
     {
         return m_isAnonymous && style()->display() == BLOCK && style()->styleType() == NOPSEUDO && !isListMarker();
     }
-    bool isInlineContinuation() const { return isInline() && isBox() && (element() ? element()->renderer() != this : false); }
+    bool isInlineContinuation() const { return (element() ? element()->renderer() != this : false) && isRenderInline(); }
     bool isFloating() const { return m_floating; }
     bool isPositioned() const { return m_positioned; } // absolute or fixed positioning
     bool isRelPositioned() const { return m_relPositioned; } // relative positioning
@@ -357,6 +357,9 @@
 
     RenderView* view() const;
 
+    // Returns true if this renderer is rooted, and optionally returns the hosting view (the root of the hierarchy).
+    bool isRooted(RenderView** = 0);
+
     // don't even think about making this method virtual!
     Node* element() const { return m_isAnonymous ? 0 : m_node; }
     Document* document() const { return m_node->document(); }
@@ -373,6 +376,9 @@
     RenderObject* container() const;
     virtual RenderObject* hoverAncestor() const { return parent(); }
 
+    // IE Extension that can be called on any RenderObject.  See the implementation for the details.
+    RenderBoxModelObject* offsetParent() const;
+
     void markContainingBlocksForLayout(bool scheduleRelayout = true, RenderObject* newRoot = 0);
     void setNeedsLayout(bool b, bool markParents = true);
     void setChildNeedsLayout(bool b, bool markParents = true);