From a712178611ae704003ec93ae838aed65abe79442 Mon Sep 17 00:00:00 2001 From: "hewitt%netscape.com" Date: Tue, 17 Jul 2001 09:34:46 +0000 Subject: [PATCH] 84230 - DOM Inspector revival, rs=hyatt git-svn-id: svn://10.0.0.236/trunk@99401 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/extensions/inspector/base/src/inBitmap.h | 2 +- .../inspector/base/src/inBitmapChannel.cpp | 1 - .../extensions/inspector/base/src/inBitmapDepot.h | 2 +- .../extensions/inspector/base/src/inBitmapURI.cpp | 1 - .../inspector/base/src/inCSSValueSearch.h | 13 +++++-------- .../extensions/inspector/base/src/inDOMDataSource.h | 1 - .../inspector/base/src/inDOMRDFResource.h | 4 +--- mozilla/extensions/inspector/base/src/inDOMUtils.h | 10 ++++------ .../inspector/base/src/inDeepTreeWalker.cpp | 2 +- .../inspector/base/src/inDeepTreeWalker.h | 2 +- .../extensions/inspector/base/src/inFileSearch.cpp | 5 +++-- .../extensions/inspector/base/src/inFileSearch.h | 4 ++-- mozilla/extensions/inspector/base/src/inFlasher.cpp | 2 +- mozilla/extensions/inspector/base/src/inFlasher.h | 10 ++++------ .../extensions/inspector/base/src/inLayoutUtils.cpp | 1 - .../extensions/inspector/base/src/inPNGEncoder.h | 2 +- .../extensions/inspector/base/src/inSearchLoop.h | 11 +++++------ mozilla/extensions/inspector/build/install.js | 2 +- .../inspector/resources/content/inspector.js | 2 +- .../inspector/resources/content/viewers/dom/dom.js | 7 ++++--- .../resources/content/viewers/jsObject/jsObject.js | 9 +++++++-- .../resources/content/viewers/jsObject/jsObject.xul | 1 - 22 files changed, 43 insertions(+), 51 deletions(-) diff --git a/mozilla/extensions/inspector/base/src/inBitmap.h b/mozilla/extensions/inspector/base/src/inBitmap.h index 88dde1a3e90..696975e833f 100644 --- a/mozilla/extensions/inspector/base/src/inBitmap.h +++ b/mozilla/extensions/inspector/base/src/inBitmap.h @@ -32,7 +32,7 @@ public: NS_DECL_INIBITMAP inBitmap(); - ~inBitmap(); + virtual ~inBitmap(); protected: PRUint32 mWidth; diff --git a/mozilla/extensions/inspector/base/src/inBitmapChannel.cpp b/mozilla/extensions/inspector/base/src/inBitmapChannel.cpp index 6b71372a451..cadeb2b689d 100644 --- a/mozilla/extensions/inspector/base/src/inBitmapChannel.cpp +++ b/mozilla/extensions/inspector/base/src/inBitmapChannel.cpp @@ -165,7 +165,6 @@ NS_IMETHODIMP inBitmapChannel::AsyncOpen(nsIStreamListener *aListener, nsISuppor wbuf[1] = h; buffer = (PRUint8*)(wbuf+2); - PRUint32 p = 0; for (PRUint32 i = 0; i < w*h; ++i) { buffer[0] = bitmapBuf[0]; buffer[1] = bitmapBuf[1]; diff --git a/mozilla/extensions/inspector/base/src/inBitmapDepot.h b/mozilla/extensions/inspector/base/src/inBitmapDepot.h index 1f23d01b86b..525f2815856 100644 --- a/mozilla/extensions/inspector/base/src/inBitmapDepot.h +++ b/mozilla/extensions/inspector/base/src/inBitmapDepot.h @@ -33,7 +33,7 @@ public: NS_DECL_INIBITMAPDEPOT inBitmapDepot(); - ~inBitmapDepot(); + virtual ~inBitmapDepot(); protected: nsSupportsHashtable mHash; diff --git a/mozilla/extensions/inspector/base/src/inBitmapURI.cpp b/mozilla/extensions/inspector/base/src/inBitmapURI.cpp index b5d97dcdecb..8f60e69780c 100644 --- a/mozilla/extensions/inspector/base/src/inBitmapURI.cpp +++ b/mozilla/extensions/inspector/base/src/inBitmapURI.cpp @@ -61,7 +61,6 @@ inBitmapURI::GetBitmapName(PRUnichar** aBitmapName) nsresult inBitmapURI::FormatSpec(char* *result) { - nsresult rv = NS_OK; nsCString spec(NS_BITMAP_SCHEME); spec += "//"; diff --git a/mozilla/extensions/inspector/base/src/inCSSValueSearch.h b/mozilla/extensions/inspector/base/src/inCSSValueSearch.h index f57047bbdf5..896d1c5684f 100644 --- a/mozilla/extensions/inspector/base/src/inCSSValueSearch.h +++ b/mozilla/extensions/inspector/base/src/inCSSValueSearch.h @@ -39,8 +39,12 @@ class inCSSValueSearch : public inICSSValueSearch { public: + NS_DECL_ISUPPORTS + NS_DECL_INISEARCHPROCESS + NS_DECL_INICSSVALUESEARCH + inCSSValueSearch(); - ~inCSSValueSearch(); + virtual ~inCSSValueSearch(); protected: PRBool mIsActive; @@ -64,13 +68,6 @@ protected: nsresult SearchStyleRule(nsIStyleRule* aStyleRule); nsresult SearchStyleValue(nsICSSDeclaration* aDec, nsCSSProperty aProp); nsresult EqualizeURL(nsAutoString* aURL); - -public: - NS_DECL_ISUPPORTS - - NS_DECL_INISEARCHPROCESS - - NS_DECL_INICSSVALUESEARCH }; #endif // __inCSSValueSearch_h__ diff --git a/mozilla/extensions/inspector/base/src/inDOMDataSource.h b/mozilla/extensions/inspector/base/src/inDOMDataSource.h index a7fe4dbdac3..164df8cee72 100644 --- a/mozilla/extensions/inspector/base/src/inDOMDataSource.h +++ b/mozilla/extensions/inspector/base/src/inDOMDataSource.h @@ -102,7 +102,6 @@ public: protected: - nsCOMPtr kINS_DOMRoot; nsCOMPtr kINS_Child; nsCOMPtr kINS_Attribute; diff --git a/mozilla/extensions/inspector/base/src/inDOMRDFResource.h b/mozilla/extensions/inspector/base/src/inDOMRDFResource.h index 2e90ce4c183..d6daa7ab32e 100644 --- a/mozilla/extensions/inspector/base/src/inDOMRDFResource.h +++ b/mozilla/extensions/inspector/base/src/inDOMRDFResource.h @@ -54,15 +54,13 @@ public: NS_DECL_ISUPPORTS_INHERITED NS_DECL_INIDOMRDFRESOURCE -public: inDOMRDFResource(); virtual ~inDOMRDFResource(); static NS_METHOD Create(nsISupports* aOuter, const nsIID& iid, void **result); -private: +protected: nsCOMPtr mObject; - }; #endif // __inDOMRDFResource_h__ diff --git a/mozilla/extensions/inspector/base/src/inDOMUtils.h b/mozilla/extensions/inspector/base/src/inDOMUtils.h index 6dbe44c2c4e..8ac1e32d3cf 100644 --- a/mozilla/extensions/inspector/base/src/inDOMUtils.h +++ b/mozilla/extensions/inspector/base/src/inDOMUtils.h @@ -30,15 +30,13 @@ class inDOMUtils : public inIDOMUtils { -public: - inDOMUtils(); - ~inDOMUtils(); - -protected: - public: NS_DECL_ISUPPORTS NS_DECL_INIDOMUTILS + + inDOMUtils(); + virtual ~inDOMUtils(); + }; #endif // __inDOMUtils_h__ diff --git a/mozilla/extensions/inspector/base/src/inDeepTreeWalker.cpp b/mozilla/extensions/inspector/base/src/inDeepTreeWalker.cpp index eb4e14a2922..a4bd6dd877d 100644 --- a/mozilla/extensions/inspector/base/src/inDeepTreeWalker.cpp +++ b/mozilla/extensions/inspector/base/src/inDeepTreeWalker.cpp @@ -342,4 +342,4 @@ char* getURL(nsIDOMDocument* aDoc) uri->GetSpec(&s); return s; } -*/ \ No newline at end of file +*/ diff --git a/mozilla/extensions/inspector/base/src/inDeepTreeWalker.h b/mozilla/extensions/inspector/base/src/inDeepTreeWalker.h index b6493008a25..e0bdced1399 100644 --- a/mozilla/extensions/inspector/base/src/inDeepTreeWalker.h +++ b/mozilla/extensions/inspector/base/src/inDeepTreeWalker.h @@ -37,7 +37,7 @@ public: NS_DECL_INIDEEPTREEWALKER inDeepTreeWalker(); - ~inDeepTreeWalker(); + virtual ~inDeepTreeWalker(); protected: void PushNode(nsIDOMNode* aNode); diff --git a/mozilla/extensions/inspector/base/src/inFileSearch.cpp b/mozilla/extensions/inspector/base/src/inFileSearch.cpp index cfcc05c2208..d969b8294ac 100644 --- a/mozilla/extensions/inspector/base/src/inFileSearch.cpp +++ b/mozilla/extensions/inspector/base/src/inFileSearch.cpp @@ -36,6 +36,8 @@ inFileSearch::inFileSearch() inFileSearch::~inFileSearch() { + delete mSearchLoop; + delete mTextCriteria; } NS_IMPL_ISUPPORTS2(inFileSearch, inISearchProcess, inIFileSearch); @@ -71,7 +73,6 @@ inFileSearch::SetHoldResults(PRBool aHoldResults) return NS_OK; } - NS_IMETHODIMP inFileSearch::SearchSync() { @@ -240,7 +241,7 @@ inFileSearch::SetFilenameCriteria(const PRUnichar* aFilenameCriteria) // second pass: split up at commas and insert into array idx = 0; - PRUint32 lastComma = -1; + PRInt32 lastComma = -1; PRUnichar* buf = new PRUnichar[257]; c = aFilenameCriteria; PRBool going = PR_TRUE; diff --git a/mozilla/extensions/inspector/base/src/inFileSearch.h b/mozilla/extensions/inspector/base/src/inFileSearch.h index 141b2cfda1a..fba39446223 100644 --- a/mozilla/extensions/inspector/base/src/inFileSearch.h +++ b/mozilla/extensions/inspector/base/src/inFileSearch.h @@ -40,13 +40,13 @@ public: NS_DECL_INIFILESEARCH inFileSearch(); - ~inFileSearch(); + virtual ~inFileSearch(); protected: // inISearchProcess related PRBool mIsActive; PRInt32 mResultCount; - nsIFile* mLastResult; + nsCOMPtr mLastResult; nsCOMPtr mResults; PRBool mHoldResults; nsAutoString* mBasePath; diff --git a/mozilla/extensions/inspector/base/src/inFlasher.cpp b/mozilla/extensions/inspector/base/src/inFlasher.cpp index 5e83e1a7cef..48d2734a641 100644 --- a/mozilla/extensions/inspector/base/src/inFlasher.cpp +++ b/mozilla/extensions/inspector/base/src/inFlasher.cpp @@ -108,7 +108,7 @@ inFlasher::DrawElementOutline(nsIDOMElement* aElement, const PRUnichar* aColor, nsAutoString colorStr; colorStr.Assign(aColor); nscolor color; - PRBool rv = NS_HexToRGB(colorStr, &color); + NS_HexToRGB(colorStr, &color); nsRect rect; frame->GetRect(rect); diff --git a/mozilla/extensions/inspector/base/src/inFlasher.h b/mozilla/extensions/inspector/base/src/inFlasher.h index 70832cf0b3d..7289fab764c 100644 --- a/mozilla/extensions/inspector/base/src/inFlasher.h +++ b/mozilla/extensions/inspector/base/src/inFlasher.h @@ -39,8 +39,11 @@ class inFlasher : public inIFlasher { public: + NS_DECL_ISUPPORTS + NS_DECL_INIFLASHER + inFlasher(); - ~inFlasher(); + virtual ~inFlasher(); protected: nsIFrame* GetFrameFor(nsIDOMElement* aElement, nsIPresShell* aShell); @@ -50,11 +53,6 @@ protected: PRUint32 aThickness, float aP2T, nsIRenderingContext* aRenderContext); NS_IMETHOD DrawLine(nscoord aX, nscoord aY, nscoord aLength, PRUint32 aThickness, PRBool aDir, PRBool aBounds, float aP2T, nsIRenderingContext* aRenderContext); - -public: - NS_DECL_ISUPPORTS - - NS_DECL_INIFLASHER }; #endif // __inFlasher_h__ diff --git a/mozilla/extensions/inspector/base/src/inLayoutUtils.cpp b/mozilla/extensions/inspector/base/src/inLayoutUtils.cpp index e9a48b2e9ee..c05046415d7 100644 --- a/mozilla/extensions/inspector/base/src/inLayoutUtils.cpp +++ b/mozilla/extensions/inspector/base/src/inLayoutUtils.cpp @@ -20,7 +20,6 @@ * Contributor(s): */ - #include "inLayoutUtils.h" #include "nsIDOMDocumentView.h" diff --git a/mozilla/extensions/inspector/base/src/inPNGEncoder.h b/mozilla/extensions/inspector/base/src/inPNGEncoder.h index 3ef36a8b0a0..2132ecefce4 100644 --- a/mozilla/extensions/inspector/base/src/inPNGEncoder.h +++ b/mozilla/extensions/inspector/base/src/inPNGEncoder.h @@ -35,7 +35,7 @@ public: NS_DECL_INIPNGENCODER inPNGEncoder(); - ~inPNGEncoder(); + virtual ~inPNGEncoder(); protected: diff --git a/mozilla/extensions/inspector/base/src/inSearchLoop.h b/mozilla/extensions/inspector/base/src/inSearchLoop.h index 7cbd95ad3d5..855225e5f01 100644 --- a/mozilla/extensions/inspector/base/src/inSearchLoop.h +++ b/mozilla/extensions/inspector/base/src/inSearchLoop.h @@ -30,17 +30,16 @@ class inSearchLoop { public: inSearchLoop(inISearchProcess* aSearchProcess); - ~inSearchLoop(); + virtual ~inSearchLoop(); -protected: - nsCOMPtr mTimer; - nsCOMPtr mSearchProcess; - -public: nsresult Start(); nsresult Step(); nsresult Stop(); static void TimerCallback(nsITimer *aTimer, void *aClosure); + +protected: + nsCOMPtr mTimer; + nsCOMPtr mSearchProcess; }; #endif diff --git a/mozilla/extensions/inspector/build/install.js b/mozilla/extensions/inspector/build/install.js index 3310b3231e0..ae213800d7d 100644 --- a/mozilla/extensions/inspector/build/install.js +++ b/mozilla/extensions/inspector/build/install.js @@ -22,7 +22,7 @@ var gVersion = "0.5"; -var err = initInstall("Document Inspector", "inspector", gVersion); +var err = initInstall("DOM Inspector", "inspector", gVersion); logComment("initInstall: " + err); var fProgram = getFolder("Program"); diff --git a/mozilla/extensions/inspector/resources/content/inspector.js b/mozilla/extensions/inspector/resources/content/inspector.js index 2cf74c6db31..4870c406938 100644 --- a/mozilla/extensions/inspector/resources/content/inspector.js +++ b/mozilla/extensions/inspector/resources/content/inspector.js @@ -459,7 +459,7 @@ InspectorApp.prototype = var js, fn, item; for (var i = 0; i < items.length; i++) { item = items[i]; - fn = item.isDisabled; + fn = "isDisabled" in item ? item.isDisabled : null; if (!fn) { js = item.getAttribute("isDisabled"); if (js) { diff --git a/mozilla/extensions/inspector/resources/content/viewers/dom/dom.js b/mozilla/extensions/inspector/resources/content/viewers/dom/dom.js index a84e2aa320e..97724a05769 100644 --- a/mozilla/extensions/inspector/resources/content/viewers/dom/dom.js +++ b/mozilla/extensions/inspector/resources/content/viewers/dom/dom.js @@ -459,8 +459,9 @@ DOMViewer.prototype = var walker = this.createDOMWalker(aEl); var line = []; var parent = aEl; + var index = null; while (parent) { - var index = this.getRowIndexFromNode(parent); + index = this.getRowIndexFromNode(parent); line.push(parent); if (index < 0) { // row for this node hasn't been created yet @@ -475,7 +476,7 @@ DOMViewer.prototype = // we've got all the ancestors, now open them // one-by-one from the top on down for (var i = line.length-1; i >= 0; i--) { - var index = this.getRowIndexFromNode(line[i]); + index = this.getRowIndexFromNode(line[i]); if (index < 0) return false; // can't find row, so stop trying to descend if ((aExpand || i > 0) && !view.isContainerOpen(index)) view.toggleOpenState(index); @@ -588,7 +589,7 @@ DOMViewer.prototype = get flasher() { - if (!this.mFlasher) { + if (!("mFlasher" in this)) { this.mFlasher = new Flasher(PrefUtils.getPref("inspector.blink.border-color"), PrefUtils.getPref("inspector.blink.border-width"), PrefUtils.getPref("inspector.blink.duration"), diff --git a/mozilla/extensions/inspector/resources/content/viewers/jsObject/jsObject.js b/mozilla/extensions/inspector/resources/content/viewers/jsObject/jsObject.js index fafd5b880e1..8c6bd251b16 100644 --- a/mozilla/extensions/inspector/resources/content/viewers/jsObject/jsObject.js +++ b/mozilla/extensions/inspector/resources/content/viewers/jsObject/jsObject.js @@ -34,6 +34,9 @@ var viewer; //////////// global constants //////////////////// +const kClipboardHelperCID = "@mozilla.org/widget/clipboardhelper;1"; +const kGlobalClipboard = Components.interfaces.nsIClipboard.kGlobalClipboard; + ////////////////////////////////////////////////// window.addEventListener("load", JSObjectViewer_initialize, false); @@ -107,8 +110,10 @@ JSObjectViewer.prototype = var sels = this.mTree.selectedItems; if (sels.length > 0) { var val = sels[0].__JSValue__; - if (val) - ClipboardUtils.writeString(val.toString()); + if (val) { + var helper = XPCU.getService(kClipboardHelperCID, "nsIClipboardHelper"); + helper.copyStringToClipboard(val, kGlobalClipboard); + } } }, diff --git a/mozilla/extensions/inspector/resources/content/viewers/jsObject/jsObject.xul b/mozilla/extensions/inspector/resources/content/viewers/jsObject/jsObject.xul index cc9ed4e97ce..2300411b987 100644 --- a/mozilla/extensions/inspector/resources/content/viewers/jsObject/jsObject.xul +++ b/mozilla/extensions/inspector/resources/content/viewers/jsObject/jsObject.xul @@ -14,7 +14,6 @@