Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(445)

Unified Diff: sky/engine/bindings/core/v8/WindowProxy.cpp

Issue 863253002: Update from https://crrev.com/312600 (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: sky/engine/bindings/core/v8/WindowProxy.cpp
diff --git a/sky/engine/bindings/core/v8/WindowProxy.cpp b/sky/engine/bindings/core/v8/WindowProxy.cpp
index 95d290c4cb66ca661f71ec06554f9a2f9d4020d5..626c18496d737a1356a7527135de7f7cc622b526 100644
--- a/sky/engine/bindings/core/v8/WindowProxy.cpp
+++ b/sky/engine/bindings/core/v8/WindowProxy.cpp
@@ -109,11 +109,6 @@ void WindowProxy::clearForNavigation()
m_document.clear();
- // Clear the document wrapper cache before turning on access checks on
- // the old LocalDOMWindow wrapper. This way, access to the document wrapper
- // will be protected by the security checks on the LocalDOMWindow wrapper.
- clearDocumentProperty();
-
v8::Handle<v8::Object> windowWrapper = V8Window::findInstanceInPrototypeChain(m_global.newLocal(m_isolate), m_isolate);
ASSERT(!windowWrapper.IsEmpty());
windowWrapper->TurnOnAccessCheck();
@@ -288,12 +283,6 @@ void WindowProxy::updateDocumentProperty()
if (m_document.isEmpty())
updateDocumentWrapper(v8::Handle<v8::Object>::Cast(documentWrapper));
- // If instantiation of the document wrapper fails, clear the cache
- // and let the LocalDOMWindow accessor handle access to the document.
- if (documentWrapper.IsEmpty()) {
- clearDocumentProperty();
- return;
- }
ASSERT(documentWrapper->IsObject());
context->Global()->ForceSet(v8AtomicString(m_isolate, "document"), documentWrapper, static_cast<v8::PropertyAttribute>(v8::ReadOnly | v8::DontDelete));
@@ -303,15 +292,6 @@ void WindowProxy::updateDocumentProperty()
V8HiddenValue::setHiddenValue(m_isolate, toInnerGlobalObject(context), V8HiddenValue::document(m_isolate), documentWrapper);
}
-void WindowProxy::clearDocumentProperty()
-{
- ASSERT(isContextInitialized());
- if (!m_world->isMainWorld())
- return;
- v8::HandleScope handleScope(m_isolate);
- m_scriptState->context()->Global()->ForceDelete(v8AtomicString(m_isolate, "document"));
-}
-
void WindowProxy::updateDocument()
{
ASSERT(m_world->isMainWorld());

Powered by Google App Engine
This is Rietveld 408576698