Title: [97332] trunk/Source/WebKit/chromium
- Revision
- 97332
- Author
- [email protected]
- Date
- 2011-10-12 18:50:41 -0700 (Wed, 12 Oct 2011)
Log Message
Fix CCThreadTest.startPostAndWaitOnCondition
https://bugs.webkit.org/show_bug.cgi?id=69967
Patch by Antoine Labour <[email protected]> on 2011-10-12
Reviewed by Darin Fisher.
* tests/CCThreadTest.cpp:
(WebKit::TEST):
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (97331 => 97332)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-10-13 01:44:14 UTC (rev 97331)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-10-13 01:50:41 UTC (rev 97332)
@@ -1,3 +1,13 @@
+2011-10-12 Antoine Labour <[email protected]>
+
+ Fix CCThreadTest.startPostAndWaitOnCondition
+ https://bugs.webkit.org/show_bug.cgi?id=69967
+
+ Reviewed by Darin Fisher.
+
+ * tests/CCThreadTest.cpp:
+ (WebKit::TEST):
+
2011-10-12 Sheriff Bot <[email protected]>
Unreviewed. Rolled DEPS.
Modified: trunk/Source/WebKit/chromium/tests/CCThreadTest.cpp (97331 => 97332)
--- trunk/Source/WebKit/chromium/tests/CCThreadTest.cpp 2011-10-13 01:44:14 UTC (rev 97331)
+++ trunk/Source/WebKit/chromium/tests/CCThreadTest.cpp 2011-10-13 01:50:41 UTC (rev 97332)
@@ -86,8 +86,17 @@
bool hit;
};
-TEST(CCThreadTest, DISABLED_startPostAndWaitOnCondition)
+#if OS(WINDOWS) || OS(MAC_OS_X)
+#define MAYBE_startPostAndWaitOnCondition DISABLED_startPostAndWaitOnCondition
+#else
+#define MAYBE_startPostAndWaitOnCondition startPostAndWaitOnCondition
+#endif
+
+TEST(CCThreadTest, MAYBE_startPostAndWaitOnCondition)
{
+ // CCMainThread is normally initialized by CCLayerTreeHost, but in this case
+ // we may run this test, before any CCLayerTreeHost gets instantiated.
+ CCMainThread::initialize();
OwnPtr<WebThread> webThread = adoptPtr(webKitPlatformSupport()->createThread("test"));
OwnPtr<CCThread> thread = WebKit::CCThreadImpl::create(webThread.get());
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
