[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[darin]

The following commit has been merged in the debian/unstable branch:
commit 6aa1a19c97d798391da49eab1c2804804c7858b8
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 25 19:59:23 2003 +0000

            - rolled out change to fix 3390850 because it caused a performance regression
    
            * khtml/misc/decoder.cpp: (Decoder::decode): Rolled out change.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5059 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 6c6699e..4297f36 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,9 @@
+2003-09-25  Darin Adler  <darin at apple.com>
+
+        - rolled out change to fix 3390850 because it caused a performance regression
+
+        * khtml/misc/decoder.cpp: (Decoder::decode): Rolled out change.
+
 2003-09-25  Ken Kocienda  <kocienda at apple.com>
 
         Reviewed by Dave
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 6c6699e..4297f36 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,9 @@
+2003-09-25  Darin Adler  <darin at apple.com>
+
+        - rolled out change to fix 3390850 because it caused a performance regression
+
+        * khtml/misc/decoder.cpp: (Decoder::decode): Rolled out change.
+
 2003-09-25  Ken Kocienda  <kocienda at apple.com>
 
         Reviewed by Dave
diff --git a/WebCore/khtml/misc/decoder.cpp b/WebCore/khtml/misc/decoder.cpp
index 7e72f3d..d0af566 100644
--- a/WebCore/khtml/misc/decoder.cpp
+++ b/WebCore/khtml/misc/decoder.cpp
@@ -483,7 +483,6 @@ QString Decoder::decode(const char *data, int len)
             const char *ptr = buffer.data();
             const char *pEnd = buffer.length();
 #endif
-            bool inScript = false;
             while(ptr != pEnd)
             {
                 if(*ptr == '<') {
@@ -573,11 +572,7 @@ QString Decoder::decode(const char *data, int len)
 			}
 		    }
                     case ID_SCRIPT:
-                        inScript = true;
-                        break;
                     case (ID_SCRIPT+ID_CLOSE_TAG):
-                        inScript = false;
-                        break;
                     case ID_NOSCRIPT:
                     case (ID_NOSCRIPT+ID_CLOSE_TAG):
                     case ID_STYLE:
@@ -596,8 +591,6 @@ QString Decoder::decode(const char *data, int len)
                     case (0 + ID_CLOSE_TAG ):
                         break;
                     default:
-                        if (inScript)
-                            break;
                         body = true;
 #ifdef DECODE_DEBUG
 			kdDebug( 6005 ) << "Decoder: no charset found. Id=" << id << endl;

-- 
WebKit Debian packaging