Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

96364 - Register html tag observers directly to parser service rather than nsObserverService. Doing so, reduces a lot of overhead. Also, the observers are now notified via sink. This eliminates the need for parser bundle.

Browse Source 
r=dp,shanjian,sfraser, sr=rpotts.


git-svn-id: svn://10.0.0.236/trunk@104152 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
harishd%netscape.com
2001-09-28 23:08:17 +00:00
parent 3c1b9e9fad
commit 1c4e4c74ec
57 changed files with 541 additions and 1544 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
mozilla/editor/base/nsEditorParserObserver.cpp
View File

@@ -38,9 +38,11 @@
* ***** END LICENSE BLOCK ***** */
#include "nsIServiceManager.h"
#include "nsIParserService.h"
#include "nsParserCIID.h"
#include "nsEditorParserObserver.h"
static NS_DEFINE_IID(kParserServiceCID, NS_PARSERSERVICE_CID);
NS_IMPL_ADDREF(nsEditorParserObserver);
NS_IMPL_RELEASE(nsEditorParserObserver);
@@ -62,15 +64,6 @@ nsEditorParserObserver::~nsEditorParserObserver()
{
}
NS_IMETHODIMP_(const char*) nsEditorParserObserver::GetTagNameAt(PRUint32 aTagIndex)
{
nsCString* theString = mWatchTags[aTagIndex];
if (theString)
return theString->get();
else
return nsnull;
}
NS_IMETHODIMP nsEditorParserObserver::Notify(
PRUint32 aDocumentID,
const PRUnichar* aTag,
@@ -98,8 +91,11 @@ NS_IMETHODIMP nsEditorParserObserver::Notify(
else
return NS_ERROR_ILLEGAL_VALUE;
}
NS_IMETHODIMP nsEditorParserObserver::Notify(nsISupports* aDocumentID, const PRUnichar* aTag,
const nsStringArray* aKeys, const nsStringArray* aValues)
NS_IMETHODIMP nsEditorParserObserver::Notify(nsISupports* aWebShell,
nsISupports* aChannel,
const PRUnichar* aTag,
const nsStringArray* aKeys,
const nsStringArray* aValues)
{
Notify();
return NS_OK;
@@ -115,26 +111,34 @@ void nsEditorParserObserver::Notify()
mBadTagFound = PR_TRUE;
}
NS_IMETHODIMP nsEditorParserObserver::Start()
NS_IMETHODIMP nsEditorParserObserver::Start(eHTMLTags* aWatchTags)
{
nsresult res = NS_OK;
nsAutoString parserService; parserService.AssignWithConversion("text/html");
nsCOMPtr<nsIParserService> parserService(do_GetService(kParserServiceCID));
if (!parserService) {
return NS_ERROR_OUT_OF_MEMORY;
}
nsCOMPtr<nsIObserverService> anObserverService = do_GetService(NS_OBSERVERSERVICE_CONTRACTID, &res);
if (NS_FAILED(res)) return res;
return anObserverService->AddObserver(this, parserService.get());
res = parserService->RegisterObserver(this,
NS_LITERAL_STRING("text/html"),
aWatchTags);
return res;
}
NS_IMETHODIMP nsEditorParserObserver::End()
{
nsresult res = NS_OK;
nsAutoString parserService; parserService.AssignWithConversion("text/html");
nsCOMPtr<nsIParserService> parserService(do_GetService(kParserServiceCID));
nsCOMPtr<nsIObserverService> anObserverService = do_GetService(NS_OBSERVERSERVICE_CONTRACTID, &res);
if (NS_FAILED(res)) return res;
if (!parserService) {
return NS_ERROR_OUT_OF_MEMORY;
}
return anObserverService->RemoveObserver(this, parserService.get());
res = parserService->UnregisterObserver(this,
NS_LITERAL_STRING("text/html"));
return res;
}
NS_IMETHODIMP nsEditorParserObserver::GetBadTagFound(PRBool *aFound)
@@ -145,12 +149,4 @@ NS_IMETHODIMP nsEditorParserObserver::GetBadTagFound(PRBool *aFound)
}
NS_IMETHODIMP nsEditorParserObserver::RegisterTagToWatch(const char* tagName)
{
nsCString theTagString(tagName);
mWatchTags.AppendCString(theTagString);
return NS_OK;
}