| 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 207 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 218 if (isContextInitialized()) | 218 if (isContextInitialized()) |
| 219 return true; | 219 return true; |
| 220 | 220 |
| 221 return initialize(); | 221 return initialize(); |
| 222 } | 222 } |
| 223 | 223 |
| 224 bool WindowProxy::initialize() | 224 bool WindowProxy::initialize() |
| 225 { | 225 { |
| 226 TRACE_EVENT0("v8", "WindowProxy::initialize"); | 226 TRACE_EVENT0("v8", "WindowProxy::initialize"); |
| 227 TRACE_EVENT_SCOPED_SAMPLING_STATE("blink", "InitializeWindow"); | 227 TRACE_EVENT_SCOPED_SAMPLING_STATE("blink", "InitializeWindow"); |
| 228 SCOPED_BLINK_UMA_HISTOGRAM_TIMER("Blink.Binding.InitializeWindowProxy"); |
| 228 | 229 |
| 229 ScriptForbiddenScope::AllowUserAgentScript allowScript; | 230 ScriptForbiddenScope::AllowUserAgentScript allowScript; |
| 230 | 231 |
| 231 v8::HandleScope handleScope(m_isolate); | 232 v8::HandleScope handleScope(m_isolate); |
| 232 | 233 |
| 233 createContext(); | 234 createContext(); |
| 234 | 235 |
| 235 if (!isContextInitialized()) | 236 if (!isContextInitialized()) |
| 236 return false; | 237 return false; |
| 237 | 238 |
| (...skipping 314 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 552 } | 553 } |
| 553 | 554 |
| 554 void WindowProxy::updateSecurityOrigin(SecurityOrigin* origin) | 555 void WindowProxy::updateSecurityOrigin(SecurityOrigin* origin) |
| 555 { | 556 { |
| 556 if (!isContextInitialized()) | 557 if (!isContextInitialized()) |
| 557 return; | 558 return; |
| 558 setSecurityToken(origin); | 559 setSecurityToken(origin); |
| 559 } | 560 } |
| 560 | 561 |
| 561 } // namespace blink | 562 } // namespace blink |
| OLD | NEW |