[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
andersca at apple.com
andersca at apple.com
Wed Dec 22 13:39:09 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 2b26afe6ac5b85331872cc6975b23bc3ab51bba8
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Sep 22 15:57:35 2010 +0000
Change a bunch of Vector<char> to Vector<uint8_t> to better indicate that we're
dealing with raw bytes.
Reviewed by Adam Roben.
* WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp:
(WebKit::parsePostBuffer):
(WebKit::NPN_GetURL):
(WebKit::NPN_PostURL):
(WebKit::NPN_GetURLNotify):
(WebKit::NPN_PostURLNotify):
* WebProcess/Plugins/Netscape/NetscapePlugin.cpp:
(WebKit::NetscapePlugin::loadURL):
(WebKit::NetscapePlugin::initialize):
* WebProcess/Plugins/Netscape/NetscapePlugin.h:
* WebProcess/Plugins/Netscape/NetscapePluginStream.cpp:
(WebKit::NetscapePluginStream::deliverData):
(WebKit::NetscapePluginStream::deliverDataToPlugin):
* WebProcess/Plugins/Netscape/NetscapePluginStream.h:
* WebProcess/Plugins/PluginController.h:
* WebProcess/Plugins/PluginView.cpp:
(WebKit::PluginView::loadURL):
* WebProcess/Plugins/PluginView.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68048 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 5030c30..5cbe2fb 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -2,6 +2,32 @@
Reviewed by Adam Roben.
+ Change a bunch of Vector<char> to Vector<uint8_t> to better indicate that we're
+ dealing with raw bytes.
+
+ * WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp:
+ (WebKit::parsePostBuffer):
+ (WebKit::NPN_GetURL):
+ (WebKit::NPN_PostURL):
+ (WebKit::NPN_GetURLNotify):
+ (WebKit::NPN_PostURLNotify):
+ * WebProcess/Plugins/Netscape/NetscapePlugin.cpp:
+ (WebKit::NetscapePlugin::loadURL):
+ (WebKit::NetscapePlugin::initialize):
+ * WebProcess/Plugins/Netscape/NetscapePlugin.h:
+ * WebProcess/Plugins/Netscape/NetscapePluginStream.cpp:
+ (WebKit::NetscapePluginStream::deliverData):
+ (WebKit::NetscapePluginStream::deliverDataToPlugin):
+ * WebProcess/Plugins/Netscape/NetscapePluginStream.h:
+ * WebProcess/Plugins/PluginController.h:
+ * WebProcess/Plugins/PluginView.cpp:
+ (WebKit::PluginView::loadURL):
+ * WebProcess/Plugins/PluginView.h:
+
+2010-09-22 Anders Carlsson <andersca at apple.com>
+
+ Reviewed by Adam Roben.
+
Assertion fails in [WKView _updateWindowFrame] when closing a WebKit2 window
https://bugs.webkit.org/show_bug.cgi?id=46264
<rdar://problem/8463534>
diff --git a/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp b/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp
index d6c080f..30b4d8e 100644
--- a/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp
+++ b/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp
@@ -196,7 +196,7 @@ static HTTPHeaderMap parseRFC822HeaderFields(const char* bytes, unsigned length)
return headerFields;
}
-static NPError parsePostBuffer(bool isFile, const char *buffer, uint32_t length, bool parseHeaders, HTTPHeaderMap& headerFields, Vector<char>& bodyData)
+static NPError parsePostBuffer(bool isFile, const char *buffer, uint32_t length, bool parseHeaders, HTTPHeaderMap& headerFields, Vector<uint8_t>& bodyData)
{
RefPtr<SharedBuffer> fileContents;
const char* postBuffer = 0;
@@ -266,7 +266,7 @@ static NPError NPN_GetURL(NPP npp, const char* url, const char* target)
return NPERR_GENERIC_ERROR;
RefPtr<NetscapePlugin> plugin = NetscapePlugin::fromNPP(npp);
- plugin->loadURL("GET", makeURLString(url), target, HTTPHeaderMap(), Vector<char>(), false, 0);
+ plugin->loadURL("GET", makeURLString(url), target, HTTPHeaderMap(), Vector<uint8_t>(), false, 0);
return NPERR_GENERIC_ERROR;
}
@@ -274,7 +274,7 @@ static NPError NPN_GetURL(NPP npp, const char* url, const char* target)
static NPError NPN_PostURL(NPP npp, const char* url, const char* target, uint32_t len, const char* buf, NPBool file)
{
HTTPHeaderMap headerFields;
- Vector<char> postData;
+ Vector<uint8_t> postData;
// NPN_PostURL only allows headers if the post buffer points to a file.
bool parseHeaders = file;
@@ -376,7 +376,7 @@ static NPError NPN_GetURLNotify(NPP npp, const char* url, const char* target, vo
return NPERR_GENERIC_ERROR;
RefPtr<NetscapePlugin> plugin = NetscapePlugin::fromNPP(npp);
- plugin->loadURL("GET", makeURLString(url), target, HTTPHeaderMap(), Vector<char>(), true, notifyData);
+ plugin->loadURL("GET", makeURLString(url), target, HTTPHeaderMap(), Vector<uint8_t>(), true, notifyData);
return NPERR_NO_ERROR;
}
@@ -384,7 +384,7 @@ static NPError NPN_GetURLNotify(NPP npp, const char* url, const char* target, vo
static NPError NPN_PostURLNotify(NPP npp, const char* url, const char* target, uint32_t len, const char* buf, NPBool file, void* notifyData)
{
HTTPHeaderMap headerFields;
- Vector<char> postData;
+ Vector<uint8_t> postData;
NPError error = parsePostBuffer(file, buf, len, true, headerFields, postData);
if (error != NPERR_NO_ERROR)
return error;
diff --git a/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp b/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp
index 8a9469b..610e8e6 100644
--- a/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp
+++ b/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp
@@ -109,7 +109,7 @@ const char* NetscapePlugin::userAgent()
return m_userAgent.data();
}
-void NetscapePlugin::loadURL(const String& method, const String& urlString, const String& target, const HTTPHeaderMap& headerFields, const Vector<char>& httpBody,
+void NetscapePlugin::loadURL(const String& method, const String& urlString, const String& target, const HTTPHeaderMap& headerFields, const Vector<uint8_t>& httpBody,
bool sendNotification, void* notificationData)
{
uint64_t requestID = ++m_nextRequestID;
@@ -358,7 +358,7 @@ bool NetscapePlugin::initialize(PluginController* pluginController, const Parame
// Load the src URL if needed.
if (!parameters.loadManually && !parameters.url.isEmpty() && shouldLoadSrcURL())
- loadURL("GET", parameters.url.string(), String(), HTTPHeaderMap(), Vector<char>(), false, 0);
+ loadURL("GET", parameters.url.string(), String(), HTTPHeaderMap(), Vector<uint8_t>(), false, 0);
return true;
}
diff --git a/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h b/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h
index e77c819..bc00cfe 100644
--- a/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h
+++ b/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h
@@ -60,7 +60,7 @@ public:
void invalidate(const NPRect*);
const char* userAgent();
void loadURL(const String& method, const String& urlString, const String& target, const WebCore::HTTPHeaderMap& headerFields,
- const Vector<char>& httpBody, bool sendNotification, void* notificationData);
+ const Vector<uint8_t>& httpBody, bool sendNotification, void* notificationData);
NPError destroyStream(NPStream*, NPReason);
void setIsWindowed(bool windowed) { m_isWindowed = windowed; }
void setStatusbarText(const String&);
diff --git a/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.cpp b/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.cpp
index 799f598..be60795 100644
--- a/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.cpp
+++ b/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.cpp
@@ -182,7 +182,7 @@ void NetscapePluginStream::deliverData(const char* bytes, int length)
if (m_transferMode != NP_ASFILEONLY) {
if (!m_deliveryData)
- m_deliveryData.set(new Vector<char>);
+ m_deliveryData.set(new Vector<uint8_t>);
m_deliveryData->reserveCapacity(m_deliveryData->size() + length);
m_deliveryData->append(bytes, length);
@@ -216,7 +216,7 @@ void NetscapePluginStream::deliverDataToPlugin()
// Figure out how much data to send to the plug-in.
int32_t dataLength = min(numBytesPluginCanHandle, numBytesToDeliver - numBytesDelivered);
- char* data = m_deliveryData->data() + numBytesDelivered;
+ uint8_t* data = m_deliveryData->data() + numBytesDelivered;
int32_t numBytesWritten = m_plugin->NPP_Write(&m_npStream, m_offset, dataLength, data);
if (numBytesWritten < 0) {
diff --git a/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.h b/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.h
index 4a72c23..7757001 100644
--- a/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.h
+++ b/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.h
@@ -103,7 +103,7 @@ private:
CString m_headers;
RunLoop::Timer<NetscapePluginStream> m_deliveryDataTimer;
- OwnPtr< Vector<char> > m_deliveryData;
+ OwnPtr< Vector<uint8_t> > m_deliveryData;
bool m_stopStreamWhenDoneDelivering;
};
diff --git a/WebKit2/WebProcess/Plugins/PluginController.h b/WebKit2/WebProcess/Plugins/PluginController.h
index be6fe31..45883dc 100644
--- a/WebKit2/WebProcess/Plugins/PluginController.h
+++ b/WebKit2/WebProcess/Plugins/PluginController.h
@@ -55,7 +55,7 @@ public:
//
// If the URL is a JavaScript URL, the JavaScript code will be evaluated and the result sent back using Plugin::didEvaluateJavaScript.
virtual void loadURL(uint64_t requestID, const String& method, const String& urlString, const String& target,
- const WebCore::HTTPHeaderMap& headerFields, const Vector<char>& httpBody, bool allowPopups) = 0;
+ const WebCore::HTTPHeaderMap& headerFields, const Vector<uint8_t>& httpBody, bool allowPopups) = 0;
/// Cancels the load of a stream that was requested by loadURL.
virtual void cancelStreamLoad(uint64_t streamID) = 0;
diff --git a/WebKit2/WebProcess/Plugins/PluginView.cpp b/WebKit2/WebProcess/Plugins/PluginView.cpp
index d115477..2c7dfc3 100644
--- a/WebKit2/WebProcess/Plugins/PluginView.cpp
+++ b/WebKit2/WebProcess/Plugins/PluginView.cpp
@@ -701,7 +701,7 @@ String PluginView::userAgent(const KURL& url)
}
void PluginView::loadURL(uint64_t requestID, const String& method, const String& urlString, const String& target,
- const HTTPHeaderMap& headerFields, const Vector<char>& httpBody, bool allowPopups)
+ const HTTPHeaderMap& headerFields, const Vector<uint8_t>& httpBody, bool allowPopups)
{
FrameLoadRequest frameLoadRequest;
frameLoadRequest.setFrameName(target);
diff --git a/WebKit2/WebProcess/Plugins/PluginView.h b/WebKit2/WebProcess/Plugins/PluginView.h
index b2bf9c8..a7f9f8f 100644
--- a/WebKit2/WebProcess/Plugins/PluginView.h
+++ b/WebKit2/WebProcess/Plugins/PluginView.h
@@ -117,7 +117,7 @@ private:
virtual void invalidate(const WebCore::IntRect&);
virtual String userAgent(const WebCore::KURL&);
virtual void loadURL(uint64_t requestID, const String& method, const String& urlString, const String& target,
- const WebCore::HTTPHeaderMap& headerFields, const Vector<char>& httpBody, bool allowPopups);
+ const WebCore::HTTPHeaderMap& headerFields, const Vector<uint8_t>& httpBody, bool allowPopups);
virtual void cancelStreamLoad(uint64_t streamID);
virtual void cancelManualStreamLoad();
virtual NPObject* windowScriptNPObject();
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list