Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(92)

Side by Side Diff: Source/bindings/core/v8/WindowProxy.cpp

Issue 1112793002: Removing blink::prefix (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fixing buildIssues Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 281 matching lines...) Expand 10 before | Expand all | Expand 10 after
292 292
293 v8::Local<v8::Context> context = v8::Context::New(m_isolate, &extensionConfi guration, globalTemplate, m_global.newLocal(m_isolate)); 293 v8::Local<v8::Context> context = v8::Context::New(m_isolate, &extensionConfi guration, globalTemplate, m_global.newLocal(m_isolate));
294 if (context.IsEmpty()) 294 if (context.IsEmpty())
295 return; 295 return;
296 m_scriptState = ScriptState::create(context, m_world); 296 m_scriptState = ScriptState::create(context, m_world);
297 297
298 double contextCreationDurationInMilliseconds = (currentTime() - contextCreat ionStartInSeconds) * 1000; 298 double contextCreationDurationInMilliseconds = (currentTime() - contextCreat ionStartInSeconds) * 1000;
299 const char* histogramName = "WebCore.WindowProxy.createContext.MainWorld"; 299 const char* histogramName = "WebCore.WindowProxy.createContext.MainWorld";
300 if (!m_world->isMainWorld()) 300 if (!m_world->isMainWorld())
301 histogramName = "WebCore.WindowProxy.createContext.IsolatedWorld"; 301 histogramName = "WebCore.WindowProxy.createContext.IsolatedWorld";
302 blink::Platform::current()->histogramCustomCounts(histogramName, contextCrea tionDurationInMilliseconds, 0, 10000, 50); 302 Platform::current()->histogramCustomCounts(histogramName, contextCreationDur ationInMilliseconds, 0, 10000, 50);
303 } 303 }
304 304
305 static v8::Local<v8::Object> toInnerGlobalObject(v8::Local<v8::Context> context) 305 static v8::Local<v8::Object> toInnerGlobalObject(v8::Local<v8::Context> context)
306 { 306 {
307 return v8::Local<v8::Object>::Cast(context->Global()->GetPrototype()); 307 return v8::Local<v8::Object>::Cast(context->Global()->GetPrototype());
308 } 308 }
309 309
310 bool WindowProxy::installDOMWindow() 310 bool WindowProxy::installDOMWindow()
311 { 311 {
312 RELEASE_ASSERT(!m_installingDOMWindow); 312 RELEASE_ASSERT(!m_installingDOMWindow);
(...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after
510 510
511 void WindowProxy::updateSecurityOrigin(SecurityOrigin* origin) 511 void WindowProxy::updateSecurityOrigin(SecurityOrigin* origin)
512 { 512 {
513 ASSERT(m_world->isMainWorld()); 513 ASSERT(m_world->isMainWorld());
514 if (!isContextInitialized()) 514 if (!isContextInitialized())
515 return; 515 return;
516 setSecurityToken(origin); 516 setSecurityToken(origin);
517 } 517 }
518 518
519 } // namespace blink 519 } // namespace blink
OLDNEW
« no previous file with comments | « Source/bindings/core/v8/V8ScriptRunner.cpp ('k') | Source/bindings/modules/v8/V8BindingForModules.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698