Move Location to DOMWindow

Source/modules/geolocation/NavigatorGeolocation.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 28 matching lines @@
 
 const char* NavigatorGeolocation::supplementName()
 {
     return "NavigatorGeolocation";
 }
 
 NavigatorGeolocation& NavigatorGeolocation::from(Navigator& navigator)
 {
     NavigatorGeolocation* supplement = static_cast<NavigatorGeolocation*>(WillBeHeapSupplement<Navigator>::from(navigator, supplementName()));
     if (!supplement) {
-        supplement = new NavigatorGeolocation(navigator.frame());
+        supplement = new NavigatorGeolocation(navigator.localFrame());
         provideTo(navigator, supplementName(), adoptPtrWillBeNoop(supplement));
     }
     return *supplement;
 }
 
 Geolocation* NavigatorGeolocation::geolocation(Navigator& navigator)
 {
     return NavigatorGeolocation::from(navigator).geolocation();
 }
 
 Geolocation* NavigatorGeolocation::geolocation()
 {
-    if (!m_geolocation && frame())
-        m_geolocation = Geolocation::create(frame()->document());
+    if (!m_geolocation && localFrame())
+        m_geolocation = Geolocation::create(localFrame()->document());
     return m_geolocation.get();
 }
 
 void NavigatorGeolocation::trace(Visitor* visitor)
 {
     visitor->trace(m_geolocation);
     WillBeHeapSupplement<Navigator>::trace(visitor);
     DOMWindowProperty::trace(visitor);
 }
 
 } // namespace blink