Changeset 62155 in webkit

Timestamp:

Jun 29, 2010 6:16:21 PM (14 years ago)

Author:

kinuko@chromium.org

Message:

2010-06-29 Kinuko Yasuda <​kinuko@chromium.org>

Reviewed by Jian Li.

Fix http/tests/local/blob/send-data-blob.html on Windows
​https://bugs.webkit.org/show_bug.cgi?id=41228

Fix a regression bug in the line-conversion code.
Rewrite the line-conversion function with simpler functions to
make it less error prone.

No new tests as this is for bug fixes.

• platform/BlobItem.cpp: (WebCore::StringBlobItem::convertToCString):

2010-06-29 Kinuko Yasuda <​kinuko@chromium.org>

Reviewed by Jian Li.

Fix http/tests/local/blob/send-data-blob.html on Windows
​https://bugs.webkit.org/show_bug.cgi?id=41228

Fix the cgi code to make it work with cygwin perl.
Also fix test expectations for Windows.

• http/tests/resources/post-and-verify-hybrid.cgi:
• platform/chromium/test_expectations.txt:
• platform/win/fast/js/global-constructors-expected.txt:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/resources/post-and-verify-hybrid.cgi (modified) (2 diffs)
• LayoutTests/platform/chromium/test_expectations.txt (modified) (1 diff)
• LayoutTests/platform/win/fast/js/global-constructors-expected.txt (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/BlobItem.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-06-29  Kinuko Yasuda  <kinuko@chromium.org>
+
+        Reviewed by Jian Li.
+
+        Fix http/tests/local/blob/send-data-blob.html on Windows
+        https://bugs.webkit.org/show_bug.cgi?id=41228
+
+        Fix the cgi code to make it work with cygwin perl.
+        Also fix test expectations for Windows.
+
+        * http/tests/resources/post-and-verify-hybrid.cgi:
+        * platform/chromium/test_expectations.txt:
+        * platform/win/fast/js/global-constructors-expected.txt:
+
 2010-06-29  James Robinson  <jamesr@chromium.org>
 

trunk/LayoutTests/http/tests/resources/post-and-verify-hybrid.cgi

@@ -1 +1 @@
 #!/usr/bin/perl -w
+
+use Config;
 
 print "Content-type: text/plain\n\n";
@@ -71 +73 @@
 
     if ($values{'convert_newlines'}) {
-        $nativeEnding = ($^O =~ /MSWin/) ? "\r\n" : "\n";
+        $nativeEnding = ($Config{osname} =~ /(MSWin|cygwin)/) ? "\r\n" : "\n";
         $postData =~ s/$nativeEnding/[NL]/g;
     }

trunk/LayoutTests/platform/chromium/test_expectations.txt

@@ -2877 +2877 @@
 BUG_HCLAM : fast/js/script-line-number.html = TEXT
 
-// Added by r61650
-BUG47259 WIN : http/tests/local/blob/send-data-blob.html = TEXT
-
 // LayoutTestController::isPageBoxVisible, pageAreaRectInPixels, and preferredPageSizeInPixels are not implemented yet for Chromium.
 BUGWK37538 : printing/page-format-data.html = TEXT

trunk/LayoutTests/platform/win/fast/js/global-constructors-expected.txt

@@ -8 +8 @@
 PASS BeforeLoadEvent.toString() is '[object BeforeLoadEventConstructor]'
 PASS Blob.toString() is '[object BlobConstructor]'
+PASS BlobBuilder.toString() is '[object BlobBuilderConstructor]'
 PASS CDATASection.toString() is '[object CDATASectionConstructor]'
 PASS CSSCharsetRule.toString() is '[object CSSCharsetRuleConstructor]'

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-06-29  Kinuko Yasuda  <kinuko@chromium.org>
+
+        Reviewed by Jian Li.
+
+        Fix http/tests/local/blob/send-data-blob.html on Windows
+        https://bugs.webkit.org/show_bug.cgi?id=41228
+
+        Fix a regression bug in the line-conversion code.
+        Rewrite the line-conversion function with simpler functions to
+        make it less error prone.
+
+        No new tests as this is for bug fixes.
+
+        * platform/BlobItem.cpp:
+        (WebCore::StringBlobItem::convertToCString):
+
 2010-06-29  Dumitru Daniliuc  <dumi@chromium.org>
 

trunk/WebCore/platform/BlobItem.cpp

@@ -34 +34 @@
 #include "FileSystem.h"
 #include "UUID.h"
+#include <wtf/Assertions.h>
 
 namespace WebCore {
@@ -125 +126 @@
 }
 
+// Normalize all line-endings to CRLF.
+static CString convertToCRLF(const CString& from)
+{
+    unsigned newLen = 0;
+    const char* p = from.data();
+    while (char c = *p++) {
+        if (c == '\r') {
+            // Safe to look ahead because of trailing '\0'.
+            if (*p != '\n') {
+                // Turn CR into CRLF.
+                newLen += 2;
+            }
+        } else if (c == '\n') {
+            // Turn LF into CRLF.
+            newLen += 2;
+        } else {
+            // Leave other characters alone.
+            newLen += 1;
+        }
+    }
+    if (newLen == from.length())
+        return from;
+
+    // Make a copy of the string.
+    p = from.data();
+    char* q;
+    CString result = CString::newUninitialized(newLen, q);
+    while (char c = *p++) {
+        if (c == '\r') {
+            // Safe to look ahead because of trailing '\0'.
+            if (*p != '\n') {
+                // Turn CR into CRLF.
+                *q++ = '\r';
+                *q++ = '\n';
+            }
+        } else if (c == '\n') {
+            // Turn LF into CRLF.
+            *q++ = '\r';
+            *q++ = '\n';
+        } else {
+            // Leave other characters alone.
+            *q++ = c;
+        }
+    }
+    return result;
+}
+
+// Normalize all line-endings to CR or LF.
+static CString convertToCROrLF(const CString& from, bool toCR)
+{
+    unsigned newLen = 0;
+    bool needFix = false;
+    const char* p = from.data();
+    char fromEndingChar = toCR ? '\n' : '\r';
+    char toEndingChar = toCR ? '\r' : '\n';
+    while (char c = *p++) {
+        if (c == '\r' && *p == '\n') {
+            // Turn CRLF into CR or LF.
+            p++;
+            needFix = true;
+        } else if (c == fromEndingChar) {
+            // Turn CR/LF into LF/CR.
+            needFix = true;
+        }
+        newLen += 1;
+    }
+    if (!needFix)
+        return from;
+
+    // Make a copy of the string.
+    p = from.data();
+    char* q;
+    CString result = CString::newUninitialized(newLen, q);
+    while (char c = *p++) {
+        if (c == '\r' && *p == '\n') {
+            // Turn CRLF or CR into CR or LF.
+            p++;
+            *q++ = toEndingChar;
+        } else if (c == fromEndingChar) {
+            // Turn CR/LF into LF/CR.
+            *q++ = toEndingChar;
+        } else {
+            // Leave other characters alone.
+            *q++ = c;
+        }
+    }
+    return result;
+}
+
 CString StringBlobItem::convertToCString(const String& text, LineEnding ending, TextEncoding encoding)
 {
     CString from = encoding.encode(text.characters(), text.length(), EntitiesForUnencodables);
-    CString result = from;
-
-    if (ending == EndingTransparent)
-        return result;
 
     if (ending == EndingNative) {
@@ -141 +227 @@
     }
 
-    const char* endingChars = (ending == EndingCRLF) ? "\r\n" : ((ending == EndingCR) ? "\r" : "\n");
-
-    int endingLength = (ending == EndingCRLF) ? 2 : 1;
-    int needFix = 0;
-
-    // Calculate the final length.
-    int calculatedLength = from.length();
-    const char* p = from.data();
-    while (char c = *p++) {
-        if (c == '\r') {
-            // Safe to look ahead because of trailing '\0'.
-            if (*p == '\n' && ending != EndingCRLF) {
-                p++;
-                calculatedLength += (endingLength - 2);
-                ++needFix;
-            } else if (ending != EndingCR) {
-                calculatedLength += (endingLength - 1);
-                ++needFix;
-            }
-        } else if (c == '\n' && ending != EndingLF) {
-            calculatedLength += (endingLength - 1);
-            ++needFix;
-        }
-    }
-
-    if (!needFix)
-        return result;
-
-    // Convert the endings and create a data buffer.
-    p = from.data();
-    char* q;
-    result = CString::newUninitialized(calculatedLength, q);
-    while (char c = *p++) {
-        if (c == '\r') {
-            if (*p == '\n' && ending != EndingCRLF) {
-                p++;
-                memcpy(q, endingChars, endingLength);
-                q += endingLength;
-            } else if (*p != '\n' && ending != EndingCR) {
-                memcpy(q, endingChars, endingLength);
-                q += endingLength;
-            }
-        } else if (c == '\n' && ending != EndingLF) {
-            memcpy(q, endingChars, endingLength);
-            q += endingLength;
-        } else {
-            // Leave other characters alone.
-            *q++ = c;
-        }
-    }
-    return result;
+    switch (ending) {
+    case EndingTransparent:
+        return from;
+    case EndingCRLF:
+        return convertToCRLF(from);
+    case EndingCR:
+        return convertToCROrLF(from, true);
+    case EndingLF:
+        return convertToCROrLF(from, false);
+    default:
+        ASSERT_NOT_REACHED();
+    }
+
+    ASSERT_NOT_REACHED();
+    return from;
 }