| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2010 Apple Inc. All rights reserved. | 2 * Copyright (C) 2010 Apple Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 16 matching lines...) Expand all Loading... |
| 27 #include "platform/network/ProxyServer.h" | 27 #include "platform/network/ProxyServer.h" |
| 28 | 28 |
| 29 #include "wtf/text/StringBuilder.h" | 29 #include "wtf/text/StringBuilder.h" |
| 30 | 30 |
| 31 namespace blink { | 31 namespace blink { |
| 32 | 32 |
| 33 static void appendProxyServerString(StringBuilder& builder, const ProxyServer& p
roxyServer) | 33 static void appendProxyServerString(StringBuilder& builder, const ProxyServer& p
roxyServer) |
| 34 { | 34 { |
| 35 switch (proxyServer.type()) { | 35 switch (proxyServer.type()) { |
| 36 case ProxyServer::Direct: | 36 case ProxyServer::Direct: |
| 37 builder.append("DIRECT"); | 37 builder.appendLiteral("DIRECT"); |
| 38 return; | 38 return; |
| 39 case ProxyServer::HTTP: | 39 case ProxyServer::HTTP: |
| 40 case ProxyServer::HTTPS: | 40 case ProxyServer::HTTPS: |
| 41 builder.append("PROXY"); | 41 builder.appendLiteral("PROXY"); |
| 42 break; | 42 break; |
| 43 case ProxyServer::SOCKS: | 43 case ProxyServer::SOCKS: |
| 44 builder.append("SOCKS"); | 44 builder.appendLiteral("SOCKS"); |
| 45 break; | 45 break; |
| 46 } | 46 } |
| 47 | 47 |
| 48 builder.append(' '); | 48 builder.append(' '); |
| 49 | 49 |
| 50 ASSERT(!proxyServer.hostName().isNull()); | 50 ASSERT(!proxyServer.hostName().isNull()); |
| 51 builder.append(proxyServer.hostName()); | 51 builder.append(proxyServer.hostName()); |
| 52 | 52 |
| 53 builder.append(':'); | 53 builder.append(':'); |
| 54 ASSERT(proxyServer.port() != -1); | 54 ASSERT(proxyServer.port() != -1); |
| 55 builder.appendNumber(proxyServer.port()); | 55 builder.appendNumber(proxyServer.port()); |
| 56 } | 56 } |
| 57 | 57 |
| 58 String toString(const Vector<ProxyServer>& proxyServers) | 58 String toString(const Vector<ProxyServer>& proxyServers) |
| 59 { | 59 { |
| 60 if (proxyServers.isEmpty()) | 60 if (proxyServers.isEmpty()) |
| 61 return "DIRECT"; | 61 return "DIRECT"; |
| 62 | 62 |
| 63 StringBuilder stringBuilder; | 63 StringBuilder stringBuilder; |
| 64 for (size_t i = 0; i < proxyServers.size(); ++i) { | 64 for (size_t i = 0; i < proxyServers.size(); ++i) { |
| 65 if (i) | 65 if (i) |
| 66 stringBuilder.append("; "); | 66 stringBuilder.appendLiteral("; "); |
| 67 | 67 |
| 68 appendProxyServerString(stringBuilder, proxyServers[i]); | 68 appendProxyServerString(stringBuilder, proxyServers[i]); |
| 69 } | 69 } |
| 70 | 70 |
| 71 return stringBuilder.toString(); | 71 return stringBuilder.toString(); |
| 72 } | 72 } |
| 73 | 73 |
| 74 | 74 |
| 75 } // namespace blink | 75 } // namespace blink |
| OLD | NEW |