| Index: chrome/renderer/chrome_content_renderer_client.cc
|
| diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc
|
| index 31db342e15799c533e06e4ca434d99f18d1aef76..98a78b73f3c7b12b580b95bc229a456cc09b0975 100644
|
| --- a/chrome/renderer/chrome_content_renderer_client.cc
|
| +++ b/chrome/renderer/chrome_content_renderer_client.cc
|
| @@ -629,8 +629,10 @@ bool ChromeContentRendererClient::ShouldPumpEventsDuringCookieMessage() {
|
| }
|
|
|
| void ChromeContentRendererClient::DidCreateScriptContext(WebFrame* frame) {
|
| - EventBindings::HandleContextCreated(
|
| - frame, false, extension_dispatcher_.get());
|
| + EventBindings::HandleContextCreated(frame,
|
| + frame->mainWorldScriptContext(),
|
| + extension_dispatcher_.get(),
|
| + 0); // isolated world ID
|
| }
|
|
|
| void ChromeContentRendererClient::DidDestroyScriptContext(WebFrame* frame) {
|
| @@ -638,8 +640,11 @@ void ChromeContentRendererClient::DidDestroyScriptContext(WebFrame* frame) {
|
| }
|
|
|
| void ChromeContentRendererClient::DidCreateIsolatedScriptContext(
|
| - WebFrame* frame) {
|
| - EventBindings::HandleContextCreated(frame, true, extension_dispatcher_.get());
|
| + WebFrame* frame, int world_id, v8::Handle<v8::Context> context) {
|
| + EventBindings::HandleContextCreated(frame,
|
| + context,
|
| + extension_dispatcher_.get(),
|
| + world_id);
|
| }
|
|
|
| unsigned long long ChromeContentRendererClient::VisitedLinkHash(
|
|
|