Remove InspectorCSSUtils, part 4: Remove nsIInspectorCSSUtils and nsInspectorCSSUtils. (Bug 371655) r=bzbarsky

layout/build/nsLayoutModule.cpp

@@ -43,7 +43,6 @@
 #include "nsDataDocumentContentPolicy.h"
 #include "nsNoDataProtocolContentPolicy.h"
 #include "nsDOMCID.h"
-#include "nsInspectorCSSUtils.h"
 #include "nsHTMLContentSerializer.h"
 #include "nsHTMLParts.h"
 #include "nsGenericHTMLElement.h"
@@ -530,7 +529,6 @@ MAKE_CTOR(CreateXTFService,               nsIXTFService,               NS_NewXTF
 MAKE_CTOR(CreateXMLContentBuilder,        nsIXMLContentBuilder,        NS_NewXMLContentBuilder)
 #endif
 MAKE_CTOR(CreateContentDLF,               nsIDocumentLoaderFactory,    NS_NewContentDocumentLoaderFactory)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsInspectorCSSUtils)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsWyciwygProtocolHandler)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsContentAreaDragDrop)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsDataDocumentContentPolicy)
@@ -1053,11 +1051,6 @@ static const nsModuleComponentInfo gComponents[] = {
     "@mozilla.org/content/subtree-content-iterator;1",
     CreateSubtreeIterator },
 
-  { "Inspector CSS Utils",
-    NS_INSPECTORCSSUTILS_CID,
-    nsnull,
-    nsInspectorCSSUtilsConstructor },
-
   // Needed to support "new Option;", "new Image;" and "new Audio;" in JavaScript
   { "HTML img element",
     NS_HTMLIMAGEELEMENT_CID,

layout/inspector/src/inCSSValueSearch.cpp

@@ -53,8 +53,6 @@
 #include "nsIURI.h"
 #include "nsNetUtil.h"
 
-static NS_DEFINE_CID(kInspectorCSSUtilsCID, NS_INSPECTORCSSUTILS_CID);
-
 ///////////////////////////////////////////////////////////////////////////////
 inCSSValueSearch::inCSSValueSearch()
   : mResults(nsnull),
@@ -68,7 +66,6 @@ inCSSValueSearch::inCSSValueSearch()
 {
   nsCSSProps::AddRefTable();
   mProperties = new nsCSSProperty[100];
-  mCSSUtils = do_GetService(kInspectorCSSUtilsCID);
 }
 
 inCSSValueSearch::~inCSSValueSearch()

layout/inspector/src/inCSSValueSearch.h

@@ -46,7 +46,6 @@
 #include "inISearchObserver.h"
 #include "nsTArray.h"
 #include "nsCSSProps.h"
-#include "nsIInspectorCSSUtils.h"
 
 class nsIDOMCSSStyleSheet;
 class nsIDOMCSSRuleList;
@@ -65,7 +64,6 @@ public:
 
 protected:
   nsCOMPtr<inISearchObserver> mObserver;
-  nsCOMPtr<nsIInspectorCSSUtils> mCSSUtils;
   nsCOMPtr<nsIDOMDocument> mDocument;
   nsTArray<nsAutoString *>* mResults;
   nsCSSProperty* mProperties;

layout/inspector/src/inDOMUtils.cpp

@@ -58,13 +58,10 @@
 #include "nsBindingManager.h"
 #include "nsComputedDOMStyle.h"
 
-static NS_DEFINE_CID(kInspectorCSSUtilsCID, NS_INSPECTORCSSUTILS_CID);
-
 ///////////////////////////////////////////////////////////////////////////////
 
 inDOMUtils::inDOMUtils()
 {
-  mCSSUtils = do_GetService(kInspectorCSSUtilsCID);
 }
 
 inDOMUtils::~inDOMUtils()

layout/inspector/src/inDOMUtils.h

@@ -42,7 +42,6 @@
 
 #include "nsIEventStateManager.h"
 #include "nsISupportsArray.h"
-#include "nsIInspectorCSSUtils.h"
 
 class nsRuleNode;
 
@@ -56,8 +55,6 @@ public:
   virtual ~inDOMUtils();
 
 private:
-  nsCOMPtr<nsIInspectorCSSUtils> mCSSUtils;
-
   static nsresult GetRuleNodeForContent(nsIContent* aContent,
                                         nsRuleNode** aRuleNode);
 };

layout/inspector/src/inFlasher.cpp

@@ -46,8 +46,6 @@
 
 #include "prprf.h"
 
-static NS_DEFINE_CID(kInspectorCSSUtilsCID, NS_INSPECTORCSSUTILS_CID);
-
 ///////////////////////////////////////////////////////////////////////////////
 
 inFlasher::inFlasher() :

layout/inspector/src/inFlasher.h

@@ -40,7 +40,6 @@
 
 #include "inIFlasher.h"
 
-#include "nsIInspectorCSSUtils.h"
 #include "nsIDOMElement.h"
 #include "nsIRenderingContext.h"
 

layout/style/Makefile.in

@@ -107,7 +107,6 @@ EXPORTS		= \
 		nsICSSStyleRuleDOMWrapper.h \
 		nsICSSStyleSheet.h \
 		nsIHTMLCSSStyleSheet.h \
-		nsIInspectorCSSUtils.h \
 		nsIStyleRule.h \
 		nsIStyleRuleProcessor.h \
 		nsIStyleSheet.h \
@@ -154,7 +153,6 @@ CPPSRCS		= \
 		nsFontFaceLoader.cpp \
 		nsHTMLCSSStyleSheet.cpp \
 		nsHTMLStyleSheet.cpp \
-		nsInspectorCSSUtils.cpp \
 		nsLayoutStylesheetCache.cpp \
 		nsMediaFeatures.cpp \
 		nsROCSSPrimitiveValue.cpp \

layout/style/nsIInspectorCSSUtils.h

@@ -1,72 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-// vim:cindent:ts=8:et:sw=4:
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2002
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   L. David Baron <dbaron@dbaron.org> (original author)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* XPCOM interface to provide some internal information to DOM inspector */
-
-#ifndef nsIInspectorCSSUtils_h___
-#define nsIInspectorCSSUtils_h___
-
-#include "nsISupports.h"
-#include "nsCSSProps.h"
-class nsRuleNode;
-class nsIStyleRule;
-class nsIFrame;
-struct nsRect;
-class nsIContent;
-class nsIDOMElement;
-class nsIArray;
-
-// afb608b5-96ac-440e-a203-52cac9f188e1
-#define NS_IINSPECTORCSSUTILS_IID \
-  { 0xafb608b5, 0x96ac, 0x440e, \
-    { 0xa2, 0x03, 0x52, 0xca, 0xc9, 0xf1, 0x88, 0xe1 } }
-
-// 7ef2f07f-6e34-410b-8336-88acd1cd16b7
-#define NS_INSPECTORCSSUTILS_CID \
-  { 0x7ef2f07f, 0x6e34, 0x410b, \
-    {0x83, 0x36, 0x88, 0xac, 0xd1, 0xcd, 0x16, 0xb7 } }
-
-class nsIInspectorCSSUtils : public nsISupports {
-public:
-    NS_DECLARE_STATIC_IID_ACCESSOR(NS_IINSPECTORCSSUTILS_IID)
-};
-
-NS_DEFINE_STATIC_IID_ACCESSOR(nsIInspectorCSSUtils, NS_IINSPECTORCSSUTILS_IID)
-
-#endif /* nsIInspectorCSSUtils_h___ */

layout/style/nsInspectorCSSUtils.cpp

@@ -1,52 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-// vim:cindent:ts=8:et:sw=4:
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2002
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   L. David Baron <dbaron@dbaron.org> (original author)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* XPCOM interface to provide some internal information to DOM inspector */
-
-#include "nsInspectorCSSUtils.h"
-
-nsInspectorCSSUtils::nsInspectorCSSUtils()
-{
-}
-
-nsInspectorCSSUtils::~nsInspectorCSSUtils()
-{
-}
-
-NS_IMPL_ISUPPORTS1(nsInspectorCSSUtils, nsIInspectorCSSUtils)

layout/style/nsInspectorCSSUtils.h

@@ -1,58 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-// vim:cindent:ts=8:et:sw=4:
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2002
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   L. David Baron <dbaron@dbaron.org> (original author)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* XPCOM interface to provide some internal information to DOM inspector */
-
-#ifndef nsInspectorCSSUtils_h___
-#define nsInspectorCSSUtils_h___
-
-#include "nsIInspectorCSSUtils.h"
-
-class nsInspectorCSSUtils : public nsIInspectorCSSUtils {
-
-public:
-
-    nsInspectorCSSUtils();
-    virtual ~nsInspectorCSSUtils();
-
-    NS_DECL_ISUPPORTS
-
-};
-
-#endif /* nsInspectorCSSUtils_h___ */