Changeset 86486 in webkit

Timestamp:

May 14, 2011 9:17:18 AM (13 years ago)

Author:

jer.noble@apple.com

Message:

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

Reviewed by Simon Fraser.

Flashing window frame and graphical glitches after exiting full screen mode.
​https://bugs.webkit.org/show_bug.cgi?id=60825

A layer-backed WebView throws an exception when moved from a layer-backed parent view
to a non-layer-backed one, so make the WebView a child of the content view, instead of
the animation view. There is an unrelated fix in beganExitFullScreen, which was calling
finishedExitFullScreenAnimation: instead of finishedEnterFullScreenAnimation: when
notifications come out of order.

• UIProcess/mac/WKFullScreenWindowController.mm: (-[WKFullScreenWindowController finishedEnterFullScreenAnimation:]): Add the _webView

to the full screen window's content view, instead of the _animationView.

(-[WKFullScreenWindowController beganExitFullScreenAnimation]): Call

finishedEnterFullScreenAnimation: instead of finishedExitFullScreenAnimation:.

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

_layerHostingView to the contentView, instead of the animationView.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/mac/WKFullScreenWindowController.mm (modified) (3 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-05-14  Jer Noble  <jer.noble@apple.com>
+
+        Reviewed by Simon Fraser.
+
+        Flashing window frame and graphical glitches after exiting full screen mode.
+        https://bugs.webkit.org/show_bug.cgi?id=60825
+
+        A layer-backed WebView throws an exception when moved from a layer-backed parent view
+        to a non-layer-backed one, so make the WebView a child of the content view, instead of
+        the animation view.  There is an unrelated fix in beganExitFullScreen, which was calling
+        finishedExitFullScreenAnimation: instead of finishedEnterFullScreenAnimation: when 
+        notifications come out of order.
+
+        * UIProcess/mac/WKFullScreenWindowController.mm:
+        (-[WKFullScreenWindowController finishedEnterFullScreenAnimation:]): Add the _webView
+            to the full screen window's content view, instead of the _animationView.
+        (-[WKFullScreenWindowController beganExitFullScreenAnimation]): Call 
+            finishedEnterFullScreenAnimation: instead of finishedExitFullScreenAnimation:.
+        (-[WKFullScreenWindowController enterAcceleratedCompositingMode:WebKit::]): Add the
+            _layerHostingView to the contentView, instead of the animationView.
+
 2011-05-14  Csaba Osztrogonác  <ossy@webkit.org>
 

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

@@ -252 +252 @@
         
         // Then insert the WebView into the full screen window
-        NSView* animationView = [[self _fullScreenWindow] animationView];
-        [animationView addSubview:_webView positioned:NSWindowBelow relativeTo:_layerHostingView.get()];
-        [_webView setFrame:[animationView bounds]];
+        NSView* contentView = [[self _fullScreenWindow] contentView];
+        [contentView addSubview:_webView positioned:NSWindowBelow relativeTo:_layerHostingView.get()];
+        [_webView setFrame:[contentView bounds]];
 
         [CATransaction begin];
@@ -299 +299 @@
 
     if (_isEnteringFullScreen)
-        [self finishedExitFullScreenAnimation:NO];
+        [self finishedEnterFullScreenAnimation:NO];
 
     [self _updateMenuAndDockForFullScreen];   
@@ -368 +368 @@
     [CATransaction setDisableActions:YES];
     WKFullScreenWindow* window = [self _fullScreenWindow];
-    [[window animationView] addSubview:_layerHostingView.get()];
+    [[window contentView] addSubview:_layerHostingView.get() positioned:NSWindowAbove relativeTo:[window animationView]];
     
     // Create a root layer that will back the NSView.