Title: [235788] trunk
- Revision
- 235788
- Author
- [email protected]
- Date
- 2018-09-07 11:15:48 -0700 (Fri, 07 Sep 2018)
Log Message
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
Modified Paths
Diff
Modified: trunk/Source/WTF/ChangeLog (235787 => 235788)
--- trunk/Source/WTF/ChangeLog 2018-09-07 17:50:35 UTC (rev 235787)
+++ trunk/Source/WTF/ChangeLog 2018-09-07 18:15:48 UTC (rev 235788)
@@ -1,3 +1,17 @@
+2018-09-07 Commit Queue <[email protected]>
+
+ 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 <[email protected]>
[RunLoopGeneric] OneShotTimer should be inactive when fired.
Modified: trunk/Source/WTF/wtf/generic/RunLoopGeneric.cpp (235787 => 235788)
--- trunk/Source/WTF/wtf/generic/RunLoopGeneric.cpp 2018-09-07 17:50:35 UTC (rev 235787)
+++ trunk/Source/WTF/wtf/generic/RunLoopGeneric.cpp 2018-09-07 18:15:48 UTC (rev 235788)
@@ -50,13 +50,12 @@
if (!isActive())
return false;
+ m_function();
+
if (!m_isRepeating)
- deactivate();
+ return false;
- m_function();
-
- if (isActive())
- updateReadyTime();
+ updateReadyTime();
return isActive();
}
@@ -291,7 +290,7 @@
bool RunLoop::TimerBase::isActive(const AbstractLocker&) const
{
- return m_scheduledTask && m_scheduledTask->isActive();
+ return m_scheduledTask;
}
Seconds RunLoop::TimerBase::secondsUntilFire() const
Modified: trunk/Tools/ChangeLog (235787 => 235788)
--- trunk/Tools/ChangeLog 2018-09-07 17:50:35 UTC (rev 235787)
+++ trunk/Tools/ChangeLog 2018-09-07 18:15:48 UTC (rev 235788)
@@ -1,3 +1,17 @@
+2018-09-07 Commit Queue <[email protected]>
+
+ 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 <[email protected]>
[RunLoopGeneric] OneShotTimer should be inactive when fired.
Modified: trunk/Tools/TestWebKitAPI/Tests/WTF/RunLoop.cpp (235787 => 235788)
--- trunk/Tools/TestWebKitAPI/Tests/WTF/RunLoop.cpp 2018-09-07 17:50:35 UTC (rev 235787)
+++ trunk/Tools/TestWebKitAPI/Tests/WTF/RunLoop.cpp 2018-09-07 18:15:48 UTC (rev 235788)
@@ -85,7 +85,6 @@
void fired()
{
- EXPECT_FALSE(isActive());
m_testFinished = true;
stop();
}
@@ -101,44 +100,6 @@
}
}
-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 @@
void fired()
{
- EXPECT_TRUE(isActive());
if (++m_count == 10) {
m_testFinished = true;
stop();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
