Title: [279840] trunk/Source/WebKit
- Revision
- 279840
- Author
- [email protected]
- Date
- 2021-07-12 11:06:58 -0700 (Mon, 12 Jul 2021)
Log Message
Unreviewed, reverting r279835.
Newly added assertions are wrong
Reverted changeset:
"Regression(r279601) ProcessAssertion may get destroyed on a
background thread"
https://bugs.webkit.org/show_bug.cgi?id=227875
https://commits.webkit.org/r279835
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (279839 => 279840)
--- trunk/Source/WebKit/ChangeLog 2021-07-12 18:02:45 UTC (rev 279839)
+++ trunk/Source/WebKit/ChangeLog 2021-07-12 18:06:58 UTC (rev 279840)
@@ -1,5 +1,18 @@
2021-07-12 Chris Dumez <[email protected]>
+ Unreviewed, reverting r279835.
+
+ Newly added assertions are wrong
+
+ Reverted changeset:
+
+ "Regression(r279601) ProcessAssertion may get destroyed on a
+ background thread"
+ https://bugs.webkit.org/show_bug.cgi?id=227875
+ https://commits.webkit.org/r279835
+
+2021-07-12 Chris Dumez <[email protected]>
+
Regression(r279601) ProcessAssertion may get destroyed on a background thread
https://bugs.webkit.org/show_bug.cgi?id=227875
<rdar://76972252>
Modified: trunk/Source/WebKit/UIProcess/ProcessAssertion.h (279839 => 279840)
--- trunk/Source/WebKit/UIProcess/ProcessAssertion.h 2021-07-12 18:02:45 UTC (rev 279839)
+++ trunk/Source/WebKit/UIProcess/ProcessAssertion.h 2021-07-12 18:06:58 UTC (rev 279840)
@@ -54,7 +54,7 @@
FinishTaskUninterruptable,
};
-class ProcessAssertion : public ThreadSafeRefCounted<ProcessAssertion, WTF::DestructionThread::MainRunLoop>, public CanMakeWeakPtr<ProcessAssertion, WeakPtrFactoryInitialization::Eager> {
+class ProcessAssertion : public ThreadSafeRefCounted<ProcessAssertion>, public CanMakeWeakPtr<ProcessAssertion, WeakPtrFactoryInitialization::Eager> {
WTF_MAKE_FAST_ALLOCATED;
public:
enum class Mode : bool { Sync, Async };
Modified: trunk/Source/WebKit/UIProcess/ios/ProcessAssertionIOS.mm (279839 => 279840)
--- trunk/Source/WebKit/UIProcess/ios/ProcessAssertionIOS.mm 2021-07-12 18:02:45 UTC (rev 279839)
+++ trunk/Source/WebKit/UIProcess/ios/ProcessAssertionIOS.mm 2021-07-12 18:06:58 UTC (rev 279840)
@@ -321,7 +321,6 @@
, m_pid(pid)
, m_reason(reason)
{
- ASSERT(isMainRunLoop());
NSString *runningBoardAssertionName = runningBoardNameForAssertionType(assertionType);
ASSERT(runningBoardAssertionName);
if (!pid) {
@@ -366,7 +365,6 @@
ProcessAssertion::~ProcessAssertion()
{
- ASSERT(isMainRunLoop());
RELEASE_LOG(ProcessSuspension, "%p - ~ProcessAssertion: Releasing process assertion '%{public}s' for process with PID=%d", this, m_reason.utf8().data(), m_pid);
if (m_rbsAssertion) {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
