Changeset 17762 in webkit

Timestamp:

Nov 14, 2006 11:52:07 AM (17 years ago)

Author:

beidson

Message:

Reviewed by Anders

Cleanup of my patch last night and merging with aroben-style changes from this morning
(More ref-counted FormData stuff)

• html/HTMLFormElement.cpp: (WebCore::HTMLFormElement::submit):
• loader/FrameLoader.cpp: (WebCore::FrameLoader::submitForm):
• platform/network/ResourceHandle.cpp: (WebCore::ResourceHandle::postData):
• platform/network/ResourceHandle.h:
• platform/network/cf/FormDataStreamCFNet.cpp: (WebCore::setHTTPBody):
• platform/network/mac/FormDataStreamMac.h:
• platform/network/mac/FormDataStreamMac.mm: (WebCore::getStreamFormDatas): (WebCore::formCreate): (WebCore::formFinalize): (WebCore::setHTTPBody): (WebCore::httpBodyFromStream):
• platform/network/mac/ResourceRequestMac.mm: (WebCore::getResourceRequest):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTMLFormElement.cpp (modified) (2 diffs)
• loader/FrameLoader.cpp (modified) (4 diffs)
• platform/network/ResourceHandle.cpp (modified) (1 diff)
• platform/network/ResourceHandle.h (modified) (1 diff)
• platform/network/cf/FormDataStreamCFNet.cpp (modified) (1 diff)
• platform/network/mac/FormDataStreamMac.h (modified) (1 diff)
• platform/network/mac/FormDataStreamMac.mm (modified) (8 diffs)
• platform/network/mac/ResourceRequestMac.mm (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2006-11-14  Brady Eidson  <beidson@apple.com>
+
+        Reviewed by Anders
+
+        Cleanup of my patch last night and merging with aroben-style changes from this morning
+        (More ref-counted FormData stuff)
+
+        * html/HTMLFormElement.cpp:
+        (WebCore::HTMLFormElement::submit):
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::submitForm):
+        * platform/network/ResourceHandle.cpp:
+        (WebCore::ResourceHandle::postData):
+        * platform/network/ResourceHandle.h:
+        * platform/network/cf/FormDataStreamCFNet.cpp:
+        (WebCore::setHTTPBody):
+        * platform/network/mac/FormDataStreamMac.h:
+        * platform/network/mac/FormDataStreamMac.mm:
+        (WebCore::getStreamFormDatas):
+        (WebCore::formCreate):
+        (WebCore::formFinalize):
+        (WebCore::setHTTPBody):
+        (WebCore::httpBodyFromStream):
+        * platform/network/mac/ResourceRequestMac.mm:
+        (WebCore::getResourceRequest):
+
 2006-11-14  Rob Buis  <buis@kde.org>
 

trunk/WebCore/html/HTMLFormElement.cpp

@@ -205 +205 @@
     }
 
-    RefPtr<FormData> result = new FormData();
+    RefPtr<FormData> result = new FormData;
     
     for (unsigned i = 0; i < formElements.size(); ++i) {
@@ -376 +376 @@
         m_multipart = false;
     
-    RefPtr<FormData> postData = formData();
     if (m_post)
-        frame->loader()->submitForm("POST", m_url, postData, m_target, enctype(), boundary(), event);
+        frame->loader()->submitForm("POST", m_url, formData(), m_target, enctype(), boundary(), event);
     else
-        frame->loader()->submitForm("GET", m_url, postData, m_target, String(), String(), event);
+        frame->loader()->submitForm("GET", m_url, formData(), m_target, String(), String(), event);
 
     if (needButtonActivation && firstSuccessfulSubmitButton)

trunk/WebCore/loader/FrameLoader.cpp

@@ -441 +441 @@
         if (m_deferredFormSubmission)
             return;
-        m_deferredFormSubmission.set(new FormSubmission(action, url, formData.get(), target,
+        m_deferredFormSubmission.set(new FormSubmission(action, url, formData, target,
             contentType, boundary, event));
         return;
@@ -460 +460 @@
         if (equalIgnoringCase(contentType, "multipart/form-data"))
             // FIXME: is this correct? I suspect not, but what site can we test this on?
-            encodedBody = KURL::encode_string(formData.get()->flattenToString().deprecatedString());
+            encodedBody = KURL::encode_string(formData->flattenToString().deprecatedString());
         else if (equalIgnoringCase(contentType, "text/plain")) {
             // Convention seems to be to decode, and s/&/\n/
-            encodedBody = formData.get()->flattenToString().deprecatedString();
+            encodedBody = formData->flattenToString().deprecatedString();
             encodedBody.replace('&', '\n');
             encodedBody.replace('+', ' ');
@@ -469 +469 @@
             encodedBody = KURL::encode_string(encodedBody); // Recode for the URL
         } else
-            encodedBody = KURL::encode_string(formData.get()->flattenToString().deprecatedString());
+            encodedBody = KURL::encode_string(formData->flattenToString().deprecatedString());
 
         DeprecatedString query = u.query();
@@ -481 +481 @@
     if (strcmp(action, "GET") == 0) {
         if (!mailtoForm)
-            u.setQuery(formData.get()->flattenToString().deprecatedString());
+            u.setQuery(formData->flattenToString().deprecatedString());
     } else {
         frameRequest.resourceRequest().setHTTPBody(formData.get());

trunk/WebCore/platform/network/ResourceHandle.cpp

@@ -68 +68 @@
 }
 
-const PassRefPtr<FormData> ResourceHandle::postData() const
+PassRefPtr<FormData> ResourceHandle::postData() const
 {
     return d->m_request.httpBody();

trunk/WebCore/platform/network/ResourceHandle.h

@@ -112 +112 @@
     const KURL& url() const;
     const String& method() const;
-    const PassRefPtr<FormData> postData() const;
+    PassRefPtr<FormData> postData() const;
 
 private:

trunk/WebCore/platform/network/cf/FormDataStreamCFNet.cpp

@@ -306 +306 @@
 void setHTTPBody(CFMutableURLRequestRef request, PassRefPtr<FormData> formData)
 {
+    if (!formData)
+        return;
     size_t count = formData->elements().size();
 

trunk/WebCore/platform/network/mac/FormDataStreamMac.h

@@ -37 +37 @@
     class FormData;
     void setHTTPBody(NSMutableURLRequest *, PassRefPtr<FormData>);
-    const PassRefPtr<FormData> httpBodyFromStream(NSInputStream* stream);
+    FormData* httpBodyFromStream(NSInputStream* stream);
 }
 

trunk/WebCore/platform/network/mac/FormDataStreamMac.mm

@@ -42 +42 @@
 namespace WebCore {
 
-static HashMap<CFReadStreamRef, RefPtr<FormData> >* streamFormDatas = 0;
-
-static HashMap<CFReadStreamRef, RefPtr<FormData> >* getStreamFormDatas()
-{
-    if (!streamFormDatas)
-        streamFormDatas = new HashMap<CFReadStreamRef, RefPtr<FormData> >();
+static HashMap<CFReadStreamRef, RefPtr<FormData> >& getStreamFormDatas()
+{
+    static HashMap<CFReadStreamRef, RefPtr<FormData> > streamFormDatas;
     return streamFormDatas;
 }
@@ -167 +164 @@
 static void* formCreate(CFReadStreamRef stream, void* context)
 {
-    RefPtr<FormData> formData = static_cast<FormData*>(context);
+    FormData* formData = static_cast<FormData*>(context);
 
     CFSetCallBacks runLoopAndModeCallBacks = { 0, pairRetain, pairRelease, NULL, pairEqual, pairHash };
@@ -183 +180 @@
         newInfo->remainingElements.append(formData->elements()[size - i - 1]);
 
-    getStreamFormDatas()->set(stream, formData);
+    getStreamFormDatas().set(stream, adoptRef(formData));
 
     return newInfo;
@@ -192 +189 @@
     FormStreamFields* form = static_cast<FormStreamFields*>(context);
 
-    getStreamFormDatas()->remove(stream);
+    getStreamFormDatas().remove(stream);
 
     closeCurrentStream(form);
@@ -307 +304 @@
 void setHTTPBody(NSMutableURLRequest *request, PassRefPtr<FormData> formData)
 {
-    size_t count = formData.get()->elements().size();
+    if (!formData)
+        return;
+        
+    size_t count = formData->elements().size();
 
     // Handle the common special case of one piece of form data, with no files.
     if (count == 1) {
-        const FormDataElement& element = formData.get()->elements()[0];
+        const FormDataElement& element = formData->elements()[0];
         if (element.m_type == FormDataElement::data) {
             NSData *data = [[NSData alloc] initWithBytes:element.m_data.data() length:element.m_data.size()];
@@ -323 +323 @@
     long long length = 0;
     for (size_t i = 0; i < count; ++i) {
-        const FormDataElement& element = formData.get()->elements()[i];
+        const FormDataElement& element = formData->elements()[i];
         if (element.m_type == FormDataElement::data)
             length += element.m_data.size();
@@ -340 +340 @@
     CFReadStreamRef stream = wkCreateCustomCFReadStream(formCreate, formFinalize,
         formOpen, formRead, formCanRead, formClose, formSchedule, formUnschedule,
-        formData.get());
+        formData.releaseRef());
     [request setHTTPBodyStream:(NSInputStream *)stream];
     CFRelease(stream);
@@ -346 +346 @@
 
 
-const PassRefPtr<FormData> httpBodyFromStream(NSInputStream* stream)
-{
-    return PassRefPtr<FormData>(getStreamFormDatas()->get((CFReadStreamRef)stream));
-}
-
-}
+FormData* httpBodyFromStream(NSInputStream* stream)
+{
+    return getStreamFormDatas().get((CFReadStreamRef)stream).get();
+}
+
+}

trunk/WebCore/platform/network/mac/ResourceRequestMac.mm

@@ -53 +53 @@
 
         if (NSData* bodyData = [nsRequest HTTPBody])
-            request.setHTTPBody(PassRefPtr<FormData>(new FormData([bodyData bytes], [bodyData length])));
+            request.setHTTPBody(new FormData([bodyData bytes], [bodyData length]));
         else if (NSInputStream* bodyStream = [nsRequest HTTPBodyStream])
-            if (const PassRefPtr<FormData> formData = httpBodyFromStream(bodyStream))
+            if (FormData* formData = httpBodyFromStream(bodyStream))
                 request.setHTTPBody(formData);
         // FIXME: what to do about arbitrary body streams?