Changeset 95371 in webkit

Timestamp:

Sep 16, 2011 11:07:42 PM (13 years ago)

Author:

koz@chromium.org

Message:

Don't detach elements from the render tree when entering fullscreen mode
​https://bugs.webkit.org/show_bug.cgi?id=66531

Source/WebCore:

This prevents plugin instances from being destroyed and reinstantiated
when entering fullscreen mode.

Reviewed by James Robinson.

Test: plugins/fullscreen-plugins-dont-reload.html

• dom/Document.cpp:

(WebCore::Document::webkitWillEnterFullScreenForElement):
(WebCore::Document::webkitDidExitFullScreenForElement):

• dom/NodeRenderingContext.cpp:

(WebCore::NodeRendererFactory::createRendererIfNeeded):

• rendering/RenderFullScreen.cpp:

(createFullScreenStyle):
(RenderFullScreen::wrapRenderer):
(RenderFullScreen::unwrapRenderer):

• rendering/RenderFullScreen.h:

LayoutTests:

Test that the plugin is not reloaded when entering fullscreen.

Reviewed by James Robinson.

• plugins/fullscreen-plugins-dont-reload-expected.txt: Added.
• plugins/fullscreen-plugins-dont-reload.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/plugins/fullscreen-plugins-dont-reload-expected.txt (added)
• LayoutTests/plugins/fullscreen-plugins-dont-reload.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/Document.cpp (modified) (3 diffs)
• Source/WebCore/dom/NodeRenderingContext.cpp (modified) (2 diffs)
• Source/WebCore/rendering/RenderFullScreen.cpp (modified) (2 diffs)
• Source/WebCore/rendering/RenderFullScreen.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-09-16  Jeremy Apthorp <jeremya@chromium.org> and James Kozianski  <koz@chromium.org>
+
+        Don't detach elements from the render tree when entering fullscreen mode
+        https://bugs.webkit.org/show_bug.cgi?id=66531
+
+        Test that the plugin is not reloaded when entering fullscreen.
+
+        Reviewed by James Robinson.
+
+        * plugins/fullscreen-plugins-dont-reload-expected.txt: Added.
+        * plugins/fullscreen-plugins-dont-reload.html: Added.
+
 2011-09-16  Jochen Eisinger  <jochen@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-09-16  Jeremy Apthorp <jeremya@chromium.org> and James Kozianski  <koz@chromium.org>
+
+        Don't detach elements from the render tree when entering fullscreen mode
+        https://bugs.webkit.org/show_bug.cgi?id=66531
+
+        This prevents plugin instances from being destroyed and reinstantiated
+        when entering fullscreen mode.
+
+        Reviewed by James Robinson.
+
+        Test: plugins/fullscreen-plugins-dont-reload.html
+
+        * dom/Document.cpp:
+        (WebCore::Document::webkitWillEnterFullScreenForElement):
+        (WebCore::Document::webkitDidExitFullScreenForElement):
+        * dom/NodeRenderingContext.cpp:
+        (WebCore::NodeRendererFactory::createRendererIfNeeded):
+        * rendering/RenderFullScreen.cpp:
+        (createFullScreenStyle):
+        (RenderFullScreen::wrapRenderer):
+        (RenderFullScreen::unwrapRenderer):
+        * rendering/RenderFullScreen.h:
+
 2011-09-16  Jochen Eisinger  <jochen@chromium.org>
 

trunk/Source/WebCore/dom/Document.cpp

@@ -4878 +4878 @@
     ASSERT(page() && page()->settings()->fullScreenEnabled());
 
+    if (m_fullScreenRenderer)
+        m_fullScreenRenderer->unwrapRenderer();
+
     m_fullScreenElement = element;
 
@@ -4892 +4895 @@
 
     if (m_fullScreenElement != documentElement())
-        m_fullScreenElement->detach();
+        RenderFullScreen::wrapRenderer(renderer, this);
 
     m_fullScreenElement->setContainsFullScreenElementOnAncestorsCrossingFrameBoundaries(true);
@@ -4943 +4946 @@
     m_areKeysEnabledInFullScreen = false;
     setAnimatingFullScreen(false);
-
+    
     if (m_fullScreenRenderer)
-        m_fullScreenRenderer->remove();
-    
-    if (m_fullScreenElement != documentElement())
-        m_fullScreenElement->detach();
+        m_fullScreenRenderer->unwrapRenderer();
 
     m_fullScreenChangeEventTargetQueue.append(m_fullScreenElement.release());
-    setFullScreenRenderer(0);
 #if USE(ACCELERATED_COMPOSITING)
     page()->chrome()->client()->setRootFullScreenLayer(0);

trunk/Source/WebCore/dom/NodeRenderingContext.cpp

@@ -304 +304 @@
 }
 
-#if ENABLE(FULLSCREEN_API)
-static RenderObject* wrapWithRenderFullScreen(RenderObject* object, Document* document)
-{
-    RenderFullScreen* fullscreenRenderer = new (document->renderArena()) RenderFullScreen(document);
-    fullscreenRenderer->setStyle(RenderFullScreen::createFullScreenStyle());
-    // It's possible that we failed to create the new render and end up wrapping nothing.
-    // We'll end up displaying a black screen, but Jer says this is expected.
-    if (object)
-        fullscreenRenderer->addChild(object);
-    document->setFullScreenRenderer(fullscreenRenderer);
-    if (fullscreenRenderer->placeholder())
-        return fullscreenRenderer->placeholder();
-    return fullscreenRenderer;
-}
-#endif
-
 void NodeRendererFactory::createRendererIfNeeded()
 {
@@ -356 +340 @@
 #if ENABLE(FULLSCREEN_API)
     if (document->webkitIsFullScreen() && document->webkitCurrentFullScreenElement() == node)
-        newRenderer = wrapWithRenderFullScreen(newRenderer, document);
+        newRenderer = RenderFullScreen::wrapRenderer(newRenderer, document);
 #endif
 

trunk/Source/WebCore/rendering/RenderFullScreen.cpp

@@ -80 +80 @@
 }
 
-PassRefPtr<RenderStyle> RenderFullScreen::createFullScreenStyle()
+static PassRefPtr<RenderStyle> createFullScreenStyle()
 {
     RefPtr<RenderStyle> fullscreenStyle = RenderStyle::createDefaultStyle();
@@ -98 +98 @@
     fullscreenStyle->setWidth(Length(100.0, Percent));
     fullscreenStyle->setHeight(Length(100.0, Percent));
-    fullscreenStyle->setLeft(Length(0, Fixed));
-    fullscreenStyle->setTop(Length(0, Fixed));
+    fullscreenStyle->setLeft(Length(0, WebCore::Fixed));
+    fullscreenStyle->setTop(Length(0, WebCore::Fixed));
     
     fullscreenStyle->setBackgroundColor(Color::black);
     
     return fullscreenStyle.release();
+}
+
+RenderObject* RenderFullScreen::wrapRenderer(RenderObject* object, Document* document)
+{
+    RenderFullScreen* fullscreenRenderer = new (document->renderArena()) RenderFullScreen(document);
+    fullscreenRenderer->setStyle(createFullScreenStyle());
+    if (object) {
+        if (RenderObject* parent = object->parent()) {
+            parent->addChild(fullscreenRenderer, object);
+            object->remove();
+        }
+        fullscreenRenderer->addChild(object);
+    }
+    document->setFullScreenRenderer(fullscreenRenderer);
+    if (fullscreenRenderer->placeholder())
+        return fullscreenRenderer->placeholder();
+    return fullscreenRenderer;
+}
+
+void RenderFullScreen::unwrapRenderer()
+{
+    RenderObject* wrappedRenderer = firstChild();
+    if (wrappedRenderer) {
+        wrappedRenderer->remove();
+        RenderObject* holder = placeholder() ? placeholder() : this;
+        RenderObject* parent = holder->parent();
+        if (parent)
+            parent->addChild(wrappedRenderer, holder);
+    }
+    remove();
+    document()->setFullScreenRenderer(0);
 }
 

trunk/Source/WebCore/rendering/RenderFullScreen.h

@@ -42 +42 @@
     void createPlaceholder(PassRefPtr<RenderStyle>, const IntRect& frameRect);
 
-    static PassRefPtr<RenderStyle> createFullScreenStyle();
+
+    static RenderObject* wrapRenderer(RenderObject* renderer, Document*);
+    void unwrapRenderer();
 
 private: