Skip to content
Permalink
Browse files
2009-12-30 Darin Fisher <darin@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@chromium.org>

        Reviewed by David Levin.

        [Chromium] Delete ResourceRequest::securityInfo
        https://bugs.webkit.org/show_bug.cgi?id=26847

        * platform/network/chromium/ResourceRequest.h:


Canonical link: https://commits.webkit.org/44090@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@52677 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
eseidel committed Dec 31, 2009
1 parent 66d3c20 commit c561f2d8ceb524dba5f56f72115e96fe368f800c
Showing 4 changed files with 20 additions and 22 deletions.
@@ -1,3 +1,12 @@
2009-12-30 Darin Fisher <darin@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@chromium.org>

Reviewed by Adam Barth.
@@ -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
@@ -1,3 +1,13 @@
2009-12-30 Darin Fisher <darin@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@chromium.org>

Not reviewed. Trivial Chromium build fix.
@@ -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();

0 comments on commit c561f2d

Please sign in to comment.