Changeset 62679 in webkit

Timestamp:

Jul 7, 2010 10:11:47 AM (14 years ago)

Author:

andersca@apple.com

Message:

Change requestURL to a KURL.
​https://bugs.webkit.org/show_bug.cgi?id=41775

Reviewed by Sam Weinig.

• Plugins/WebNetscapePluginStream.h:

(WebNetscapePluginStream::setRequestURL):

• Plugins/WebNetscapePluginStream.mm:

(WebNetscapePluginStream::pluginCancelledConnectionError):
(WebNetscapePluginStream::errorForReason):
(WebNetscapePluginStream::startStream):
(WebNetscapePluginStream::didReceiveResponse):
(WebNetscapePluginStream::destroyStream):

Location:

trunk/WebKit/mac

Files:

• ChangeLog (modified) (1 diff)
• Plugins/WebNetscapePluginStream.h (modified) (4 diffs)
• Plugins/WebNetscapePluginStream.mm (modified) (6 diffs)

trunk/WebKit/mac/ChangeLog

@@ -8 +8 @@
         * WebView/WebView.mm:
         (-[WebView _commonInitializationWithFrameName:groupName:usesDocumentViews:]):
+
+2010-07-07  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Change requestURL to a KURL.
+        https://bugs.webkit.org/show_bug.cgi?id=41775
+
+        * Plugins/WebNetscapePluginStream.h:
+        (WebNetscapePluginStream::setRequestURL):
+        * Plugins/WebNetscapePluginStream.mm:
+        (WebNetscapePluginStream::pluginCancelledConnectionError):
+        (WebNetscapePluginStream::errorForReason):
+        (WebNetscapePluginStream::startStream):
+        (WebNetscapePluginStream::didReceiveResponse):
+        (WebNetscapePluginStream::destroyStream):
 
 2010-07-07  Anders Carlsson  <andersca@apple.com>

trunk/WebKit/mac/Plugins/WebNetscapePluginStream.h

@@ -37 +37 @@
 #import <wtf/RefPtr.h>
 #import <wtf/RetainPtr.h>
+#import <wtf/text/CString.h>
 
 #import "WebNetscapePluginView.h"
@@ -72 +73 @@
     void cancelLoadAndDestroyStreamWithError(NSError *);
 
-    void setRequestURL(NSURL *requestURL) { m_requestURL = requestURL; }
+    void setRequestURL(const WebCore::KURL& requestURL) { m_requestURL = requestURL; }
 
     void start();
@@ -90 +91 @@
     void deliverData();
 
-    void startStream(NSURL *, long long expectedContentLength, NSDate *lastModifiedDate, NSString *mimeType, NSData *headers);
+    void startStream(NSURL *, long long expectedContentLength, NSDate *lastModifiedDate, const WebCore::String& mimeType, NSData *headers);
     
     NSError *pluginCancelledConnectionError() const;
@@ -100 +101 @@
 
     RetainPtr<NSMutableData> m_deliveryData;
-    RetainPtr<NSURL> m_requestURL;
+    WebCore::KURL m_requestURL;
     RetainPtr<NSURL> m_responseURL;
-    RetainPtr<NSString> m_mimeType;
+    CString m_mimeType;
 
     NPP m_plugin;

trunk/WebKit/mac/Plugins/WebNetscapePluginStream.mm

@@ -103 +103 @@
 {
     return [[[NSError alloc] _initWithPluginErrorCode:WebKitErrorPlugInCancelledConnection
-                                           contentURL:m_responseURL ? m_responseURL.get() : m_requestURL.get()
+                                           contentURL:m_responseURL ? m_responseURL.get() : (NSURL *)m_requestURL
                                         pluginPageURL:nil
                                            pluginName:[[m_pluginView.get() pluginPackage] pluginInfo].name
-                                             MIMEType:m_mimeType.get()] autorelease];
+                                             MIMEType:(NSString *)String::fromUTF8(m_mimeType.data(), m_mimeType.length())] autorelease];
 }
 
@@ -117 +117 @@
         return [NSError _webKitErrorWithDomain:NSURLErrorDomain
                                           code:NSURLErrorCancelled 
-                                           URL:m_responseURL ? m_responseURL.get() : m_requestURL.get()];
+                                           URL:m_responseURL ? m_responseURL.get() : (NSURL *)m_requestURL];
 
     return pluginCancelledConnectionError();
@@ -210 +210 @@
 }
 
-void WebNetscapePluginStream::startStream(NSURL *url, long long expectedContentLength, NSDate *lastModifiedDate, NSString *mimeType, NSData *headers)
+void WebNetscapePluginStream::startStream(NSURL *url, long long expectedContentLength, NSDate *lastModifiedDate, const String& mimeType, NSData *headers)
 {
     ASSERT(!m_isTerminated);
     
     m_responseURL = url;
-    m_mimeType = mimeType;
+    m_mimeType = mimeType.utf8();
     
     free((void *)m_stream.url);
@@ -244 +244 @@
     {
         PluginStopDeferrer deferrer(m_pluginView.get());
-        npErr = m_pluginFuncs->newstream(m_plugin, (char *)[m_mimeType.get() UTF8String], &m_stream, NO, &m_transferMode);
-    }
-
-    LOG(Plugins, "NPP_NewStream URL=%@ MIME=%@ error=%d", m_responseURL.get(), m_mimeType.get(), npErr);
+        npErr = m_pluginFuncs->newstream(m_plugin, m_mimeType.mutableData(), &m_stream, NO, &m_transferMode);
+    }
+
+    LOG(Plugins, "NPP_NewStream URL=%@ MIME=%s error=%d", m_responseURL.get(), m_mimeType.data(), npErr);
 
     if (npErr != NPERR_NO_ERROR) {
@@ -351 +351 @@
     }
     
-    startStream([r URL], expectedContentLength, WKGetNSURLResponseLastModifiedDate(r), [r MIMEType], theHeaders);
+    startStream([r URL], expectedContentLength, WKGetNSURLResponseLastModifiedDate(r), response.mimeType(), theHeaders);
 }
 
@@ -441 +441 @@
         // NPP_URLNotify expects the request URL, not the response URL.
         PluginStopDeferrer deferrer(m_pluginView.get());
-        m_pluginFuncs->urlnotify(m_plugin, [m_requestURL.get() _web_URLCString], m_reason, m_notifyData);
-        LOG(Plugins, "NPP_URLNotify requestURL=%@ reason=%d", m_requestURL.get(), m_reason);
+        m_pluginFuncs->urlnotify(m_plugin, m_requestURL.string().utf8().data(), m_reason, m_notifyData);
+        LOG(Plugins, "NPP_URLNotify requestURL=%@ reason=%d", (NSURL *)m_requestURL, m_reason);
     }