Diff
Modified: trunk/Source/WebCore/ChangeLog (224435 => 224436)
--- trunk/Source/WebCore/ChangeLog 2017-11-03 22:03:30 UTC (rev 224435)
+++ trunk/Source/WebCore/ChangeLog 2017-11-03 22:42:13 UTC (rev 224436)
@@ -1,3 +1,41 @@
+2017-11-03 Zalan Bujtas <za...@apple.com>
+
+ Remove redundant LayoutStateMaintainer argument (RenderView&)
+ https://bugs.webkit.org/show_bug.cgi?id=179269
+ <rdar://problem/35344397>
+
+ Reviewed by Simon Fraser.
+
+ No change in functionality.
+
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::simplifiedLayout):
+ * rendering/RenderBlockFlow.cpp:
+ (WebCore::RenderBlockFlow::layoutBlock):
+ * rendering/RenderBox.cpp:
+ (WebCore::RenderBox::layout):
+ * rendering/RenderDeprecatedFlexibleBox.cpp:
+ (WebCore::RenderDeprecatedFlexibleBox::layoutBlock):
+ * rendering/RenderEmbeddedObject.cpp:
+ (WebCore::RenderEmbeddedObject::layout):
+ * rendering/RenderFlexibleBox.cpp:
+ (WebCore::RenderFlexibleBox::layoutBlock):
+ * rendering/RenderGrid.cpp:
+ (WebCore::RenderGrid::layoutBlock):
+ * rendering/RenderImage.cpp:
+ (WebCore::RenderImage::layoutShadowControls):
+ * rendering/RenderTable.cpp:
+ (WebCore::RenderTable::layout):
+ * rendering/RenderTableRow.cpp:
+ (WebCore::RenderTableRow::layout):
+ * rendering/RenderTableSection.cpp:
+ (WebCore::RenderTableSection::layout):
+ (WebCore::RenderTableSection::layoutRows):
+ * rendering/RenderVTTCue.cpp:
+ (WebCore::RenderVTTCue::layout):
+ * rendering/RenderView.h:
+ (WebCore::LayoutStateMaintainer::LayoutStateMaintainer):
+
2017-11-03 Youenn Fablet <you...@apple.com>
Use VCP H264 encoder for platforms supporting it
Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (224435 => 224436)
--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2017-11-03 22:03:30 UTC (rev 224435)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2017-11-03 22:42:13 UTC (rev 224436)
@@ -1317,7 +1317,7 @@
if (!canPerformSimplifiedLayout())
return false;
- LayoutStateMaintainer statePusher(view(), *this, locationOffset(), hasTransform() || hasReflection() || style().isFlippedBlocksWritingMode());
+ LayoutStateMaintainer statePusher(*this, locationOffset(), hasTransform() || hasReflection() || style().isFlippedBlocksWritingMode());
if (needsPositionedMovementLayout() && !tryLayoutDoingPositionedMovementOnly()) {
statePusher.pop();
return false;
Modified: trunk/Source/WebCore/rendering/RenderBlockFlow.cpp (224435 => 224436)
--- trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2017-11-03 22:03:30 UTC (rev 224435)
+++ trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2017-11-03 22:42:13 UTC (rev 224436)
@@ -492,7 +492,7 @@
checkForPaginationLogicalHeightChange(relayoutChildren, pageLogicalHeight, pageLogicalHeightChanged);
const RenderStyle& styleToUse = style();
- LayoutStateMaintainer statePusher(view(), *this, locationOffset(), hasTransform() || hasReflection() || styleToUse.isFlippedBlocksWritingMode(), pageLogicalHeight, pageLogicalHeightChanged);
+ LayoutStateMaintainer statePusher(*this, locationOffset(), hasTransform() || hasReflection() || styleToUse.isFlippedBlocksWritingMode(), pageLogicalHeight, pageLogicalHeightChanged);
preparePaginationBeforeBlockLayout(relayoutChildren);
Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (224435 => 224436)
--- trunk/Source/WebCore/rendering/RenderBox.cpp 2017-11-03 22:03:30 UTC (rev 224435)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp 2017-11-03 22:42:13 UTC (rev 224436)
@@ -507,7 +507,7 @@
return;
}
- LayoutStateMaintainer statePusher(view(), *this, locationOffset(), style().isFlippedBlocksWritingMode());
+ LayoutStateMaintainer statePusher(*this, locationOffset(), style().isFlippedBlocksWritingMode());
while (child) {
if (child->needsLayout())
downcast<RenderElement>(*child).layout();
Modified: trunk/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp (224435 => 224436)
--- trunk/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp 2017-11-03 22:03:30 UTC (rev 224435)
+++ trunk/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp 2017-11-03 22:42:13 UTC (rev 224436)
@@ -278,7 +278,7 @@
return;
LayoutRepainter repainter(*this, checkForRepaintDuringLayout());
- LayoutStateMaintainer statePusher(view(), *this, locationOffset(), hasTransform() || hasReflection() || style().isFlippedBlocksWritingMode());
+ LayoutStateMaintainer statePusher(*this, locationOffset(), hasTransform() || hasReflection() || style().isFlippedBlocksWritingMode());
preparePaginationBeforeBlockLayout(relayoutChildren);
Modified: trunk/Source/WebCore/rendering/RenderEmbeddedObject.cpp (224435 => 224436)
--- trunk/Source/WebCore/rendering/RenderEmbeddedObject.cpp 2017-11-03 22:03:30 UTC (rev 224435)
+++ trunk/Source/WebCore/rendering/RenderEmbeddedObject.cpp 2017-11-03 22:42:13 UTC (rev 224436)
@@ -452,7 +452,7 @@
// When calling layout() on a child node, a parent must either push a LayoutStateMaintainter, or
// instantiate LayoutStateDisabler. Since using a LayoutStateMaintainer is slightly more efficient,
// and this method will be called many times per second during playback, use a LayoutStateMaintainer:
- LayoutStateMaintainer statePusher(view(), *this, locationOffset(), hasTransform() || hasReflection() || style().isFlippedBlocksWritingMode());
+ LayoutStateMaintainer statePusher(*this, locationOffset(), hasTransform() || hasReflection() || style().isFlippedBlocksWritingMode());
childBox.setLocation(LayoutPoint(borderLeft(), borderTop()) + LayoutSize(paddingLeft(), paddingTop()));
childBox.mutableStyle().setHeight(Length(newSize.height(), Fixed));
Modified: trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp (224435 => 224436)
--- trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp 2017-11-03 22:03:30 UTC (rev 224435)
+++ trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp 2017-11-03 22:42:13 UTC (rev 224436)
@@ -273,7 +273,7 @@
LayoutUnit previousHeight = logicalHeight();
setLogicalHeight(borderAndPaddingLogicalHeight() + scrollbarLogicalHeight());
- LayoutStateMaintainer statePusher(view(), *this, locationOffset(), hasTransform() || hasReflection() || style().isFlippedBlocksWritingMode());
+ LayoutStateMaintainer statePusher(*this, locationOffset(), hasTransform() || hasReflection() || style().isFlippedBlocksWritingMode());
preparePaginationBeforeBlockLayout(relayoutChildren);
Modified: trunk/Source/WebCore/rendering/RenderGrid.cpp (224435 => 224436)
--- trunk/Source/WebCore/rendering/RenderGrid.cpp 2017-11-03 22:03:30 UTC (rev 224435)
+++ trunk/Source/WebCore/rendering/RenderGrid.cpp 2017-11-03 22:42:13 UTC (rev 224436)
@@ -229,7 +229,7 @@
return;
LayoutRepainter repainter(*this, checkForRepaintDuringLayout());
- LayoutStateMaintainer statePusher(view(), *this, locationOffset(), hasTransform() || hasReflection() || style().isFlippedBlocksWritingMode());
+ LayoutStateMaintainer statePusher(*this, locationOffset(), hasTransform() || hasReflection() || style().isFlippedBlocksWritingMode());
preparePaginationBeforeBlockLayout(relayoutChildren);
Modified: trunk/Source/WebCore/rendering/RenderImage.cpp (224435 => 224436)
--- trunk/Source/WebCore/rendering/RenderImage.cpp 2017-11-03 22:03:30 UTC (rev 224435)
+++ trunk/Source/WebCore/rendering/RenderImage.cpp 2017-11-03 22:42:13 UTC (rev 224436)
@@ -732,7 +732,7 @@
// When calling layout() on a child node, a parent must either push a LayoutStateMaintainter, or
// instantiate LayoutStateDisabler. Since using a LayoutStateMaintainer is slightly more efficient,
// and this method might be called many times per second during video playback, use a LayoutStateMaintainer:
- LayoutStateMaintainer statePusher(view(), *this, locationOffset(), hasTransform() || hasReflection() || style().isFlippedBlocksWritingMode());
+ LayoutStateMaintainer statePusher(*this, locationOffset(), hasTransform() || hasReflection() || style().isFlippedBlocksWritingMode());
if (shadowControlsNeedCustomLayoutMetrics()) {
controlsRenderer->setLocation(LayoutPoint(borderLeft(), borderTop()) + LayoutSize(paddingLeft(), paddingTop()));
Modified: trunk/Source/WebCore/rendering/RenderTable.cpp (224435 => 224436)
--- trunk/Source/WebCore/rendering/RenderTable.cpp 2017-11-03 22:03:30 UTC (rev 224435)
+++ trunk/Source/WebCore/rendering/RenderTable.cpp 2017-11-03 22:42:13 UTC (rev 224436)
@@ -447,7 +447,7 @@
recalcBordersInRowDirection();
LayoutRepainter repainter(*this, checkForRepaintDuringLayout());
- LayoutStateMaintainer statePusher(view(), *this, locationOffset(), hasTransform() || hasReflection() || style().isFlippedBlocksWritingMode());
+ LayoutStateMaintainer statePusher(*this, locationOffset(), hasTransform() || hasReflection() || style().isFlippedBlocksWritingMode());
LayoutUnit oldLogicalWidth = logicalWidth();
LayoutUnit oldLogicalHeight = logicalHeight();
Modified: trunk/Source/WebCore/rendering/RenderTableRow.cpp (224435 => 224436)
--- trunk/Source/WebCore/rendering/RenderTableRow.cpp 2017-11-03 22:03:30 UTC (rev 224435)
+++ trunk/Source/WebCore/rendering/RenderTableRow.cpp 2017-11-03 22:42:13 UTC (rev 224436)
@@ -176,7 +176,7 @@
ASSERT(needsLayout());
// Table rows do not add translation.
- LayoutStateMaintainer statePusher(view(), *this, LayoutSize(), hasTransform() || hasReflection() || style().isFlippedBlocksWritingMode());
+ LayoutStateMaintainer statePusher(*this, LayoutSize(), hasTransform() || hasReflection() || style().isFlippedBlocksWritingMode());
bool paginated = view().layoutState()->isPaginated();
Modified: trunk/Source/WebCore/rendering/RenderTableSection.cpp (224435 => 224436)
--- trunk/Source/WebCore/rendering/RenderTableSection.cpp 2017-11-03 22:03:30 UTC (rev 224435)
+++ trunk/Source/WebCore/rendering/RenderTableSection.cpp 2017-11-03 22:42:13 UTC (rev 224436)
@@ -385,7 +385,7 @@
// can be called in a loop (e.g during parsing). Doing it now ensures we have a stable-enough structure.
m_grid.shrinkToFit();
- LayoutStateMaintainer statePusher(view(), *this, locationOffset(), hasTransform() || hasReflection() || style().isFlippedBlocksWritingMode());
+ LayoutStateMaintainer statePusher(*this, locationOffset(), hasTransform() || hasReflection() || style().isFlippedBlocksWritingMode());
bool paginated = view().layoutState()->isPaginated();
const Vector<LayoutUnit>& columnPos = table()->columnPositions();
@@ -601,7 +601,7 @@
LayoutUnit vspacing = table()->vBorderSpacing();
unsigned nEffCols = table()->numEffCols();
- LayoutStateMaintainer statePusher(view(), *this, locationOffset(), hasTransform() || style().isFlippedBlocksWritingMode());
+ LayoutStateMaintainer statePusher(*this, locationOffset(), hasTransform() || style().isFlippedBlocksWritingMode());
for (unsigned r = 0; r < totalRows; r++) {
// Set the row's x/y position and width/height.
Modified: trunk/Source/WebCore/rendering/RenderVTTCue.cpp (224435 => 224436)
--- trunk/Source/WebCore/rendering/RenderVTTCue.cpp 2017-11-03 22:03:30 UTC (rev 224435)
+++ trunk/Source/WebCore/rendering/RenderVTTCue.cpp 2017-11-03 22:42:13 UTC (rev 224436)
@@ -55,7 +55,7 @@
if (!m_cue->regionId().isEmpty())
return;
- LayoutStateMaintainer statePusher(view(), *this, locationOffset(), hasTransform() || hasReflection() || style().isFlippedBlocksWritingMode());
+ LayoutStateMaintainer statePusher(*this, locationOffset(), hasTransform() || hasReflection() || style().isFlippedBlocksWritingMode());
if (m_cue->cueType()== TextTrackCue::WebVTT) {
if (toVTTCue(m_cue)->snapToLines())
Modified: trunk/Source/WebCore/rendering/RenderView.h (224435 => 224436)
--- trunk/Source/WebCore/rendering/RenderView.h 2017-11-03 22:03:30 UTC (rev 224435)
+++ trunk/Source/WebCore/rendering/RenderView.h 2017-11-03 22:42:13 UTC (rev 224436)
@@ -346,8 +346,8 @@
WTF_MAKE_NONCOPYABLE(LayoutStateMaintainer);
public:
// Constructor to push now.
- explicit LayoutStateMaintainer(RenderView& view, RenderBox& root, LayoutSize offset, bool disableState = false, LayoutUnit pageHeight = 0, bool pageHeightChanged = false)
- : m_view(view)
+ explicit LayoutStateMaintainer(RenderBox& root, LayoutSize offset, bool disableState = false, LayoutUnit pageHeight = 0, bool pageHeightChanged = false)
+ : m_view(root.view())
, m_disabled(disableState)
{
push(root, offset, pageHeight, pageHeightChanged);
