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

Side by Side Diff: Source/core/platform/network/ResourceError.cpp

Issue 14495011: Revert "Create errors (especially cancellation errors) internally to WebCore, rather" (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 7 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 | Annotate | Revision Log
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 "config.h" 27 #include "config.h"
28 #include "core/platform/network/ResourceError.h" 28 #include "core/platform/network/ResourceError.h"
29 29
30 #include "core/platform/KURL.h"
31 #include <public/Platform.h>
32 #include <public/WebURL.h>
33 #include <public/WebURLError.h>
34
35 namespace WebCore { 30 namespace WebCore {
36 31
37 const char* const errorDomainWebKitInternal = "WebKitInternal"; 32 const char* const errorDomainWebKitInternal = "WebKitInternal";
38 33
39 ResourceError ResourceError::cancelledError(const String& failingURL)
40 {
41 return WebKit::Platform::current()->cancelledError(KURL(ParsedURLString, fai lingURL));
42 }
43
44 ResourceError ResourceError::copy() const 34 ResourceError ResourceError::copy() const
45 { 35 {
46 ResourceError errorCopy; 36 ResourceError errorCopy;
47 errorCopy.m_domain = m_domain.isolatedCopy(); 37 errorCopy.m_domain = m_domain.isolatedCopy();
48 errorCopy.m_errorCode = m_errorCode; 38 errorCopy.m_errorCode = m_errorCode;
49 errorCopy.m_failingURL = m_failingURL.isolatedCopy(); 39 errorCopy.m_failingURL = m_failingURL.isolatedCopy();
50 errorCopy.m_localizedDescription = m_localizedDescription.isolatedCopy(); 40 errorCopy.m_localizedDescription = m_localizedDescription.isolatedCopy();
51 errorCopy.m_isNull = m_isNull; 41 errorCopy.m_isNull = m_isNull;
52 errorCopy.m_isCancellation = m_isCancellation; 42 errorCopy.m_isCancellation = m_isCancellation;
53 errorCopy.m_isTimeout = m_isTimeout; 43 errorCopy.m_isTimeout = m_isTimeout;
(...skipping 23 matching lines...) Expand all
77 if (a.isCancellation() != b.isCancellation()) 67 if (a.isCancellation() != b.isCancellation())
78 return false; 68 return false;
79 69
80 if (a.isTimeout() != b.isTimeout()) 70 if (a.isTimeout() != b.isTimeout())
81 return false; 71 return false;
82 72
83 return true; 73 return true;
84 } 74 }
85 75
86 } // namespace WebCore 76 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/platform/network/ResourceError.h ('k') | Tools/DumpRenderTree/chromium/TestRunner/public/WebTestProxy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698