Title: [233060] trunk/Source/WebKit
- Revision
- 233060
- Author
- commit-qu...@webkit.org
- Date
- 2018-06-21 14:42:59 -0700 (Thu, 21 Jun 2018)
Log Message
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
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (233059 => 233060)
--- trunk/Source/WebKit/ChangeLog 2018-06-21 21:23:12 UTC (rev 233059)
+++ trunk/Source/WebKit/ChangeLog 2018-06-21 21:42:59 UTC (rev 233060)
@@ -1,3 +1,18 @@
+2018-06-21 Commit Queue <commit-qu...@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.no...@apple.com>
[Fullscreen] Page sometimes ends up with an incorrect zoom level after entering fullscreen
Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPage.h (233059 => 233060)
--- trunk/Source/WebKit/WebProcess/WebPage/WebPage.h 2018-06-21 21:23:12 UTC (rev 233059)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPage.h 2018-06-21 21:42:59 UTC (rev 233060)
@@ -246,7 +246,7 @@
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();
Modified: trunk/Source/WebKit/WebProcess/WebPage/mac/DrawingAreaMac.cpp (233059 => 233060)
--- trunk/Source/WebKit/WebProcess/WebPage/mac/DrawingAreaMac.cpp 2018-06-21 21:23:12 UTC (rev 233059)
+++ trunk/Source/WebKit/WebProcess/WebPage/mac/DrawingAreaMac.cpp 2018-06-21 21:42:59 UTC (rev 233060)
@@ -57,7 +57,7 @@
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,7 +69,7 @@
DisplayRefreshMonitorMac::DisplayRefreshMonitorMac(PlatformDisplayID displayID, WebPage& webPage)
: DisplayRefreshMonitor(displayID)
- , m_webPage(makeWeakPtr(webPage))
+ , m_webPage(webPage)
, m_observerID(++m_counterID)
{
}
@@ -76,19 +76,11 @@
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;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
