Reland: Don't store ScriptValue in PopStateEvent

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

 /*
  * Copyright (C) 2009 Apple Inc. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY APPLE, INC. ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  */
 
 #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 {
 
 class History;
 class SerializedScriptValue;
 
 class PopStateEvent final : public Event {
   DEFINE_WRAPPERTYPEINFO();
 
  public:
   ~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();
   }
   void SetSerializedState(PassRefPtr<SerializedScriptValue> state) {
     DCHECK(!serialized_state_);
     serialized_state_ = std::move(state);
   }
   History* GetHistory() const { return history_.Get(); }
 
   const AtomicString& InterfaceName() const override;
 
   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_;
 };
 
 }  // namespace blink
 
 #endif  // PopStateEvent_h