commit 123b7b8ebd2f8abb7e3b2d498f299ae281b24b74
author Robert Phillips <robertphillips@google.com> Tue Apr 11 09:09:24 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Apr 12 11:14:31 2017 +0000
tree 2cbf0655227e1d2da1dc87c002100ccbd302bc74
parent 8f30709e93ba377a0bf77f24aeae890d38b66e52

Disable deferred proxies for Chrome branch

Chrome is branching again and Proxy instantiation is still occurring at a bad spot in Skia.

Change-Id: I2f6bed7f1833737aa9bb7fd819ff108cffaeaf1d
Reviewed-on: https://skia-review.googlesource.com/13133
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>

tests/ProxyRefTest.cpp

diff --git a/tests/ProxyRefTest.cpp b/tests/ProxyRefTest.cpp
index dc48ef0..708c7b3 100644
--- a/tests/ProxyRefTest.cpp
+++ b/tests/ProxyRefTest.cpp
@@ -47,6 +47,8 @@
     return fPendingWrites;
 }
 
+#ifndef SK_DISABLE_DEFERRED_PROXIES
+
 static const int kWidthHeight = 128;
 
 static void check_refs(skiatest::Reporter* reporter,
@@ -189,3 +191,5 @@
     }
 }
 #endif
+
+#endif