Changeset 202763 in webkit

Timestamp:

Jul 1, 2016 4:41:45 PM (8 years ago)

Author:

jer.noble@apple.com

Message:

REGRESSION(r201405): Fullscreen video no longer enters low-power mode
​https://bugs.webkit.org/show_bug.cgi?id=159220
<rdar://problem/26701056>

Reviewed by Beth Dakin.

In r201405, we removed the call to setTopContentInset(0) to avoid a flash
during repainting where the WebProcess still thought it had an inset and
the UIProcess did not, but the >0 inset breaks low power video playback
in fullscreen. So, instead, fix the repaint issue by setting a CALayer
fence which makes sure both the UIProcess and WebProcess paint simultaneously
after resizing and changing the top content inset.

This requires a new message from WebPageProxy -> WebPage: setTopContentInsetFenced().

• UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::setTopContentInset):

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

(-[WKFullScreenWindowController enterFullScreen:]):
(-[WKFullScreenWindowController finishedEnterFullScreenAnimation:]):

• WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::setTopContentInsetFenced):

• WebProcess/WebPage/WebPage.h:
• WebProcess/WebPage/WebPage.messages.in:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/WebPageProxy.cpp (modified) (1 diff)
• UIProcess/mac/WKFullScreenWindowController.h (modified) (1 diff)
• UIProcess/mac/WKFullScreenWindowController.mm (modified) (3 diffs)
• WebProcess/WebPage/WebPage.cpp (modified) (1 diff)
• WebProcess/WebPage/WebPage.h (modified) (1 diff)
• WebProcess/WebPage/WebPage.messages.in (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2016-07-01  Jer Noble  <jer.noble@apple.com>
+
+        REGRESSION(r201405): Fullscreen video no longer enters low-power mode
+        https://bugs.webkit.org/show_bug.cgi?id=159220
+        <rdar://problem/26701056>
+
+        Reviewed by Beth Dakin.
+
+        In r201405, we removed the call to setTopContentInset(0) to avoid a flash
+        during repainting where the WebProcess still thought it had an inset and
+        the UIProcess did not, but the >0 inset breaks low power video playback 
+        in fullscreen. So, instead, fix the repaint issue by setting a CALayer
+        fence which makes sure both the UIProcess and WebProcess paint simultaneously
+        after resizing and changing the top content inset.
+
+        This requires a new message from WebPageProxy -> WebPage: setTopContentInsetFenced().
+
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::setTopContentInset):
+        * UIProcess/mac/WKFullScreenWindowController.h:
+        * UIProcess/mac/WKFullScreenWindowController.mm:
+        (-[WKFullScreenWindowController enterFullScreen:]):
+        (-[WKFullScreenWindowController finishedEnterFullScreenAnimation:]):
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::setTopContentInsetFenced):
+        * WebProcess/WebPage/WebPage.h:
+        * WebProcess/WebPage/WebPage.messages.in:
+
 2016-07-01  Dan Bernstein  <mitz@apple.com>
 

trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

@@ -1316 +1316 @@
     m_topContentInset = contentInset;
 
-    if (isValid())
-        m_process->send(Messages::WebPage::SetTopContentInset(contentInset), m_pageID);
+    if (!isValid())
+        return;
+#if PLATFORM(COCOA)
+    MachSendRight fence = m_drawingArea->createFence();
+
+    auto fenceAttachment = IPC::Attachment(fence.leakSendRight(), MACH_MSG_TYPE_MOVE_SEND);
+    m_process->send(Messages::WebPage::SetTopContentInsetFenced(contentInset, fenceAttachment), m_pageID);
+#else
+    m_process->send(Messages::WebPage::SetTopContentInset(contentInset), m_pageID);
+#endif
 }
 

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

@@ -59 +59 @@
     double _savedScale;
     RefPtr<WebKit::VoidCallback> _repaintCallback;
+    float _savedTopContentInset;
 }
 

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

@@ -221 +221 @@
     NSResponder *webWindowFirstResponder = [[_webView window] firstResponder];
     [self _manager]->saveScrollPosition();
+    _savedTopContentInset = _page->topContentInset();
+    _page->setTopContentInset(0);
     [[self window] setFrame:screenFrame display:NO];
 
@@ -241 +243 @@
     NSView *contentView = [[self window] contentView];
     [_clipView addSubview:_webView positioned:NSWindowBelow relativeTo:nil];
-    NSRect contentViewBounds = contentView.bounds;
-    contentViewBounds.size.height += _page->topContentInset();
-    _webView.frame = contentViewBounds;
+    _webView.frame = NSInsetRect(contentView.bounds, 0, -_page->topContentInset());
 
     makeResponderFirstResponderIfDescendantOfView(self.window, webWindowFirstResponder, _webView);
@@ -305 +305 @@
         _page->scalePage(_savedScale, IntPoint());
         [self _manager]->restoreScrollPosition();
+        _page->setTopContentInset(_savedTopContentInset);
         [self _manager]->didExitFullScreen();
         [self _manager]->setAnimatingFullScreen(false);

trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp

@@ -2458 +2458 @@
 }
 
+#if PLATFORM(COCOA)
+void WebPage::setTopContentInsetFenced(float contentInset, IPC::Attachment fencePort)
+{
+    m_drawingArea->addFence(MachSendRight::create(fencePort.port()));
+
+    setTopContentInset(contentInset);
+
+    mach_port_deallocate(mach_task_self(), fencePort.port());
+}
+#endif
+
 void WebPage::setTopContentInset(float contentInset)
 {

trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h

@@ -1054 +1054 @@
     void setDrawsBackground(bool);
 
+#if PLATFORM(COCOA)
+    void setTopContentInsetFenced(float, IPC::Attachment);
+#endif
     void setTopContentInset(float);
 

trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in

@@ -30 +30 @@
     SetDrawsBackground(bool drawsBackground)
 
+#if PLATFORM(COCOA)
+    SetTopContentInsetFenced(float contentInset, IPC::Attachment fencePort)
+#endif
     SetTopContentInset(float contentInset)