[Line Layout API] Convert InlineBox::boxModelObject to new API

Source/core/layout/line/InlineBox.h

 /*
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2009, 2010, 2011 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 "core/layout/LayoutBoxModelObject.h"
 #include "core/layout/LayoutObject.h"
+#include "core/layout/api/LineLayoutBoxModel.h"
 #include "core/layout/api/LineLayoutItem.h"
 #include "core/layout/api/SelectionState.h"
 #include "platform/graphics/paint/DisplayItemClient.h"
 #include "platform/text/TextDirection.h"
 
 namespace blink {
 
 class HitTestRequest;
 class HitTestResult;
 class RootInlineBox;
@@ skipping 124 matching lines @@
 
     InlineBox* nextLeafChild() const;
     InlineBox* prevLeafChild() const;
 
     // Helper functions for editing and hit-testing code.
     // FIXME: These two functions should be moved to RenderedPosition once the code to convert between
     // Position and inline box, offset pair is moved to RenderedPosition.
     InlineBox* nextLeafChildIgnoringLineBreak() const;
     InlineBox* prevLeafChildIgnoringLineBreak() const;
 
-    // TODO(pilgrim) convert all callers to lineLayoutItem, replace m_layoutObject with m_lineLayoutItem, remove layoutObject()
+    // TODO(pilgrim): This will be removed as part of the Line Layout API refactoring crbug.com/499321
     LayoutObject& layoutObject() const { return m_layoutObject; }
     LineLayoutItem lineLayoutItem() const { return LineLayoutItem(&m_layoutObject); }
 
     InlineFlowBox* parent() const
     {
         ASSERT(!m_hasBadParent);
         return m_parent;
     }
     void setParent(InlineFlowBox* par) { m_parent = par; }
 
@@ skipping 82 matching lines @@
 #if ENABLE(ASSERT)
     void setHasBadParent();
 #endif
 
     int expansion() const { return m_bitfields.expansion(); }
 
     bool visibleToHitTestRequest(const HitTestRequest& request) const { return lineLayoutItem().visibleToHitTestRequest(request); }
 
     EVerticalAlign verticalAlign() const { return lineLayoutItem().isText() ? ComputedStyle::initialVerticalAlign() : lineLayoutItem().style(m_bitfields.firstLine())->verticalAlign(); }
 
-    // Use with caution! The type is not checked!
-    LayoutBoxModelObject* boxModelObject() const
+    // TODO(pilgrim) remove this
+    LayoutBoxModelObject* deprecatedBoxModelObject() const
     {
         if (!lineLayoutItem().isText())
             return toLayoutBoxModelObject(&layoutObject());
         return 0;
     }
 
+    // Use with caution! The type is not checked!
+    LineLayoutBoxModel boxModelObject() const
+    {
+        if (!lineLayoutItem().isText())
+            return LineLayoutBoxModel(toLayoutBoxModelObject(&layoutObject()));
+        return LineLayoutBoxModel(nullptr);
+    }
+
     LayoutPoint locationIncludingFlipping();
 
     // Converts from a rect in the logical space of the InlineBox to one in the physical space
     // of the containing block. The logical space of an InlineBox may be transposed for vertical text and
     // flipped for right-to-left text.
     void logicalRectToPhysicalRect(LayoutRect&);
 
     void flipForWritingMode(FloatRect&);
     FloatPoint flipForWritingMode(const FloatPoint&);
     void flipForWritingMode(LayoutRect&);
@@ skipping 148 matching lines @@
 
 } // namespace blink
 
 #ifndef NDEBUG
 // Outside the WebCore namespace for ease of invocation from gdb.
 void showTree(const blink::InlineBox*);
 void showLineTree(const blink::InlineBox*);
 #endif
 
 #endif // InlineBox_h