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

Side by Side Diff: Source/core/css/CSSImageValue.cpp

Issue 995783002: Gracefully handle mixed content checking on detached resource fetches. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 9 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 unified diff | Download patch
« no previous file with comments | « Source/core/css/CSSFontFaceSrcValue.cpp ('k') | Source/core/fetch/ResourceFetcher.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * (C) 1999-2003 Lars Knoll (knoll@kde.org) 2 * (C) 1999-2003 Lars Knoll (knoll@kde.org)
3 * Copyright (C) 2004, 2005, 2006, 2008 Apple Inc. All rights reserved. 3 * Copyright (C) 2004, 2005, 2006, 2008 Apple Inc. All rights reserved.
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * 9 *
10 * This library is distributed in the hope that it will be useful, 10 * This library is distributed in the hope that it will be useful,
(...skipping 10 matching lines...) Expand all
21 #include "config.h" 21 #include "config.h"
22 #include "core/css/CSSImageValue.h" 22 #include "core/css/CSSImageValue.h"
23 23
24 #include "core/FetchInitiatorTypeNames.h" 24 #include "core/FetchInitiatorTypeNames.h"
25 #include "core/css/CSSMarkup.h" 25 #include "core/css/CSSMarkup.h"
26 #include "core/dom/Document.h" 26 #include "core/dom/Document.h"
27 #include "core/fetch/FetchRequest.h" 27 #include "core/fetch/FetchRequest.h"
28 #include "core/fetch/ImageResource.h" 28 #include "core/fetch/ImageResource.h"
29 #include "core/layout/style/StyleFetchedImage.h" 29 #include "core/layout/style/StyleFetchedImage.h"
30 #include "core/layout/style/StylePendingImage.h" 30 #include "core/layout/style/StylePendingImage.h"
31 #include "core/loader/MixedContentChecker.h"
31 #include "platform/weborigin/KURL.h" 32 #include "platform/weborigin/KURL.h"
32 #include "platform/weborigin/SecurityPolicy.h" 33 #include "platform/weborigin/SecurityPolicy.h"
33 34
34 namespace blink { 35 namespace blink {
35 36
36 CSSImageValue::CSSImageValue(const String& rawValue, const KURL& url, StyleImage * image) 37 CSSImageValue::CSSImageValue(const String& rawValue, const KURL& url, StyleImage * image)
37 : CSSValue(ImageClass) 38 : CSSValue(ImageClass)
38 , m_relativeURL(rawValue) 39 , m_relativeURL(rawValue)
39 , m_absoluteURL(url.string()) 40 , m_absoluteURL(url.string())
40 , m_image(image) 41 , m_image(image)
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 { 125 {
125 KURL url = document.completeURL(m_relativeURL); 126 KURL url = document.completeURL(m_relativeURL);
126 if (url == m_absoluteURL) 127 if (url == m_absoluteURL)
127 return; 128 return;
128 m_absoluteURL = url.string(); 129 m_absoluteURL = url.string();
129 m_accessedImage = false; 130 m_accessedImage = false;
130 m_image.clear(); 131 m_image.clear();
131 } 132 }
132 133
133 } // namespace blink 134 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/css/CSSFontFaceSrcValue.cpp ('k') | Source/core/fetch/ResourceFetcher.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698