[haiku-webkit-commits] r222 - in webkit/trunk/WebCore: . platform/haiku
- From: webkit@xxxxxxxxxxxxxxx
- To: haiku-webkit-commits@xxxxxxxxxxxxx
- Date: Thu, 25 Feb 2010 22:35:06 +0000
Author: stippi
Date: Thu Feb 25 22:34:59 2010
New Revision: 222
URL: http://mmlr.dyndns.org/changeset/222
Log:
Implemented KURL::fileSystemPath().
Added:
webkit/trunk/WebCore/platform/haiku/KURLHaiku.cpp
Modified:
webkit/trunk/WebCore/Jamfile
webkit/trunk/WebCore/platform/haiku/TemporaryLinkStubs.cpp
Modified: webkit/trunk/WebCore/Jamfile
==============================================================================
--- webkit/trunk/WebCore/Jamfile Thu Feb 25 22:34:10 2010 (r221)
+++ webkit/trunk/WebCore/Jamfile Thu Feb 25 22:34:59 2010 (r222)
@@ -1102,7 +1102,6 @@
KURLGoogle.cpp
Length.cpp
LinkHash.cpp
- LocalizedStringsHaiku.cpp
Logging.cpp
MIMETypeRegistry.cpp
Scrollbar.cpp
@@ -1200,6 +1199,8 @@
EventLoopHaiku.cpp
FileChooserHaiku.cpp
FileSystemHaiku.cpp
+ KURLHaiku.cpp
+ LocalizedStringsHaiku.cpp
LoggingHaiku.cpp
MIMETypeRegistryHaiku.cpp
PasteboardHaiku.cpp
Added: webkit/trunk/WebCore/platform/haiku/KURLHaiku.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ webkit/trunk/WebCore/platform/haiku/KURLHaiku.cpp Thu Feb 25 22:34:59
2010 (r222)
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2006 Apple Computer, Inc. All rights reserved.
+ * Copyright (C) 2006 Michael Emmel mike.emmel@xxxxxxxxx
+ * Copyright (C) 2006 George Staikos <staikos@xxxxxxx>
+ * Copyright (C) 2006 Dirk Mueller <mueller@xxxxxxx>
+ * Copyright (C) 2006 Nikolas Zimmermann <zimmermann@xxxxxxx>
+ * Copyright (C) 2007 Ryan Leavengood <leavengood@xxxxxxxxx>
+ * Copyright (C) 2009 Maxime Simon <simon.maxime@xxxxxxxxx>
+ *
+ * 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 COMPUTER, 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.
+ */
+
+#include "config.h"
+#include "KURL.h"
+
+#include "PlatformString.h"
+
+namespace WebCore {
+
+String KURL::fileSystemPath() const
+{
+ if (!isValid() || !protocolIs("file"))
+ return String();
+
+ return String(path());
+}
+
+} // namespace WebCore
+
Modified: webkit/trunk/WebCore/platform/haiku/TemporaryLinkStubs.cpp
==============================================================================
--- webkit/trunk/WebCore/platform/haiku/TemporaryLinkStubs.cpp Thu Feb 25
22:34:10 2010 (r221)
+++ webkit/trunk/WebCore/platform/haiku/TemporaryLinkStubs.cpp Thu Feb 25
22:34:59 2010 (r222)
@@ -66,11 +66,5 @@
return 0;
}
-String KURL::fileSystemPath() const
-{
- notImplemented();
- return String();
-}
-
} // namespace WebCore
Other related posts:
