| Index: third_party/WebKit/Source/core/fetch/ImageResource.cpp
|
| diff --git a/third_party/WebKit/Source/core/fetch/ImageResource.cpp b/third_party/WebKit/Source/core/fetch/ImageResource.cpp
|
| index 4235737767e45d6d5544d8b4ea38e7a97992ad76..6cdb12c73b249bcc213232b327c52e4e58bf12fa 100644
|
| --- a/third_party/WebKit/Source/core/fetch/ImageResource.cpp
|
| +++ b/third_party/WebKit/Source/core/fetch/ImageResource.cpp
|
| @@ -178,7 +178,7 @@ bool ImageResource::willPaintBrokenImage() const
|
| return errorOccurred();
|
| }
|
|
|
| -blink::Image* ImageResource::image()
|
| +blink::Image* ImageResource::getImage()
|
| {
|
| ASSERT(!isPurgeable());
|
|
|
| @@ -452,7 +452,7 @@ bool ImageResource::isAccessAllowed(SecurityOrigin* securityOrigin)
|
| {
|
| if (response().wasFetchedViaServiceWorker())
|
| return response().serviceWorkerResponseType() != WebServiceWorkerResponseTypeOpaque;
|
| - if (!image()->currentFrameHasSingleSecurityOrigin())
|
| + if (!getImage()->currentFrameHasSingleSecurityOrigin())
|
| return false;
|
| if (passesAccessControlCheck(securityOrigin))
|
| return true;
|
|
|