<!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>[200827] releases/WebKitGTK/webkit-2.12/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/200827">200827</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-05-13 03:01:07 -0700 (Fri, 13 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/199856">r199856</a> - RenderVideo should always update the intrinsic size before layout.
https://bugs.webkit.org/show_bug.cgi?id=156878
Reviewed by Simon Fraser.
In order to layout video element properly we need to know the correct intrinsic size.
This patch also asserts if we end up updating the intrinsic size right after finishing video renderer layout.
This issues was discovered as part of webkit.org/b/156245. (hence covered by existing tests)
* rendering/RenderVideo.cpp:
(WebCore::RenderVideo::updateIntrinsicSize):
(WebCore::RenderVideo::layout):
(WebCore::RenderVideo::updatePlayer):
* rendering/RenderVideo.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit212SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebCorerenderingRenderVideocpp">releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/RenderVideo.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebCorerenderingRenderVideoh">releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/RenderVideo.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit212SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog (200826 => 200827)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-05-13 09:57:43 UTC (rev 200826)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-05-13 10:01:07 UTC (rev 200827)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-04-21 Zalan Bujtas <zalan@apple.com>
+
+ RenderVideo should always update the intrinsic size before layout.
+ https://bugs.webkit.org/show_bug.cgi?id=156878
+
+ Reviewed by Simon Fraser.
+
+ In order to layout video element properly we need to know the correct intrinsic size.
+ This patch also asserts if we end up updating the intrinsic size right after finishing video renderer layout.
+
+ This issues was discovered as part of webkit.org/b/156245. (hence covered by existing tests)
+
+ * rendering/RenderVideo.cpp:
+ (WebCore::RenderVideo::updateIntrinsicSize):
+ (WebCore::RenderVideo::layout):
+ (WebCore::RenderVideo::updatePlayer):
+ * rendering/RenderVideo.h:
+
</ins><span class="cx"> 2016-04-21 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix crashes when loading SVG images.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebCorerenderingRenderVideocpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/RenderVideo.cpp (200826 => 200827)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/RenderVideo.cpp 2016-05-13 09:57:43 UTC (rev 200826)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/RenderVideo.cpp 2016-05-13 10:01:07 UTC (rev 200827)
</span><span class="lines">@@ -76,21 +76,22 @@
</span><span class="cx"> updateIntrinsicSize();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderVideo::updateIntrinsicSize()
</del><ins>+bool RenderVideo::updateIntrinsicSize()
</ins><span class="cx"> {
</span><span class="cx"> LayoutSize size = calculateIntrinsicSize();
</span><span class="cx"> size.scale(style().effectiveZoom());
</span><span class="cx">
</span><span class="cx"> // Never set the element size to zero when in a media document.
</span><span class="cx"> if (size.isEmpty() && document().isMediaDocument())
</span><del>- return;
</del><ins>+ return false;
</ins><span class="cx">
</span><span class="cx"> if (size == intrinsicSize())
</span><del>- return;
</del><ins>+ return false;
</ins><span class="cx">
</span><span class="cx"> setIntrinsicSize(size);
</span><span class="cx"> setPreferredLogicalWidthsDirty(true);
</span><span class="cx"> setNeedsLayout();
</span><ins>+ return true;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LayoutSize RenderVideo::calculateIntrinsicSize()
</span><span class="lines">@@ -199,6 +200,7 @@
</span><span class="cx"> void RenderVideo::layout()
</span><span class="cx"> {
</span><span class="cx"> StackStats::LayoutCheckPoint layoutCheckPoint;
</span><ins>+ updateIntrinsicSize();
</ins><span class="cx"> RenderMedia::layout();
</span><span class="cx"> updatePlayer();
</span><span class="cx"> }
</span><span class="lines">@@ -219,7 +221,9 @@
</span><span class="cx"> if (documentBeingDestroyed())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- updateIntrinsicSize();
</del><ins>+ bool intrinsicSizeChanged;
+ intrinsicSizeChanged = updateIntrinsicSize();
+ ASSERT_UNUSED(intrinsicSizeChanged, !intrinsicSizeChanged || !view().frameView().isInRenderTreeLayout());
</ins><span class="cx">
</span><span class="cx"> MediaPlayer* mediaPlayer = videoElement().player();
</span><span class="cx"> if (!mediaPlayer)
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebCorerenderingRenderVideoh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/RenderVideo.h (200826 => 200827)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/RenderVideo.h 2016-05-13 09:57:43 UTC (rev 200826)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/RenderVideo.h 2016-05-13 10:01:07 UTC (rev 200827)
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx">
</span><span class="cx"> virtual void intrinsicSizeChanged() override;
</span><span class="cx"> LayoutSize calculateIntrinsicSize();
</span><del>- void updateIntrinsicSize();
</del><ins>+ bool updateIntrinsicSize();
</ins><span class="cx">
</span><span class="cx"> virtual void imageChanged(WrappedImagePtr, const IntRect*) override;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>