Title: [107955] branches/subpixellayout/Source/WebCore
- Revision
- 107955
- Author
- [email protected]
- Date
- 2012-02-16 10:55:00 -0800 (Thu, 16 Feb 2012)
Log Message
Un-nesting the namespaces in FractionaLayoutUnit, and correcting use of max integers in RenderRubyRun with max LayoutUnits.
Modified Paths
Diff
Modified: branches/subpixellayout/Source/WebCore/platform/FractionalLayoutUnit.h (107954 => 107955)
--- branches/subpixellayout/Source/WebCore/platform/FractionalLayoutUnit.h 2012-02-16 18:12:25 UTC (rev 107954)
+++ branches/subpixellayout/Source/WebCore/platform/FractionalLayoutUnit.h 2012-02-16 18:55:00 UTC (rev 107955)
@@ -503,6 +503,8 @@
return (location + size).round() - location.round();
}
+} // namespace WebCore
+
namespace std {
template<>
struct numeric_limits<WebCore::FractionalLayoutUnit>
@@ -556,7 +558,4 @@
};
}
-
-} // namespace WebCore
-
#endif // FractionalLayoutUnit_h
Modified: branches/subpixellayout/Source/WebCore/rendering/RenderRubyRun.cpp (107954 => 107955)
--- branches/subpixellayout/Source/WebCore/rendering/RenderRubyRun.cpp 2012-02-16 18:12:25 UTC (rev 107954)
+++ branches/subpixellayout/Source/WebCore/rendering/RenderRubyRun.cpp 2012-02-16 18:55:00 UTC (rev 107955)
@@ -287,11 +287,11 @@
return;
int logicalWidth = this->logicalWidth();
- int logicalLeftOverhang = numeric_limits<int>::max();
- int logicalRightOverhang = numeric_limits<int>::max();
+ int logicalLeftOverhang = numeric_limits<LayoutUnit>::max();
+ int logicalRightOverhang = numeric_limits<LayoutUnit>::max();
for (RootInlineBox* rootInlineBox = rubyBase->firstRootBox(); rootInlineBox; rootInlineBox = rootInlineBox->nextRootBox()) {
- logicalLeftOverhang = min<int>(logicalLeftOverhang, rootInlineBox->logicalLeft());
- logicalRightOverhang = min<int>(logicalRightOverhang, logicalWidth - rootInlineBox->logicalRight());
+ logicalLeftOverhang = min<LayoutUnit>(logicalLeftOverhang, rootInlineBox->logicalLeft());
+ logicalRightOverhang = min<LayoutUnit>(logicalRightOverhang, logicalWidth - rootInlineBox->logicalRight());
}
startOverhang = style()->isLeftToRightDirection() ? logicalLeftOverhang : logicalRightOverhang;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
