Title: [98088] trunk/Source
- Revision
- 98088
- Author
- [email protected]
- Date
- 2011-10-21 01:55:00 -0700 (Fri, 21 Oct 2011)
Log Message
Unreviewed, rolling out r98085.
http://trac.webkit.org/changeset/98085
https://bugs.webkit.org/show_bug.cgi?id=70589
It broke the build (Requested by Ossy on #webkit).
Patch by Sheriff Bot <[email protected]> on 2011-10-21
Source/WebKit/qt:
* tests/util.h:
Source/WebKit2:
* UIProcess/API/qt/tests/util.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit/qt/ChangeLog (98087 => 98088)
--- trunk/Source/WebKit/qt/ChangeLog 2011-10-21 08:49:35 UTC (rev 98087)
+++ trunk/Source/WebKit/qt/ChangeLog 2011-10-21 08:55:00 UTC (rev 98088)
@@ -1,3 +1,13 @@
+2011-10-21 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r98085.
+ http://trac.webkit.org/changeset/98085
+ https://bugs.webkit.org/show_bug.cgi?id=70589
+
+ It broke the build (Requested by Ossy on #webkit).
+
+ * tests/util.h:
+
2011-10-21 Csaba Osztrogonác <[email protected]>
[Qt][WK2] Unreviewed buildfix for newer Qt5. Remove duplicated defines.
Modified: trunk/Source/WebKit/qt/tests/util.h (98087 => 98088)
--- trunk/Source/WebKit/qt/tests/util.h 2011-10-21 08:49:35 UTC (rev 98087)
+++ trunk/Source/WebKit/qt/tests/util.h 2011-10-21 08:55:00 UTC (rev 98088)
@@ -48,3 +48,31 @@
loop.exec();
return timeoutSpy.isEmpty();
}
+
+// Will try to wait for the condition while allowing event processing
+#define QTRY_VERIFY(__expr) \
+ do { \
+ const int __step = 50; \
+ const int __timeout = 5000; \
+ if (!(__expr)) { \
+ QTest::qWait(0); \
+ } \
+ for (int __i = 0; __i < __timeout && !(__expr); __i+=__step) { \
+ QTest::qWait(__step); \
+ } \
+ QVERIFY(__expr); \
+ } while(0)
+
+// Will try to wait for the condition while allowing event processing
+#define QTRY_COMPARE(__expr, __expected) \
+ do { \
+ const int __step = 50; \
+ const int __timeout = 5000; \
+ if ((__expr) != (__expected)) { \
+ QTest::qWait(0); \
+ } \
+ for (int __i = 0; __i < __timeout && ((__expr) != (__expected)); __i+=__step) { \
+ QTest::qWait(__step); \
+ } \
+ QCOMPARE(__expr, __expected); \
+ } while(0)
Modified: trunk/Source/WebKit2/ChangeLog (98087 => 98088)
--- trunk/Source/WebKit2/ChangeLog 2011-10-21 08:49:35 UTC (rev 98087)
+++ trunk/Source/WebKit2/ChangeLog 2011-10-21 08:55:00 UTC (rev 98088)
@@ -1,3 +1,13 @@
+2011-10-21 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r98085.
+ http://trac.webkit.org/changeset/98085
+ https://bugs.webkit.org/show_bug.cgi?id=70589
+
+ It broke the build (Requested by Ossy on #webkit).
+
+ * UIProcess/API/qt/tests/util.h:
+
2011-10-21 Carlos Garcia Campos <[email protected]>
[GTK] Fix API documentation comment for webkit_web_view_get_estimated_load_progress()
Modified: trunk/Source/WebKit2/UIProcess/API/qt/tests/util.h (98087 => 98088)
--- trunk/Source/WebKit2/UIProcess/API/qt/tests/util.h 2011-10-21 08:49:35 UTC (rev 98087)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/util.h 2011-10-21 08:55:00 UTC (rev 98088)
@@ -28,3 +28,31 @@
void addQtWebProcessToPath();
bool waitForSignal(QObject*, const char* signal, int timeout = 10000);
+
+// Will try to wait for the condition while allowing event processing
+#define QTRY_VERIFY(__expr) \
+ do { \
+ const int __step = 50; \
+ const int __timeout = 5000; \
+ if (!(__expr)) { \
+ QTest::qWait(0); \
+ } \
+ for (int __i = 0; __i < __timeout && !(__expr); __i+=__step) { \
+ QTest::qWait(__step); \
+ } \
+ QVERIFY(__expr); \
+ } while(0)
+
+// Will try to wait for the condition while allowing event processing
+#define QTRY_COMPARE(__expr, __expected) \
+ do { \
+ const int __step = 50; \
+ const int __timeout = 5000; \
+ if ((__expr) != (__expected)) { \
+ QTest::qWait(0); \
+ } \
+ for (int __i = 0; __i < __timeout && ((__expr) != (__expected)); __i+=__step) { \
+ QTest::qWait(__step); \
+ } \
+ QCOMPARE(__expr, __expected); \
+ } while(0)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
