| 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 258 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 269 | 269 |
| 270 void V8WindowShell::createContext() | 270 void V8WindowShell::createContext() |
| 271 { | 271 { |
| 272 // The documentLoader pointer could be 0 during frame shutdown. | 272 // The documentLoader pointer could be 0 during frame shutdown. |
| 273 // FIXME: Can we remove this check? | 273 // FIXME: Can we remove this check? |
| 274 if (!m_frame->loader().documentLoader()) | 274 if (!m_frame->loader().documentLoader()) |
| 275 return; | 275 return; |
| 276 | 276 |
| 277 // Create a new environment using an empty template for the shadow | 277 // Create a new environment using an empty template for the shadow |
| 278 // object. Reuse the global object if one has been created earlier. | 278 // object. Reuse the global object if one has been created earlier. |
| 279 v8::Handle<v8::ObjectTemplate> globalTemplate = V8Window::GetShadowObjectTem
plate(m_isolate, m_world->isMainWorld() ? MainWorld : IsolatedWorld); | 279 v8::Handle<v8::ObjectTemplate> globalTemplate = V8Window::getShadowObjectTem
plate(m_isolate, m_world->isMainWorld() ? MainWorld : IsolatedWorld); |
| 280 if (globalTemplate.IsEmpty()) | 280 if (globalTemplate.IsEmpty()) |
| 281 return; | 281 return; |
| 282 | 282 |
| 283 double contextCreationStartInSeconds = currentTime(); | 283 double contextCreationStartInSeconds = currentTime(); |
| 284 | 284 |
| 285 // Dynamically tell v8 about our extensions now. | 285 // Dynamically tell v8 about our extensions now. |
| 286 const V8Extensions& extensions = ScriptController::registeredExtensions(); | 286 const V8Extensions& extensions = ScriptController::registeredExtensions(); |
| 287 OwnPtr<const char*[]> extensionNames = adoptArrayPtr(new const char*[extensi
ons.size()]); | 287 OwnPtr<const char*[]> extensionNames = adoptArrayPtr(new const char*[extensi
ons.size()]); |
| 288 int index = 0; | 288 int index = 0; |
| 289 int extensionGroup = m_world->extensionGroup(); | 289 int extensionGroup = m_world->extensionGroup(); |
| (...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 519 { | 519 { |
| 520 ASSERT(isMainThread()); | 520 ASSERT(isMainThread()); |
| 521 // We're initializing the context, so it is not yet in a status where we can | 521 // We're initializing the context, so it is not yet in a status where we can |
| 522 // validate the context. | 522 // validate the context. |
| 523 if (contextBeingInitialized) | 523 if (contextBeingInitialized) |
| 524 return true; | 524 return true; |
| 525 return !!toDOMWindow(context); | 525 return !!toDOMWindow(context); |
| 526 } | 526 } |
| 527 | 527 |
| 528 } // WebCore | 528 } // WebCore |
| OLD | NEW |