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

Side by Side Diff: Source/bindings/v8/V8WindowShell.cpp

Issue 131203009: Make event names of TRACE_EVENT_SAMPLING_STATE macros more descriptive (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 11 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 | Annotate | Revision Log
« no previous file with comments | « Source/bindings/v8/V8ScriptRunner.cpp ('k') | Source/platform/ThreadTimers.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 // the outer window, and the outer window identify is preserved for 179 // the outer window, and the outer window identify is preserved for
180 // the frame. However, a new inner window is created for the new page. 180 // the frame. However, a new inner window is created for the new page.
181 // If there are JS code holds a closure to the old inner window, 181 // If there are JS code holds a closure to the old inner window,
182 // it won't be able to reach the outer window via its global object. 182 // it won't be able to reach the outer window via its global object.
183 bool V8WindowShell::initializeIfNeeded() 183 bool V8WindowShell::initializeIfNeeded()
184 { 184 {
185 if (m_contextHolder) 185 if (m_contextHolder)
186 return true; 186 return true;
187 187
188 TRACE_EVENT0("v8", "V8WindowShell::initializeIfNeeded"); 188 TRACE_EVENT0("v8", "V8WindowShell::initializeIfNeeded");
189 TRACE_EVENT_SCOPED_SAMPLING_STATE("Blink", "InitializeWindow");
189 190
190 v8::HandleScope handleScope(m_isolate); 191 v8::HandleScope handleScope(m_isolate);
191 192
192 createContext(); 193 createContext();
193 if (!m_contextHolder) 194 if (!m_contextHolder)
194 return false; 195 return false;
195 196
196 v8::Handle<v8::Context> context = m_contextHolder->context(); 197 v8::Handle<v8::Context> context = m_contextHolder->context();
197 198
198 V8PerContextDataHolder::install(context); 199 V8PerContextDataHolder::install(context);
(...skipping 296 matching lines...) Expand 10 before | Expand all | Expand 10 after
495 void V8WindowShell::updateSecurityOrigin(SecurityOrigin* origin) 496 void V8WindowShell::updateSecurityOrigin(SecurityOrigin* origin)
496 { 497 {
497 ASSERT(m_world->isMainWorld()); 498 ASSERT(m_world->isMainWorld());
498 if (!m_contextHolder) 499 if (!m_contextHolder)
499 return; 500 return;
500 v8::HandleScope handleScope(m_isolate); 501 v8::HandleScope handleScope(m_isolate);
501 setSecurityToken(origin); 502 setSecurityToken(origin);
502 } 503 }
503 504
504 } // WebCore 505 } // WebCore
OLDNEW
« no previous file with comments | « Source/bindings/v8/V8ScriptRunner.cpp ('k') | Source/platform/ThreadTimers.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698