зеркало из https://github.com/mozilla/pjs.git
Move webbrowserpersist code to components/ directory. b=106554 r=brade@netscape.com sr=sfraser@netscape.com
This commit is contained in:
locka%iol.ie
Родитель
67813a84f8
Коммит
2bafd807d9
|
|
@ -57,6 +57,7 @@ REQUIRES = \
|
|||
embed_base \
|
||||
necko \
|
||||
windowwatcher \
|
||||
webbrowserpersist \
|
||||
$(NULL)
|
||||
|
||||
MAKE_OBJ_TYPE = DLL
|
||||
|
|
|
|||
|
|
@ -37,6 +37,7 @@ REQUIRES = xpcom \
|
|||
gfx \
|
||||
content \
|
||||
mimetype \
|
||||
webbrowserpersist \
|
||||
$(NULL)
|
||||
|
||||
include <$(DEPTH)\config\config.mak>
|
||||
|
|
|
|||
|
|
@ -27,7 +27,6 @@
|
|||
#include "nsXPIDLString.h"
|
||||
|
||||
#include "nsWebBrowser.h"
|
||||
#include "nsWebBrowserPersist.h"
|
||||
#include "nsCommandHandler.h"
|
||||
#include "nsWebBrowserContentPolicy.h"
|
||||
|
||||
|
|
@ -36,7 +35,6 @@
|
|||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsWebBrowser)
|
||||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsWebBrowserContentPolicy)
|
||||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsCommandHandler)
|
||||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsWebBrowserPersist)
|
||||
|
||||
static NS_METHOD
|
||||
RegisterContentPolicy(nsIComponentManager *aCompMgr, nsIFile *aPath,
|
||||
|
|
@ -73,8 +71,6 @@ UnregisterContentPolicy(nsIComponentManager *aCompMgr, nsIFile *aPath,
|
|||
|
||||
static nsModuleComponentInfo components[] =
|
||||
{
|
||||
{ "WebBrowserPersist Component", NS_WEBBROWSERPERSIST_CID,
|
||||
NS_WEBBROWSERPERSIST_CONTRACTID, nsWebBrowserPersistConstructor },
|
||||
{ "WebBrowser Component", NS_WEBBROWSER_CID,
|
||||
NS_WEBBROWSER_CONTRACTID, nsWebBrowserConstructor },
|
||||
{ "CommandHandler Component", NS_COMMANDHANDLER_CID,
|
||||
|
|
|
|||
|
|
@ -26,7 +26,6 @@ nsIWebBrowserChrome.idl
|
|||
nsIWebBrowserChromeFocus.idl
|
||||
nsIWebBrowserSetup.idl
|
||||
nsIEmbeddingSiteWindow.idl
|
||||
nsIWebBrowserPersist.idl
|
||||
nsIWebBrowserFocus.idl
|
||||
nsIWebBrowserPrint.idl
|
||||
nsITooltipListener.idl
|
||||
|
|
|
|||
|
|
@ -32,8 +32,6 @@ REQUIRES = xpcom \
|
|||
uriloader \
|
||||
shistory \
|
||||
webshell \
|
||||
mimetype \
|
||||
exthandler \
|
||||
timer \
|
||||
windowwatcher \
|
||||
wallet \
|
||||
|
|
@ -41,6 +39,7 @@ REQUIRES = xpcom \
|
|||
gfx \
|
||||
content \
|
||||
history \
|
||||
webbrowserpersist \
|
||||
$(NULL)
|
||||
|
||||
EXPORTS = \
|
||||
|
|
@ -57,7 +56,6 @@ XPIDLSRCS= \
|
|||
.\nsIWebBrowserChromeFocus.idl \
|
||||
.\nsICommandHandler.idl \
|
||||
.\nsIWebBrowserSetup.idl \
|
||||
.\nsIWebBrowserPersist.idl \
|
||||
.\nsIEmbeddingSiteWindow.idl \
|
||||
.\nsIWebBrowserFocus.idl \
|
||||
.\nsIWebBrowserPrint.idl \
|
||||
|
|
@ -69,8 +67,6 @@ CPP_OBJS= \
|
|||
.\$(OBJDIR)\nsDocShellTreeOwner.obj \
|
||||
.\$(OBJDIR)\nsWebBrowser.obj \
|
||||
.\$(OBJDIR)\nsCommandHandler.obj \
|
||||
.\$(OBJDIR)\nsWebBrowserPersist.obj \
|
||||
.\$(OBJDIR)\nsDOMWalker.obj \
|
||||
.\$(OBJDIR)\nsNonPersistAuthPrompt.obj \
|
||||
.\$(OBJDIR)\nsWebBrowserContentPolicy.obj \
|
||||
$(NULL)
|
||||
|
|
|
|||
|
|
@ -51,10 +51,4 @@ nsIInterfaceRequestor
|
|||
{ 0xf1eac761, 0x87e9, 0x11d3, { 0xaf, 0x80, 0x00, 0xa0, 0x24, 0xff, 0xc0, 0x8c } }
|
||||
#define NS_WEBBROWSER_CONTRACTID \
|
||||
"@mozilla.org/embedding/browser/nsWebBrowser;1"
|
||||
|
||||
// {7E677795-C582-4cd1-9E8D-8271B3474D2A}
|
||||
#define NS_WEBBROWSERPERSIST_CID \
|
||||
{ 0x7e677795, 0xc582, 0x4cd1, { 0x9e, 0x8d, 0x82, 0x71, 0xb3, 0x47, 0x4d, 0x2a } }
|
||||
#define NS_WEBBROWSERPERSIST_CONTRACTID \
|
||||
"@mozilla.org/embedding/browser/nsWebBrowserPersist;1"
|
||||
%}
|
||||
|
|
|
|||
|
|
@ -107,7 +107,6 @@ interface nsIWebBrowserChrome : nsISupports
|
|||
nsIWebBrowser createBrowserWindow(in unsigned long chromeFlags,
|
||||
in long aX, in long aY, in long aCX, in long aCY);
|
||||
|
||||
|
||||
/*
|
||||
Asks the implementer to destroy the window associated with this
|
||||
webbrowser object.
|
||||
|
|
|
|||
|
|
@ -22,7 +22,6 @@
|
|||
|
||||
// Local Includes
|
||||
#include "nsWebBrowser.h"
|
||||
#include "nsWebBrowserPersist.h"
|
||||
|
||||
// Helper Classes
|
||||
#include "nsGfxCIID.h"
|
||||
|
|
@ -51,6 +50,9 @@
|
|||
#include "nsIURIContentListener.h"
|
||||
#include "nsGUIEvent.h"
|
||||
#include "nsISHistoryListener.h"
|
||||
#include "nsIURI.h"
|
||||
#include "nsIWebBrowserPersist.h"
|
||||
#include "nsCWebBrowserPersist.h"
|
||||
|
||||
// for painting the background window
|
||||
#include "nsIRenderingContext.h"
|
||||
|
|
@ -72,6 +74,7 @@ static NS_DEFINE_CID(kWebShellCID, NS_WEB_SHELL_CID);
|
|||
static NS_DEFINE_CID(kChildCID, NS_CHILD_CID);
|
||||
static NS_DEFINE_CID(kLookAndFeelCID, NS_LOOKANDFEEL_CID);
|
||||
|
||||
|
||||
//*****************************************************************************
|
||||
//*** nsWebBrowser: Object Management
|
||||
//*****************************************************************************
|
||||
|
|
@ -884,12 +887,13 @@ NS_IMETHODIMP nsWebBrowser::SaveURI(nsIURI *aURI, nsIInputStream *aPostData, nsI
|
|||
}
|
||||
|
||||
// Create a throwaway persistence object to do the work
|
||||
nsWebBrowserPersist *persist = new nsWebBrowserPersist();
|
||||
mPersist = do_QueryInterface(NS_STATIC_CAST(nsIWebBrowserPersist *, persist));
|
||||
nsresult rv;
|
||||
mPersist = do_CreateInstance(NS_WEBBROWSERPERSIST_CONTRACTID, &rv);
|
||||
NS_ENSURE_SUCCESS(rv, NS_ERROR_FAILURE);
|
||||
mPersist->SetProgressListener(this);
|
||||
mPersist->SetPersistFlags(mPersistFlags);
|
||||
mPersist->GetCurrentState(&mPersistCurrentState);
|
||||
nsresult rv = mPersist->SaveURI(uri, aPostData, aFile);
|
||||
rv = mPersist->SaveURI(uri, aPostData, aFile);
|
||||
if (NS_FAILED(rv))
|
||||
{
|
||||
mPersist = nsnull;
|
||||
|
|
@ -933,12 +937,13 @@ NS_IMETHODIMP nsWebBrowser::SaveDocument(nsIDOMDocument *aDocument, nsILocalFile
|
|||
}
|
||||
|
||||
// Create a throwaway persistence object to do the work
|
||||
nsWebBrowserPersist *persist = new nsWebBrowserPersist();
|
||||
mPersist = do_QueryInterface(NS_STATIC_CAST(nsIWebBrowserPersist *, persist));
|
||||
nsresult rv;
|
||||
mPersist = do_CreateInstance(NS_WEBBROWSERPERSIST_CONTRACTID, &rv);
|
||||
NS_ENSURE_SUCCESS(rv, NS_ERROR_FAILURE);
|
||||
mPersist->SetProgressListener(this);
|
||||
mPersist->SetPersistFlags(mPersistFlags);
|
||||
mPersist->GetCurrentState(&mPersistCurrentState);
|
||||
nsresult rv = mPersist->SaveDocument(doc, aFile, aDataPath);
|
||||
rv = mPersist->SaveDocument(doc, aFile, aDataPath);
|
||||
if (NS_FAILED(rv))
|
||||
{
|
||||
mPersist = nsnull;
|
||||
|
|
|
|||
|
|
@ -25,12 +25,18 @@ REQUIRES = js \
|
|||
xpcom \
|
||||
string \
|
||||
windowwatcher \
|
||||
webbrowserpersist \
|
||||
jsconsole \
|
||||
find \
|
||||
embed_base \
|
||||
dom \
|
||||
txtsvc \
|
||||
mimetype \
|
||||
necko \
|
||||
content \
|
||||
uriloader \
|
||||
$(NULL)
|
||||
|
||||
include <$(DEPTH)\config\config.mak>
|
||||
|
||||
LIBRARY_NAME=embedcomponents
|
||||
|
|
@ -47,6 +53,7 @@ SUB_LIBRARIES = \
|
|||
$(DIST)\lib\jsconsole_s.lib \
|
||||
$(DIST)\lib\appstartupnotifier_s.lib \
|
||||
$(DIST)\lib\find_s.lib \
|
||||
$(DIST)\lib\webbrowserpersist_s.lib \
|
||||
$(NULL)
|
||||
|
||||
LLIBS = \
|
||||
|
|
@ -60,6 +67,7 @@ INCS = $(INCS) \
|
|||
-I$(DEPTH)\embedding\components\jsconsole\src \
|
||||
-I$(DEPTH)\embedding\components\appstartup\src \
|
||||
-I$(DEPTH)\embedding\components\find\src \
|
||||
-I$(DEPTH)\embedding\components\webbrowserpersist\src \
|
||||
$(NULL)
|
||||
|
||||
include <$(DEPTH)\config\rules.mak>
|
||||
|
|
|
|||
|
|
@ -43,6 +43,7 @@
|
|||
#include "nsAppStartupNotifier.h"
|
||||
#include "nsJSConsoleService.h"
|
||||
#include "nsWebBrowserFind.h"
|
||||
#include "nsWebBrowserPersist.h"
|
||||
|
||||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsDialogParamBlock)
|
||||
NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsPromptService, Init)
|
||||
|
|
@ -50,6 +51,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsWindowWatcher, Init)
|
|||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsAppStartupNotifier)
|
||||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsJSConsoleService)
|
||||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsWebBrowserFind)
|
||||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsWebBrowserPersist)
|
||||
|
||||
static nsModuleComponentInfo gComponents[] = {
|
||||
|
||||
|
|
@ -58,7 +60,8 @@ static nsModuleComponentInfo gComponents[] = {
|
|||
{ "JS Console Service", NS_JSCONSOLESERVICE_CID, NS_JSCONSOLESERVICE_CONTRACTID, nsJSConsoleServiceConstructor },
|
||||
{ "Window Watcher", NS_WINDOWWATCHER_CID, NS_WINDOWWATCHER_CONTRACTID, nsWindowWatcherConstructor },
|
||||
{ "Find", NS_WEB_BROWSER_FIND_CID, NS_WEB_BROWSER_FIND_CONTRACTID, nsWebBrowserFindConstructor },
|
||||
{ NS_APPSTARTUPNOTIFIER_CLASSNAME, NS_APPSTARTUPNOTIFIER_CID, NS_APPSTARTUPNOTIFIER_CONTRACTID, nsAppStartupNotifierConstructor }
|
||||
{ NS_APPSTARTUPNOTIFIER_CLASSNAME, NS_APPSTARTUPNOTIFIER_CID, NS_APPSTARTUPNOTIFIER_CONTRACTID, nsAppStartupNotifierConstructor },
|
||||
{ "WebBrowserPersist Component", NS_WEBBROWSERPERSIST_CID, NS_WEBBROWSERPERSIST_CONTRACTID, nsWebBrowserPersistConstructor }
|
||||
};
|
||||
|
||||
NS_IMPL_NSGETMODULE(embedcomponents, gComponents)
|
||||
|
|
|
|||
|
|
@ -26,6 +26,7 @@ DIRS= \
|
|||
find \
|
||||
jsconsole \
|
||||
ui \
|
||||
webbrowserpersist \
|
||||
build \
|
||||
$(NULL)
|
||||
|
||||
|
|
|
|||
|
|
@ -38,6 +38,7 @@ REQUIRES = \
|
|||
gfx \
|
||||
windowwatcher \
|
||||
layout \
|
||||
webbrowserpersist \
|
||||
$(NULL)
|
||||
|
||||
DIRS=components \
|
||||
|
|
|
|||
|
|
@ -39,6 +39,7 @@ REQUIRES = xpcom \
|
|||
layout \
|
||||
uriloader \
|
||||
shistory \
|
||||
webbrowserpersist \
|
||||
$(NULL)
|
||||
|
||||
PROGRAM = .\$(OBJDIR)\$(MODULE).exe
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче