Changeset 170787 in webkit

Timestamp:

Jul 4, 2014, 12:10:10 AM (12 years ago)

Author:

timothy_horton@apple.com

Message:

[iOS][WK2] Black web view after un-suspending process
​https://bugs.webkit.org/show_bug.cgi?id=134623
<rdar://problem/17513223>

Reviewed by Simon Fraser.

• UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::viewStateDidChange):
Add an argument to viewStateDidChange that allows callers (-[WKContentView _applicationWillEnterForeground:])
to force us to wait for a synchronous reply from the Web process after performing a view state change.

(WebKit::WebPageProxy::dispatchViewStateChange):
Move the has-been-in-window-and-now-is-newly-in-window check into dispatchViewStateChange.
Adjust the logic surrounding going into/out of window by factoring out the IsInWindow-did-change check, for clarity.

• UIProcess/WebPageProxy.h:
• UIProcess/ios/WKContentView.mm:

(-[WKContentView _applicationWillEnterForeground:]):
As previously mentioned, wait for a reply when foregrounding.

• WebProcess/WebPage/DrawingArea.h:
• WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h:
• WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm:

(WebKit::RemoteLayerTreeDrawingArea::scheduleCompositingLayerFlushImmediately):
(WebKit::RemoteLayerTreeDrawingArea::scheduleCompositingLayerFlush):
(WebKit::RemoteLayerTreeDrawingArea::viewStateDidChange):
Make sure to schedule a commit immediately if the UI process is waiting for a reply.
Previously we assumed that a commit would be scheduled anyway because we would have to reparent the
layer tree, but that doesn't happen in the suspension-without-unparenting case. Also, we want to skip
all throttling in this case.

• WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h:
• WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:

(WebKit::TiledCoreAnimationDrawingArea::scheduleCompositingLayerFlushImmediately):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/WebPageProxy.cpp (modified) (5 diffs)
• UIProcess/WebPageProxy.h (modified) (3 diffs)
• UIProcess/ios/WKContentView.mm (modified) (1 diff)
• WebProcess/WebPage/DrawingArea.h (modified) (1 diff)
• WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h (modified) (1 diff)
• WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm (modified) (3 diffs)
• WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h (modified) (1 diff)
• WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-07-04  Timothy Horton  <timothy_horton@apple.com>
+
+        [iOS][WK2] Black web view after un-suspending process
+        https://bugs.webkit.org/show_bug.cgi?id=134623
+        <rdar://problem/17513223>
+
+        Reviewed by Simon Fraser.
+
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::viewStateDidChange):
+        Add an argument to viewStateDidChange that allows callers (-[WKContentView _applicationWillEnterForeground:])
+        to force us to wait for a synchronous reply from the Web process after performing a view state change.
+
+        (WebKit::WebPageProxy::dispatchViewStateChange):
+        Move the has-been-in-window-and-now-is-newly-in-window check into dispatchViewStateChange.
+        Adjust the logic surrounding going into/out of window by factoring out the IsInWindow-did-change check, for clarity.
+
+        * UIProcess/WebPageProxy.h:
+        * UIProcess/ios/WKContentView.mm:
+        (-[WKContentView _applicationWillEnterForeground:]):
+        As previously mentioned, wait for a reply when foregrounding.
+
+        * WebProcess/WebPage/DrawingArea.h:
+        * WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h:
+        * WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm:
+        (WebKit::RemoteLayerTreeDrawingArea::scheduleCompositingLayerFlushImmediately):
+        (WebKit::RemoteLayerTreeDrawingArea::scheduleCompositingLayerFlush):
+        (WebKit::RemoteLayerTreeDrawingArea::viewStateDidChange):
+        Make sure to schedule a commit immediately if the UI process is waiting for a reply.
+        Previously we assumed that a commit would be scheduled anyway because we would have to reparent the
+        layer tree, but that doesn't happen in the suspension-without-unparenting case. Also, we want to skip
+        all throttling in this case.
+
+        * WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h:
+        * WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:
+        (WebKit::TiledCoreAnimationDrawingArea::scheduleCompositingLayerFlushImmediately):
+
 2014-07-03  Gavin Barraclough  <baraclough@apple.com>
 

trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

@@ -367 +367 @@
     , m_configurationPreferenceValues(configuration.preferenceValues)
     , m_potentiallyChangedViewStateFlags(ViewState::NoFlags)
-    , m_viewStateChangeWantsReply(WantsReplyOrNot::DoesNotWantReply)
+    , m_viewStateChangeWantsReply(false)
 {
     if (m_process->state() == WebProcessProxy::State::Running) {
@@ -1102 +1102 @@
 }
 
-void WebPageProxy::viewStateDidChange(ViewState::Flags mayHaveChanged)
-{
-    bool isNewlyInWindow = !isInWindow() && (mayHaveChanged & ViewState::IsInWindow) && m_pageClient.isViewInWindow();
-
+void WebPageProxy::viewStateDidChange(ViewState::Flags mayHaveChanged, bool wantsReply)
+{
     m_potentiallyChangedViewStateFlags |= mayHaveChanged;
-    m_viewStateChangeWantsReply = ((m_viewWasEverInWindow && isNewlyInWindow) || m_viewStateChangeWantsReply == WantsReplyOrNot::DoesWantReply) ? WantsReplyOrNot::DoesWantReply : WantsReplyOrNot::DoesNotWantReply;
+    m_viewStateChangeWantsReply = m_viewStateChangeWantsReply || wantsReply;
 
 #if PLATFORM(COCOA)
-    if (isNewlyInWindow) {
+    if (!isInWindow() && (mayHaveChanged & ViewState::IsInWindow) && m_pageClient.isViewInWindow()) {
         dispatchViewStateChange();
         return;
@@ -1118 +1116 @@
     dispatchViewStateChange();
 #endif
+}
+
+void WebPageProxy::viewDidLeaveWindow()
+{
+#if ENABLE(INPUT_TYPE_COLOR_POPOVER)
+    // When leaving the current page, close the popover color well.
+    if (m_colorPicker)
+        endColorPicker();
+#endif
+#if PLATFORM(IOS)
+    // When leaving the current page, close the video fullscreen.
+    if (m_videoFullscreenManager)
+        m_videoFullscreenManager->requestHideAndExitFullscreen();
+#endif
+}
+
+void WebPageProxy::viewDidEnterWindow()
+{
+    LayerHostingMode layerHostingMode = m_pageClient.viewLayerHostingMode();
+    if (m_layerHostingMode != layerHostingMode) {
+        m_layerHostingMode = layerHostingMode;
+        m_process->send(Messages::WebPage::SetLayerHostingMode(static_cast<unsigned>(layerHostingMode)), m_pageID);
+    }
 }
 
@@ -1139 +1160 @@
     ViewState::Flags changed = m_viewState ^ previousViewState;
 
+    // We always want to wait for the Web process to reply if we've been in-window before and are coming back in-window.
+    if (m_viewWasEverInWindow && (changed & ViewState::IsInWindow) && isInWindow())
+        m_viewStateChangeWantsReply = true;
+
     if (changed)
-        m_process->send(Messages::WebPage::SetViewState(m_viewState, m_viewStateChangeWantsReply == WantsReplyOrNot::DoesWantReply), m_pageID);
+        m_process->send(Messages::WebPage::SetViewState(m_viewState, m_viewStateChangeWantsReply), m_pageID);
 
     // This must happen after the SetViewState message is sent, to ensure the page visibility event can fire.
@@ -1154 +1179 @@
         m_process->responsivenessTimer()->stop();
 
-    if ((m_potentiallyChangedViewStateFlags & ViewState::IsInWindow) && (m_viewState & ViewState::IsInWindow)) {
-        LayerHostingMode layerHostingMode = m_pageClient.viewLayerHostingMode();
-        if (m_layerHostingMode != layerHostingMode) {
-            m_layerHostingMode = layerHostingMode;
-            m_process->send(Messages::WebPage::SetLayerHostingMode(static_cast<unsigned>(layerHostingMode)), m_pageID);
-        }
-    }
-
-    if ((m_potentiallyChangedViewStateFlags & ViewState::IsInWindow) && !(m_viewState & ViewState::IsInWindow)) {
-#if ENABLE(INPUT_TYPE_COLOR_POPOVER)
-        // When leaving the current page, close the popover color well.
-        if (m_colorPicker)
-            endColorPicker();
-#endif
-#if PLATFORM(IOS)
-        // When leaving the current page, close the video fullscreen.
-        if (m_videoFullscreenManager)
-            m_videoFullscreenManager->requestHideAndExitFullscreen();
-#endif
+    if (changed & ViewState::IsInWindow) {
+        if (isInWindow())
+            viewDidEnterWindow();
+        else
+            viewDidLeaveWindow();
     }
 
     updateBackingStoreDiscardableState();
 
-    if (m_viewStateChangeWantsReply == WantsReplyOrNot::DoesWantReply)
+    if (m_viewStateChangeWantsReply)
         waitForDidUpdateViewState();
 
     m_potentiallyChangedViewStateFlags = ViewState::NoFlags;
-    m_viewStateChangeWantsReply = WantsReplyOrNot::DoesNotWantReply;
+    m_viewStateChangeWantsReply = false;
 }
 

trunk/Source/WebKit2/UIProcess/WebPageProxy.h

@@ -361 +361 @@
     bool delegatesScrolling() const { return m_delegatesScrolling; }
 
-    enum class WantsReplyOrNot { DoesNotWantReply, DoesWantReply };
-    void viewStateDidChange(WebCore::ViewState::Flags mayHaveChanged);
+    void viewStateDidChange(WebCore::ViewState::Flags mayHaveChanged, bool wantsReply = false);
     bool isInWindow() const { return m_viewState & WebCore::ViewState::IsInWindow; }
     void waitForDidUpdateViewState();
@@ -1267 +1266 @@
 
     void dispatchViewStateChange();
+    void viewDidLeaveWindow();
+    void viewDidEnterWindow();
 
     PageClient& m_pageClient;
@@ -1514 +1515 @@
     WebPreferencesStore::ValueMap m_configurationPreferenceValues;
     WebCore::ViewState::Flags m_potentiallyChangedViewStateFlags;
-    WantsReplyOrNot m_viewStateChangeWantsReply;
+    bool m_viewStateChangeWantsReply;
 };
 

trunk/Source/WebKit2/UIProcess/ios/WKContentView.mm

@@ -761 +761 @@
 {
     _page->applicationWillEnterForeground();
-    _page->viewStateDidChange(ViewState::AllFlags & ~ViewState::IsInWindow);
+    _page->viewStateDidChange(ViewState::AllFlags & ~ViewState::IsInWindow, true);
 }
 

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

@@ -102 +102 @@
     virtual void setRootCompositingLayer(WebCore::GraphicsLayer*) = 0;
     virtual void scheduleCompositingLayerFlush() = 0;
+    virtual void scheduleCompositingLayerFlushImmediately() = 0;
 
 #if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)

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

@@ -67 +67 @@
     virtual void setRootCompositingLayer(WebCore::GraphicsLayer*) override;
     virtual void scheduleCompositingLayerFlush() override;
+    virtual void scheduleCompositingLayerFlushImmediately() override;
 
     virtual void addTransactionCallbackID(uint64_t callbackID) override;

trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm

@@ -240 +240 @@
 }
 
+void RemoteLayerTreeDrawingArea::scheduleCompositingLayerFlushImmediately()
+{
+    m_layerFlushTimer.startOneShot(0_ms);
+}
+
 void RemoteLayerTreeDrawingArea::scheduleCompositingLayerFlush()
 {
@@ -249 +254 @@
     if (m_isLayerFlushThrottlingTemporarilyDisabledForInteraction) {
         m_isLayerFlushThrottlingTemporarilyDisabledForInteraction = false;
-        m_layerFlushTimer.startOneShot(0_ms);
+        scheduleCompositingLayerFlushImmediately();
         return;
     }
@@ -428 +433 @@
 {
     // FIXME: Should we suspend painting while not visible, like TiledCoreAnimationDrawingArea? Probably.
+
+    if (wantsDidUpdateViewState)
+        scheduleCompositingLayerFlushImmediately();
 }
 

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

@@ -68 +68 @@
     virtual void setRootCompositingLayer(WebCore::GraphicsLayer*) override;
     virtual void scheduleCompositingLayerFlush() override;
+    virtual void scheduleCompositingLayerFlushImmediately() override;
 
     virtual void updatePreferences(const WebPreferencesStore&) override;

trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm

@@ -175 +175 @@
 }
 
+void TiledCoreAnimationDrawingArea::scheduleCompositingLayerFlushImmediately()
+{
+    scheduleCompositingLayerFlush();
+}
+
 void TiledCoreAnimationDrawingArea::updatePreferences(const WebPreferencesStore&)
 {