Rollout r231818, as it introduced regression on tickets.com.
authorpvollan@apple.com <pvollan@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 15 Jun 2018 17:32:48 +0000 (17:32 +0000)
committerpvollan@apple.com <pvollan@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 15 Jun 2018 17:32:48 +0000 (17:32 +0000)
https://bugs.webkit.org/show_bug.cgi?id=186675

Unreviewed, rolling out.

* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::dispatchActivityStateChange):
* UIProcess/mac/DisplayLink.cpp:
(WebKit::DisplayLink::pause): Deleted.
(WebKit::DisplayLink::resume): Deleted.
* UIProcess/mac/DisplayLink.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@232879 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit/ChangeLog
Source/WebKit/UIProcess/WebPageProxy.cpp
Source/WebKit/UIProcess/mac/DisplayLink.cpp
Source/WebKit/UIProcess/mac/DisplayLink.h

index b16e747..2e72ba8 100644 (file)
@@ -1,3 +1,17 @@
+2018-06-15  Per Arne Vollan  <pvollan@apple.com>
+
+        Rollout r231818, as it introduced regression on tickets.com.
+        https://bugs.webkit.org/show_bug.cgi?id=186675
+
+        Unreviewed, rolling out.
+
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::dispatchActivityStateChange):
+        * UIProcess/mac/DisplayLink.cpp:
+        (WebKit::DisplayLink::pause): Deleted.
+        (WebKit::DisplayLink::resume): Deleted.
+        * UIProcess/mac/DisplayLink.h:
+
 2018-06-15  Thibault Saunier  <tsaunier@igalia.com>
 
         [GTK][WPE]: Avoid using uninitialized launchOptions in getLaunchOptions
index 49e6d6c..b9af1d6 100644 (file)
@@ -1601,13 +1601,8 @@ void WebPageProxy::dispatchActivityStateChange()
 #endif
 
     if (changed & ActivityState::IsVisible) {
-        if (isViewVisible()) {
+        if (isViewVisible())
             m_visiblePageToken = m_process->visiblePageToken();
-#if PLATFORM(MAC) && ENABLE(WEBPROCESS_WINDOWSERVER_BLOCKING)
-            if (m_displayLink)
-                m_displayLink->resume();
-#endif
-        }
         else {
             m_visiblePageToken = nullptr;
 
@@ -1615,10 +1610,6 @@ void WebPageProxy::dispatchActivityStateChange()
             // state, it might not send back a reply (since it won't paint anything if the web page is hidden) so we
             // stop the unresponsiveness timer here.
             m_process->responsivenessTimer().stop();
-#if PLATFORM(MAC) && ENABLE(WEBPROCESS_WINDOWSERVER_BLOCKING)
-            if (m_displayLink)
-                m_displayLink->pause();
-#endif
         }
     }
 
index d759b97..ef1801a 100644 (file)
@@ -83,20 +83,6 @@ bool DisplayLink::hasObservers() const
     return !m_observers.isEmpty();
 }
 
-void DisplayLink::pause()
-{
-    if (!CVDisplayLinkIsRunning(m_displayLink))
-        return;
-    CVDisplayLinkStop(m_displayLink);
-}
-
-void DisplayLink::resume()
-{
-    if (CVDisplayLinkIsRunning(m_displayLink))
-        return;
-    CVDisplayLinkStart(m_displayLink);
-}
-
 CVReturn DisplayLink::displayLinkCallback(CVDisplayLinkRef displayLinkRef, const CVTimeStamp*, const CVTimeStamp*, CVOptionFlags, CVOptionFlags*, void* data)
 {
     DisplayLink* displayLink = static_cast<DisplayLink*>(data);
index 6cb732c..28eb81e 100644 (file)
@@ -49,9 +49,6 @@ public:
     void removeObserver(unsigned observerID);
     bool hasObservers() const;
 
-    void pause();
-    void resume();
-    
 private:
     static CVReturn displayLinkCallback(CVDisplayLinkRef, const CVTimeStamp*, const CVTimeStamp*, CVOptionFlags, CVOptionFlags*, void* data);