| Index: Source/core/loader/FrameLoader.cpp
|
| diff --git a/Source/core/loader/FrameLoader.cpp b/Source/core/loader/FrameLoader.cpp
|
| index 8cf4eda5bef57170110d5b9ed49caa1632dcc949..7601fcd5c63f21f093a4c8f4a6b5211213a18f61 100644
|
| --- a/Source/core/loader/FrameLoader.cpp
|
| +++ b/Source/core/loader/FrameLoader.cpp
|
| @@ -1442,8 +1442,13 @@ void FrameLoader::dispatchDidClearWindowObjectsInAllWorlds()
|
|
|
| Vector<RefPtr<DOMWrapperWorld> > worlds;
|
| DOMWrapperWorld::getAllWorlds(worlds);
|
| - for (size_t i = 0; i < worlds.size(); ++i)
|
| - dispatchDidClearWindowObjectInWorld(worlds[i].get());
|
| + for (size_t i = 0; i < worlds.size(); ++i) {
|
| + if (Page* page = m_frame->page())
|
| + page->inspectorController().didClearWindowObjectInWorld(m_frame, worlds[i].get());
|
| + m_client->dispatchDidClearWindowObjectInWorld(worlds[i].get());
|
| +
|
| + InspectorInstrumentation::didClearWindowObjectInWorld(m_frame, worlds[i].get());
|
| + }
|
| }
|
|
|
| void FrameLoader::dispatchDidClearWindowObjectInWorld(DOMWrapperWorld* world)
|
| @@ -1452,11 +1457,6 @@ void FrameLoader::dispatchDidClearWindowObjectInWorld(DOMWrapperWorld* world)
|
| return;
|
|
|
| m_client->dispatchDidClearWindowObjectInWorld(world);
|
| -
|
| - if (Page* page = m_frame->page())
|
| - page->inspectorController().didClearWindowObjectInWorld(m_frame, world);
|
| -
|
| - InspectorInstrumentation::didClearWindowObjectInWorld(m_frame, world);
|
| }
|
|
|
| SandboxFlags FrameLoader::effectiveSandboxFlags() const
|
|
|