Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "cc/tiles/gpu_image_decode_cache.h" | 5 #include "cc/tiles/gpu_image_decode_cache.h" |
| 6 | 6 |
| 7 #include "cc/paint/draw_image.h" | 7 #include "cc/paint/draw_image.h" |
| 8 #include "cc/test/test_context_provider.h" | 8 #include "cc/test/test_context_provider.h" |
| 9 #include "cc/test/test_tile_task_runner.h" | 9 #include "cc/test/test_tile_task_runner.h" |
| 10 #include "testing/gtest/include/gtest/gtest.h" | 10 #include "testing/gtest/include/gtest/gtest.h" |
| (...skipping 493 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 504 draw_image, ImageDecodeCache::TracingInfo(), &another_task); | 504 draw_image, ImageDecodeCache::TracingInfo(), &another_task); |
| 505 EXPECT_TRUE(need_unref); | 505 EXPECT_TRUE(need_unref); |
| 506 EXPECT_FALSE(another_task); | 506 EXPECT_FALSE(another_task); |
| 507 | 507 |
| 508 TestTileTaskRunner::CompleteTask(task.get()); | 508 TestTileTaskRunner::CompleteTask(task.get()); |
| 509 | 509 |
| 510 cache.UnrefImage(draw_image); | 510 cache.UnrefImage(draw_image); |
| 511 cache.UnrefImage(draw_image); | 511 cache.UnrefImage(draw_image); |
| 512 } | 512 } |
| 513 | 513 |
| 514 TEST(GpuImageDecodeCacheTest, GetTaskForImageCanceledGetsNewTask) { | 514 // crbug.com/697171. |
|
Nico
2017/04/13 15:06:36
can you make this 709341? (I'm writing a CL to upd
jdoerrie
2017/04/13 15:20:25
Done.
| |
| 515 #if defined(MEMORY_SANITIZER) | |
| 516 #define MAYBE_GetTaskForImageCanceledGetsNewTask \ | |
| 517 DISABLED_GetTaskForImageCanceledGetsNewTask | |
| 518 #else | |
| 519 #define MAYBE_GetTaskForImageCanceledGetsNewTask \ | |
| 520 GetTaskForImageCanceledGetsNewTask | |
| 521 #endif | |
| 522 TEST(GpuImageDecodeCacheTest, MAYBE_GetTaskForImageCanceledGetsNewTask) { | |
| 515 auto context_provider = TestContextProvider::Create(); | 523 auto context_provider = TestContextProvider::Create(); |
| 516 context_provider->BindToCurrentThread(); | 524 context_provider->BindToCurrentThread(); |
| 517 TestGpuImageDecodeCache cache(context_provider.get()); | 525 TestGpuImageDecodeCache cache(context_provider.get()); |
| 518 bool is_decomposable = true; | 526 bool is_decomposable = true; |
| 519 SkFilterQuality quality = kHigh_SkFilterQuality; | 527 SkFilterQuality quality = kHigh_SkFilterQuality; |
| 520 | 528 |
| 521 sk_sp<SkImage> image = CreateImage(100, 100); | 529 sk_sp<SkImage> image = CreateImage(100, 100); |
| 522 DrawImage draw_image(image, SkIRect::MakeWH(image->width(), image->height()), | 530 DrawImage draw_image(image, SkIRect::MakeWH(image->width(), image->height()), |
| 523 quality, | 531 quality, |
| 524 CreateMatrix(SkSize::Make(0.5f, 0.5f), is_decomposable), | 532 CreateMatrix(SkSize::Make(0.5f, 0.5f), is_decomposable), |
| (...skipping 1311 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1836 TestTileTaskRunner::ProcessTask(second_task->dependencies()[0].get()); | 1844 TestTileTaskRunner::ProcessTask(second_task->dependencies()[0].get()); |
| 1837 TestTileTaskRunner::ProcessTask(second_task.get()); | 1845 TestTileTaskRunner::ProcessTask(second_task.get()); |
| 1838 | 1846 |
| 1839 cache.UnrefImage(first_draw_image); | 1847 cache.UnrefImage(first_draw_image); |
| 1840 cache.UnrefImage(second_draw_image); | 1848 cache.UnrefImage(second_draw_image); |
| 1841 cache.UnrefImage(third_draw_image); | 1849 cache.UnrefImage(third_draw_image); |
| 1842 } | 1850 } |
| 1843 | 1851 |
| 1844 } // namespace | 1852 } // namespace |
| 1845 } // namespace cc | 1853 } // namespace cc |
| OLD | NEW |