Bug 22188 – Smear some lipstick on the HTMLTokenizer pig.

• Component: New Bugs
• Status: RESOLVED FIXED

[Eric Seidel (no email)]

So scary.  But I need to fix a crasher in HTMLTokenizer... so let's clean'er up first.

I'm about to attach like 10 git patches.  I will squash them down and land them as one large patch, but reviewing all the little pieces is likely easier (certainly safer).

[Eric Seidel (no email)]

Created attachment 25056 [details]
Rename pendingScripts to m_pendingScripts

 WebCore/html/HTMLTokenizer.cpp |   35 +++++++++++++++++------------------
 WebCore/html/HTMLTokenizer.h   |    2 +-
 2 files changed, 18 insertions(+), 19 deletions(-)

[Eric Seidel (no email)]

Created attachment 25057 [details]
Rename scriptNode to m_scriptNode make the type specific

 WebCore/html/HTMLTokenizer.cpp |   18 +++++++++---------
 WebCore/html/HTMLTokenizer.h   |    3 ++-
 2 files changed, 11 insertions(+), 10 deletions(-)

[Eric Seidel (no email)]

Created attachment 25058 [details]
Rename pendingSrc to m_pendingSrc

 WebCore/html/HTMLTokenizer.cpp |   34 +++++++++++++++++-----------------
 WebCore/html/HTMLTokenizer.h   |    2 +-
 2 files changed, 18 insertions(+), 18 deletions(-)

[Eric Seidel (no email)]

Created attachment 25059 [details]
Rename currentPrependingSrc to m_currentPrependingSrc

 WebCore/html/HTMLTokenizer.cpp |   30 +++++++++++++++---------------
 WebCore/html/HTMLTokenizer.h   |    2 +-
 2 files changed, 16 insertions(+), 16 deletions(-)

[Eric Seidel (no email)]

Created attachment 25060 [details]
Rename noMoreData to m_noMoreData and cBuffer to m_cBuffer

 WebCore/html/HTMLTokenizer.cpp |   68 +++++++++++++++++++--------------------
 WebCore/html/HTMLTokenizer.h   |    4 +-
 2 files changed, 35 insertions(+), 37 deletions(-)

[Eric Seidel (no email)]

Created attachment 25061 [details]
Remove long-since-dead kdDebug and qDebug calls

 WebCore/css/CSSParser.cpp         |   12 ------------
 WebCore/html/HTMLTokenizer.cpp    |   32 ++++----------------------------
 WebCore/rendering/RenderBlock.cpp |    7 ++-----
 3 files changed, 6 insertions(+), 45 deletions(-)

[Eric Seidel (no email)]

Created attachment 25062 [details]
Rename brokenComments to m_brokenComments

 WebCore/html/HTMLTokenizer.cpp |    8 ++++----
 WebCore/html/HTMLTokenizer.h   |    2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

[Eric Seidel (no email)]

Created attachment 25063 [details]
Remove HTMLTokenizer includes and document the rest

 WebCore/dom/XMLTokenizer.cpp            |    1 -
 WebCore/dom/XMLTokenizerLibxml2.cpp     |    2 +-
 WebCore/html/HTMLDocument.cpp           |    1 -
 WebCore/html/HTMLElement.cpp            |    2 +-
 WebCore/html/HTMLFormControlElement.cpp |    1 -
 WebCore/xml/XSLTProcessor.cpp           |    2 +-
 6 files changed, 3 insertions(+), 6 deletions(-)

[Eric Seidel (no email)]

Created attachment 25064 [details]
Rename src to m_src

 WebCore/html/HTMLTokenizer.cpp |   76 ++++++++++++++++++++--------------------
 WebCore/html/HTMLTokenizer.h   |    4 +-
 2 files changed, 40 insertions(+), 40 deletions(-)

[Eric Seidel (no email)]

Created attachment 25065 [details]
Rename parser to m_parser and make it an OwnPtr

 WebCore/html/HTMLTokenizer.cpp |   19 +++++++++----------
 WebCore/html/HTMLTokenizer.h   |    4 ++--
 2 files changed, 11 insertions(+), 12 deletions(-)

[Eric Seidel (no email)]

Created attachment 25066 [details]
Rename inWrite to m_inWrite and jsProxy to scriptController

 WebCore/html/HTMLTokenizer.cpp |   34 +++++++++++++++++-----------------
 WebCore/html/HTMLTokenizer.h   |    2 +-
 2 files changed, 18 insertions(+), 18 deletions(-)

[Eric Seidel (no email)]

Created attachment 25067 [details]
Rename brokenServer to m_brokenServer

 WebCore/html/HTMLTokenizer.cpp |    6 +++---
 WebCore/html/HTMLTokenizer.h   |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

[Eric Seidel (no email)]

Created attachment 25068 [details]
Rename buffer to m_buffer and dest to m_dest

 WebCore/html/HTMLTokenizer.cpp |  106 ++++++++++++++++++++--------------------
 WebCore/html/HTMLTokenizer.h   |   10 ++--
 2 files changed, 58 insertions(+), 58 deletions(-)

[Eric Seidel (no email)]

Created attachment 25069 [details]
Rename size to m_bufferSize

 WebCore/html/HTMLTokenizer.cpp |    8 ++++----
 WebCore/html/HTMLTokenizer.h   |    6 ++----
 2 files changed, 6 insertions(+), 8 deletions(-)

[Eric Seidel (no email)]

Created attachment 25070 [details]
Rename attrName to m_attrName

 WebCore/html/HTMLTokenizer.cpp |   26 +++++++++++++-------------
 WebCore/html/HTMLTokenizer.h   |    2 +-
 2 files changed, 14 insertions(+), 14 deletions(-)

[Eric Seidel (no email)]

Created attachment 25071 [details]
Rename searchStopper to m_searchStopper and searchStopperLen to m_searchStopperLen

 WebCore/html/HTMLTokenizer.cpp |   32 ++++++++++++++++----------------
 WebCore/html/HTMLTokenizer.h   |    4 ++--
 2 files changed, 18 insertions(+), 18 deletions(-)

[Eric Seidel (no email)]

Created attachment 25072 [details]
Rename scriptCode* to m_scriptCode* and change scriptCodeMax to m_scriptCodeCapacity

 WebCore/html/HTMLTokenizer.cpp |  136 ++++++++++++++++++++--------------------
 WebCore/html/HTMLTokenizer.h   |   11 ++--
 2 files changed, 73 insertions(+), 74 deletions(-)

[Eric Seidel (no email)]

Created attachment 25073 [details]
Rename scriptStartLineno to m_currentScriptTagStartLineNumber and tagStartLineno to m_currentTagStartLineNumber

 WebCore/html/HTMLTokenizer.cpp |   19 ++++++++++---------
 WebCore/html/HTMLTokenizer.h   |    5 ++---
 2 files changed, 12 insertions(+), 12 deletions(-)

[Eric Seidel (no email)]

Created attachment 25074 [details]
Rename scriptSrc to m_scriptTagSrcAttrValue and scriptSrcCharset to m_scriptTagCharsetAttrValue -- a bit unwieldy, but more precise

 WebCore/html/HTMLTokenizer.cpp |   16 ++++++++--------
 WebCore/html/HTMLTokenizer.h   |    4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

[Eric Seidel (no email)]

Created attachment 25075 [details]
Rename flat to selfClosingTag

 WebCore/html/HTMLTokenizer.cpp |    8 ++++----
 WebCore/html/HTMLTokenizer.h   |   11 ++++++++---
 2 files changed, 12 insertions(+), 7 deletions(-)

[Eric Seidel (no email)]

Created attachment 25076 [details]
Rename currToken to m_currentToken

 WebCore/html/HTMLTokenizer.cpp |  112 ++++++++++++++++++++--------------------
 WebCore/html/HTMLTokenizer.h   |    2 +-
 2 files changed, 57 insertions(+), 57 deletions(-)

[Antti Koivisto]

Comment on attachment 25060 [details]
Rename noMoreData to m_noMoreData and cBuffer to m_cBuffer

#define CBUFLEN 1024

could make this a static const with better name since you are here.

[Antti Koivisto]

Comment on attachment 25071 [details]
Rename searchStopper to m_searchStopper and searchStopperLen to m_searchStopperLen

Maybe m_searchStopperLenght instead of m_searchStopperLen?

[Antti Koivisto]

Comment on attachment 25075 [details]
Rename flat to selfClosingTag

This class nees some m_ consistency too. Maybe it should be a struct since fields are public? Then m_ can go too.

[Eric Seidel (no email)]

Committing to http://svn.webkit.org/repository/webkit/trunk ...
	M	WebCore/ChangeLog
	M	WebCore/css/CSSParser.cpp
	M	WebCore/dom/XMLTokenizer.cpp
	M	WebCore/dom/XMLTokenizerLibxml2.cpp
	M	WebCore/html/HTMLDocument.cpp
	M	WebCore/html/HTMLElement.cpp
	M	WebCore/html/HTMLFormControlElement.cpp
	M	WebCore/html/HTMLParser.cpp
	M	WebCore/html/HTMLParser.h
	M	WebCore/html/HTMLTokenizer.cpp
	M	WebCore/html/HTMLTokenizer.h
	M	WebCore/html/HTMLViewSourceDocument.h
	M	WebCore/rendering/RenderBlock.cpp
	M	WebCore/xml/XSLTProcessor.cpp
Committed r38327