Changeset 154546 in webkit for trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp

Timestamp:

Aug 24, 2013, 9:33:15 AM (12 years ago)

Author:

[email protected]

Message:

RenderObject::view() should return a reference.
<​https://webkit.org/b/120247>

Reviewed by Antti Koivisto.

Now that the lifetime and accessibility characteristics of RenderView are well-defined,
we can make RenderObject::view() return a reference, exposing a plethora of unnecessary
null checks.

File:

• trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp (modified) (2 diffs)

trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp

@@ -337 +337 @@
     setLogicalHeight(borderAndPaddingLogicalHeight() + scrollbarLogicalHeight());
 
-    LayoutStateMaintainer statePusher(view(), this, locationOffset(), hasTransform() || hasReflection() || style()->isFlippedBlocksWritingMode());
+    LayoutStateMaintainer statePusher(&view(), this, locationOffset(), hasTransform() || hasReflection() || style()->isFlippedBlocksWritingMode());
 
     // Regions changing widths can force us to relayout our children.
@@ -915 +915 @@
 void RenderFlexibleBox::computeMainAxisPreferredSizes(OrderHashSet& orderValues)
 {
-    RenderView* renderView = view();
+    RenderView* renderView = &view();
     for (RenderBox* child = firstChildBox(); child; child = child->nextSiblingBox()) {
         orderValues.add(child->style()->order());