summaryrefslogtreecommitdiffstats
path: root/content/renderer
diff options
context:
space:
mode:
authorperkj@chromium.org <perkj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-18 10:54:15 +0000
committerperkj@chromium.org <perkj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-18 10:54:15 +0000
commit92b72ac6b4d1cae8d759676e0a71c05f7e3bae50 (patch)
treeb20e94ca634e8cf63d1631ed7ca536af9907b43e /content/renderer
parent085fd942793bad7ec5a52f069d56f75f180b93f6 (diff)
downloadchromium_src-92b72ac6b4d1cae8d759676e0a71c05f7e3bae50.zip
chromium_src-92b72ac6b4d1cae8d759676e0a71c05f7e3bae50.tar.gz
chromium_src-92b72ac6b4d1cae8d759676e0a71c05f7e3bae50.tar.bz2
Disable WebLayerImplFixedBoundsTest.CompareToWebLayerImplComplex and CompareToWebLayerImplComplex on lsan.
These two tests are not new but are run under content_unittests as of r277988. https://codereview.chromium.org/317163002 BUG=386080 TBR=amogh.bihani@samsung.com, Review URL: https://codereview.chromium.org/340723004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@278025 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer')
-rw-r--r--content/renderer/compositor_bindings/web_layer_impl_fixed_bounds_unittest.cc17
1 files changed, 15 insertions, 2 deletions
diff --git a/content/renderer/compositor_bindings/web_layer_impl_fixed_bounds_unittest.cc b/content/renderer/compositor_bindings/web_layer_impl_fixed_bounds_unittest.cc
index 1935e20..1ab52f0 100644
--- a/content/renderer/compositor_bindings/web_layer_impl_fixed_bounds_unittest.cc
+++ b/content/renderer/compositor_bindings/web_layer_impl_fixed_bounds_unittest.cc
@@ -142,15 +142,28 @@ void CompareFixedBoundsLayerAndNormalLayer(const WebFloatPoint& anchor_point,
}
}
+// TODO(perkj): CompareToWebLayerImplSimple disabled on LSAN due to crbug/386080
+#if defined(LEAK_SANITIZER)
+#define MAYBE_CompareToWebLayerImplSimple DISABLED_CompareToWebLayerImplSimple
+#else
+#define MAYBE_CompareToWebLayerImplSimple CompareToWebLayerImplSimple
+#endif
// A black box test that ensures WebLayerImplFixedBounds won't change target
// geometries. Simple case: identity transforms and zero anchor point.
-TEST(WebLayerImplFixedBoundsTest, CompareToWebLayerImplSimple) {
+TEST(WebLayerImplFixedBoundsTest, MAYBE_CompareToWebLayerImplSimple) {
CompareFixedBoundsLayerAndNormalLayer(WebFloatPoint(0, 0), gfx::Transform());
}
+// TODO(perkj): CompareToWebLayerImplComplex disabled on LSAN due to
+// crbug/386080
+#if defined(LEAK_SANITIZER)
+#define MAYBE_CompareToWebLayerImplComplex DISABLED_CompareToWebLayerImplComplex
+#else
+#define MAYBE_CompareToWebLayerImplComplex CompareToWebLayerImplComplex
+#endif
// A black box test that ensures WebLayerImplFixedBounds won't change target
// geometries. Complex case: complex transforms and non-zero anchor point.
-TEST(WebLayerImplFixedBoundsTest, CompareToWebLayerImplComplex) {
+TEST(WebLayerImplFixedBoundsTest, MAYBE_CompareToWebLayerImplComplex) {
gfx::Transform transform;
// These are arbitrary values that should not affect the results.
transform.Translate3d(50, 60, 70);