Merge back LayoutLayerModelObject into RenderBoxModelObject

Source/core/layout/LayerStackingNode.h

 /*
  * Copyright (C) 2003, 2009, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2013 Intel Corporation. All rights reserved.
  *
  * Portions are Copyright (C) 1998 Netscape Communications Corporation.
  *
  * Other contributors:
  *   Robert O'Callahan <roc+@cs.cmu.edu>
  *   David Baron <dbaron@fas.harvard.edu>
  *   Christian Biesinger <cbiesinger@web.de>
@@ skipping 27 matching lines @@
  * version of this file under the LGPL, indicate your decision by
  * deletingthe provisions above and replace them with the notice and
  * other provisions required by the MPL or the GPL, as the case may be.
  * If you do not delete the provisions above, a recipient may use your
  * version of this file under any of the LGPL, the MPL or the GPL.
  */
 
 #ifndef LayerStackingNode_h
 #define LayerStackingNode_h
 
-#include "core/layout/LayoutLayerModelObject.h"
+#include "core/layout/LayoutBoxModelObject.h"
 #include "wtf/Noncopyable.h"
 #include "wtf/OwnPtr.h"
 #include "wtf/Vector.h"
 
 namespace blink {
 
 class Layer;
 class LayerCompositor;
 class LayoutStyle;
+class LayoutBoxModelObject;
 
 class LayerStackingNode {
     WTF_MAKE_NONCOPYABLE(LayerStackingNode);
 public:
     explicit LayerStackingNode(Layer*);
     ~LayerStackingNode();
 
     int zIndex() const { return renderer()->style()->zIndex(); }
 
     // A stacking context is a layer that has a non-auto z-index.
@@ skipping 64 matching lines @@
     void setStackingParent(LayerStackingNode* stackingParent) { m_stackingParent = stackingParent; }
 #endif
 
     bool shouldBeNormalFlowOnly() const;
 
     void updateNormalFlowList();
 
     bool isDirtyStackingContext() const { return m_zOrderListsDirty && isStackingContext(); }
 
     LayerCompositor* compositor() const;
-    // FIXME: Investigate changing this to Renderbox.
-    LayoutLayerModelObject* renderer() const;
+    // We can't return a RenderBox as RenderInline can be a stacking context.
+    LayoutBoxModelObject* renderer() const;
 
     Layer* m_layer;
 
     // m_posZOrderList holds a sorted list of all the descendant nodes within
     // that have z-indices of 0 or greater (auto will count as 0).
     // m_negZOrderList holds descendants within our stacking context with
     // negative z-indices.
     OwnPtr<Vector<LayerStackingNode*>> m_posZOrderList;
     OwnPtr<Vector<LayerStackingNode*>> m_negZOrderList;
 
@@ skipping 53 matching lines @@
 
 private:
     LayerStackingNode* m_stackingNode;
     bool m_previousMutationAllowedState;
 };
 #endif
 
 } // namespace blink
 
 #endif // LayerStackingNode_h