third_party/WebKit/Source/platform/network/ResourceResponse.cpp - Issue 1497423002: Revert of Downgrade lock icon for broken-HTTPS subresources

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/platform/network/ResourceResponse.cpp

Issue 1497423002: Revert of Downgrade lock icon for broken-HTTPS subresources (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix conflict Created 5 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/Source/platform/network/ResourceResponse.h ('k') | third_party/WebKit/Source/web/FrameLoaderClientImpl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/network/ResourceResponse.cpp

diff --git a/third_party/WebKit/Source/platform/network/ResourceResponse.cpp b/third_party/WebKit/Source/platform/network/ResourceResponse.cpp

index 1ba750e586aff99490b20dcc6a4681bcdc515672..37de0b6a8bd39e31b13911e2454bd8adbc1913eb 100644

--- a/third_party/WebKit/Source/platform/network/ResourceResponse.cpp

+++ b/third_party/WebKit/Source/platform/network/ResourceResponse.cpp

@@ -48,7 +48,6 @@ ResourceResponse::ResourceResponse()

, m_date(0.0)

, m_expires(0.0)

, m_lastModified(0.0)

- , m_hasMajorCertificateErrors(false)

, m_securityStyle(SecurityStyleUnknown)

, m_httpVersion(HTTPVersionUnknown)

, m_appCacheID(0)

@@ -85,7 +84,6 @@ ResourceResponse::ResourceResponse(const KURL& url, const AtomicString& mimeType

, m_date(0.0)

, m_expires(0.0)

, m_lastModified(0.0)

- , m_hasMajorCertificateErrors(false)

, m_securityStyle(SecurityStyleUnknown)

, m_httpVersion(HTTPVersionUnknown)

, m_appCacheID(0)

@@ -118,7 +116,6 @@ PassOwnPtr<ResourceResponse> ResourceResponse::adopt(PassOwnPtr<CrossThreadResou

response->setLastModifiedDate(data->m_lastModifiedDate);

response->setResourceLoadTiming(data->m_resourceLoadTiming.release());

response->m_securityInfo = data->m_securityInfo;

- response->m_hasMajorCertificateErrors = data->m_hasMajorCertificateErrors;

response->m_securityStyle = data->m_securityStyle;

response->m_securityDetails.protocol = data->m_securityDetails.protocol;

response->m_securityDetails.cipher = data->m_securityDetails.cipher;

@@ -164,7 +161,6 @@ PassOwnPtr<CrossThreadResourceResponseData> ResourceResponse::copyData() const

if (m_resourceLoadTiming)

data->m_resourceLoadTiming = m_resourceLoadTiming->deepCopy();

data->m_securityInfo = CString(m_securityInfo.data(), m_securityInfo.length());

- data->m_hasMajorCertificateErrors = m_hasMajorCertificateErrors;

data->m_securityStyle = m_securityStyle;

data->m_securityDetails.protocol = m_securityDetails.protocol.isolatedCopy();

data->m_securityDetails.cipher = m_securityDetails.cipher.isolatedCopy();