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

Side by Side Diff: third_party/WebKit/Source/platform/network/ResourceError.cpp

Issue 2535383003: Collapse images disallowed by the Safe Browsing Subresource Filter. (Closed)
Patch Set: Rebase. Created 4 years 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) 2006 Apple Computer, Inc. All rights reserved. 2 * Copyright (C) 2006 Apple Computer, Inc. All rights reserved.
3 * Copyright (C) 2009 Google Inc. All rights reserved. 3 * Copyright (C) 2009 Google Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
11 * notice, this list of conditions and the following disclaimer in the 11 * notice, this list of conditions and the following disclaimer in the
12 * documentation and/or other materials provided with the distribution. 12 * documentation and/or other materials provided with the distribution.
13 * 13 *
14 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY 14 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
16 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 16 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
17 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR 17 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
18 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 18 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
19 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 19 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
20 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 20 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
21 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 21 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
22 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 22 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 */ 25 */
26 26
27 #include "platform/network/ResourceError.h" 27 #include "platform/network/ResourceError.h"
28 28
29 #include "platform/network/ResourceRequest.h"
29 #include "platform/weborigin/KURL.h" 30 #include "platform/weborigin/KURL.h"
30 #include "public/platform/Platform.h" 31 #include "public/platform/Platform.h"
31 #include "public/platform/WebURL.h" 32 #include "public/platform/WebURL.h"
32 #include "public/platform/WebURLError.h" 33 #include "public/platform/WebURLError.h"
33 34
34 namespace blink { 35 namespace blink {
35 36
36 const char errorDomainBlinkInternal[] = "BlinkInternal"; 37 const char errorDomainBlinkInternal[] = "BlinkInternal";
37 38
38 ResourceError ResourceError::cancelledError(const String& failingURL) { 39 ResourceError ResourceError::cancelledError(const String& failingURL) {
39 return Platform::current()->cancelledError(KURL(ParsedURLString, failingURL)); 40 return Platform::current()->cancelledError(KURL(ParsedURLString, failingURL));
40 } 41 }
41 42
42 ResourceError ResourceError::cancelledDueToAccessCheckError( 43 ResourceError ResourceError::cancelledDueToAccessCheckError(
43 const String& failingURL) { 44 const String& failingURL,
45 ResourceRequestBlockedReason blockedReason) {
44 ResourceError error = cancelledError(failingURL); 46 ResourceError error = cancelledError(failingURL);
45 error.setIsAccessCheck(true); 47 error.setIsAccessCheck(true);
48 if (blockedReason == ResourceRequestBlockedReason::SubresourceFilter)
49 error.setShouldCollapseInitiator(true);
46 return error; 50 return error;
47 } 51 }
48 52
49 ResourceError ResourceError::cacheMissError(const String& failingURL) { 53 ResourceError ResourceError::cacheMissError(const String& failingURL) {
50 ResourceError error(errorDomainBlinkInternal, 0, failingURL, String()); 54 ResourceError error(errorDomainBlinkInternal, 0, failingURL, String());
51 error.setIsCacheMiss(true); 55 error.setIsCacheMiss(true);
52 return error; 56 return error;
53 } 57 }
54 58
55 ResourceError ResourceError::copy() const { 59 ResourceError ResourceError::copy() const {
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 if (a.wasIgnoredByHandler() != b.wasIgnoredByHandler()) 106 if (a.wasIgnoredByHandler() != b.wasIgnoredByHandler())
103 return false; 107 return false;
104 108
105 if (a.isCacheMiss() != b.isCacheMiss()) 109 if (a.isCacheMiss() != b.isCacheMiss())
106 return false; 110 return false;
107 111
108 return true; 112 return true;
109 } 113 }
110 114
111 } // namespace blink 115 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698