Diff
Modified: trunk/Source/WebCore/ChangeLog (107496 => 107497)
--- trunk/Source/WebCore/ChangeLog 2012-02-12 02:26:06 UTC (rev 107496)
+++ trunk/Source/WebCore/ChangeLog 2012-02-12 02:33:54 UTC (rev 107497)
@@ -1,3 +1,20 @@
+2012-02-11 Benjamin Poulain <benja...@webkit.org>
+
+ Get rid of WebCore::URLString
+ https://bugs.webkit.org/show_bug.cgi?id=78429
+
+ Reviewed by Adam Barth.
+
+ URLString is unused, remove the class.
+
+ * GNUmakefile.list.am:
+ * WebCore.gypi:
+ * WebCore.xcodeproj/project.pbxproj:
+ * platform/KURL.cpp:
+ * platform/KURL.h:
+ (KURL):
+ * platform/URLString.h: Removed.
+
2012-02-11 Sam Weinig <s...@webkit.org>
Fix the windows build.
Modified: trunk/Source/WebCore/GNUmakefile.list.am (107496 => 107497)
--- trunk/Source/WebCore/GNUmakefile.list.am 2012-02-12 02:26:06 UTC (rev 107496)
+++ trunk/Source/WebCore/GNUmakefile.list.am 2012-02-12 02:33:54 UTC (rev 107497)
@@ -3351,7 +3351,6 @@
Source/WebCore/platform/Timer.cpp \
Source/WebCore/platform/Timer.h \
Source/WebCore/platform/TreeShared.h \
- Source/WebCore/platform/URLString.h \
Source/WebCore/platform/UUID.cpp \
Source/WebCore/platform/UUID.h \
Source/WebCore/platform/Widget.cpp \
Modified: trunk/Source/WebCore/WebCore.gypi (107496 => 107497)
--- trunk/Source/WebCore/WebCore.gypi 2012-02-12 02:26:06 UTC (rev 107496)
+++ trunk/Source/WebCore/WebCore.gypi 2012-02-12 02:33:54 UTC (rev 107497)
@@ -303,7 +303,6 @@
'platform/ThreadGlobalData.h',
'platform/Timer.h',
'platform/TreeShared.h',
- 'platform/URLString.h',
'platform/VisitedLinkStrategy.h',
'platform/Widget.h',
'platform/WindowsKeyboardCodes.h',
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (107496 => 107497)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2012-02-12 02:26:06 UTC (rev 107496)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2012-02-12 02:33:54 UTC (rev 107497)
@@ -3312,7 +3312,6 @@
9705997A107D975200A50A7C /* PolicyChecker.h in Headers */ = {isa = PBXBuildFile; fileRef = 97059976107D975200A50A7C /* PolicyChecker.h */; settings = {ATTRIBUTES = (Private, ); }; };
970B728A144FFAC600F00A37 /* EventInterfaces.h in Headers */ = {isa = PBXBuildFile; fileRef = 970B7289144FFAC600F00A37 /* EventInterfaces.h */; settings = {ATTRIBUTES = (Private, ); }; };
970B72A6145008EB00F00A37 /* EventHeaders.h in Headers */ = {isa = PBXBuildFile; fileRef = 970B72A5145008EB00F00A37 /* EventHeaders.h */; };
- 971491DA12FD65E8001BFEB1 /* URLString.h in Headers */ = {isa = PBXBuildFile; fileRef = 971491D912FD65E8001BFEB1 /* URLString.h */; settings = {ATTRIBUTES = (Private, ); }; };
97205AAF123928CA00B17380 /* FTPDirectoryDocument.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97205AAD123928CA00B17380 /* FTPDirectoryDocument.cpp */; };
97205AB0123928CA00B17380 /* FTPDirectoryDocument.h in Headers */ = {isa = PBXBuildFile; fileRef = 97205AAE123928CA00B17380 /* FTPDirectoryDocument.h */; };
97205AB51239291000B17380 /* ImageDocument.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97205AB11239291000B17380 /* ImageDocument.cpp */; };
@@ -10157,7 +10156,6 @@
97059976107D975200A50A7C /* PolicyChecker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PolicyChecker.h; sourceTree = "<group>"; };
970B7289144FFAC600F00A37 /* EventInterfaces.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EventInterfaces.h; sourceTree = "<group>"; };
970B72A5145008EB00F00A37 /* EventHeaders.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EventHeaders.h; sourceTree = "<group>"; };
- 971491D912FD65E8001BFEB1 /* URLString.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = URLString.h; sourceTree = "<group>"; };
97205AAD123928CA00B17380 /* FTPDirectoryDocument.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FTPDirectoryDocument.cpp; sourceTree = "<group>"; };
97205AAE123928CA00B17380 /* FTPDirectoryDocument.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FTPDirectoryDocument.h; sourceTree = "<group>"; };
97205AB11239291000B17380 /* ImageDocument.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ImageDocument.cpp; sourceTree = "<group>"; };
@@ -19800,7 +19798,6 @@
93309EA1099EB78C0056E581 /* Timer.cpp */,
9305B24C098F1B6B00C28855 /* Timer.h */,
1419D2C40CEA6F6100FF507A /* TreeShared.h */,
- 971491D912FD65E8001BFEB1 /* URLString.h */,
2E3BBF051162DA1100B9409A /* UUID.cpp */,
2E3BBF061162DA1100B9409A /* UUID.h */,
515788C01207852C00A37C4A /* VisitedLinkStrategy.h */,
@@ -23993,7 +23990,6 @@
E4AFCFA50DAF29A300F5F55C /* UnitBezier.h in Headers */,
D086FE9809D53AAB005BC74D /* UnlinkCommand.h in Headers */,
F55B3DDE1251F12D003EF269 /* URLInputType.h in Headers */,
- 971491DA12FD65E8001BFEB1 /* URLString.h in Headers */,
656581B209D14EE6000E61D7 /* UserAgentStyleSheets.h in Headers */,
003F1FEA11E6AB43008258D9 /* UserContentTypes.h in Headers */,
BCACF3BD1072921A00C0C8A3 /* UserContentURLPattern.h in Headers */,
Modified: trunk/Source/WebCore/platform/KURL.cpp (107496 => 107497)
--- trunk/Source/WebCore/platform/KURL.cpp 2012-02-12 02:26:06 UTC (rev 107496)
+++ trunk/Source/WebCore/platform/KURL.cpp 2012-02-12 02:33:54 UTC (rev 107497)
@@ -339,12 +339,6 @@
ASSERT(url == m_string);
}
-KURL::KURL(ParsedURLStringTag, const URLString& url)
-{
- parse(url.string());
- ASSERT(url.string() == m_string);
-}
-
KURL::KURL(const KURL& base, const String& relative)
{
init(base, relative, UTF8Encoding());
Modified: trunk/Source/WebCore/platform/KURL.h (107496 => 107497)
--- trunk/Source/WebCore/platform/KURL.h 2012-02-12 02:26:06 UTC (rev 107496)
+++ trunk/Source/WebCore/platform/KURL.h 2012-02-12 02:33:54 UTC (rev 107497)
@@ -27,7 +27,6 @@
#define KURL_h
#include "PlatformString.h"
-#include "URLString.h"
#include <wtf/HashMap.h>
#if USE(CF)
@@ -70,7 +69,6 @@
// KURL object, or indiscernible from such.
// It is usually best to avoid repeatedly parsing a string, unless memory saving outweigh the possible slow-downs.
KURL(ParsedURLStringTag, const String&);
- KURL(ParsedURLStringTag, const URLString&);
#if USE(GOOGLEURL)
KURL(WTF::HashTableDeletedValueType) : m_url(WTF::HashTableDeletedValue) { }
#else
@@ -123,10 +121,8 @@
#if USE(GOOGLEURL)
const String& string() const { return m_url.string(); }
- URLString urlString() const { return URLString(m_url.string()); }
#else
const String& string() const { return m_string; }
- URLString urlString() const { return URLString(m_string); }
#endif
String protocol() const;
Deleted: trunk/Source/WebCore/platform/URLString.h (107496 => 107497)
--- trunk/Source/WebCore/platform/URLString.h 2012-02-12 02:26:06 UTC (rev 107496)
+++ trunk/Source/WebCore/platform/URLString.h 2012-02-12 02:33:54 UTC (rev 107497)
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2011 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 GOOGLE, 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 COMPUTER, 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 <wtf/text/WTFString.h>
-
-namespace WebCore {
-
-class KURL;
-
-class URLString {
-public:
- const String& string() const { return m_string; }
-
-private:
- friend class KURL;
-
- explicit URLString(const String& string)
- : m_string(string)
- {
- }
-
- String m_string;
-};
-
-}
-
-#endif
