Fixing bug 124412. Making nsXULDocument inherit nsXMLDocument to avoid the need to duplicate a large amount of code in nsXULDocument. Also removing nsMarkupDocument and nsIDOMEventCapturer that are no longer needed. Changing the inheritance of nsIDOMXULDocument to avoid ~60 or so forwarding methods, and doing a *lot* of code cleanup. r=bugmail@sicking.cc, sr=peterv@netscape.com
git-svn-id: svn://10.0.0.236/trunk@140344 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -50,6 +50,7 @@
|
||||
#include "nsCRT.h"
|
||||
#include "nsIPrefBranchInternal.h"
|
||||
#include "nsIObserverService.h"
|
||||
#include "nsString.h"
|
||||
|
||||
static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID);
|
||||
|
||||
|
||||
@@ -38,6 +38,7 @@
|
||||
#include "nsIDOMProcessingInstruction.h"
|
||||
#include "nsIDOMElement.h"
|
||||
#include "nsIDOMText.h"
|
||||
#include "nsString.h"
|
||||
|
||||
// Need to determine if these are well-chosen.
|
||||
#define WRAPPER_INITIAL_SIZE 256
|
||||
|
||||
@@ -36,6 +36,7 @@
|
||||
#include "nsIDOMNode.h"
|
||||
#include "nsIDOMNodeList.h"
|
||||
#include "txAtoms.h"
|
||||
#include "nsString.h"
|
||||
|
||||
MOZ_DECL_CTOR_COUNTER(Node)
|
||||
|
||||
|
||||
@@ -52,6 +52,7 @@
|
||||
#include "nsIDOMRange.h"
|
||||
#include "nsIModifyableXPointer.h"
|
||||
#include "nsAutoPtr.h"
|
||||
#include "nsString.h"
|
||||
|
||||
#include "nsContentCID.h"
|
||||
static NS_DEFINE_IID(kRangeCID, NS_RANGE_CID);
|
||||
|
||||
@@ -126,7 +126,7 @@ nsXPointerResult::Item(PRUint32 aIndex, nsIDOMRange** aReturn)
|
||||
{
|
||||
NS_ENSURE_ARG_POINTER(aReturn);
|
||||
|
||||
if (aIndex >= mArray.Count()) {
|
||||
if (aIndex >= (PRUint32)mArray.Count()) {
|
||||
return NS_ERROR_FAILURE;
|
||||
}
|
||||
|
||||
@@ -255,7 +255,7 @@ nsXPointerSchemeContext::GetSchemeData(PRUint32 aIndex,
|
||||
nsAString &aScheme,
|
||||
nsAString &aData)
|
||||
{
|
||||
if (aIndex >= mSchemes.Count()) {
|
||||
if (aIndex >= (PRUint32)mSchemes.Count()) {
|
||||
aScheme.Truncate();
|
||||
aData.Truncate();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user