<!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>[167780] 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/167780">167780</a></dd>
<dt>Author</dt> <dd>jer.noble@apple.com</dd>
<dt>Date</dt> <dd>2014-04-24 15:48:32 -0700 (Thu, 24 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/167441">r167441</a>.
https://bugs.webkit.org/show_bug.cgi?id=132152
Caused full screen regressions on vimeo, youtube, and others.
(Requested by jernoble on #webkit).
Reverted changeset:
"Fullscreen media controls are unusable in pagination mode"
https://bugs.webkit.org/show_bug.cgi?id=131705
http://trac.webkit.org/changeset/167441
Patch by Commit Queue <commit-queue@webkit.org> on 2014-04-24</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfullscreenfullscreennostylesharingexpectedtxt">trunk/LayoutTests/fullscreen/full-screen-no-style-sharing-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfullscreenvideocursorautohidehtml">trunk/LayoutTests/fullscreen/video-cursor-auto-hide.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderFullScreencpp">trunk/Source/WebCore/rendering/RenderFullScreen.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderFullScreenh">trunk/Source/WebCore/rendering/RenderFullScreen.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (167779 => 167780)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-04-24 22:29:16 UTC (rev 167779)
+++ trunk/LayoutTests/ChangeLog 2014-04-24 22:48:32 UTC (rev 167780)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-04-24 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r167441.
+ https://bugs.webkit.org/show_bug.cgi?id=132152
+
+ Caused full screen regressions on vimeo, youtube, and others.
+ (Requested by jernoble on #webkit).
+
+ Reverted changeset:
+
+ "Fullscreen media controls are unusable in pagination mode"
+ https://bugs.webkit.org/show_bug.cgi?id=131705
+ http://trac.webkit.org/changeset/167441
+
</ins><span class="cx"> 2014-04-24 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Subpixel rendering: Clipping on text areas when shifted by one device pixel.
</span></span></pre></div>
<a id="trunkLayoutTestsfullscreenfullscreennostylesharingexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fullscreen/full-screen-no-style-sharing-expected.txt (167779 => 167780)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fullscreen/full-screen-no-style-sharing-expected.txt 2014-04-24 22:29:16 UTC (rev 167779)
+++ trunk/LayoutTests/fullscreen/full-screen-no-style-sharing-expected.txt 2014-04-24 22:48:32 UTC (rev 167780)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-
</del><ins>+
</ins><span class="cx"> EVENT(webkitfullscreenchange) TEST(video2.clientWidth==document.body.clientWidth) OK
</span><span class="cx"> END OF TEST
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfullscreenvideocursorautohidehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fullscreen/video-cursor-auto-hide.html (167779 => 167780)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fullscreen/video-cursor-auto-hide.html 2014-04-24 22:29:16 UTC (rev 167779)
+++ trunk/LayoutTests/fullscreen/video-cursor-auto-hide.html 2014-04-24 22:48:32 UTC (rev 167780)
</span><span class="lines">@@ -6,7 +6,6 @@
</span><span class="cx"> <script src="full-screen-test.js"></script>
</span><span class="cx"> <script>
</span><span class="cx"> var wrapper = document.getElementById('wrapper');
</span><del>- var video = document.getElementById('video');
</del><span class="cx">
</span><span class="cx"> function checkForHiddenMouse()
</span><span class="cx"> {
</span><span class="lines">@@ -18,8 +17,8 @@
</span><span class="cx"> {
</span><span class="cx"> if (window.internals) {
</span><span class="cx"> internals.settings.setTimeWithoutMouseMovementBeforeHidingControls(0);
</span><del>- videoBox = internals.boundingBox(video);
- eventSender.mouseMoveTo(videoBox.left + videoBox.width / 2, videoBox.top + videoBox.height / 2);
</del><ins>+ wrapperBox = internals.boundingBox(wrapper);
+ eventSender.mouseMoveTo(wrapperBox.left + wrapperBox.width / 2, wrapperBox.top + wrapperBox.height / 2);
</ins><span class="cx"> testExpected('window.internals.getCurrentCursorInfo()', 'type=Pointer hotSpot=0,0');
</span><span class="cx"> setTimeout(checkForHiddenMouse, 0);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (167779 => 167780)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-24 22:29:16 UTC (rev 167779)
+++ trunk/Source/WebCore/ChangeLog 2014-04-24 22:48:32 UTC (rev 167780)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-04-24 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r167441.
+ https://bugs.webkit.org/show_bug.cgi?id=132152
+
+ Caused full screen regressions on vimeo, youtube, and others.
+ (Requested by jernoble on #webkit).
+
+ Reverted changeset:
+
+ "Fullscreen media controls are unusable in pagination mode"
+ https://bugs.webkit.org/show_bug.cgi?id=131705
+ http://trac.webkit.org/changeset/167441
+
</ins><span class="cx"> 2014-04-24 Adenilson Cavalcanti <cavalcantii@gmail.com>
</span><span class="cx">
</span><span class="cx"> Unused class forward declarations in Page
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (167779 => 167780)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2014-04-24 22:29:16 UTC (rev 167779)
+++ trunk/Source/WebCore/dom/Document.cpp 2014-04-24 22:48:32 UTC (rev 167780)
</span><span class="lines">@@ -5363,6 +5363,9 @@
</span><span class="cx"> m_savedPlaceholderRenderStyle = RenderStyle::clone(&renderer->style());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (m_fullScreenElement != documentElement())
+ RenderFullScreen::wrapRenderer(renderer, renderer ? renderer->parent() : nullptr, *this);
+
</ins><span class="cx"> m_fullScreenElement->setContainsFullScreenElementOnAncestorsCrossingFrameBoundaries(true);
</span><span class="cx">
</span><span class="cx"> recalcStyle(Style::Force);
</span><span class="lines">@@ -5427,10 +5430,10 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (renderer && m_savedPlaceholderRenderStyle)
</span><del>- renderer->setPlaceholderStyle(m_savedPlaceholderRenderStyle.releaseNonNull(), m_savedPlaceholderFrameRect);
</del><ins>+ renderer->createPlaceholder(m_savedPlaceholderRenderStyle.releaseNonNull(), m_savedPlaceholderFrameRect);
</ins><span class="cx"> else if (renderer && m_fullScreenRenderer && m_fullScreenRenderer->placeholder()) {
</span><span class="cx"> RenderBlock* placeholder = m_fullScreenRenderer->placeholder();
</span><del>- renderer->setPlaceholderStyle(RenderStyle::clone(&placeholder->style()), placeholder->frameRect());
</del><ins>+ renderer->createPlaceholder(RenderStyle::clone(&placeholder->style()), placeholder->frameRect());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_fullScreenRenderer)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderFullScreencpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderFullScreen.cpp (167779 => 167780)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderFullScreen.cpp 2014-04-24 22:29:16 UTC (rev 167779)
+++ trunk/Source/WebCore/rendering/RenderFullScreen.cpp 2014-04-24 22:48:32 UTC (rev 167780)
</span><span class="lines">@@ -31,7 +31,6 @@
</span><span class="cx"> #include "RenderBlockFlow.h"
</span><span class="cx"> #include "RenderLayer.h"
</span><span class="cx"> #include "RenderLayerCompositor.h"
</span><del>-#include "RenderView.h"
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -51,7 +50,7 @@
</span><span class="cx">
</span><span class="cx"> void RenderFullScreenPlaceholder::willBeDestroyed()
</span><span class="cx"> {
</span><del>- m_owner.clearPlaceholder();
</del><ins>+ m_owner.setPlaceholder(0);
</ins><span class="cx"> RenderBlockFlow::willBeDestroyed();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -105,7 +104,7 @@
</span><span class="cx"> return fullscreenStyle;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RenderElement* RenderFullScreen::wrapRenderer(RenderObject* object, RenderElement* parent, Document& document)
</del><ins>+RenderFullScreen* RenderFullScreen::wrapRenderer(RenderObject* object, RenderElement* parent, Document& document)
</ins><span class="cx"> {
</span><span class="cx"> RenderFullScreen* fullscreenRenderer = new RenderFullScreen(document, createFullScreenStyle());
</span><span class="cx"> fullscreenRenderer->initializeStyle();
</span><span class="lines">@@ -119,12 +118,11 @@
</span><span class="cx"> if (RenderElement* parent = object->parent()) {
</span><span class="cx"> RenderBlock* containingBlock = object->containingBlock();
</span><span class="cx"> ASSERT(containingBlock);
</span><del>-
</del><span class="cx"> // Since we are moving the |object| to a new parent |fullscreenRenderer|,
</span><span class="cx"> // the line box tree underneath our |containingBlock| is not longer valid.
</span><span class="cx"> containingBlock->deleteLines();
</span><span class="cx">
</span><del>- parent->addChild(fullscreenRenderer->ensurePlaceholder(), object);
</del><ins>+ parent->addChild(fullscreenRenderer, object);
</ins><span class="cx"> object->removeFromParent();
</span><span class="cx">
</span><span class="cx"> // Always just do a full layout to ensure that line boxes get deleted properly.
</span><span class="lines">@@ -133,17 +131,16 @@
</span><span class="cx"> parent->setNeedsLayoutAndPrefWidthsRecalc();
</span><span class="cx"> containingBlock->setNeedsLayoutAndPrefWidthsRecalc();
</span><span class="cx"> }
</span><del>-
- object->view().addChild(fullscreenRenderer);
</del><span class="cx"> fullscreenRenderer->addChild(object);
</span><ins>+ fullscreenRenderer->setNeedsLayoutAndPrefWidthsRecalc();
</ins><span class="cx"> }
</span><span class="cx"> document.setFullScreenRenderer(fullscreenRenderer);
</span><del>- return fullscreenRenderer->ensurePlaceholder();
</del><ins>+ return fullscreenRenderer;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderFullScreen::unwrapRenderer()
</span><span class="cx"> {
</span><del>- if (placeholder() && placeholder()->parent()) {
</del><ins>+ if (parent()) {
</ins><span class="cx"> RenderObject* child;
</span><span class="cx"> while ((child = firstChild())) {
</span><span class="cx"> // We have to clear the override size, because as a flexbox, we
</span><span class="lines">@@ -152,38 +149,39 @@
</span><span class="cx"> if (child->isBox())
</span><span class="cx"> toRenderBox(child)->clearOverrideSize();
</span><span class="cx"> child->removeFromParent();
</span><del>- placeholder()->parent()->addChild(child, m_placeholder);
</del><ins>+ parent()->addChild(child, this);
+ parent()->setNeedsLayoutAndPrefWidthsRecalc();
</ins><span class="cx"> }
</span><del>-
- placeholder()->removeFromParent();
</del><span class="cx"> }
</span><ins>+ if (placeholder())
+ placeholder()->removeFromParent();
</ins><span class="cx"> removeFromParent();
</span><span class="cx"> document().setFullScreenRenderer(0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderFullScreen::clearPlaceholder()
</del><ins>+void RenderFullScreen::setPlaceholder(RenderBlock* placeholder)
</ins><span class="cx"> {
</span><del>- m_placeholder = nullptr;
</del><ins>+ m_placeholder = placeholder;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-RenderBlock* RenderFullScreen::ensurePlaceholder()
</del><ins>+void RenderFullScreen::createPlaceholder(PassRef<RenderStyle> style, const LayoutRect& frameRect)
</ins><span class="cx"> {
</span><del>- if (m_placeholder)
- return m_placeholder;
-
- m_placeholder = new RenderFullScreenPlaceholder(*this, RenderStyle::create());
- m_placeholder->initializeStyle();
- return m_placeholder;
-}
-
-void RenderFullScreen::setPlaceholderStyle(PassRef<RenderStyle> style, const LayoutRect& frameRect)
-{
</del><span class="cx"> if (style.get().width().isAuto())
</span><span class="cx"> style.get().setWidth(Length(frameRect.width(), Fixed));
</span><span class="cx"> if (style.get().height().isAuto())
</span><span class="cx"> style.get().setHeight(Length(frameRect.height(), Fixed));
</span><span class="cx">
</span><del>- ensurePlaceholder()->setStyle(std::move(style));
</del><ins>+ if (m_placeholder) {
+ m_placeholder->setStyle(std::move(style));
+ return;
+ }
+
+ m_placeholder = new RenderFullScreenPlaceholder(*this, std::move(style));
+ m_placeholder->initializeStyle();
+ if (parent()) {
+ parent()->addChild(m_placeholder, this);
+ parent()->setNeedsLayoutAndPrefWidthsRecalc();
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderFullScreenh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderFullScreen.h (167779 => 167780)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderFullScreen.h 2014-04-24 22:29:16 UTC (rev 167779)
+++ trunk/Source/WebCore/rendering/RenderFullScreen.h 2014-04-24 22:48:32 UTC (rev 167780)
</span><span class="lines">@@ -39,12 +39,11 @@
</span><span class="cx"> virtual bool isRenderFullScreen() const override { return true; }
</span><span class="cx"> virtual const char* renderName() const override { return "RenderFullScreen"; }
</span><span class="cx">
</span><del>- void clearPlaceholder();
- RenderBlock* ensurePlaceholder();
</del><ins>+ void setPlaceholder(RenderBlock*);
</ins><span class="cx"> RenderBlock* placeholder() { return m_placeholder; }
</span><del>- void setPlaceholderStyle(PassRef<RenderStyle>, const LayoutRect& frameRect);
</del><ins>+ void createPlaceholder(PassRef<RenderStyle>, const LayoutRect& frameRect);
</ins><span class="cx">
</span><del>- static RenderElement* wrapRenderer(RenderObject*, RenderElement*, Document&);
</del><ins>+ static RenderFullScreen* wrapRenderer(RenderObject*, RenderElement*, Document&);
</ins><span class="cx"> void unwrapRenderer();
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre>
</div>
</div>
</body>
</html>