| 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 271 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 282 } | 282 } |
| 283 v8::ExtensionConfiguration extensionConfiguration(index, extensionNames.get(
)); | 283 v8::ExtensionConfiguration extensionConfiguration(index, extensionNames.get(
)); |
| 284 | 284 |
| 285 v8::HandleScope handleScope(m_isolate); | 285 v8::HandleScope handleScope(m_isolate); |
| 286 m_context.set(m_isolate, v8::Context::New(m_isolate, &extensionConfiguration
, globalTemplate, m_global.newLocal(m_isolate))); | 286 m_context.set(m_isolate, v8::Context::New(m_isolate, &extensionConfiguration
, globalTemplate, m_global.newLocal(m_isolate))); |
| 287 | 287 |
| 288 double contextCreationDurationInMilliseconds = (currentTime() - contextCreat
ionStartInSeconds) * 1000; | 288 double contextCreationDurationInMilliseconds = (currentTime() - contextCreat
ionStartInSeconds) * 1000; |
| 289 const char* histogramName = "WebCore.V8WindowShell.createContext.MainWorld"; | 289 const char* histogramName = "WebCore.V8WindowShell.createContext.MainWorld"; |
| 290 if (!m_world->isMainWorld()) | 290 if (!m_world->isMainWorld()) |
| 291 histogramName = "WebCore.V8WindowShell.createContext.IsolatedWorld"; | 291 histogramName = "WebCore.V8WindowShell.createContext.IsolatedWorld"; |
| 292 WebKit::Platform::current()->histogramCustomCounts(histogramName, contextCre
ationDurationInMilliseconds, 0, 10000, 50); | 292 blink::Platform::current()->histogramCustomCounts(histogramName, contextCrea
tionDurationInMilliseconds, 0, 10000, 50); |
| 293 } | 293 } |
| 294 | 294 |
| 295 bool V8WindowShell::installDOMWindow() | 295 bool V8WindowShell::installDOMWindow() |
| 296 { | 296 { |
| 297 DOMWrapperWorld::setInitializingWindow(true); | 297 DOMWrapperWorld::setInitializingWindow(true); |
| 298 DOMWindow* window = m_frame->domWindow(); | 298 DOMWindow* window = m_frame->domWindow(); |
| 299 v8::Local<v8::Object> windowWrapper = V8ObjectConstructor::newInstance(V8Per
ContextData::from(m_context.newLocal(m_isolate))->constructorForType(&V8Window::
wrapperTypeInfo)); | 299 v8::Local<v8::Object> windowWrapper = V8ObjectConstructor::newInstance(V8Per
ContextData::from(m_context.newLocal(m_isolate))->constructorForType(&V8Window::
wrapperTypeInfo)); |
| 300 if (windowWrapper.IsEmpty()) | 300 if (windowWrapper.IsEmpty()) |
| 301 return false; | 301 return false; |
| 302 | 302 |
| (...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 494 void V8WindowShell::updateSecurityOrigin() | 494 void V8WindowShell::updateSecurityOrigin() |
| 495 { | 495 { |
| 496 ASSERT(m_world->isMainWorld()); | 496 ASSERT(m_world->isMainWorld()); |
| 497 if (m_context.isEmpty()) | 497 if (m_context.isEmpty()) |
| 498 return; | 498 return; |
| 499 v8::HandleScope handleScope(m_isolate); | 499 v8::HandleScope handleScope(m_isolate); |
| 500 setSecurityToken(); | 500 setSecurityToken(); |
| 501 } | 501 } |
| 502 | 502 |
| 503 } // WebCore | 503 } // WebCore |
| OLD | NEW |