| Index: third_party/WebKit/Source/core/frame/DOMWindow.cpp
|
| diff --git a/third_party/WebKit/Source/core/frame/DOMWindow.cpp b/third_party/WebKit/Source/core/frame/DOMWindow.cpp
|
| index ebf7826339c91a59678df41fa1104ddb62a5a48a..f2432ea734f229a9993d5ba0a8c234f4994ece6a 100644
|
| --- a/third_party/WebKit/Source/core/frame/DOMWindow.cpp
|
| +++ b/third_party/WebKit/Source/core/frame/DOMWindow.cpp
|
| @@ -259,7 +259,10 @@ String DOMWindow::crossDomainAccessErrorMessage(const LocalDOMWindow* callingWin
|
| // FIXME: This message, and other console messages, have extra newlines. Should remove them.
|
| const SecurityOrigin* activeOrigin = callingWindow->document()->securityOrigin();
|
| const SecurityOrigin* targetOrigin = frame()->securityContext()->securityOrigin();
|
| - ASSERT(!activeOrigin->canAccessCheckSuborigins(targetOrigin));
|
| + // It's possible for a remote frame to be same origin with respect to a
|
| + // local frame, but it must still be treated as a disallowed cross-domain
|
| + // access. See https://crbug.com/601629.
|
| + ASSERT(frame()->isRemoteFrame() || !activeOrigin->canAccessCheckSuborigins(targetOrigin));
|
|
|
| String message = "Blocked a frame with origin \"" + activeOrigin->toString() + "\" from accessing a frame with origin \"" + targetOrigin->toString() + "\". ";
|
|
|
|
|