Not reviewed, fix for accidental commit.

        - rolled back more of the accidentall commit that I forgot.

        * platform/network/mac/ResourceRequestMac.h: Removed.
        * platform/network/mac/ResourceRequestMac.mm: Removed.

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

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index e944d363b335dde80602132381eddf2851ff5e92..fca52f0493ba72f0772ccc776f3fd04f40627bd6 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2006-11-03  Maciej Stachowiak  <mjs@apple.com>
+
+        Not reviewed, fix for accidental commit.
+
+        - rolled back more of the accidentall commit that I forgot.
+
+        * platform/network/mac/ResourceRequestMac.h: Removed.
+        * platform/network/mac/ResourceRequestMac.mm: Removed.
+
 2006-11-03  Maciej Stachowiak  <mjs@apple.com>
 
         Not reviewed, fix for accidental commit.

diff --git a/WebCore/platform/network/mac/ResourceRequestMac.h b/WebCore/platform/network/mac/ResourceRequestMac.h
deleted file mode 100644 (file)
index fe3a09c..0000000
--- a/WebCore/platform/network/mac/ResourceRequestMac.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// -*- mode: c++; c-basic-offset: 4 -*-
-/*
- * Copyright (C) 2006 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 ResourceRequestMac_h_
-#define ResourceRequestMac_h_
-
-@class NSURLRequest;
-
-namespace WebCore {
-
-    class ResourceRequest;
-
-    void getResourceRequest(ResourceRequest&, NSURLRequest *);
-    NSURLRequest *nsURLRequest(const ResourceRequest&);
-
-}
-
-#endif // ResourceRequestMac_h_

diff --git a/WebCore/platform/network/mac/ResourceRequestMac.mm b/WebCore/platform/network/mac/ResourceRequestMac.mm
deleted file mode 100644 (file)
index be95385..0000000
--- a/WebCore/platform/network/mac/ResourceRequestMac.mm
+++ /dev/null
@@ -1,83 +0,0 @@
-// -*- mode: c++; c-basic-offset: 4 -*-
-/*
- * Copyright (C) 2006 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 "config.h"
-#import "ResourceRequestMac.h"
-
-#import "FormDataStream.h"
-#import "ResourceRequest.h"
-
-#import <Foundation/Foundation.h>
-
-namespace WebCore {
-    
-    void getResourceRequest(ResourceRequest& request, NSURLRequest* nsRequest)
-    {
-        request = ResourceRequest([nsRequest URL]);
-
-        request.setCachePolicy((ResourceRequestCachePolicy)[nsRequest cachePolicy]);
-        request.setTimeoutInterval([nsRequest timeoutInterval]);
-        request.setMainDocumentURL(KURL([nsRequest mainDocumentURL]));
-        if (NSString* method = [nsRequest HTTPMethod])
-            request.setHTTPMethod(method);
-        request.setAllowHTTPCookies([nsRequest HTTPShouldHandleCookies]);
-
-        NSDictionary *headers = [nsRequest allHTTPHeaderFields];
-        NSEnumerator *e = [headers keyEnumerator];
-        NSString *name;
-        while ((name = [e nextObject]))
-            request.setHTTPHeaderField(name, [headers objectForKey:name]);
-
-        if (NSData* bodyData = [nsRequest HTTPBody])
-            request.setHTTPBody(FormData([bodyData bytes], [bodyData length]));
-        else if (NSInputStream* bodyStream = [nsRequest HTTPBodyStream])
-            if (const FormData* formData = httpBodyFromStream(bodyStream))
-                request.setHTTPBody(*formData);
-        // FIXME: what to do about arbitrary body streams?
-    }
-
-    NSURLRequest* nsURLRequest(const ResourceRequest& request)
-    {
-        NSMutableURLRequest* nsRequest = [[NSMutableURLRequest alloc] initWithURL:request.url().getNSURL()];
-
-        [nsRequest setCachePolicy:(NSURLRequestCachePolicy)request.cachePolicy()];
-        [nsRequest setTimeoutInterval:request.timeoutInterval()];
-        [nsRequest setMainDocumentURL:request.mainDocumentURL().getNSURL()];
-        if (!request.httpMethod().isEmpty())
-            [nsRequest setHTTPMethod:request.httpMethod()];
-        [nsRequest setHTTPShouldHandleCookies:request.allowHTTPCookies()];
-
-        HTTPHeaderMap::const_iterator end = request.httpHeaderFields().end();
-        for (HTTPHeaderMap::const_iterator it = request.httpHeaderFields().begin(); it != end; ++it)
-            [nsRequest setValue:it->second forHTTPHeaderField:it->first];
-
-        if (!request.httpBody().isEmpty())
-            setHTTPBody(nsRequest, request.httpBody());
-
-        return [nsRequest autorelease];
-    }
-
-}