diff options
-rw-r--r-- | gyp/exported_api_headers.gypi | 2 | ||||
-rw-r--r-- | include/core/SkFlattenableSerialization.h | 1 | ||||
-rw-r--r-- | tests/ResourceCacheTest.cpp | 4 |
3 files changed, 3 insertions, 4 deletions
diff --git a/gyp/exported_api_headers.gypi b/gyp/exported_api_headers.gypi index a105a8a831..83a16a13a3 100644 --- a/gyp/exported_api_headers.gypi +++ b/gyp/exported_api_headers.gypi @@ -1,7 +1,7 @@ # Include this gypi to include all public header files that use # the SK_API defines. # -# The list is computed by running 'egrep -lr "SK_API" include' in the root dir +# The list is computed by running 'egrep -lr "SK_API" include' in the root dir # of the project. # { diff --git a/include/core/SkFlattenableSerialization.h b/include/core/SkFlattenableSerialization.h index e9076348fd..2ed244c1ed 100644 --- a/include/core/SkFlattenableSerialization.h +++ b/include/core/SkFlattenableSerialization.h @@ -17,4 +17,3 @@ SK_API SkData* SkSerializeFlattenable(SkFlattenable*); SK_API SkFlattenable* SkDeserializeFlattenable(const void* data, size_t size); #endif - diff --git a/tests/ResourceCacheTest.cpp b/tests/ResourceCacheTest.cpp index 59182844fb..1bb6766b2c 100644 --- a/tests/ResourceCacheTest.cpp +++ b/tests/ResourceCacheTest.cpp @@ -16,7 +16,7 @@ static const int gWidth = 640; static const int gHeight = 480; //////////////////////////////////////////////////////////////////////////////// -static void test_cache(skiatest::Reporter* reporter, +static void test_cache(skiatest::Reporter* reporter, GrContext* context, SkCanvas* canvas) { const SkIRect size = SkIRect::MakeWH(gWidth, gHeight); @@ -32,7 +32,7 @@ static void test_cache(skiatest::Reporter* reporter, int oldMaxNum; size_t oldMaxBytes; context->getTextureCacheLimits(&oldMaxNum, &oldMaxBytes); - + // Set the cache limits so we can fit 10 "src" images and the // max number of textures doesn't matter size_t maxCacheSize = initialCacheSize + 10*srcSize; |