Attachment 342821 Details for Bug 186675 – Patch

[patch] Patch

bug-186675-20180615100136.patch (text/plain), 3.33 KB, created by Per Arne Vollan on 2018-06-15 10:01:37 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Per Arne Vollan

Created: 2018-06-15 10:01:37 PDT

Size: 3.33 KB

patch

obsolete

>Index: Source/WebKit/ChangeLog
>===================================================================
>--- Source/WebKit/ChangeLog	(revision 232876)
>+++ Source/WebKit/ChangeLog	(working copy)
>@@ -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: Source/WebKit/UIProcess/WebPageProxy.cpp
>===================================================================
>--- Source/WebKit/UIProcess/WebPageProxy.cpp	(revision 232876)
>+++ Source/WebKit/UIProcess/WebPageProxy.cpp	(working copy)
>@@ -1601,13 +1601,8 @@ void WebPageProxy::dispatchActivityState
> #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::dispatchActivityState
>             // 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: Source/WebKit/UIProcess/mac/DisplayLink.cpp
>===================================================================
>--- Source/WebKit/UIProcess/mac/DisplayLink.cpp	(revision 232876)
>+++ Source/WebKit/UIProcess/mac/DisplayLink.cpp	(working copy)
>@@ -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: Source/WebKit/UIProcess/mac/DisplayLink.h
>===================================================================
>--- Source/WebKit/UIProcess/mac/DisplayLink.h	(revision 232876)
>+++ Source/WebKit/UIProcess/mac/DisplayLink.h	(working copy)
>@@ -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);
>

Actions: View | Formatted Diff | Diff

Attachments on bug 186675: 342821