Move Location to DOMWindow

Source/core/frame/History.cpp

 /*
  * Copyright (C) 2007 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 36 matching lines @@
 {
 }
 
 void History::trace(Visitor* visitor)
 {
     DOMWindowProperty::trace(visitor);
 }
 
 unsigned History::length() const
 {
-    if (!m_frame || !m_frame->loader().client())
+    if (!localFrame() || !localFrame()->loader().client())
         return 0;
-    return m_frame->loader().client()->backForwardLength();
+    return localFrame()->loader().client()->backForwardLength();
 }
 
 SerializedScriptValue* History::state()
 {
     m_lastStateObjectRequested = stateInternal();
     return m_lastStateObjectRequested.get();
 }
 
 SerializedScriptValue* History::stateInternal() const
 {
-    if (!m_frame)
+    if (!localFrame())
         return 0;
 
-    if (HistoryItem* historyItem = m_frame->loader().currentItem())
+    if (HistoryItem* historyItem = localFrame()->loader().currentItem())
         return historyItem->stateObject();
 
     return 0;
 }
 
 bool History::stateChanged() const
 {
     return m_lastStateObjectRequested != stateInternal();
 }
 
 bool History::isSameAsCurrentState(SerializedScriptValue* state) const
 {
     return state == stateInternal();
 }
 
 void History::back(ExecutionContext* context)
 {
     go(context, -1);
 }
 
 void History::forward(ExecutionContext* context)
 {
     go(context, 1);
 }
 
 void History::go(ExecutionContext* context, int distance)
 {
-    if (!m_frame || !m_frame->loader().client())
+    if (!localFrame() || !localFrame()->loader().client())
         return;
 
     ASSERT(isMainThread());
     Document* activeDocument = toDocument(context);
     if (!activeDocument)
         return;
 
     if (!activeDocument->frame() || !activeDocument->frame()->canNavigate(*m_frame))
         return;
 
     if (distance)
-        m_frame->loader().client()->navigateBackForward(distance);
+        localFrame()->loader().client()->navigateBackForward(distance);
     else
         m_frame->reload(NormalReload, ClientRedirect);
 }
 
 KURL History::urlForState(const String& urlString)
 {
-    Document* document = m_frame->document();
+    Document* document = localFrame()->document();
 
     if (urlString.isNull())
         return document->url();
     if (urlString.isEmpty())
         return document->baseURL();
 
     return KURL(document->baseURL(), urlString);
 }
 
 void History::stateObjectAdded(PassRefPtr<SerializedScriptValue> data, const String& /* title */, const String& urlString, FrameLoadType type, ExceptionState& exceptionState)
 {
-    if (!m_frame || !m_frame->page() || !m_frame->loader().documentLoader())
+    if (!localFrame() || !localFrame()->page() || !localFrame()->loader().documentLoader())
         return;
 
     KURL fullURL = urlForState(urlString);
-    if (!fullURL.isValid() || !m_frame->document()->securityOrigin()->canRequest(fullURL)) {
+    if (!fullURL.isValid() || !m_frame->securityContext()->securityOrigin()->canRequest(fullURL)) {
         // We can safely expose the URL to JavaScript, as a) no redirection takes place: JavaScript already had this URL, b) JavaScript can only access a same-origin History object.
-        exceptionState.throwSecurityError("A history state object with URL '" + fullURL.elidedString() + "' cannot be created in a document with origin '" + m_frame->document()->securityOrigin()->toString() + "'.");
+        exceptionState.throwSecurityError("A history state object with URL '" + fullURL.elidedString() + "' cannot be created in a document with origin '" + m_frame->securityContext()->securityOrigin()->toString() + "'.");
         return;
     }
-    m_frame->loader().updateForSameDocumentNavigation(fullURL, SameDocumentNavigationHistoryApi, data, type);
+    localFrame()->loader().updateForSameDocumentNavigation(fullURL, SameDocumentNavigationHistoryApi, data, type);
 }
 
 } // namespace blink