Modified: trunk/Source/WebKit/chromium/ChangeLog (120379 => 120380)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-06-15 00:12:40 UTC (rev 120379)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-06-15 00:35:53 UTC (rev 120380)
@@ -1,3 +1,18 @@
+2012-06-14 Shawn Singh <shawnsi...@chromium.org>
+
+ [chromium] CCLayerTreeHostCommonTest.verifyHitTestingForSingleLayer failing in debug
+ https://bugs.webkit.org/show_bug.cgi?id=89065
+
+ Reviewed by James Robinson.
+
+ A debug assertion was being triggered in the hit-testing unit
+ tests because I accidentally forgot to set the
+ DebugScopedSetImplThread for the tests.
+
+ This patch also re-enables the disabled broken test.
+
+ * tests/CCLayerTreeHostCommonTest.cpp:
+
2012-06-14 Xianzhu Wang <wangxian...@chromium.org>
[Chromium] Add setAutoHint() and setUseBitmaps() in WebFontRendering
Modified: trunk/Source/WebKit/chromium/tests/CCLayerTreeHostCommonTest.cpp (120379 => 120380)
--- trunk/Source/WebKit/chromium/tests/CCLayerTreeHostCommonTest.cpp 2012-06-15 00:12:40 UTC (rev 120379)
+++ trunk/Source/WebKit/chromium/tests/CCLayerTreeHostCommonTest.cpp 2012-06-15 00:35:53 UTC (rev 120380)
@@ -2913,6 +2913,7 @@
TEST(CCLayerTreeHostCommonTest, verifyHitTestingForEmptyLayerList)
{
// Hit testing on an empty renderSurfaceLayerList should return a null pointer.
+ DebugScopedSetImplThread thisScopeIsOnImplThread;
Vector<CCLayerImpl*> renderSurfaceLayerList;
@@ -2925,8 +2926,10 @@
EXPECT_FALSE(resultLayer);
}
-TEST(CCLayerTreeHostCommonTest, DISABLED_verifyHitTestingForSingleLayer)
+TEST(CCLayerTreeHostCommonTest, verifyHitTestingForSingleLayer)
{
+ DebugScopedSetImplThread thisScopeIsOnImplThread;
+
OwnPtr<CCLayerImpl> root = CCLayerImpl::create(12345);
root->createRenderSurface();
root->renderSurface()->setContentRect(IntRect(IntPoint::zero(), IntSize(100, 100)));
@@ -3038,6 +3041,8 @@
TEST(CCLayerTreeHostCommonTest, verifyHitTestingForSinglePositionedLayer)
{
+ DebugScopedSetImplThread thisScopeIsOnImplThread;
+
OwnPtr<CCLayerImpl> root = CCLayerImpl::create(12345);
root->createRenderSurface();
root->renderSurface()->setContentRect(IntRect(IntPoint::zero(), IntSize(100, 100)));
@@ -3084,6 +3089,8 @@
TEST(CCLayerTreeHostCommonTest, verifyHitTestingForSingleRotatedLayer)
{
+ DebugScopedSetImplThread thisScopeIsOnImplThread;
+
OwnPtr<CCLayerImpl> root = CCLayerImpl::create(12345);
root->createRenderSurface();
root->renderSurface()->setContentRect(IntRect(IntPoint::zero(), IntSize(100, 100)));
@@ -3138,6 +3145,8 @@
TEST(CCLayerTreeHostCommonTest, verifyHitTestingForSinglePerspectiveLayer)
{
+ DebugScopedSetImplThread thisScopeIsOnImplThread;
+
OwnPtr<CCLayerImpl> root = CCLayerImpl::create(12345);
root->createRenderSurface();
root->renderSurface()->setContentRect(IntRect(IntPoint::zero(), IntSize(100, 100)));
@@ -3204,6 +3213,7 @@
// contentsScale is ignored, then hit testing will mis-interpret the visibleLayerRect
// as being larger than the actual bounds of the layer.
//
+ DebugScopedSetImplThread thisScopeIsOnImplThread;
OwnPtr<CCLayerImpl> root = CCLayerImpl::create(12345);
root->createRenderSurface();
@@ -3258,6 +3268,7 @@
{
// Test that hit-testing will only work for the visible portion of a layer, and not
// the entire layer bounds. Here we just test the simple axis-aligned case.
+ DebugScopedSetImplThread thisScopeIsOnImplThread;
OwnPtr<CCLayerImpl> root = CCLayerImpl::create(123);
root->createRenderSurface();
@@ -3325,6 +3336,7 @@
// combined create a triangle. The rotatedLeaf will only be visible where it overlaps
// this triangle.
//
+ DebugScopedSetImplThread thisScopeIsOnImplThread;
OwnPtr<CCLayerImpl> root = CCLayerImpl::create(123);
root->createRenderSurface();
@@ -3427,6 +3439,8 @@
TEST(CCLayerTreeHostCommonTest, verifyHitTestingForMultipleLayers)
{
+ DebugScopedSetImplThread thisScopeIsOnImplThread;
+
OwnPtr<CCLayerImpl> root = CCLayerImpl::create(1);
root->createRenderSurface();
root->renderSurface()->setContentRect(IntRect(IntPoint::zero(), IntSize(100, 100)));
@@ -3535,6 +3549,7 @@
// The geometry is set up similarly to the previous case, but
// all layers are forced to be renderSurfaces now.
//
+ DebugScopedSetImplThread thisScopeIsOnImplThread;
OwnPtr<CCLayerImpl> root = CCLayerImpl::create(1);
root->createRenderSurface();
