| 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 313 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 324 // Dynamically tell v8 about our extensions now. | 324 // Dynamically tell v8 about our extensions now. |
| 325 const V8Extensions& extensions = ScriptController::registeredExtensions(); | 325 const V8Extensions& extensions = ScriptController::registeredExtensions(); |
| 326 extensionNames.reserveInitialCapacity(extensions.size()); | 326 extensionNames.reserveInitialCapacity(extensions.size()); |
| 327 int extensionGroup = m_world->extensionGroup(); | 327 int extensionGroup = m_world->extensionGroup(); |
| 328 int worldId = m_world->worldId(); | 328 int worldId = m_world->worldId(); |
| 329 for (const auto* extension : extensions) { | 329 for (const auto* extension : extensions) { |
| 330 if (!frame->loader().client()->allowScriptExtension( | 330 if (!frame->loader().client()->allowScriptExtension( |
| 331 extension->name(), extensionGroup, worldId)) | 331 extension->name(), extensionGroup, worldId)) |
| 332 continue; | 332 continue; |
| 333 | 333 |
| 334 extensionNames.append(extension->name()); | 334 extensionNames.push_back(extension->name()); |
| 335 } | 335 } |
| 336 } | 336 } |
| 337 v8::ExtensionConfiguration extensionConfiguration(extensionNames.size(), | 337 v8::ExtensionConfiguration extensionConfiguration(extensionNames.size(), |
| 338 extensionNames.data()); | 338 extensionNames.data()); |
| 339 | 339 |
| 340 v8::Local<v8::Context> context; | 340 v8::Local<v8::Context> context; |
| 341 { | 341 { |
| 342 V8PerIsolateData::UseCounterDisabledScope useCounterDisabled( | 342 V8PerIsolateData::UseCounterDisabledScope useCounterDisabled( |
| 343 V8PerIsolateData::from(m_isolate)); | 343 V8PerIsolateData::from(m_isolate)); |
| 344 context = | 344 context = |
| (...skipping 243 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 588 .ToChecked(); | 588 .ToChecked(); |
| 589 } | 589 } |
| 590 | 590 |
| 591 void WindowProxy::updateSecurityOrigin(SecurityOrigin* origin) { | 591 void WindowProxy::updateSecurityOrigin(SecurityOrigin* origin) { |
| 592 if (!isContextInitialized()) | 592 if (!isContextInitialized()) |
| 593 return; | 593 return; |
| 594 setSecurityToken(origin); | 594 setSecurityToken(origin); |
| 595 } | 595 } |
| 596 | 596 |
| 597 } // namespace blink | 597 } // namespace blink |
| OLD | NEW |