Changeset 19501 for S60/trunk/WebCore

Timestamp:

02/08/07 10:52:29 (2 years ago)

Author:

brmorris

Message:

brmorris <bradley.morrison@nokia.com>, rs'd by zalan

DESC: merge from s60/branches/3.1m to s60/trunk of r19464, r19466, r19472 & r19499

Location:

S60/trunk/WebCore

Files:

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

S60/trunk/WebCore/ChangeLog

@@ +1 @@
+yadavall, reviewed by zalan bujtas
+ DESC: Unclosed object tag causing content to not appear 
+ http://bugs.webkit.org/show_bug.cgi?id=12680
+
 yaharon, reviewed by zalan. merged to s60/trunk by brad.
         DESC: [S60] BrowserNG: Betsson.com crash (MLIO-6XWP2K)

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

@@ -1208 +1208 @@
                         // being bogus HTML.  They do not honor the "/" for other tags.  This behavior
                         // also deviates from WinIE, but in this case we'll just copy Moz and Opera.
+#ifdef NOKIA_CHANGES
+                        if ((currToken.id == ID_SCRIPT || currToken.id == ID_OBJECT) && curchar == '>' &&
+#else
                         if (currToken.id == ID_SCRIPT && curchar == '>' &&
+#endif
                             attrName == "/")
                             currToken.flat = true;
@@ -1539 +1543 @@
                 if (beginTag) {
 #ifdef NOKIA_CHANGES
-                    if(slashAtEndOfTag) 
-                       break;    
+                    if(slashAtEndOfTag)
+                       break;
 #endif
                     searchStopper = titleEnd;
                     searchStopperLen = 7;
-                    title = true;         
+                    title = true;
                     parseSpecial(src);
                 }