| Index: extensions/renderer/object_backed_native_handler.cc
|
| diff --git a/extensions/renderer/object_backed_native_handler.cc b/extensions/renderer/object_backed_native_handler.cc
|
| index 3728543d2be924e1d91fb9c3acb6c11e3f8c3270..671730be2f60b6676996ce1e3f9711338960e211 100644
|
| --- a/extensions/renderer/object_backed_native_handler.cc
|
| +++ b/extensions/renderer/object_backed_native_handler.cc
|
| @@ -163,8 +163,12 @@ bool ObjectBackedNativeHandler::ContextCanAccessObject(
|
| return true;
|
| if (context == object->CreationContext())
|
| return true;
|
| + // TODO(lazyboy): ScriptContextSet isn't available on worker threads. We
|
| + // should probably use WorkerScriptContextSet somehow.
|
| ScriptContext* other_script_context =
|
| - ScriptContextSet::GetContextByObject(object);
|
| + content::WorkerThread::GetCurrentId() == 0
|
| + ? ScriptContextSet::GetContextByObject(object)
|
| + : nullptr;
|
| if (!other_script_context || !other_script_context->web_frame())
|
| return allow_null_context;
|
|
|
|
|