Title: [105546] trunk/Source/WebCore
- Revision
- 105546
- Author
- [email protected]
- Date
- 2012-01-20 15:00:05 -0800 (Fri, 20 Jan 2012)
Log Message
Remove unused variable in RenderReplaced after r105513
https://bugs.webkit.org/show_bug.cgi?id=76742
Reviewed by Daniel Bates.
* rendering/RenderReplaced.cpp:
(WebCore::RenderReplaced::computeReplacedLogicalWidth):
(WebCore::RenderReplaced::computeReplacedLogicalHeight):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (105545 => 105546)
--- trunk/Source/WebCore/ChangeLog 2012-01-20 22:59:14 UTC (rev 105545)
+++ trunk/Source/WebCore/ChangeLog 2012-01-20 23:00:05 UTC (rev 105546)
@@ -1,3 +1,14 @@
+2012-01-20 Caio Marcelo de Oliveira Filho <[email protected]>
+
+ Remove unused variable in RenderReplaced after r105513
+ https://bugs.webkit.org/show_bug.cgi?id=76742
+
+ Reviewed by Daniel Bates.
+
+ * rendering/RenderReplaced.cpp:
+ (WebCore::RenderReplaced::computeReplacedLogicalWidth):
+ (WebCore::RenderReplaced::computeReplacedLogicalHeight):
+
2012-01-20 Jonathan Backer <[email protected]>
[chromium] Plumb damage from accelerated canvas 2D.
Modified: trunk/Source/WebCore/rendering/RenderReplaced.cpp (105545 => 105546)
--- trunk/Source/WebCore/rendering/RenderReplaced.cpp 2012-01-20 22:59:14 UTC (rev 105545)
+++ trunk/Source/WebCore/rendering/RenderReplaced.cpp 2012-01-20 23:00:05 UTC (rev 105546)
@@ -284,17 +284,14 @@
return computeReplacedLogicalWidthRespectingMinMaxWidth(computeReplacedLogicalWidthUsing(style()->logicalWidth()), includeMaxWidth);
RenderBox* contentRenderer = embeddedContentBox();
- RenderStyle* contentRenderStyle = 0;
// 10.3.2 Inline, replaced elements: http://www.w3.org/TR/CSS21/visudet.html#inline-replaced-width
bool isPercentageIntrinsicSize = false;
double intrinsicRatio = 0;
FloatSize intrinsicSize;
- if (contentRenderer) {
+ if (contentRenderer)
contentRenderer->computeIntrinsicRatioInformation(intrinsicSize, intrinsicRatio, isPercentageIntrinsicSize);
- contentRenderStyle = contentRenderer->style();
- ASSERT(contentRenderStyle);
- } else
+ else
computeIntrinsicRatioInformation(intrinsicSize, intrinsicRatio, isPercentageIntrinsicSize);
if (intrinsicRatio && !isHorizontalWritingMode())
@@ -366,17 +363,14 @@
return computeReplacedLogicalHeightRespectingMinMaxHeight(computeReplacedLogicalHeightUsing(style()->logicalHeight()));
RenderBox* contentRenderer = embeddedContentBox();
- RenderStyle* contentRenderStyle = 0;
// 10.6.2 Inline, replaced elements: http://www.w3.org/TR/CSS21/visudet.html#inline-replaced-height
bool isPercentageIntrinsicSize = false;
double intrinsicRatio = 0;
FloatSize intrinsicSize;
- if (contentRenderer) {
+ if (contentRenderer)
contentRenderer->computeIntrinsicRatioInformation(intrinsicSize, intrinsicRatio, isPercentageIntrinsicSize);
- contentRenderStyle = contentRenderer->style();
- ASSERT(contentRenderStyle);
- } else
+ else
computeIntrinsicRatioInformation(intrinsicSize, intrinsicRatio, isPercentageIntrinsicSize);
if (intrinsicRatio && !isHorizontalWritingMode())
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
