Merge 110323

Source/WebCore/rendering/RenderObject.h

Index: Source/WebCore/rendering/RenderObject.h
===================================================================
--- Source/WebCore/rendering/RenderObject.h	(revision 111422)
+++ Source/WebCore/rendering/RenderObject.h	(working copy)
@@ -744,6 +744,8 @@
     // The current selection state for an object.  For blocks, the state refers to the state of the leaf
     // descendants (as described above in the SelectionState enum declaration).
     SelectionState selectionState() const { return static_cast<SelectionState>(m_selectionState);; }
+    inline void setSelectionStateIfNeeded(SelectionState);
+    bool canUpdateSelectionOnRootLineBoxes();
 
     // Sets the selection state for an object.
     virtual void setSelectionState(SelectionState state) { m_selectionState = state; }
@@ -1026,6 +1028,14 @@
     return style()->preserveNewline();
 }
 
+inline void RenderObject::setSelectionStateIfNeeded(SelectionState state)
+{
+    if (selectionState() == state)
+        return;
+
+    setSelectionState(state);
+}
+
 inline void makeMatrixRenderable(TransformationMatrix& matrix, bool has3DRendering)
 {
 #if !ENABLE(3D_RENDERING)