Simplify security token setting logic in WindowProxy

third_party/WebKit/Source/bindings/core/v8/WindowProxy.cpp

Index: third_party/WebKit/Source/bindings/core/v8/WindowProxy.cpp
diff --git a/third_party/WebKit/Source/bindings/core/v8/WindowProxy.cpp b/third_party/WebKit/Source/bindings/core/v8/WindowProxy.cpp
index a8d4be011e9c99e2e3dd5ae22c0b877b6ee463d1..6e8dbc7ca9c56d4b19ff438aa396fe8e1ff3c2c9 100644
--- a/third_party/WebKit/Source/bindings/core/v8/WindowProxy.cpp
+++ b/third_party/WebKit/Source/bindings/core/v8/WindowProxy.cpp
@@ -427,12 +427,11 @@ void WindowProxy::setSecurityToken(SecurityOrigin* origin)
     // If two tokens are not equal, then we have to call canAccess.
     // Note: we can't use the HTTPOrigin if it was set from the DOM.
     String token;
-    // There are several situations where v8 needs to do a full canAccess check,
+    // There are two situations where v8 needs to do a full canAccess check,
     // so set an empty security token instead:
     // - document.domain was modified
-    // - the frame is showing the initial empty document
     // - the frame is remote
-    bool delaySet = m_frame->isRemoteFrame() || (m_world->isMainWorld() && (origin->domainWasSetInDOM() || toLocalFrame(m_frame)->loader().stateMachine()->isDisplayingInitialEmptyDocument()));
+    bool delaySet = m_frame->isRemoteFrame() || (m_world->isMainWorld() && origin->domainWasSetInDOM());

[dcheng, 2016/08/18 00:45:12]

Note: I'm not actually sure why the second part of this condition requires that
we only delay it for the main world. Does document.domain not affect other
worlds?

     if (origin && !delaySet)
         token = origin->toString();