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

Side by Side Diff: third_party/WebKit/Source/core/fetch/Resource.cpp

Issue 1706243002: Don't use SVG resource documents with an unrecognized MIME-type (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. 6 Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
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 17 matching lines...) Expand all
28 #include "core/fetch/FetchInitiatorTypeNames.h" 28 #include "core/fetch/FetchInitiatorTypeNames.h"
29 #include "core/fetch/MemoryCache.h" 29 #include "core/fetch/MemoryCache.h"
30 #include "core/fetch/ResourceClient.h" 30 #include "core/fetch/ResourceClient.h"
31 #include "core/fetch/ResourceClientWalker.h" 31 #include "core/fetch/ResourceClientWalker.h"
32 #include "core/fetch/ResourceFetcher.h" 32 #include "core/fetch/ResourceFetcher.h"
33 #include "core/fetch/ResourceLoader.h" 33 #include "core/fetch/ResourceLoader.h"
34 #include "core/inspector/InspectorInstrumentation.h" 34 #include "core/inspector/InspectorInstrumentation.h"
35 #include "platform/Logging.h" 35 #include "platform/Logging.h"
36 #include "platform/SharedBuffer.h" 36 #include "platform/SharedBuffer.h"
37 #include "platform/TraceEvent.h" 37 #include "platform/TraceEvent.h"
38 #include "platform/network/HTTPParsers.h"
38 #include "platform/weborigin/KURL.h" 39 #include "platform/weborigin/KURL.h"
39 #include "public/platform/Platform.h" 40 #include "public/platform/Platform.h"
40 #include "public/platform/WebProcessMemoryDump.h" 41 #include "public/platform/WebProcessMemoryDump.h"
41 #include "public/platform/WebScheduler.h" 42 #include "public/platform/WebScheduler.h"
42 #include "wtf/CurrentTime.h" 43 #include "wtf/CurrentTime.h"
43 #include "wtf/MathExtras.h" 44 #include "wtf/MathExtras.h"
44 #include "wtf/StdLibExtras.h" 45 #include "wtf/StdLibExtras.h"
45 #include "wtf/Vector.h" 46 #include "wtf/Vector.h"
46 #include "wtf/WeakPtr.h" 47 #include "wtf/WeakPtr.h"
47 #include "wtf/text/CString.h" 48 #include "wtf/text/CString.h"
(...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after
311 void Resource::finish() 312 void Resource::finish()
312 { 313 {
313 ASSERT(m_revalidatingRequest.isNull()); 314 ASSERT(m_revalidatingRequest.isNull());
314 ASSERT(!errorOccurred()); 315 ASSERT(!errorOccurred());
315 finishOnePart(); 316 finishOnePart();
316 markClientsFinished(); 317 markClientsFinished();
317 if (!errorOccurred()) 318 if (!errorOccurred())
318 m_status = Cached; 319 m_status = Cached;
319 } 320 }
320 321
322 AtomicString Resource::httpContentType() const
323 {
324 return extractMIMETypeFromMediaType(m_response.httpHeaderField(HTTPNames::Co ntent_Type)).lower();
Mike West 2016/02/24 13:23:44 Would you mind adding some unit tests for this met
fs 2016/02/24 17:04:59 Not sure if there was anything in particular you w
325 }
326
321 bool Resource::passesAccessControlCheck(SecurityOrigin* securityOrigin) const 327 bool Resource::passesAccessControlCheck(SecurityOrigin* securityOrigin) const
322 { 328 {
323 String ignoredErrorDescription; 329 String ignoredErrorDescription;
324 return passesAccessControlCheck(securityOrigin, ignoredErrorDescription); 330 return passesAccessControlCheck(securityOrigin, ignoredErrorDescription);
325 } 331 }
326 332
327 bool Resource::passesAccessControlCheck(SecurityOrigin* securityOrigin, String& errorDescription) const 333 bool Resource::passesAccessControlCheck(SecurityOrigin* securityOrigin, String& errorDescription) const
328 { 334 {
329 return blink::passesAccessControlCheck(m_response, lastResourceRequest().all owStoredCredentials() ? AllowStoredCredentials : DoNotAllowStoredCredentials, se curityOrigin, errorDescription, lastResourceRequest().requestContext()); 335 return blink::passesAccessControlCheck(m_response, lastResourceRequest().all owStoredCredentials() ? AllowStoredCredentials : DoNotAllowStoredCredentials, se curityOrigin, errorDescription, lastResourceRequest().requestContext());
330 } 336 }
(...skipping 780 matching lines...) Expand 10 before | Expand all | Expand 10 after
1111 case Resource::Media: 1117 case Resource::Media:
1112 return "Media"; 1118 return "Media";
1113 case Resource::Manifest: 1119 case Resource::Manifest:
1114 return "Manifest"; 1120 return "Manifest";
1115 } 1121 }
1116 ASSERT_NOT_REACHED(); 1122 ASSERT_NOT_REACHED();
1117 return "Unknown"; 1123 return "Unknown";
1118 } 1124 }
1119 1125
1120 } // namespace blink 1126 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698