git://git.webkit.org / WebKit-https.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Reviewed by Mitz.
[WebKit-https.git] / WebCore / html / HTMLTokenizer.cpp
diff --git a/WebCore/html/HTMLTokenizer.cpp b/WebCore/html/HTMLTokenizer.cpp
index a9c8160c474ddae3420c467f1fe17a484a1be38f..3c7f8a4f6295b8707ef3c99ace3a44854d148baa 100644 (file)
--- a/WebCore/html/HTMLTokenizer.cpp
+++ b/WebCore/html/HTMLTokenizer.cpp
@@ -242,7 +242,7 @@ void HTMLTokenizer::begin()
     noMoreData = false;
     brokenComments = false;
     brokenServer = false;
-    lineno = 0;
+    m_lineNumber = 0;
     scriptStartLineno = 0;
     tagStartLineno = 0;
     m_state.setForceSynchronous(false);
@@ -261,7 +261,7 @@ HTMLTokenizer::State HTMLTokenizer::processListing(SegmentedString list, State s
         if (state.skipLF()) {
             state.setSkipLF(false);
             if (*list == '\n') {
-                list.advance(0);
+                list.advance();
                 continue;
             }
         }
@@ -279,11 +279,11 @@ HTMLTokenizer::State HTMLTokenizer::processListing(SegmentedString list, State s
             if (*list == '\r')
                 state.setSkipLF(true);
 
-            list.advance(0);
+            list.advance();
         } else {
             state.setDiscardLF(false);
             *dest++ = *list;
-            list.advance(0);
+            list.advance();
         }
     }
 
@@ -296,7 +296,7 @@ HTMLTokenizer::State HTMLTokenizer::parseSpecial(SegmentedString &src, State sta
     ASSERT(!state.hasTagState());
     ASSERT(state.inXmp() + state.inTextArea() + state.inTitle() + state.inStyle() + state.inScript() == 1 );
     if (state.inScript())
-        scriptStartLineno = lineno;
+        scriptStartLineno = m_lineNumber;
 
     if (state.inComment()) 
         state = parseComment(src, state);
@@ -311,7 +311,7 @@ HTMLTokenizer::State HTMLTokenizer::parseSpecial(SegmentedString &src, State sta
             continue;
         }
         if (scriptCodeResync && !tquote && ch == '>') {
-            src.advance(lineNumberPtr());
+            src.advance(m_lineNumber);
             scriptCodeSize = scriptCodeResync-1;
             scriptCodeResync = 0;
             scriptCode[ scriptCodeSize ] = scriptCode[ scriptCodeSize + 1 ] = 0;
@@ -363,12 +363,12 @@ HTMLTokenizer::State HTMLTokenizer::parseSpecial(SegmentedString &src, State sta
         state.setEscaped(!state.escaped() && ch == '\\');
         if (!scriptCodeResync && (state.inTextArea() || state.inTitle()) && !src.escaped() && ch == '&') {
             UChar* scriptCodeDest = scriptCode+scriptCodeSize;
-            src.advance(lineNumberPtr());
+            src.advance(m_lineNumber);
             state = parseEntity(src, scriptCodeDest, state, m_cBufferPos, true, false);
             scriptCodeSize = scriptCodeDest-scriptCode;
         } else {
             scriptCode[scriptCodeSize++] = *src;
-            src.advance(lineNumberPtr());
+            src.advance(m_lineNumber);
         }
     }
 
@@ -578,7 +578,7 @@ HTMLTokenizer::State HTMLTokenizer::parseComment(SegmentedString &src, State sta
                 endCharsCount = 4;
             }
             if (handleBrokenComments || endCharsCount > 1) {
-                src.advance(lineNumberPtr());
+                src.advance(m_lineNumber);
                 if (!(state.inTitle() || state.inScript() || state.inXmp() || state.inTextArea() || state.inStyle())) {
                     checkScriptBuffer();
                     scriptCode[scriptCodeSize] = 0;
@@ -596,7 +596,7 @@ HTMLTokenizer::State HTMLTokenizer::parseComment(SegmentedString &src, State sta
                 return state; // Finished parsing comment
             }
         }
-        src.advance(lineNumberPtr());
+        src.advance(m_lineNumber);
     }
 
     return state;
@@ -609,12 +609,12 @@ HTMLTokenizer::State HTMLTokenizer::parseServer(SegmentedString& src, State stat
         scriptCode[scriptCodeSize++] = *src;
         if (*src == '>' &&
             scriptCodeSize > 1 && scriptCode[scriptCodeSize-2] == '%') {
-            src.advance(lineNumberPtr());
+            src.advance(m_lineNumber);
             state.setInServer(false);
             scriptCodeSize = 0;
             return state; // Finished parsing server include
         }
-        src.advance(lineNumberPtr());
+        src.advance(m_lineNumber);
     }
     return state;
 }
@@ -634,11 +634,11 @@ HTMLTokenizer::State HTMLTokenizer::parseProcessingInstruction(SegmentedString &
         else if (chbegin == '>' && (!tquote || oldchar == '?')) {
             // We got a '?>' sequence
             state.setInProcessingInstruction(false);
-            src.advance(lineNumberPtr());
+            src.advance(m_lineNumber);
             state.setDiscardLF(true);
             return state; // Finished parsing comment!
         }
-        src.advance(lineNumberPtr());
+        src.advance(m_lineNumber);
         oldchar = chbegin;
     }
     
@@ -653,7 +653,7 @@ HTMLTokenizer::State HTMLTokenizer::parseText(SegmentedString &src, State state)
         if (state.skipLF()) {
             state.setSkipLF(false);
             if (cc == '\n') {
-                src.advance(lineNumberPtr());
+                src.advance(m_lineNumber);
                 continue;
             }
         }
@@ -666,7 +666,7 @@ HTMLTokenizer::State HTMLTokenizer::parseText(SegmentedString &src, State state)
             *dest++ = '\n';
         } else
             *dest++ = cc;
-        src.advance(lineNumberPtr());
+        src.advance(m_lineNumber);
     }
 
     return state;
@@ -693,7 +693,7 @@ HTMLTokenizer::State HTMLTokenizer::parseEntity(SegmentedString &src, UChar*& de
         case SearchEntity:
             if(cc == '#') {
                 cBuffer[cBufferPos++] = cc;
-                src.advance(lineNumberPtr());
+                src.advance(m_lineNumber);
                 state.setEntityState(NumericSearch);
             }
             else
@@ -704,7 +704,7 @@ HTMLTokenizer::State HTMLTokenizer::parseEntity(SegmentedString &src, UChar*& de
         case NumericSearch:
             if (cc == 'x' || cc == 'X') {
                 cBuffer[cBufferPos++] = cc;
-                src.advance(lineNumberPtr());
+                src.advance(m_lineNumber);
                 state.setEntityState(Hexadecimal);
             } else if (cc >= '0' && cc <= '9')
                 state.setEntityState(Decimal);
@@ -727,7 +727,7 @@ HTMLTokenizer::State HTMLTokenizer::parseEntity(SegmentedString &src, UChar*& de
                     digit = (cc - 'A' + 10) & 0xF; // handle both upper and lower case without a branch
                 EntityUnicodeValue = EntityUnicodeValue * 16 + digit;
                 cBuffer[cBufferPos++] = cc;
-                src.advance(lineNumberPtr());
+                src.advance(m_lineNumber);
             }
             if (cBufferPos == 10)  
                 state.setEntityState(SearchSemicolon);
@@ -746,7 +746,7 @@ HTMLTokenizer::State HTMLTokenizer::parseEntity(SegmentedString &src, UChar*& de
 
                 EntityUnicodeValue = EntityUnicodeValue * 10 + (cc - '0');
                 cBuffer[cBufferPos++] = cc;
-                src.advance(lineNumberPtr());
+                src.advance(m_lineNumber);
             }
             if (cBufferPos == 9)  
                 state.setEntityState(SearchSemicolon);
@@ -764,7 +764,7 @@ HTMLTokenizer::State HTMLTokenizer::parseEntity(SegmentedString &src, UChar*& de
                 }
 
                 cBuffer[cBufferPos++] = cc;
-                src.advance(lineNumberPtr());
+                src.advance(m_lineNumber);
             }
             if (cBufferPos == 9) 
                 state.setEntityState(SearchSemicolon);
@@ -787,7 +787,7 @@ HTMLTokenizer::State HTMLTokenizer::parseEntity(SegmentedString &src, UChar*& de
             if (EntityUnicodeValue > 0 && EntityUnicodeValue <= 0x10FFFF) {
                 if (!inViewSourceMode()) {
                     if (*src == ';')
-                        src.advance(lineNumberPtr());
+                        src.advance(m_lineNumber);
                     if (EntityUnicodeValue <= 0xFFFF) {
                         checkBuffer();
                         src.push(fixUpChar(EntityUnicodeValue));
@@ -806,7 +806,7 @@ HTMLTokenizer::State HTMLTokenizer::parseEntity(SegmentedString &src, UChar*& de
                     dest += cBufferPos;
                     if (*src == ';') {
                         *dest++ = ';';
-                        src.advance(lineNumberPtr());
+                        src.advance(m_lineNumber);
                     }
                 }
             } else {
@@ -832,7 +832,6 @@ HTMLTokenizer::State HTMLTokenizer::parseTag(SegmentedString &src, State state)
 
     unsigned cBufferPos = m_cBufferPos;
 
-    int* lineNoPtr = lineNumberPtr();
     bool lastIsSlash = false;
 
     while (!src.isEmpty()) {
@@ -859,7 +858,7 @@ HTMLTokenizer::State HTMLTokenizer::parseTag(SegmentedString &src, State state)
                         kdDebug( 6036 ) << "Found comment" << endl;
 #endif
                         // Found '<!--' sequence
-                        src.advance(lineNoPtr);
+                        src.advance(m_lineNumber);
                         dest = buffer; // ignore the previous part of this tag
                         state.setInComment(true);
                         state.setTagState(NoTag);
@@ -869,7 +868,7 @@ HTMLTokenizer::State HTMLTokenizer::parseTag(SegmentedString &src, State state)
                         // can handle this case.  Only do this in quirks mode. -dwh
                         if (!src.isEmpty() && *src == '>' && m_doc->inCompatMode()) {
                           state.setInComment(false);
-                          src.advance(lineNoPtr);
+                          src.advance(m_lineNumber);
                           if (!src.isEmpty())
                               // cuts off high bits, which is okay
                               cBuffer[cBufferPos++] = *src;
@@ -882,7 +881,7 @@ HTMLTokenizer::State HTMLTokenizer::parseTag(SegmentedString &src, State state)
                     }
                     // cuts off high bits, which is okay
                     cBuffer[cBufferPos++] = *src;
-                    src.advance(lineNoPtr);
+                    src.advance(m_lineNumber);
                     break;
                 }
                 else
@@ -903,7 +902,7 @@ HTMLTokenizer::State HTMLTokenizer::parseTag(SegmentedString &src, State state)
                     cBuffer[cBufferPos++] = curchar + ('a' - 'A');
                 else
                     cBuffer[cBufferPos++] = curchar;
-                src.advance(lineNoPtr);
+                src.advance(m_lineNumber);
             }
 
             // Disadvantage: we add the possible rest of the tag
@@ -957,7 +956,7 @@ HTMLTokenizer::State HTMLTokenizer::parseTag(SegmentedString &src, State state)
                 }
                 if (inViewSourceMode())
                     currToken.addViewSourceChar(curchar);
-                src.advance(lineNoPtr);
+                src.advance(m_lineNumber);
             }
             break;
         case AttributeName:
@@ -987,7 +986,7 @@ HTMLTokenizer::State HTMLTokenizer::parseTag(SegmentedString &src, State state)
                 else
                     cBuffer[cBufferPos++] = curchar;
                     
-                src.advance(lineNoPtr);
+                src.advance(m_lineNumber);
             }
             if ( cBufferPos == CBUFLEN ) {
                 cBuffer[cBufferPos] = '\0';
@@ -1024,7 +1023,7 @@ HTMLTokenizer::State HTMLTokenizer::parseTag(SegmentedString &src, State state)
                         state.setTagState(SearchValue);
                         if (inViewSourceMode())
                             currToken.addViewSourceChar(curchar);
-                        src.advance(lineNoPtr);
+                        src.advance(m_lineNumber);
                     }
                     else {
                         currToken.addAttribute(m_doc, attrName, emptyAtom, inViewSourceMode());
@@ -1039,7 +1038,7 @@ HTMLTokenizer::State HTMLTokenizer::parseTag(SegmentedString &src, State state)
                     
                 lastIsSlash = curchar == '/';
 
-                src.advance(lineNoPtr);
+                src.advance(m_lineNumber);
             }
             break;
         case SearchValue:
@@ -1051,7 +1050,7 @@ HTMLTokenizer::State HTMLTokenizer::parseTag(SegmentedString &src, State state)
                         state.setTagState(QuotedValue);
                         if (inViewSourceMode())
                             currToken.addViewSourceChar(curchar);
-                        src.advance(lineNoPtr);
+                        src.advance(m_lineNumber);
                     } else
                         state.setTagState(Value);
 
@@ -1059,7 +1058,7 @@ HTMLTokenizer::State HTMLTokenizer::parseTag(SegmentedString &src, State state)
                 }
                 if (inViewSourceMode())
                     currToken.addViewSourceChar(curchar);
-                src.advance(lineNoPtr);
+                src.advance(m_lineNumber);
             }
             break;
         case QuotedValue:
@@ -1095,7 +1094,7 @@ HTMLTokenizer::State HTMLTokenizer::parseTag(SegmentedString &src, State state)
                     // ### attributes like '&{blaa....};' are supposed to be treated as jscript.
                     if ( curchar == '&' )
                     {
-                        src.advance(lineNoPtr);
+                        src.advance(m_lineNumber);
                         state = parseEntity(src, dest, state, cBufferPos, true, true);
                         break;
                     }
@@ -1118,12 +1117,12 @@ HTMLTokenizer::State HTMLTokenizer::parseTag(SegmentedString &src, State state)
                         tquote = NoQuote;
                         if (inViewSourceMode())
                             currToken.addViewSourceChar(curchar);
-                        src.advance(lineNoPtr);
+                        src.advance(m_lineNumber);
                         break;
                     }
                 }
                 *dest++ = *src;
-                src.advance(lineNoPtr);
+                src.advance(m_lineNumber);
             }
             break;
         case Value:
@@ -1137,7 +1136,7 @@ HTMLTokenizer::State HTMLTokenizer::parseTag(SegmentedString &src, State state)
                     // parse Entities
                     if ( curchar == '&' )
                     {
-                        src.advance(lineNoPtr);
+                        src.advance(m_lineNumber);
                         state = parseEntity(src, dest, state, cBufferPos, true, true);
                         break;
                     }
@@ -1156,7 +1155,7 @@ HTMLTokenizer::State HTMLTokenizer::parseTag(SegmentedString &src, State state)
                 }
 
                 *dest++ = *src;
-                src.advance(lineNoPtr);
+                src.advance(m_lineNumber);
             }
             break;
         case SearchEnd:
@@ -1173,7 +1172,7 @@ HTMLTokenizer::State HTMLTokenizer::parseTag(SegmentedString &src, State state)
 
                 if (inViewSourceMode())
                     currToken.addViewSourceChar(*src);
-                src.advance(lineNoPtr);
+                src.advance(m_lineNumber);
             }
             if (src.isEmpty()) break;
 
@@ -1182,7 +1181,7 @@ HTMLTokenizer::State HTMLTokenizer::parseTag(SegmentedString &src, State state)
             tquote = NoQuote;
 
             if (*src != '<')
-                src.advance(lineNoPtr);
+                src.advance(m_lineNumber);
 
             if (currToken.tagName == nullAtom) { //stop if tag is unknown
                 m_cBufferPos = cBufferPos;
@@ -1253,7 +1252,7 @@ HTMLTokenizer::State HTMLTokenizer::parseTag(SegmentedString &src, State state)
                         searchStopperLen = 7;
                         State savedState = state;
                         SegmentedString savedSrc = src;
-                        long savedLineno = lineno;
+                        long savedLineno = m_lineNumber;
                         state.setInTitle(true);
                         state = parseSpecial(src, state);
                         if (state.inTitle() && src.isEmpty()) {
@@ -1266,7 +1265,7 @@ HTMLTokenizer::State HTMLTokenizer::parseTag(SegmentedString &src, State state)
                             // than a local variable.
                             state = savedState;
                             src = savedSrc;
-                            lineno = savedLineno;
+                            m_lineNumber = savedLineno;
                             scriptCodeSize = 0;
                         }
                     }
@@ -1366,8 +1365,6 @@ bool HTMLTokenizer::write(const SegmentedString& str, bool appendData)
 
     State state = m_state;
 
-    int* lineNoPtr = lineNumberPtr();
-
     while (!src.isEmpty() && (!frame || !frame->loader()->isScheduledLocationChangePending())) {
         if (!continueProcessing(processedCount, startTime, state))
             break;
@@ -1382,7 +1379,7 @@ bool HTMLTokenizer::write(const SegmentedString& str, bool appendData)
             state.setSkipLF(false);
 
         if (wasSkipLF && (cc == '\n'))
-            src.advance(0);
+            src.advance();
         else if (state.needsSpecialWriteHandling()) {
             // it's important to keep needsSpecialWriteHandling with the flags this block tests
             if (state.hasEntityState())
@@ -1449,11 +1446,11 @@ bool HTMLTokenizer::write(const SegmentedString& str, bool appendData)
                 state = parseTag(src, state);
             }
         } else if (cc == '&' && !src.escaped()) {
-            src.advance(lineNoPtr);
+            src.advance(m_lineNumber);
             state = parseEntity(src, dest, state, m_cBufferPos, true, state.hasTagState());
         } else if (cc == '<' && !src.escaped()) {
-            tagStartLineno = lineno;
-            src.advance(lineNoPtr);
+            tagStartLineno = m_lineNumber;
+            src.advance(m_lineNumber);
             state.setStartTag(true);
         } else if (cc == '\n' || cc == '\r') {
             if (state.discardLF())
@@ -1463,17 +1460,17 @@ bool HTMLTokenizer::write(const SegmentedString& str, bool appendData)
                 // Process this LF
                 *dest++ = '\n';
                 if (cc == '\r' && !src.excludeLineNumbers())
-                    lineno++;
+                    m_lineNumber++;
             }
 
             /* Check for MS-DOS CRLF sequence */
             if (cc == '\r')
                 state.setSkipLF(true);
-            src.advance(lineNoPtr);
+            src.advance(m_lineNumber);
         } else {
             state.setDiscardLF(false);
             *dest++ = cc;
-            src.advance(lineNoPtr);
+            src.advance(m_lineNumber);
         }
     }
     
@@ -1614,7 +1611,7 @@ PassRefPtr<Node> HTMLTokenizer::processToken()
     } else if (currToken.tagName == nullAtom) {
         currToken.reset();
         if (jsProxy)
-            jsProxy->setEventHandlerLineno(lineno);
+            jsProxy->setEventHandlerLineno(m_lineNumber);
         return 0;
     }
 
Mirror of the WebKit open source project from svn.webkit.org.