Changeset 18939 for S60/trunk/WebCore

Timestamp:

01/18/07 08:32:53 (2 years ago)

Author:

yongjzha

Message:

2007-01-14 sareen <shyam.sareen@nokia.com>

Reviewed by Antti Kovisto.Browser
DESC: Browser - Form/The TC is not displayed, it's a white page displayed
http://bugzilla.opendarwin.org/show_bug.cgi?id=12269

WARNING: NO TEST CASES ADDED OR CHANGED

• khtml/html/htmltokenizer.cpp: (khtml::HTMLTokenizer::parseTag):
• khtml/html/htmltokenizer.h:

Location:

S60/trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• khtml/html/htmltokenizer.cpp (modified) (3 diffs)
• khtml/html/htmltokenizer.h (modified) (1 diff)

S60/trunk/WebCore/ChangeLog

@@ +1 @@
+2007-01-14  sareen  <shyam.sareen@nokia.com>
+
+        Reviewed by Antti Kovisto.Browser 
+        DESC: Browser - Form/The TC is not displayed, it's a white page displayed
+        http://bugzilla.opendarwin.org/show_bug.cgi?id=12269
+
+        WARNING: NO TEST CASES ADDED OR CHANGED
+
+        * khtml/html/htmltokenizer.cpp:
+        (khtml::HTMLTokenizer::parseTag):
+        * khtml/html/htmltokenizer.h:
+
 2007-01-18  sareen  <shyam.sareen@yahoo.com>
 

S60/trunk/WebCore/khtml/html/htmltokenizer.cpp

@@ -1028 +1028 @@
 {
     assert(!Entity );
+#ifdef NOKIA_CHANGES
+    slashAtEndOfTag = false;
+#endif
 
     while ( !src.isEmpty() )
@@ -1122 +1125 @@
 
                 // Accept empty xml tags like <br/>.  We trim off the "/" so that when we call
-                // getTagID, we'll look up "br" as the tag name and not "br/".
+                // getTagID, we'll look up "br" as the tag name and not "br/". This will also
+                // handle a case when some wrong tags such as <title/> is found and ther is no
+                // end tag.
+
                 if(len > 1 && ptr[len-1] == '/' )
-                    ptr[--len] = '\0';
+                {
+#ifdef NOKIA_CHANGES
+                 slashAtEndOfTag = true;
+#endif
+                 ptr[--len] = '\0';
+                }
 
                 // Look up the tagID for the specified tag name (now that we've shaved off any
@@ -1527 +1538 @@
             case ID_TITLE:
                 if (beginTag) {
+#ifdef NOKIA_CHANGES
+                    if(slashAtEndOfTag) 
+                       break;    
+#endif
                     searchStopper = titleEnd;
                     searchStopperLen = 7;
-                    title = true;
+                    title = true;         
                     parseSpecial(src);
                 }

S60/trunk/WebCore/khtml/html/htmltokenizer.h

@@ -381 +381 @@
     //Are we executing an external script?
     bool executingExternalScript;
+    //Sometimes, it is found that tag name is ended with slash
+    //For example, <title/>. But, after that there is not end tag.
+    bool slashAtEndOfTag;
 #endif