Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(178)

Unified Diff: third_party/WebKit/Source/core/dom/Document.cpp

Issue 1716303002: Remove SecurityOrigin::isPotentiallyTrustworthy() |errorMessage| (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: build fix Created 4 years, 10 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 | « no previous file | third_party/WebKit/Source/core/workers/WorkerGlobalScope.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/dom/Document.cpp
diff --git a/third_party/WebKit/Source/core/dom/Document.cpp b/third_party/WebKit/Source/core/dom/Document.cpp
index 65e0939e4bbb0b58d5560f076f5b09ed9afd725c..9fabc5b700e4ae18d4361e5fd2a787e9f44c01cd 100644
--- a/third_party/WebKit/Source/core/dom/Document.cpp
+++ b/third_party/WebKit/Source/core/dom/Document.cpp
@@ -346,9 +346,11 @@ static bool acceptsEditingFocus(const Element& element)
static bool isOriginPotentiallyTrustworthy(SecurityOrigin* origin, String* errorMessage)
{
+ if (origin->isPotentiallyTrustworthy())
+ return true;
if (errorMessage)
- return origin->isPotentiallyTrustworthy(*errorMessage);
- return origin->isPotentiallyTrustworthy();
+ *errorMessage = origin->isPotentiallyTrustworthyErrorMessage();
+ return false;
}
uint64_t Document::s_globalTreeVersion = 0;
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/workers/WorkerGlobalScope.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698