Title: [112097] branches/subpixellayout/Source/WebCore/rendering
- Revision
- 112097
- Author
- [email protected]
- Date
- 2012-03-26 08:11:53 -0700 (Mon, 26 Mar 2012)
Log Message
Removing dead code in RenderReplaced, and correcting use of LayoutUnits for integers from HTMLFrameBase.
Modified Paths
Diff
Modified: branches/subpixellayout/Source/WebCore/rendering/RenderFrame.cpp (112096 => 112097)
--- branches/subpixellayout/Source/WebCore/rendering/RenderFrame.cpp 2012-03-26 14:54:55 UTC (rev 112096)
+++ branches/subpixellayout/Source/WebCore/rendering/RenderFrame.cpp 2012-03-26 15:11:53 UTC (rev 112097)
@@ -56,8 +56,8 @@
FrameView* view = static_cast<FrameView*>(widget());
- LayoutUnit marginWidth = element->marginWidth();
- LayoutUnit marginHeight = element->marginHeight();
+ int marginWidth = element->marginWidth();
+ int marginHeight = element->marginHeight();
if (marginWidth != -1)
view->setMarginWidth(marginWidth);
Modified: branches/subpixellayout/Source/WebCore/rendering/RenderReplaced.cpp (112096 => 112097)
--- branches/subpixellayout/Source/WebCore/rendering/RenderReplaced.cpp 2012-03-26 14:54:55 UTC (rev 112096)
+++ branches/subpixellayout/Source/WebCore/rendering/RenderReplaced.cpp 2012-03-26 15:11:53 UTC (rev 112097)
@@ -202,24 +202,6 @@
return true;
}
-LayoutUnit RenderReplaced::computeIntrinsicLogicalWidth(RenderBox* contentRenderer, bool includeMaxWidth) const
-{
- if (m_hasIntrinsicSize)
- return computeReplacedLogicalWidthRespectingMinMaxWidth(calcAspectRatioLogicalWidth(), includeMaxWidth);
- ASSERT(contentRenderer);
- ASSERT(contentRenderer->style());
- return contentRenderer->computeReplacedLogicalWidthRespectingMinMaxWidth(contentRenderer->computeReplacedLogicalWidthUsing(contentRenderer->style()->logicalWidth()), includeMaxWidth);
-}
-
-LayoutUnit RenderReplaced::computeIntrinsicLogicalHeight(RenderBox* contentRenderer) const
-{
- if (m_hasIntrinsicSize)
- return computeReplacedLogicalHeightRespectingMinMaxHeight(calcAspectRatioLogicalHeight());
- ASSERT(contentRenderer);
- ASSERT(contentRenderer->style());
- return contentRenderer->computeReplacedLogicalHeightRespectingMinMaxHeight(contentRenderer->computeReplacedLogicalHeightUsing(contentRenderer->style()->logicalHeight()));
-}
-
static inline RenderBlock* firstContainingBlockWithLogicalWidth(const RenderReplaced* replaced)
{
// We have to lookup the containing block, which has an explicit width, which must not be equal to our direct containing block.
Modified: branches/subpixellayout/Source/WebCore/rendering/RenderReplaced.h (112096 => 112097)
--- branches/subpixellayout/Source/WebCore/rendering/RenderReplaced.h 2012-03-26 14:54:55 UTC (rev 112096)
+++ branches/subpixellayout/Source/WebCore/rendering/RenderReplaced.h 2012-03-26 15:11:53 UTC (rev 112097)
@@ -63,8 +63,6 @@
private:
virtual RenderBox* embeddedContentBox() const { return 0; }
- LayoutUnit computeIntrinsicLogicalWidth(RenderBox* contentRenderer, bool includeMaxWidth) const;
- LayoutUnit computeIntrinsicLogicalHeight(RenderBox* contentRenderer) const;
virtual const char* renderName() const { return "RenderReplaced"; }
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
