diff --git a/extensions/layout-debug/Makefile.in b/extensions/layout-debug/Makefile.in index d5394bd4a8f..2ad69d246ea 100644 --- a/extensions/layout-debug/Makefile.in +++ b/extensions/layout-debug/Makefile.in @@ -26,7 +26,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS += public src idl +DIRS = src include $(topsrcdir)/config/rules.mk diff --git a/extensions/layout-debug/idl/Makefile.in b/extensions/layout-debug/idl/Makefile.in deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/extensions/layout-debug/idl/nsIFrameDebugObject.idl b/extensions/layout-debug/idl/nsIFrameDebugObject.idl deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/extensions/layout-debug/public/Makefile.in b/extensions/layout-debug/public/Makefile.in deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/extensions/layout-debug/public/nsLayoutDebugCIID.h b/extensions/layout-debug/public/nsLayoutDebugCIID.h deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/extensions/layout-debug/src/Makefile.in b/extensions/layout-debug/src/Makefile.in index 930ac585202..ec9b622e850 100644 --- a/extensions/layout-debug/src/Makefile.in +++ b/extensions/layout-debug/src/Makefile.in @@ -28,32 +28,39 @@ include $(DEPTH)/config/autoconf.mk MODULE = layout_debug LIBRARY_NAME = gkdebug -EXPORT_LIBRARY = 1 +EXPORT_LIBRARY = 1 IS_COMPONENT = 1 MODULE_NAME = nsLayoutDebugModule REQUIRES= xpcom \ - string \ - debugobject\ - windowwatcher\ - docshell\ - string \ - dom\ - gfx\ - content\ - necko\ - layout\ - widget \ - locale \ - view \ - pref \ - imglib2 \ - unicharutil \ - $(NULL) + string \ + windowwatcher\ + docshell\ + string \ + dom\ + gfx\ + content\ + necko\ + layout\ + widget \ + locale \ + view \ + pref \ + imglib2 \ + unicharutil \ + $(NULL) + +XPIDLSRCS = \ + nsILayoutRegressionTester.idl \ + $(NULL) + +EXPORTS = \ + nsLayoutDebugCIID.h \ + $(NULL) CPPSRCS = \ - nsDebugObject.cpp \ nsDebugFactory.cpp \ + nsRegressionTester.cpp \ $(NULL) EXTRA_DSO_LDOPTS = \ diff --git a/extensions/layout-debug/src/nsDebugFactory.cpp b/extensions/layout-debug/src/nsDebugFactory.cpp index ea6a2edafb9..0dfa2e01bca 100644 --- a/extensions/layout-debug/src/nsDebugFactory.cpp +++ b/extensions/layout-debug/src/nsDebugFactory.cpp @@ -40,21 +40,21 @@ #include "nsLayoutDebugCIID.h" #include "nsIFactory.h" #include "nsISupports.h" -#include "nsDebugObject.h" +#include "nsRegressionTester.h" #include "nsIGenericFactory.h" -NS_GENERIC_FACTORY_CONSTRUCTOR(nsDebugObject) +NS_GENERIC_FACTORY_CONSTRUCTOR(nsRegressionTester) static const nsModuleComponentInfo components[] = { - { "nsDebugObject", - NS_FRAME_DEBUG_OBJECT_CID, - "@mozilla.org/layout_debug/framedebugobject;1", - nsDebugObjectConstructor + { "nsRegressionTester", + NS_REGRESSION_TESTER_CID, + "@mozilla.org/layout_debug/regressiontester;1", + nsRegressionTesterConstructor } }; diff --git a/extensions/layout-debug/src/nsDebugObject.cpp b/extensions/layout-debug/src/nsDebugObject.cpp deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/extensions/layout-debug/src/nsDebugObject.h b/extensions/layout-debug/src/nsDebugObject.h deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/extensions/layout-debug/src/nsILayoutRegressionTester.idl b/extensions/layout-debug/src/nsILayoutRegressionTester.idl index 4eff5075737..881a9ef4954 100644 --- a/extensions/layout-debug/src/nsILayoutRegressionTester.idl +++ b/extensions/layout-debug/src/nsILayoutRegressionTester.idl @@ -44,7 +44,7 @@ interface nsIDOMWindow; interface nsILocalFile; [scriptable, uuid(1B4CD090-0531-11d6-A876-00105A183419)] -interface nsIFrameDebugObject : nsISupports +interface nsILayoutRegressionTester : nsISupports { /** diff --git a/extensions/layout-debug/src/nsLayoutDebugCIID.h b/extensions/layout-debug/src/nsLayoutDebugCIID.h index 928bc41bcd3..37f64b1cd83 100644 --- a/extensions/layout-debug/src/nsLayoutDebugCIID.h +++ b/extensions/layout-debug/src/nsLayoutDebugCIID.h @@ -43,7 +43,7 @@ #include "nsIFactory.h" #include "nsIComponentManager.h" -#define NS_FRAME_DEBUG_OBJECT_CID \ +#define NS_REGRESSION_TESTER_CID \ { 0x698c54f4, 0x4ea9, 0x11d7, \ { 0x85, 0x9f, 0x00, 0x03, 0x93, 0x63, 0x65, 0x92 } } diff --git a/extensions/layout-debug/src/nsRegressionTester.cpp b/extensions/layout-debug/src/nsRegressionTester.cpp index 8f418ed8026..b540e31d9a4 100644 --- a/extensions/layout-debug/src/nsRegressionTester.cpp +++ b/extensions/layout-debug/src/nsRegressionTester.cpp @@ -38,7 +38,7 @@ * ***** END LICENSE BLOCK ***** */ #include "nsISupports.h" -#include "nsDebugObject.h" +#include "nsRegressionTester.h" #include "nsXPIDLString.h" #include "nsReadableUtils.h" @@ -74,18 +74,18 @@ static NS_DEFINE_CID(kFrameUtilCID, NS_FRAME_UTIL_CID); static NS_DEFINE_CID(kLayoutDebuggerCID, NS_LAYOUT_DEBUGGER_CID); -nsDebugObject::nsDebugObject() +nsRegressionTester::nsRegressionTester() { } -nsDebugObject::~nsDebugObject() +nsRegressionTester::~nsRegressionTester() { } -NS_IMPL_ISUPPORTS1(nsDebugObject, nsIFrameDebugObject) +NS_IMPL_ISUPPORTS1(nsRegressionTester, nsILayoutRegressionTester) NS_IMETHODIMP -nsDebugObject::OutputTextToFile(nsILocalFile *aFile, PRBool aTruncateFile, const char *aOutputString) +nsRegressionTester::OutputTextToFile(nsILocalFile *aFile, PRBool aTruncateFile, const char *aOutputString) { NS_ENSURE_ARG(aOutputString); @@ -106,7 +106,7 @@ nsDebugObject::OutputTextToFile(nsILocalFile *aFile, PRBool aTruncateFile, const NS_IMETHODIMP -nsDebugObject::DumpFrameModel(nsIDOMWindow *aWindowToDump, nsILocalFile *aDestFile, PRUint32 aFlagsMask, PRInt32 *aResult) +nsRegressionTester::DumpFrameModel(nsIDOMWindow *aWindowToDump, nsILocalFile *aDestFile, PRUint32 aFlagsMask, PRInt32 *aResult) { NS_ENSURE_ARG(aWindowToDump); NS_ENSURE_ARG_POINTER(aResult); @@ -162,7 +162,7 @@ nsDebugObject::DumpFrameModel(nsIDOMWindow *aWindowToDump, nsILocalFile *aDestFi /* void dumpContent (in nsIDOMWindow aWindow, in nsILocalFile aDestFile); */ NS_IMETHODIMP -nsDebugObject::DumpContent(nsIDOMWindow *aWindow, nsILocalFile *aDestFile) +nsRegressionTester::DumpContent(nsIDOMWindow *aWindow, nsILocalFile *aDestFile) { NS_ENSURE_ARG(aWindow); @@ -187,7 +187,7 @@ nsDebugObject::DumpContent(nsIDOMWindow *aWindow, nsILocalFile *aDestFile) /* void dumpFrames (in nsIDOMWindow aWindow, in nsILocalFile aDestFile); */ NS_IMETHODIMP -nsDebugObject::DumpFrames(nsIDOMWindow *aWindow, nsILocalFile *aDestFile) +nsRegressionTester::DumpFrames(nsIDOMWindow *aWindow, nsILocalFile *aDestFile) { NS_ENSURE_ARG(aWindow); @@ -211,7 +211,7 @@ nsDebugObject::DumpFrames(nsIDOMWindow *aWindow, nsILocalFile *aDestFile) } NS_IMETHODIMP -nsDebugObject::DumpViews(nsIDOMWindow *aWindow, nsILocalFile *aDestFile) +nsRegressionTester::DumpViews(nsIDOMWindow *aWindow, nsILocalFile *aDestFile) { NS_ENSURE_ARG(aWindow); @@ -236,7 +236,7 @@ nsDebugObject::DumpViews(nsIDOMWindow *aWindow, nsILocalFile *aDestFile) /* void dumpWebShells (in nsIDOMWindow aWindow, in nsILocalFile aDestFile); */ NS_IMETHODIMP -nsDebugObject::DumpWebShells(nsIDOMWindow *aWindow, nsILocalFile *aDestFile) +nsRegressionTester::DumpWebShells(nsIDOMWindow *aWindow, nsILocalFile *aDestFile) { NS_ENSURE_ARG(aWindow); @@ -260,7 +260,7 @@ nsDebugObject::DumpWebShells(nsIDOMWindow *aWindow, nsILocalFile *aDestFile) } NS_IMETHODIMP -nsDebugObject::DumpStyleSheets(nsIDOMWindow *aWindow, nsILocalFile *aDestFile) +nsRegressionTester::DumpStyleSheets(nsIDOMWindow *aWindow, nsILocalFile *aDestFile) { NS_ENSURE_ARG(aWindow); @@ -288,7 +288,7 @@ nsDebugObject::DumpStyleSheets(nsIDOMWindow *aWindow, nsILocalFile *aDestFile) } NS_IMETHODIMP -nsDebugObject::DumpStyleContexts(nsIDOMWindow *aWindow, nsILocalFile *aDestFile) +nsRegressionTester::DumpStyleContexts(nsIDOMWindow *aWindow, nsILocalFile *aDestFile) { NS_ENSURE_ARG(aWindow); @@ -324,7 +324,7 @@ nsDebugObject::DumpStyleContexts(nsIDOMWindow *aWindow, nsILocalFile *aDestFile) /* void dumpReflowStats (in nsIDOMWindow aWindow, in nsILocalFile aDestFile); */ NS_IMETHODIMP -nsDebugObject::DumpReflowStats(nsIDOMWindow *aWindow, nsILocalFile* /* aDestFile */) +nsRegressionTester::DumpReflowStats(nsIDOMWindow *aWindow, nsILocalFile* /* aDestFile */) { NS_ENSURE_ARG(aWindow); @@ -344,7 +344,7 @@ nsDebugObject::DumpReflowStats(nsIDOMWindow *aWindow, nsILocalFile* /* aDestFile } NS_IMETHODIMP -nsDebugObject::CompareFrameModels(nsILocalFile *aBaseFile, nsILocalFile *aVerFile, PRUint32 aFlags, PRInt32 *aResult) +nsRegressionTester::CompareFrameModels(nsILocalFile *aBaseFile, nsILocalFile *aVerFile, PRUint32 aFlags, PRInt32 *aResult) { NS_ENSURE_ARG(aBaseFile); NS_ENSURE_ARG(aVerFile); @@ -378,7 +378,7 @@ nsDebugObject::CompareFrameModels(nsILocalFile *aBaseFile, nsILocalFile *aVerFil } NS_IMETHODIMP -nsDebugObject::GetShowFrameBorders(PRBool *aShowFrameBorders) +nsRegressionTester::GetShowFrameBorders(PRBool *aShowFrameBorders) { NS_ENSURE_ARG_POINTER(aShowFrameBorders); NS_ENSURE_SUCCESS(EnsureLayoutDebugger(), NS_ERROR_FAILURE); @@ -386,7 +386,7 @@ nsDebugObject::GetShowFrameBorders(PRBool *aShowFrameBorders) } NS_IMETHODIMP -nsDebugObject::SetShowFrameBorders(PRBool aShowFrameBorders) +nsRegressionTester::SetShowFrameBorders(PRBool aShowFrameBorders) { NS_ENSURE_SUCCESS(EnsureLayoutDebugger(), NS_ERROR_FAILURE); nsresult rv = mLayoutDebugger->SetShowFrameBorders(aShowFrameBorders); @@ -395,7 +395,7 @@ nsDebugObject::SetShowFrameBorders(PRBool aShowFrameBorders) } NS_IMETHODIMP -nsDebugObject::GetShowEventTargetFrameBorder(PRBool *aShowEventTargetFrameBorder) +nsRegressionTester::GetShowEventTargetFrameBorder(PRBool *aShowEventTargetFrameBorder) { NS_ENSURE_ARG_POINTER(aShowEventTargetFrameBorder); NS_ENSURE_SUCCESS(EnsureLayoutDebugger(), NS_ERROR_FAILURE); @@ -403,7 +403,7 @@ nsDebugObject::GetShowEventTargetFrameBorder(PRBool *aShowEventTargetFrameBorder } NS_IMETHODIMP -nsDebugObject::SetShowEventTargetFrameBorder(PRBool aShowEventTargetFrameBorder) +nsRegressionTester::SetShowEventTargetFrameBorder(PRBool aShowEventTargetFrameBorder) { NS_ENSURE_SUCCESS(EnsureLayoutDebugger(), NS_ERROR_FAILURE); nsresult rv = mLayoutDebugger->SetShowEventTargetFrameBorder(aShowEventTargetFrameBorder); @@ -412,7 +412,7 @@ nsDebugObject::SetShowEventTargetFrameBorder(PRBool aShowEventTargetFrameBorder) } NS_IMETHODIMP -nsDebugObject::SetShowReflowStats(nsIDOMWindow *aWindow, PRBool inShow) +nsRegressionTester::SetShowReflowStats(nsIDOMWindow *aWindow, PRBool inShow) { nsCOMPtr presShell; nsresult rv = GetPresShellFromWindow(aWindow, getter_AddRefs(presShell)); @@ -430,7 +430,7 @@ nsDebugObject::SetShowReflowStats(nsIDOMWindow *aWindow, PRBool inShow) } nsresult -nsDebugObject::EnsureLayoutDebugger() +nsRegressionTester::EnsureLayoutDebugger() { if (!mLayoutDebugger) { @@ -444,7 +444,7 @@ nsDebugObject::EnsureLayoutDebugger() } nsresult -nsDebugObject::RefreshAllWindows() +nsRegressionTester::RefreshAllWindows() { nsresult rv; // hack. Toggle the underline links pref to get stuff to redisplay @@ -464,7 +464,7 @@ nsDebugObject::RefreshAllWindows() nsresult -nsDebugObject::GetDocShellFromWindow(nsIDOMWindow* inWindow, nsIDocShell** outShell) +nsRegressionTester::GetDocShellFromWindow(nsIDOMWindow* inWindow, nsIDocShell** outShell) { nsCOMPtr scriptObj(do_QueryInterface(inWindow)); if (!scriptObj) return NS_ERROR_FAILURE; @@ -474,7 +474,7 @@ nsDebugObject::GetDocShellFromWindow(nsIDOMWindow* inWindow, nsIDocShell** outSh nsresult -nsDebugObject::GetPresShellFromWindow(nsIDOMWindow* inWindow, nsIPresShell** outShell) +nsRegressionTester::GetPresShellFromWindow(nsIDOMWindow* inWindow, nsIPresShell** outShell) { nsCOMPtr docShell; GetDocShellFromWindow(inWindow, getter_AddRefs(docShell)); @@ -492,7 +492,7 @@ nsDebugObject::GetPresShellFromWindow(nsIDOMWindow* inWindow, nsIPresShell** out #endif void -nsDebugObject::DumpMultipleWebShells(nsIDOMWindow* aWindow, FILE* aOut) +nsRegressionTester::DumpMultipleWebShells(nsIDOMWindow* aWindow, FILE* aOut) { nsCOMPtr docShell; GetDocShellFromWindow(aWindow, getter_AddRefs(docShell)); @@ -512,7 +512,7 @@ nsDebugObject::DumpMultipleWebShells(nsIDOMWindow* aWindow, FILE* aOut) void -nsDebugObject::DumpAWebShell(nsIDocShellTreeItem* aShellItem, FILE* aOut, PRInt32 aIndent) +nsRegressionTester::DumpAWebShell(nsIDocShellTreeItem* aShellItem, FILE* aOut, PRInt32 aIndent) { nsXPIDLString name; nsAutoString str; @@ -547,7 +547,7 @@ nsDebugObject::DumpAWebShell(nsIDocShellTreeItem* aShellItem, FILE* aOut, PRInt3 void -nsDebugObject::DumpContentRecurse(nsIDocShell* inDocShell, FILE* inDestFile) +nsRegressionTester::DumpContentRecurse(nsIDocShell* inDocShell, FILE* inDestFile) { if (inDocShell) { @@ -588,7 +588,7 @@ nsDebugObject::DumpContentRecurse(nsIDocShell* inDocShell, FILE* inDestFile) void -nsDebugObject::DumpFramesRecurse(nsIDocShell* aDocShell, FILE* inDestFile) +nsRegressionTester::DumpFramesRecurse(nsIDocShell* aDocShell, FILE* inDestFile) { if (aDocShell) { @@ -633,7 +633,7 @@ nsDebugObject::DumpFramesRecurse(nsIDocShell* aDocShell, FILE* inDestFile) void -nsDebugObject::DumpViewsRecurse(nsIDocShell* aDocShell, FILE* inDestFile) +nsRegressionTester::DumpViewsRecurse(nsIDocShell* aDocShell, FILE* inDestFile) { if (aDocShell) { diff --git a/extensions/layout-debug/src/nsRegressionTester.h b/extensions/layout-debug/src/nsRegressionTester.h index 524fc0a7c3e..d0e72770f23 100644 --- a/extensions/layout-debug/src/nsRegressionTester.h +++ b/extensions/layout-debug/src/nsRegressionTester.h @@ -19,12 +19,12 @@ * Contributor(s): */ -#ifndef nsDebugObject_h__ -#define nsDebugObject_h__ +#ifndef nsRegressionTester_h__ +#define nsRegressionTester_h__ #include "nsCOMPtr.h" -#include "nsIFrameDebugObject.h" +#include "nsILayoutRegressionTester.h" #include "nsILayoutDebugger.h" class nsIDOMWindow; @@ -33,16 +33,16 @@ class nsIDocShell; class nsIDocShellTreeItem; //***************************************************************************** -//*** nsDebugObject +//*** nsRegressionTester //***************************************************************************** -class nsDebugObject : public nsIFrameDebugObject +class nsRegressionTester : public nsILayoutRegressionTester { public: NS_DECL_ISUPPORTS - NS_DECL_NSIFRAMEDEBUGOBJECT + NS_DECL_NSILAYOUTREGRESSIONTESTER - nsDebugObject(); - virtual ~nsDebugObject(); + nsRegressionTester(); + virtual ~nsRegressionTester(); protected: @@ -66,4 +66,4 @@ protected: -#endif /* nsDebugObject_h__ */ +#endif /* nsRegressionTester_h__ */ diff --git a/layout/tools/tests/content_dumping.html b/layout/tools/tests/content_dumping.html index 3858e17e0c7..da6f6356871 100644 --- a/layout/tools/tests/content_dumping.html +++ b/layout/tools/tests/content_dumping.html @@ -7,54 +7,54 @@ diff --git a/layout/tools/tests/debug_utils.html b/layout/tools/tests/debug_utils.html index 0fed4104be6..75cb635f7b7 100644 --- a/layout/tools/tests/debug_utils.html +++ b/layout/tools/tests/debug_utils.html @@ -6,54 +6,54 @@