Retry "Replace RenderFullScreen with top layer"

Source/core/dom/FullscreenElementStack.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  *           (C) 2006 Alexey Proskuryakov (ap@webkit.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
@@ skipping 19 matching lines @@
 
 #include "HTMLNames.h"
 #include "core/dom/Document.h"
 #include "core/events/Event.h"
 #include "core/frame/Frame.h"
 #include "core/frame/FrameHost.h"
 #include "core/frame/Settings.h"
 #include "core/html/HTMLFrameOwnerElement.h"
 #include "core/page/Chrome.h"
 #include "core/page/ChromeClient.h"
-#include "core/rendering/RenderFullScreen.h"
 #include "platform/UserGestureIndicator.h"
 
 namespace WebCore {
 
 using namespace HTMLNames;
 
 static bool isAttributeOnAllOwners(const WebCore::QualifiedName& attribute, const WebCore::QualifiedName& prefixedAttribute, const HTMLFrameOwnerElement* owner)
 {
     if (!owner)
         return true;
@@ skipping 42 matching lines @@
 bool FullscreenElementStack::isFullScreen(Document* document)
 {
     if (FullscreenElementStack* found = fromIfExists(document))
         return found->webkitIsFullScreen();
     return false;
 }
 
 FullscreenElementStack::FullscreenElementStack(Document* document)
     : DocumentLifecycleObserver(document)
     , m_areKeysEnabledInFullScreen(false)
-    , m_fullScreenRenderer(0)
     , m_fullScreenChangeDelayTimer(this, &FullscreenElementStack::fullScreenChangeDelayTimerFired)
 {
     document->setHasFullscreenElementStack();
 }
 
 FullscreenElementStack::~FullscreenElementStack()
 {
 }
 
 inline Document* FullscreenElementStack::document()
 {
     return lifecycleContext();
 }
 
 void FullscreenElementStack::documentWasDetached()
 {
     m_fullScreenChangeEventTargetQueue.clear();
     m_fullScreenErrorEventTargetQueue.clear();
-
-    if (m_fullScreenRenderer)
-        setFullScreenRenderer(0);
 }
 
 void FullscreenElementStack::documentWasDisposed()
 {
     m_fullScreenElement = 0;
     m_fullScreenElementStack.clear();
 }
 
 bool FullscreenElementStack::fullScreenIsAllowedForElement(Element* element) const
 {
@@ skipping 122 matching lines @@
     // "To fully exit fullscreen act as if the exitFullscreen() method was invoked on the top-level browsing
     // context's document and subsequently empty that document's fullscreen element stack."
     if (!fullscreenElementFrom(document()->topDocument()))
         return;
 
     // To achieve that aim, remove all the elements from the top document's stack except for the first before
     // calling webkitExitFullscreen():
     Vector<RefPtr<Element> > replacementFullscreenElementStack;
     replacementFullscreenElementStack.append(fullscreenElementFrom(document()->topDocument()));
     FullscreenElementStack* topFullscreenElementStack = from(document()->topDocument());
+    // FIXME: This will remove a modal full screen dialog from the top layer.
+    // We shouldn't have separate vectors for full screen element stack and top layer. http://crbug.com/336704
+    Vector<RefPtr<Element> >::iterator end = topFullscreenElementStack->m_fullScreenElementStack.end();
+    for (Vector<RefPtr<Element> >::iterator it = topFullscreenElementStack->m_fullScreenElementStack.begin(); it + 1 < end; ++it) {
+        topFullscreenElementStack->document()->removeFromTopLayer(it->get());
+    }
     topFullscreenElementStack->m_fullScreenElementStack.swap(replacementFullscreenElementStack);
     topFullscreenElementStack->webkitExitFullscreen();
 }
 
 void FullscreenElementStack::webkitExitFullscreen()
 {
     // The exitFullscreen() method must run these steps:
 
     // 1. Let doc be the context object. (i.e. "this")
     Document* currentDoc = document();
@@ skipping 80 matching lines @@
 
 void FullscreenElementStack::webkitWillEnterFullScreenForElement(Element* element)
 {
     ASSERT(element);
     if (!document()->isActive())
         return;
 
     ASSERT(document()->settings()); // If we're active we must have settings.
     ASSERT(document()->settings()->fullScreenEnabled());
 
-    if (m_fullScreenRenderer)
-        m_fullScreenRenderer->unwrapRenderer();
-
     m_fullScreenElement = element;
-
-    // Create a placeholder block for a the full-screen element, to keep the page from reflowing
-    // when the element is removed from the normal flow. Only do this for a RenderBox, as only
-    // a box will have a frameRect. The placeholder will be created in setFullScreenRenderer()
-    // during layout.
-    RenderObject* renderer = m_fullScreenElement->renderer();
-    bool shouldCreatePlaceholder = renderer && renderer->isBox();
-    if (shouldCreatePlaceholder) {
-        m_savedPlaceholderFrameRect = toRenderBox(renderer)->frameRect();
-        m_savedPlaceholderRenderStyle = RenderStyle::clone(renderer->style());
-    }
-
-    if (m_fullScreenElement != document()->documentElement())
-        RenderFullScreen::wrapRenderer(renderer, renderer ? renderer->parent() : 0, document());
-
+    document()->addToTopLayer(element);
     m_fullScreenElement->setContainsFullScreenElementOnAncestorsCrossingFrameBoundaries(true);
 
     document()->recalcStyle(Force);
 }
 
 void FullscreenElementStack::webkitDidEnterFullScreenForElement(Element*)
 {
     if (!m_fullScreenElement)
         return;
 
     if (!document()->isActive())
         return;
 
     m_fullScreenElement->didBecomeFullscreenElement();
 
     m_fullScreenChangeDelayTimer.startOneShot(0);
 }
 
 void FullscreenElementStack::webkitWillExitFullScreenForElement(Element*)
 {
     if (!m_fullScreenElement)
         return;
 
     if (!document()->isActive())
         return;
 
+    document()->removeFromTopLayer(m_fullScreenElement.get());
     m_fullScreenElement->willStopBeingFullscreenElement();
 }
 
 void FullscreenElementStack::webkitDidExitFullScreenForElement(Element*)
 {
     if (!m_fullScreenElement)
         return;
 
     if (!document()->isActive())
         return;
 
     m_fullScreenElement->setContainsFullScreenElementOnAncestorsCrossingFrameBoundaries(false);
 
     m_areKeysEnabledInFullScreen = false;
 
-    if (m_fullScreenRenderer)
-        m_fullScreenRenderer->unwrapRenderer();
-
     m_fullScreenElement = 0;
     document()->setNeedsStyleRecalc();
 
     // When webkitCancelFullScreen is called, we call webkitExitFullScreen on the topDocument(). That
     // means that the events will be queued there. So if we have no events here, start the timer on
     // the exiting document.
     Document* exitingDocument = document();
     if (m_fullScreenChangeEventTargetQueue.isEmpty() && m_fullScreenErrorEventTargetQueue.isEmpty())
         exitingDocument = document()->topDocument();
     from(exitingDocument)->m_fullScreenChangeDelayTimer.startOneShot(0);
 }
 
-void FullscreenElementStack::setFullScreenRenderer(RenderFullScreen* renderer)
-{
-    if (renderer == m_fullScreenRenderer)
-        return;
-
-    if (renderer && m_savedPlaceholderRenderStyle) {
-        renderer->createPlaceholder(m_savedPlaceholderRenderStyle.release(), m_savedPlaceholderFrameRect);
-    } else if (renderer && m_fullScreenRenderer && m_fullScreenRenderer->placeholder()) {
-        RenderBlock* placeholder = m_fullScreenRenderer->placeholder();
-        renderer->createPlaceholder(RenderStyle::clone(placeholder->style()), placeholder->frameRect());
-    }
-
-    if (m_fullScreenRenderer)
-        m_fullScreenRenderer->destroy();
-    ASSERT(!m_fullScreenRenderer);
-
-    m_fullScreenRenderer = renderer;
-}
-
-void FullscreenElementStack::fullScreenRendererDestroyed()
-{
-    m_fullScreenRenderer = 0;
-}
-
 void FullscreenElementStack::fullScreenChangeDelayTimerFired(Timer<FullscreenElementStack>*)
 {
     // Since we dispatch events in this function, it's possible that the
     // document will be detached and GC'd. We protect it here to make sure we
     // can finish the function successfully.
     RefPtr<Document> protectDocument(document());
     Deque<RefPtr<Node> > changeQueue;
     m_fullScreenChangeEventTargetQueue.swap(changeQueue);
     Deque<RefPtr<Node> > errorQueue;
     m_fullScreenErrorEventTargetQueue.swap(errorQueue);
@@ skipping 51 matching lines @@
         elementInSubtree = m_fullScreenElement->isDescendantOf(node);
     else
         elementInSubtree = (m_fullScreenElement == node) || m_fullScreenElement->isDescendantOf(node);
 
     if (elementInSubtree)
         fullScreenElementRemoved();
 }
 
 void FullscreenElementStack::clearFullscreenElementStack()
 {
+    Vector<RefPtr<Element> >::iterator end = m_fullScreenElementStack.end();
+    for (Vector<RefPtr<Element> >::iterator iter = m_fullScreenElementStack.begin(); iter != end; ++iter)
+        document()->removeFromTopLayer(iter->get());
     m_fullScreenElementStack.clear();
 }
 
 void FullscreenElementStack::popFullscreenElementStack()
 {
     if (m_fullScreenElementStack.isEmpty())
         return;
 
+    RefPtr<Element> element = m_fullScreenElementStack.last();
     m_fullScreenElementStack.removeLast();
+    document()->removeFromTopLayer(element.get());
 }
 
 void FullscreenElementStack::pushFullscreenElementStack(Element* element)
 {
+    document()->addToTopLayer(element);
     m_fullScreenElementStack.append(element);
 }
 
 void FullscreenElementStack::addDocumentToFullScreenChangeEventQueue(Document* doc)
 {
     ASSERT(doc);
 
     Node* target = 0;
     if (FullscreenElementStack* fullscreen = fromIfExists(doc)) {
         target = fullscreen->webkitFullscreenElement();
         if (!target)
             target = fullscreen->webkitCurrentFullScreenElement();
     }
 
     if (!target)
         target = doc;
     m_fullScreenChangeEventTargetQueue.append(target);
 }
 
 } // namespace WebCore