commit b602d4dff8a353f686ce6d7f9d01b7882cc10277
author bsalomon <bsalomon@google.com> Thu Feb 19 12:05:58 2015 -0800
committer Commit bot <commit-bot@chromium.org> Thu Feb 19 12:05:58 2015 -0800
tree 66de1e22bf468864eee0e7e046d34f7e45c80219
parent c8e4765b8e72f6792bd739ce871f2f1e9f878d10

Speculative fix for nexus player unit test failure

TBR=robertphillips@google.com

NOTREECHECKS=true

Review URL: https://codereview.chromium.org/941433006

tests/ResourceCacheTest.cpp

diff --git a/tests/ResourceCacheTest.cpp b/tests/ResourceCacheTest.cpp
index 8316c6b..d063b6a 100644
--- a/tests/ResourceCacheTest.cpp
+++ b/tests/ResourceCacheTest.cpp
@@ -104,6 +104,12 @@
         GrSurfaceDesc smallMSAADesc = smallDesc;
         smallMSAADesc.fSampleCnt = 4;
         SkAutoTUnref<GrTexture> smallMSAART0(context->createTexture(smallMSAADesc, false));
+#ifdef SK_BUILD_FOR_ANDROID
+        if (!smallMSAART0) {
+            // The nexus player seems to fail to create MSAA textures.
+            return;
+        }
+#endif
         REPORTER_ASSERT(reporter, smallRT0 && smallMSAART0 &&
                                   smallRT0->asRenderTarget() && smallMSAART0->asRenderTarget() &&
                                   smallRT0->asRenderTarget()->getStencilBuffer() !=