Changeset 87652 in webkit

Timestamp:

May 29, 2011 2:28:24 PM (13 years ago)

Author:

jer.noble@apple.com

Message:

2011-05-29 Jer Noble <​jer.noble@apple.com>

Reviewed by Simon Fraser.

REGRESSION (r86924): webkitRequestFullScreen does not work properly (black screen, can’t interact)
​https://bugs.webkit.org/show_bug.cgi?id=61710

When taking the documentElement full screen, we don't create a RenderFullScreen
object and thus never enter accelerated compositing mode for the animation. Tell
the WKFullScreenWindowController to enter accelerated compositing mode anyway
(with an empty layer context) so as to fulfill its expectations and cause the
full screen animation to complete.

• UIProcess/mac/WKFullScreenWindowController.mm: (-[WKFullScreenWindowController finishedEnterFullScreenAnimation:]): Added a

comment explaining when we expect the animation to complete.

(-[WKFullScreenWindowController enterAcceleratedCompositingMode:WebKit::]):

Remove an ASSERT which is no longer valid.

• WebProcess/FullScreen/mac/WebFullScreenManagerMac.mm: (WebKit::WebFullScreenManagerMac::beginEnterFullScreenAnimation): Tell the UIProcess

to enter then exit full-screen mode.

(WebKit::WebFullScreenManagerMac::beginExitFullScreenAnimation): Ditto.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/mac/WKFullScreenWindowController.mm (modified) (2 diffs)
• WebProcess/FullScreen/mac/WebFullScreenManagerMac.mm (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-05-29  Jer Noble  <jer.noble@apple.com>
+
+        Reviewed by Simon Fraser.
+
+        REGRESSION (r86924): webkitRequestFullScreen does not work properly (black screen, can’t interact)
+        https://bugs.webkit.org/show_bug.cgi?id=61710
+
+        When taking the documentElement full screen, we don't create a RenderFullScreen 
+        object and thus never enter accelerated compositing mode for the animation. Tell
+        the WKFullScreenWindowController to enter accelerated compositing mode anyway 
+        (with an empty layer context) so as to fulfill its expectations and cause the 
+        full screen animation to complete.
+
+        * UIProcess/mac/WKFullScreenWindowController.mm:
+        (-[WKFullScreenWindowController finishedEnterFullScreenAnimation:]): Added a 
+            comment explaining when we expect the animation to complete.
+        (-[WKFullScreenWindowController enterAcceleratedCompositingMode:WebKit::]):
+            Remove an ASSERT which is no longer valid.
+        * WebProcess/FullScreen/mac/WebFullScreenManagerMac.mm:
+        (WebKit::WebFullScreenManagerMac::beginEnterFullScreenAnimation): Tell the UIProcess
+            to enter then exit full-screen mode.
+        (WebKit::WebFullScreenManagerMac::beginExitFullScreenAnimation): Ditto.
+
 2011-05-29  Darin Adler  <darin@apple.com>
 

trunk/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm

@@ -273 +273 @@
         [self _manager]->didEnterFullScreen();
     }
+
+    // Complete the animation once -(void)exitCompositingMode is called.
 }
 
@@ -363 +365 @@
     if (_layerHostingView)
         return;
-
-    ASSERT(!layerTreeContext.isEmpty());
     
     // Create an NSView that will host our layer tree.

trunk/Source/WebKit2/WebProcess/FullScreen/mac/WebFullScreenManagerMac.mm

@@ -191 +191 @@
     if (!m_rootLayer || m_rootLayer->children().isEmpty()) {
         // If we don't have a root layer, we can't animate in and out of full screen
+        m_page->send(Messages::WebFullScreenManagerProxy::EnterAcceleratedCompositingMode(m_layerTreeContext));
         this->beganEnterFullScreenAnimation();
         this->finishedEnterFullScreenAnimation(true);
+        m_page->send(Messages::WebFullScreenManagerProxy::ExitAcceleratedCompositingMode());
         return;
     }
@@ -212 +214 @@
     if (!m_rootLayer || m_rootLayer->children().isEmpty()) {
         // If we don't have a root layer, we can't animate in and out of full screen
+        m_page->send(Messages::WebFullScreenManagerProxy::EnterAcceleratedCompositingMode(m_layerTreeContext));
         this->beganExitFullScreenAnimation();
         this->finishedExitFullScreenAnimation(true);
+        m_page->send(Messages::WebFullScreenManagerProxy::ExitAcceleratedCompositingMode());
         return;
     }