Changeset 19440 for S60/trunk/WebCore

Timestamp:

02/06/07 14:03:51 (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 r19429, r19430, r19431, r19432 and r19433

Location:

S60/trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• group/WebCore.mmp (modified) (1 diff)
• khtml/css/html4.css (modified) (1 diff)
• khtml/misc/decoder.cpp (modified) (4 diffs)

S60/trunk/WebCore/ChangeLog

@@ +1 @@
+yongjzha, reviewed by Zalan.
+        DESC: don't apply outline style for image inside <A> element
+        http://bugs.webkit.org/show_bug.cgi?id=12621
+
+        WARNING: NO TEST CASES ADDED OR CHANGED
+
+        * khtml/css/html4.css:
+
+vbradley, Reviewed by Yongjun.
+        DESC: Fixed the stack size and pcre stack overflow. Limit the number
+    recursions that are allowed in match().
+        http://bugs.webkit.org/show_bug.cgi?id=12611
+
+
+        WARNING: NO TEST CASES ADDED OR CHANGED
+
+        * group/WebCore.mmp:
+
+2007-02-02  w3liu  <wei.liu@nokia.com>
+
+        Reviewed by yongjun.zhang@nokia.com.
+        DESC: If there is meta, should check meta tag in decoder.cpp
+        http://bugs.webkit.org/show_bug.cgi?id=12225
+
+        WARNING: NO TEST CASES ADDED OR CHANGED
+
+        * khtml/misc/decoder.cpp:
+        (Decoder::decode):
+
 bujtas, merged of r19405 to s60/trunk by mbradley, reviewed by yongjun.
         DESC: browser is crashing if it is closed while a page is loading and closing and opening a new window crashes the browser as well TMCN-6XRQP2 

S60/trunk/WebCore/group/WebCore.mmp

@@ -25 +25 @@
 epocallowdlldata
 VENDORID    VID_DEFAULT
+// stack size 64K
+epocstacksize 0x10000
 
 LANG     SC

S60/trunk/WebCore/khtml/css/html4.css

@@ -429 +429 @@
 :focus img  { outline: auto 2px #aaaaff; outline-offset: 2px }
 a:-khtml-any-link:hover     { outline: auto 4px #aaaaff; outline-offset: 2px }
-a:-khtml-any-link:hover img { outline: auto 4px #aaaaff; outline-offset: 2px }
 
 

S60/trunk/WebCore/khtml/misc/decoder.cpp

@@ -485 +485 @@
             const char *pEnd = buffer.length();
 #endif
+#if NOKIA_CHANGES
+            bool hasMeta = buffer.find("<meta", 0, false);
+            bool reachMeta = false;
+#endif
             while(ptr != pEnd)
             {
@@ -533 +537 @@
                     switch( id ) {
                     case ID_META:
-                    {
+                        {
+#if NOKIA_CHANGES
+                        reachMeta = true;                        
+#endif
                         // found a meta tag...
                         //ptr += 5;
@@ -544 +551 @@
                         //if( (pos = str.find("http-equiv", pos)) == -1) break;
                         //if( (pos = str.find("content-type", pos)) == -1) break;
-            while( pos < ( int ) str.length() ) {
-                if( (pos = str.find("charset", pos, false)) == -1) break;
-                pos += 7;
+                        while( pos < ( int ) str.length() ) {
+                            if( (pos = str.find("charset", pos, false)) == -1) break;
+                            pos += 7;
                             // skip whitespace..
-                while(  pos < (int)str.length() && str[pos] <= ' ' ) pos++;
+                            while(  pos < (int)str.length() && str[pos] <= ' ' ) pos++;
                             if ( pos == ( int )str.length()) break;
                             if ( str[pos++] != '=' ) continue;
                             while ( pos < ( int )str.length() &&
-                                    ( str[pos] <= ' ' ) || str[pos] == '=' || str[pos] == '"' || str[pos] == '\'')
-                pos++;
-
+                                ( str[pos] <= ' ' ) || str[pos] == '=' || str[pos] == '"' || str[pos] == '\'')
+                                pos++;
+                            
                             // end ?
                             if ( pos == ( int )str.length() ) break;
-                uint endpos = pos;
-                while( endpos < str.length() &&
-                                   (str[endpos] != ' ' && str[endpos] != '"' && str[endpos] != '\''
-                                    && str[endpos] != ';' && str[endpos] != '>') )
-                endpos++;
-#ifdef DECODE_DEBUG
-                kdDebug( 6005 ) << "Decoder: found charset: " << str.mid(pos, endpos-pos) << endl;
-#endif
-                setEncoding(str.mid(pos, endpos-pos), EncodingFromMetaTag);
-                if( m_type == EncodingFromMetaTag ) goto found;
-
+                            uint endpos = pos;
+                            while( endpos < str.length() &&
+                                (str[endpos] != ' ' && str[endpos] != '"' && str[endpos] != '\''
+                                && str[endpos] != ';' && str[endpos] != '>') )
+                                endpos++;
+#ifdef DECODE_DEBUG
+                            kdDebug( 6005 ) << "Decoder: found charset: " << str.mid(pos, endpos-pos) << endl;
+#endif
+                            setEncoding(str.mid(pos, endpos-pos), EncodingFromMetaTag);
+                            if( m_type == EncodingFromMetaTag ) goto found;
+                            
                             if ( endpos >= str.length() || str[endpos] == '/' || str[endpos] == '>' ) break;
-
-                pos = endpos + 1;
-            }
-            }
+                            
+                            pos = endpos + 1;
+                            }
+                        }
                     case (ID_META+ID_CLOSE_TAG):
                     case ID_SCRIPT:
@@ -597 +604 @@
                         break;
                     default:
+#if NOKIA_CHANGES
+                        if (hasMeta && !reachMeta)
+                            break;
+#endif
                         body = true;
 #ifdef DECODE_DEBUG