| Index: third_party/WebKit/Source/platform/bindings/DOMWrapperWorld.cpp
|
| diff --git a/third_party/WebKit/Source/bindings/core/v8/DOMWrapperWorld.cpp b/third_party/WebKit/Source/platform/bindings/DOMWrapperWorld.cpp
|
| similarity index 97%
|
| rename from third_party/WebKit/Source/bindings/core/v8/DOMWrapperWorld.cpp
|
| rename to third_party/WebKit/Source/platform/bindings/DOMWrapperWorld.cpp
|
| index 97f2c12b14ed6dafa231c3c1a386c0c34aa58645..afac40293de1ce77214bb2039c6553786403d46d 100644
|
| --- a/third_party/WebKit/Source/bindings/core/v8/DOMWrapperWorld.cpp
|
| +++ b/third_party/WebKit/Source/platform/bindings/DOMWrapperWorld.cpp
|
| @@ -1,5 +1,5 @@
|
| /*
|
| - * Copyright (C) 2009 Google Inc. All rights reserved.
|
| + * Copyright (C) 2017 Google Inc. All rights reserved.
|
| *
|
| * Redistribution and use in source and binary forms, with or without
|
| * modification, are permitted provided that the following conditions are
|
| @@ -28,12 +28,11 @@
|
| * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
| */
|
|
|
| -#include "bindings/core/v8/DOMWrapperWorld.h"
|
| +#include "platform/bindings/DOMWrapperWorld.h"
|
|
|
| #include <memory>
|
|
|
| -#include "bindings/core/v8/DOMDataStore.h"
|
| -#include "bindings/core/v8/ScriptFunction.h"
|
| +#include "platform/bindings/DOMDataStore.h"
|
| #include "platform/wtf/HashTraits.h"
|
| #include "platform/wtf/PtrUtil.h"
|
| #include "platform/wtf/StdLibExtras.h"
|
| @@ -196,7 +195,7 @@ static IsolatedWorldHumanReadableNameMap& IsolatedWorldHumanReadableNames() {
|
| }
|
|
|
| String DOMWrapperWorld::IsolatedWorldHumanReadableName() {
|
| - ASSERT(this->IsIsolatedWorld());
|
| + DCHECK(this->IsIsolatedWorld());
|
| return IsolatedWorldHumanReadableNames().at(GetWorldId());
|
| }
|
|
|
|
|