| Index: third_party/WebKit/Source/bindings/core/v8/DOMWrapperWorld.cpp
|
| diff --git a/third_party/WebKit/Source/bindings/core/v8/DOMWrapperWorld.cpp b/third_party/WebKit/Source/bindings/core/v8/DOMWrapperWorld.cpp
|
| index ec78f7f738dc740185fcea1b8f04c9a83aab0216..7f774b237070d7053468c1e099e356bb3dc0444d 100644
|
| --- a/third_party/WebKit/Source/bindings/core/v8/DOMWrapperWorld.cpp
|
| +++ b/third_party/WebKit/Source/bindings/core/v8/DOMWrapperWorld.cpp
|
| @@ -30,13 +30,19 @@
|
|
|
| #include "bindings/core/v8/DOMWrapperWorld.h"
|
|
|
| -#include <memory>
|
| -
|
| #include "bindings/core/v8/DOMDataStore.h"
|
| -#include "bindings/core/v8/ScriptFunction.h"
|
| +#include "bindings/core/v8/ScriptController.h"
|
| +#include "bindings/core/v8/V8Binding.h"
|
| +#include "bindings/core/v8/V8DOMActivityLogger.h"
|
| +#include "bindings/core/v8/V8DOMWrapper.h"
|
| +#include "bindings/core/v8/V8Window.h"
|
| +#include "bindings/core/v8/WindowProxy.h"
|
| +#include "bindings/core/v8/WrapperTypeInfo.h"
|
| +#include "core/dom/ExecutionContext.h"
|
| #include "wtf/HashTraits.h"
|
| #include "wtf/PtrUtil.h"
|
| #include "wtf/StdLibExtras.h"
|
| +#include <memory>
|
|
|
| namespace blink {
|
|
|
| @@ -309,16 +315,4 @@
|
| holderBase->world()->unregisterDOMObjectHolder(holderBase);
|
| }
|
|
|
| -void DOMWrapperWorld::dissociateDOMWindowWrappersInAllWorlds(
|
| - ScriptWrappable* scriptWrappable) {
|
| - DCHECK(scriptWrappable);
|
| - DCHECK(isMainThread());
|
| -
|
| - scriptWrappable->unsetWrapperIfAny();
|
| -
|
| - for (auto& world : isolatedWorldMap().values()) {
|
| - world->domDataStore().unsetWrapperIfAny(scriptWrappable);
|
| - }
|
| -}
|
| -
|
| } // namespace blink
|
|
|