Index: third_party/WebKit/Source/bindings/core/v8/WindowProxy.cpp |
diff --git a/third_party/WebKit/Source/bindings/core/v8/WindowProxy.cpp b/third_party/WebKit/Source/bindings/core/v8/WindowProxy.cpp |
index c4b17c2929d89231f5dc4dcdba87029728503caf..ddd19e1fef91967045066f83aca267fb6763071f 100644 |
--- a/third_party/WebKit/Source/bindings/core/v8/WindowProxy.cpp |
+++ b/third_party/WebKit/Source/bindings/core/v8/WindowProxy.cpp |
@@ -42,6 +42,7 @@ |
#include "bindings/core/v8/V8Initializer.h" |
#include "bindings/core/v8/V8ObjectConstructor.h" |
#include "bindings/core/v8/V8PagePopupControllerBinding.h" |
+#include "bindings/core/v8/V8PrivateProperty.h" |
#include "bindings/core/v8/V8Window.h" |
#include "core/frame/LocalFrame.h" |
#include "core/frame/csp/ContentSecurityPolicy.h" |
@@ -415,9 +416,9 @@ void WindowProxy::updateDocumentProperty() |
checkDocumentWrapper(m_document.newLocal(m_isolate), frame->document()); |
ASSERT(documentWrapper->IsObject()); |
- // TODO(jochen): Don't replace the accessor with a data value. We need a way to tell v8 that the accessor's return value won't change after this point. |
- if (!v8CallBoolean(context->Global()->ForceSet(context, v8AtomicString(m_isolate, "document"), documentWrapper, static_cast<v8::PropertyAttribute>(v8::ReadOnly | v8::DontDelete)))) |
- return; |
+ |
+ // Update cached accessor. |
+ CHECK(V8PrivateProperty::getWindowDocumentCachedAccessor(m_isolate).set(context, context->Global(), documentWrapper)); |
} |
void WindowProxy::updateActivityLogger() |