<!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>[186594] 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/186594">186594</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2015-07-09 11:09:47 -0700 (Thu, 09 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Win] Honor CACFLayer content scale factor
https://bugs.webkit.org/show_bug.cgi?id=146792
Reviewed by Dean Jackson.
* AVFoundationSupport.py: Check for the CACFLayerSet/GetContentsScale
* platform/graphics/ca/win/PlatformCALayerWin.cpp:
(PlatformCALayerWin::PlatformCALayerWin): Use owner's scale factor (if
present).
(PlatformCALayerWin::contentsScale): Use CACFLayer API if present.
(PlatformCALayerWin::setContentsScale): Ditto.
* platform/graphics/ca/win/PlatformCALayerWinInternal.cpp:
(PlatformCALayerWinInternal::PlatformCALayerWinInternal): Use owner's scale
factor (if present).
(PlatformCALayerWinInternal::addTile): Use tile parent's scale factor.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreAVFoundationSupportpy">trunk/Source/WebCore/AVFoundationSupport.py</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscawinPlatformCALayerWincpp">trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscawinPlatformCALayerWinInternalcpp">trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWinInternal.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreAVFoundationSupportpy"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/AVFoundationSupport.py (186593 => 186594)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/AVFoundationSupport.py 2015-07-09 16:26:33 UTC (rev 186593)
+++ trunk/Source/WebCore/AVFoundationSupport.py 2015-07-09 18:09:47 UTC (rev 186594)
</span><span class="lines">@@ -53,3 +53,7 @@
</span><span class="cx"> regexp = re.compile("AVCFURLAssetIsPlayableExtendedMIMEType")
</span><span class="cx"> if fileContains("/include/AVFoundationCF/AVCFAsset.h", regexp):
</span><span class="cx"> print "#define HAVE_AVCFURL_PLAYABLE_MIMETYPE 1"
</span><ins>+if lookFor("/include/QuartzCore/CACFLayer.h"):
+ regexp = re.compile("CACFLayerSetContentsScale")
+ if fileContains("/include/QuartzCore/CACFLayer.h", regexp):
+ print "#define HAVE_CACFLAYER_SETCONTENTSSCALE 1"
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (186593 => 186594)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-07-09 16:26:33 UTC (rev 186593)
+++ trunk/Source/WebCore/ChangeLog 2015-07-09 18:09:47 UTC (rev 186594)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-07-09 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Honor CACFLayer content scale factor
+ https://bugs.webkit.org/show_bug.cgi?id=146792
+
+ Reviewed by Dean Jackson.
+
+ * AVFoundationSupport.py: Check for the CACFLayerSet/GetContentsScale
+ * platform/graphics/ca/win/PlatformCALayerWin.cpp:
+ (PlatformCALayerWin::PlatformCALayerWin): Use owner's scale factor (if
+ present).
+ (PlatformCALayerWin::contentsScale): Use CACFLayer API if present.
+ (PlatformCALayerWin::setContentsScale): Ditto.
+ * platform/graphics/ca/win/PlatformCALayerWinInternal.cpp:
+ (PlatformCALayerWinInternal::PlatformCALayerWinInternal): Use owner's scale
+ factor (if present).
+ (PlatformCALayerWinInternal::addTile): Use tile parent's scale factor.
+
</ins><span class="cx"> 2015-07-08 Matt Rajca <mrajca@apple.com>
</span><span class="cx">
</span><span class="cx"> Media Session: report to chrome client 'hasActiveMediaElements' changes
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscawinPlatformCALayerWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp (186593 => 186594)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp 2015-07-09 16:26:33 UTC (rev 186593)
+++ trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp 2015-07-09 18:09:47 UTC (rev 186594)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2011, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2011, 2014-2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> #include "PlatformCAAnimationWin.h"
</span><span class="cx"> #include "PlatformCALayerWinInternal.h"
</span><span class="cx"> #include "TileController.h"
</span><ins>+#include "WebCoreHeaderDetection.h"
</ins><span class="cx"> #include <QuartzCore/CoreAnimationCF.h>
</span><span class="cx"> #include <WebKitSystemInterface/WebKitSystemInterface.h>
</span><span class="cx"> #include <wtf/CurrentTime.h>
</span><span class="lines">@@ -136,6 +137,10 @@
</span><span class="cx">
</span><span class="cx"> m_layer = adoptCF(CACFLayerCreate(toCACFLayerType(layerType)));
</span><span class="cx">
</span><ins>+#if HAVE(CACFLAYER_SETCONTENTSSCALE)
+ CACFLayerSetContentsScale(m_layer.get(), owner ? owner->platformCALayerDeviceScaleFactor() : 1.0f);
+#endif
+
</ins><span class="cx"> // Create the PlatformCALayerWinInternal object and point to it in the userdata.
</span><span class="cx"> PlatformCALayerWinInternal* intern = new PlatformCALayerWinInternal(this);
</span><span class="cx"> CACFLayerSetUserData(m_layer.get(), intern);
</span><span class="lines">@@ -582,11 +587,18 @@
</span><span class="cx">
</span><span class="cx"> float PlatformCALayerWin::contentsScale() const
</span><span class="cx"> {
</span><del>- return 1;
</del><ins>+#if HAVE(CACFLAYER_SETCONTENTSSCALE)
+ return CACFLayerGetContentsScale(m_layer.get());
+#else
+ return 1.0f;
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void PlatformCALayerWin::setContentsScale(float)
</del><ins>+void PlatformCALayerWin::setContentsScale(float scaleFactor)
</ins><span class="cx"> {
</span><ins>+#if HAVE(CACFLAYER_SETCONTENTSSCALE)
+ CACFLayerSetContentsScale(m_layer.get(), scaleFactor);
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> float PlatformCALayerWin::cornerRadius() const
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscawinPlatformCALayerWinInternalcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWinInternal.cpp (186593 => 186594)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWinInternal.cpp 2015-07-09 16:26:33 UTC (rev 186593)
+++ trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWinInternal.cpp 2015-07-09 18:09:47 UTC (rev 186594)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2011 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2011, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> #include "TextRun.h"
</span><span class="cx"> #include "TileController.h"
</span><span class="cx"> #include "TiledBacking.h"
</span><ins>+#include "WebCoreHeaderDetection.h"
</ins><span class="cx"> #include <QuartzCore/CACFLayer.h>
</span><span class="cx"> #include <wtf/MainThread.h>
</span><span class="cx">
</span><span class="lines">@@ -60,6 +61,10 @@
</span><span class="cx"> // Tiled layers are placed in a child layer that is always the first child of the TiledLayer
</span><span class="cx"> m_tileParent = adoptCF(CACFLayerCreate(kCACFLayer));
</span><span class="cx"> CACFLayerInsertSublayer(m_owner->platformLayer(), m_tileParent.get(), 0);
</span><ins>+#if HAVE(CACFLAYER_SETCONTENTSSCALE)
+ CACFLayerSetContentsScale(m_tileParent.get(), CACFLayerGetContentsScale(m_owner->platformLayer()));
+#endif
+
</ins><span class="cx"> updateTiles();
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -420,6 +425,9 @@
</span><span class="cx"> CACFLayerSetAnchorPoint(newLayer.get(), CGPointMake(0, 1));
</span><span class="cx"> CACFLayerSetUserData(newLayer.get(), this);
</span><span class="cx"> CACFLayerSetDisplayCallback(newLayer.get(), tileDisplayCallback);
</span><ins>+#if HAVE(CACFLAYER_SETCONTENTSSCALE)
+ CACFLayerSetContentsScale(newLayer.get(), CACFLayerGetContentsScale(m_tileParent.get()));
+#endif
</ins><span class="cx">
</span><span class="cx"> CFArrayRef sublayers = CACFLayerGetSublayers(m_tileParent.get());
</span><span class="cx"> CACFLayerInsertSublayer(m_tileParent.get(), newLayer.get(), sublayers ? CFArrayGetCount(sublayers) : 0);
</span></span></pre>
</div>
</div>
</body>
</html>