Move Location to DOMWindow

Source/core/frame/Navigator.cpp

 /*
  *  Copyright (C) 2000 Harri Porten (porten@kde.org)
  *  Copyright (c) 2000 Daniel Molkentin (molkentin@kde.org)
  *  Copyright (c) 2000 Stefan Schimanski (schimmi@kde.org)
  *  Copyright (C) 2003, 2004, 2005, 2006 Apple Computer, Inc.
  *  Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public
  *  License as published by the Free Software Foundation; either
@@ skipping 60 matching lines @@
 }
 
 String Navigator::vendorSub() const
 {
     return WEBCORE_NAVIGATOR_VENDOR_SUB;
 }
 
 String Navigator::userAgent() const
 {
     // If the frame is already detached it no longer has a meaningful useragent.
-    if (!m_frame || !m_frame->page())
+    if (!localFrame() || !m_frame->page())
         return String();
 
-    return m_frame->loader().userAgent(m_frame->document()->url());
+    return localFrame()->loader().userAgent(localFrame()->document()->url());
 }
 
 DOMPluginArray* Navigator::plugins() const
 {
     if (!m_plugins)
-        m_plugins = DOMPluginArray::create(m_frame);
+        m_plugins = DOMPluginArray::create(localFrame());
     return m_plugins.get();
 }
 
 DOMMimeTypeArray* Navigator::mimeTypes() const
 {
     if (!m_mimeTypes)
-        m_mimeTypes = DOMMimeTypeArray::create(m_frame);
+        m_mimeTypes = DOMMimeTypeArray::create(localFrame());
     return m_mimeTypes.get();
 }
 
 bool Navigator::cookieEnabled() const
 {
-    if (!m_frame)
+    if (!localFrame())
         return false;
 
     Settings* settings = m_frame->settings();
     if (!settings || !settings->cookieEnabled())
         return false;
 
-    return cookiesEnabled(m_frame->document());
+    return cookiesEnabled(localFrame()->document());
 }
 
 bool Navigator::javaEnabled() const
 {
     if (!m_frame || !m_frame->settings())
         return false;
 
     if (!m_frame->settings()->javaEnabled())
         return false;
 
@@ skipping 34 matching lines @@
 {
 #if ENABLE(OILPAN)
     visitor->trace(m_plugins);
     visitor->trace(m_mimeTypes);
     HeapSupplementable<Navigator>::trace(visitor);
 #endif
     DOMWindowProperty::trace(visitor);
 }
 
 } // namespace blink