corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1241764: Replace nsPIDOMWindow with nsPIDOMWindowInner/Outer. r=mrbkap,smaug

Browse Source
This commit is contained in:
Kyle Huey
2016-01-30 09:05:36 -08:00
parent 366da70c9f
commit e95edb30a9
806 changed files with 4709 additions and 5300 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
embedding/components/commandhandler/nsCommandManager.cpp
View File

@@ -60,11 +60,10 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsCommandManager)
NS_INTERFACE_MAP_END
NS_IMETHODIMP
nsCommandManager::Init(nsIDOMWindow* aWindow)
nsCommandManager::Init(mozIDOMWindowProxy* aWindow)
{
NS_ENSURE_ARG_POINTER(aWindow);
NS_ASSERTION(aWindow, "Need non-null window here");
mWindow = aWindow; // weak ptr
return NS_OK;
}
@@ -140,7 +139,7 @@ nsCommandManager::RemoveCommandObserver(nsIObserver* aCommandObserver,
NS_IMETHODIMP
nsCommandManager::IsCommandSupported(const char* aCommandName,
nsIDOMWindow* aTargetWindow,
mozIDOMWindowProxy* aTargetWindow,
bool* aResult)
{
NS_ENSURE_ARG_POINTER(aResult);
@@ -154,7 +153,7 @@ nsCommandManager::IsCommandSupported(const char* aCommandName,
NS_IMETHODIMP
nsCommandManager::IsCommandEnabled(const char* aCommandName,
nsIDOMWindow* aTargetWindow,
mozIDOMWindowProxy* aTargetWindow,
bool* aResult)
{
NS_ENSURE_ARG_POINTER(aResult);
@@ -173,7 +172,7 @@ nsCommandManager::IsCommandEnabled(const char* aCommandName,
NS_IMETHODIMP
nsCommandManager::GetCommandState(const char* aCommandName,
nsIDOMWindow* aTargetWindow,
mozIDOMWindowProxy* aTargetWindow,
nsICommandParams* aCommandParams)
{
nsCOMPtr<nsIController> controller;
@@ -198,7 +197,7 @@ nsCommandManager::GetCommandState(const char* aCommandName,
NS_IMETHODIMP
nsCommandManager::DoCommand(const char* aCommandName,
nsICommandParams* aCommandParams,
nsIDOMWindow* aTargetWindow)
mozIDOMWindowProxy* aTargetWindow)
{
nsCOMPtr<nsIController> controller;
nsresult rv = GetControllerForCommand(aCommandName, aTargetWindow,
@@ -219,7 +218,7 @@ nsCommandManager::DoCommand(const char* aCommandName,
nsresult
nsCommandManager::GetControllerForCommand(const char* aCommand,
nsIDOMWindow* aTargetWindow,
mozIDOMWindowProxy* aTargetWindow,
nsIController** aResult)
{
nsresult rv = NS_ERROR_FAILURE;
@@ -238,7 +237,7 @@ nsCommandManager::GetControllerForCommand(const char* aCommand,
}
}
if (nsCOMPtr<nsPIDOMWindow> targetWindow = do_QueryInterface(aTargetWindow)) {
if (auto* targetWindow = nsPIDOMWindowOuter::From(aTargetWindow)) {
// get the controller for this particular window
nsCOMPtr<nsIControllers> controllers;
rv = targetWindow->GetControllers(getter_AddRefs(controllers));
@@ -253,7 +252,7 @@ nsCommandManager::GetControllerForCommand(const char* aCommand,
return controllers->GetControllerForCommand(aCommand, aResult);
}
nsCOMPtr<nsPIDOMWindow> window(do_QueryInterface(mWindow));
auto* window = nsPIDOMWindowOuter::From(mWindow);
NS_ENSURE_TRUE(window, NS_ERROR_FAILURE);
nsCOMPtr<nsPIWindowRoot> root = window->GetTopWindowRoot();
NS_ENSURE_TRUE(root, NS_ERROR_FAILURE);