Title: [119513] trunk/Source/WebCore
- Revision
- 119513
- Author
- [email protected]
- Date
- 2012-06-05 12:16:55 -0700 (Tue, 05 Jun 2012)
Log Message
Delete dead code from RenderBox::computeLogicalWidthInRegion
https://bugs.webkit.org/show_bug.cgi?id=88353
Reviewed by Tony Chang.
No new tests obviously since this is dead code.
* rendering/RenderBox.cpp:
(WebCore::RenderBox::computeLogicalWidthInRegion):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (119512 => 119513)
--- trunk/Source/WebCore/ChangeLog 2012-06-05 19:16:11 UTC (rev 119512)
+++ trunk/Source/WebCore/ChangeLog 2012-06-05 19:16:55 UTC (rev 119513)
@@ -1,3 +1,15 @@
+2012-06-05 Ojan Vafai <[email protected]>
+
+ Delete dead code from RenderBox::computeLogicalWidthInRegion
+ https://bugs.webkit.org/show_bug.cgi?id=88353
+
+ Reviewed by Tony Chang.
+
+ No new tests obviously since this is dead code.
+
+ * rendering/RenderBox.cpp:
+ (WebCore::RenderBox::computeLogicalWidthInRegion):
+
2012-06-05 Greg Billock <[email protected]>
New constructor for WebIntent to be used for delivery
Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (119512 => 119513)
--- trunk/Source/WebCore/rendering/RenderBox.cpp 2012-06-05 19:16:11 UTC (rev 119512)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp 2012-06-05 19:16:55 UTC (rev 119513)
@@ -1689,25 +1689,19 @@
// Calculate MaxLogicalWidth
if (!styleToUse->logicalMaxWidth().isUndefined()) {
LayoutUnit maxLogicalWidth = computeLogicalWidthInRegionUsing(MaxLogicalWidth, containerWidthInInlineDirection, cb, region, offsetFromLogicalTopOfFirstPage);
- if (logicalWidth() > maxLogicalWidth) {
+ if (logicalWidth() > maxLogicalWidth)
setLogicalWidth(maxLogicalWidth);
- logicalWidthLength = styleToUse->logicalMaxWidth();
- }
}
// Calculate MinLogicalWidth
LayoutUnit minLogicalWidth = computeLogicalWidthInRegionUsing(MinLogicalWidth, containerWidthInInlineDirection, cb, region, offsetFromLogicalTopOfFirstPage);
- if (logicalWidth() < minLogicalWidth) {
+ if (logicalWidth() < minLogicalWidth)
setLogicalWidth(minLogicalWidth);
- logicalWidthLength = styleToUse->logicalMinWidth();
- }
}
// Fieldsets are currently the only objects that stretch to their minimum width.
- if (stretchesToMinIntrinsicLogicalWidth()) {
+ if (stretchesToMinIntrinsicLogicalWidth())
setLogicalWidth(max(logicalWidth(), minPreferredLogicalWidth()));
- logicalWidthLength = Length(logicalWidth(), Fixed);
- }
// Margin calculations.
if (hasPerpendicularContainingBlock || isFloating() || isInline()) {
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
