Title: [113307] trunk/Source
- Revision
- 113307
- Author
- [email protected]
- Date
- 2012-04-05 03:14:43 -0700 (Thu, 05 Apr 2012)
Log Message
webkit_unit_tests build fix.
https://bugs.webkit.org/show_bug.cgi?id=83261
Unreviewed, webkit_unit_tests buildfix.
The CCLayerTreeHostTestEmptyContentsShouldNotDraw.runMultiThread test
stopped working after r113254.
Disable it for now.
Source/WebCore:
* platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp:
(WebCore::CCLayerTreeHostImpl::canDraw):
Source/WebKit/chromium:
* tests/CCLayerTreeHostTest.cpp:
(WTF):
(WTF::TEST_F):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (113306 => 113307)
--- trunk/Source/WebCore/ChangeLog 2012-04-05 10:10:09 UTC (rev 113306)
+++ trunk/Source/WebCore/ChangeLog 2012-04-05 10:14:43 UTC (rev 113307)
@@ -1,3 +1,18 @@
+2012-04-05 Hans Wennborg <[email protected]>
+
+ webkit_unit_tests build fix.
+ https://bugs.webkit.org/show_bug.cgi?id=83261
+
+ Unreviewed, webkit_unit_tests buildfix.
+
+ The CCLayerTreeHostTestEmptyContentsShouldNotDraw.runMultiThread test
+ stopped working after r113254.
+
+ Disable it for now.
+
+ * platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp:
+ (WebCore::CCLayerTreeHostImpl::canDraw):
+
2012-04-05 Sudarsana Nagineni <[email protected]>
[EFL] keycode translation is wrong for function keys
Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp (113306 => 113307)
--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp 2012-04-05 10:10:09 UTC (rev 113306)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp 2012-04-05 10:14:43 UTC (rev 113307)
@@ -144,6 +144,8 @@
{
// FIXME: Reenable after figuring out why this causes the gpu_test
// ThreadedCompositorTest.ThreadedCompositor to fail.
+ // Also reenable CCLayerTreeHostTestEmptyContentsShouldNotDraw.runMultiThread
+ // in webkit_unit_tests.
if (!rootLayer()) // || rootLayer()->bounds().isEmpty())
return false;
if (viewportSize().isEmpty())
Modified: trunk/Source/WebKit/chromium/ChangeLog (113306 => 113307)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-04-05 10:10:09 UTC (rev 113306)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-04-05 10:14:43 UTC (rev 113307)
@@ -1,3 +1,19 @@
+2012-04-05 Hans Wennborg <[email protected]>
+
+ webkit_unit_tests build fix.
+ https://bugs.webkit.org/show_bug.cgi?id=83261
+
+ Unreviewed, webkit_unit_tests buildfix.
+
+ The CCLayerTreeHostTestEmptyContentsShouldNotDraw.runMultiThread test
+ stopped working after r113254.
+
+ Disable it for now.
+
+ * tests/CCLayerTreeHostTest.cpp:
+ (WTF):
+ (WTF::TEST_F):
+
2012-04-05 Jochen Eisinger <[email protected]>
[chromium] Only shut down V8 if we actually initialized it
Modified: trunk/Source/WebKit/chromium/tests/CCLayerTreeHostTest.cpp (113306 => 113307)
--- trunk/Source/WebKit/chromium/tests/CCLayerTreeHostTest.cpp 2012-04-05 10:10:09 UTC (rev 113306)
+++ trunk/Source/WebKit/chromium/tests/CCLayerTreeHostTest.cpp 2012-04-05 10:14:43 UTC (rev 113307)
@@ -870,7 +870,9 @@
int m_numCommits;
};
-TEST_F(CCLayerTreeHostTestEmptyContentsShouldNotDraw, runMultiThread)
+// FIXME: This was disabled after r113254, which made a temporary change to
+// CCLayerTreeHostImpl::canDraw().
+TEST_F(CCLayerTreeHostTestEmptyContentsShouldNotDraw, FAILS_runMultiThread)
{
runTestThreaded();
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
