Commit 5ffbb5c7 authored by darin@apple.com's avatar darin@apple.com

rename KURL to URL

https://bugs.webkit.org/show_bug.cgi?id=16214

Reviewed by Andreas Kling.

Source/WebCore:

* many files: Renamed, using script.

Source/WebKit:

* WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in:
Let the script to try to rename here.

Source/WebKit/blackberry:

* many files: Renamed, using script.

Source/WebKit/efl:

* many files: Renamed, using script.

Source/WebKit/gtk:

* many files: Renamed, using script.

Source/WebKit/mac:

* many files: Renamed, using script.

Source/WebKit/qt:

* many files: Renamed, using script.

Source/WebKit/win:

* many files: Renamed, using script.

Source/WebKit/wince:

* many files: Renamed, using script.

Source/WebKit2:

* many files: Renamed, using script.

Tools:

* many files: Renamed, using script.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@156550 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 42062786
......@@ -1817,7 +1817,7 @@ set(WebCore_SOURCES
platform/FileStream.cpp
platform/FileSystem.cpp
platform/HistogramSupport.cpp
platform/KURL.cpp
platform/URL.cpp
platform/KillRingNone.cpp
platform/Language.cpp
platform/Length.cpp
......
2013-09-26 Darin Adler <darin@apple.com>
rename KURL to URL
https://bugs.webkit.org/show_bug.cgi?id=16214
Reviewed by Andreas Kling.
* many files: Renamed, using script.
2013-09-06 Jer Noble <jer.noble@apple.com>
[Mac] Implement the media controls in JavaScript.
......@@ -6059,9 +6059,9 @@ platform_sources += \
Source/WebCore/platform/HistogramSupport.cpp \
Source/WebCore/platform/HistogramSupport.h \
Source/WebCore/platform/HostWindow.h \
Source/WebCore/platform/KURL.cpp \
Source/WebCore/platform/KURL.h \
Source/WebCore/platform/KURLHash.h \
Source/WebCore/platform/URL.cpp \
Source/WebCore/platform/URL.h \
Source/WebCore/platform/URLHash.h \
Source/WebCore/platform/KillRing.h \
Source/WebCore/platform/KillRingNone.cpp \
Source/WebCore/platform/Language.cpp \
......
......@@ -55,7 +55,7 @@
namespace WebCore {
// static
PassRefPtr<DOMFileSystem> DOMFileSystem::create(ScriptExecutionContext* context, const String& name, FileSystemType type, const KURL& rootURL, PassOwnPtr<AsyncFileSystem> asyncFileSystem)
PassRefPtr<DOMFileSystem> DOMFileSystem::create(ScriptExecutionContext* context, const String& name, FileSystemType type, const URL& rootURL, PassOwnPtr<AsyncFileSystem> asyncFileSystem)
{
RefPtr<DOMFileSystem> fileSystem(adoptRef(new DOMFileSystem(context, name, type, rootURL, asyncFileSystem)));
fileSystem->suspendIfNeeded();
......@@ -83,10 +83,10 @@ PassRefPtr<DOMFileSystem> DOMFileSystem::createIsolatedFileSystem(ScriptExecutio
rootURL.append(filesystemId);
rootURL.append("/");
return DOMFileSystem::create(context, filesystemName.toString(), FileSystemTypeIsolated, KURL(ParsedURLString, rootURL.toString()), AsyncFileSystem::create());
return DOMFileSystem::create(context, filesystemName.toString(), FileSystemTypeIsolated, URL(ParsedURLString, rootURL.toString()), AsyncFileSystem::create());
}
DOMFileSystem::DOMFileSystem(ScriptExecutionContext* context, const String& name, FileSystemType type, const KURL& rootURL, PassOwnPtr<AsyncFileSystem> asyncFileSystem)
DOMFileSystem::DOMFileSystem(ScriptExecutionContext* context, const String& name, FileSystemType type, const URL& rootURL, PassOwnPtr<AsyncFileSystem> asyncFileSystem)
: DOMFileSystemBase(context, name, type, rootURL, asyncFileSystem)
, ActiveDOMObject(context)
{
......@@ -150,7 +150,7 @@ namespace {
class SnapshotFileCallback : public FileSystemCallbacksBase {
public:
static PassOwnPtr<SnapshotFileCallback> create(PassRefPtr<DOMFileSystem> filesystem, const String& name, const KURL& url, PassRefPtr<FileCallback> successCallback, PassRefPtr<ErrorCallback> errorCallback)
static PassOwnPtr<SnapshotFileCallback> create(PassRefPtr<DOMFileSystem> filesystem, const String& name, const URL& url, PassRefPtr<FileCallback> successCallback, PassRefPtr<ErrorCallback> errorCallback)
{
return adoptPtr(new SnapshotFileCallback(filesystem, name, url, successCallback, errorCallback));
}
......@@ -184,7 +184,7 @@ public:
}
private:
SnapshotFileCallback(PassRefPtr<DOMFileSystem> filesystem, const String& name, const KURL& url, PassRefPtr<FileCallback> successCallback, PassRefPtr<ErrorCallback> errorCallback)
SnapshotFileCallback(PassRefPtr<DOMFileSystem> filesystem, const String& name, const URL& url, PassRefPtr<FileCallback> successCallback, PassRefPtr<ErrorCallback> errorCallback)
: FileSystemCallbacksBase(errorCallback)
, m_filesystem(filesystem)
, m_name(name)
......@@ -195,7 +195,7 @@ private:
RefPtr<DOMFileSystem> m_filesystem;
String m_name;
KURL m_url;
URL m_url;
RefPtr<FileCallback> m_successCallback;
};
......@@ -203,7 +203,7 @@ private:
void DOMFileSystem::createFile(const FileEntry* fileEntry, PassRefPtr<FileCallback> successCallback, PassRefPtr<ErrorCallback> errorCallback)
{
KURL fileSystemURL = createFileSystemURL(fileEntry);
URL fileSystemURL = createFileSystemURL(fileEntry);
m_asyncFileSystem->createSnapshotFileAndReadMetadata(fileSystemURL, SnapshotFileCallback::create(this, fileEntry->name(), fileSystemURL, successCallback, errorCallback));
}
......
......@@ -47,7 +47,7 @@ class FileWriterCallback;
class DOMFileSystem : public DOMFileSystemBase, public ActiveDOMObject {
public:
static PassRefPtr<DOMFileSystem> create(ScriptExecutionContext*, const String& name, FileSystemType, const KURL& rootURL, PassOwnPtr<AsyncFileSystem>);
static PassRefPtr<DOMFileSystem> create(ScriptExecutionContext*, const String& name, FileSystemType, const URL& rootURL, PassOwnPtr<AsyncFileSystem>);
// Creates a new isolated file system for the given filesystemId.
static PassRefPtr<DOMFileSystem> createIsolatedFileSystem(ScriptExecutionContext*, const String& filesystemId);
......@@ -72,7 +72,7 @@ public:
}
private:
DOMFileSystem(ScriptExecutionContext*, const String& name, FileSystemType, const KURL& rootURL, PassOwnPtr<AsyncFileSystem>);
DOMFileSystem(ScriptExecutionContext*, const String& name, FileSystemType, const URL& rootURL, PassOwnPtr<AsyncFileSystem>);
// ActiveDOMObject methods.
virtual void stop() OVERRIDE;
......
......@@ -57,7 +57,7 @@ const size_t DOMFileSystemBase::temporaryPathPrefixLength = sizeof(DOMFileSystem
const char DOMFileSystemBase::isolatedPathPrefix[] = "isolated";
const size_t DOMFileSystemBase::isolatedPathPrefixLength = sizeof(DOMFileSystemBase::isolatedPathPrefix) - 1;
DOMFileSystemBase::DOMFileSystemBase(ScriptExecutionContext* context, const String& name, FileSystemType type, const KURL& rootURL, PassOwnPtr<AsyncFileSystem> asyncFileSystem)
DOMFileSystemBase::DOMFileSystemBase(ScriptExecutionContext* context, const String& name, FileSystemType type, const URL& rootURL, PassOwnPtr<AsyncFileSystem> asyncFileSystem)
: m_context(context)
, m_name(name)
, m_type(type)
......@@ -79,7 +79,7 @@ bool DOMFileSystemBase::isValidType(FileSystemType type)
}
// static
bool DOMFileSystemBase::crackFileSystemURL(const KURL& url, FileSystemType& type, String& filePath)
bool DOMFileSystemBase::crackFileSystemURL(const URL& url, FileSystemType& type, String& filePath)
{
if (!url.protocolIs("filesystem"))
return false;
......@@ -105,10 +105,10 @@ bool DOMFileSystemBase::supportsToURL() const
return true;
}
KURL DOMFileSystemBase::createFileSystemURL(const String& fullPath) const
URL DOMFileSystemBase::createFileSystemURL(const String& fullPath) const
{
ASSERT(DOMFilePath::isAbsolute(fullPath));
KURL url = m_filesystemRootURL;
URL url = m_filesystemRootURL;
// Remove the extra leading slash.
url.setPath(url.path() + encodeWithURLEscapeSequences(fullPath.substring(1)));
return url;
......@@ -120,7 +120,7 @@ SecurityOrigin* DOMFileSystemBase::securityOrigin() const
return m_context->securityOrigin();
}
KURL DOMFileSystemBase::createFileSystemURL(const EntryBase* entry) const
URL DOMFileSystemBase::createFileSystemURL(const EntryBase* entry) const
{
return createFileSystemURL(entry->fullPath());
}
......
......@@ -36,7 +36,7 @@
#include "AsyncFileSystem.h"
#include "FileSystemFlags.h"
#include "FileSystemType.h"
#include "KURL.h"
#include "URL.h"
#include <wtf/PassRefPtr.h>
#include <wtf/RefCounted.h>
#include <wtf/text/WTFString.h>
......@@ -66,7 +66,7 @@ public:
static const char isolatedPathPrefix[];
static const size_t isolatedPathPrefixLength;
static PassRefPtr<DOMFileSystemBase> create(ScriptExecutionContext* context, const String& name, FileSystemType type, const KURL& rootURL, PassOwnPtr<AsyncFileSystem> asyncFileSystem)
static PassRefPtr<DOMFileSystemBase> create(ScriptExecutionContext* context, const String& name, FileSystemType type, const URL& rootURL, PassOwnPtr<AsyncFileSystem> asyncFileSystem)
{
return adoptRef(new DOMFileSystemBase(context, name, type, rootURL, asyncFileSystem));
}
......@@ -74,7 +74,7 @@ public:
const String& name() const { return m_name; }
FileSystemType type() const { return m_type; }
KURL rootURL() const { return m_filesystemRootURL; }
URL rootURL() const { return m_filesystemRootURL; }
AsyncFileSystem* asyncFileSystem() const { return m_asyncFileSystem.get(); }
SecurityOrigin* securityOrigin() const;
......@@ -85,10 +85,10 @@ public:
bool clonable() const { return m_clonable; }
static bool isValidType(FileSystemType);
static bool crackFileSystemURL(const KURL&, FileSystemType&, String& filePath);
static bool crackFileSystemURL(const URL&, FileSystemType&, String& filePath);
bool supportsToURL() const;
KURL createFileSystemURL(const EntryBase*) const;
KURL createFileSystemURL(const String& fullPath) const;
URL createFileSystemURL(const EntryBase*) const;
URL createFileSystemURL(const String& fullPath) const;
// Actual FileSystem API implementations. All the validity checks on virtual paths are done at this level.
// They return false for immediate errors that don't involve lower AsyncFileSystem layer (e.g. for name validation errors). Otherwise they return true (but later may call back with an runtime error).
......@@ -103,13 +103,13 @@ public:
bool readDirectory(PassRefPtr<DirectoryReaderBase>, const String& path, PassRefPtr<EntriesCallback>, PassRefPtr<ErrorCallback>);
protected:
DOMFileSystemBase(ScriptExecutionContext*, const String& name, FileSystemType, const KURL& rootURL, PassOwnPtr<AsyncFileSystem>);
DOMFileSystemBase(ScriptExecutionContext*, const String& name, FileSystemType, const URL& rootURL, PassOwnPtr<AsyncFileSystem>);
friend class DOMFileSystemSync;
ScriptExecutionContext* m_context;
String m_name;
FileSystemType m_type;
KURL m_filesystemRootURL;
URL m_filesystemRootURL;
bool m_clonable;
mutable OwnPtr<AsyncFileSystem> m_asyncFileSystem;
......
......@@ -56,7 +56,7 @@ PassRefPtr<DOMFileSystemSync> DOMFileSystemSync::create(DOMFileSystemBase* fileS
return adoptRef(new DOMFileSystemSync(fileSystem->m_context, fileSystem->name(), fileSystem->type(), fileSystem->rootURL(), fileSystem->m_asyncFileSystem.release()));
}
DOMFileSystemSync::DOMFileSystemSync(ScriptExecutionContext* context, const String& name, FileSystemType type, const KURL& rootURL, PassOwnPtr<AsyncFileSystem> asyncFileSystem)
DOMFileSystemSync::DOMFileSystemSync(ScriptExecutionContext* context, const String& name, FileSystemType type, const URL& rootURL, PassOwnPtr<AsyncFileSystem> asyncFileSystem)
: DOMFileSystemBase(context, name, type, rootURL, asyncFileSystem)
{
}
......@@ -98,7 +98,7 @@ public:
friend class WTF::RefCounted<CreateFileResult>;
};
static PassOwnPtr<CreateFileHelper> create(PassRefPtr<CreateFileResult> result, const String& name, const KURL& url, FileSystemType type)
static PassOwnPtr<CreateFileHelper> create(PassRefPtr<CreateFileResult> result, const String& name, const URL& url, FileSystemType type)
{
return adoptPtr(new CreateFileHelper(result, name, url, type));
}
......@@ -136,7 +136,7 @@ public:
}
}
private:
CreateFileHelper(PassRefPtr<CreateFileResult> result, const String& name, const KURL& url, FileSystemType type)
CreateFileHelper(PassRefPtr<CreateFileResult> result, const String& name, const URL& url, FileSystemType type)
: m_result(result)
, m_name(name)
, m_url(url)
......@@ -146,7 +146,7 @@ private:
RefPtr<CreateFileResult> m_result;
String m_name;
KURL m_url;
URL m_url;
FileSystemType m_type;
};
......@@ -155,7 +155,7 @@ private:
PassRefPtr<File> DOMFileSystemSync::createFile(const FileEntrySync* fileEntry, ExceptionCode& ec)
{
ec = 0;
KURL fileSystemURL = createFileSystemURL(fileEntry);
URL fileSystemURL = createFileSystemURL(fileEntry);
RefPtr<CreateFileHelper::CreateFileResult> result(CreateFileHelper::CreateFileResult::create());
m_asyncFileSystem->createSnapshotFileAndReadMetadata(fileSystemURL, CreateFileHelper::create(result, fileEntry->name(), fileSystemURL, type()));
if (!m_asyncFileSystem->waitForOperationToComplete()) {
......
......@@ -46,7 +46,7 @@ typedef int ExceptionCode;
class DOMFileSystemSync : public DOMFileSystemBase {
public:
static PassRefPtr<DOMFileSystemSync> create(ScriptExecutionContext* context, const String& name, FileSystemType type, const KURL& rootURL, PassOwnPtr<AsyncFileSystem> asyncFileSystem)
static PassRefPtr<DOMFileSystemSync> create(ScriptExecutionContext* context, const String& name, FileSystemType type, const URL& rootURL, PassOwnPtr<AsyncFileSystem> asyncFileSystem)
{
return adoptRef(new DOMFileSystemSync(context, name, type, rootURL, asyncFileSystem));
}
......@@ -61,7 +61,7 @@ public:
PassRefPtr<FileWriterSync> createWriter(const FileEntrySync*, ExceptionCode&);
private:
DOMFileSystemSync(ScriptExecutionContext*, const String& name, FileSystemType, const KURL& rootURL, PassOwnPtr<AsyncFileSystem>);
DOMFileSystemSync(ScriptExecutionContext*, const String& name, FileSystemType, const URL& rootURL, PassOwnPtr<AsyncFileSystem>);
};
}
......
......@@ -84,7 +84,7 @@ void DOMWindowFileSystem::webkitResolveLocalFileSystemURL(DOMWindow* window, con
return;
SecurityOrigin* securityOrigin = document->securityOrigin();
KURL completedURL = document->completeURL(url);
URL completedURL = document->completeURL(url);
if (!AsyncFileSystem::isAvailable() || !securityOrigin->canAccessFileSystem() || !securityOrigin->canRequest(completedURL)) {