Merge WebKit at r80534: Intial merge by Git

Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61

1 files changed, 16 insertions, 17 deletions

diff --git a/Source/WebKit/chromium/src/WebURLResponse.cpp b/Source/WebKit/chromium/src/WebURLResponse.cpp
index 7917298..2850441 100644
--- a/Source/WebKit/chromium/src/WebURLResponse.cpp
+++ b/Source/WebKit/chromium/src/WebURLResponse.cpp
@@ -60,7 +60,6 @@ public:
         : m_resourceResponseAllocation(*p->m_resourceResponse)
     {
         m_resourceResponse = &m_resourceResponseAllocation;
-        m_downloadFilePath = p->m_downloadFilePath;
     }
 
     virtual void dispose() { delete this; }
@@ -257,16 +256,6 @@ void WebURLResponse::setLastModifiedDate(double lastModifiedDate)
     m_private->m_resourceResponse->setLastModifiedDate(static_cast<time_t>(lastModifiedDate));
 }
 
-bool WebURLResponse::isContentFiltered() const
-{
-    return m_private->m_resourceResponse->isContentFiltered();
-}
-
-void WebURLResponse::setIsContentFiltered(bool isContentFiltered)
-{
-    m_private->m_resourceResponse->setIsContentFiltered(isContentFiltered);
-}
-
 long long WebURLResponse::appCacheID() const
 {
     return m_private->m_resourceResponse->appCacheID();
@@ -376,22 +365,32 @@ void WebURLResponse::setIsMultipartPayload(bool value)
 
 WebString WebURLResponse::downloadFilePath() const
 {
-    return m_private->m_downloadFilePath;
+    return m_private->m_resourceResponse->downloadFilePath();
 }
 
 void WebURLResponse::setDownloadFilePath(const WebString& downloadFilePath)
 {
-    m_private->m_downloadFilePath = downloadFilePath;
+    m_private->m_resourceResponse->setDownloadFilePath(downloadFilePath.utf8().data());
+}
+
+WebString WebURLResponse::remoteIPAddress() const
+{
+    return m_private->m_resourceResponse->remoteIPAddress();
+}
+
+void WebURLResponse::setRemoteIPAddress(const WebString& remoteIPAddress)
+{
+    m_private->m_resourceResponse->setRemoteIPAddress(remoteIPAddress);
 }
 
-WebString WebURLResponse::socketAddress() const
+unsigned short WebURLResponse::remotePort() const
 {
-    return m_private->m_resourceResponse->socketAddress();
+    return m_private->m_resourceResponse->remotePort();
 }
 
-void WebURLResponse::setSocketAddress(const WebString& socketAddress)
+void WebURLResponse::setRemotePort(unsigned short remotePort)
 {
-    m_private->m_resourceResponse->setSocketAddress(socketAddress);
+    m_private->m_resourceResponse->setRemotePort(remotePort);
 }
 
 void WebURLResponse::assign(WebURLResponsePrivate* p)