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 * Copyright (C) 2008, 2009, 2011 Google Inc. All rights reserved. | 4 * Copyright (C) 2008, 2009, 2011 Google Inc. All rights reserved. |
5 * | 5 * |
6 * Redistribution and use in source and binary forms, with or without | 6 * Redistribution and use in source and binary forms, with or without |
7 * modification, are permitted provided that the following conditions | 7 * modification, are permitted provided that the following conditions |
8 * are met: | 8 * are met: |
9 * 1. Redistributions of source code must retain the above copyright | 9 * 1. Redistributions of source code must retain the above copyright |
10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
(...skipping 809 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
820 return begin == end && !*protocol; | 820 return begin == end && !*protocol; |
821 } | 821 } |
822 | 822 |
823 template<typename CHAR> | 823 template<typename CHAR> |
824 bool checkIfProtocolIsInHTTPFamily(const url::Component& scheme, const CHAR* spe
c) | 824 bool checkIfProtocolIsInHTTPFamily(const url::Component& scheme, const CHAR* spe
c) |
825 { | 825 { |
826 if (scheme.len == 4) | 826 if (scheme.len == 4) |
827 return internalProtocolIs(scheme, spec, "http"); | 827 return internalProtocolIs(scheme, spec, "http"); |
828 if (scheme.len == 5) | 828 if (scheme.len == 5) |
829 return internalProtocolIs(scheme, spec, "https"); | 829 return internalProtocolIs(scheme, spec, "https"); |
| 830 if (scheme.len == 7) |
| 831 return internalProtocolIs(scheme, spec, "http-so"); |
| 832 if (scheme.len == 8) |
| 833 return internalProtocolIs(scheme, spec, "https-so"); |
830 return false; | 834 return false; |
831 } | 835 } |
832 | 836 |
833 void KURL::initProtocolIsInHTTPFamily() | 837 void KURL::initProtocolIsInHTTPFamily() |
834 { | 838 { |
835 if (!m_isValid) { | 839 if (!m_isValid) { |
836 m_protocolIsInHTTPFamily = false; | 840 m_protocolIsInHTTPFamily = false; |
837 return; | 841 return; |
838 } | 842 } |
839 | 843 |
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
894 m_string = AtomicString::fromUTF8(output.data(), output.length()); | 898 m_string = AtomicString::fromUTF8(output.data(), output.length()); |
895 } | 899 } |
896 | 900 |
897 bool KURL::isSafeToSendToAnotherThread() const | 901 bool KURL::isSafeToSendToAnotherThread() const |
898 { | 902 { |
899 return m_string.isSafeToSendToAnotherThread() | 903 return m_string.isSafeToSendToAnotherThread() |
900 && (!m_innerURL || m_innerURL->isSafeToSendToAnotherThread()); | 904 && (!m_innerURL || m_innerURL->isSafeToSendToAnotherThread()); |
901 } | 905 } |
902 | 906 |
903 } // namespace blink | 907 } // namespace blink |
OLD | NEW |