| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  * Copyright 2012 Google Inc. | 2  * Copyright 2012 Google Inc. | 
| 3  * | 3  * | 
| 4  * Use of this source code is governed by a BSD-style license that can be | 4  * Use of this source code is governed by a BSD-style license that can be | 
| 5  * found in the LICENSE file. | 5  * found in the LICENSE file. | 
| 6  */ | 6  */ | 
| 7 | 7 | 
| 8 #include "Test.h" |  | 
| 9 #include "SkGraphics.h" | 8 #include "SkGraphics.h" | 
| 10 #include "SkPaint.h" | 9 #include "SkPaint.h" | 
| 11 #include "SkTLS.h" | 10 #include "SkTLS.h" | 
| 12 #include "SkThreadUtils.h" | 11 #include "SkThreadUtils.h" | 
|  | 12 #include "Test.h" | 
| 13 | 13 | 
| 14 static void thread_main(void*) { | 14 static void thread_main(void*) { | 
| 15     SkGraphics::SetTLSFontCacheLimit(1 * 1024 * 1024); | 15     SkGraphics::SetTLSFontCacheLimit(1 * 1024 * 1024); | 
| 16 | 16 | 
| 17     const char text[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; | 17     const char text[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; | 
| 18     size_t len = strlen(text); | 18     size_t len = strlen(text); | 
| 19 | 19 | 
| 20     SkPaint paint; | 20     SkPaint paint; | 
| 21 | 21 | 
| 22     for (int j = 0; j < 10; ++j) { | 22     for (int j = 0; j < 10; ++j) { | 
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 71     // TODO: Disabled for now to work around | 71     // TODO: Disabled for now to work around | 
| 72     // http://code.google.com/p/skia/issues/detail?id=619 | 72     // http://code.google.com/p/skia/issues/detail?id=619 | 
| 73     // ('flaky segfault in TLS test on Shuttle_Ubuntu12 buildbots') | 73     // ('flaky segfault in TLS test on Shuttle_Ubuntu12 buildbots') | 
| 74     if( false ) test_threads(&thread_main); | 74     if( false ) test_threads(&thread_main); | 
| 75 | 75 | 
| 76     // Test to ensure that at thread destruction, TLS destructors | 76     // Test to ensure that at thread destruction, TLS destructors | 
| 77     // have been called. | 77     // have been called. | 
| 78     test_threads(&testTLSDestructor); | 78     test_threads(&testTLSDestructor); | 
| 79     REPORTER_ASSERT(reporter, 0 == gCounter); | 79     REPORTER_ASSERT(reporter, 0 == gCounter); | 
| 80 } | 80 } | 
| OLD | NEW | 
|---|