<!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>[164474] trunk/Source</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/164474">164474</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2014-02-20 22:32:11 -0800 (Thu, 20 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove redundant deviceScaleFactor() functions and make callers use Document::deviceScaleFactor() when accessible.
https://bugs.webkit.org/show_bug.cgi?id=129137
Reviewed by Simon Fraser.
No change in behavior.
Source/WebCore:
* editing/DeleteButtonController.cpp:
(WebCore::DeleteButtonController::createDeletionUI):
* page/Page.cpp:
* page/Page.h:
* platform/graphics/GraphicsContext.cpp:
(WebCore::GraphicsContext::GraphicsContext):
* platform/graphics/GraphicsContext.h:
* platform/graphics/cg/GraphicsContextCG.cpp:
(WebCore::GraphicsContext::platformInit):
* rendering/RenderBoxModelObject.cpp:
(WebCore::RenderBoxModelObject::paintFillLayerExtended):
(WebCore::RenderBoxModelObject::drawBoxSideFromPath):
* rendering/RenderImage.cpp:
(WebCore::RenderImage::imageSizeForError):
(WebCore::RenderImage::paintReplaced):
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::drawPlatformResizerImage):
* rendering/RenderObject.cpp:
(WebCore::RenderObject::drawLineForBoxSide):
* rendering/RenderThemeMac.mm:
(WebCore::RenderThemeMac::paintProgressBar):
* rendering/svg/SVGRenderingContext.cpp:
(WebCore::SVGRenderingContext::calculateTransformationToOutermostCoordinateSystem):
Source/WebKit2:
* WebProcess/WebPage/FindController.cpp:
(WebKit::FindController::getFindIndicatorBitmapAndRect):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreeditingDeleteButtonControllercpp">trunk/Source/WebCore/editing/DeleteButtonController.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePagecpp">trunk/Source/WebCore/page/Page.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePageh">trunk/Source/WebCore/page/Page.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGraphicsContextcpp">trunk/Source/WebCore/platform/graphics/GraphicsContext.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGraphicsContexth">trunk/Source/WebCore/platform/graphics/GraphicsContext.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscairoGraphicsContextCairocpp">trunk/Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscgGraphicsContextCGcpp">trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBoxModelObjectcpp">trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderImagecpp">trunk/Source/WebCore/rendering/RenderImage.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayercpp">trunk/Source/WebCore/rendering/RenderLayer.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderObjectcpp">trunk/Source/WebCore/rendering/RenderObject.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemeMacmm">trunk/Source/WebCore/rendering/RenderThemeMac.mm</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgSVGRenderingContextcpp">trunk/Source/WebCore/rendering/svg/SVGRenderingContext.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageFindControllercpp">trunk/Source/WebKit2/WebProcess/WebPage/FindController.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (164473 => 164474)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-21 06:13:39 UTC (rev 164473)
+++ trunk/Source/WebCore/ChangeLog 2014-02-21 06:32:11 UTC (rev 164474)
</span><span class="lines">@@ -1,3 +1,36 @@
</span><ins>+2014-02-20 Zalan Bujtas <zalan@apple.com>
+
+ Remove redundant deviceScaleFactor() functions and make callers use Document::deviceScaleFactor() when accessible.
+ https://bugs.webkit.org/show_bug.cgi?id=129137
+
+ Reviewed by Simon Fraser.
+
+ No change in behavior.
+
+ * editing/DeleteButtonController.cpp:
+ (WebCore::DeleteButtonController::createDeletionUI):
+ * page/Page.cpp:
+ * page/Page.h:
+ * platform/graphics/GraphicsContext.cpp:
+ (WebCore::GraphicsContext::GraphicsContext):
+ * platform/graphics/GraphicsContext.h:
+ * platform/graphics/cg/GraphicsContextCG.cpp:
+ (WebCore::GraphicsContext::platformInit):
+ * rendering/RenderBoxModelObject.cpp:
+ (WebCore::RenderBoxModelObject::paintFillLayerExtended):
+ (WebCore::RenderBoxModelObject::drawBoxSideFromPath):
+ * rendering/RenderImage.cpp:
+ (WebCore::RenderImage::imageSizeForError):
+ (WebCore::RenderImage::paintReplaced):
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::drawPlatformResizerImage):
+ * rendering/RenderObject.cpp:
+ (WebCore::RenderObject::drawLineForBoxSide):
+ * rendering/RenderThemeMac.mm:
+ (WebCore::RenderThemeMac::paintProgressBar):
+ * rendering/svg/SVGRenderingContext.cpp:
+ (WebCore::SVGRenderingContext::calculateTransformationToOutermostCoordinateSystem):
+
</ins><span class="cx"> 2014-02-20 David Kilzer <ddkilzer@apple.com>
</span><span class="cx">
</span><span class="cx"> Stop generating Objective-C bindings for the SVG DOM
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingDeleteButtonControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/DeleteButtonController.cpp (164473 => 164474)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/DeleteButtonController.cpp 2014-02-21 06:13:39 UTC (rev 164473)
+++ trunk/Source/WebCore/editing/DeleteButtonController.cpp 2014-02-21 06:32:11 UTC (rev 164474)
</span><span class="lines">@@ -245,9 +245,8 @@
</span><span class="cx"> button->setInlineStyleProperty(CSSPropertyHeight, buttonHeight, CSSPrimitiveValue::CSS_PX);
</span><span class="cx"> button->setInlineStyleProperty(CSSPropertyVisibility, CSSValueVisible);
</span><span class="cx">
</span><del>- float deviceScaleFactor = WebCore::deviceScaleFactor(&m_frame);
</del><span class="cx"> RefPtr<Image> buttonImage;
</span><del>- if (deviceScaleFactor >= 2)
</del><ins>+ if (m_target->document().deviceScaleFactor() >= 2)
</ins><span class="cx"> buttonImage = Image::loadPlatformResource("deleteButton@2x");
</span><span class="cx"> else
</span><span class="cx"> buttonImage = Image::loadPlatformResource("deleteButton");
</span></span></pre></div>
<a id="trunkSourceWebCorepagePagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.cpp (164473 => 164474)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.cpp 2014-02-21 06:13:39 UTC (rev 164473)
+++ trunk/Source/WebCore/page/Page.cpp 2014-02-21 06:32:11 UTC (rev 164474)
</span><span class="lines">@@ -114,16 +114,6 @@
</span><span class="cx"> frames[i]->document()->dispatchWindowEvent(Event::create(eventName, false, false));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-float deviceScaleFactor(Frame* frame)
-{
- if (!frame)
- return 1;
- Page* page = frame->page();
- if (!page)
- return 1;
- return page->deviceScaleFactor();
-}
-
</del><span class="cx"> static const ViewState::Flags PageInitialViewState = ViewState::IsVisible | ViewState::IsInWindow;
</span><span class="cx">
</span><span class="cx"> Page::Page(PageClients& pageClients)
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.h (164473 => 164474)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.h 2014-02-21 06:13:39 UTC (rev 164473)
+++ trunk/Source/WebCore/page/Page.h 2014-02-21 06:32:11 UTC (rev 164474)
</span><span class="lines">@@ -110,8 +110,6 @@
</span><span class="cx">
</span><span class="cx"> enum FindDirection { FindDirectionForward, FindDirectionBackward };
</span><span class="cx">
</span><del>-float deviceScaleFactor(Frame*);
-
</del><span class="cx"> class Page : public Supplementable<Page> {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(Page);
</span><span class="cx"> friend class Settings;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGraphicsContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GraphicsContext.cpp (164473 => 164474)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GraphicsContext.cpp 2014-02-21 06:13:39 UTC (rev 164473)
+++ trunk/Source/WebCore/platform/graphics/GraphicsContext.cpp 2014-02-21 06:32:11 UTC (rev 164474)
</span><span class="lines">@@ -80,7 +80,6 @@
</span><span class="cx"> GraphicsContext::GraphicsContext(PlatformGraphicsContext* platformGraphicsContext)
</span><span class="cx"> : m_updatingControlTints(false)
</span><span class="cx"> , m_transparencyCount(0)
</span><del>- , m_pixelSnappingFactor(1)
</del><span class="cx"> {
</span><span class="cx"> platformInit(platformGraphicsContext);
</span><span class="cx"> }
</span><span class="lines">@@ -88,7 +87,6 @@
</span><span class="cx"> GraphicsContext::GraphicsContext(PlatformGraphicsContext* platformGraphicsContext, bool shouldUseContextColors)
</span><span class="cx"> : m_updatingControlTints(false)
</span><span class="cx"> , m_transparencyCount(0)
</span><del>- , m_pixelSnappingFactor(1)
</del><span class="cx"> {
</span><span class="cx"> platformInit(platformGraphicsContext, shouldUseContextColors);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGraphicsContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GraphicsContext.h (164473 => 164474)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GraphicsContext.h 2014-02-21 06:13:39 UTC (rev 164473)
+++ trunk/Source/WebCore/platform/graphics/GraphicsContext.h 2014-02-21 06:32:11 UTC (rev 164474)
</span><span class="lines">@@ -444,12 +444,6 @@
</span><span class="cx"> enum IncludeDeviceScale { DefinitelyIncludeDeviceScale, PossiblyIncludeDeviceScale };
</span><span class="cx"> AffineTransform getCTM(IncludeDeviceScale includeScale = PossiblyIncludeDeviceScale) const;
</span><span class="cx">
</span><del>-#if PLATFORM(WIN)
- float pixelSnappingFactor() const { return 1.0; }
-#else
- float pixelSnappingFactor() const { return m_pixelSnappingFactor; }
-#endif
-
</del><span class="cx"> #if ENABLE(3D_RENDERING) && USE(TEXTURE_MAPPER)
</span><span class="cx"> // This is needed when using accelerated-compositing in software mode, like in TextureMapper.
</span><span class="cx"> void concat3DTransform(const TransformationMatrix&);
</span><span class="lines">@@ -582,7 +576,6 @@
</span><span class="cx"> Vector<GraphicsContextState> m_stack;
</span><span class="cx"> bool m_updatingControlTints;
</span><span class="cx"> unsigned m_transparencyCount;
</span><del>- float m_pixelSnappingFactor;
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class GraphicsContextStateSaver {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscairoGraphicsContextCairocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp (164473 => 164474)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp 2014-02-21 06:13:39 UTC (rev 164473)
+++ trunk/Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp 2014-02-21 06:32:11 UTC (rev 164474)
</span><span class="lines">@@ -177,7 +177,6 @@
</span><span class="cx"> GraphicsContext::GraphicsContext(cairo_t* cr)
</span><span class="cx"> : m_updatingControlTints(false)
</span><span class="cx"> , m_transparencyCount(0)
</span><del>- , m_pixelSnappingFactor(1)
</del><span class="cx"> {
</span><span class="cx"> m_data = new GraphicsContextPlatformPrivateToplevel(new PlatformContextCairo(cr));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgGraphicsContextCGcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp (164473 => 164474)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp 2014-02-21 06:13:39 UTC (rev 164473)
+++ trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp 2014-02-21 06:32:11 UTC (rev 164474)
</span><span class="lines">@@ -125,9 +125,6 @@
</span><span class="cx"> m_data = new GraphicsContextPlatformPrivate(cgContext);
</span><span class="cx"> setPaintingDisabled(!cgContext);
</span><span class="cx"> if (cgContext) {
</span><del>- CGAffineTransform baseDeviceMatrix = CGContextGetUserSpaceToDeviceSpaceTransform(cgContext);
- ASSERT(fabs(baseDeviceMatrix.a) == fabs(baseDeviceMatrix.d));
- m_pixelSnappingFactor = baseDeviceMatrix.a;
</del><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> m_state.shouldUseContextColors = shouldUseContextColors;
</span><span class="cx"> if (shouldUseContextColors) {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxModelObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp (164473 => 164474)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp 2014-02-21 06:13:39 UTC (rev 164473)
+++ trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp 2014-02-21 06:32:11 UTC (rev 164474)
</span><span class="lines">@@ -658,7 +658,7 @@
</span><span class="cx"> context->restore();
</span><span class="cx"> }
</span><span class="cx"> } else
</span><del>- context->fillRect(pixelSnappedForPainting(rect, context->pixelSnappingFactor()), bgColor, style().colorSpace());
</del><ins>+ context->fillRect(pixelSnappedForPainting(rect, document().deviceScaleFactor()), bgColor, style().colorSpace());
</ins><span class="cx">
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -2116,7 +2116,7 @@
</span><span class="cx">
</span><span class="cx"> graphicsContext->setStrokeStyle(NoStroke);
</span><span class="cx"> graphicsContext->setFillColor(color, style->colorSpace());
</span><del>- graphicsContext->drawRect(pixelSnappedForPainting(borderRect, graphicsContext->pixelSnappingFactor()));
</del><ins>+ graphicsContext->drawRect(pixelSnappedForPainting(borderRect, document().deviceScaleFactor()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void findInnerVertex(const FloatPoint& outerCorner, const FloatPoint& innerCorner, const FloatPoint& centerPoint, FloatPoint& result)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderImagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderImage.cpp (164473 => 164474)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderImage.cpp 2014-02-21 06:13:39 UTC (rev 164473)
+++ trunk/Source/WebCore/rendering/RenderImage.cpp 2014-02-21 06:32:11 UTC (rev 164474)
</span><span class="lines">@@ -166,8 +166,7 @@
</span><span class="cx">
</span><span class="cx"> IntSize imageSize;
</span><span class="cx"> if (newImage->willPaintBrokenImage()) {
</span><del>- float deviceScaleFactor = WebCore::deviceScaleFactor(&frame());
- std::pair<Image*, float> brokenImageAndImageScaleFactor = newImage->brokenImage(deviceScaleFactor);
</del><ins>+ std::pair<Image*, float> brokenImageAndImageScaleFactor = newImage->brokenImage(document().deviceScaleFactor());
</ins><span class="cx"> imageSize = brokenImageAndImageScaleFactor.first->size();
</span><span class="cx"> imageSize.scale(1 / brokenImageAndImageScaleFactor.second);
</span><span class="cx"> } else
</span><span class="lines">@@ -420,9 +419,8 @@
</span><span class="cx"> RefPtr<Image> image = imageResource().image();
</span><span class="cx">
</span><span class="cx"> if (imageResource().errorOccurred() && !image->isNull() && usableWidth >= image->width() && usableHeight >= image->height()) {
</span><del>- float deviceScaleFactor = WebCore::deviceScaleFactor(&frame());
</del><span class="cx"> // Call brokenImage() explicitly to ensure we get the broken image icon at the appropriate resolution.
</span><del>- std::pair<Image*, float> brokenImageAndImageScaleFactor = imageResource().cachedImage()->brokenImage(deviceScaleFactor);
</del><ins>+ std::pair<Image*, float> brokenImageAndImageScaleFactor = imageResource().cachedImage()->brokenImage(document().deviceScaleFactor());
</ins><span class="cx"> image = brokenImageAndImageScaleFactor.first;
</span><span class="cx"> IntSize imageSize = image->size();
</span><span class="cx"> imageSize.scale(1 / brokenImageAndImageScaleFactor.second);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (164473 => 164474)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2014-02-21 06:13:39 UTC (rev 164473)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2014-02-21 06:32:11 UTC (rev 164474)
</span><span class="lines">@@ -3400,11 +3400,9 @@
</span><span class="cx">
</span><span class="cx"> void RenderLayer::drawPlatformResizerImage(GraphicsContext* context, const LayoutRect& resizerCornerRect)
</span><span class="cx"> {
</span><del>- float deviceScaleFactor = WebCore::deviceScaleFactor(&renderer().frame());
-
</del><span class="cx"> RefPtr<Image> resizeCornerImage;
</span><span class="cx"> IntSize cornerResizerSize;
</span><del>- if (deviceScaleFactor >= 2) {
</del><ins>+ if (renderer().document().deviceScaleFactor() >= 2) {
</ins><span class="cx"> DEFINE_STATIC_LOCAL(Image*, resizeCornerImageHiRes, (Image::loadPlatformResource("textAreaResizeCorner@2x").leakRef()));
</span><span class="cx"> resizeCornerImage = resizeCornerImageHiRes;
</span><span class="cx"> cornerResizerSize = resizeCornerImage->size();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderObject.cpp (164473 => 164474)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderObject.cpp 2014-02-21 06:13:39 UTC (rev 164473)
+++ trunk/Source/WebCore/rendering/RenderObject.cpp 2014-02-21 06:32:11 UTC (rev 164474)
</span><span class="lines">@@ -738,7 +738,7 @@
</span><span class="cx"> if (borderStyle == DOUBLE && thickness < 3)
</span><span class="cx"> borderStyle = SOLID;
</span><span class="cx">
</span><del>- float pixelSnappingFactor = graphicsContext->pixelSnappingFactor();
</del><ins>+ float pixelSnappingFactor = document().deviceScaleFactor();
</ins><span class="cx"> // FIXME: We really would like this check to be an ASSERT as we don't want to draw empty borders. However
</span><span class="cx"> // nothing guarantees that the following recursive calls to drawLineForBoxSide will have non-null dimensions.
</span><span class="cx"> // FIXME: flooring is a temporary solution until the device pixel snapping is added here for all border types.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeMac.mm (164473 => 164474)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeMac.mm 2014-02-21 06:13:39 UTC (rev 164473)
+++ trunk/Source/WebCore/rendering/RenderThemeMac.mm 2014-02-21 06:32:11 UTC (rev 164474)
</span><span class="lines">@@ -1042,10 +1042,7 @@
</span><span class="cx"> else
</span><span class="cx"> trackInfo.kind = renderProgress->position() < 0 ? kThemeMediumIndeterminateBar : kThemeMediumProgressBar;
</span><span class="cx">
</span><del>- float deviceScaleFactor = 1;
- if (Page* page = renderObject->frame().page())
- deviceScaleFactor = page->deviceScaleFactor();
-
</del><ins>+ float deviceScaleFactor = renderObject->document().deviceScaleFactor();
</ins><span class="cx"> trackInfo.bounds = IntRect(IntPoint(), inflatedRect.size());
</span><span class="cx"> trackInfo.min = 0;
</span><span class="cx"> trackInfo.max = std::numeric_limits<SInt32>::max();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgSVGRenderingContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/SVGRenderingContext.cpp (164473 => 164474)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/SVGRenderingContext.cpp 2014-02-21 06:13:39 UTC (rev 164473)
+++ trunk/Source/WebCore/rendering/svg/SVGRenderingContext.cpp 2014-02-21 06:32:11 UTC (rev 164474)
</span><span class="lines">@@ -218,10 +218,7 @@
</span><span class="cx"> {
</span><span class="cx"> absoluteTransform = currentContentTransformation();
</span><span class="cx">
</span><del>- float deviceScaleFactor = 1;
- if (Page* page = renderer.document().page())
- deviceScaleFactor = page->deviceScaleFactor();
-
</del><ins>+ float deviceScaleFactor = renderer.document().deviceScaleFactor();
</ins><span class="cx"> // Walk up the render tree, accumulating SVG transforms.
</span><span class="cx"> const RenderObject* ancestor = &renderer;
</span><span class="cx"> while (ancestor) {
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (164473 => 164474)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-02-21 06:13:39 UTC (rev 164473)
+++ trunk/Source/WebKit2/ChangeLog 2014-02-21 06:32:11 UTC (rev 164474)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-02-20 Zalan Bujtas <zalan@apple.com>
+
+ Remove redundant deviceScaleFactor() functions and make callers use Document::deviceScaleFactor() when accessible.
+ https://bugs.webkit.org/show_bug.cgi?id=129137
+
+ Reviewed by Simon Fraser.
+
+ No change in behavior.
+
+ * WebProcess/WebPage/FindController.cpp:
+ (WebKit::FindController::getFindIndicatorBitmapAndRect):
+
</ins><span class="cx"> 2014-02-20 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><span class="cx"> Add a missing piece of r164469
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageFindControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/FindController.cpp (164473 => 164474)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/FindController.cpp 2014-02-21 06:13:39 UTC (rev 164473)
+++ trunk/Source/WebKit2/WebProcess/WebPage/FindController.cpp 2014-02-21 06:32:11 UTC (rev 164474)
</span><span class="lines">@@ -208,7 +208,8 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> IntSize backingStoreSize = selectionRect.size();
</span><del>- backingStoreSize.scale(m_webPage->corePage()->deviceScaleFactor());
</del><ins>+ float deviceScaleFactor = m_webPage->corePage()->deviceScaleFactor();
+ backingStoreSize.scale(deviceScaleFactor);
</ins><span class="cx">
</span><span class="cx"> // Create a backing store and paint the find indicator text into it.
</span><span class="cx"> RefPtr<ShareableBitmap> findIndicatorTextBackingStore = ShareableBitmap::createShareable(backingStoreSize, ShareableBitmap::SupportsAlpha);
</span><span class="lines">@@ -216,7 +217,7 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> auto graphicsContext = findIndicatorTextBackingStore->createGraphicsContext();
</span><del>- graphicsContext->scale(FloatSize(m_webPage->corePage()->deviceScaleFactor(), m_webPage->corePage()->deviceScaleFactor()));
</del><ins>+ graphicsContext->scale(FloatSize(deviceScaleFactor, deviceScaleFactor));
</ins><span class="cx">
</span><span class="cx"> IntRect paintRect = selectionRect;
</span><span class="cx"> paintRect.move(frame->view()->frameRect().x(), frame->view()->frameRect().y());
</span></span></pre>
</div>
</div>
</body>
</html>