third_party/WebKit/Source/core/dom/Document.h - Issue 2142523004: M52: Merge "Reland: service worker: Don't control a subframe of an insecure context"

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/core/dom/Document.h

Issue 2142523004: M52: Merge "Reland: service worker: Don't control a subframe of an insecure context" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2743

Patch Set: fix compile errors Created 4 years, 5 months 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/LayoutTests/http/tests/serviceworker/resources/insecure-parent.html ('k') | third_party/WebKit/Source/core/dom/Document.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/dom/Document.h

diff --git a/third_party/WebKit/Source/core/dom/Document.h b/third_party/WebKit/Source/core/dom/Document.h

index 06c470dafe5da8547e8ae29412e9b0f4276e0535..ee2a66058c58a2039f6f9e550dc7ac590c3c6f41 100644

--- a/third_party/WebKit/Source/core/dom/Document.h

+++ b/third_party/WebKit/Source/core/dom/Document.h

@@ -1129,7 +1129,7 @@ private:

bool childTypeAllowed(NodeType) const final;

Node* cloneNode(bool deep) final;

void cloneDataFromDocument(const Document&);

- bool isSecureContextImpl(String* errorMessage, const SecureContextCheck priviligeContextCheck) const;

+ bool isSecureContextImpl(const SecureContextCheck priviligeContextCheck) const;

ShadowCascadeOrder m_shadowCascadeOrder = ShadowCascadeNone;