OLD | NEW |
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 |
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
53 ResourceError errorCopy; | 53 ResourceError errorCopy; |
54 errorCopy.m_domain = m_domain.isolatedCopy(); | 54 errorCopy.m_domain = m_domain.isolatedCopy(); |
55 errorCopy.m_errorCode = m_errorCode; | 55 errorCopy.m_errorCode = m_errorCode; |
56 errorCopy.m_failingURL = m_failingURL.isolatedCopy(); | 56 errorCopy.m_failingURL = m_failingURL.isolatedCopy(); |
57 errorCopy.m_localizedDescription = m_localizedDescription.isolatedCopy(); | 57 errorCopy.m_localizedDescription = m_localizedDescription.isolatedCopy(); |
58 errorCopy.m_isNull = m_isNull; | 58 errorCopy.m_isNull = m_isNull; |
59 errorCopy.m_isCancellation = m_isCancellation; | 59 errorCopy.m_isCancellation = m_isCancellation; |
60 errorCopy.m_isAccessCheck = m_isAccessCheck; | 60 errorCopy.m_isAccessCheck = m_isAccessCheck; |
61 errorCopy.m_isTimeout = m_isTimeout; | 61 errorCopy.m_isTimeout = m_isTimeout; |
62 errorCopy.m_staleCopyInCache = m_staleCopyInCache; | 62 errorCopy.m_staleCopyInCache = m_staleCopyInCache; |
| 63 errorCopy.m_wasIgnoredByHandler = m_wasIgnoredByHandler; |
63 return errorCopy; | 64 return errorCopy; |
64 } | 65 } |
65 | 66 |
66 bool ResourceError::compare(const ResourceError& a, const ResourceError& b) | 67 bool ResourceError::compare(const ResourceError& a, const ResourceError& b) |
67 { | 68 { |
68 if (a.isNull() && b.isNull()) | 69 if (a.isNull() && b.isNull()) |
69 return true; | 70 return true; |
70 | 71 |
71 if (a.isNull() || b.isNull()) | 72 if (a.isNull() || b.isNull()) |
72 return false; | 73 return false; |
(...skipping 15 matching lines...) Expand all Loading... |
88 | 89 |
89 if (a.isAccessCheck() != b.isAccessCheck()) | 90 if (a.isAccessCheck() != b.isAccessCheck()) |
90 return false; | 91 return false; |
91 | 92 |
92 if (a.isTimeout() != b.isTimeout()) | 93 if (a.isTimeout() != b.isTimeout()) |
93 return false; | 94 return false; |
94 | 95 |
95 if (a.staleCopyInCache() != b.staleCopyInCache()) | 96 if (a.staleCopyInCache() != b.staleCopyInCache()) |
96 return false; | 97 return false; |
97 | 98 |
| 99 if (a.wasIgnoredByHandler() != b.wasIgnoredByHandler()) |
| 100 return false; |
| 101 |
98 return true; | 102 return true; |
99 } | 103 } |
100 | 104 |
101 } // namespace blink | 105 } // namespace blink |
OLD | NEW |