Rolling out r17865 because it caused a performance regression.

[WebKit-https.git] / WebCore / loader / TextResourceDecoder.cpp
diff --git a/WebCore/loader/TextResourceDecoder.cpp b/WebCore/loader/TextResourceDecoder.cpp

index 2a33b62d2437d625026d9cdd9905d235e48f9576..9799f9993102bf39e68408b37e60b990117f8388 100644 (file)
--- a/WebCore/loader/TextResourceDecoder.cpp
+++ b/WebCore/loader/TextResourceDecoder.cpp
@@ -481,10 +481,10 @@ bool TextResourceDecoder::checkForHeadCharset(const char* data, size_t len, bool
      // We stop scanning when a tag that is not permitted in <head>
      // is seen, rather when </head> is seen, because that more closely
      // matches behavior in other browsers; more details in
      // We stop scanning when a tag that is not permitted in <head>
      // is seen, rather when </head> is seen, because that more closely
      // matches behavior in other browsers; more details in
-    // <http://bugzilla.opendarwin.org/show_bug.cgi?id=3590>.
+    // <http://bugs.webkit.org/show_bug.cgi?id=3590>.
      
      // Additionally, we ignore things that looks like tags in <title>; see
      
      // Additionally, we ignore things that looks like tags in <title>; see
-    // <http://bugzilla.opendarwin.org/show_bug.cgi?id=4560>.
+    // <http://bugs.webkit.org/show_bug.cgi?id=4560>.
      
      bool withinTitle = false;
  
      
      bool withinTitle = false;
  
@@ -511,7 +511,7 @@ bool TextResourceDecoder::checkForHeadCharset(const char* data, size_t len, bool
                  if (*end == '\0')
                      break;
                  DeprecatedCString str(ptr, end - ptr);
                  if (*end == '\0')
                      break;
                  DeprecatedCString str(ptr, end - ptr);
-                int len;
+                int len = 0;
                  int pos = findXMLEncoding(str, len);
                  if (pos != -1)
                      setEncoding(TextEncoding(str.mid(pos, len)), EncodingFromXMLHeader);
                  int pos = findXMLEncoding(str, len);
                  if (pos != -1)
                      setEncoding(TextEncoding(str.mid(pos, len)), EncodingFromXMLHeader);