Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 22 matching lines...) Expand all Loading... | |
| 33 #include "wtf/Threading.h" | 33 #include "wtf/Threading.h" |
| 34 #include "wtf/text/StringHash.h" | 34 #include "wtf/text/StringHash.h" |
| 35 | 35 |
| 36 namespace blink { | 36 namespace blink { |
| 37 | 37 |
| 38 bool isDefaultPortForProtocol(unsigned short port, const String& protocol) | 38 bool isDefaultPortForProtocol(unsigned short port, const String& protocol) |
| 39 { | 39 { |
| 40 if (protocol.isEmpty()) | 40 if (protocol.isEmpty()) |
| 41 return false; | 41 return false; |
| 42 | 42 |
| 43 typedef HashMap<String, unsigned, CaseFoldingHash> DefaultPortsMap; | 43 if (protocol == "http") |
| 44 AtomicallyInitializedStaticReference(DefaultPortsMap, defaultPorts, new Defa ultPortsMap()); | 44 return port == 80; |
| 45 if (defaultPorts.isEmpty()) { | 45 if (protocol == "https") |
| 46 defaultPorts.set("http", 80); | 46 return port == 443; |
| 47 defaultPorts.set("https", 443); | 47 if (protocol == "ftp") |
| 48 defaultPorts.set("ftp", 21); | 48 return port == 21; |
| 49 defaultPorts.set("ftps", 990); | 49 if (protocol == "ftps") |
| 50 } | 50 return port == 990; |
|
kinuko
2015/02/03 03:52:32
Switching on port number, and then comparing proto
Ian Wen
2015/02/03 19:08:54
Indeed. Done.
| |
| 51 return defaultPorts.get(protocol) == port; | 51 |
| 52 return false; | |
| 52 } | 53 } |
| 53 | 54 |
| 54 bool portAllowed(const KURL& url) | 55 bool portAllowed(const KURL& url) |
| 55 { | 56 { |
| 56 unsigned short port = url.port(); | 57 unsigned short port = url.port(); |
| 57 | 58 |
| 58 // Since most URLs don't have a port, return early for the "no port" case. | 59 // Since most URLs don't have a port, return early for the "no port" case. |
| 59 if (!port) | 60 if (!port) |
| 60 return true; | 61 return true; |
| 61 | 62 |
| (...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 149 return true; | 150 return true; |
| 150 | 151 |
| 151 // Allow any port number in a file URL, since the port number is ignored. | 152 // Allow any port number in a file URL, since the port number is ignored. |
| 152 if (url.protocolIs("file")) | 153 if (url.protocolIs("file")) |
| 153 return true; | 154 return true; |
| 154 | 155 |
| 155 return false; | 156 return false; |
| 156 } | 157 } |
| 157 | 158 |
| 158 } | 159 } |
| OLD | NEW |