WebKit Bugzilla
Attachment 349166 Details for
Bug 189421
: REGRESSION(r235784): RunLoopCF does not agree to the fix (Requested by yusukesuzuki on #webkit).
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
ROLLOUT of r235784
bug-189421-20180907141325.patch (text/plain), 4.24 KB, created by
WebKit Commit Bot
on 2018-09-07 11:13:26 PDT
(
hide
)
Description:
ROLLOUT of r235784
Filename:
MIME Type:
Creator:
WebKit Commit Bot
Created:
2018-09-07 11:13:26 PDT
Size:
4.24 KB
patch
obsolete
>Subversion Revision: 235787 >diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog >index 7256148b5b1088b9f0aaa3061d7ffd815157d8c9..1b80c24f1d31939b3d580e7029ed3ca731cae224 100644 >--- a/Source/WTF/ChangeLog >+++ b/Source/WTF/ChangeLog >@@ -1,3 +1,17 @@ >+2018-09-07 Commit Queue <commit-queue@webkit.org> >+ >+ Unreviewed, rolling out r235784. >+ https://bugs.webkit.org/show_bug.cgi?id=189421 >+ >+ RunLoopCF does not agree to the fix (Requested by yusukesuzuki >+ on #webkit). >+ >+ Reverted changeset: >+ >+ "[RunLoopGeneric] OneShotTimer should be inactive when fired." >+ https://bugs.webkit.org/show_bug.cgi?id=189335 >+ https://trac.webkit.org/changeset/235784 >+ > 2018-09-07 Yoshiaki Jitsukawa <yoshiaki.jitsukawa@sony.com> > > [RunLoopGeneric] OneShotTimer should be inactive when fired. >diff --git a/Source/WTF/wtf/generic/RunLoopGeneric.cpp b/Source/WTF/wtf/generic/RunLoopGeneric.cpp >index b45b1b95bdf3a955f495e120b41a0f8256b1fe7a..7869199798c55d821463d5efc180651d1a10d146 100644 >--- a/Source/WTF/wtf/generic/RunLoopGeneric.cpp >+++ b/Source/WTF/wtf/generic/RunLoopGeneric.cpp >@@ -50,13 +50,12 @@ public: > if (!isActive()) > return false; > >- if (!m_isRepeating) >- deactivate(); >- > m_function(); > >- if (isActive()) >- updateReadyTime(); >+ if (!m_isRepeating) >+ return false; >+ >+ updateReadyTime(); > return isActive(); > } > >@@ -291,7 +290,7 @@ bool RunLoop::TimerBase::isActive() const > > bool RunLoop::TimerBase::isActive(const AbstractLocker&) const > { >- return m_scheduledTask && m_scheduledTask->isActive(); >+ return m_scheduledTask; > } > > Seconds RunLoop::TimerBase::secondsUntilFire() const >diff --git a/Tools/ChangeLog b/Tools/ChangeLog >index 187ba92122519073f2dede02a69bbaf04a339d99..400c797762ce62c45a5d274df8bd1cc87a3b2912 100644 >--- a/Tools/ChangeLog >+++ b/Tools/ChangeLog >@@ -1,3 +1,17 @@ >+2018-09-07 Commit Queue <commit-queue@webkit.org> >+ >+ Unreviewed, rolling out r235784. >+ https://bugs.webkit.org/show_bug.cgi?id=189421 >+ >+ RunLoopCF does not agree to the fix (Requested by yusukesuzuki >+ on #webkit). >+ >+ Reverted changeset: >+ >+ "[RunLoopGeneric] OneShotTimer should be inactive when fired." >+ https://bugs.webkit.org/show_bug.cgi?id=189335 >+ https://trac.webkit.org/changeset/235784 >+ > 2018-09-07 Yoshiaki Jitsukawa <yoshiaki.jitsukawa@sony.com> > > [RunLoopGeneric] OneShotTimer should be inactive when fired. >diff --git a/Tools/TestWebKitAPI/Tests/WTF/RunLoop.cpp b/Tools/TestWebKitAPI/Tests/WTF/RunLoop.cpp >index 33c69ffaea26b536f68b6e965b39e3b1434b1e7a..93b3d8c28f3208176cd3bc52b7f9e3d614a07917 100644 >--- a/Tools/TestWebKitAPI/Tests/WTF/RunLoop.cpp >+++ b/Tools/TestWebKitAPI/Tests/WTF/RunLoop.cpp >@@ -85,7 +85,6 @@ TEST(WTF_RunLoop, OneShotTimer) > > void fired() > { >- EXPECT_FALSE(isActive()); > m_testFinished = true; > stop(); > } >@@ -101,44 +100,6 @@ TEST(WTF_RunLoop, OneShotTimer) > } > } > >-TEST(WTF_RunLoop, ChainingOneShotTimer) >-{ >- RunLoop::initializeMainRunLoop(); >- >- bool testFinished = false; >- >- class DerivedTimer : public RunLoop::Timer<DerivedTimer> { >- public: >- DerivedTimer(bool& testFinished) >- : RunLoop::Timer<DerivedTimer>(RunLoop::current(), this, &DerivedTimer::fired) >- , m_testFinished(testFinished) >- { >- } >- >- void fired() >- { >- EXPECT_FALSE(isActive()); >- if (++m_count != 2) { >- startOneShot(100_ms); >- EXPECT_TRUE(isActive()); >- } else { >- m_testFinished = true; >- stop(); >- } >- } >- >- private: >- unsigned m_count { 0 }; >- bool& m_testFinished; >- }; >- >- { >- DerivedTimer timer(testFinished); >- timer.startOneShot(100_ms); >- Util::run(&testFinished); >- } >-} >- > TEST(WTF_RunLoop, RepeatingTimer) > { > RunLoop::initializeMainRunLoop(); >@@ -155,7 +116,6 @@ TEST(WTF_RunLoop, RepeatingTimer) > > void fired() > { >- EXPECT_TRUE(isActive()); > if (++m_count == 10) { > m_testFinished = true; > stop();
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 189421
: 349166