[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 7211ad199f687a419e9a3f02f1f1afeb9bd137a7
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 31 04:58:54 2009 +0000

    2009-12-30  Darin Fisher  <darin at chromium.org>
    
            Reviewed by David Levin.
    
            [Chromium] Delete ResourceRequest::securityInfo
            https://bugs.webkit.org/show_bug.cgi?id=26847
    
            * src/WebWorkerBase.cpp:
            (WebKit::WebWorkerBase::initializeLoader):
    2009-12-30  Darin Fisher  <darin at chromium.org>
    
            Reviewed by David Levin.
    
            [Chromium] Delete ResourceRequest::securityInfo
            https://bugs.webkit.org/show_bug.cgi?id=26847
    
            * platform/network/chromium/ResourceRequest.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52677 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 9d410fb..0082d4e 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2009-12-30  Darin Fisher  <darin at chromium.org>
+
+        Reviewed by David Levin.
+
+        [Chromium] Delete ResourceRequest::securityInfo
+        https://bugs.webkit.org/show_bug.cgi?id=26847
+
+        * platform/network/chromium/ResourceRequest.h:
+
 2009-12-30  Dimitri Glazkov  <dglazkov at chromium.org>
 
         Reviewed by Adam Barth.
diff --git a/WebCore/platform/network/chromium/ResourceRequest.h b/WebCore/platform/network/chromium/ResourceRequest.h
index 176f923..8ef0c5e 100644
--- a/WebCore/platform/network/chromium/ResourceRequest.h
+++ b/WebCore/platform/network/chromium/ResourceRequest.h
@@ -28,7 +28,6 @@
 #ifndef ResourceRequest_h
 #define ResourceRequest_h
 
-#include "CString.h"
 #include "ResourceRequestBase.h"
 
 namespace WebCore {
@@ -45,15 +44,6 @@ namespace WebCore {
         {
         }
 
-        ResourceRequest(const KURL& url, const CString& securityInfo) 
-            : ResourceRequestBase(url, UseProtocolCachePolicy)
-            , m_requestorID(0)
-            , m_requestorProcessID(0)
-            , m_appCacheHostID(0)
-            , m_securityInfo(securityInfo)
-        {
-        }
-
         ResourceRequest(const KURL& url) 
             : ResourceRequestBase(url, UseProtocolCachePolicy)
             , m_requestorID(0)
@@ -94,15 +84,6 @@ namespace WebCore {
         int appCacheHostID() const { return m_appCacheHostID; }
         void setAppCacheHostID(int id) { m_appCacheHostID = id; }
 
-        // Opaque buffer that describes the security state (including SSL
-        // connection state) for the resource that should be reported when the
-        // resource has been loaded.  This is used to simulate secure
-        // connection for request (typically when showing error page, so the
-        // error page has the errors of the page that actually failed).  Empty
-        // string if not a secure connection.
-        CString securityInfo() const { return m_securityInfo; }
-        void setSecurityInfo(const CString& value) { m_securityInfo = value; }
-
     private:
         friend class ResourceRequestBase;
 
@@ -112,7 +93,6 @@ namespace WebCore {
         int m_requestorID;
         int m_requestorProcessID;
         int m_appCacheHostID;
-        CString m_securityInfo;
     };
 
 } // namespace WebCore
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 85b082e..9d10403 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,13 @@
+2009-12-30  Darin Fisher  <darin at chromium.org>
+
+        Reviewed by David Levin.
+
+        [Chromium] Delete ResourceRequest::securityInfo
+        https://bugs.webkit.org/show_bug.cgi?id=26847
+
+        * src/WebWorkerBase.cpp:
+        (WebKit::WebWorkerBase::initializeLoader):
+
 2009-12-30  Albert J. Wong  <ajwong at chromium.org>
 
         Not reviewed.  Trivial Chromium build fix.
diff --git a/WebKit/chromium/src/WebWorkerBase.cpp b/WebKit/chromium/src/WebWorkerBase.cpp
index 85a263b..0e3aa4e 100644
--- a/WebKit/chromium/src/WebWorkerBase.cpp
+++ b/WebKit/chromium/src/WebWorkerBase.cpp
@@ -132,8 +132,7 @@ void WebWorkerBase::initializeLoader(const WebURL& url)
     int len = static_cast<int>(content.length());
     RefPtr<SharedBuffer> buf(SharedBuffer::create(content.data(), len));
     SubstituteData substData(buf, String("text/html"), String("UTF-8"), KURL());
-    ResourceRequest request(url, CString());
-    webFrame->frame()->loader()->load(request, substData, false);
+    webFrame->frame()->loader()->load(ResourceRequest(url), substData, false);
 
     // This document will be used as 'loading context' for the worker.
     m_loadingDocument = webFrame->frame()->document();

-- 
WebKit Debian packaging