Do not show image placeholders for CSS sprites

third_party/WebKit/Source/core/css/CSSImageValue.cpp

 /*
  * (C) 1999-2003 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2008 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
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
 
 #include "core/css/CSSImageValue.h"
 
 #include "core/css/CSSMarkup.h"
 #include "core/dom/Document.h"
 #include "core/frame/LocalFrame.h"
+#include "core/frame/Settings.h"

[sclittle, 2017/06/21 20:46:56]

nit: remove unused include

 #include "core/loader/resource/ImageResourceContent.h"
 #include "core/style/StyleFetchedImage.h"
 #include "core/style/StyleInvalidImage.h"
 #include "platform/CrossOriginAttributeValue.h"
 #include "platform/loader/fetch/FetchInitiatorTypeNames.h"
 #include "platform/loader/fetch/FetchParameters.h"
 #include "platform/loader/fetch/ResourceFetcher.h"
 #include "platform/loader/fetch/ResourceLoaderOptions.h"
 #include "platform/weborigin/KURL.h"
 #include "platform/weborigin/SecurityPolicy.h"
@@ skipping 10 matching lines @@
       absolute_url_(url.GetString()),
       cached_image_(image) {}
 
 CSSImageValue::CSSImageValue(const AtomicString& absolute_url)
     : CSSValue(kImageClass),
       relative_url_(absolute_url),
       absolute_url_(absolute_url) {}
 
 CSSImageValue::~CSSImageValue() {}
 
-StyleImage* CSSImageValue::CacheImage(const Document& document,
-                                      CrossOriginAttributeValue cross_origin) {
+StyleImage* CSSImageValue::CacheImage(
+    const Document& document,
+    FetchParameters::PlaceholderImageRequestType placeholder_image_request_type,
+    CrossOriginAttributeValue cross_origin) {
   if (!cached_image_) {
     if (absolute_url_.IsEmpty())
       ReResolveURL(document);
     ResourceRequest resource_request(absolute_url_);
     resource_request.SetHTTPReferrer(SecurityPolicy::GenerateReferrer(
         referrer_.referrer_policy, resource_request.Url(), referrer_.referrer));
     ResourceLoaderOptions options(kAllowStoredCredentials,
                                   kClientRequestedCredentials);
     options.initiator_info.name = initiator_name_.IsEmpty()
                                       ? FetchInitiatorTypeNames::css
                                       : initiator_name_;
     FetchParameters params(resource_request, options);
 
     if (cross_origin != kCrossOriginAttributeNotSet) {
       params.SetCrossOriginAccessControl(document.GetSecurityOrigin(),
                                          cross_origin);
     }
-    if (document.GetFrame())
+    if (document.GetFrame() &&
+        placeholder_image_request_type == FetchParameters::kAllowPlaceholder)
       document.GetFrame()->MaybeAllowImagePlaceholder(params);
 
     if (ImageResourceContent* cached_image =
             ImageResourceContent::Fetch(params, document.Fetcher())) {
       cached_image_ =
           StyleFetchedImage::Create(cached_image, document, params.Url());
     } else {
       cached_image_ = StyleInvalidImage::Create(Url());
     }
   }
@@ skipping 48 matching lines @@
 void CSSImageValue::ReResolveURL(const Document& document) const {
   KURL url = document.CompleteURL(relative_url_);
   AtomicString url_string(url.GetString());
   if (url_string == absolute_url_)
     return;
   absolute_url_ = url_string;
   cached_image_.Clear();
 }
 
 }  // namespace blink