Title: [232879] trunk/Source/WebKit
- Revision
- 232879
- Author
- pvol...@apple.com
- Date
- 2018-06-15 10:32:48 -0700 (Fri, 15 Jun 2018)
Log Message
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:
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (232878 => 232879)
--- trunk/Source/WebKit/ChangeLog 2018-06-15 17:17:14 UTC (rev 232878)
+++ trunk/Source/WebKit/ChangeLog 2018-06-15 17:32:48 UTC (rev 232879)
@@ -1,3 +1,17 @@
+2018-06-15 Per Arne Vollan <pvol...@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 <tsaun...@igalia.com>
[GTK][WPE]: Avoid using uninitialized launchOptions in getLaunchOptions
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.cpp (232878 => 232879)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2018-06-15 17:17:14 UTC (rev 232878)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2018-06-15 17:32:48 UTC (rev 232879)
@@ -1601,13 +1601,8 @@
#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 @@
// 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
}
}
Modified: trunk/Source/WebKit/UIProcess/mac/DisplayLink.cpp (232878 => 232879)
--- trunk/Source/WebKit/UIProcess/mac/DisplayLink.cpp 2018-06-15 17:17:14 UTC (rev 232878)
+++ trunk/Source/WebKit/UIProcess/mac/DisplayLink.cpp 2018-06-15 17:32:48 UTC (rev 232879)
@@ -83,20 +83,6 @@
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);
Modified: trunk/Source/WebKit/UIProcess/mac/DisplayLink.h (232878 => 232879)
--- trunk/Source/WebKit/UIProcess/mac/DisplayLink.h 2018-06-15 17:17:14 UTC (rev 232878)
+++ trunk/Source/WebKit/UIProcess/mac/DisplayLink.h 2018-06-15 17:32:48 UTC (rev 232879)
@@ -49,9 +49,6 @@
void removeObserver(unsigned observerID);
bool hasObservers() const;
- void pause();
- void resume();
-
private:
static CVReturn displayLinkCallback(CVDisplayLinkRef, const CVTimeStamp*, const CVTimeStamp*, CVOptionFlags, CVOptionFlags*, void* data);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
