<!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>[164555] 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/164555">164555</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2014-02-23 08:22:58 -0800 (Sun, 23 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Subpixel rendering: Add devicepixel based computation to BorderEdge class.
https://bugs.webkit.org/show_bug.cgi?id=129224
Reviewed by Simon Fraser.
To produce correct width (and type) results, BorderEdge class needs to take device pixel ratio into account.
Currently not testable.
* rendering/RenderBoxModelObject.cpp:
(WebCore::BorderEdge::BorderEdge):
(WebCore::BorderEdge::obscuresBackgroundEdge):
(WebCore::BorderEdge::getDoubleBorderStripeWidths): this does not always produce the same
result as before, but the sum of inner and outer is not different.
(WebCore::BorderEdge::borderWidthInDevicePixel):
(WebCore::RenderBoxModelObject::getBorderEdgeInfo):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBoxModelObjectcpp">trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (164554 => 164555)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-23 05:44:05 UTC (rev 164554)
+++ trunk/Source/WebCore/ChangeLog 2014-02-23 16:22:58 UTC (rev 164555)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-02-23 Zalan Bujtas <zalan@apple.com>
+
+ Subpixel rendering: Add devicepixel based computation to BorderEdge class.
+ https://bugs.webkit.org/show_bug.cgi?id=129224
+
+ Reviewed by Simon Fraser.
+
+ To produce correct width (and type) results, BorderEdge class needs to take device pixel ratio into account.
+
+ Currently not testable.
+
+ * rendering/RenderBoxModelObject.cpp:
+ (WebCore::BorderEdge::BorderEdge):
+ (WebCore::BorderEdge::obscuresBackgroundEdge):
+ (WebCore::BorderEdge::getDoubleBorderStripeWidths): this does not always produce the same
+ result as before, but the sum of inner and outer is not different.
+ (WebCore::BorderEdge::borderWidthInDevicePixel):
+ (WebCore::RenderBoxModelObject::getBorderEdgeInfo):
+
</ins><span class="cx"> 2014-02-22 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r164507): Crash beneath JSGlobalObjectInspectorController::reportAPIException at facebook.com, twitter.com, youtube.com
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxModelObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp (164554 => 164555)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp 2014-02-23 05:44:05 UTC (rev 164554)
+++ trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp 2014-02-23 16:22:58 UTC (rev 164555)
</span><span class="lines">@@ -1396,22 +1396,24 @@
</span><span class="cx">
</span><span class="cx"> class BorderEdge {
</span><span class="cx"> public:
</span><del>- BorderEdge(LayoutUnit edgeWidth, const Color& edgeColor, EBorderStyle edgeStyle, bool edgeIsTransparent, bool edgeIsPresent = true)
</del><ins>+ BorderEdge(LayoutUnit edgeWidth, const Color& edgeColor, EBorderStyle edgeStyle, bool edgeIsTransparent, bool edgeIsPresent, float devicePixelRatio)
</ins><span class="cx"> : width(edgeWidth)
</span><span class="cx"> , color(edgeColor)
</span><span class="cx"> , style(edgeStyle)
</span><span class="cx"> , isTransparent(edgeIsTransparent)
</span><span class="cx"> , isPresent(edgeIsPresent)
</span><ins>+ , devicePixelRatio(devicePixelRatio)
</ins><span class="cx"> {
</span><del>- if (style == DOUBLE && edgeWidth < 3)
</del><ins>+ if (style == DOUBLE && width < borderWidthInDevicePixel(3))
</ins><span class="cx"> style = SOLID;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> BorderEdge()
</span><del>- : width(0)
</del><ins>+ : width(LayoutUnit::fromPixel(0))
</ins><span class="cx"> , style(BHIDDEN)
</span><span class="cx"> , isTransparent(false)
</span><span class="cx"> , isPresent(false)
</span><ins>+ , devicePixelRatio(1)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1420,14 +1422,14 @@
</span><span class="cx"> bool presentButInvisible() const { return usedWidth() && !hasVisibleColorAndStyle(); }
</span><span class="cx"> bool obscuresBackgroundEdge(float scale) const
</span><span class="cx"> {
</span><del>- if (!isPresent || isTransparent || (width * scale) < 2 || color.hasAlpha() || style == BHIDDEN)
</del><ins>+ if (!isPresent || isTransparent || (width * scale) < borderWidthInDevicePixel(2) || color.hasAlpha() || style == BHIDDEN)
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if (style == DOTTED || style == DASHED)
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if (style == DOUBLE)
</span><del>- return width >= 5 * scale; // The outer band needs to be >= 2px wide at unit scale.
</del><ins>+ return width >= scale * borderWidthInDevicePixel(5); // The outer band needs to be >= 2px wide at unit scale.
</ins><span class="cx">
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="lines">@@ -1446,16 +1448,9 @@
</span><span class="cx">
</span><span class="cx"> void getDoubleBorderStripeWidths(LayoutUnit& outerWidth, LayoutUnit& innerWidth) const
</span><span class="cx"> {
</span><del>- int fullWidth = usedWidth();
- outerWidth = fullWidth / 3;
- innerWidth = fullWidth * 2 / 3;
-
- // We need certain integer rounding results
- if (fullWidth % 3 == 2)
- outerWidth += 1;
-
- if (fullWidth % 3 == 1)
- innerWidth += 1;
</del><ins>+ LayoutUnit fullWidth = usedWidth();
+ innerWidth = ceilToDevicePixel(fullWidth * 2 / 3, devicePixelRatio);
+ outerWidth = floorToDevicePixel(fullWidth / 3, devicePixelRatio);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LayoutUnit width;
</span><span class="lines">@@ -1463,6 +1458,10 @@
</span><span class="cx"> EBorderStyle style;
</span><span class="cx"> bool isTransparent;
</span><span class="cx"> bool isPresent;
</span><ins>+ float devicePixelRatio;
+
+private:
+ float borderWidthInDevicePixel(int logicalPixels) const { return LayoutUnit(logicalPixels / devicePixelRatio).toFloat(); }
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> static bool allCornersClippedOut(const RoundedRect& border, const LayoutRect& clipRect)
</span><span class="lines">@@ -2353,30 +2352,35 @@
</span><span class="cx"> void RenderBoxModelObject::getBorderEdgeInfo(BorderEdge edges[], const RenderStyle* style, bool includeLogicalLeftEdge, bool includeLogicalRightEdge) const
</span><span class="cx"> {
</span><span class="cx"> bool horizontal = style->isHorizontalWritingMode();
</span><ins>+ float deviceScaleFactor = document().deviceScaleFactor();
</ins><span class="cx">
</span><span class="cx"> edges[BSTop] = BorderEdge(style->borderTopWidth(),
</span><span class="cx"> style->visitedDependentColor(CSSPropertyBorderTopColor),
</span><span class="cx"> style->borderTopStyle(),
</span><span class="cx"> style->borderTopIsTransparent(),
</span><del>- horizontal || includeLogicalLeftEdge);
</del><ins>+ horizontal || includeLogicalLeftEdge,
+ deviceScaleFactor);
</ins><span class="cx">
</span><span class="cx"> edges[BSRight] = BorderEdge(style->borderRightWidth(),
</span><span class="cx"> style->visitedDependentColor(CSSPropertyBorderRightColor),
</span><span class="cx"> style->borderRightStyle(),
</span><span class="cx"> style->borderRightIsTransparent(),
</span><del>- !horizontal || includeLogicalRightEdge);
</del><ins>+ !horizontal || includeLogicalRightEdge,
+ deviceScaleFactor);
</ins><span class="cx">
</span><span class="cx"> edges[BSBottom] = BorderEdge(style->borderBottomWidth(),
</span><span class="cx"> style->visitedDependentColor(CSSPropertyBorderBottomColor),
</span><span class="cx"> style->borderBottomStyle(),
</span><span class="cx"> style->borderBottomIsTransparent(),
</span><del>- horizontal || includeLogicalRightEdge);
</del><ins>+ horizontal || includeLogicalRightEdge,
+ deviceScaleFactor);
</ins><span class="cx">
</span><span class="cx"> edges[BSLeft] = BorderEdge(style->borderLeftWidth(),
</span><span class="cx"> style->visitedDependentColor(CSSPropertyBorderLeftColor),
</span><span class="cx"> style->borderLeftStyle(),
</span><span class="cx"> style->borderLeftIsTransparent(),
</span><del>- !horizontal || includeLogicalLeftEdge);
</del><ins>+ !horizontal || includeLogicalLeftEdge,
+ deviceScaleFactor);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool RenderBoxModelObject::borderObscuresBackgroundEdge(const FloatSize& contextScale) const
</span></span></pre>
</div>
</div>
</body>
</html>