Move Location to DOMWindow

Source/modules/mediastream/NavigatorMediaStream.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 37 matching lines @@
 
 NavigatorMediaStream::~NavigatorMediaStream()
 {
 }
 
 void NavigatorMediaStream::webkitGetUserMedia(Navigator& navigator, const Dictionary& options, NavigatorUserMediaSuccessCallback* successCallback, NavigatorUserMediaErrorCallback* errorCallback, ExceptionState& exceptionState)
 {
     if (!successCallback)
         return;
 
-    UserMediaController* userMedia = UserMediaController::from(navigator.frame());
+    UserMediaController* userMedia = UserMediaController::from(navigator.localFrame());
     if (!userMedia) {
         exceptionState.throwDOMException(NotSupportedError, "No user media controller available; is this a detached window?");
         return;
     }
 
     String errorMessage;
-    if (navigator.frame()->document()->securityOrigin()->canAccessFeatureRequiringSecureOrigin(errorMessage)) {
-        UseCounter::count(navigator.frame(), UseCounter::GetUserMediaSecureOrigin);
+    if (navigator.localFrame()->document()->securityOrigin()->canAccessFeatureRequiringSecureOrigin(errorMessage)) {
+        UseCounter::count(navigator.localFrame(), UseCounter::GetUserMediaSecureOrigin);
     } else {
-        UseCounter::count(navigator.frame(), UseCounter::GetUserMediaInsecureOrigin);
+        UseCounter::count(navigator.localFrame(), UseCounter::GetUserMediaInsecureOrigin);
         if (navigator.frame()->settings()->strictPowerfulFeatureRestrictions()) {
             exceptionState.throwSecurityError(ExceptionMessages::failedToExecute("webkitGetUserMedia", "Navigator", errorMessage));
             return;
         }
     }
 
-    UserMediaRequest* request = UserMediaRequest::create(navigator.frame()->document(), userMedia, options, successCallback, errorCallback, exceptionState);
+    UserMediaRequest* request = UserMediaRequest::create(navigator.localFrame()->document(), userMedia, options, successCallback, errorCallback, exceptionState);
     if (!request) {
         ASSERT(exceptionState.hadException());
         return;
     }
 
     request->start();
 }
 
 void NavigatorMediaStream::getMediaDevices(Navigator& navigator, MediaDeviceInfoCallback* callback, ExceptionState& exceptionState)
 {
-    UserMediaController* userMedia = UserMediaController::from(navigator.frame());
+    UserMediaController* userMedia = UserMediaController::from(navigator.localFrame());
     if (!userMedia) {
         exceptionState.throwDOMException(NotSupportedError, "No media device controller available; is this a detached window?");
         return;
     }
 
-    MediaDevicesRequest* request = MediaDevicesRequest::create(navigator.frame()->document(), userMedia, callback, exceptionState);
+    MediaDevicesRequest* request = MediaDevicesRequest::create(navigator.localFrame()->document(), userMedia, callback, exceptionState);
     if (!request) {
         if (!exceptionState.hadException())
             exceptionState.throwDOMException(NotSupportedError, "Failed to request media devices.");
         return;
     }
 
     request->start();
 }
 
 } // namespace blink