Changeset 201405 in webkit

Timestamp:

May 25, 2016 3:07:17 PM (8 years ago)

Author:

jer.noble@apple.com

Message:

Flashiness and jumpiness when entering fullscreen
​https://bugs.webkit.org/show_bug.cgi?id=158087

Reviewed by Beth Dakin.

Multiple independant sources of jumpiness and flashiness are addressed here:

• Setting the top content inset on the WKView cause a vertical jump during fullscreen

transition. Instead of setting the content inset to 0, take the existing inset into account
when placing the WKView in the NSWindow.

• The enter fullscreen transition causes a white flash due to the NSWindow needing

display before ordering onscreen. Ensure the window has a backing by calling -displayIfNeeded
before entering fullscreen mode.

• The exit fullscreen transition causes a white background color flash for an unknown

reason, but is solved by not making the window's content view layer-backed. Rather than
directly animating the contentView's background color, create a specific background view
and animate it's background color instead.

• UIProcess/mac/WKFullScreenWindowController.h:
• UIProcess/mac/WKFullScreenWindowController.mm:

(-[WKFullScreenWindowController initWithWindow:webView:page:]):
(-[WKFullScreenWindowController enterFullScreen:]):
(-[WKFullScreenWindowController finishedEnterFullScreenAnimation:]):
(-[WKFullScreenWindowController finishedExitFullScreenAnimation:]):
(-[WKFullScreenWindowController _startEnterFullScreenAnimationWithDuration:]):
(-[WKFullScreenWindowController _startExitFullScreenAnimationWithDuration:]):

• WebProcess/FullScreen/WebFullScreenManager.cpp:

(WebKit::WebFullScreenManager::saveScrollPosition): Deleted.
(WebKit::WebFullScreenManager::restoreScrollPosition): Deleted.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/mac/WKFullScreenWindowController.h (modified) (1 diff)
• UIProcess/mac/WKFullScreenWindowController.mm (modified) (6 diffs)
• WebProcess/FullScreen/WebFullScreenManager.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2016-05-25  Jer Noble  <jer.noble@apple.com>
+
+        Flashiness and jumpiness when entering fullscreen
+        https://bugs.webkit.org/show_bug.cgi?id=158087
+
+        Reviewed by Beth Dakin.
+
+        Multiple independant sources of jumpiness and flashiness are addressed here:
+
+        - Setting the top content inset on the WKView cause a vertical jump during fullscreen
+        transition. Instead of setting the content inset to 0, take the existing inset into account
+        when placing the WKView in the NSWindow.
+
+        - The enter fullscreen transition causes a white flash due to the NSWindow needing
+        display before ordering onscreen. Ensure the window has a backing by calling -displayIfNeeded
+        before entering fullscreen mode.
+
+        - The exit fullscreen transition causes a white background color flash for an unknown
+        reason, but is solved by not making the window's content view layer-backed. Rather than
+        directly animating the contentView's background color, create a specific background view
+        and animate it's background color instead.
+
+        * UIProcess/mac/WKFullScreenWindowController.h:
+        * UIProcess/mac/WKFullScreenWindowController.mm:
+        (-[WKFullScreenWindowController initWithWindow:webView:page:]):
+        (-[WKFullScreenWindowController enterFullScreen:]):
+        (-[WKFullScreenWindowController finishedEnterFullScreenAnimation:]):
+        (-[WKFullScreenWindowController finishedExitFullScreenAnimation:]):
+        (-[WKFullScreenWindowController _startEnterFullScreenAnimationWithDuration:]):
+        (-[WKFullScreenWindowController _startExitFullScreenAnimationWithDuration:]):
+        * WebProcess/FullScreen/WebFullScreenManager.cpp:
+        (WebKit::WebFullScreenManager::saveScrollPosition): Deleted.
+        (WebKit::WebFullScreenManager::restoreScrollPosition): Deleted.
+
 2016-05-25  Alex Christensen  <achristensen@webkit.org>
 

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

@@ -50 +50 @@
     RetainPtr<WebCoreFullScreenPlaceholderView> _webViewPlaceholder;
     RetainPtr<NSView> _clipView;
+    RetainPtr<NSView> _backgroundView;
     NSRect _initialFrame;
     NSRect _finalFrame;

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

@@ -95 +95 @@
 
     NSView *contentView = [window contentView];
-    contentView.wantsLayer = YES;
-    contentView.layer.hidden = YES;
+    contentView.hidden = YES;
     contentView.autoresizesSubviews = YES;
+
+    _backgroundView = adoptNS([[NSView alloc] initWithFrame:contentView.bounds]);
+    _backgroundView.get().layer = [CALayer layer];
+    _backgroundView.get().wantsLayer = YES;
+    _backgroundView.get().autoresizingMask = NSViewWidthSizable | NSViewHeightSizable;
+    [contentView addSubview:_backgroundView.get()];
 
     _clipView = adoptNS([[NSView alloc] initWithFrame:contentView.bounds]);
     [_clipView setWantsLayer:YES];
     [_clipView setAutoresizingMask:(NSViewWidthSizable | NSViewHeightSizable)];
-    [contentView addSubview:_clipView.get()];
+    [_backgroundView addSubview:_clipView.get()];
 
     [self windowDidLoad];
+    [window displayIfNeeded];
     _webView = webView;
     _page = &page;
@@ -235 +241 @@
     NSView *contentView = [[self window] contentView];
     [_clipView addSubview:_webView positioned:NSWindowBelow relativeTo:nil];
-    [_webView setFrame:[contentView bounds]];
+    _webView.frame = NSInsetRect(contentView.bounds, 0, -_page->topContentInset());
 
     makeResponderFirstResponderIfDescendantOfView(self.window, webWindowFirstResponder, _webView);
@@ -273 +279 @@
         [self _manager]->setAnimatingFullScreen(false);
 
-        NSView *contentView = [[self window] contentView];
-        [contentView.layer removeAllAnimations];
+        [_backgroundView.get().layer removeAllAnimations];
         [[_clipView layer] removeAllAnimations];
         [[_clipView layer] setMask:nil];
@@ -370 +375 @@
     [[self window] orderOut:self];
     NSView *contentView = [[self window] contentView];
-    contentView.layer.hidden = YES;
+    contentView.hidden = YES;
+    [_backgroundView.get().layer removeAllAnimations];
     [[_webViewPlaceholder window] setAutodisplay:NO];
 
@@ -577 +583 @@
     [_clipView layer].mask = maskLayer;
 
-    contentView.layer.hidden = NO;
-    [contentView.layer addAnimation:fadeAnimation(duration, AnimateIn) forKey:@"fullscreen"];
+    contentView.hidden = NO;
+    [_backgroundView.get().layer addAnimation:fadeAnimation(duration, AnimateIn) forKey:@"fullscreen"];
 
     NSWindow* window = [self window];
@@ -606 +612 @@
 
     NSView* contentView = [[self window] contentView];
-    contentView.layer.hidden = NO;
-    [contentView.layer addAnimation:fadeAnimation(duration, AnimateOut) forKey:@"fullscreen"];
+    contentView.hidden = NO;
+    [_backgroundView.get().layer addAnimation:fadeAnimation(duration, AnimateOut) forKey:@"fullscreen"];
 
     _page->setSuppressVisibilityUpdates(false);

trunk/Source/WebKit2/WebProcess/FullScreen/WebFullScreenManager.cpp

@@ -158 +158 @@
 {
     m_scrollPosition = m_page->corePage()->mainFrame().view()->scrollPosition();
-    m_topContentInset = m_page->corePage()->topContentInset();
-    m_page->corePage()->setTopContentInset(0);
 }
 
 void WebFullScreenManager::restoreScrollPosition()
 {
-    m_page->corePage()->setTopContentInset(m_topContentInset);
     m_page->corePage()->mainFrame().view()->setScrollPosition(m_scrollPosition);
 }