Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 03:15:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset 27ceedad1d1c (bug 976605)

Browse Source
This commit is contained in:
Ed Morley 2014-04-15 17:45:24 +01:00
parent 8c932681e3
commit 5e0030630f
5 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
layout/build/nsLayoutModule.cpp
View File

@ -1084,7 +1084,7 @@ static const mozilla::Module::ContractIDEntry kLayoutContracts[] = {
{ "@mozilla.org/inspector/deep-tree-walker;1", &kIN_DEEPTREEWALKER_CID },
{ "@mozilla.org/inspector/flasher;1", &kIN_FLASHER_CID },
{ "@mozilla.org/inspector/search;1?type=cssvalue", &kIN_CSSVALUESEARCH_CID },
{ IN_DOMUTILS_CONTRACTID, &kIN_DOMUTILS_CID },
{ "@mozilla.org/inspector/dom-utils;1", &kIN_DOMUTILS_CID },
{ "@mozilla.org/xml/xml-document;1", &kNS_XMLDOCUMENT_CID },
{ "@mozilla.org/svg/svg-document;1", &kNS_SVGDOCUMENT_CID },
{ NS_DOMMULTIPARTBLOB_CONTRACTID, &kNS_DOMMULTIPARTBLOB_CID },

7
layout/inspector/inDOMView.cpp
View File

@ -24,7 +24,6 @@
#include "nsITreeColumns.h"
#include "nsITreeBoxObject.h"
#include "mozilla/dom/Element.h"
#include "mozilla/Services.h"
#ifdef ACCESSIBILITY
#include "nsIAccessible.h"
@ -791,7 +790,7 @@ inDOMView::ContentInserted(nsIDocument *aDocument, nsIContent* aContainer,
nsCOMPtr<nsIDOMNode> childDOMNode(do_QueryInterface(aChild));
nsCOMPtr<nsIDOMNode> parent;
if (!mDOMUtils) {
mDOMUtils = services::GetInDOMUtils();
mDOMUtils = do_GetService("@mozilla.org/inspector/dom-utils;1");
if (!mDOMUtils) {
return;
}
@ -1190,7 +1189,7 @@ inDOMView::GetChildNodesFor(nsIDOMNode* aNode, nsCOMArray<nsIDOMNode>& aResult)
if (mWhatToShow & nsIDOMNodeFilter::SHOW_ELEMENT) {
nsCOMPtr<nsIDOMNodeList> kids;
if (!mDOMUtils) {
mDOMUtils = services::GetInDOMUtils();
mDOMUtils = do_GetService("@mozilla.org/inspector/dom-utils;1");
if (!mDOMUtils) {
return NS_ERROR_FAILURE;
}
@ -1235,7 +1234,7 @@ inDOMView::AppendKidsToArray(nsIDOMNodeList* aKids,
// Try and get DOM Utils in case we don't have one yet.
if (!mShowWhitespaceNodes && !mDOMUtils) {
mDOMUtils = services::GetInDOMUtils();
mDOMUtils = do_CreateInstance("@mozilla.org/inspector/dom-utils;1");
}
for (uint32_t i = 0; i < l; ++i) {

4
layout/inspector/inIDOMUtils.idl
View File

@ -104,7 +104,3 @@ interface inIDOMUtils : nsISupports
*/
void parseStyleSheet(in nsIDOMCSSStyleSheet aSheet, in DOMString aInput);
};
%{ C++
#define IN_DOMUTILS_CONTRACTID "@mozilla.org/inspector/dom-utils;1"
%}

1
xpcom/build/ServiceList.h
View File

@ -14,7 +14,6 @@ MOZ_SERVICE(IOService, nsIIOService, "@mozilla.org/network/io-service;1")
MOZ_SERVICE(ObserverService, nsIObserverService, "@mozilla.org/observer-service;1")
MOZ_SERVICE(StringBundleService, nsIStringBundleService, "@mozilla.org/intl/stringbundle;1")
MOZ_SERVICE(XPConnect, nsIXPConnect, "@mozilla.org/js/xpc/XPConnect;1")
MOZ_SERVICE(InDOMUtils, inIDOMUtils, "@mozilla.org/inspector/dom-utils;1")
#ifdef MOZ_USE_NAMESPACE
namespace mozilla

1
xpcom/build/Services.cpp
View File

@ -20,7 +20,6 @@
#include "nsIXULOverlayProvider.h"
#include "IHistory.h"
#include "nsIXPConnect.h"
#include "inIDOMUtils.h"
using namespace mozilla;
using namespace mozilla::services;