- Revision
- 167973
- Author
- mmaxfi...@apple.com
- Date
- 2014-04-29 17:36:21 -0700 (Tue, 29 Apr 2014)
Log Message
Removing unused argument in InlineFlowBox::placeBoxesInInlineDirection()
https://bugs.webkit.org/show_bug.cgi?id=132369
Reviewed by Darin Adler.
This was not caught by our compiler because placeBoxesInInlineDirection()
is mutually-recursive with placeBoxRangeInInlineDirection().
No new tests are necessary because there should be no behavior change.
* rendering/InlineFlowBox.cpp:
(WebCore::InlineFlowBox::placeBoxesInInlineDirection):
(WebCore::InlineFlowBox::placeBoxRangeInInlineDirection):
* rendering/InlineFlowBox.h:
* rendering/RenderBlockLineLayout.cpp:
(WebCore::RenderBlockFlow::computeInlineDirectionPositionsForLine):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (167972 => 167973)
--- trunk/Source/WebCore/ChangeLog 2014-04-30 00:34:27 UTC (rev 167972)
+++ trunk/Source/WebCore/ChangeLog 2014-04-30 00:36:21 UTC (rev 167973)
@@ -1,3 +1,22 @@
+2014-04-29 Myles C. Maxfield <mmaxfi...@apple.com>
+
+ Removing unused argument in InlineFlowBox::placeBoxesInInlineDirection()
+ https://bugs.webkit.org/show_bug.cgi?id=132369
+
+ Reviewed by Darin Adler.
+
+ This was not caught by our compiler because placeBoxesInInlineDirection()
+ is mutually-recursive with placeBoxRangeInInlineDirection().
+
+ No new tests are necessary because there should be no behavior change.
+
+ * rendering/InlineFlowBox.cpp:
+ (WebCore::InlineFlowBox::placeBoxesInInlineDirection):
+ (WebCore::InlineFlowBox::placeBoxRangeInInlineDirection):
+ * rendering/InlineFlowBox.h:
+ * rendering/RenderBlockLineLayout.cpp:
+ (WebCore::RenderBlockFlow::computeInlineDirectionPositionsForLine):
+
2014-04-29 Alex Christensen <achristen...@webkit.org>
[WinCairo] Switch video from GStreamer to Media Foundation.
Modified: trunk/Source/WebCore/rendering/InlineFlowBox.cpp (167972 => 167973)
--- trunk/Source/WebCore/rendering/InlineFlowBox.cpp 2014-04-30 00:34:27 UTC (rev 167972)
+++ trunk/Source/WebCore/rendering/InlineFlowBox.cpp 2014-04-30 00:36:21 UTC (rev 167973)
@@ -367,7 +367,7 @@
}
}
-float InlineFlowBox::placeBoxesInInlineDirection(float logicalLeft, bool& needsWordSpacing, GlyphOverflowAndFallbackFontsMap& textBoxDataMap)
+float InlineFlowBox::placeBoxesInInlineDirection(float logicalLeft, bool& needsWordSpacing)
{
// Set our x position.
beginPlacingBoxRangesInInlineDirection(logicalLeft);
@@ -378,14 +378,14 @@
float minLogicalLeft = startLogicalLeft;
float maxLogicalRight = logicalLeft;
- placeBoxRangeInInlineDirection(firstChild(), 0, logicalLeft, minLogicalLeft, maxLogicalRight, needsWordSpacing, textBoxDataMap);
+ placeBoxRangeInInlineDirection(firstChild(), 0, logicalLeft, minLogicalLeft, maxLogicalRight, needsWordSpacing);
logicalLeft += borderLogicalRight() + paddingLogicalRight();
endPlacingBoxRangesInInlineDirection(startLogicalLeft, logicalLeft, minLogicalLeft, maxLogicalRight);
return logicalLeft;
}
-float InlineFlowBox::placeBoxRangeInInlineDirection(InlineBox* firstChild, InlineBox* lastChild, float& logicalLeft, float& minLogicalLeft, float& maxLogicalRight, bool& needsWordSpacing, GlyphOverflowAndFallbackFontsMap& textBoxDataMap)
+float InlineFlowBox::placeBoxRangeInInlineDirection(InlineBox* firstChild, InlineBox* lastChild, float& logicalLeft, float& minLogicalLeft, float& maxLogicalRight, bool& needsWordSpacing)
{
for (InlineBox* curr = firstChild; curr && curr != lastChild; curr = curr->nextOnLine()) {
if (curr->renderer().isText()) {
@@ -418,7 +418,7 @@
logicalLeft += flow->marginLogicalLeft();
if (knownToHaveNoOverflow())
minLogicalLeft = std::min(logicalLeft, minLogicalLeft);
- logicalLeft = flow->placeBoxesInInlineDirection(logicalLeft, needsWordSpacing, textBoxDataMap);
+ logicalLeft = flow->placeBoxesInInlineDirection(logicalLeft, needsWordSpacing);
if (knownToHaveNoOverflow())
maxLogicalRight = std::max(logicalLeft, maxLogicalRight);
logicalLeft += flow->marginLogicalRight();
Modified: trunk/Source/WebCore/rendering/InlineFlowBox.h (167972 => 167973)
--- trunk/Source/WebCore/rendering/InlineFlowBox.h 2014-04-30 00:34:27 UTC (rev 167972)
+++ trunk/Source/WebCore/rendering/InlineFlowBox.h 2014-04-30 00:36:21 UTC (rev 167973)
@@ -176,8 +176,8 @@
// Helper functions used during line construction and placement.
void determineSpacingForFlowBoxes(bool lastLine, bool isLogicallyLastRunWrapped, RenderObject* logicallyLastRunRenderer);
LayoutUnit getFlowSpacingLogicalWidth();
- float placeBoxesInInlineDirection(float logicalLeft, bool& needsWordSpacing, GlyphOverflowAndFallbackFontsMap&);
- float placeBoxRangeInInlineDirection(InlineBox* firstChild, InlineBox* lastChild, float& logicalLeft, float& minLogicalLeft, float& maxLogicalRight, bool& needsWordSpacing, GlyphOverflowAndFallbackFontsMap&);
+ float placeBoxesInInlineDirection(float logicalLeft, bool& needsWordSpacing);
+ float placeBoxRangeInInlineDirection(InlineBox* firstChild, InlineBox* lastChild, float& logicalLeft, float& minLogicalLeft, float& maxLogicalRight, bool& needsWordSpacing);
void beginPlacingBoxRangesInInlineDirection(float logicalLeft) { setLogicalLeft(logicalLeft); }
void endPlacingBoxRangesInInlineDirection(float logicalLeft, float logicalRight, float minLogicalLeft, float maxLogicalRight)
{
Modified: trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp (167972 => 167973)
--- trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp 2014-04-30 00:34:27 UTC (rev 167972)
+++ trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp 2014-04-30 00:36:21 UTC (rev 167973)
@@ -645,7 +645,7 @@
// The widths of all runs are now known. We can now place every inline box (and
// compute accurate widths for the inline flow boxes).
needsWordSpacing = false;
- lineBox->placeBoxesInInlineDirection(lineLogicalLeft, needsWordSpacing, textBoxDataMap);
+ lineBox->placeBoxesInInlineDirection(lineLogicalLeft, needsWordSpacing);
}
BidiRun* RenderBlockFlow::computeInlineDirectionPositionsForSegment(RootInlineBox* lineBox, const LineInfo& lineInfo, ETextAlign textAlign, float& logicalLeft,
