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

Side by Side Diff: Source/core/fetch/CSSStyleSheetResource.cpp

Issue 954233003: Enable SRI only for same origin and CORS content. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de) 2 Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de)
3 Copyright (C) 2001 Dirk Mueller (mueller@kde.org) 3 Copyright (C) 2001 Dirk Mueller (mueller@kde.org)
4 Copyright (C) 2002 Waldo Bastian (bastian@kde.org) 4 Copyright (C) 2002 Waldo Bastian (bastian@kde.org)
5 Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com) 5 Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
6 Copyright (C) 2004, 2005, 2006 Apple Computer, Inc. 6 Copyright (C) 2004, 2005, 2006 Apple Computer, Inc.
7 7
8 This library is free software; you can redistribute it and/or 8 This library is free software; you can redistribute it and/or
9 modify it under the terms of the GNU Library General Public 9 modify it under the terms of the GNU Library General Public
10 License as published by the Free Software Foundation; either 10 License as published by the Free Software Foundation; either
(...skipping 19 matching lines...) Expand all
30 #include "core/css/StyleSheetContents.h" 30 #include "core/css/StyleSheetContents.h"
31 #include "core/fetch/ResourceClientWalker.h" 31 #include "core/fetch/ResourceClientWalker.h"
32 #include "core/fetch/StyleSheetResourceClient.h" 32 #include "core/fetch/StyleSheetResourceClient.h"
33 #include "platform/SharedBuffer.h" 33 #include "platform/SharedBuffer.h"
34 #include "platform/network/HTTPParsers.h" 34 #include "platform/network/HTTPParsers.h"
35 #include "wtf/CurrentTime.h" 35 #include "wtf/CurrentTime.h"
36 36
37 namespace blink { 37 namespace blink {
38 38
39 CSSStyleSheetResource::CSSStyleSheetResource(const ResourceRequest& resourceRequ est, const String& charset) 39 CSSStyleSheetResource::CSSStyleSheetResource(const ResourceRequest& resourceRequ est, const String& charset)
40 : StyleSheetResource(resourceRequest, CSSStyleSheet, "text/css", charset) 40 : StyleSheetResource(resourceRequest, CSSStyleSheet, "text/css", charset), m _corsNeededAndFailed(false)
41 { 41 {
42 DEFINE_STATIC_LOCAL(const AtomicString, acceptCSS, ("text/css,*/*;q=0.1", At omicString::ConstructFromLiteral)); 42 DEFINE_STATIC_LOCAL(const AtomicString, acceptCSS, ("text/css,*/*;q=0.1", At omicString::ConstructFromLiteral));
43 43
44 // Prefer text/css but accept any type (dell.com serves a stylesheet 44 // Prefer text/css but accept any type (dell.com serves a stylesheet
45 // as text/html; see <http://bugs.webkit.org/show_bug.cgi?id=11451>). 45 // as text/html; see <http://bugs.webkit.org/show_bug.cgi?id=11451>).
46 setAccept(acceptCSS); 46 setAccept(acceptCSS);
47 } 47 }
48 48
49 CSSStyleSheetResource::~CSSStyleSheetResource() 49 CSSStyleSheetResource::~CSSStyleSheetResource()
50 { 50 {
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
176 176
177 if (m_parsedStyleSheetCache) 177 if (m_parsedStyleSheetCache)
178 m_parsedStyleSheetCache->removedFromMemoryCache(); 178 m_parsedStyleSheetCache->removedFromMemoryCache();
179 m_parsedStyleSheetCache = sheet; 179 m_parsedStyleSheetCache = sheet;
180 m_parsedStyleSheetCache->addedToMemoryCache(); 180 m_parsedStyleSheetCache->addedToMemoryCache();
181 181
182 setDecodedSize(m_parsedStyleSheetCache->estimatedSizeInBytes()); 182 setDecodedSize(m_parsedStyleSheetCache->estimatedSizeInBytes());
183 } 183 }
184 184
185 } 185 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698