Attachment 343262 Details for Bug 186891 – ROLLOUT of r232884

[patch] ROLLOUT of r232884

bug-186891-20180621162114.patch (text/plain), 2.96 KB, created by WebKit Commit Bot on 2018-06-21 13:21:15 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: WebKit Commit Bot

Created: 2018-06-21 13:21:15 PDT

Size: 2.96 KB

patch

obsolete

>Subversion Revision: 233054
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 900822d603f48a8c311bb635683483b57e3c2912..4e24f7f06b47539c96ae6e64e92055f9a1617b86 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,18 @@
>+2018-06-21  Commit Queue  <commit-queue@webkit.org>
>+
>+        Unreviewed, rolling out r232884.
>+        https://bugs.webkit.org/show_bug.cgi?id=186891
>+
>+        "Introduced assertion failure in ~DisplayRefreshMonitorMac()."
>+        (Requested by perarne on #webkit).
>+
>+        Reverted changeset:
>+
>+        "DisplayRefreshMonitorMac should hold a weak pointer to
>+        WebPage."
>+        https://bugs.webkit.org/show_bug.cgi?id=186683
>+        https://trac.webkit.org/changeset/232884
>+
> 2018-06-21  Jer Noble  <jer.noble@apple.com>
> 
>         [Fullscreen] Use secondary glyph style for fullscreen controls
>diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.h b/Source/WebKit/WebProcess/WebPage/WebPage.h
>index 40d3af8f76728978675434c88bfcd86f51ddfadb..db22c16979d3c6da22c5f0e8313bb00bb3263da5 100644
>--- a/Source/WebKit/WebProcess/WebPage/WebPage.h
>+++ b/Source/WebKit/WebProcess/WebPage/WebPage.h
>@@ -246,7 +246,7 @@ struct WebsitePoliciesData;
> using SnapshotOptions = uint32_t;
> using WKEventModifiers = uint32_t;
> 
>-class WebPage : public API::ObjectImpl<API::Object::Type::BundlePage>, public IPC::MessageReceiver, public IPC::MessageSender, public CanMakeWeakPtr<WebPage> {
>+class WebPage : public API::ObjectImpl<API::Object::Type::BundlePage>, public IPC::MessageReceiver, public IPC::MessageSender {
> public:
>     static Ref<WebPage> create(uint64_t pageID, WebPageCreationParameters&&);
>     virtual ~WebPage();
>diff --git a/Source/WebKit/WebProcess/WebPage/mac/DrawingAreaMac.cpp b/Source/WebKit/WebProcess/WebPage/mac/DrawingAreaMac.cpp
>index 95b47d2c2e278e1c5db0bf1d669619efe92f8e75..d698ea4a74f3100333388b089442fb1808c818d0 100644
>--- a/Source/WebKit/WebProcess/WebPage/mac/DrawingAreaMac.cpp
>+++ b/Source/WebKit/WebProcess/WebPage/mac/DrawingAreaMac.cpp
>@@ -57,7 +57,7 @@ private:
>     
>     bool hasRequestedRefreshCallback() const override { return m_hasSentMessage; }
> 
>-    WeakPtr<WebPage> m_webPage;
>+    Ref<WebPage> m_webPage;
>     bool m_hasSentMessage { false };
>     unsigned m_observerID;
>     static unsigned m_counterID;
>@@ -69,26 +69,18 @@ unsigned DisplayRefreshMonitorMac::m_counterID = 0;
> 
> DisplayRefreshMonitorMac::DisplayRefreshMonitorMac(PlatformDisplayID displayID, WebPage& webPage)
>     : DisplayRefreshMonitor(displayID)
>-    , m_webPage(makeWeakPtr(webPage))
>+    , m_webPage(webPage)
>     , m_observerID(++m_counterID)
> {
> }
> 
> DisplayRefreshMonitorMac::~DisplayRefreshMonitorMac()
> {
>-    ASSERT(m_webPage);
>-    if (!m_webPage)
>-        return;
>-    
>     m_webPage->send(Messages::WebPageProxy::StopDisplayLink(m_observerID));
> }
> 
> bool DisplayRefreshMonitorMac::requestRefreshCallback()
> {
>-    ASSERT(m_webPage);
>-    if (!m_webPage)
>-        return false;
>-
>     if (!isActive())
>         return false;
>

Actions: View | Formatted Diff | Diff

Attachments on bug 186891: 343262