Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(82)

Unified Diff: third_party/WebKit/Source/core/fetch/ImageResource.cpp

Issue 1738623004: Rename enums/functions that collide in chromium style. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@get-names-4
Patch Set: get-names-5 Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 30e13864b184ef5e48bd4a9c0070ccbe5bc0b853..427a5bccf23d496d2f3b8ee916c1a52c7f1ce58f 100644
--- a/third_party/WebKit/Source/core/fetch/ImageResource.cpp
+++ b/third_party/WebKit/Source/core/fetch/ImageResource.cpp
@@ -47,7 +47,7 @@ PassRefPtrWillBeRawPtr<ImageResource> ImageResource::fetch(FetchRequest& request
request.mutableResourceRequest().setRequestContext(WebURLRequest::RequestContextImage);
if (fetcher->context().pageDismissalEventBeingDispatched()) {
KURL requestURL = request.resourceRequest().url();
- if (requestURL.isValid() && fetcher->context().canRequest(Resource::Image, request.resourceRequest(), requestURL, request.options(), request.forPreload(), request.originRestriction()))
+ if (requestURL.isValid() && fetcher->context().canRequest(Resource::Image, request.resourceRequest(), requestURL, request.options(), request.forPreload(), request.getOriginRestriction()))
fetcher->context().sendImagePing(requestURL);
return nullptr;
}
@@ -118,7 +118,7 @@ void ImageResource::didAddClient(ResourceClient* c)
m_image->setData(m_data, true);
}
- ASSERT(c->resourceClientType() == ImageResourceClient::expectedType());
+ ASSERT(c->getResourceClientType() == ImageResourceClient::expectedType());
if (m_image && !m_image->isNull())
static_cast<ImageResourceClient*>(c)->imageChanged(this);
@@ -128,7 +128,7 @@ void ImageResource::didAddClient(ResourceClient* c)
void ImageResource::didRemoveClient(ResourceClient* c)
{
ASSERT(c);
- ASSERT(c->resourceClientType() == ImageResourceClient::expectedType());
+ ASSERT(c->getResourceClientType() == ImageResourceClient::expectedType());
Resource::didRemoveClient(c);
}
@@ -321,7 +321,7 @@ void ImageResource::updateImage(bool allDataReceived)
// to decode.
if (sizeAvailable || allDataReceived) {
if (!m_image || m_image->isNull()) {
- error(errorOccurred() ? status() : DecodeError);
+ error(errorOccurred() ? getStatus() : DecodeError);
if (memoryCache()->contains(this))
memoryCache()->remove(this);
return;

Powered by Google App Engine
This is Rietveld 408576698