| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2008, 2009, 2011 Google Inc. All rights reserved. | 2 * Copyright (C) 2008, 2009, 2011 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 209 return false; | 209 return false; |
| 210 } | 210 } |
| 211 } | 211 } |
| 212 | 212 |
| 213 if (!m_world->isMainWorld()) { | 213 if (!m_world->isMainWorld()) { |
| 214 V8WindowShell* mainWindow = m_frame->script().existingWindowShell(DOMWra
pperWorld::mainWorld()); | 214 V8WindowShell* mainWindow = m_frame->script().existingWindowShell(DOMWra
pperWorld::mainWorld()); |
| 215 if (mainWindow && !mainWindow->context().IsEmpty()) | 215 if (mainWindow && !mainWindow->context().IsEmpty()) |
| 216 setInjectedScriptContextDebugId(context, m_frame->script().contextDe
bugId(mainWindow->context())); | 216 setInjectedScriptContextDebugId(context, m_frame->script().contextDe
bugId(mainWindow->context())); |
| 217 } | 217 } |
| 218 | 218 |
| 219 m_scriptState->world().setActivityLogger(V8DOMActivityLogger::activityLogger
(m_world->worldId())); | 219 m_scriptState->setActivityLogger(V8DOMActivityLogger::activityLogger(m_world
->worldId(), |
| 220 m_frame->document() ? m_frame->document()->baseURI() : KURL())); |
| 220 if (!installDOMWindow()) { | 221 if (!installDOMWindow()) { |
| 221 disposeContext(DoNotDetachGlobal); | 222 disposeContext(DoNotDetachGlobal); |
| 222 return false; | 223 return false; |
| 223 } | 224 } |
| 224 | 225 |
| 225 if (m_world->isMainWorld()) { | 226 if (m_world->isMainWorld()) { |
| 226 updateDocument(); | 227 updateDocument(); |
| 227 if (m_frame->document()) { | 228 if (m_frame->document()) { |
| 228 setSecurityToken(m_frame->document()->securityOrigin()); | 229 setSecurityToken(m_frame->document()->securityOrigin()); |
| 229 ContentSecurityPolicy* csp = m_frame->document()->contentSecurityPol
icy(); | 230 ContentSecurityPolicy* csp = m_frame->document()->contentSecurityPol
icy(); |
| (...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 484 | 485 |
| 485 void V8WindowShell::updateSecurityOrigin(SecurityOrigin* origin) | 486 void V8WindowShell::updateSecurityOrigin(SecurityOrigin* origin) |
| 486 { | 487 { |
| 487 ASSERT(m_world->isMainWorld()); | 488 ASSERT(m_world->isMainWorld()); |
| 488 if (!isContextInitialized()) | 489 if (!isContextInitialized()) |
| 489 return; | 490 return; |
| 490 setSecurityToken(origin); | 491 setSecurityToken(origin); |
| 491 } | 492 } |
| 492 | 493 |
| 493 } // WebCore | 494 } // WebCore |
| OLD | NEW |