From c17c0b671bf37d2057ada78ad24f06231eb7fab3 Mon Sep 17 00:00:00 2001 From: "dcone%netscape.com" Date: Mon, 6 May 2002 13:14:33 +0000 Subject: [PATCH] Updated the debug object. This is not part of the build yet. --- .../layout-debug/plugin/common/makefile.win | 44 ---------- extensions/layout-debug/plugin/makefile.win | 83 ------------------- extensions/layout-debug/plugin/plugin.cpp | 14 +++- extensions/layout-debug/plugin/test.html | 4 +- 4 files changed, 13 insertions(+), 132 deletions(-) diff --git a/extensions/layout-debug/plugin/common/makefile.win b/extensions/layout-debug/plugin/common/makefile.win index bbd8a2bb633..e69de29bb2d 100644 --- a/extensions/layout-debug/plugin/common/makefile.win +++ b/extensions/layout-debug/plugin/common/makefile.win @@ -1,44 +0,0 @@ -#!nmake -# -# The contents of this file are subject to the Netscape 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/NPL/ -# -# 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 Netscape are -# Copyright (C) 1998 Netscape Communications Corporation. All -# Rights Reserved. -# -# Contributor(s): - -DEPTH=..\..\..\..\..\.. -include <$(DEPTH)\config\config.mak> - -MAKE_OBJ_TYPE = LIB -LIBRARY_NAME = plugingate -LIB=.\$(OBJDIR)\$(LIBRARY_NAME).lib - -CFLAGS = $(CFLAGS) -I..\include -I..\..\include - -OBJS = \ - .\$(OBJDIR)\npn_gate.obj \ - .\$(OBJDIR)\npp_gate.obj \ - .\$(OBJDIR)\np_entry.obj \ - $(NULL) - -include <$(DEPTH)\config\rules.mak> - -# it will export the lib to the dist/lib dir, so do not forget to remove it -libs:: $(LIB) - $(RM) $(DIST)\lib\$(LIBRARY_NAME).lib - -clobber:: - $(RM) *.sbr diff --git a/extensions/layout-debug/plugin/makefile.win b/extensions/layout-debug/plugin/makefile.win index 56cc5f68dfd..e69de29bb2d 100644 --- a/extensions/layout-debug/plugin/makefile.win +++ b/extensions/layout-debug/plugin/makefile.win @@ -1,83 +0,0 @@ -#!nmake -# -# The contents of this file are subject to the Netscape 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/NPL/ -# -# 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 Netscape are -# Copyright (C) 1998 Netscape Communications Corporation. All -# Rights Reserved. -# -# Contributor(s): - -DEPTH=..\..\.. -MODULE = npdebug -REQUIRES= xpcom \ - dom \ - necko\ - string \ - widget \ - locale \ - view \ - pref \ - gfx2 \ - imglib2 \ - unicharutil \ - java \ - debug \ - $(NULL) - -include <$(DEPTH)\config\config.mak> - - - - -XPIDLSRCS = \ - .\nsIDebugPlugin.idl \ - $(NULL) - -MAKE_OBJ_TYPE = DLL -DLLNAME = npdebug -RESFILE = npdebug.res -DEFFILE = npdebug.def -DLL=.\$(OBJDIR)\$(DLLNAME).dll - -CFLAGS = $(CFLAGS) -I.\include - -OBJS = \ - .\$(OBJDIR)\plugin.obj \ - .\$(OBJDIR)\nsScriptablePeer.obj \ - $(NULL) - -LLIBS = \ - .\common\$(OBJDIR)\plugingate.lib \ - $(DIST)\lib\xpcom.lib \ - $(NULL) - -WIN_LIBS = version.lib - -include <$(DEPTH)\config\rules.mak> - -# don't forget to remove files exported by default -libs:: $(DLL) - $(RM) $(XPDIST)\idl\nsIDebugPlugin.idl - $(RM) $(XPDIST)\include\nsIDebugPlugin.h -# $(RM) $(DIST)\bin\components\$(DLLNAME).xpt - $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin\plugins - - -clobber:: - $(RM) *.sbr - $(RM) $(XPDIST)\idl\nsIDebugPlugin.idl - $(RM) $(XPDIST)\include\nsIDebugPlugin.h - $(RM) $(DIST)\bin\components\$(DLLNAME).xpt - $(RM) $(DIST)\bin\plugins\$(DLLNAME).dll diff --git a/extensions/layout-debug/plugin/plugin.cpp b/extensions/layout-debug/plugin/plugin.cpp index 4fbc9ef2146..d8e5dcf56af 100644 --- a/extensions/layout-debug/plugin/plugin.cpp +++ b/extensions/layout-debug/plugin/plugin.cpp @@ -45,6 +45,7 @@ #include "nsISimpleEnumerator.h" #include "nsMemory.h" #include "nsNetUtil.h" +#include "nsString.h" // service manager which will give the access to all public browser services // we will use memory service as an illustration @@ -198,7 +199,7 @@ nsXPIDLCString dirPath; nsresult rv; nsCOMPtr theDir = do_CreateInstance(NS_LOCAL_FILE_CONTRACTID); - rv = NS_InitFileFromURLSpec(theDir, aFilePath); + rv = NS_InitFileFromURLSpec(theDir, nsDependentCString(aFilePath)); if (NS_FAILED(rv)){ mIter = 0; @@ -236,13 +237,20 @@ char* URLName; break; nsXPIDLCString filePath; char* afilepath; - rv = dirEntry->GetPath(&afilepath); + nsCAutoString path; + + + rv = dirEntry->GetPath(path); if (NS_FAILED(rv)) continue; + afilepath = ToNewCString(path); + if( strstr(afilepath,".html") != 0 ) { *aDirName = afilepath; - NS_GetURLSpecFromFile(dirEntry,&URLName); + nsCAutoString urlname; + NS_GetURLSpecFromFile(dirEntry,urlname); + URLName = ToNewCString(urlname); *aDirName = URLName; break; } else { diff --git a/extensions/layout-debug/plugin/test.html b/extensions/layout-debug/plugin/test.html index 195c1908325..b4ea6eadfb8 100644 --- a/extensions/layout-debug/plugin/test.html +++ b/extensions/layout-debug/plugin/test.html @@ -36,8 +36,8 @@ function DumpFrames() alert(outputfilename); - //var thewindow = window.open(filetopen); - //embed.DumpLayout(thewindow,"s:/tests","filename"); + var thewindow = window.open(filetopen); + embed.DumpLayout(thewindow,"s:/tests","filename"); } while (filename!=null) }