Index: third_party/WebKit/Source/core/frame/ImageBitmapTest.cpp |
diff --git a/third_party/WebKit/Source/core/frame/ImageBitmapTest.cpp b/third_party/WebKit/Source/core/frame/ImageBitmapTest.cpp |
index 96ebafa3abd84b0091f5a8ef94912ff8c8e8abca..20970b11b5a3906117e06bd95cfda9537dca9b9a 100644 |
--- a/third_party/WebKit/Source/core/frame/ImageBitmapTest.cpp |
+++ b/third_party/WebKit/Source/core/frame/ImageBitmapTest.cpp |
@@ -44,6 +44,7 @@ |
#include "platform/image-decoders/ImageDecoder.h" |
#include "platform/loader/fetch/MemoryCache.h" |
#include "platform/loader/fetch/ResourceRequest.h" |
+#include "platform/scheduler/test/fake_web_task_runner.h" |
#include "testing/gtest/include/gtest/gtest.h" |
#include "third_party/skia/include/core/SkCanvas.h" |
#include "third_party/skia/include/core/SkColorSpaceXform.h" |
@@ -77,6 +78,8 @@ class ImageBitmapTest : public ::testing::Test { |
RuntimeEnabledFeatures::colorCorrectRenderingEnabled(); |
color_correct_rendering_default_mode = |
RuntimeEnabledFeatures::colorCorrectRenderingDefaultModeEnabled(); |
+ |
+ task_runner_ = AdoptRef(new scheduler::FakeWebTaskRunner); |
} |
virtual void TearDown() { |
// Garbage collection is required prior to switching out the |
@@ -100,14 +103,15 @@ class ImageBitmapTest : public ::testing::Test { |
bool experimental_canvas_features; |
bool color_correct_rendering; |
bool color_correct_rendering_default_mode; |
+ RefPtr<scheduler::FakeWebTaskRunner> task_runner_; |
}; |
TEST_F(ImageBitmapTest, ImageResourceConsistency) { |
const ImageBitmapOptions default_options; |
HTMLImageElement* image_element = |
HTMLImageElement::Create(*Document::Create()); |
- ImageResourceContent* image = |
- ImageResourceContent::Create(StaticBitmapImage::Create(image_).Get()); |
+ ImageResourceContent* image = ImageResourceContent::Create( |
+ task_runner_, StaticBitmapImage::Create(image_).Get()); |
image_element->SetImageResource(image); |
Optional<IntRect> crop_rect = |
@@ -148,8 +152,8 @@ TEST_F(ImageBitmapTest, ImageResourceConsistency) { |
// reference to the original Image if the HTMLImageElement src is changed. |
TEST_F(ImageBitmapTest, ImageBitmapSourceChanged) { |
HTMLImageElement* image = HTMLImageElement::Create(*Document::Create()); |
- ImageResourceContent* original_image_resource = |
- ImageResourceContent::Create(StaticBitmapImage::Create(image_).Get()); |
+ ImageResourceContent* original_image_resource = ImageResourceContent::Create( |
+ task_runner_, StaticBitmapImage::Create(image_).Get()); |
image->SetImageResource(original_image_resource); |
const ImageBitmapOptions default_options; |
@@ -163,8 +167,8 @@ TEST_F(ImageBitmapTest, ImageBitmapSourceChanged) { |
ASSERT_NE(image_bitmap->BitmapImage()->ImageForCurrentFrame(), |
original_image_resource->GetImage()->ImageForCurrentFrame()); |
- ImageResourceContent* new_image_resource = |
- ImageResourceContent::Create(StaticBitmapImage::Create(image2_).Get()); |
+ ImageResourceContent* new_image_resource = ImageResourceContent::Create( |
+ task_runner_, StaticBitmapImage::Create(image2_).Get()); |
image->SetImageResource(new_image_resource); |
{ |
@@ -238,8 +242,8 @@ TEST_F(ImageBitmapTest, ImageBitmapColorSpaceConversionHTMLImageElement) { |
image->readPixels(raster_image_info.makeWH(1, 1), src_pixel.get(), |
image->width() * raster_image_info.bytesPerPixel(), 5, 5); |
- ImageResourceContent* original_image_resource = |
- ImageResourceContent::Create(StaticBitmapImage::Create(image).Get()); |
+ ImageResourceContent* original_image_resource = ImageResourceContent::Create( |
+ task_runner_, StaticBitmapImage::Create(image).Get()); |
image_element->SetImageResource(original_image_resource); |
Optional<IntRect> crop_rect = IntRect(0, 0, image->width(), image->height()); |
@@ -335,8 +339,8 @@ TEST_F(ImageBitmapTest, ImageBitmapColorSpaceConversionImageBitmap) { |
image->readPixels(raster_image_info.makeWH(1, 1), src_pixel.get(), |
image->width() * raster_image_info.bytesPerPixel(), 5, 5); |
- ImageResourceContent* source_image_resource = |
- ImageResourceContent::Create(StaticBitmapImage::Create(image).Get()); |
+ ImageResourceContent* source_image_resource = ImageResourceContent::Create( |
+ task_runner_, StaticBitmapImage::Create(image).Get()); |
image_element->SetImageResource(source_image_resource); |
Optional<IntRect> crop_rect = IntRect(0, 0, image->width(), image->height()); |