Title: [117286] trunk
- Revision
- 117286
- Author
- [email protected]
- Date
- 2012-05-16 07:21:02 -0700 (Wed, 16 May 2012)
Log Message
Source/WebCore: Unreviewed, rolling out r110699.
http://trac.webkit.org/changeset/110699
https://bugs.webkit.org/show_bug.cgi?id=80982
Not needed anymore and broke modal event loops
* platform/qt/RunLoopQt.cpp:
(WebCore::RunLoop::TimerObject::TimerObject):
(WebCore::RunLoop::TimerObject::performWork):
(RunLoop::TimerObject):
LayoutTests: Unskip fast/animation/request-animation-frame-during-modal.html that was
skipped due to r110699.
* platform/qt-5.0-wk2/Skipped:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (117285 => 117286)
--- trunk/LayoutTests/ChangeLog 2012-05-16 14:08:05 UTC (rev 117285)
+++ trunk/LayoutTests/ChangeLog 2012-05-16 14:21:02 UTC (rev 117286)
@@ -1,3 +1,10 @@
+2012-05-16 Simon Hausmann <[email protected]>
+
+ Unskip fast/animation/request-animation-frame-during-modal.html that was
+ skipped due to r110699.
+
+ * platform/qt-5.0-wk2/Skipped:
+
2012-05-16 Csaba Osztrogonác <[email protected]>
Unreviewed gardening: updating expectations after r117259
Modified: trunk/LayoutTests/platform/qt-5.0-wk2/Skipped (117285 => 117286)
--- trunk/LayoutTests/platform/qt-5.0-wk2/Skipped 2012-05-16 14:08:05 UTC (rev 117285)
+++ trunk/LayoutTests/platform/qt-5.0-wk2/Skipped 2012-05-16 14:21:02 UTC (rev 117286)
@@ -321,10 +321,6 @@
# https://bugs.webkit.org/show_bug.cgi?id=74504
fast/dom/rtl-scroll-to-leftmost-and-resize.html
-# [Qt][WK2]REGRESSION(r110699): It made fast/animation/request-animation-frame-during-modal.html timeout
-# https://bugs.webkit.org/show_bug.cgi?id=81671
-fast/animation/request-animation-frame-during-modal.html
-
# flakey svg tests
svg/custom/getscreenctm-in-scrollable-svg-area.xhtml
svg/custom/getscreenctm-in-scrollable-div-area.xhtml
Modified: trunk/Source/WebCore/ChangeLog (117285 => 117286)
--- trunk/Source/WebCore/ChangeLog 2012-05-16 14:08:05 UTC (rev 117285)
+++ trunk/Source/WebCore/ChangeLog 2012-05-16 14:21:02 UTC (rev 117286)
@@ -1,3 +1,16 @@
+2012-05-16 Simon Hausmann <[email protected]>
+
+ Unreviewed, rolling out r110699.
+ http://trac.webkit.org/changeset/110699
+ https://bugs.webkit.org/show_bug.cgi?id=80982
+
+ Not needed anymore and broke modal event loops
+
+ * platform/qt/RunLoopQt.cpp:
+ (WebCore::RunLoop::TimerObject::TimerObject):
+ (WebCore::RunLoop::TimerObject::performWork):
+ (RunLoop::TimerObject):
+
2012-05-16 Pavel Feldman <[email protected]>
Web Inspector: split ScriptMapping into UISourceCodeProvider and SourceMapping.
Modified: trunk/Source/WebCore/platform/qt/RunLoopQt.cpp (117285 => 117286)
--- trunk/Source/WebCore/platform/qt/RunLoopQt.cpp 2012-05-16 14:08:05 UTC (rev 117285)
+++ trunk/Source/WebCore/platform/qt/RunLoopQt.cpp 2012-05-16 14:21:02 UTC (rev 117286)
@@ -39,30 +39,13 @@
class RunLoop::TimerObject : public QObject {
Q_OBJECT
public:
- TimerObject(RunLoop* runLoop)
- : m_runLoop(runLoop)
- , m_pendingPerformWorkInvocations(0)
+ TimerObject(RunLoop* runLoop) : m_runLoop(runLoop)
{
int methodIndex = metaObject()->indexOfMethod("performWork()");
m_method = metaObject()->method(methodIndex);
}
- Q_SLOT void performWork() {
- // It may happen that a secondary thread adds more method invocations via
- // RunLoop::dispatch(), which will schedule a call to this function. If during
- // performWork() event loop messages get processed, it may happen that this
- // function is called again. In this case we should protected ourselves against
- // recursive - and thus out-of-order - message dispatching and instead perform
- // the work serially.
- m_pendingPerformWorkInvocations++;
- if (m_pendingPerformWorkInvocations > 1)
- return;
-
- while (m_pendingPerformWorkInvocations) {
- m_runLoop->performWork();
- m_pendingPerformWorkInvocations--;
- }
- }
+ Q_SLOT void performWork() { m_runLoop->performWork(); }
inline void wakeUp() { m_method.invoke(this, Qt::QueuedConnection); }
protected:
@@ -74,7 +57,6 @@
private:
RunLoop* m_runLoop;
QMetaMethod m_method;
- int m_pendingPerformWorkInvocations;
};
static QEventLoop* currentEventLoop;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
