Title: [113332] trunk/Source
- Revision
- 113332
- Author
- z...@google.com
- Date
- 2012-04-05 10:11:41 -0700 (Thu, 05 Apr 2012)
Log Message
Unreviewed, rolling out r113307.
http://trac.webkit.org/changeset/113307
https://bugs.webkit.org/show_bug.cgi?id=83288
Requested by siev...@chromium.org (Requested by zhenyao on
#webkit).
Patch by Sheriff Bot <webkit.review....@gmail.com> on 2012-04-05
Source/WebCore:
* platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp:
(WebCore::CCLayerTreeHostImpl::canDraw):
Source/WebKit/chromium:
* tests/CCLayerTreeHostTest.cpp:
(WTF::TEST_F):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (113331 => 113332)
--- trunk/Source/WebCore/ChangeLog 2012-04-05 16:56:02 UTC (rev 113331)
+++ trunk/Source/WebCore/ChangeLog 2012-04-05 17:11:41 UTC (rev 113332)
@@ -1,3 +1,15 @@
+2012-04-05 Sheriff Bot <webkit.review....@gmail.com>
+
+ Unreviewed, rolling out r113307.
+ http://trac.webkit.org/changeset/113307
+ https://bugs.webkit.org/show_bug.cgi?id=83288
+
+ Requested by siev...@chromium.org (Requested by zhenyao on
+ #webkit).
+
+ * platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp:
+ (WebCore::CCLayerTreeHostImpl::canDraw):
+
2012-03-14 Antonio Gomes <ago...@rim.com>
Extend HitTestResult to support not "discarding" shadow content in favor of its DOM ancestor
Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp (113331 => 113332)
--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp 2012-04-05 16:56:02 UTC (rev 113331)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp 2012-04-05 17:11:41 UTC (rev 113332)
@@ -144,8 +144,6 @@
{
// 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 (113331 => 113332)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-04-05 16:56:02 UTC (rev 113331)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-04-05 17:11:41 UTC (rev 113332)
@@ -1,3 +1,15 @@
+2012-04-05 Sheriff Bot <webkit.review....@gmail.com>
+
+ Unreviewed, rolling out r113307.
+ http://trac.webkit.org/changeset/113307
+ https://bugs.webkit.org/show_bug.cgi?id=83288
+
+ Requested by siev...@chromium.org (Requested by zhenyao on
+ #webkit).
+
+ * tests/CCLayerTreeHostTest.cpp:
+ (WTF::TEST_F):
+
2012-04-05 Pavel Feldman <pfeld...@chromium.org>
Web Inspector: [chromium] clean up WDTFC::saveAs after migration to save()
Modified: trunk/Source/WebKit/chromium/tests/CCLayerTreeHostTest.cpp (113331 => 113332)
--- trunk/Source/WebKit/chromium/tests/CCLayerTreeHostTest.cpp 2012-04-05 16:56:02 UTC (rev 113331)
+++ trunk/Source/WebKit/chromium/tests/CCLayerTreeHostTest.cpp 2012-04-05 17:11:41 UTC (rev 113332)
@@ -870,9 +870,7 @@
int m_numCommits;
};
-// FIXME: This was disabled after r113254, which made a temporary change to
-// CCLayerTreeHostImpl::canDraw().
-TEST_F(CCLayerTreeHostTestEmptyContentsShouldNotDraw, FAILS_runMultiThread)
+TEST_F(CCLayerTreeHostTestEmptyContentsShouldNotDraw, runMultiThread)
{
runTestThreaded();
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
