<!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>[197618] trunk</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/197618">197618</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2016-03-05 16:01:17 -0800 (Sat, 05 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add support for the object-position CSS property
https://bugs.webkit.org/show_bug.cgi?id=122811
rdar://problem/15836338
Reviewed by Sam Weinig.
Source/WebCore:
Take object-position into account when rendering replaced elements.
RenderReplaced::replacedContentRect() is the one place where we compute
the content rect for replaced elements.
Also return false from foregroundIsKnownToBeOpaqueInRect() if we have
any non-default object-position, as the foreground may no longer fill the box.
Tests: compositing/video/video-object-position.html
fast/css/object-position/object-position-canvas.html
fast/css/object-position/object-position-embed.html
fast/css/object-position/object-position-img-svg.html
fast/css/object-position/object-position-img.html
fast/css/object-position/object-position-input-image.html
fast/css/object-position/object-position-object.html
fast/css/object-position/object-position-video-poster.html
* rendering/RenderImage.cpp:
(WebCore::RenderImage::foregroundIsKnownToBeOpaqueInRect):
* rendering/RenderReplaced.cpp:
(WebCore::RenderReplaced::replacedContentRect):
LayoutTests:
Various object-position tests.
* compositing/video/video-object-position-expected.txt: Added.
* compositing/video/video-object-position.html: Added.
* fast/css/object-position/object-position-embed-expected.html: Added.
* fast/css/object-position/object-position-embed.html: Added.
* fast/css/object-position/object-position-img-expected.html: Added.
* fast/css/object-position/object-position-img-svg-expected.html: Added.
* fast/css/object-position/object-position-img-svg.html: Added.
* fast/css/object-position/object-position-img.html: Added.
* fast/css/object-position/object-position-input-image-expected.html: Added.
* fast/css/object-position/object-position-input-image.html: Added.
* fast/css/object-position/object-position-object-expected.html: Added.
* fast/css/object-position/object-position-object.html: Added.
* fast/css/object-position/object-position-video-poster-expected.html: Added.
* fast/css/object-position/object-position-video-poster.html: Added.
* fast/css/object-position/resources/expected.css: Added.
* fast/css/object-position/resources/test.css: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderImagecpp">trunk/Source/WebCore/rendering/RenderImage.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderReplacedcpp">trunk/Source/WebCore/rendering/RenderReplaced.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestscompositingvideovideoobjectpositionexpectedtxt">trunk/LayoutTests/compositing/video/video-object-position-expected.txt</a></li>
<li><a href="#trunkLayoutTestscompositingvideovideoobjectpositionhtml">trunk/LayoutTests/compositing/video/video-object-position.html</a></li>
<li><a href="#trunkLayoutTestsfastcssobjectpositionobjectpositionembedexpectedhtml">trunk/LayoutTests/fast/css/object-position/object-position-embed-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastcssobjectpositionobjectpositionembedhtml">trunk/LayoutTests/fast/css/object-position/object-position-embed.html</a></li>
<li><a href="#trunkLayoutTestsfastcssobjectpositionobjectpositionimgexpectedhtml">trunk/LayoutTests/fast/css/object-position/object-position-img-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastcssobjectpositionobjectpositionimgsvgexpectedhtml">trunk/LayoutTests/fast/css/object-position/object-position-img-svg-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastcssobjectpositionobjectpositionimgsvghtml">trunk/LayoutTests/fast/css/object-position/object-position-img-svg.html</a></li>
<li><a href="#trunkLayoutTestsfastcssobjectpositionobjectpositionimghtml">trunk/LayoutTests/fast/css/object-position/object-position-img.html</a></li>
<li><a href="#trunkLayoutTestsfastcssobjectpositionobjectpositioninputimageexpectedhtml">trunk/LayoutTests/fast/css/object-position/object-position-input-image-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastcssobjectpositionobjectpositioninputimagehtml">trunk/LayoutTests/fast/css/object-position/object-position-input-image.html</a></li>
<li><a href="#trunkLayoutTestsfastcssobjectpositionobjectpositionobjectexpectedhtml">trunk/LayoutTests/fast/css/object-position/object-position-object-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastcssobjectpositionobjectpositionobjecthtml">trunk/LayoutTests/fast/css/object-position/object-position-object.html</a></li>
<li><a href="#trunkLayoutTestsfastcssobjectpositionobjectpositionvideoposterexpectedhtml">trunk/LayoutTests/fast/css/object-position/object-position-video-poster-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastcssobjectpositionobjectpositionvideoposterhtml">trunk/LayoutTests/fast/css/object-position/object-position-video-poster.html</a></li>
<li>trunk/LayoutTests/fast/css/object-position/resources/</li>
<li><a href="#trunkLayoutTestsfastcssobjectpositionresourcesexpectedcss">trunk/LayoutTests/fast/css/object-position/resources/expected.css</a></li>
<li><a href="#trunkLayoutTestsfastcssobjectpositionresourcestestcss">trunk/LayoutTests/fast/css/object-position/resources/test.css</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (197617 => 197618)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-03-05 23:23:40 UTC (rev 197617)
+++ trunk/LayoutTests/ChangeLog 2016-03-06 00:01:17 UTC (rev 197618)
</span><span class="lines">@@ -1,5 +1,32 @@
</span><span class="cx"> 2016-03-05 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><ins>+ Add support for the object-position CSS property
+ https://bugs.webkit.org/show_bug.cgi?id=122811
+ rdar://problem/15836338
+
+ Reviewed by Sam Weinig.
+
+ Various object-position tests.
+
+ * compositing/video/video-object-position-expected.txt: Added.
+ * compositing/video/video-object-position.html: Added.
+ * fast/css/object-position/object-position-embed-expected.html: Added.
+ * fast/css/object-position/object-position-embed.html: Added.
+ * fast/css/object-position/object-position-img-expected.html: Added.
+ * fast/css/object-position/object-position-img-svg-expected.html: Added.
+ * fast/css/object-position/object-position-img-svg.html: Added.
+ * fast/css/object-position/object-position-img.html: Added.
+ * fast/css/object-position/object-position-input-image-expected.html: Added.
+ * fast/css/object-position/object-position-input-image.html: Added.
+ * fast/css/object-position/object-position-object-expected.html: Added.
+ * fast/css/object-position/object-position-object.html: Added.
+ * fast/css/object-position/object-position-video-poster-expected.html: Added.
+ * fast/css/object-position/object-position-video-poster.html: Added.
+ * fast/css/object-position/resources/expected.css: Added.
+ * fast/css/object-position/resources/test.css: Added.
+
+2016-03-05 Simon Fraser <simon.fraser@apple.com>
+
</ins><span class="cx"> Add parsing support for object-position
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=155065
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestscompositingvideovideoobjectpositionexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/compositing/video/video-object-position-expected.txt (0 => 197618)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/compositing/video/video-object-position-expected.txt (rev 0)
+++ trunk/LayoutTests/compositing/video/video-object-position-expected.txt 2016-03-06 00:01:17 UTC (rev 197618)
</span><span class="lines">@@ -0,0 +1,89 @@
</span><ins>+
+
+(GraphicsLayer
+ (anchor 0.00 0.00)
+ (bounds 800.00 600.00)
+ (children 1
+ (GraphicsLayer
+ (bounds 800.00 600.00)
+ (contentsOpaque 1)
+ (children 10
+ (GraphicsLayer
+ (position 13.00 13.00)
+ (bounds 124.00 204.00)
+ (contentsOpaque 1)
+ (drawsContent 1)
+ (contents layer 2.00, 2.00 120.00 x 200.00)
+ )
+ (GraphicsLayer
+ (position 151.00 13.00)
+ (bounds 124.00 204.00)
+ (contentsOpaque 1)
+ (drawsContent 1)
+ (contents clipping layer 2.00, 2.00 120.00 x 200.00)
+ (contents layer 20.00, 10.00 120.00 x 200.00)
+ )
+ (GraphicsLayer
+ (position 289.00 13.00)
+ (bounds 124.00 204.00)
+ (contentsOpaque 1)
+ (drawsContent 1)
+ (contents layer 2.00, 2.00 120.00 x 200.00)
+ )
+ (GraphicsLayer
+ (position 427.00 13.00)
+ (bounds 124.00 204.00)
+ (contentsOpaque 1)
+ (drawsContent 1)
+ (contents clipping layer 2.00, 2.00 120.00 x 200.00)
+ (contents layer -10.00, -10.00 120.00 x 200.00)
+ )
+ (GraphicsLayer
+ (position 565.00 13.00)
+ (bounds 124.00 204.00)
+ (contentsOpaque 1)
+ (drawsContent 1)
+ (contents layer 2.00, 2.00 120.00 x 200.00)
+ )
+ (GraphicsLayer
+ (position 13.00 231.00)
+ (bounds 124.00 204.00)
+ (contentsOpaque 1)
+ (drawsContent 1)
+ (contents layer 2.00, 57.00 120.00 x 90.00)
+ )
+ (GraphicsLayer
+ (position 151.00 231.00)
+ (bounds 124.00 204.00)
+ (contentsOpaque 1)
+ (drawsContent 1)
+ (contents clipping layer 2.00, 2.00 120.00 x 200.00)
+ (contents layer 20.00, 10.00 120.00 x 90.00)
+ )
+ (GraphicsLayer
+ (position 289.00 231.00)
+ (bounds 124.00 204.00)
+ (contentsOpaque 1)
+ (drawsContent 1)
+ (contents layer 2.00, 30.00 120.00 x 90.00)
+ )
+ (GraphicsLayer
+ (position 427.00 231.00)
+ (bounds 124.00 204.00)
+ (contentsOpaque 1)
+ (drawsContent 1)
+ (contents clipping layer 2.00, 2.00 120.00 x 200.00)
+ (contents layer -10.00, 100.00 120.00 x 90.00)
+ )
+ (GraphicsLayer
+ (position 565.00 231.00)
+ (bounds 124.00 204.00)
+ (contentsOpaque 1)
+ (drawsContent 1)
+ (contents layer 2.00, 101.00 120.00 x 90.00)
+ )
+ )
+ )
+ )
+)
+
</ins></span></pre></div>
<a id="trunkLayoutTestscompositingvideovideoobjectpositionhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/compositing/video/video-object-position.html (0 => 197618)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/compositing/video/video-object-position.html (rev 0)
+++ trunk/LayoutTests/compositing/video/video-object-position.html 2016-03-06 00:01:17 UTC (rev 197618)
</span><span class="lines">@@ -0,0 +1,64 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<style>
+ video {
+ width: 120px;
+ height: 200px;
+ margin: 5px;
+ border: 2px solid blue;
+ background-color: gray;
+ }
+
+ .group > *:nth-child(1) { object-position: center center; }
+ .group > *:nth-child(2) { object-position: 20px 10px; }
+ .group > *:nth-child(3) { object-position: 50% 25%; }
+ .group > *:nth-child(4) { object-position: bottom 10px right 10px; }
+ .group > *:nth-child(5) { object-position: bottom 10% right 30%; }
+</style>
+<script src="../../media/media-file.js"></script>
+<script>
+ if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+ }
+
+ function init()
+ {
+ setSrcByTagName("video", findMediaFile("video", "../../media/content/test"));
+
+ var totalCount = document.getElementsByTagName('video').length;
+ var count = totalCount;
+ document.addEventListener("canplaythrough", function () {
+ if (!--count) {
+ if (window.testRunner)
+ setTimeout(function() {
+ if (window.internals)
+ document.getElementById('results').innerText = window.internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_CONTENT_LAYERS);
+ testRunner.notifyDone();
+ }, totalCount * 150);
+ }
+ }, true);
+ }
+</script>
+
+</head>
+<body onload="init();">
+ <div class="group">
+ <video style="object-fit: fill"></video>
+ <video style="object-fit: fill"></video>
+ <video style="object-fit: fill"></video>
+ <video style="object-fit: fill"></video>
+ <video style="object-fit: fill"></video>
+ </div>
+
+ <div class="group">
+ <video style="object-fit: contain"></video>
+ <video style="object-fit: contain"></video>
+ <video style="object-fit: contain"></video>
+ <video style="object-fit: contain"></video>
+ <video style="object-fit: contain"></video>
+ </div>
+<pre id="results"></pre>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcssobjectpositionobjectpositionembedexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/object-position/object-position-embed-expected.html (0 => 197618)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/object-position/object-position-embed-expected.html (rev 0)
+++ trunk/LayoutTests/fast/css/object-position/object-position-embed-expected.html 2016-03-06 00:01:17 UTC (rev 197618)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+<!DOCTYPE html>
+
+<html>
+<head>
+ <link rel="stylesheet" href="resources/expected.css" type="text/css">
+</head>
+<body>
+ <div class="group">
+ <div><img src="../resources/circles-landscape.png"></div>
+ <div><img src="../resources/circles-landscape.png"></div>
+ <div><img src="../resources/circles-landscape.png"></div>
+ <div><img src="../resources/circles-landscape.png"></div>
+ <div><img src="../resources/circles-landscape.png"></div>
+ </div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcssobjectpositionobjectpositionembedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/object-position/object-position-embed.html (0 => 197618)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/object-position/object-position-embed.html (rev 0)
+++ trunk/LayoutTests/fast/css/object-position/object-position-embed.html 2016-03-06 00:01:17 UTC (rev 197618)
</span><span class="lines">@@ -0,0 +1,21 @@
</span><ins>+<!DOCTYPE html>
+
+<html>
+<head>
+ <link rel="stylesheet" href="resources/test.css" type="text/css">
+ <script>
+ // Disable plugins, because otherwise the "Test WebKit PlugIn" steals <embed>s referencing PNGs.
+ if (window.testRunner)
+ testRunner.setPluginsEnabled(false);
+ </script>
+</head>
+<body>
+ <div class="group">
+ <embed src="../resources/circles-landscape.png"></embed>
+ <embed src="../resources/circles-landscape.png"></embed>
+ <embed src="../resources/circles-landscape.png"></embed>
+ <embed src="../resources/circles-landscape.png"></embed>
+ <embed src="../resources/circles-landscape.png"></embed>
+ </div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcssobjectpositionobjectpositionimgexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/object-position/object-position-img-expected.html (0 => 197618)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/object-position/object-position-img-expected.html (rev 0)
+++ trunk/LayoutTests/fast/css/object-position/object-position-img-expected.html 2016-03-06 00:01:17 UTC (rev 197618)
</span><span class="lines">@@ -0,0 +1,51 @@
</span><ins>+<!DOCTYPE html>
+
+<html>
+ <head>
+ <style type="text/css">
+ .group > div {
+ display: inline-block;
+ overflow: hidden;
+ width: 100px;
+ height: 100px;
+ margin: 2px 10px;
+ border: 1px solid black;
+ background-color: gray;
+ }
+
+ .group img { display: block; }
+ .contain img { width: 100%; }
+ .contain > *:nth-child(1) * { margin-top: 25px; }
+ .contain > *:nth-child(2) * { margin-left: 20px; margin-top: 10px; }
+ .contain > *:nth-child(3) * { margin-top: 13px; }
+ .contain > *:nth-child(4) * { margin-left: -10px; margin-top: 40px; }
+ .contain > *:nth-child(5) * { margin-top: 45px; }
+
+ .fill img { height: 100%; width: 100%; }
+ .fill > *:nth-child(1) * { }
+ .fill > *:nth-child(2) * { margin-left: 20px; margin-top: 10px; }
+ .fill > *:nth-child(3) * { }
+ .fill > *:nth-child(4) * { margin-left: -10px; margin-top: -10px; }
+ .fill > *:nth-child(5) * { }
+ </style>
+ </head>
+ <body>
+
+ <div class="contain group">
+ <div><img src="../resources/circles-landscape.png"></div>
+ <div><img src="../resources/circles-landscape.png"></div>
+ <div><img src="../resources/circles-landscape.png"></div>
+ <div><img src="../resources/circles-landscape.png"></div>
+ <div><img src="../resources/circles-landscape.png"></div>
+ </div>
+
+ <div class="fill group">
+ <div><img src="../resources/circles-landscape.png"></div>
+ <div><img src="../resources/circles-landscape.png"></div>
+ <div><img src="../resources/circles-landscape.png"></div>
+ <div><img src="../resources/circles-landscape.png"></div>
+ <div><img src="../resources/circles-landscape.png"></div>
+ </div>
+
+ </body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcssobjectpositionobjectpositionimgsvgexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/object-position/object-position-img-svg-expected.html (0 => 197618)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/object-position/object-position-img-svg-expected.html (rev 0)
+++ trunk/LayoutTests/fast/css/object-position/object-position-img-svg-expected.html 2016-03-06 00:01:17 UTC (rev 197618)
</span><span class="lines">@@ -0,0 +1,32 @@
</span><ins>+<!DOCTYPE html>
+
+<html>
+ <head>
+ <link rel="stylesheet" href="resources/expected.css" type="text/css">
+ <style type="text/css">
+ .group > div {
+ height: 72px;
+ width: 144px;
+ }
+ </style>
+ </head>
+ <body>
+
+ <div class="group">
+ <div><img src="../resources/circle.svg" type="image/svg+xml"></div>
+ <div><img src="../resources/circle.svg" type="image/svg+xml"></div>
+ <div><img src="../resources/circle.svg" type="image/svg+xml"></div>
+ <div><img src="../resources/circle.svg" type="image/svg+xml"></div>
+ <div><img src="../resources/circle.svg" type="image/svg+xml"></div>
+ </div>
+
+ <div class="group">
+ <div><img src="../resources/circle2.svg" type="image/svg+xml"></div>
+ <div><img src="../resources/circle2.svg" type="image/svg+xml"></div>
+ <div><img src="../resources/circle2.svg" type="image/svg+xml"></div>
+ <div><img src="../resources/circle2.svg" type="image/svg+xml"></div>
+ <div><img src="../resources/circle2.svg" type="image/svg+xml"></div>
+ </div>
+
+ </body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcssobjectpositionobjectpositionimgsvghtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/object-position/object-position-img-svg.html (0 => 197618)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/object-position/object-position-img-svg.html (rev 0)
+++ trunk/LayoutTests/fast/css/object-position/object-position-img-svg.html 2016-03-06 00:01:17 UTC (rev 197618)
</span><span class="lines">@@ -0,0 +1,42 @@
</span><ins>+<!DOCTYPE html>
+
+<html>
+ <head>
+ <title>object-fit on SVG images</title>
+ <style type="text/css">
+ img, embed, object, input, canvas, video {
+ height: 72px;
+ width: 144px;
+ margin: 2px 10px;
+ border: 1px solid black;
+ background-color: gray;
+ }
+
+ .group { object-fit: contain; }
+ .group > *:nth-child(1) { object-position: center center; }
+ .group > *:nth-child(2) { object-position: 20px 10px; }
+ .group > *:nth-child(3) { object-position: 50% 25%; }
+ .group > *:nth-child(4) { object-position: bottom 10px right 10px; }
+ .group > *:nth-child(5) { object-position: bottom 10% right 30%; }
+ </style>
+ </head>
+ <body>
+
+ <div class="group">
+ <img src="../resources/circle.svg" type="image/svg+xml">
+ <img src="../resources/circle.svg" type="image/svg+xml">
+ <img src="../resources/circle.svg" type="image/svg+xml">
+ <img src="../resources/circle.svg" type="image/svg+xml">
+ <img src="../resources/circle.svg" type="image/svg+xml">
+ </div>
+
+ <div class="group">
+ <img src="../resources/circle2.svg" type="image/svg+xml">
+ <img src="../resources/circle2.svg" type="image/svg+xml">
+ <img src="../resources/circle2.svg" type="image/svg+xml">
+ <img src="../resources/circle2.svg" type="image/svg+xml">
+ <img src="../resources/circle2.svg" type="image/svg+xml">
+ </div>
+
+ </body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcssobjectpositionobjectpositionimghtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/object-position/object-position-img.html (0 => 197618)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/object-position/object-position-img.html (rev 0)
+++ trunk/LayoutTests/fast/css/object-position/object-position-img.html 2016-03-06 00:01:17 UTC (rev 197618)
</span><span class="lines">@@ -0,0 +1,46 @@
</span><ins>+<!DOCTYPE html>
+
+<html>
+ <head>
+ <title>object-position on images</title>
+ <style type="text/css">
+ img, embed, object, input, canvas, video {
+ width: 100px;
+ height: 100px;
+ margin: 2px 10px;
+ border: 1px solid black;
+ background-color: gray;
+ }
+
+ .contain > img { object-fit: contain; }
+ .fill > img { object-fit: fill; }
+
+ .group > *:nth-child(1) { object-position: center center; }
+ .group > *:nth-child(2) { object-position: 20px 10px; }
+ .group > *:nth-child(3) { object-position: 50% 25%; }
+ .group > *:nth-child(4) { object-position: bottom 10px right 10px; }
+ .group > *:nth-child(5) { object-position: bottom 10% right 30%; }
+
+ .group > *:nth-child(7) { }
+ </style>
+ </head>
+ <body>
+
+ <div class="contain group">
+ <img src="../resources/circles-landscape.png">
+ <img src="../resources/circles-landscape.png">
+ <img src="../resources/circles-landscape.png">
+ <img src="../resources/circles-landscape.png">
+ <img src="../resources/circles-landscape.png">
+ </div>
+
+ <div class="fill group">
+ <img src="../resources/circles-landscape.png">
+ <img src="../resources/circles-landscape.png">
+ <img src="../resources/circles-landscape.png">
+ <img src="../resources/circles-landscape.png">
+ <img src="../resources/circles-landscape.png">
+ </div>
+
+ </body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcssobjectpositionobjectpositioninputimageexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/object-position/object-position-input-image-expected.html (0 => 197618)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/object-position/object-position-input-image-expected.html (rev 0)
+++ trunk/LayoutTests/fast/css/object-position/object-position-input-image-expected.html 2016-03-06 00:01:17 UTC (rev 197618)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+<!DOCTYPE html>
+
+<html>
+<head>
+ <link rel="stylesheet" href="resources/expected.css" type="text/css">
+</head>
+<body>
+ <div class="group">
+ <div><img src="../resources/circles-landscape.png"></div>
+ <div><img src="../resources/circles-landscape.png"></div>
+ <div><img src="../resources/circles-landscape.png"></div>
+ <div><img src="../resources/circles-landscape.png"></div>
+ <div><img src="../resources/circles-landscape.png"></div>
+ </div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcssobjectpositionobjectpositioninputimagehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/object-position/object-position-input-image.html (0 => 197618)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/object-position/object-position-input-image.html (rev 0)
+++ trunk/LayoutTests/fast/css/object-position/object-position-input-image.html 2016-03-06 00:01:17 UTC (rev 197618)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+<!DOCTYPE html>
+
+<html>
+<head>
+ <title>object-fit on input images</title>
+ <link rel="stylesheet" href="resources/test.css" type="text/css">
+</head>
+<body>
+ <div class="group">
+ <input type="image" src="../resources/circles-landscape.png">
+ <input type="image" src="../resources/circles-landscape.png">
+ <input type="image" src="../resources/circles-landscape.png">
+ <input type="image" src="../resources/circles-landscape.png">
+ <input type="image" src="../resources/circles-landscape.png">
+ </div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcssobjectpositionobjectpositionobjectexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/object-position/object-position-object-expected.html (0 => 197618)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/object-position/object-position-object-expected.html (rev 0)
+++ trunk/LayoutTests/fast/css/object-position/object-position-object-expected.html 2016-03-06 00:01:17 UTC (rev 197618)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+<!DOCTYPE html>
+
+<html>
+<head>
+ <link rel="stylesheet" href="resources/expected.css" type="text/css">
+</head>
+<body>
+ <div class="group">
+ <div><img src="../resources/circles-landscape.png"></div>
+ <div><img src="../resources/circles-landscape.png"></div>
+ <div><img src="../resources/circles-landscape.png"></div>
+ <div><img src="../resources/circles-landscape.png"></div>
+ <div><img src="../resources/circles-landscape.png"></div>
+ </div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcssobjectpositionobjectpositionobjecthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/object-position/object-position-object.html (0 => 197618)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/object-position/object-position-object.html (rev 0)
+++ trunk/LayoutTests/fast/css/object-position/object-position-object.html 2016-03-06 00:01:17 UTC (rev 197618)
</span><span class="lines">@@ -0,0 +1,18 @@
</span><ins>+<!DOCTYPE html>
+
+<html>
+ <head>
+ <link rel="stylesheet" href="resources/test.css" type="text/css">
+ </head>
+ <body>
+
+ <div class="group">
+ <object data="../resources/circles-landscape.png"></object>
+ <object data="../resources/circles-landscape.png"></object>
+ <object data="../resources/circles-landscape.png"></object>
+ <object data="../resources/circles-landscape.png"></object>
+ <object data="../resources/circles-landscape.png"></object>
+ </div>
+
+ </body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcssobjectpositionobjectpositionvideoposterexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/object-position/object-position-video-poster-expected.html (0 => 197618)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/object-position/object-position-video-poster-expected.html (rev 0)
+++ trunk/LayoutTests/fast/css/object-position/object-position-video-poster-expected.html 2016-03-06 00:01:17 UTC (rev 197618)
</span><span class="lines">@@ -0,0 +1,29 @@
</span><ins>+<!DOCTYPE html>
+
+<html>
+ <head>
+ <link rel="stylesheet" href="resources/expected.css" type="text/css">
+ <style>
+ .group video {
+ width: 100px;
+ height: 50px;
+ }
+ .group > *:nth-child(1) * { margin-top: 25px; }
+ .group > *:nth-child(2) * { margin-left: 20px; margin-top: 10px; }
+ .group > *:nth-child(3) * { margin-top: 13px; }
+ .group > *:nth-child(4) * { margin-left: -10px; margin-top: 40px; }
+ .group > *:nth-child(5) * { margin-top: 45px; }
+ </style>
+ </head>
+ <body>
+
+ <div class="group">
+ <div><video poster="../resources/circles-landscape.png"></video></div>
+ <div><video poster="../resources/circles-landscape.png"></video></div>
+ <div><video poster="../resources/circles-landscape.png"></video></div>
+ <div><video poster="../resources/circles-landscape.png"></video></div>
+ <div><video poster="../resources/circles-landscape.png"></video></div>
+ </div>
+
+ </body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcssobjectpositionobjectpositionvideoposterhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/object-position/object-position-video-poster.html (0 => 197618)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/object-position/object-position-video-poster.html (rev 0)
+++ trunk/LayoutTests/fast/css/object-position/object-position-video-poster.html 2016-03-06 00:01:17 UTC (rev 197618)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+<!DOCTYPE html>
+
+<html>
+<head>
+ <link rel="stylesheet" href="resources/test.css">
+</head>
+<body>
+ <div class="group">
+ <video poster="../resources/circles-landscape.png"></video>
+ <video poster="../resources/circles-landscape.png"></video>
+ <video poster="../resources/circles-landscape.png"></video>
+ <video poster="../resources/circles-landscape.png"></video>
+ <video poster="../resources/circles-landscape.png"></video>
+ </div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcssobjectpositionresourcesexpectedcss"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/object-position/resources/expected.css (0 => 197618)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/object-position/resources/expected.css (rev 0)
+++ trunk/LayoutTests/fast/css/object-position/resources/expected.css 2016-03-06 00:01:17 UTC (rev 197618)
</span><span class="lines">@@ -0,0 +1,19 @@
</span><ins>+.group > div {
+ display: inline-block;
+ overflow: hidden;
+ width: 100px;
+ height: 100px;
+ margin: 2px 10px;
+ border: 1px solid black;
+ background-color: gray;
+}
+
+.group img, .group canvas, .group video {
+ height: 100%; width: 100%;
+ display: block;
+}
+.group > *:nth-child(1) * { }
+.group > *:nth-child(2) * { margin-left: 20px; margin-top: 10px; }
+.group > *:nth-child(3) * { }
+.group > *:nth-child(4) * { margin-left: -10px; margin-top: -10px; }
+.group > *:nth-child(5) * { }
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcssobjectpositionresourcestestcss"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/object-position/resources/test.css (0 => 197618)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/object-position/resources/test.css (rev 0)
+++ trunk/LayoutTests/fast/css/object-position/resources/test.css 2016-03-06 00:01:17 UTC (rev 197618)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+
+img, embed, object, input, canvas, video {
+ width: 100px;
+ height: 100px;
+ margin: 2px 10px;
+ border: 1px solid black;
+ background-color: gray;
+}
+
+.group { object-fit: contain; }
+.group > *:nth-child(1) { object-position: center center; }
+.group > *:nth-child(2) { object-position: 20px 10px; }
+.group > *:nth-child(3) { object-position: 50% 25%; }
+.group > *:nth-child(4) { object-position: bottom 10px right 10px; }
+.group > *:nth-child(5) { object-position: bottom 10% right 30%; }
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (197617 => 197618)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-03-05 23:23:40 UTC (rev 197617)
+++ trunk/Source/WebCore/ChangeLog 2016-03-06 00:01:17 UTC (rev 197618)
</span><span class="lines">@@ -1,5 +1,34 @@
</span><span class="cx"> 2016-03-05 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><ins>+ Add support for the object-position CSS property
+ https://bugs.webkit.org/show_bug.cgi?id=122811
+ rdar://problem/15836338
+
+ Reviewed by Sam Weinig.
+
+ Take object-position into account when rendering replaced elements.
+ RenderReplaced::replacedContentRect() is the one place where we compute
+ the content rect for replaced elements.
+
+ Also return false from foregroundIsKnownToBeOpaqueInRect() if we have
+ any non-default object-position, as the foreground may no longer fill the box.
+
+ Tests: compositing/video/video-object-position.html
+ fast/css/object-position/object-position-canvas.html
+ fast/css/object-position/object-position-embed.html
+ fast/css/object-position/object-position-img-svg.html
+ fast/css/object-position/object-position-img.html
+ fast/css/object-position/object-position-input-image.html
+ fast/css/object-position/object-position-object.html
+ fast/css/object-position/object-position-video-poster.html
+
+ * rendering/RenderImage.cpp:
+ (WebCore::RenderImage::foregroundIsKnownToBeOpaqueInRect):
+ * rendering/RenderReplaced.cpp:
+ (WebCore::RenderReplaced::replacedContentRect):
+
+2016-03-05 Simon Fraser <simon.fraser@apple.com>
+
</ins><span class="cx"> Add parsing support for object-position
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=155065
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderImagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderImage.cpp (197617 => 197618)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderImage.cpp 2016-03-05 23:23:40 UTC (rev 197617)
+++ trunk/Source/WebCore/rendering/RenderImage.cpp 2016-03-06 00:01:17 UTC (rev 197618)
</span><span class="lines">@@ -584,6 +584,11 @@
</span><span class="cx"> ObjectFit objectFit = style().objectFit();
</span><span class="cx"> if (objectFit != ObjectFitFill && objectFit != ObjectFitCover)
</span><span class="cx"> return false;
</span><ins>+
+ LengthPoint objectPosition = style().objectPosition();
+ if (objectPosition != RenderStyle::initialObjectPosition())
+ return false;
+
</ins><span class="cx"> // Check for image with alpha.
</span><span class="cx"> return imageResource().cachedImage() && imageResource().cachedImage()->currentFrameKnownToBeOpaque(this);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderReplacedcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderReplaced.cpp (197617 => 197618)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderReplaced.cpp 2016-03-05 23:23:40 UTC (rev 197617)
+++ trunk/Source/WebCore/rendering/RenderReplaced.cpp 2016-03-06 00:01:17 UTC (rev 197618)
</span><span class="lines">@@ -338,8 +338,6 @@
</span><span class="cx"> return contentRect;
</span><span class="cx">
</span><span class="cx"> ObjectFit objectFit = style().objectFit();
</span><del>- if (objectFit == ObjectFitFill)
- return contentRect;
</del><span class="cx">
</span><span class="cx"> LayoutRect finalRect = contentRect;
</span><span class="cx"> switch (objectFit) {
</span><span class="lines">@@ -354,13 +352,14 @@
</span><span class="cx"> finalRect.setSize(intrinsicSize);
</span><span class="cx"> break;
</span><span class="cx"> case ObjectFitFill:
</span><del>- ASSERT_NOT_REACHED();
</del><ins>+ break;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- // FIXME: This is where object-position should be taken into account, but since it's not
- // implemented yet, assume the initial value of "50% 50%".
- LayoutUnit xOffset = (contentRect.width() - finalRect.width()) / 2;
- LayoutUnit yOffset = (contentRect.height() - finalRect.height()) / 2;
</del><ins>+ LengthPoint objectPosition = style().objectPosition();
+
+ LayoutUnit xOffset = minimumValueForLength(objectPosition.x(), contentRect.width() - finalRect.width());
+ LayoutUnit yOffset = minimumValueForLength(objectPosition.y(), contentRect.height() - finalRect.height());
+
</ins><span class="cx"> finalRect.move(xOffset, yOffset);
</span><span class="cx">
</span><span class="cx"> return finalRect;
</span></span></pre>
</div>
</div>
</body>
</html>