<!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>[169346] 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/169346">169346</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2014-05-26 09:08:16 -0700 (Mon, 26 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Subpixel layout: Legacy Element.offset* client* return values are invalid in certain cases.
https://bugs.webkit.org/show_bug.cgi?id=133272
Reviewed by Simon Fraser.
Element.offset* client* functions applied various rounding strategies on the return values before <a href="http://trac.webkit.org/projects/webkit/changeset/168868">r168868</a>.
(for example, offsetLeft/Top either floored through implicit integer arithmetics or rounded explicitly depending
whether the zoom scale was 1. see http://trac.webkit.org/changeset/168868/trunk/Source/WebCore/dom/Element.cpp for details)
This patch mimics the legacy behavior by either rounding or flooring the return value.
Not testable (legacy switch is not exposed)
* dom/Element.cpp:
(WebCore::adjustForLocalZoom):
(WebCore::convertToNonSubpixelValueIfNeeded):
(WebCore::Element::offsetLeft):
(WebCore::Element::offsetTop):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomElementcpp">trunk/Source/WebCore/dom/Element.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (169345 => 169346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-05-26 15:04:27 UTC (rev 169345)
+++ trunk/Source/WebCore/ChangeLog 2014-05-26 16:08:16 UTC (rev 169346)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2014-05-26 Zalan Bujtas <zalan@apple.com>
+
+ Subpixel layout: Legacy Element.offset* client* return values are invalid in certain cases.
+ https://bugs.webkit.org/show_bug.cgi?id=133272
+
+ Reviewed by Simon Fraser.
+
+ Element.offset* client* functions applied various rounding strategies on the return values before r168868.
+ (for example, offsetLeft/Top either floored through implicit integer arithmetics or rounded explicitly depending
+ whether the zoom scale was 1. see http://trac.webkit.org/changeset/168868/trunk/Source/WebCore/dom/Element.cpp for details)
+ This patch mimics the legacy behavior by either rounding or flooring the return value.
+
+ Not testable (legacy switch is not exposed)
+
+ * dom/Element.cpp:
+ (WebCore::adjustForLocalZoom):
+ (WebCore::convertToNonSubpixelValueIfNeeded):
+ (WebCore::Element::offsetLeft):
+ (WebCore::Element::offsetTop):
+
</ins><span class="cx"> 2014-05-26 Michał Pakuła vel Rutka <m.pakula@samsung.com>
</span><span class="cx">
</span><span class="cx"> [EFL] Input fields and text areas are not rendered correctly after r167771
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.cpp (169345 => 169346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.cpp 2014-05-26 15:04:27 UTC (rev 169345)
+++ trunk/Source/WebCore/dom/Element.cpp 2014-05-26 16:08:16 UTC (rev 169346)
</span><span class="lines">@@ -644,9 +644,9 @@
</span><span class="cx"> return zoomFactor;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static double adjustForLocalZoom(LayoutUnit value, const RenderElement& renderer)
</del><ins>+static double adjustForLocalZoom(LayoutUnit value, const RenderElement& renderer, double& zoomFactor)
</ins><span class="cx"> {
</span><del>- double zoomFactor = localZoomForRenderer(renderer);
</del><ins>+ zoomFactor = localZoomForRenderer(renderer);
</ins><span class="cx"> if (zoomFactor == 1)
</span><span class="cx"> return value.toDouble();
</span><span class="cx"> #if ENABLE(SUBPIXEL_LAYOUT)
</span><span class="lines">@@ -659,24 +659,30 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static double convertToNonSubpixelValueIfNeeded(double value, const Document& document)
</del><ins>+enum LegacyCSSOMElementMetricsRoundingStrategy { Round, Floor };
+
+static double convertToNonSubpixelValueIfNeeded(double value, const Document& document, LegacyCSSOMElementMetricsRoundingStrategy roundStrategy = Round)
</ins><span class="cx"> {
</span><del>- return document.settings() && !document.settings()->subpixelCSSOMElementMetricsEnabled() ? floor(value) : value;
</del><ins>+ return document.settings() && !document.settings()->subpixelCSSOMElementMetricsEnabled() ? roundStrategy == Round ? round(value) : floor(value) : value;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> double Element::offsetLeft()
</span><span class="cx"> {
</span><span class="cx"> document().updateLayoutIgnorePendingStylesheets();
</span><del>- if (RenderBoxModelObject* renderer = renderBoxModelObject())
- return convertToNonSubpixelValueIfNeeded(adjustForLocalZoom(renderer->offsetLeft(), *renderer), renderer->document());
</del><ins>+ if (RenderBoxModelObject* renderer = renderBoxModelObject()) {
+ double zoomFactor = 1;
+ return convertToNonSubpixelValueIfNeeded(adjustForLocalZoom(renderer->offsetLeft(), *renderer, zoomFactor), renderer->document(), zoomFactor == 1 ? Floor : Round);
+ }
</ins><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> double Element::offsetTop()
</span><span class="cx"> {
</span><span class="cx"> document().updateLayoutIgnorePendingStylesheets();
</span><del>- if (RenderBoxModelObject* renderer = renderBoxModelObject())
- return convertToNonSubpixelValueIfNeeded(adjustForLocalZoom(renderer->offsetTop(), *renderer), renderer->document());
</del><ins>+ if (RenderBoxModelObject* renderer = renderBoxModelObject()) {
+ double zoomFactor = 1;
+ return convertToNonSubpixelValueIfNeeded(adjustForLocalZoom(renderer->offsetTop(), *renderer, zoomFactor), renderer->document(), zoomFactor == 1 ? Floor : Round);
+ }
</ins><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>