<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[163152] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/163152">163152</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2014-01-30 19:52:14 -0800 (Thu, 30 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Subpixel rendering: Change BorderData's width from unsigned to float to enable subpixel border painting.
https://bugs.webkit.org/show_bug.cgi?id=127949
Reviewed by Andreas Kling.
Covered by existing tests. No change in functionality.
* css/DeprecatedStyleBuilder.cpp:
(WebCore::DeprecatedStyleBuilder::DeprecatedStyleBuilder):
* page/animation/CSSPropertyAnimation.cpp:
(WebCore::CSSPropertyAnimationWrapperMap::CSSPropertyAnimationWrapperMap):
* rendering/RenderTable.cpp:
(WebCore::RenderTable::calcBorderStart):
(WebCore::RenderTable::calcBorderEnd):
* rendering/style/BorderValue.h:
(WebCore::BorderValue::BorderValue):
(WebCore::BorderValue::width):
* rendering/style/RenderStyle.cpp:
(WebCore::RenderStyle::borderBeforeWidth):
(WebCore::RenderStyle::borderAfterWidth):
(WebCore::RenderStyle::borderStartWidth):
(WebCore::RenderStyle::borderEndWidth):
* rendering/style/RenderStyle.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssDeprecatedStyleBuildercpp">trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp</a></li>
<li><a href="#trunkSourceWebCorepageanimationCSSPropertyAnimationcpp">trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTablecpp">trunk/Source/WebCore/rendering/RenderTable.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleBorderValueh">trunk/Source/WebCore/rendering/style/BorderValue.h</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleRenderStylecpp">trunk/Source/WebCore/rendering/style/RenderStyle.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleRenderStyleh">trunk/Source/WebCore/rendering/style/RenderStyle.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (163151 => 163152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-31 03:38:06 UTC (rev 163151)
+++ trunk/Source/WebCore/ChangeLog 2014-01-31 03:52:14 UTC (rev 163152)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2014-01-30 Zalan Bujtas <zalan@apple.com>
+
+ Subpixel rendering: Change BorderData's width from unsigned to float to enable subpixel border painting.
+ https://bugs.webkit.org/show_bug.cgi?id=127949
+
+ Reviewed by Andreas Kling.
+
+ Covered by existing tests. No change in functionality.
+
+ * css/DeprecatedStyleBuilder.cpp:
+ (WebCore::DeprecatedStyleBuilder::DeprecatedStyleBuilder):
+ * page/animation/CSSPropertyAnimation.cpp:
+ (WebCore::CSSPropertyAnimationWrapperMap::CSSPropertyAnimationWrapperMap):
+ * rendering/RenderTable.cpp:
+ (WebCore::RenderTable::calcBorderStart):
+ (WebCore::RenderTable::calcBorderEnd):
+ * rendering/style/BorderValue.h:
+ (WebCore::BorderValue::BorderValue):
+ (WebCore::BorderValue::width):
+ * rendering/style/RenderStyle.cpp:
+ (WebCore::RenderStyle::borderBeforeWidth):
+ (WebCore::RenderStyle::borderAfterWidth):
+ (WebCore::RenderStyle::borderStartWidth):
+ (WebCore::RenderStyle::borderEndWidth):
+ * rendering/style/RenderStyle.h:
+
</ins><span class="cx"> 2014-01-30 David Kilzer <ddkilzer@apple.com>
</span><span class="cx">
</span><span class="cx"> Add security-checked cast for WebCore::CachedImage
</span></span></pre></div>
<a id="trunkSourceWebCorecssDeprecatedStyleBuildercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp (163151 => 163152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp 2014-01-31 03:38:06 UTC (rev 163151)
+++ trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp 2014-01-31 03:52:14 UTC (rev 163152)
</span><span class="lines">@@ -2352,7 +2352,7 @@
</span><span class="cx"> setPropertyHandler(CSSPropertyBorderBottomLeftRadius, ApplyPropertyBorderRadius<&RenderStyle::borderBottomLeftRadius, &RenderStyle::setBorderBottomLeftRadius, &RenderStyle::initialBorderRadius>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyBorderBottomRightRadius, ApplyPropertyBorderRadius<&RenderStyle::borderBottomRightRadius, &RenderStyle::setBorderBottomRightRadius, &RenderStyle::initialBorderRadius>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyBorderBottomStyle, ApplyPropertyDefault<EBorderStyle, &RenderStyle::borderBottomStyle, EBorderStyle, &RenderStyle::setBorderBottomStyle, EBorderStyle, &RenderStyle::initialBorderStyle>::createHandler());
</span><del>- setPropertyHandler(CSSPropertyBorderBottomWidth, ApplyPropertyComputeLength<unsigned, &RenderStyle::borderBottomWidth, &RenderStyle::setBorderBottomWidth, &RenderStyle::initialBorderWidth, NormalDisabled, ThicknessEnabled>::createHandler());
</del><ins>+ setPropertyHandler(CSSPropertyBorderBottomWidth, ApplyPropertyComputeLength<float, &RenderStyle::borderBottomWidth, &RenderStyle::setBorderBottomWidth, &RenderStyle::initialBorderWidth, NormalDisabled, ThicknessEnabled>::createHandler());
</ins><span class="cx"> setPropertyHandler(CSSPropertyBorderCollapse, ApplyPropertyDefault<EBorderCollapse, &RenderStyle::borderCollapse, EBorderCollapse, &RenderStyle::setBorderCollapse, EBorderCollapse, &RenderStyle::initialBorderCollapse>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyBorderImageOutset, ApplyPropertyBorderImageModifier<BorderImage, Outset>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyBorderImageRepeat, ApplyPropertyBorderImageModifier<BorderImage, Repeat>::createHandler());
</span><span class="lines">@@ -2361,15 +2361,15 @@
</span><span class="cx"> setPropertyHandler(CSSPropertyBorderImageWidth, ApplyPropertyBorderImageModifier<BorderImage, Width>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyBorderLeftColor, ApplyPropertyColor<NoInheritFromParent, &RenderStyle::borderLeftColor, &RenderStyle::setBorderLeftColor, &RenderStyle::setVisitedLinkBorderLeftColor, &RenderStyle::color>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyBorderLeftStyle, ApplyPropertyDefault<EBorderStyle, &RenderStyle::borderLeftStyle, EBorderStyle, &RenderStyle::setBorderLeftStyle, EBorderStyle, &RenderStyle::initialBorderStyle>::createHandler());
</span><del>- setPropertyHandler(CSSPropertyBorderLeftWidth, ApplyPropertyComputeLength<unsigned, &RenderStyle::borderLeftWidth, &RenderStyle::setBorderLeftWidth, &RenderStyle::initialBorderWidth, NormalDisabled, ThicknessEnabled>::createHandler());
</del><ins>+ setPropertyHandler(CSSPropertyBorderLeftWidth, ApplyPropertyComputeLength<float, &RenderStyle::borderLeftWidth, &RenderStyle::setBorderLeftWidth, &RenderStyle::initialBorderWidth, NormalDisabled, ThicknessEnabled>::createHandler());
</ins><span class="cx"> setPropertyHandler(CSSPropertyBorderRightColor, ApplyPropertyColor<NoInheritFromParent, &RenderStyle::borderRightColor, &RenderStyle::setBorderRightColor, &RenderStyle::setVisitedLinkBorderRightColor, &RenderStyle::color>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyBorderRightStyle, ApplyPropertyDefault<EBorderStyle, &RenderStyle::borderRightStyle, EBorderStyle, &RenderStyle::setBorderRightStyle, EBorderStyle, &RenderStyle::initialBorderStyle>::createHandler());
</span><del>- setPropertyHandler(CSSPropertyBorderRightWidth, ApplyPropertyComputeLength<unsigned, &RenderStyle::borderRightWidth, &RenderStyle::setBorderRightWidth, &RenderStyle::initialBorderWidth, NormalDisabled, ThicknessEnabled>::createHandler());
</del><ins>+ setPropertyHandler(CSSPropertyBorderRightWidth, ApplyPropertyComputeLength<float, &RenderStyle::borderRightWidth, &RenderStyle::setBorderRightWidth, &RenderStyle::initialBorderWidth, NormalDisabled, ThicknessEnabled>::createHandler());
</ins><span class="cx"> setPropertyHandler(CSSPropertyBorderTopColor, ApplyPropertyColor<NoInheritFromParent, &RenderStyle::borderTopColor, &RenderStyle::setBorderTopColor, &RenderStyle::setVisitedLinkBorderTopColor, &RenderStyle::color>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyBorderTopLeftRadius, ApplyPropertyBorderRadius<&RenderStyle::borderTopLeftRadius, &RenderStyle::setBorderTopLeftRadius, &RenderStyle::initialBorderRadius>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyBorderTopRightRadius, ApplyPropertyBorderRadius<&RenderStyle::borderTopRightRadius, &RenderStyle::setBorderTopRightRadius, &RenderStyle::initialBorderRadius>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyBorderTopStyle, ApplyPropertyDefault<EBorderStyle, &RenderStyle::borderTopStyle, EBorderStyle, &RenderStyle::setBorderTopStyle, EBorderStyle, &RenderStyle::initialBorderStyle>::createHandler());
</span><del>- setPropertyHandler(CSSPropertyBorderTopWidth, ApplyPropertyComputeLength<unsigned, &RenderStyle::borderTopWidth, &RenderStyle::setBorderTopWidth, &RenderStyle::initialBorderWidth, NormalDisabled, ThicknessEnabled>::createHandler());
</del><ins>+ setPropertyHandler(CSSPropertyBorderTopWidth, ApplyPropertyComputeLength<float, &RenderStyle::borderTopWidth, &RenderStyle::setBorderTopWidth, &RenderStyle::initialBorderWidth, NormalDisabled, ThicknessEnabled>::createHandler());
</ins><span class="cx"> setPropertyHandler(CSSPropertyBottom, ApplyPropertyLength<&RenderStyle::bottom, &RenderStyle::setBottom, &RenderStyle::initialOffset, AutoEnabled>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyBoxSizing, ApplyPropertyDefault<EBoxSizing, &RenderStyle::boxSizing, EBoxSizing, &RenderStyle::setBoxSizing, EBoxSizing, &RenderStyle::initialBoxSizing>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyCaptionSide, ApplyPropertyDefault<ECaptionSide, &RenderStyle::captionSide, ECaptionSide, &RenderStyle::setCaptionSide, ECaptionSide, &RenderStyle::initialCaptionSide>::createHandler());
</span></span></pre></div>
<a id="trunkSourceWebCorepageanimationCSSPropertyAnimationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp (163151 => 163152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp 2014-01-31 03:38:06 UTC (rev 163151)
+++ trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp 2014-01-31 03:52:14 UTC (rev 163152)
</span><span class="lines">@@ -1150,10 +1150,10 @@
</span><span class="cx">
</span><span class="cx"> new PropertyWrapperFlex(),
</span><span class="cx">
</span><del>- new PropertyWrapper<unsigned>(CSSPropertyBorderLeftWidth, &RenderStyle::borderLeftWidth, &RenderStyle::setBorderLeftWidth),
- new PropertyWrapper<unsigned>(CSSPropertyBorderRightWidth, &RenderStyle::borderRightWidth, &RenderStyle::setBorderRightWidth),
- new PropertyWrapper<unsigned>(CSSPropertyBorderTopWidth, &RenderStyle::borderTopWidth, &RenderStyle::setBorderTopWidth),
- new PropertyWrapper<unsigned>(CSSPropertyBorderBottomWidth, &RenderStyle::borderBottomWidth, &RenderStyle::setBorderBottomWidth),
</del><ins>+ new PropertyWrapper<float>(CSSPropertyBorderLeftWidth, &RenderStyle::borderLeftWidth, &RenderStyle::setBorderLeftWidth),
+ new PropertyWrapper<float>(CSSPropertyBorderRightWidth, &RenderStyle::borderRightWidth, &RenderStyle::setBorderRightWidth),
+ new PropertyWrapper<float>(CSSPropertyBorderTopWidth, &RenderStyle::borderTopWidth, &RenderStyle::setBorderTopWidth),
+ new PropertyWrapper<float>(CSSPropertyBorderBottomWidth, &RenderStyle::borderBottomWidth, &RenderStyle::setBorderBottomWidth),
</ins><span class="cx"> new LengthPropertyWrapper<Length>(CSSPropertyMarginLeft, &RenderStyle::marginLeft, &RenderStyle::setMarginLeft),
</span><span class="cx"> new LengthPropertyWrapper<Length>(CSSPropertyMarginRight, &RenderStyle::marginRight, &RenderStyle::setMarginRight),
</span><span class="cx"> new LengthPropertyWrapper<Length>(CSSPropertyMarginTop, &RenderStyle::marginTop, &RenderStyle::setMarginTop),
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTablecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTable.cpp (163151 => 163152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTable.cpp 2014-01-31 03:38:06 UTC (rev 163151)
+++ trunk/Source/WebCore/rendering/RenderTable.cpp 2014-01-31 03:52:14 UTC (rev 163152)
</span><span class="lines">@@ -961,7 +961,7 @@
</span><span class="cx"> if (!numEffCols())
</span><span class="cx"> return 0;
</span><span class="cx">
</span><del>- unsigned borderWidth = 0;
</del><ins>+ float borderWidth = 0;
</ins><span class="cx">
</span><span class="cx"> const BorderValue& tableStartBorder = style().borderStart();
</span><span class="cx"> if (tableStartBorder.style() == BHIDDEN)
</span><span class="lines">@@ -1015,7 +1015,7 @@
</span><span class="cx"> if (!numEffCols())
</span><span class="cx"> return 0;
</span><span class="cx">
</span><del>- unsigned borderWidth = 0;
</del><ins>+ float borderWidth = 0;
</ins><span class="cx">
</span><span class="cx"> const BorderValue& tableEndBorder = style().borderEnd();
</span><span class="cx"> if (tableEndBorder.style() == BHIDDEN)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleBorderValueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/BorderValue.h (163151 => 163152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/BorderValue.h 2014-01-31 03:38:06 UTC (rev 163151)
+++ trunk/Source/WebCore/rendering/style/BorderValue.h 2014-01-31 03:52:14 UTC (rev 163152)
</span><span class="lines">@@ -34,9 +34,9 @@
</span><span class="cx"> friend class RenderStyle;
</span><span class="cx"> public:
</span><span class="cx"> BorderValue()
</span><del>- : m_color(0)
</del><ins>+ : m_width(3)
+ , m_color(0)
</ins><span class="cx"> , m_colorIsValid(false)
</span><del>- , m_width(3)
</del><span class="cx"> , m_style(BNONE)
</span><span class="cx"> , m_isAuto(AUTO_OFF)
</span><span class="cx"> {
</span><span class="lines">@@ -75,14 +75,14 @@
</span><span class="cx">
</span><span class="cx"> Color color() const { return Color(m_color, m_colorIsValid); }
</span><span class="cx">
</span><del>- unsigned width() const { return m_width; }
</del><ins>+ float width() const { return m_width; }
</ins><span class="cx"> EBorderStyle style() const { return static_cast<EBorderStyle>(m_style); }
</span><span class="cx">
</span><span class="cx"> protected:
</span><ins>+ float m_width;
</ins><span class="cx"> RGBA32 m_color;
</span><span class="cx"> unsigned m_colorIsValid : 1;
</span><span class="cx">
</span><del>- unsigned m_width : 26;
</del><span class="cx"> unsigned m_style : 4; // EBorderStyle
</span><span class="cx">
</span><span class="cx"> // This is only used by OutlineValue but moved here to keep the bits packed.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStylecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyle.cpp (163151 => 163152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyle.cpp 2014-01-31 03:38:06 UTC (rev 163151)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.cpp 2014-01-31 03:52:14 UTC (rev 163152)
</span><span class="lines">@@ -54,8 +54,9 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> struct SameSizeAsBorderValue {
</span><ins>+ float m_width;
</ins><span class="cx"> RGBA32 m_color;
</span><del>- unsigned m_width;
</del><ins>+ int m_restBits;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> COMPILE_ASSERT(sizeof(BorderValue) == sizeof(SameSizeAsBorderValue), BorderValue_should_not_grow);
</span><span class="lines">@@ -1682,7 +1683,7 @@
</span><span class="cx"> return isLeftToRightDirection() ? borderBottom() : borderTop();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-unsigned short RenderStyle::borderBeforeWidth() const
</del><ins>+float RenderStyle::borderBeforeWidth() const
</ins><span class="cx"> {
</span><span class="cx"> switch (writingMode()) {
</span><span class="cx"> case TopToBottomWritingMode:
</span><span class="lines">@@ -1698,7 +1699,7 @@
</span><span class="cx"> return borderTopWidth();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-unsigned short RenderStyle::borderAfterWidth() const
</del><ins>+float RenderStyle::borderAfterWidth() const
</ins><span class="cx"> {
</span><span class="cx"> switch (writingMode()) {
</span><span class="cx"> case TopToBottomWritingMode:
</span><span class="lines">@@ -1714,14 +1715,14 @@
</span><span class="cx"> return borderBottomWidth();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-unsigned short RenderStyle::borderStartWidth() const
</del><ins>+float RenderStyle::borderStartWidth() const
</ins><span class="cx"> {
</span><span class="cx"> if (isHorizontalWritingMode())
</span><span class="cx"> return isLeftToRightDirection() ? borderLeftWidth() : borderRightWidth();
</span><span class="cx"> return isLeftToRightDirection() ? borderTopWidth() : borderBottomWidth();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-unsigned short RenderStyle::borderEndWidth() const
</del><ins>+float RenderStyle::borderEndWidth() const
</ins><span class="cx"> {
</span><span class="cx"> if (isHorizontalWritingMode())
</span><span class="cx"> return isLeftToRightDirection() ? borderRightWidth() : borderLeftWidth();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStyleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyle.h (163151 => 163152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyle.h 2014-01-31 03:38:06 UTC (rev 163151)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.h 2014-01-31 03:52:14 UTC (rev 163152)
</span><span class="lines">@@ -503,23 +503,23 @@
</span><span class="cx"> const LengthSize& borderBottomRightRadius() const { return surround->border.bottomRight(); }
</span><span class="cx"> bool hasBorderRadius() const { return surround->border.hasBorderRadius(); }
</span><span class="cx">
</span><del>- unsigned borderLeftWidth() const { return surround->border.borderLeftWidth(); }
</del><ins>+ float borderLeftWidth() const { return surround->border.borderLeftWidth(); }
</ins><span class="cx"> EBorderStyle borderLeftStyle() const { return surround->border.left().style(); }
</span><span class="cx"> bool borderLeftIsTransparent() const { return surround->border.left().isTransparent(); }
</span><del>- unsigned borderRightWidth() const { return surround->border.borderRightWidth(); }
</del><ins>+ float borderRightWidth() const { return surround->border.borderRightWidth(); }
</ins><span class="cx"> EBorderStyle borderRightStyle() const { return surround->border.right().style(); }
</span><span class="cx"> bool borderRightIsTransparent() const { return surround->border.right().isTransparent(); }
</span><del>- unsigned borderTopWidth() const { return surround->border.borderTopWidth(); }
</del><ins>+ float borderTopWidth() const { return surround->border.borderTopWidth(); }
</ins><span class="cx"> EBorderStyle borderTopStyle() const { return surround->border.top().style(); }
</span><span class="cx"> bool borderTopIsTransparent() const { return surround->border.top().isTransparent(); }
</span><del>- unsigned borderBottomWidth() const { return surround->border.borderBottomWidth(); }
</del><ins>+ float borderBottomWidth() const { return surround->border.borderBottomWidth(); }
</ins><span class="cx"> EBorderStyle borderBottomStyle() const { return surround->border.bottom().style(); }
</span><span class="cx"> bool borderBottomIsTransparent() const { return surround->border.bottom().isTransparent(); }
</span><span class="cx">
</span><del>- unsigned short borderBeforeWidth() const;
- unsigned short borderAfterWidth() const;
- unsigned short borderStartWidth() const;
- unsigned short borderEndWidth() const;
</del><ins>+ float borderBeforeWidth() const;
+ float borderAfterWidth() const;
+ float borderStartWidth() const;
+ float borderEndWidth() const;
</ins><span class="cx">
</span><span class="cx"> unsigned short outlineSize() const { return std::max(0, outlineWidth() + outlineOffset()); }
</span><span class="cx"> unsigned short outlineWidth() const
</span><span class="lines">@@ -1091,16 +1091,16 @@
</span><span class="cx"> RoundedRect getRoundedInnerBorderFor(const LayoutRect& borderRect,
</span><span class="cx"> int topWidth, int bottomWidth, int leftWidth, int rightWidth, bool includeLogicalLeftEdge, bool includeLogicalRightEdge) const;
</span><span class="cx">
</span><del>- void setBorderLeftWidth(unsigned v) { SET_VAR(surround, border.m_left.m_width, v); }
</del><ins>+ void setBorderLeftWidth(float v) { SET_VAR(surround, border.m_left.m_width, v); }
</ins><span class="cx"> void setBorderLeftStyle(EBorderStyle v) { SET_VAR(surround, border.m_left.m_style, v); }
</span><span class="cx"> void setBorderLeftColor(const Color& v) { SET_BORDERVALUE_COLOR(surround, border.m_left, v); }
</span><del>- void setBorderRightWidth(unsigned v) { SET_VAR(surround, border.m_right.m_width, v); }
</del><ins>+ void setBorderRightWidth(float v) { SET_VAR(surround, border.m_right.m_width, v); }
</ins><span class="cx"> void setBorderRightStyle(EBorderStyle v) { SET_VAR(surround, border.m_right.m_style, v); }
</span><span class="cx"> void setBorderRightColor(const Color& v) { SET_BORDERVALUE_COLOR(surround, border.m_right, v); }
</span><del>- void setBorderTopWidth(unsigned v) { SET_VAR(surround, border.m_top.m_width, v); }
</del><ins>+ void setBorderTopWidth(float v) { SET_VAR(surround, border.m_top.m_width, v); }
</ins><span class="cx"> void setBorderTopStyle(EBorderStyle v) { SET_VAR(surround, border.m_top.m_style, v); }
</span><span class="cx"> void setBorderTopColor(const Color& v) { SET_BORDERVALUE_COLOR(surround, border.m_top, v); }
</span><del>- void setBorderBottomWidth(unsigned v) { SET_VAR(surround, border.m_bottom.m_width, v); }
</del><ins>+ void setBorderBottomWidth(float v) { SET_VAR(surround, border.m_bottom.m_width, v); }
</ins><span class="cx"> void setBorderBottomStyle(EBorderStyle v) { SET_VAR(surround, border.m_bottom.m_style, v); }
</span><span class="cx"> void setBorderBottomColor(const Color& v) { SET_BORDERVALUE_COLOR(surround, border.m_bottom, v); }
</span><span class="cx">
</span><span class="lines">@@ -1649,7 +1649,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> static Color initialColor() { return Color::black; }
</span><span class="cx"> static StyleImage* initialListStyleImage() { return 0; }
</span><del>- static unsigned initialBorderWidth() { return 3; }
</del><ins>+ static float initialBorderWidth() { return 3; }
</ins><span class="cx"> static unsigned short initialColumnRuleWidth() { return 3; }
</span><span class="cx"> static unsigned short initialOutlineWidth() { return 3; }
</span><span class="cx"> static float initialLetterSpacing() { return 0; }
</span></span></pre>
</div>
</div>
</body>
</html>