Centralize the setting of Accept headers

third_party/WebKit/Source/core/fetch/ImageResource.cpp

 /*
     Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de)
     Copyright (C) 2001 Dirk Mueller (mueller@kde.org)
     Copyright (C) 2002 Waldo Bastian (bastian@kde.org)
     Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
     Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
@@ skipping 47 matching lines @@
     return toImageResource(fetcher->requestResource(request, ImageResourceFactory()));
 }
 
 ImageResource::ImageResource(const ResourceRequest& resourceRequest, const ResourceLoaderOptions& options)
     : Resource(resourceRequest, Image, options)
     , m_devicePixelRatioHeaderValue(1.0)
     , m_image(nullptr)
     , m_hasDevicePixelRatioHeaderValue(false)
 {
     WTF_LOG(Timers, "new ImageResource(ResourceRequest) %p", this);
-    setCustomAcceptHeader();
 }
 
 ImageResource::ImageResource(blink::Image* image, const ResourceLoaderOptions& options)
     : Resource(ResourceRequest(""), Image, options)
     , m_devicePixelRatioHeaderValue(1.0)
     , m_image(image)
     , m_hasDevicePixelRatioHeaderValue(false)
 {
     WTF_LOG(Timers, "new ImageResource(Image) %p", this);
     setStatus(Cached);
-    setCustomAcceptHeader();
 }
 
 ImageResource::ImageResource(const ResourceRequest& resourceRequest, blink::Image* image, const ResourceLoaderOptions& options)
     : Resource(resourceRequest, Image, options)
     , m_image(image)
 {
     WTF_LOG(Timers, "new ImageResource(ResourceRequest, Image) %p", this);
     setStatus(Cached);
-    setCustomAcceptHeader();
 }
 
 ImageResource::~ImageResource()
 {
     WTF_LOG(Timers, "~ImageResource %p", this);
     clearImage();
 }
 
 DEFINE_TRACE(ImageResource)
 {
@@ skipping 207 matching lines @@
     }
 }
 
 void ImageResource::clear()
 {
     prune();
     clearImage();
     setEncodedSize(0);
 }
 
-void ImageResource::setCustomAcceptHeader()
-{
-    DEFINE_STATIC_LOCAL(const AtomicString, acceptImages, ("image/webp,image/*,*/*;q=0.8"));
-    setAccept(acceptImages);
-}
-
 inline void ImageResource::createImage()
 {
     // Create the image if it doesn't yet exist.
     if (m_image)
         return;
 
     if (m_response.mimeType() == "image/svg+xml") {
         m_image = SVGImage::create(this);
     } else {
         m_image = BitmapImage::create(this);
@@ skipping 212 matching lines @@
     if (response().wasFetchedViaServiceWorker())
         return response().serviceWorkerResponseType() != WebServiceWorkerResponseTypeOpaque;
     if (!getImage()->currentFrameHasSingleSecurityOrigin())
         return false;
     if (passesAccessControlCheck(securityOrigin))
         return true;
     return !securityOrigin->taintsCanvas(response().url());
 }
 
 } // namespace blink