Attachment 341594 Details for Bug 186097 – Patch

[patch] Patch

bug-186097-20180530122844.patch (text/plain), 2.78 KB, created by Chris Dumez on 2018-05-30 12:28:45 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Dumez

Created: 2018-05-30 12:28:45 PDT

Size: 2.78 KB

patch

obsolete

>Subversion Revision: 232301
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 5abe2d28915408d0893fea1211e31dd1ff9e54d0..7646be1d7ef925953332802140f4c37f3fadcdbd 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,19 @@
>+2018-05-30  Chris Dumez  <cdumez@apple.com>
>+
>+        Take a background process assertion in WebPageProxy::callAfterNextPresentationUpdate()
>+        https://bugs.webkit.org/show_bug.cgi?id=186097
>+        <rdar://problem/40651225>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Refactor fix landed in r232298 so that we rely on the existing Callback infrastructure
>+        to take a background process assertion.
>+
>+        * UIProcess/RemoteLayerTree/RemoteLayerTreeDrawingAreaProxy.mm:
>+        (WebKit::RemoteLayerTreeDrawingAreaProxy::dispatchAfterEnsuringDrawing):
>+        * UIProcess/WebPageProxy.cpp:
>+        (WebKit::WebPageProxy::callAfterNextPresentationUpdate):
>+
> 2018-05-30  Jer Noble  <jer.noble@apple.com>
> 
>         Auto-pip should use main content heuristic.
>diff --git a/Source/WebKit/UIProcess/RemoteLayerTree/RemoteLayerTreeDrawingAreaProxy.mm b/Source/WebKit/UIProcess/RemoteLayerTree/RemoteLayerTreeDrawingAreaProxy.mm
>index c0bdfe576b382f824850c7dd558a61691bda5e3b..089f7594cf5d361b2683d2d9d8143ba10216ceaa 100644
>--- a/Source/WebKit/UIProcess/RemoteLayerTree/RemoteLayerTreeDrawingAreaProxy.mm
>+++ b/Source/WebKit/UIProcess/RemoteLayerTree/RemoteLayerTreeDrawingAreaProxy.mm
>@@ -456,7 +456,7 @@ void RemoteLayerTreeDrawingAreaProxy::dispatchAfterEnsuringDrawing(WTF::Function
>         return;
>     }
> 
>-    m_webPageProxy.process().send(Messages::DrawingArea::AddTransactionCallbackID(m_callbacks.put(WTFMove(callbackFunction), nullptr)), m_webPageProxy.pageID());
>+    m_webPageProxy.process().send(Messages::DrawingArea::AddTransactionCallbackID(m_callbacks.put(WTFMove(callbackFunction), m_webPageProxy.process().throttler().backgroundActivityToken())), m_webPageProxy.pageID());
> }
> 
> void RemoteLayerTreeDrawingAreaProxy::hideContentUntilPendingUpdate()
>diff --git a/Source/WebKit/UIProcess/WebPageProxy.cpp b/Source/WebKit/UIProcess/WebPageProxy.cpp
>index 0dbd01fd55ba352277787a68238d6dd75338e06a..ea43629501c59f2b34f4fbb0be6b740120c08991 100644
>--- a/Source/WebKit/UIProcess/WebPageProxy.cpp
>+++ b/Source/WebKit/UIProcess/WebPageProxy.cpp
>@@ -7351,9 +7351,7 @@ void WebPageProxy::callAfterNextPresentationUpdate(WTF::Function<void (CallbackB
>         return;
>     }
> 
>-    m_drawingArea->dispatchAfterEnsuringDrawing([callback = WTFMove(callback), backgroundActivity = m_process->throttler().backgroundActivityToken()](CallbackBase::Error error) {
>-        callback(error);
>-    });
>+    m_drawingArea->dispatchAfterEnsuringDrawing(WTFMove(callback));
> }
> 
> void WebPageProxy::setShouldScaleViewToFitDocument(bool shouldScaleViewToFitDocument)

Actions: View | Formatted Diff | Diff

Attachments on bug 186097: 341575 | 341594