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

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

Issue 2417173002: Loading: bulk style errors fix in core/fetch (Closed)
Patch Set: Created 4 years, 2 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 586d1f77dbe3bc81757ceb054cde47ce755ca341..e4c93592c8e0ac2361f84aab18df2f68f2c03fd8 100644
--- a/third_party/WebKit/Source/core/fetch/ImageResource.cpp
+++ b/third_party/WebKit/Source/core/fetch/ImageResource.cpp
@@ -48,9 +48,10 @@ namespace blink {
ImageResource* ImageResource::fetch(FetchRequest& request,
ResourceFetcher* fetcher) {
if (request.resourceRequest().requestContext() ==
- WebURLRequest::RequestContextUnspecified)
+ WebURLRequest::RequestContextUnspecified) {
request.mutableResourceRequest().setRequestContext(
WebURLRequest::RequestContextImage);
+ }
if (fetcher->context().pageDismissalEventBeingDispatched()) {
KURL requestURL = request.resourceRequest().url();
if (requestURL.isValid() &&
@@ -229,12 +230,13 @@ void ImageResource::allClientsAndObserversRemoved() {
// If possible, delay the resetting until back at the event loop. Doing so
// after a conservative GC prevents resetAnimation() from upsetting ongoing
// animation updates (crbug.com/613709)
- if (!ThreadHeap::willObjectBeLazilySwept(this))
+ if (!ThreadHeap::willObjectBeLazilySwept(this)) {
Platform::current()->currentThread()->getWebTaskRunner()->postTask(
BLINK_FROM_HERE, WTF::bind(&ImageResource::doResetAnimation,
wrapWeakPersistent(this)));
- else
+ } else {
m_image->resetAnimation();
+ }
}
if (m_multipartParser)
m_multipartParser->cancel();
@@ -315,11 +317,12 @@ LayoutSize ImageResource::imageSize(
LayoutSize size;
if (m_image->isBitmapImage() &&
- shouldRespectImageOrientation == RespectImageOrientation)
+ shouldRespectImageOrientation == RespectImageOrientation) {
size =
LayoutSize(toBitmapImage(m_image.get())->sizeRespectingOrientation());
- else
+ } else {
size = LayoutSize(m_image->size());
+ }
if (sizeType == IntrinsicCorrectedToDPR && m_hasDevicePixelRatioHeaderValue &&
m_devicePixelRatioHeaderValue > 0)
@@ -451,9 +454,10 @@ void ImageResource::responseReceived(
DCHECK(!handle);
DCHECK(!m_multipartParser);
// If there's no boundary, just handle the request normally.
- if (response.isMultipart() && !response.multipartBoundary().isEmpty())
+ if (response.isMultipart() && !response.multipartBoundary().isEmpty()) {
m_multipartParser = new MultipartImageResourceParser(
response, response.multipartBoundary(), this);
+ }
Resource::responseReceived(response, std::move(handle));
if (RuntimeEnabledFeatures::clientHintsEnabled()) {
m_devicePixelRatioHeaderValue =
@@ -604,9 +608,10 @@ void ImageResource::multipartDataReceived(const char* bytes, size_t size) {
}
bool ImageResource::isAccessAllowed(SecurityOrigin* securityOrigin) {
- if (response().wasFetchedViaServiceWorker())
+ if (response().wasFetchedViaServiceWorker()) {
return response().serviceWorkerResponseType() !=
WebServiceWorkerResponseTypeOpaque;
+ }
if (!getImage()->currentFrameHasSingleSecurityOrigin())
return false;
if (passesAccessControlCheck(securityOrigin))

Powered by Google App Engine
This is Rietveld 408576698