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

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

Issue 2390583002: [WIP] WebFonts cache-aware timeout adaption (Closed)
Patch Set: check ERR_CACHE_MISS directly in ResourceError Created 4 years, 1 month 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 "net/base/net_errors.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) {
44 ResourceError error = cancelledError(failingURL); 45 ResourceError error = cancelledError(failingURL);
45 error.setIsAccessCheck(true); 46 error.setIsAccessCheck(true);
46 return error; 47 return error;
47 } 48 }
48 49
50 ResourceError ResourceError::cacheMissError() {
51 ResourceError error;
yhirano 2016/10/25 08:50:28 error.m_domain = String(net::kErrorDomain);
52 error.m_errorCode = net::ERR_CACHE_MISS;
53 error.m_isNull = false;
54 return error;
55 }
56
49 ResourceError ResourceError::copy() const { 57 ResourceError ResourceError::copy() const {
50 ResourceError errorCopy; 58 ResourceError errorCopy;
51 errorCopy.m_domain = m_domain.isolatedCopy(); 59 errorCopy.m_domain = m_domain.isolatedCopy();
52 errorCopy.m_errorCode = m_errorCode; 60 errorCopy.m_errorCode = m_errorCode;
53 errorCopy.m_failingURL = m_failingURL.isolatedCopy(); 61 errorCopy.m_failingURL = m_failingURL.isolatedCopy();
54 errorCopy.m_localizedDescription = m_localizedDescription.isolatedCopy(); 62 errorCopy.m_localizedDescription = m_localizedDescription.isolatedCopy();
55 errorCopy.m_isNull = m_isNull; 63 errorCopy.m_isNull = m_isNull;
56 errorCopy.m_isCancellation = m_isCancellation; 64 errorCopy.m_isCancellation = m_isCancellation;
57 errorCopy.m_isAccessCheck = m_isAccessCheck; 65 errorCopy.m_isAccessCheck = m_isAccessCheck;
58 errorCopy.m_isTimeout = m_isTimeout; 66 errorCopy.m_isTimeout = m_isTimeout;
59 errorCopy.m_staleCopyInCache = m_staleCopyInCache; 67 errorCopy.m_staleCopyInCache = m_staleCopyInCache;
60 errorCopy.m_wasIgnoredByHandler = m_wasIgnoredByHandler; 68 errorCopy.m_wasIgnoredByHandler = m_wasIgnoredByHandler;
61 return errorCopy; 69 return errorCopy;
62 } 70 }
63 71
72 bool ResourceError::isCacheMiss() const {
73 return m_errorCode == net::ERR_CACHE_MISS;
yhirano 2016/10/25 08:50:28 We need to check m_domain as well.
74 }
75
64 bool ResourceError::compare(const ResourceError& a, const ResourceError& b) { 76 bool ResourceError::compare(const ResourceError& a, const ResourceError& b) {
65 if (a.isNull() && b.isNull()) 77 if (a.isNull() && b.isNull())
66 return true; 78 return true;
67 79
68 if (a.isNull() || b.isNull()) 80 if (a.isNull() || b.isNull())
69 return false; 81 return false;
70 82
71 if (a.domain() != b.domain()) 83 if (a.domain() != b.domain())
72 return false; 84 return false;
73 85
(...skipping 18 matching lines...) Expand all
92 if (a.staleCopyInCache() != b.staleCopyInCache()) 104 if (a.staleCopyInCache() != b.staleCopyInCache())
93 return false; 105 return false;
94 106
95 if (a.wasIgnoredByHandler() != b.wasIgnoredByHandler()) 107 if (a.wasIgnoredByHandler() != b.wasIgnoredByHandler())
96 return false; 108 return false;
97 109
98 return true; 110 return true;
99 } 111 }
100 112
101 } // namespace blink 113 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698