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

Side by Side Diff: Source/platform/weborigin/KnownPorts.cpp

Issue 895793003: Simplify protocal name and port comparison (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Removed one unnecessary include Created 5 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2004, 2007, 2008, 2011, 2012 Apple Inc. All rights reserved. 2 * Copyright (C) 2004, 2007, 2008, 2011, 2012 Apple Inc. All rights reserved.
3 * Copyright (C) 2012 Research In Motion Limited. All rights reserved. 3 * Copyright (C) 2012 Research In Motion Limited. 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 12 matching lines...) Expand all
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 "platform/weborigin/KnownPorts.h" 28 #include "platform/weborigin/KnownPorts.h"
29 29
30 #include "platform/weborigin/KURL.h" 30 #include "platform/weborigin/KURL.h"
31 #include "wtf/HashMap.h" 31 #include "wtf/HashMap.h"
32 #include "wtf/StdLibExtras.h" 32 #include "wtf/StdLibExtras.h"
33 #include "wtf/Threading.h"
34 #include "wtf/text/StringHash.h" 33 #include "wtf/text/StringHash.h"
35 34
36 namespace blink { 35 namespace blink {
37 36
38 bool isDefaultPortForProtocol(unsigned short port, const String& protocol) 37 bool isDefaultPortForProtocol(unsigned short port, const String& protocol)
39 { 38 {
40 if (protocol.isEmpty()) 39 if (protocol.isEmpty())
41 return false; 40 return false;
42 41
43 typedef HashMap<String, unsigned, CaseFoldingHash> DefaultPortsMap; 42 switch (port) {
44 AtomicallyInitializedStaticReference(DefaultPortsMap, defaultPorts, new Defa ultPortsMap()); 43 case 80:
45 if (defaultPorts.isEmpty()) { 44 return protocol == "http";
46 defaultPorts.set("http", 80); 45 break;
47 defaultPorts.set("https", 443); 46 case 443:
48 defaultPorts.set("ftp", 21); 47 return protocol == "https";
49 defaultPorts.set("ftps", 990); 48 break;
49 case 21:
50 return protocol == "ftp";
51 break;
52 case 990:
53 return protocol == "ftps";
54 break;
55 default:
56 return false;
50 } 57 }
51 return defaultPorts.get(protocol) == port;
52 } 58 }
53 59
54 bool portAllowed(const KURL& url) 60 bool portAllowed(const KURL& url)
55 { 61 {
56 unsigned short port = url.port(); 62 unsigned short port = url.port();
57 63
58 // Since most URLs don't have a port, return early for the "no port" case. 64 // Since most URLs don't have a port, return early for the "no port" case.
59 if (!port) 65 if (!port)
60 return true; 66 return true;
61 67
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 return true; 155 return true;
150 156
151 // Allow any port number in a file URL, since the port number is ignored. 157 // Allow any port number in a file URL, since the port number is ignored.
152 if (url.protocolIs("file")) 158 if (url.protocolIs("file"))
153 return true; 159 return true;
154 160
155 return false; 161 return false;
156 } 162 }
157 163
158 } 164 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698