Reviewed by John.
authordarin <darin@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 14 Feb 2005 21:09:29 +0000 (21:09 +0000)
committerdarin <darin@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 14 Feb 2005 21:09:29 +0000 (21:09 +0000)
        - fixed <rdar://problem/3686434> Safari uses too much RAM on file upload, leading to malloc errors and crashes (HP printers)

        * khtml/html/html_formimpl.cpp:
        (DOM::FormDataList::begin): Updated to use a list of FormDataListItem instead of QCString.
        (DOM::FormDataList::end): Ditto.
        (DOM::HTMLFormElementImpl::formData): Same here, and also use appendFile rather than appendData
        when we encounter a path name rather than data.
        (DOM::HTMLInputElementImpl::appendFormData): Use appendFile here rather than reading the file
        in; the reading now happens inside WebKit.
        (DOM::FormDataList::appendString): Updated for FormDataListItem.
        (DOM::FormDataList::appendFile): Added.

        * ForwardingHeaders/kfileitem.h: Emptied out the file; no longer includes KWQKFileItem.h.
        * ForwardingHeaders/netaccess.h: Emptied out the file; no longer includes KWQKIONetAccess.h.
        * kwq/KWQKFileItem.h: Removed.
        * kwq/KWQKFileItem.mm: Removed.
        * kwq/KWQKIONetAccess.h: Removed.
        * kwq/KWQKIONetAccess.mm: Removed.
        * WebCore.pbproj/project.pbxproj: Removed the 4 files above.

        - small unrelated fix (not reviewed by John)

        * khtml/ecma/kjs_window.cpp: (Window::isSafeScript): Put some logging code outside if statements so it works all the time.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@8591 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/ChangeLog-2005-08-23
WebCore/ForwardingHeaders/kfileitem.h
WebCore/ForwardingHeaders/netaccess.h
WebCore/WebCore.pbproj/project.pbxproj
WebCore/khtml/ecma/kjs_window.cpp
WebCore/khtml/html/html_formimpl.cpp
WebCore/kwq/KWQKFileItem.h [deleted file]
WebCore/kwq/KWQKFileItem.mm [deleted file]
WebCore/kwq/KWQKIONetAccess.h [deleted file]
WebCore/kwq/KWQKIONetAccess.mm [deleted file]

index 8c34d402c43d71ba8bbe8b468d8860e777654548..34fbcbb9fd2764a08c05fae0723b59950bdcdbb7 100644 (file)
@@ -1,3 +1,31 @@
+2005-02-14  Darin Adler  <darin@apple.com>
+
+        Reviewed by John.
+
+        - fixed <rdar://problem/3686434> Safari uses too much RAM on file upload, leading to malloc errors and crashes (HP printers)
+
+        * khtml/html/html_formimpl.cpp:
+        (DOM::FormDataList::begin): Updated to use a list of FormDataListItem instead of QCString.
+        (DOM::FormDataList::end): Ditto.
+        (DOM::HTMLFormElementImpl::formData): Same here, and also use appendFile rather than appendData
+        when we encounter a path name rather than data.
+        (DOM::HTMLInputElementImpl::appendFormData): Use appendFile here rather than reading the file
+        in; the reading now happens inside WebKit.
+        (DOM::FormDataList::appendString): Updated for FormDataListItem.
+        (DOM::FormDataList::appendFile): Added.
+
+        * ForwardingHeaders/kfileitem.h: Emptied out the file; no longer includes KWQKFileItem.h.
+        * ForwardingHeaders/netaccess.h: Emptied out the file; no longer includes KWQKIONetAccess.h.
+        * kwq/KWQKFileItem.h: Removed.
+        * kwq/KWQKFileItem.mm: Removed.
+        * kwq/KWQKIONetAccess.h: Removed.
+        * kwq/KWQKIONetAccess.mm: Removed.
+        * WebCore.pbproj/project.pbxproj: Removed the 4 files above.
+
+        - small unrelated fix (not reviewed by John)
+
+        * khtml/ecma/kjs_window.cpp: (Window::isSafeScript): Put some logging code outside if statements so it works all the time.
+
 2005-02-14  David Harrison  <harrison@apple.com>
 
         Reviewed by Darin.
index ad35ed7d4011403b6380f5f78cfe59f310e56292..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
@@ -1 +0,0 @@
-#import "KWQKFileItem.h"
index 58a9a23a96a37bd37d225e5c17c41ca9891e3a5a..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
@@ -1 +0,0 @@
-#import "KWQKIONetAccess.h"
index 0a63c7b75d2a86bc7a4357ce5e2e0111966a1f34..83854fb93739645c81825420e094fa567e0fa0a0 100644 (file)
                                F587858002DE375901EA4122,
                                F587862902DE398401EA4122,
                                F587860A02DE382001EA4122,
-                               F587865702DE3A9A01EA4122,
                                F587860B02DE382001EA4122,
                                F587860C02DE382001EA4122,
                                F587863C02DE3A1401EA4122,
                                F587863B02DE3A1401EA4122,
                                F587864202DE3A1401EA4122,
                                F587865402DE3A9A01EA4122,
-                               F587865D02DE3A9A01EA4122,
                                F587865802DE3A9A01EA4122,
                                F587860E02DE382001EA4122,
                                F587864602DE3A7701EA4122,
                                F587857F02DE375901EA4122,
                                F587858102DE375901EA4122,
                                F587858202DE375901EA4122,
-                               F587858502DE375901EA4122,
                                F587858602DE375901EA4122,
                                F587858702DE375901EA4122,
                                F587858802DE375901EA4122,
                                F587859302DE375901EA4122,
                                F587859502DE375901EA4122,
                                F587859602DE375901EA4122,
-                               F587859902DE375901EA4122,
                                F587859A02DE375901EA4122,
                                F587859E02DE375901EA4122,
                                F587859F02DE375901EA4122,
                        refType = 4;
                        sourceTree = "<group>";
                };
-               F58784F302DE375901EA4122 = {
-                       fileEncoding = 30;
-                       isa = PBXFileReference;
-                       lastKnownFileType = sourcecode.cpp.objcpp;
-                       path = KWQKFileItem.mm;
-                       refType = 4;
-                       sourceTree = "<group>";
-               };
                F58784F402DE375901EA4122 = {
                        fileEncoding = 30;
                        isa = PBXFileReference;
                        refType = 4;
                        sourceTree = "<group>";
                };
-               F587850702DE375901EA4122 = {
-                       fileEncoding = 30;
-                       isa = PBXFileReference;
-                       lastKnownFileType = sourcecode.cpp.objcpp;
-                       path = KWQKIONetAccess.mm;
-                       refType = 4;
-                       sourceTree = "<group>";
-               };
                F587850802DE375901EA4122 = {
                        fileEncoding = 30;
                        isa = PBXFileReference;
                        settings = {
                        };
                };
-               F587858502DE375901EA4122 = {
-                       fileRef = F58784F302DE375901EA4122;
-                       isa = PBXBuildFile;
-                       settings = {
-                       };
-               };
                F587858602DE375901EA4122 = {
                        fileRef = F58784F402DE375901EA4122;
                        isa = PBXBuildFile;
                        settings = {
                        };
                };
-               F587859902DE375901EA4122 = {
-                       fileRef = F587850702DE375901EA4122;
-                       isa = PBXBuildFile;
-                       settings = {
-                       };
-               };
                F587859A02DE375901EA4122 = {
                        fileRef = F587850802DE375901EA4122;
                        isa = PBXBuildFile;
                        refType = 4;
                        sourceTree = "<group>";
                };
-               F587864C02DE3A9A01EA4122 = {
-                       fileEncoding = 30;
-                       isa = PBXFileReference;
-                       lastKnownFileType = sourcecode.c.h;
-                       path = KWQKFileItem.h;
-                       refType = 4;
-                       sourceTree = "<group>";
-               };
                F587864D02DE3A9A01EA4122 = {
                        fileEncoding = 30;
                        isa = PBXFileReference;
                        refType = 4;
                        sourceTree = "<group>";
                };
-               F587865202DE3A9A01EA4122 = {
-                       fileEncoding = 30;
-                       isa = PBXFileReference;
-                       lastKnownFileType = sourcecode.c.h;
-                       path = KWQKIONetAccess.h;
-                       refType = 4;
-                       sourceTree = "<group>";
-               };
                F587865402DE3A9A01EA4122 = {
                        fileRef = F587864902DE3A9A01EA4122;
                        isa = PBXBuildFile;
                        settings = {
                        };
                };
-               F587865702DE3A9A01EA4122 = {
-                       fileRef = F587864C02DE3A9A01EA4122;
-                       isa = PBXBuildFile;
-                       settings = {
-                       };
-               };
                F587865802DE3A9A01EA4122 = {
                        fileRef = F587864D02DE3A9A01EA4122;
                        isa = PBXBuildFile;
                        settings = {
                        };
                };
-               F587865D02DE3A9A01EA4122 = {
-                       fileRef = F587865202DE3A9A01EA4122;
-                       isa = PBXBuildFile;
-                       settings = {
-                       };
-               };
                F587865F02DE3A9C01EA4122 = {
                        children = (
                                F58784E502DE375901EA4122,
                                F587850002DE375901EA4122,
                                F587864B02DE3A9A01EA4122,
                                F587850102DE375901EA4122,
-                               F587864C02DE3A9A01EA4122,
-                               F58784F302DE375901EA4122,
                                F587864D02DE3A9A01EA4122,
-                               F587865202DE3A9A01EA4122,
-                               F587850702DE375901EA4122,
                                F587866202DE3B1101EA4122,
                                84B2B24F056BF15F00D2B771,
                        );
index 0bdb34b1bd930acdcd55b5d8af1dd84368464762..285a46cb576a8093244ba14b5237ebbccb488c9c 100644 (file)
@@ -1157,11 +1157,11 @@ bool Window::isSafeScript (const KJS::ScriptInterpreter *origin, const KJS::Scri
     if (Interpreter::shouldPrintExceptions()) {
        printf("Unsafe JavaScript attempt to access frame with URL %s from frame with URL %s. Domains must match.\n", 
             targetDocument->URL().latin1(), originDocument->URL().latin1());
-       QString message;
-       message.sprintf("Unsafe JavaScript attempt to access frame with URL %s from frame with URL %s. Domains must match.\n", 
-                     targetDocument->URL().latin1(), originDocument->URL().latin1());
-       KWQ(targetPart)->addMessageToConsole(message, 1, QString()); //fixme: provide a real line number and sourceurl
     }
+    QString message;
+    message.sprintf("Unsafe JavaScript attempt to access frame with URL %s from frame with URL %s. Domains must match.\n", 
+                  targetDocument->URL().latin1(), originDocument->URL().latin1());
+    KWQ(targetPart)->addMessageToConsole(message, 1, QString()); //fixme: provide a real line number and sourceurl
 
     return false;
 }
@@ -1223,11 +1223,11 @@ bool Window::isSafeScript(ExecState *exec) const
   if (Interpreter::shouldPrintExceptions()) {
       printf("Unsafe JavaScript attempt to access frame with URL %s from frame with URL %s. Domains must match.\n", 
              thisDocument->URL().latin1(), actDocument->URL().latin1());
-      QString message;
-      message.sprintf("Unsafe JavaScript attempt to access frame with URL %s from frame with URL %s. Domains must match.\n", 
-                      thisDocument->URL().latin1(), actDocument->URL().latin1());
-      KWQ(m_part)->addMessageToConsole(message, 1, QString()); //fixme: provide a real line number and sourceurl
   }
+  QString message;
+  message.sprintf("Unsafe JavaScript attempt to access frame with URL %s from frame with URL %s. Domains must match.\n", 
+                  thisDocument->URL().latin1(), actDocument->URL().latin1());
+  KWQ(m_part)->addMessageToConsole(message, 1, QString());
 #endif
   
   kdWarning(6070) << "Javascript: access denied for current frame '" << actDomain.string() << "' to frame '" << thisDomain.string() << "'" << endl;
index d43dd0d3fe68b86227dbf2e80544b20c5dbc98b7..831bd4109cb0a52abdd1a72c97f311108f1938a9 100644 (file)
@@ -66,6 +66,14 @@ using namespace khtml;
 
 namespace DOM {
 
+struct FormDataListItem {
+    FormDataListItem(const QCString &data) : m_data(data) { }
+    FormDataListItem(const QString &path) : m_path(path) { }
+
+    QString m_path;
+    QCString m_data;
+};
+
 class FormDataList {
 public:
     FormDataList(QTextCodec *);
@@ -80,16 +88,17 @@ public:
         { appendString(key.string()); appendString(QString::number(value)); }
     void appendFile(const DOMString &key, const DOMString &filename);
 
-    // Temporary API.
-    QValueListConstIterator<QCString> begin() const;
-    QValueListConstIterator<QCString> end() const;
+    QValueListConstIterator<FormDataListItem> begin() const
+        { return m_list.begin(); }
+    QValueListConstIterator<FormDataListItem> end() const
+        { return m_list.end(); }
 
 private:
     void appendString(const QCString &s);
     void appendString(const QString &s);
 
     QTextCodec *m_codec;
-    QValueList<QCString> m_strings;
+    QValueList<FormDataListItem> m_list;
 };
 
 HTMLFormElementImpl::HTMLFormElementImpl(DocumentPtr *doc)
@@ -358,24 +367,24 @@ bool HTMLFormElementImpl::formData(FormData &form_data) const
         if (!current->disabled() && current->appendFormData(lst, m_multipart))
         {
             //kdDebug(6030) << "adding name " << current->name().string() << endl;
-            for(QValueListConstIterator<QCString> it = lst.begin(); it != lst.end(); ++it )
+            for(QValueListConstIterator<FormDataListItem> it = lst.begin(); it != lst.end(); ++it )
             {
                 if (!m_multipart)
                 {
                     // handle ISINDEX / <input name=isindex> special
                     // but only if its the first entry
-                    if ( enc_string.isEmpty() && *it == "isindex" ) {
+                    if ( enc_string.isEmpty() && (*it).m_data == "isindex" ) {
                         ++it;
-                        enc_string += encodeCString( *it );
+                        enc_string += encodeCString( (*it).m_data );
                     }
                     else {
                         if(!enc_string.isEmpty())
                             enc_string += '&';
 
-                        enc_string += encodeCString(*it);
+                        enc_string += encodeCString((*it).m_data);
                         enc_string += "=";
                         ++it;
-                        enc_string += encodeCString(*it);
+                        enc_string += encodeCString((*it).m_data);
                     }
                 }
                 else
@@ -384,7 +393,7 @@ bool HTMLFormElementImpl::formData(FormData &form_data) const
                     hstr += m_boundary.string().latin1();
                     hstr += "\r\n";
                     hstr += "Content-Disposition: form-data; name=\"";
-                    hstr += (*it).data();
+                    hstr += (*it).m_data.data();
                     hstr += "\"";
 
                     // if the current type is FILE, then we also need to
@@ -425,7 +434,16 @@ bool HTMLFormElementImpl::formData(FormData &form_data) const
 
                     // append body
                     form_data.appendData(hstr.data(), hstr.length());
-                    form_data.appendData(*it, (*it).size() - 1);
+#if APPLE_CHANGES
+                    const FormDataListItem &item = *it;
+                    size_t dataSize = item.m_data.size();
+                    if (dataSize != 0)
+                        form_data.appendData(item.m_data, dataSize - 1);
+                    else if (!item.m_path.isEmpty())
+                        form_data.appendFile(item.m_path);
+#else
+                    form_data.appendData((*it).m_data, (*it).m_data.size() - 1);
+#endif
                     form_data.appendData("\r\n", 2);
                 }
             }
@@ -1818,16 +1836,15 @@ bool HTMLInputElementImpl::appendFormData(FormDataList &encoding, bool multipart
                 return true;
             }
 
+#if APPLE_CHANGES
+            encoding.appendFile(name(), value());
+#else
             KURL fileurl("file:///");
             fileurl.setPath(value().string());
             KIO::UDSEntry filestat;
 
             if (!KIO::NetAccess::stat(fileurl, filestat)) {
-#if APPLE_CHANGES
-                // FIXME: Figure out how to report this error.
-#else
                 KMessageBox::sorry(0L, i18n("Error fetching file for submission:\n%1").arg(KIO::NetAccess::lastErrorString()));
-#endif
                 return false;
             }
 
@@ -1856,14 +1873,11 @@ bool HTMLInputElementImpl::appendFormData(FormDataList &encoding, bool multipart
                 return false;
             }
             else {
-#if APPLE_CHANGES
-                // FIXME: Figure out how to report this error.
-#else
                 KMessageBox::sorry(0L, i18n("Error fetching file for submission:\n%1").arg(KIO::NetAccess::lastErrorString()));
-#endif
                 return false;
             }
             break;
+#endif
         }
         case ISINDEX:
             encoding.appendData(name(), value());
@@ -3144,24 +3158,20 @@ FormDataList::FormDataList(QTextCodec *c)
 
 void FormDataList::appendString(const QCString &s)
 {
-    m_strings.append(s);
+    m_list.append(s);
 }
 
 void FormDataList::appendString(const QString &s)
 {
     QCString cstr = fixLineBreaks(m_codec->fromUnicode(s));
     cstr.truncate(cstr.length());
-    m_strings.append(cstr);
-}
-
-QValueListConstIterator<QCString> FormDataList::begin() const
-{
-    return m_strings.begin();
+    m_list.append(cstr);
 }
 
-QValueListConstIterator<QCString> FormDataList::end() const
+void FormDataList::appendFile(const DOMString &key, const DOMString &filename)
 {
-    return m_strings.end();
+    appendString(key.string());
+    m_list.append(filename.string());
 }
 
 } // namespace
diff --git a/WebCore/kwq/KWQKFileItem.h b/WebCore/kwq/KWQKFileItem.h
deleted file mode 100644 (file)
index b8f4d1b..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2003 Apple Computer, 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 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. 
- */
-
-#ifndef KFILEITEM_H_
-#define KFILEITEM_H_
-
-#include "KWQKIONetAccess.h"
-
-class KFileItem {
-public:
-    KFileItem(const KIO::UDSEntry &, const KURL &, bool, bool);
-    bool isDir() const;
-};
-
-#endif
diff --git a/WebCore/kwq/KWQKFileItem.mm b/WebCore/kwq/KWQKFileItem.mm
deleted file mode 100644 (file)
index 61ce56c..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2003 Apple Computer, 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 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. 
- */
-
-#import "KWQKFileItem.h"
-
-#import "KWQLogging.h"
-
-KFileItem::KFileItem(const KIO::UDSEntry &, const KURL &, bool, bool)
-{
-}
-
-bool KFileItem::isDir() const
-{
-    return false;
-}
-
-
-
diff --git a/WebCore/kwq/KWQKIONetAccess.h b/WebCore/kwq/KWQKIONetAccess.h
deleted file mode 100644 (file)
index d0ff8e8..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (C) 2003 Apple Computer, 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 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. 
- */
-
-#ifndef NETACCESS_H_
-#define NETACCESS_H_
-
-#include "KWQValueList.h"
-#include "KWQKURL.h"
-
-namespace KIO {
-
-class UDSAtom { };
-
-typedef QValueList<UDSAtom> UDSEntry;
-
-class NetAccess {
-public:
-    static bool stat(const KURL &, KIO::UDSEntry &);
-    static QString lastErrorString();
-    static bool download(const KURL &, QString &);
-    static void removeTempFile(const QString &);
-};
-
-}
-
-#endif
diff --git a/WebCore/kwq/KWQKIONetAccess.mm b/WebCore/kwq/KWQKIONetAccess.mm
deleted file mode 100644 (file)
index 1412df6..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2003 Apple Computer, 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 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. 
- */
-
-#import "KWQLogging.h"
-#import "KWQKIONetAccess.h"
-
-namespace KIO {
-
-bool NetAccess::stat(const KURL &, KIO::UDSEntry &)
-{
-    return true;
-}
-
-QString NetAccess::lastErrorString()
-{
-    return QString::null;
-}
-
-bool NetAccess::download(const KURL &url, QString &filename)
-{
-    filename = url.path();
-    return true;
-}
-
-void NetAccess::removeTempFile(const QString &)
-{
-}
-
-} // namespace KIO
-