Changeset 167780 in webkit

Timestamp:

Apr 24, 2014, 3:48:32 PM (12 years ago)

Author:

jer.noble@apple.com

Message:

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

Patch by Commit Queue <​commit-queue@webkit.org> on 2014-04-24

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fullscreen/full-screen-no-style-sharing-expected.txt (modified) (1 diff)
• LayoutTests/fullscreen/video-cursor-auto-hide.html (modified) (2 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/Document.cpp (modified) (2 diffs)
• Source/WebCore/rendering/RenderFullScreen.cpp (modified) (7 diffs)
• Source/WebCore/rendering/RenderFullScreen.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+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
+
 2014-04-24  Zalan Bujtas  <zalan@apple.com>
 

trunk/LayoutTests/fullscreen/full-screen-no-style-sharing-expected.txt

@@ -1 @@
-  
+ 
 EVENT(webkitfullscreenchange) TEST(video2.clientWidth==document.body.clientWidth) OK
 END OF TEST

trunk/LayoutTests/fullscreen/video-cursor-auto-hide.html

@@ -7 +7 @@
     <script>
         var wrapper = document.getElementById('wrapper');
-        var video = document.getElementById('video');
 
         function checkForHiddenMouse()
@@ -19 +18 @@
             if (window.internals) {
                 internals.settings.setTimeWithoutMouseMovementBeforeHidingControls(0);
-                videoBox = internals.boundingBox(video);
-                eventSender.mouseMoveTo(videoBox.left + videoBox.width / 2, videoBox.top + videoBox.height / 2);
+                wrapperBox = internals.boundingBox(wrapper);
+                eventSender.mouseMoveTo(wrapperBox.left + wrapperBox.width / 2, wrapperBox.top + wrapperBox.height / 2);
                 testExpected('window.internals.getCurrentCursorInfo()', 'type=Pointer hotSpot=0,0');
                 setTimeout(checkForHiddenMouse, 0);

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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
+
 2014-04-24  Adenilson Cavalcanti  <cavalcantii@gmail.com>
 

trunk/Source/WebCore/dom/Document.cpp

@@ -5364 +5364 @@
     }
 
+    if (m_fullScreenElement != documentElement())
+        RenderFullScreen::wrapRenderer(renderer, renderer ? renderer->parent() : nullptr, *this);
+
     m_fullScreenElement->setContainsFullScreenElementOnAncestorsCrossingFrameBoundaries(true);
     
@@ -5428 +5431 @@
 
     if (renderer && m_savedPlaceholderRenderStyle) 
-        renderer->setPlaceholderStyle(m_savedPlaceholderRenderStyle.releaseNonNull(), m_savedPlaceholderFrameRect);
+        renderer->createPlaceholder(m_savedPlaceholderRenderStyle.releaseNonNull(), m_savedPlaceholderFrameRect);
     else if (renderer && m_fullScreenRenderer && m_fullScreenRenderer->placeholder()) {
         RenderBlock* placeholder = m_fullScreenRenderer->placeholder();
-        renderer->setPlaceholderStyle(RenderStyle::clone(&placeholder->style()), placeholder->frameRect());
+        renderer->createPlaceholder(RenderStyle::clone(&placeholder->style()), placeholder->frameRect());
     }
 

trunk/Source/WebCore/rendering/RenderFullScreen.cpp

@@ -32 +32 @@
 #include "RenderLayer.h"
 #include "RenderLayerCompositor.h"
-#include "RenderView.h"
 
 namespace WebCore {
@@ -52 +51 @@
 void RenderFullScreenPlaceholder::willBeDestroyed()
 {
-    m_owner.clearPlaceholder();
+    m_owner.setPlaceholder(0);
     RenderBlockFlow::willBeDestroyed();
 }
@@ -106 +105 @@
 }
 
-RenderElement* RenderFullScreen::wrapRenderer(RenderObject* object, RenderElement* parent, Document& document)
+RenderFullScreen* RenderFullScreen::wrapRenderer(RenderObject* object, RenderElement* parent, Document& document)
 {
     RenderFullScreen* fullscreenRenderer = new RenderFullScreen(document, createFullScreenStyle());
@@ -120 +119 @@
             RenderBlock* containingBlock = object->containingBlock();
             ASSERT(containingBlock);
-
             // Since we are moving the |object| to a new parent |fullscreenRenderer|,
             // the line box tree underneath our |containingBlock| is not longer valid.
             containingBlock->deleteLines();
 
-            parent->addChild(fullscreenRenderer->ensurePlaceholder(), object);
+            parent->addChild(fullscreenRenderer, object);
             object->removeFromParent();
             
@@ -134 +132 @@
             containingBlock->setNeedsLayoutAndPrefWidthsRecalc();
         }
-
-        object->view().addChild(fullscreenRenderer);
         fullscreenRenderer->addChild(object);
+        fullscreenRenderer->setNeedsLayoutAndPrefWidthsRecalc();
     }
     document.setFullScreenRenderer(fullscreenRenderer);
-    return fullscreenRenderer->ensurePlaceholder();
+    return fullscreenRenderer;
 }
 
 void RenderFullScreen::unwrapRenderer()
 {
-    if (placeholder() && placeholder()->parent()) {
+    if (parent()) {
         RenderObject* child;
         while ((child = firstChild())) {
@@ -153 +150 @@
                 toRenderBox(child)->clearOverrideSize();
             child->removeFromParent();
-            placeholder()->parent()->addChild(child, m_placeholder);
+            parent()->addChild(child, this);
+            parent()->setNeedsLayoutAndPrefWidthsRecalc();
         }
-
+    }
+    if (placeholder())
         placeholder()->removeFromParent();
-    }
     removeFromParent();
     document().setFullScreenRenderer(0);
 }
 
-void RenderFullScreen::clearPlaceholder()
+void RenderFullScreen::setPlaceholder(RenderBlock* placeholder)
 {
-    m_placeholder = nullptr;
+    m_placeholder = placeholder;
 }
 
-RenderBlock* RenderFullScreen::ensurePlaceholder()
-{
-    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)
+void RenderFullScreen::createPlaceholder(PassRef<RenderStyle> style, const LayoutRect& frameRect)
 {
     if (style.get().width().isAuto())
@@ -184 +172 @@
         style.get().setHeight(Length(frameRect.height(), Fixed));
 
-    ensurePlaceholder()->setStyle(std::move(style));
+    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();
+    }
 }
 

trunk/Source/WebCore/rendering/RenderFullScreen.h

@@ -40 +40 @@
     virtual const char* renderName() const override { return "RenderFullScreen"; }
 
-    void clearPlaceholder();
-    RenderBlock* ensurePlaceholder();
+    void setPlaceholder(RenderBlock*);
     RenderBlock* placeholder() { return m_placeholder; }
-    void setPlaceholderStyle(PassRef<RenderStyle>, const LayoutRect& frameRect);
+    void createPlaceholder(PassRef<RenderStyle>, const LayoutRect& frameRect);
 
-    static RenderElement* wrapRenderer(RenderObject*, RenderElement*, Document&);
+    static RenderFullScreen* wrapRenderer(RenderObject*, RenderElement*, Document&);
     void unwrapRenderer();