Reland: Don't store ScriptValue in PopStateEvent

third_party/WebKit/Source/core/events/PopStateEvent.h

Index: third_party/WebKit/Source/core/events/PopStateEvent.h
diff --git a/third_party/WebKit/Source/core/events/PopStateEvent.h b/third_party/WebKit/Source/core/events/PopStateEvent.h
index 22da42d1db4f2ef04758677a3f709ecffe668544..3d882e24ecf9f79f36d5328e4553ab06390ee319 100644
--- a/third_party/WebKit/Source/core/events/PopStateEvent.h
+++ b/third_party/WebKit/Source/core/events/PopStateEvent.h
@@ -27,8 +27,10 @@
 #ifndef PopStateEvent_h
 #define PopStateEvent_h
 
+#include "bindings/core/v8/TraceWrapperV8Reference.h"
 #include "core/events/Event.h"
 #include "core/events/PopStateEventInit.h"
+#include "platform/bindings/DOMWrapperWorld.h"
 #include "platform/heap/Handle.h"
 
 namespace blink {
@@ -43,9 +45,11 @@ class PopStateEvent final : public Event {
   ~PopStateEvent() override;
   static PopStateEvent* Create();
   static PopStateEvent* Create(PassRefPtr<SerializedScriptValue>, History*);
-  static PopStateEvent* Create(const AtomicString&, const PopStateEventInit&);
+  static PopStateEvent* Create(ScriptState*,
+                               const AtomicString&,
+                               const PopStateEventInit&);
 
-  ScriptValue state() const { return state_; }
+  ScriptValue state(ScriptState*) const;
   SerializedScriptValue* SerializedState() const {
     return serialized_state_.Get();
   }
@@ -59,13 +63,16 @@ class PopStateEvent final : public Event {
 
   DECLARE_VIRTUAL_TRACE();
 
+  DECLARE_VIRTUAL_TRACE_WRAPPERS();
+
  private:
   PopStateEvent();
-  PopStateEvent(const AtomicString&, const PopStateEventInit&);
+  PopStateEvent(ScriptState*, const AtomicString&, const PopStateEventInit&);
   PopStateEvent(PassRefPtr<SerializedScriptValue>, History*);
 
   RefPtr<SerializedScriptValue> serialized_state_;
-  ScriptValue state_;
+  RefPtr<DOMWrapperWorld> world_;
+  TraceWrapperV8Reference<v8::Value> state_;
   Member<History> history_;
 };