Return refererence from InlineBox::root()

Source/core/rendering/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
@@ skipping 15 matching lines @@
 
 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 {
+    WTF_MAKE_NONCOPYABLE(InlineBox);
 public:
     InlineBox(RenderObject& obj)
         : m_next(0)
         , m_prev(0)
         , m_parent(0)
         , m_renderer(obj)
         , m_logicalWidth(0)
 #ifndef NDEBUG
         , m_hasBadParent(false)
 #endif
@@ skipping 129 matching lines @@
 
     RenderObject& renderer() const { return m_renderer; }
 
     InlineFlowBox* parent() const
     {
         ASSERT(!m_hasBadParent);
         return m_parent;
     }
     void setParent(InlineFlowBox* par) { m_parent = par; }
 
-    const RootInlineBox* root() const;
-    RootInlineBox* root();
+    const RootInlineBox& root() const;
+    RootInlineBox& root();
 
     // x() is the left side of the box in the containing block's coordinate system.
     void setX(float x) { m_topLeft.setX(x); }
     float x() const { return m_topLeft.x(); }
     float left() const { return m_topLeft.x(); }
 
     // y() is the top side of the box in the containing block's coordinate system.
     void setY(float y) { m_topLeft.setY(y); }
     float y() const { return m_topLeft.y(); }
     float top() const { return m_topLeft.y(); }
@@ skipping 222 matching lines @@
 #ifndef NDEBUG
 inline void InlineBox::setHasBadParent()
 {
     m_hasBadParent = true;
 }
 #endif
 
 #define DEFINE_INLINE_BOX_TYPE_CASTS(typeName) \
     DEFINE_TYPE_CASTS(typeName, InlineBox, box, box->is##typeName(), box.is##typeName())
 
+// Allow equality comparisons of InlineBox's by reference or pointer, interchangeably.

[Inactive, 2014/03/03 20:25:18]

I don't mind this but I'd like to hear esprehn's opinion on this.
For the record, this is what was done for Node by adamk already. This makes the
code more readable.

[esprehn, 2014/03/03 20:57:23]

This is fine with me, having to marshall between refs and pointers all the time
is really gross.

+inline bool operator==(const InlineBox& a, const InlineBox& b) { return &a == &b; }
+inline bool operator==(const InlineBox& a, const InlineBox* b) { return &a == b; }
+inline bool operator==(const InlineBox* a, const InlineBox& b) { return a == &b; }
+inline bool operator!=(const InlineBox& a, const InlineBox& b) { return !(a == b); }
+inline bool operator!=(const InlineBox& a, const InlineBox* b) { return !(a == b); }
+inline bool operator!=(const InlineBox* a, const InlineBox& b) { return !(a == b); }
+
 } // namespace WebCore
 
 #ifndef NDEBUG
 // Outside the WebCore namespace for ease of invocation from gdb.
 void showTree(const WebCore::InlineBox*);
 void showLineTree(const WebCore::InlineBox*);
 #endif
 
 #endif // InlineBox_h