Merge 130549 - Deprecated flexboxes subtract scrollbar width/height twice

Source/WebCore/rendering/RenderBox.h

Index: Source/WebCore/rendering/RenderBox.h
===================================================================
--- Source/WebCore/rendering/RenderBox.h	(revision 130950)
+++ Source/WebCore/rendering/RenderBox.h	(working copy)
@@ -289,6 +289,10 @@
     virtual LayoutUnit minPreferredLogicalWidth() const;
     virtual LayoutUnit maxPreferredLogicalWidth() const;
 
+    // FIXME: We should rename these back to overrideLogicalHeight/Width and have them store
+    // the border-box height/width like the regular height/width accessors on RenderBox.
+    // Right now, these are different than contentHeight/contentWidth because they still
+    // include the scrollbar height/width.
     LayoutUnit overrideLogicalContentWidth() const;
     LayoutUnit overrideLogicalContentHeight() const;
     bool hasOverrideHeight() const;