Bug 1434399 part 18. Remove nsIXULDocument::ResetDocumentLWTheme. r=mystor

MozReview-Commit-ID: 9z4HAVJAl7R
This commit is contained in:
Boris Zbarsky 2018-01-31 14:49:29 -05:00
Родитель 3e1fd1a5ab
Коммит 3347e08790
3 изменённых файлов: 3 добавлений и 6 удалений

Просмотреть файл

@ -150,7 +150,7 @@ public:
virtual nsIDocument::DocumentTheme GetDocumentLWTheme() override;
virtual nsIDocument::DocumentTheme ThreadSafeGetDocumentLWTheme() const override;
virtual void ResetDocumentLWTheme() override { mDocLWTheme = Doc_Theme_Uninitialized; }
void ResetDocumentLWTheme() { mDocLWTheme = Doc_Theme_Uninitialized; }
NS_IMETHOD OnScriptCompileComplete(JSScript* aScript, nsresult aStatus) override;

Просмотреть файл

@ -34,8 +34,6 @@ class nsIXULDocument : public nsISupports
{
public:
NS_DECLARE_STATIC_IID_ACCESSOR(NS_IXULDOCUMENT_IID)
virtual void ResetDocumentLWTheme() = 0;
};
NS_DEFINE_STATIC_IID_ACCESSOR(nsIXULDocument, NS_IXULDOCUMENT_IID)

Просмотреть файл

@ -40,7 +40,6 @@
#include "nsIURL.h"
#include "nsViewManager.h"
#include "nsIWidget.h"
#include "nsIXULDocument.h"
#include "nsLayoutCID.h"
#include "nsContentCID.h"
#include "mozilla/dom/Event.h"
@ -1161,7 +1160,7 @@ nsXULElement::AfterSetAttr(int32_t aNamespaceID, nsAtom* aName,
} else if (aName == nsGkAtoms::lwtheme ||
aName == nsGkAtoms::lwthemetextcolor) {
// if the lwtheme changed, make sure to reset the document lwtheme cache
nsCOMPtr<nsIXULDocument> xuldoc = do_QueryInterface(document);
XULDocument* xuldoc = document->AsXULDocument();
if (xuldoc) {
xuldoc->ResetDocumentLWTheme();
UpdateBrightTitlebarForeground(document);
@ -1198,7 +1197,7 @@ nsXULElement::AfterSetAttr(int32_t aNamespaceID, nsAtom* aName,
} else if ((aName == nsGkAtoms::lwtheme ||
aName == nsGkAtoms::lwthemetextcolor)) {
// if the lwtheme changed, make sure to restyle appropriately
nsCOMPtr<nsIXULDocument> xuldoc = do_QueryInterface(doc);
XULDocument* xuldoc = doc->AsXULDocument();
if (xuldoc) {
xuldoc->ResetDocumentLWTheme();
UpdateBrightTitlebarForeground(doc);