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

Side by Side Diff: third_party/WebKit/Source/platform/weborigin/KURL.cpp

Issue 2332263002: Updated suborigin serialization to latest spec proposal (Closed)
Patch Set: Fix unit tests Created 4 years, 3 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
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 * 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 811 matching lines...) Expand 10 before | Expand all | Expand 10 after
822 return begin == end && !*protocol; 822 return begin == end && !*protocol;
823 } 823 }
824 824
825 template<typename CHAR> 825 template<typename CHAR>
826 bool checkIfProtocolIsInHTTPFamily(const url::Component& scheme, const CHAR* spe c) 826 bool checkIfProtocolIsInHTTPFamily(const url::Component& scheme, const CHAR* spe c)
827 { 827 {
828 if (scheme.len == 4) 828 if (scheme.len == 4)
829 return internalProtocolIs(scheme, spec, "http"); 829 return internalProtocolIs(scheme, spec, "http");
830 if (scheme.len == 5) 830 if (scheme.len == 5)
831 return internalProtocolIs(scheme, spec, "https"); 831 return internalProtocolIs(scheme, spec, "https");
832 if (scheme.len == 7)
833 return internalProtocolIs(scheme, spec, "http-so");
834 if (scheme.len == 8)
835 return internalProtocolIs(scheme, spec, "https-so");
832 return false; 836 return false;
833 } 837 }
834 838
835 void KURL::initProtocolIsInHTTPFamily() 839 void KURL::initProtocolIsInHTTPFamily()
836 { 840 {
837 if (!m_isValid) { 841 if (!m_isValid) {
838 m_protocolIsInHTTPFamily = false; 842 m_protocolIsInHTTPFamily = false;
839 return; 843 return;
840 } 844 }
841 845
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
896 m_string = AtomicString::fromUTF8(output.data(), output.length()); 900 m_string = AtomicString::fromUTF8(output.data(), output.length());
897 } 901 }
898 902
899 bool KURL::isSafeToSendToAnotherThread() const 903 bool KURL::isSafeToSendToAnotherThread() const
900 { 904 {
901 return m_string.isSafeToSendToAnotherThread() 905 return m_string.isSafeToSendToAnotherThread()
902 && (!m_innerURL || m_innerURL->isSafeToSendToAnotherThread()); 906 && (!m_innerURL || m_innerURL->isSafeToSendToAnotherThread());
903 } 907 }
904 908
905 } // namespace blink 909 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698