| 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;
|
|
|