| 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 216 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 227 if (m_frame->document()) { | 227 if (m_frame->document()) { |
| 228 setSecurityToken(m_frame->document()->securityOrigin()); | 228 setSecurityToken(m_frame->document()->securityOrigin()); |
| 229 ContentSecurityPolicy* csp = m_frame->document()->contentSecurityPol
icy(); | 229 ContentSecurityPolicy* csp = m_frame->document()->contentSecurityPol
icy(); |
| 230 context->AllowCodeGenerationFromStrings(csp->allowEval(0, ContentSec
urityPolicy::SuppressReport)); | 230 context->AllowCodeGenerationFromStrings(csp->allowEval(0, ContentSec
urityPolicy::SuppressReport)); |
| 231 context->SetErrorMessageForCodeGenerationFromStrings(v8String(m_isol
ate, csp->evalDisabledErrorMessage())); | 231 context->SetErrorMessageForCodeGenerationFromStrings(v8String(m_isol
ate, csp->evalDisabledErrorMessage())); |
| 232 } | 232 } |
| 233 } else { | 233 } else { |
| 234 SecurityOrigin* origin = m_world->isolatedWorldSecurityOrigin(); | 234 SecurityOrigin* origin = m_world->isolatedWorldSecurityOrigin(); |
| 235 setSecurityToken(origin); | 235 setSecurityToken(origin); |
| 236 if (origin && InspectorInstrumentation::hasFrontends()) { | 236 if (origin && InspectorInstrumentation::hasFrontends()) { |
| 237 InspectorInstrumentation::didCreateIsolatedContext(m_frame, ScriptSt
ate::current(m_isolate), origin); | 237 InspectorInstrumentation::didCreateIsolatedContext(m_frame, m_script
State.get(), origin); |
| 238 } | 238 } |
| 239 } | 239 } |
| 240 m_frame->loader().client()->didCreateScriptContext(context, m_world->extensi
onGroup(), m_world->worldId()); | 240 m_frame->loader().client()->didCreateScriptContext(context, m_world->extensi
onGroup(), m_world->worldId()); |
| 241 return true; | 241 return true; |
| 242 } | 242 } |
| 243 | 243 |
| 244 void V8WindowShell::createContext() | 244 void V8WindowShell::createContext() |
| 245 { | 245 { |
| 246 // The documentLoader pointer could be 0 during frame shutdown. | 246 // The documentLoader pointer could be 0 during frame shutdown. |
| 247 // FIXME: Can we remove this check? | 247 // FIXME: Can we remove this check? |
| (...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 484 | 484 |
| 485 void V8WindowShell::updateSecurityOrigin(SecurityOrigin* origin) | 485 void V8WindowShell::updateSecurityOrigin(SecurityOrigin* origin) |
| 486 { | 486 { |
| 487 ASSERT(m_world->isMainWorld()); | 487 ASSERT(m_world->isMainWorld()); |
| 488 if (!isContextInitialized()) | 488 if (!isContextInitialized()) |
| 489 return; | 489 return; |
| 490 setSecurityToken(origin); | 490 setSecurityToken(origin); |
| 491 } | 491 } |
| 492 | 492 |
| 493 } // WebCore | 493 } // WebCore |
| OLD | NEW |