Commit 403eecaa authored by haraken's avatar haraken Committed by Commit bot

Remove an isGlobalInitialized() check from WindowProxy::updateDocument()

Context states transit from Uninitialized to Initialized, and then to Detached.

- isGlobalInitialized() returns true when the context state is Initialized or Detached.
- isContextInitialized() returns true when the context state is Initialized.

Thus !isContextInitialized() is stronger than !isGlobalInitialized().
Hence we can remove if(!isGlobalInitialized()) from WindowProxy::updateDocument().

BUG=677253

Review-Url: https://codereview.chromium.org/2603953002
Cr-Commit-Position: refs/heads/master@{#440842}
parent 3d044ba6
...@@ -460,10 +460,9 @@ void WindowProxy::setSecurityToken(SecurityOrigin* origin) { ...@@ -460,10 +460,9 @@ void WindowProxy::setSecurityToken(SecurityOrigin* origin) {
void WindowProxy::updateDocument() { void WindowProxy::updateDocument() {
DCHECK(m_world->isMainWorld()); DCHECK(m_world->isMainWorld());
if (!isGlobalInitialized())
return;
if (!isContextInitialized()) if (!isContextInitialized())
return; return;
updateActivityLogger(); updateActivityLogger();
updateDocumentProperty(); updateDocumentProperty();
updateSecurityOrigin(m_frame->securityContext()->getSecurityOrigin()); updateSecurityOrigin(m_frame->securityContext()->getSecurityOrigin());
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment