Move Location to DOMWindow

Source/core/storage/Storage.h

 /*
  * Copyright (C) 2008 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
@@ skipping 29 matching lines @@
 class ExceptionState;
 class LocalFrame;
 
 class Storage final : public RefCountedWillBeGarbageCollected<Storage>, public ScriptWrappable, public DOMWindowProperty {
     DEFINE_WRAPPERTYPEINFO();
     WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(Storage);
     DECLARE_EMPTY_VIRTUAL_DESTRUCTOR_WILL_BE_REMOVED(Storage);
 public:
     static PassRefPtrWillBeRawPtr<Storage> create(LocalFrame*, PassOwnPtrWillBeRawPtr<StorageArea>);
 
-    unsigned length(ExceptionState& ec) const { return m_storageArea->length(ec, m_frame); }
-    String key(unsigned index, ExceptionState& ec) const { return m_storageArea->key(index, ec, m_frame); }
-    String getItem(const String& key, ExceptionState& ec) const { return m_storageArea->getItem(key, ec, m_frame); }
-    void setItem(const String& key, const String& value, ExceptionState& ec) { m_storageArea->setItem(key, value, ec, m_frame); }
-    void removeItem(const String& key, ExceptionState& ec) { m_storageArea->removeItem(key, ec, m_frame); }
-    void clear(ExceptionState& ec) { m_storageArea->clear(ec, m_frame); }
-    bool contains(const String& key, ExceptionState& ec) const { return m_storageArea->contains(key, ec, m_frame); }
+    unsigned length(ExceptionState& ec) const { return m_storageArea->length(ec, localFrame()); }
+    String key(unsigned index, ExceptionState& ec) const { return m_storageArea->key(index, ec, localFrame()); }
+    String getItem(const String& key, ExceptionState& ec) const { return m_storageArea->getItem(key, ec, localFrame()); }
+    void setItem(const String& key, const String& value, ExceptionState& ec) { m_storageArea->setItem(key, value, ec, localFrame()); }
+    void removeItem(const String& key, ExceptionState& ec) { m_storageArea->removeItem(key, ec, localFrame()); }
+    void clear(ExceptionState& ec) { m_storageArea->clear(ec, localFrame()); }
+    bool contains(const String& key, ExceptionState& ec) const { return m_storageArea->contains(key, ec, localFrame()); }
 
     StorageArea* area() const { return m_storageArea.get(); }
 
     String anonymousIndexedGetter(unsigned, ExceptionState&);
     String anonymousNamedGetter(const AtomicString&, ExceptionState&);
     bool anonymousNamedSetter(const AtomicString& name, const AtomicString& value, ExceptionState&);
     bool anonymousIndexedSetter(unsigned, const AtomicString&, ExceptionState&);
     DeleteResult anonymousNamedDeleter(const AtomicString&, ExceptionState&);
     DeleteResult anonymousIndexedDeleter(unsigned, ExceptionState&);
     void namedPropertyEnumerator(Vector<String>&, ExceptionState&);
     bool namedPropertyQuery(const AtomicString&, ExceptionState&);
 
     virtual void trace(Visitor*) override;
 
 private:
     Storage(LocalFrame*, PassOwnPtrWillBeRawPtr<StorageArea>);
 
     OwnPtrWillBeMember<StorageArea> m_storageArea;
 };
 
 } // namespace blink
 
 #endif // Storage_h