241328 - Make the HTML parser more 64-bit friendly, and clean up some code.

Status: RESOLVED FIXED

(Core :: DOM: HTML Parser, defect)

Description

[Johnny Stenback (:jst)]

I was looking for classes where we mix 32-bit members with pointer members w/o
grouping them together (which causes the class to be larger than necessary on
some 64-bit platforms due to pointer size and alignment etc) and I found that we
do that in nsParserNode, so I decided to fix that, and in doing so, I found some
other silly stuff I decided to cleanup, and some unused code (and members) I
could remove.

Patch coming up.

Comment 1

[Johnny Stenback (:jst)]

Attachment: Cleanup

This does all that, and also initializes mRefCnt in nsCParserNode's default
ctor where it was left undefined before. Sigh.

Comment 2

[Johnny Stenback (:jst)]

Attachment: diff -w for review

Comment 3

[Boris Zbarsky [:bzbarsky]]

Comment on attachment 146779 [details] [diff] [review]
diff -w for review

>Index: htmlparser/public/nsHTMLTokens.h

>+  virtual PRBool IsWellFormed(void) const {
>+    return PRBool(eWellFormed == mContainerInfo);
>+  }

Ditch the "PRBool()" part.

> class CEntityToken : public CHTMLToken {
>+  static nsresult ConsumeEntity(PRUnichar aChar, nsString& aString,
>+                                nsScanner& aScanner);
>     static  PRInt32     TranslateToUnicodeStr(PRInt32 aValue,nsString& aString);

Fix your weird indent?

> class CTextToken: public CHTMLToken {
>+  nsresult ConsumeUntil(PRUnichar aChar, PRBool aIgnoreComments,
>+                        nsScanner& aScanner, nsString& aEndTagName,
>+                        PRInt32 aFlag, PRBool& aFlushTokens);
>     virtual PRInt32     GetTokenType(void);

Again.

>+  virtual void Bind(nsScanner* aScanner, nsScannerIterator& aStart,
>+                    nsScannerIterator& aEnd);
>     virtual void        Bind(const nsAString& aStr);

Again.

> class CAttributeToken: public CHTMLToken {
>+  virtual void BindKey(nsScanner* aScanner, nsScannerIterator& aStart,
>+                       nsScannerIterator& aEnd);
>     virtual const nsAString&     GetValue(void) {return mTextValue;}

Again.

r+sr=bzbarsky with those nits.

Comment 4

[Johnny Stenback (:jst)]

You were looking at a diff -w, all those indentation issues were fixed already.
Thanks for the review!

Comment 5

[Boris Zbarsky [:bzbarsky]]

Ah, damn.  Shoulda checked the normal diff.   ;)

Comment 6

[Johnny Stenback (:jst)]

Fix checked in.

Comment 7

[Henrik Gemal]

the file:
mozilla/parser/htmlparser/src/win32.order

seems to have been checked into the branch:
:pserver:[e-mail]:/cvsroot 

according to bonsai.mozilla.org