<!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>[160763] 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/160763">160763</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2013-12-18 07:02:45 -0800 (Wed, 18 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>RenderElement-ize adjustForAbsoluteZoom() and friends.
<https://webkit.org/b/125921>
Make adjustForAbsoluteZoom() take a const RenderElement& instead
of a RenderObject* so we can avoid the extra branch in style().
All call sites already had RenderElements.
Reviewed by Antti Koivisto.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssMediaQueryEvaluatorcpp">trunk/Source/WebCore/css/MediaQueryEvaluator.cpp</a></li>
<li><a href="#trunkSourceWebCoredomElementcpp">trunk/Source/WebCore/dom/Element.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLImageElementcpp">trunk/Source/WebCore/html/HTMLImageElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlImageInputTypecpp">trunk/Source/WebCore/html/ImageInputType.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorOverlaycpp">trunk/Source/WebCore/inspector/InspectorOverlay.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderElementh">trunk/Source/WebCore/rendering/RenderElement.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderObjecth">trunk/Source/WebCore/rendering/RenderObject.h</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 (160762 => 160763)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2013-12-18 14:18:41 UTC (rev 160762)
+++ trunk/Source/WebCore/ChangeLog 2013-12-18 15:02:45 UTC (rev 160763)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2013-12-18 Andreas Kling <akling@apple.com>
+
+ RenderElement-ize adjustForAbsoluteZoom() and friends.
+ <https://webkit.org/b/125921>
+
+ Make adjustForAbsoluteZoom() take a const RenderElement& instead
+ of a RenderObject* so we can avoid the extra branch in style().
+ All call sites already had RenderElements.
+
+ Reviewed by Antti Koivisto.
+
</ins><span class="cx"> 2013-12-18 Chris Fleizach <cfleizach@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: HTML spec change indicates @aria-required should trump @required on any element
</span></span></pre></div>
<a id="trunkSourceWebCorecssMediaQueryEvaluatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/MediaQueryEvaluator.cpp (160762 => 160763)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/MediaQueryEvaluator.cpp 2013-12-18 14:18:41 UTC (rev 160762)
+++ trunk/Source/WebCore/css/MediaQueryEvaluator.cpp 2013-12-18 15:02:45 UTC (rev 160763)
</span><span class="lines">@@ -396,7 +396,7 @@
</span><span class="cx"> if (value) {
</span><span class="cx"> int height = view->layoutHeight();
</span><span class="cx"> if (RenderView* renderView = frame->document()->renderView())
</span><del>- height = adjustForAbsoluteZoom(height, renderView);
</del><ins>+ height = adjustForAbsoluteZoom(height, *renderView);
</ins><span class="cx"> RenderStyle* rootStyle = frame->document()->documentElement()->renderStyle();
</span><span class="cx"> int length;
</span><span class="cx"> return computeLength(value, !frame->document()->inQuirksMode(), style, rootStyle, length) && compareValue(height, length, op);
</span><span class="lines">@@ -414,7 +414,7 @@
</span><span class="cx"> if (value) {
</span><span class="cx"> int width = view->layoutWidth();
</span><span class="cx"> if (RenderView* renderView = frame->document()->renderView())
</span><del>- width = adjustForAbsoluteZoom(width, renderView);
</del><ins>+ width = adjustForAbsoluteZoom(width, *renderView);
</ins><span class="cx"> RenderStyle* rootStyle = frame->document()->documentElement()->renderStyle();
</span><span class="cx"> int length;
</span><span class="cx"> return computeLength(value, !frame->document()->inQuirksMode(), style, rootStyle, length) && compareValue(width, length, op);
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.cpp (160762 => 160763)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.cpp 2013-12-18 14:18:41 UTC (rev 160762)
+++ trunk/Source/WebCore/dom/Element.cpp 2013-12-18 15:02:45 UTC (rev 160763)
</span><span class="lines">@@ -701,9 +701,9 @@
</span><span class="cx"> document().updateLayoutIgnorePendingStylesheets();
</span><span class="cx"> if (RenderBoxModelObject* renderer = renderBoxModelObject())
</span><span class="cx"> #if ENABLE(SUBPIXEL_LAYOUT)
</span><del>- return adjustLayoutUnitForAbsoluteZoom(renderer->pixelSnappedOffsetWidth(), renderer).round();
</del><ins>+ return adjustLayoutUnitForAbsoluteZoom(renderer->pixelSnappedOffsetWidth(), *renderer).round();
</ins><span class="cx"> #else
</span><del>- return adjustForAbsoluteZoom(renderer->pixelSnappedOffsetWidth(), renderer);
</del><ins>+ return adjustForAbsoluteZoom(renderer->pixelSnappedOffsetWidth(), *renderer);
</ins><span class="cx"> #endif
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="lines">@@ -713,9 +713,9 @@
</span><span class="cx"> document().updateLayoutIgnorePendingStylesheets();
</span><span class="cx"> if (RenderBoxModelObject* renderer = renderBoxModelObject())
</span><span class="cx"> #if ENABLE(SUBPIXEL_LAYOUT)
</span><del>- return adjustLayoutUnitForAbsoluteZoom(renderer->pixelSnappedOffsetHeight(), renderer).round();
</del><ins>+ return adjustLayoutUnitForAbsoluteZoom(renderer->pixelSnappedOffsetHeight(), *renderer).round();
</ins><span class="cx"> #else
</span><del>- return adjustForAbsoluteZoom(renderer->pixelSnappedOffsetHeight(), renderer);
</del><ins>+ return adjustForAbsoluteZoom(renderer->pixelSnappedOffsetHeight(), *renderer);
</ins><span class="cx"> #endif
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="lines">@@ -745,7 +745,7 @@
</span><span class="cx"> document().updateLayoutIgnorePendingStylesheets();
</span><span class="cx">
</span><span class="cx"> if (RenderBox* renderer = renderBox())
</span><del>- return adjustForAbsoluteZoom(roundToInt(renderer->clientLeft()), renderer);
</del><ins>+ return adjustForAbsoluteZoom(roundToInt(renderer->clientLeft()), *renderer);
</ins><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -754,7 +754,7 @@
</span><span class="cx"> document().updateLayoutIgnorePendingStylesheets();
</span><span class="cx">
</span><span class="cx"> if (RenderBox* renderer = renderBox())
</span><del>- return adjustForAbsoluteZoom(roundToInt(renderer->clientTop()), renderer);
</del><ins>+ return adjustForAbsoluteZoom(roundToInt(renderer->clientTop()), *renderer);
</ins><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -770,13 +770,13 @@
</span><span class="cx"> // When in quirks mode, clientWidth for the body element should return the width of the containing frame.
</span><span class="cx"> bool inQuirksMode = document().inQuirksMode();
</span><span class="cx"> if ((!inQuirksMode && document().documentElement() == this) || (inQuirksMode && isHTMLElement() && document().body() == this))
</span><del>- return adjustForAbsoluteZoom(renderView.frameView().layoutWidth(), &renderView);
</del><ins>+ return adjustForAbsoluteZoom(renderView.frameView().layoutWidth(), renderView);
</ins><span class="cx">
</span><span class="cx"> if (RenderBox* renderer = renderBox())
</span><span class="cx"> #if ENABLE(SUBPIXEL_LAYOUT)
</span><del>- return adjustLayoutUnitForAbsoluteZoom(renderer->pixelSnappedClientWidth(), renderer).round();
</del><ins>+ return adjustLayoutUnitForAbsoluteZoom(renderer->pixelSnappedClientWidth(), *renderer).round();
</ins><span class="cx"> #else
</span><del>- return adjustForAbsoluteZoom(renderer->pixelSnappedClientWidth(), renderer);
</del><ins>+ return adjustForAbsoluteZoom(renderer->pixelSnappedClientWidth(), *renderer);
</ins><span class="cx"> #endif
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="lines">@@ -793,13 +793,13 @@
</span><span class="cx"> // When in quirks mode, clientHeight for the body element should return the height of the containing frame.
</span><span class="cx"> bool inQuirksMode = document().inQuirksMode();
</span><span class="cx"> if ((!inQuirksMode && document().documentElement() == this) || (inQuirksMode && isHTMLElement() && document().body() == this))
</span><del>- return adjustForAbsoluteZoom(renderView.frameView().layoutHeight(), &renderView);
</del><ins>+ return adjustForAbsoluteZoom(renderView.frameView().layoutHeight(), renderView);
</ins><span class="cx">
</span><span class="cx"> if (RenderBox* renderer = renderBox())
</span><span class="cx"> #if ENABLE(SUBPIXEL_LAYOUT)
</span><del>- return adjustLayoutUnitForAbsoluteZoom(renderer->pixelSnappedClientHeight(), renderer).round();
</del><ins>+ return adjustLayoutUnitForAbsoluteZoom(renderer->pixelSnappedClientHeight(), *renderer).round();
</ins><span class="cx"> #else
</span><del>- return adjustForAbsoluteZoom(renderer->pixelSnappedClientHeight(), renderer);
</del><ins>+ return adjustForAbsoluteZoom(renderer->pixelSnappedClientHeight(), *renderer);
</ins><span class="cx"> #endif
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="lines">@@ -816,10 +816,10 @@
</span><span class="cx"> RenderView& renderView = *document().renderView();
</span><span class="cx">
</span><span class="cx"> if (document().documentElement() == this)
</span><del>- return adjustForAbsoluteZoom(renderView.frameView().scrollX(), &renderView);
</del><ins>+ return adjustForAbsoluteZoom(renderView.frameView().scrollX(), renderView);
</ins><span class="cx">
</span><span class="cx"> if (RenderBox* rend = renderBox())
</span><del>- return adjustForAbsoluteZoom(rend->scrollLeft(), rend);
</del><ins>+ return adjustForAbsoluteZoom(rend->scrollLeft(), *rend);
</ins><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -835,10 +835,10 @@
</span><span class="cx"> RenderView& renderView = *document().renderView();
</span><span class="cx">
</span><span class="cx"> if (document().documentElement() == this)
</span><del>- return adjustForAbsoluteZoom(renderView.frameView().scrollY(), &renderView);
</del><ins>+ return adjustForAbsoluteZoom(renderView.frameView().scrollY(), renderView);
</ins><span class="cx">
</span><span class="cx"> if (RenderBox* rend = renderBox())
</span><del>- return adjustForAbsoluteZoom(rend->scrollTop(), rend);
</del><ins>+ return adjustForAbsoluteZoom(rend->scrollTop(), *rend);
</ins><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -888,7 +888,7 @@
</span><span class="cx"> {
</span><span class="cx"> document().updateLayoutIgnorePendingStylesheets();
</span><span class="cx"> if (RenderBox* rend = renderBox())
</span><del>- return adjustForAbsoluteZoom(rend->scrollWidth(), rend);
</del><ins>+ return adjustForAbsoluteZoom(rend->scrollWidth(), *rend);
</ins><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -896,7 +896,7 @@
</span><span class="cx"> {
</span><span class="cx"> document().updateLayoutIgnorePendingStylesheets();
</span><span class="cx"> if (RenderBox* rend = renderBox())
</span><del>- return adjustForAbsoluteZoom(rend->scrollHeight(), rend);
</del><ins>+ return adjustForAbsoluteZoom(rend->scrollHeight(), *rend);
</ins><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLImageElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLImageElement.cpp (160762 => 160763)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLImageElement.cpp 2013-12-18 14:18:41 UTC (rev 160762)
+++ trunk/Source/WebCore/html/HTMLImageElement.cpp 2013-12-18 15:02:45 UTC (rev 160763)
</span><span class="lines">@@ -265,7 +265,7 @@
</span><span class="cx"> document().updateLayout();
</span><span class="cx">
</span><span class="cx"> RenderBox* box = renderBox();
</span><del>- return box ? adjustForAbsoluteZoom(box->contentBoxRect().pixelSnappedWidth(), box) : 0;
</del><ins>+ return box ? adjustForAbsoluteZoom(box->contentBoxRect().pixelSnappedWidth(), *box) : 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> int HTMLImageElement::height(bool ignorePendingStylesheets)
</span><span class="lines">@@ -288,7 +288,7 @@
</span><span class="cx"> document().updateLayout();
</span><span class="cx">
</span><span class="cx"> RenderBox* box = renderBox();
</span><del>- return box ? adjustForAbsoluteZoom(box->contentBoxRect().pixelSnappedHeight(), box) : 0;
</del><ins>+ return box ? adjustForAbsoluteZoom(box->contentBoxRect().pixelSnappedHeight(), *box) : 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> int HTMLImageElement::naturalWidth() const
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlImageInputTypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/ImageInputType.cpp (160762 => 160763)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/ImageInputType.cpp 2013-12-18 14:18:41 UTC (rev 160762)
+++ trunk/Source/WebCore/html/ImageInputType.cpp 2013-12-18 15:02:45 UTC (rev 160763)
</span><span class="lines">@@ -192,7 +192,7 @@
</span><span class="cx"> element->document().updateLayout();
</span><span class="cx">
</span><span class="cx"> RenderBox* box = element->renderBox();
</span><del>- return box ? adjustForAbsoluteZoom(box->contentHeight(), box) : 0;
</del><ins>+ return box ? adjustForAbsoluteZoom(box->contentHeight(), *box) : 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> unsigned ImageInputType::width() const
</span><span class="lines">@@ -216,7 +216,7 @@
</span><span class="cx"> element->document().updateLayout();
</span><span class="cx">
</span><span class="cx"> RenderBox* box = element->renderBox();
</span><del>- return box ? adjustForAbsoluteZoom(box->contentWidth(), box) : 0;
</del><ins>+ return box ? adjustForAbsoluteZoom(box->contentWidth(), *box) : 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorOverlaycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorOverlay.cpp (160762 => 160763)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorOverlay.cpp 2013-12-18 14:18:41 UTC (rev 160762)
+++ trunk/Source/WebCore/inspector/InspectorOverlay.cpp 2013-12-18 15:02:45 UTC (rev 160763)
</span><span class="lines">@@ -661,8 +661,8 @@
</span><span class="cx"> FrameView* containingView = containingFrame->view();
</span><span class="cx"> IntRect boundingBox = pixelSnappedIntRect(containingView->contentsToRootView(renderer->absoluteBoundingBoxRect()));
</span><span class="cx"> RenderBoxModelObject* modelObject = renderer->isBoxModelObject() ? toRenderBoxModelObject(renderer) : 0;
</span><del>- elementInfo->setString("nodeWidth", String::number(modelObject ? adjustForAbsoluteZoom(modelObject->pixelSnappedOffsetWidth(), modelObject) : boundingBox.width()));
- elementInfo->setString("nodeHeight", String::number(modelObject ? adjustForAbsoluteZoom(modelObject->pixelSnappedOffsetHeight(), modelObject) : boundingBox.height()));
</del><ins>+ elementInfo->setString("nodeWidth", String::number(modelObject ? adjustForAbsoluteZoom(modelObject->pixelSnappedOffsetWidth(), *modelObject) : boundingBox.width()));
+ elementInfo->setString("nodeHeight", String::number(modelObject ? adjustForAbsoluteZoom(modelObject->pixelSnappedOffsetHeight(), *modelObject) : boundingBox.height()));
</ins><span class="cx">
</span><span class="cx"> if (renderer->isRenderNamedFlowFragmentContainer()) {
</span><span class="cx"> RenderNamedFlowFragment* region = toRenderBlockFlow(renderer)->renderNamedFlowFragment();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderElement.h (160762 => 160763)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderElement.h 2013-12-18 14:18:41 UTC (rev 160762)
+++ trunk/Source/WebCore/rendering/RenderElement.h 2013-12-18 15:02:45 UTC (rev 160763)
</span><span class="lines">@@ -334,6 +334,18 @@
</span><span class="cx"> return toRenderElement(Node::renderer());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+inline int adjustForAbsoluteZoom(int value, const RenderElement& renderer)
+{
+ return adjustForAbsoluteZoom(value, renderer.style());
+}
+
+#if ENABLE(SUBPIXEL_LAYOUT)
+inline LayoutUnit adjustLayoutUnitForAbsoluteZoom(LayoutUnit value, const RenderElement& renderer)
+{
+ return adjustLayoutUnitForAbsoluteZoom(value, renderer.style());
+}
+#endif
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // RenderElement_h
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderObject.h (160762 => 160763)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderObject.h 2013-12-18 14:18:41 UTC (rev 160762)
+++ trunk/Source/WebCore/rendering/RenderObject.h 2013-12-18 15:02:45 UTC (rev 160763)
</span><span class="lines">@@ -1149,18 +1149,6 @@
</span><span class="cx"> return m_bitfields.boxDecorationState() == HasBoxDecorationsAndBackgroundIsKnownToBeObscured;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline int adjustForAbsoluteZoom(int value, RenderObject* renderer)
-{
- return adjustForAbsoluteZoom(value, &renderer->style());
-}
-
-#if ENABLE(SUBPIXEL_LAYOUT)
-inline LayoutUnit adjustLayoutUnitForAbsoluteZoom(LayoutUnit value, RenderObject* renderer)
-{
- return adjustLayoutUnitForAbsoluteZoom(value, &renderer->style());
-}
-#endif
-
</del><span class="cx"> #define RENDER_OBJECT_TYPE_CASTS(ToValueTypeName, predicate) \
</span><span class="cx"> TYPE_CASTS_BASE(ToValueTypeName, RenderObject, object, object->predicate, object.predicate)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStyleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyle.h (160762 => 160763)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyle.h 2013-12-18 14:18:41 UTC (rev 160762)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.h 2013-12-18 15:02:45 UTC (rev 160763)
</span><span class="lines">@@ -1926,9 +1926,9 @@
</span><span class="cx"> void appendContent(std::unique_ptr<ContentData>);
</span><span class="cx"> };
</span><span class="cx">
</span><del>-inline int adjustForAbsoluteZoom(int value, const RenderStyle* style)
</del><ins>+inline int adjustForAbsoluteZoom(int value, const RenderStyle& style)
</ins><span class="cx"> {
</span><del>- double zoomFactor = style->effectiveZoom();
</del><ins>+ double zoomFactor = style.effectiveZoom();
</ins><span class="cx"> if (zoomFactor == 1)
</span><span class="cx"> return value;
</span><span class="cx"> // Needed because computeLengthInt truncates (rather than rounds) when scaling up.
</span><span class="lines">@@ -1948,9 +1948,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(SUBPIXEL_LAYOUT)
</span><del>-inline LayoutUnit adjustLayoutUnitForAbsoluteZoom(LayoutUnit value, const RenderStyle* style)
</del><ins>+inline LayoutUnit adjustLayoutUnitForAbsoluteZoom(LayoutUnit value, const RenderStyle& style)
</ins><span class="cx"> {
</span><del>- return value / style->effectiveZoom();
</del><ins>+ return value / style.effectiveZoom();
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>