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

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

Issue 869083002: Remove DEFINE_STATIC_LOCAL in isDefaultPortForProtocol (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 11 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
« 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"
33 #include "wtf/text/StringHash.h" 34 #include "wtf/text/StringHash.h"
34 35
35 namespace blink { 36 namespace blink {
36 37
37 bool isDefaultPortForProtocol(unsigned short port, const String& protocol) 38 bool isDefaultPortForProtocol(unsigned short port, const String& protocol)
38 { 39 {
39 if (protocol.isEmpty()) 40 if (protocol.isEmpty())
40 return false; 41 return false;
41 42
42 typedef HashMap<String, unsigned, CaseFoldingHash> DefaultPortsMap; 43 typedef HashMap<String, unsigned, CaseFoldingHash> DefaultPortsMap;
43 DEFINE_STATIC_LOCAL(DefaultPortsMap, defaultPorts, ()); 44 AtomicallyInitializedStaticReference(DefaultPortsMap, defaultPorts, new Defa ultPortsMap());
44 if (defaultPorts.isEmpty()) { 45 if (defaultPorts.isEmpty()) {
45 defaultPorts.set("http", 80); 46 defaultPorts.set("http", 80);
46 defaultPorts.set("https", 443); 47 defaultPorts.set("https", 443);
47 defaultPorts.set("ftp", 21); 48 defaultPorts.set("ftp", 21);
48 defaultPorts.set("ftps", 990); 49 defaultPorts.set("ftps", 990);
49 } 50 }
50 return defaultPorts.get(protocol) == port; 51 return defaultPorts.get(protocol) == port;
51 } 52 }
52 53
53 bool portAllowed(const KURL& url) 54 bool portAllowed(const KURL& url)
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 return true; 149 return true;
149 150
150 // Allow any port number in a file URL, since the port number is ignored. 151 // Allow any port number in a file URL, since the port number is ignored.
151 if (url.protocolIs("file")) 152 if (url.protocolIs("file"))
152 return true; 153 return true;
153 154
154 return false; 155 return false;
155 } 156 }
156 157
157 } 158 }
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