diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-17 16:21:14 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-17 16:21:14 +0200 |
| commit | 8995b83bcbfbb68245f779b64e5517627c6cc6ea (patch) | |
| tree | 17985605dab9263cc2444bd4d45f189e142cca7c /Source/WebCore/plugins/PluginStream.cpp | |
| parent | b9c9652036d5e9f1e29c574f40bc73a35c81ace6 (diff) | |
| download | qtwebkit-8995b83bcbfbb68245f779b64e5517627c6cc6ea.tar.gz | |
Imported WebKit commit cf4f8fc6f19b0629f51860cb2d4b25e139d07e00 (http://svn.webkit.org/repository/webkit/trunk@131592)
New snapshot that includes the build fixes for Mac OS X 10.6 and earlier as well
as the previously cherry-picked changes
Diffstat (limited to 'Source/WebCore/plugins/PluginStream.cpp')
| -rw-r--r-- | Source/WebCore/plugins/PluginStream.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Source/WebCore/plugins/PluginStream.cpp b/Source/WebCore/plugins/PluginStream.cpp index 085a318b4..1e71708d0 100644 --- a/Source/WebCore/plugins/PluginStream.cpp +++ b/Source/WebCore/plugins/PluginStream.cpp @@ -147,9 +147,9 @@ void PluginStream::startStream() HTTPHeaderMap::const_iterator end = m_resourceResponse.httpHeaderFields().end(); for (HTTPHeaderMap::const_iterator it = m_resourceResponse.httpHeaderFields().begin(); it != end; ++it) { - stringBuilder.append(it->first); + stringBuilder.append(it->key); stringBuilder.append(separator); - stringBuilder.append(it->second); + stringBuilder.append(it->value); stringBuilder.append('\n'); } @@ -312,7 +312,7 @@ void PluginStream::destroyStream() void PluginStream::delayDeliveryTimerFired(Timer<PluginStream>* timer) { - ASSERT(timer == &m_delayDeliveryTimer); + ASSERT_UNUSED(timer, timer == &m_delayDeliveryTimer); deliverData(); } @@ -396,7 +396,7 @@ void PluginStream::sendJavaScriptStream(const KURL& requestURL, const CString& r void PluginStream::didReceiveResponse(NetscapePlugInStreamLoader* loader, const ResourceResponse& response) { - ASSERT(loader == m_loader); + ASSERT_UNUSED(loader, loader == m_loader); ASSERT(m_streamState == StreamBeforeStarted); m_resourceResponse = response; @@ -406,7 +406,7 @@ void PluginStream::didReceiveResponse(NetscapePlugInStreamLoader* loader, const void PluginStream::didReceiveData(NetscapePlugInStreamLoader* loader, const char* data, int length) { - ASSERT(loader == m_loader); + ASSERT_UNUSED(loader, loader == m_loader); ASSERT(m_streamState == StreamStarted); // If the plug-in cancels the stream in deliverData it could be deleted, @@ -433,7 +433,7 @@ void PluginStream::didReceiveData(NetscapePlugInStreamLoader* loader, const char void PluginStream::didFail(NetscapePlugInStreamLoader* loader, const ResourceError&) { - ASSERT(loader == m_loader); + ASSERT_UNUSED(loader, loader == m_loader); LOG_PLUGIN_NET_ERROR(); @@ -447,7 +447,7 @@ void PluginStream::didFail(NetscapePlugInStreamLoader* loader, const ResourceErr void PluginStream::didFinishLoading(NetscapePlugInStreamLoader* loader) { - ASSERT(loader == m_loader); + ASSERT_UNUSED(loader, loader == m_loader); ASSERT(m_streamState == StreamStarted); // destroyStream can result in our being deleted |