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

Timestamp:

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

Author:

akling@apple.com

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/RenderGrid.cpp (modified) (2 diffs)

trunk/Source/WebCore/rendering/RenderGrid.cpp

@@ -148 +148 @@
     // It would be nice to refactor some of the duplicate code.
     LayoutRepainter repainter(*this, checkForRepaintDuringLayout());
-    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.
@@ -317 +317 @@
     // FIXME: We still need to support calc() here (https://webkit.org/b/103761).
     ASSERT(trackLength.isFixed() || trackLength.isPercent() || trackLength.isViewportPercentage());
-    return valueForLength(trackLength, direction == ForColumns ? logicalWidth() : computeContentLogicalHeight(style()->logicalHeight()), view());
+    return valueForLength(trackLength, direction == ForColumns ? logicalWidth() : computeContentLogicalHeight(style()->logicalHeight()), &view());
 }