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 6e8dbc7ca9c56d4b19ff438aa396fe8e1ff3c2c9..1e2108f18bf8b40906f55ed0188cdba3e04ec85c 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" |
@@ -65,6 +66,7 @@ |
#include "wtf/StringExtras.h" |
#include "wtf/text/CString.h" |
#include <algorithm> |
+#include <map> |
haraken
2016/09/20 05:53:25
Remove this.
Alfonso
2016/09/20 13:48:23
Done.
|
#include <utility> |
#include <v8-debug.h> |
#include <v8.h> |
@@ -410,9 +412,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 cache. |
+ CHECK(V8PrivateProperty::getWindow_document(m_isolate).set(context, context->Global(), documentWrapper)); |
jochen (gone - plz use gerrit)
2016/09/19 14:54:19
I suspect that you need to do this also right afte
Alfonso
2016/09/20 13:48:23
Done. The test pass as is.
|
} |
void WindowProxy::updateActivityLogger() |