From cad810f21b803229eb11403f9209855525a25d57 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Fri, 6 May 2011 11:45:16 +0100 Subject: Merge WebKit at r75315: Initial merge by git. Change-Id: I570314b346ce101c935ed22a626b48c2af266b84 --- JavaScriptCore/wtf/url/api/ParsedURL.cpp | 90 -------------------------------- JavaScriptCore/wtf/url/api/ParsedURL.h | 62 ---------------------- JavaScriptCore/wtf/url/api/URLString.h | 55 ------------------- 3 files changed, 207 deletions(-) delete mode 100644 JavaScriptCore/wtf/url/api/ParsedURL.cpp delete mode 100644 JavaScriptCore/wtf/url/api/ParsedURL.h delete mode 100644 JavaScriptCore/wtf/url/api/URLString.h (limited to 'JavaScriptCore/wtf/url/api') diff --git a/JavaScriptCore/wtf/url/api/ParsedURL.cpp b/JavaScriptCore/wtf/url/api/ParsedURL.cpp deleted file mode 100644 index abe0061..0000000 --- a/JavaScriptCore/wtf/url/api/ParsedURL.cpp +++ /dev/null @@ -1,90 +0,0 @@ -/* - * Copyright (C) 2010 Google, Inc. All Rights Reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY - * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#include "config.h" -#include "ParsedURL.h" - -#include "URLComponent.h" -#include "URLParser.h" - -namespace WTF { - -ParsedURL::ParsedURL(const URLString& spec) - : m_spec(spec) -{ - // FIXME: Handle non-standard URLs. - if (spec.string().isEmpty()) - return; - URLParser::parseStandardURL(spec.string().characters(), spec.string().length(), m_segments); -} - -String ParsedURL::scheme() const -{ - return segment(m_segments.scheme); -} - -String ParsedURL::username() const -{ - return segment(m_segments.username); -} - -String ParsedURL::password() const -{ - return segment(m_segments.password); -} - -String ParsedURL::host() const -{ - return segment(m_segments.host); -} - -String ParsedURL::port() const -{ - return segment(m_segments.port); -} - -String ParsedURL::path() const -{ - return segment(m_segments.path); -} - -String ParsedURL::query() const -{ - return segment(m_segments.query); -} - -String ParsedURL::fragment() const -{ - return segment(m_segments.fragment); -} - -String ParsedURL::segment(const URLComponent& component) const -{ - if (!component.isValid()) - return String(); - return m_spec.string().substring(component.begin(), component.length()); -} - -} diff --git a/JavaScriptCore/wtf/url/api/ParsedURL.h b/JavaScriptCore/wtf/url/api/ParsedURL.h deleted file mode 100644 index ebc19b7..0000000 --- a/JavaScriptCore/wtf/url/api/ParsedURL.h +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright (C) 2010 Google, Inc. All Rights Reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY - * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef ParsedURL_h -#define ParsedURL_h - -#include "URLSegments.h" -#include "URLString.h" - -namespace WTF { - -class URLComponent; - -class ParsedURL { -public: - explicit ParsedURL(const URLString&); - - // FIXME: Add a method for parsing non-canonicalized URLs. - - String scheme() const; - String username() const; - String password() const; - String host() const; - String port() const; - String path() const; - String query() const; - String fragment() const; - - URLString spec() { return m_spec; } - -private: - inline String segment(const URLComponent&) const; - - URLString m_spec; - URLSegments m_segments; -}; - -} - -#endif diff --git a/JavaScriptCore/wtf/url/api/URLString.h b/JavaScriptCore/wtf/url/api/URLString.h deleted file mode 100644 index 7395d49..0000000 --- a/JavaScriptCore/wtf/url/api/URLString.h +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright (C) 2010 Google, Inc. All Rights Reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY - * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef URLString_h -#define URLString_h - -#include "WTFString.h" - -namespace WTF { - -// URLString represents a string that's a canonicalized URL. -class URLString { -public: - URLString() { } - - const String& string() const { return m_string;} - -private: - friend class ParsedURL; - - // URLString can only be constructed by a ParsedURL. - explicit URLString(const String& string) - : m_string(string) - { - } - - String m_string; -}; - -} - -#endif - -- cgit v1.1