| Index: sky/engine/core/fetch/ImageResource.cpp
|
| diff --git a/sky/engine/core/fetch/ImageResource.cpp b/sky/engine/core/fetch/ImageResource.cpp
|
| index 3488063d5c8a9042906e56854452b2fe3f0da8ae..834820dfade967d4ba318219aaeb9b7c472dd9a7 100644
|
| --- a/sky/engine/core/fetch/ImageResource.cpp
|
| +++ b/sky/engine/core/fetch/ImageResource.cpp
|
| @@ -155,28 +155,10 @@ void ImageResource::allClientsRemoved()
|
| Resource::allClientsRemoved();
|
| }
|
|
|
| -pair<blink::Image*, float> ImageResource::brokenImage(float deviceScaleFactor)
|
| -{
|
| - if (deviceScaleFactor >= 2) {
|
| - DEFINE_STATIC_REF(blink::Image, brokenImageHiRes, (blink::Image::loadPlatformResource("missingImage@2x")));
|
| - return std::make_pair(brokenImageHiRes, 2);
|
| - }
|
| -
|
| - DEFINE_STATIC_REF(blink::Image, brokenImageLoRes, (blink::Image::loadPlatformResource("missingImage")));
|
| - return std::make_pair(brokenImageLoRes, 1);
|
| -}
|
| -
|
| blink::Image* ImageResource::image()
|
| {
|
| ASSERT(!isPurgeable());
|
|
|
| - if (errorOccurred()) {
|
| - // Returning the 1x broken image is non-ideal, but we cannot reliably access the appropriate
|
| - // deviceScaleFactor from here. It is critical that callers use ImageResource::brokenImage()
|
| - // when they need the real, deviceScaleFactor-appropriate broken image icon.
|
| - return brokenImage(1).first;
|
| - }
|
| -
|
| if (m_image)
|
| return m_image.get();
|
|
|
| @@ -187,13 +169,6 @@ blink::Image* ImageResource::imageForRenderer(const RenderObject* renderer)
|
| {
|
| ASSERT(!isPurgeable());
|
|
|
| - if (errorOccurred()) {
|
| - // Returning the 1x broken image is non-ideal, but we cannot reliably access the appropriate
|
| - // deviceScaleFactor from here. It is critical that callers use ImageResource::brokenImage()
|
| - // when they need the real, deviceScaleFactor-appropriate broken image icon.
|
| - return brokenImage(1).first;
|
| - }
|
| -
|
| if (!m_image)
|
| return blink::Image::nullImage();
|
|
|
|
|