Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-04-03 13:02:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1073213 - Do not use nsIDOMWindowUtils in editor/; r=roc

Browse Source
This commit is contained in:
Ehsan Akhgari 2014-09-26 09:19:56 -04:00
parent 608af8951e
commit dfb64283ad
1 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
editor/composer/nsEditingSession.cpp
View File

@ -25,7 +25,6 @@
#include "nsIDOMDocument.h" // for nsIDOMDocument #include "nsIDOMDocument.h" // for nsIDOMDocument
#include "nsIDOMHTMLDocument.h" // for nsIDOMHTMLDocument #include "nsIDOMHTMLDocument.h" // for nsIDOMHTMLDocument
#include "nsIDOMWindow.h" // for nsIDOMWindow #include "nsIDOMWindow.h" // for nsIDOMWindow
#include "nsIDOMWindowUtils.h" // for nsIDOMWindowUtils
#include "nsIDocShell.h" // for nsIDocShell #include "nsIDocShell.h" // for nsIDocShell
#include "nsIDocument.h" // for nsIDocument #include "nsIDocument.h" // for nsIDocument
#include "nsIDocumentStateListener.h" #include "nsIDocumentStateListener.h"
@ -33,6 +32,7 @@
#include "nsIHTMLDocument.h" // for nsIHTMLDocument, etc #include "nsIHTMLDocument.h" // for nsIHTMLDocument, etc
#include "nsIInterfaceRequestorUtils.h" // for do_GetInterface #include "nsIInterfaceRequestorUtils.h" // for do_GetInterface
#include "nsIPlaintextEditor.h" // for nsIPlaintextEditor, etc #include "nsIPlaintextEditor.h" // for nsIPlaintextEditor, etc
#include "nsIPresShell.h" // for nsIPresShell
#include "nsIRefreshURI.h" // for nsIRefreshURI #include "nsIRefreshURI.h" // for nsIRefreshURI
#include "nsIRequest.h" // for nsIRequest #include "nsIRequest.h" // for nsIRequest
#include "nsISelection.h" // for nsISelection #include "nsISelection.h" // for nsISelection
@ -45,6 +45,7 @@
#include "nsLiteralString.h" // for NS_LITERAL_STRING #include "nsLiteralString.h" // for NS_LITERAL_STRING
#include "nsPICommandUpdater.h" // for nsPICommandUpdater #include "nsPICommandUpdater.h" // for nsPICommandUpdater
#include "nsPIDOMWindow.h" // for nsPIDOMWindow #include "nsPIDOMWindow.h" // for nsPIDOMWindow
#include "nsPresContext.h" // for nsPresContext
#include "nsReadableUtils.h" // for AppendUTF16toUTF8 #include "nsReadableUtils.h" // for AppendUTF16toUTF8
#include "nsStringFwd.h" // for nsAFlatString #include "nsStringFwd.h" // for nsAFlatString
@ -396,12 +397,13 @@ nsEditingSession::SetupEditorOnWindow(nsIDOMWindow *aWindow)
if (!mInteractive) { if (!mInteractive) {
// Disable animation of images in this document: // Disable animation of images in this document:
nsCOMPtr<nsIDOMWindowUtils> utils(do_GetInterface(aWindow)); nsCOMPtr<nsIPresShell> presShell = docShell->GetPresShell();
NS_ENSURE_TRUE(utils, NS_ERROR_FAILURE); NS_ENSURE_TRUE(presShell, NS_ERROR_FAILURE);
nsPresContext* presContext = presShell->GetPresContext();
NS_ENSURE_TRUE(presContext, NS_ERROR_FAILURE);
rv = utils->GetImageAnimationMode(&mImageAnimationMode); mImageAnimationMode = presContext->ImageAnimationMode();
NS_ENSURE_SUCCESS(rv, rv); presContext->SetImageAnimationMode(imgIContainer::kDontAnimMode);
utils->SetImageAnimationMode(imgIContainer::kDontAnimMode);
} }
// create and set editor // create and set editor
@ -1303,9 +1305,14 @@ nsEditingSession::RestoreAnimationMode(nsIDOMWindow *aWindow)
{ {
if (!mInteractive) if (!mInteractive)
{ {
nsCOMPtr<nsIDOMWindowUtils> utils(do_GetInterface(aWindow)); nsCOMPtr<nsIDocShell> docShell = GetDocShellFromWindow(aWindow);
if (utils) NS_ENSURE_TRUE(docShell, );
utils->SetImageAnimationMode(mImageAnimationMode); nsCOMPtr<nsIPresShell> presShell = docShell->GetPresShell();
NS_ENSURE_TRUE(presShell, );
nsPresContext* presContext = presShell->GetPresContext();
NS_ENSURE_TRUE(presContext, );
presContext->SetImageAnimationMode(mImageAnimationMode);
} }
} }
@ -1390,12 +1397,13 @@ nsEditingSession::ReattachToWindow(nsIDOMWindow* aWindow)
if (!mInteractive) if (!mInteractive)
{ {
// Disable animation of images in this document: // Disable animation of images in this document:
nsCOMPtr<nsIDOMWindowUtils> utils(do_GetInterface(aWindow)); nsCOMPtr<nsIPresShell> presShell = docShell->GetPresShell();
NS_ENSURE_TRUE(utils, NS_ERROR_FAILURE); NS_ENSURE_TRUE(presShell, NS_ERROR_FAILURE);
nsPresContext* presContext = presShell->GetPresContext();
NS_ENSURE_TRUE(presContext, NS_ERROR_FAILURE);
rv = utils->GetImageAnimationMode(&mImageAnimationMode); mImageAnimationMode = presContext->ImageAnimationMode();
NS_ENSURE_SUCCESS(rv, rv); presContext->SetImageAnimationMode(imgIContainer::kDontAnimMode);
utils->SetImageAnimationMode(imgIContainer::kDontAnimMode);
} }
// The third controller takes an nsIEditor as the context // The third controller takes an nsIEditor as the context