| 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 17 matching lines...) Expand all Loading... |
| 28 #include "config.h" | 28 #include "config.h" |
| 29 #include "weborigin/KURL.h" | 29 #include "weborigin/KURL.h" |
| 30 | 30 |
| 31 #include "wtf/HashMap.h" | 31 #include "wtf/HashMap.h" |
| 32 #include "wtf/StdLibExtras.h" | 32 #include "wtf/StdLibExtras.h" |
| 33 #include "wtf/text/CString.h" | 33 #include "wtf/text/CString.h" |
| 34 #include "wtf/text/StringHash.h" | 34 #include "wtf/text/StringHash.h" |
| 35 #include "wtf/text/StringUTF8Adaptor.h" | 35 #include "wtf/text/StringUTF8Adaptor.h" |
| 36 #include "wtf/text/TextEncoding.h" | 36 #include "wtf/text/TextEncoding.h" |
| 37 #include <algorithm> | 37 #include <algorithm> |
| 38 #include <url/url_util.h> |
| 39 #ifndef NDEBUG |
| 38 #include <stdio.h> | 40 #include <stdio.h> |
| 39 #include <url/url_util.h> | 41 #endif |
| 40 | 42 |
| 41 namespace WebCore { | 43 namespace WebCore { |
| 42 | 44 |
| 43 static const unsigned maximumValidPortNumber = 0xFFFE; | 45 static const unsigned maximumValidPortNumber = 0xFFFE; |
| 44 static const unsigned invalidPortNumber = 0xFFFF; | 46 static const unsigned invalidPortNumber = 0xFFFF; |
| 45 | 47 |
| 46 static void assertProtocolIsGood(const char* protocol) | 48 static void assertProtocolIsGood(const char* protocol) |
| 47 { | 49 { |
| 48 #ifndef NDEBUG | 50 #ifndef NDEBUG |
| 49 const char* p = protocol; | 51 const char* p = protocol; |
| (...skipping 792 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 842 m_string = AtomicString::fromUTF8(output.data(), output.length()); | 844 m_string = AtomicString::fromUTF8(output.data(), output.length()); |
| 843 } | 845 } |
| 844 | 846 |
| 845 bool KURL::isSafeToSendToAnotherThread() const | 847 bool KURL::isSafeToSendToAnotherThread() const |
| 846 { | 848 { |
| 847 return m_string.isSafeToSendToAnotherThread() | 849 return m_string.isSafeToSendToAnotherThread() |
| 848 && (!m_innerURL || m_innerURL->isSafeToSendToAnotherThread()); | 850 && (!m_innerURL || m_innerURL->isSafeToSendToAnotherThread()); |
| 849 } | 851 } |
| 850 | 852 |
| 851 } // namespace WebCore | 853 } // namespace WebCore |
| OLD | NEW |