Imported WebKit commit 0dc6cd75e1d4836eaffbb520be96fac4847cc9d2 (http://svn.webkit.org/repository/webkit/trunk@131300)

WebKit update which introduces the QtWebKitWidgets module that contains the WK1
widgets based API. (In fact it renames QtWebKit to QtWebKitWidgets while we're
working on completing the entire split as part of
https://bugs.webkit.org/show_bug.cgi?id=99314

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