Move Location to DOMWindow

Source/core/frame/Location.cpp

 /*
  * Copyright (C) 2008, 2010 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
@@ skipping 24 matching lines @@
 #include "core/dom/Document.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/frame/LocalDOMWindow.h"
 #include "core/frame/LocalFrame.h"
 #include "core/loader/FrameLoader.h"
 #include "platform/weborigin/KURL.h"
 #include "platform/weborigin/SecurityOrigin.h"
 
 namespace blink {
 
-Location::Location(LocalFrame* frame)
-    : DOMWindowProperty(frame)
+Location::Location(Frame* frame)
+    : m_frame(frame)
 {
 }
 
 void Location::trace(Visitor* visitor)
 {
-    DOMWindowProperty::trace(visitor);
+    visitor->trace(m_frame);
 }
 
 inline const KURL& Location::url() const
 {
-    ASSERT(m_frame);
+    ASSERT(m_frame && m_frame->isLocalFrame());

[haraken, 2015/02/03 00:56:09]

This ASSERT would be redundant, since toLocalFrame has the check.

[Nate Chapin, 2015/02/03 19:17:21]

Done.

 
-    const KURL& url = m_frame->document()->url();
+    const KURL& url = toLocalFrame(m_frame)->document()->url();
     if (!url.isValid())
         return blankURL(); // Use "about:blank" while the page is still loading (before we have a frame).
 
     return url;
 }
 
 String Location::href() const
 {
     if (!m_frame)
         return String();
@@ skipping 72 matching lines @@
 {
     if (!m_frame)
         return;
     setLocation(url, callingWindow, enteredWindow);
 }
 
 void Location::setProtocol(LocalDOMWindow* callingWindow, LocalDOMWindow* enteredWindow, const String& protocol, ExceptionState& exceptionState)
 {
     if (!m_frame)
         return;
-    KURL url = m_frame->document()->url();
+    ASSERT(m_frame->isLocalFrame());

[haraken, 2015/02/03 00:56:09]

Ditto. The same comment for other parts in this file.

[Nate Chapin, 2015/02/03 19:17:21]

Done.

+    KURL url = toLocalFrame(m_frame)->document()->url();
     if (!url.setProtocol(protocol)) {
         exceptionState.throwDOMException(SyntaxError, "'" + protocol + "' is an invalid protocol.");
         return;
     }
     setLocation(url.string(), callingWindow, enteredWindow);
 }
 
 void Location::setHost(LocalDOMWindow* callingWindow, LocalDOMWindow* enteredWindow, const String& host)
 {
     if (!m_frame)
         return;
-    KURL url = m_frame->document()->url();
+    ASSERT(m_frame->isLocalFrame());
+    KURL url = toLocalFrame(m_frame)->document()->url();
     url.setHostAndPort(host);
     setLocation(url.string(), callingWindow, enteredWindow);
 }
 
 void Location::setHostname(LocalDOMWindow* callingWindow, LocalDOMWindow* enteredWindow, const String& hostname)
 {
     if (!m_frame)
         return;
-    KURL url = m_frame->document()->url();
+    ASSERT(m_frame->isLocalFrame());
+    KURL url = toLocalFrame(m_frame)->document()->url();
     url.setHost(hostname);
     setLocation(url.string(), callingWindow, enteredWindow);
 }
 
 void Location::setPort(LocalDOMWindow* callingWindow, LocalDOMWindow* enteredWindow, const String& portString)
 {
     if (!m_frame)
         return;
-    KURL url = m_frame->document()->url();
+    ASSERT(m_frame->isLocalFrame());
+    KURL url = toLocalFrame(m_frame)->document()->url();
     url.setPort(portString);
     setLocation(url.string(), callingWindow, enteredWindow);
 }
 
 void Location::setPathname(LocalDOMWindow* callingWindow, LocalDOMWindow* enteredWindow, const String& pathname)
 {
     if (!m_frame)
         return;
-    KURL url = m_frame->document()->url();
+    ASSERT(m_frame->isLocalFrame());
+    KURL url = toLocalFrame(m_frame)->document()->url();
     url.setPath(pathname);
     setLocation(url.string(), callingWindow, enteredWindow);
 }
 
 void Location::setSearch(LocalDOMWindow* callingWindow, LocalDOMWindow* enteredWindow, const String& search)
 {
     if (!m_frame)
         return;
-    KURL url = m_frame->document()->url();
+    ASSERT(m_frame->isLocalFrame());
+    KURL url = toLocalFrame(m_frame)->document()->url();
     url.setQuery(search);
     setLocation(url.string(), callingWindow, enteredWindow);
 }
 
 void Location::setHash(LocalDOMWindow* callingWindow, LocalDOMWindow* enteredWindow, const String& hash)
 {
     if (!m_frame)
         return;
-    KURL url = m_frame->document()->url();
+    ASSERT(m_frame->isLocalFrame());
+    KURL url = toLocalFrame(m_frame)->document()->url();
     String oldFragmentIdentifier = url.fragmentIdentifier();
     String newFragmentIdentifier = hash;
     if (hash[0] == '#')
         newFragmentIdentifier = hash.substring(1);
     url.setFragmentIdentifier(newFragmentIdentifier);
     // Note that by parsing the URL and *then* comparing fragments, we are
     // comparing fragments post-canonicalization, and so this handles the
     // cases where fragment identifiers are ignored or invalid.
     if (equalIgnoringNullity(oldFragmentIdentifier, url.fragmentIdentifier()))
         return;
@@ skipping 11 matching lines @@
 {
     if (!m_frame)
         return;
     setLocation(url, callingWindow, enteredWindow, SetLocation::ReplaceThisFrame);
 }
 
 void Location::reload(LocalDOMWindow* callingWindow)
 {
     if (!m_frame)
         return;
-    if (protocolIsJavaScript(m_frame->document()->url()))
+    ASSERT(m_frame->isLocalFrame());
+    if (protocolIsJavaScript(toLocalFrame(m_frame)->document()->url()))
         return;
     m_frame->reload(NormalReload, ClientRedirect);
 }
 
 void Location::setLocation(const String& url, LocalDOMWindow* callingWindow, LocalDOMWindow* enteredWindow, SetLocation locationPolicy)
 {
     ASSERT(m_frame);
     if (!m_frame || !m_frame->host())
         return;
 
@@ skipping 17 matching lines @@
         argv.append("LocalDOMWindow");
         argv.append("url");
         argv.append(enteredDocument->url());
         argv.append(completedURL);
         activityLogger->logEvent("blinkSetAttribute", argv.size(), argv.data());
     }
     m_frame->navigate(*callingWindow->document(), completedURL, locationPolicy == SetLocation::ReplaceThisFrame);
 }
 
 } // namespace blink