Revert of Add CHECKs to try to narrow down cause of bad internal fields in Window DOM wrapper (patchset #2 id:20001 of https://codereview.chromium.org/2736533002/ )
Reason for revert:
Reverting debugging patch
Original issue's description:
> Add CHECKs to try to narrow down cause of bad internal fields in Window DOM wrapper
>
> BUG=696528
>
> Review-Url: https://codereview.chromium.org/2736533002
> Cr-Commit-Position: refs/heads/master@{#454781}
> Committed: https://chromium.googlesource.com/chromium/src/+/7cf0339964c7dcb8b77660a31bed2467b9f7cc3a
TBR=jbroman@chromium.org
# Not skipping CQ checks because original CL landed more than 1 days ago.
BUG=696528
Review-Url: https://codereview.chromium.org/2736733003
Cr-Commit-Position: refs/heads/master@{#454967}
diff --git a/third_party/WebKit/Source/bindings/core/v8/WindowProxy.cpp b/third_party/WebKit/Source/bindings/core/v8/WindowProxy.cpp
index 67d3a44..4a31146 100644
--- a/third_party/WebKit/Source/bindings/core/v8/WindowProxy.cpp
+++ b/third_party/WebKit/Source/bindings/core/v8/WindowProxy.cpp
@@ -33,11 +33,9 @@
#include <utility>
#include "bindings/core/v8/V8DOMWrapper.h"
-#include "bindings/core/v8/V8Window.h"
#include "core/frame/Frame.h"
#include "v8/include/v8.h"
#include "wtf/Assertions.h"
-#include "wtf/debug/Alias.h"
namespace blink {
@@ -132,40 +130,11 @@
// If there are JS code holds a closure to the old inner window,
// it won't be able to reach the outer window via its global object.
void WindowProxy::initializeIfNeeded() {
- v8::HandleScope handleScope(m_isolate);
- Lifecycle oldLifecycle = m_lifecycle;
- DOMWindow* window = m_frame->domWindow();
- bool isLocal = window->isLocalDOMWindow();
- // Prevent these locals from getting optimized out, and hopefully, the heap
- // contents captured into minidumps.
- WTF::debug::alias(&oldLifecycle);
- WTF::debug::alias(&window);
- WTF::debug::alias(&isLocal);
-
// TODO(haraken): It is wrong to re-initialize an already detached window
// proxy. This must be 'if(m_lifecycle == Lifecycle::ContextUninitialized)'.
if (m_lifecycle != Lifecycle::ContextInitialized) {
initialize();
- // Note: this set of CHECKs is intentionally duplicated below to distinguish
- // between initializing the global with null internal fields or returning a
- // global that claims to be initialized but has null internal fields.
- v8::Local<v8::Object> globalProxy = m_globalProxy.newLocal(m_isolate);
- CHECK(!globalProxy.IsEmpty());
- CHECK(V8Window::hasInstance(globalProxy, m_isolate));
- CHECK(window);
- CHECK_EQ(window, V8Window::toImpl(globalProxy));
- } else {
- v8::Local<v8::Object> globalProxy = m_globalProxy.newLocal(m_isolate);
- CHECK(!globalProxy.IsEmpty());
- CHECK(V8Window::hasInstance(globalProxy, m_isolate));
- CHECK(window);
- CHECK_EQ(window, V8Window::toImpl(globalProxy));
}
-
- // Sanity check: WindowProxy's frame's window should still be the same
- DOMWindow* window2 = m_frame->domWindow();
- WTF::debug::alias(&window2);
- CHECK_EQ(window, window2);
}
} // namespace blink
diff --git a/third_party/WebKit/Source/web/WebRemoteFrameImpl.cpp b/third_party/WebKit/Source/web/WebRemoteFrameImpl.cpp
index c44cc46c..5992326 100644
--- a/third_party/WebKit/Source/web/WebRemoteFrameImpl.cpp
+++ b/third_party/WebKit/Source/web/WebRemoteFrameImpl.cpp
@@ -5,7 +5,6 @@
#include "web/WebRemoteFrameImpl.h"
#include "bindings/core/v8/RemoteWindowProxy.h"
-#include "bindings/core/v8/V8Window.h"
#include "core/dom/Fullscreen.h"
#include "core/dom/RemoteSecurityContext.h"
#include "core/dom/SecurityContext.h"
@@ -28,7 +27,6 @@
#include "web/RemoteFrameOwner.h"
#include "web/WebLocalFrameImpl.h"
#include "web/WebViewImpl.h"
-#include "wtf/debug/Alias.h"
namespace blink {
@@ -218,23 +216,9 @@
v8::Local<v8::Context> WebRemoteFrameImpl::deprecatedMainWorldScriptContext()
const {
- v8::Local<v8::Context> context =
- static_cast<RemoteWindowProxy*>(
- frame()->windowProxy(DOMWrapperWorld::mainWorld()))
- ->contextIfInitialized();
-
- DOMWindow* window = frame()->domWindow();
- // Prevent this local from getting optimized out, and hopefully, the heap
- // contents captured into minidumps.
- WTF::debug::alias(&window);
-
- v8::Local<v8::Object> globalProxy = context->Global();
- CHECK(!globalProxy.IsEmpty());
- CHECK(V8Window::hasInstance(globalProxy, v8::Isolate::GetCurrent()));
- CHECK(window);
- CHECK_EQ(window, V8Window::toImpl(globalProxy));
-
- return context;
+ return static_cast<RemoteWindowProxy*>(
+ frame()->windowProxy(DOMWrapperWorld::mainWorld()))
+ ->contextIfInitialized();
}
void WebRemoteFrameImpl::reload(WebFrameLoadType) {
