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

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

Issue 1074913004: Simplify protocol name and port comparison in KnwonPorts.cpp (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: added upper-case test case Created 5 years, 8 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 | « Source/platform/blink_platform.gypi ('k') | Source/platform/weborigin/KnownPortsTest.cpp » ('j') | 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 22 matching lines...) Expand all
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 switch (port) {
44 AtomicallyInitializedStaticReference(DefaultPortsMap, defaultPorts, new Defa ultPortsMap()); 44 case 80:
45 if (defaultPorts.isEmpty()) { 45 return protocol == "http";
46 defaultPorts.set("http", 80); 46 case 443:
47 defaultPorts.set("https", 443); 47 return protocol == "https";
48 defaultPorts.set("ftp", 21); 48 case 21:
49 defaultPorts.set("ftps", 990); 49 return protocol == "ftp";
50 case 990:
51 return protocol == "ftps";
50 } 52 }
51 return defaultPorts.get(protocol) == port; 53 return false;
52 } 54 }
53 55
54 } 56 }
OLDNEW
« no previous file with comments | « Source/platform/blink_platform.gypi ('k') | Source/platform/weborigin/KnownPortsTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698