Diff
Modified: trunk/LayoutTests/ChangeLog (118811 => 118812)
--- trunk/LayoutTests/ChangeLog 2012-05-29 18:39:32 UTC (rev 118811)
+++ trunk/LayoutTests/ChangeLog 2012-05-29 18:42:01 UTC (rev 118812)
@@ -1,3 +1,20 @@
+2012-05-29 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r118620.
+ http://trac.webkit.org/changeset/118620
+ https://bugs.webkit.org/show_bug.cgi?id=87760
+
+ This patch causes regression to read an empty file/blob via
+ FileReader (Requested by jianli on #webkit).
+
+ * fast/files/blob-slice-test-expected.txt:
+ * fast/files/read-blob-async-expected.txt:
+ * fast/files/read-file-async-expected.txt:
+ * fast/files/resources/read-common.js:
+ (logResult):
+ * fast/files/workers/worker-read-blob-async-expected.txt:
+ * fast/files/workers/worker-read-file-async-expected.txt:
+
2012-05-29 Jessie Berlin <[email protected]>
[Win] ASSERT(m_manualStream) failed in PluginView::didFinishLoading running
Modified: trunk/LayoutTests/fast/files/blob-slice-test-expected.txt (118811 => 118812)
--- trunk/LayoutTests/fast/files/blob-slice-test-expected.txt 2012-05-29 18:39:32 UTC (rev 118811)
+++ trunk/LayoutTests/fast/files/blob-slice-test-expected.txt 2012-05-29 18:42:01 UTC (rev 118812)
@@ -1,28 +1,28 @@
Slicing from 2 to 3: 2
Slicing from 2 to 12: 23456789
-Slicing from 2 to 2: null
-Slicing from 2 to 1: null
-Slicing from 2 to -12: null
+Slicing from 2 to 2:
+Slicing from 2 to 1:
+Slicing from 2 to -12:
Slicing from 2 to 2147483647: 23456789
-Slicing from 2 to -2147483648: null
+Slicing from 2 to -2147483648:
Slicing from 2 to 9223372036854775000: 23456789
-Slicing from 2 to -9223372036854775000: null
+Slicing from 2 to -9223372036854775000:
Slicing from -2 to -1: 8
-Slicing from -2 to -2: null
-Slicing from -2 to -3: null
-Slicing from -2 to -12: null
+Slicing from -2 to -2:
+Slicing from -2 to -3:
+Slicing from -2 to -12:
Slicing from -2 to 2147483647: 89
-Slicing from -2 to -2147483648: null
+Slicing from -2 to -2147483648:
Slicing from -2 to 9223372036854775000: 89
-Slicing from -2 to -9223372036854775000: null
+Slicing from -2 to -9223372036854775000:
Slicing from 0: 0123456789
Slicing from 2: 23456789
Slicing from -2: 89
-Slicing from 12: null
+Slicing from 12:
Slicing from -12: 0123456789
-Slicing from 2147483647: null
+Slicing from 2147483647:
Slicing from -2147483648: 0123456789
-Slicing from 9223372036854775000: null
+Slicing from 9223372036854775000:
Slicing from -9223372036854775000: 0123456789
Slicing without parameters: 0123456789
Modified: trunk/LayoutTests/fast/files/read-blob-async-expected.txt (118811 => 118812)
--- trunk/LayoutTests/fast/files/read-blob-async-expected.txt 2012-05-29 18:39:32 UTC (rev 118811)
+++ trunk/LayoutTests/fast/files/read-blob-async-expected.txt 2012-05-29 18:42:01 UTC (rev 118812)
@@ -17,7 +17,8 @@
readyState: 1
Received load event
readyState: 2
-result: null
+result size: 0
+result:
Received loadend event
Test reading a blob containing empty text
readyState: 0
@@ -25,7 +26,8 @@
readyState: 1
Received load event
readyState: 2
-result: null
+result size: 0
+result:
Received loadend event
Test reading a blob containing empty files and empty texts
readyState: 0
@@ -33,7 +35,8 @@
readyState: 1
Received load event
readyState: 2
-result: null
+result size: 0
+result:
Received loadend event
Test reading a blob containing single file
readyState: 0
Modified: trunk/LayoutTests/fast/files/read-file-async-expected.txt (118811 => 118812)
--- trunk/LayoutTests/fast/files/read-file-async-expected.txt 2012-05-29 18:39:32 UTC (rev 118811)
+++ trunk/LayoutTests/fast/files/read-file-async-expected.txt 2012-05-29 18:42:01 UTC (rev 118812)
@@ -38,7 +38,8 @@
readyState: 1
Received load event
readyState: 2
-result: null
+result size: 0
+result:
Received loadend event
Test reading an empty file as text
readyState: 0
@@ -46,7 +47,8 @@
readyState: 1
Received load event
readyState: 2
-result: null
+result size: 0
+result:
Received loadend event
Test reading an empty file as data URL
readyState: 0
@@ -188,7 +190,7 @@
result: Hello
Received loadend event
readyState after recalling read method: 1
-result after recalling read method: null
+result after recalling read method:
error after recalling read method: null
Received loadstart event
readyState: 1
@@ -204,7 +206,7 @@
error code: 1
Received loadend event
readyState after recalling read method: 1
-result after recalling read method: null
+result after recalling read method:
error after recalling read method: null
Received loadstart event
readyState: 1
Modified: trunk/LayoutTests/fast/files/resources/read-common.js (118811 => 118812)
--- trunk/LayoutTests/fast/files/resources/read-common.js 2012-05-29 18:39:32 UTC (rev 118811)
+++ trunk/LayoutTests/fast/files/resources/read-common.js 2012-05-29 18:42:01 UTC (rev 118812)
@@ -168,13 +168,9 @@
return new FileReaderSync();
}
-// 'result' can be an ArrayBuffer object, a string or null.
+// 'result' can be either an ArrayBuffer object or a string.
function logResult(result)
{
- if (result === null) {
- log("result: null");
- return;
- }
if (typeof result == 'object') {
log("result size: " + result.byteLength);
result = new Uint8Array(result, 0, result.byteLength);
Modified: trunk/LayoutTests/fast/files/workers/worker-read-blob-async-expected.txt (118811 => 118812)
--- trunk/LayoutTests/fast/files/workers/worker-read-blob-async-expected.txt 2012-05-29 18:39:32 UTC (rev 118811)
+++ trunk/LayoutTests/fast/files/workers/worker-read-blob-async-expected.txt 2012-05-29 18:42:01 UTC (rev 118812)
@@ -18,7 +18,8 @@
readyState: 1
Received load event
readyState: 2
-result: null
+result size: 0
+result:
Received loadend event
Test reading a blob containing empty text
readyState: 0
@@ -26,7 +27,8 @@
readyState: 1
Received load event
readyState: 2
-result: null
+result size: 0
+result:
Received loadend event
Test reading a blob containing empty files and empty texts
readyState: 0
@@ -34,7 +36,8 @@
readyState: 1
Received load event
readyState: 2
-result: null
+result size: 0
+result:
Received loadend event
Test reading a blob containing single file
readyState: 0
Modified: trunk/LayoutTests/fast/files/workers/worker-read-file-async-expected.txt (118811 => 118812)
--- trunk/LayoutTests/fast/files/workers/worker-read-file-async-expected.txt 2012-05-29 18:39:32 UTC (rev 118811)
+++ trunk/LayoutTests/fast/files/workers/worker-read-file-async-expected.txt 2012-05-29 18:42:01 UTC (rev 118812)
@@ -39,7 +39,8 @@
readyState: 1
Received load event
readyState: 2
-result: null
+result size: 0
+result:
Received loadend event
Test reading an empty file as text
readyState: 0
@@ -47,7 +48,8 @@
readyState: 1
Received load event
readyState: 2
-result: null
+result size: 0
+result:
Received loadend event
Test reading an empty file as data URL
readyState: 0
@@ -189,7 +191,7 @@
result: Hello
Received loadend event
readyState after recalling read method: 1
-result after recalling read method: null
+result after recalling read method:
error after recalling read method: null
Received loadstart event
readyState: 1
@@ -205,7 +207,7 @@
error code: 1
Received loadend event
readyState after recalling read method: 1
-result after recalling read method: null
+result after recalling read method:
error after recalling read method: null
Received loadstart event
readyState: 1
Modified: trunk/Source/WebCore/ChangeLog (118811 => 118812)
--- trunk/Source/WebCore/ChangeLog 2012-05-29 18:39:32 UTC (rev 118811)
+++ trunk/Source/WebCore/ChangeLog 2012-05-29 18:42:01 UTC (rev 118812)
@@ -1,3 +1,15 @@
+2012-05-29 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r118620.
+ http://trac.webkit.org/changeset/118620
+ https://bugs.webkit.org/show_bug.cgi?id=87760
+
+ This patch causes regression to read an empty file/blob via
+ FileReader (Requested by jianli on #webkit).
+
+ * fileapi/FileReader.cpp:
+ (WebCore::FileReader::stringResult):
+
2012-05-29 Andreas Kling <[email protected]>
Make StylePropertySet a variable-sized object to reduce memory use.
Modified: trunk/Source/WebCore/fileapi/FileReader.cpp (118811 => 118812)
--- trunk/Source/WebCore/fileapi/FileReader.cpp 2012-05-29 18:39:32 UTC (rev 118811)
+++ trunk/Source/WebCore/fileapi/FileReader.cpp 2012-05-29 18:42:01 UTC (rev 118812)
@@ -255,10 +255,7 @@
String FileReader::stringResult()
{
- String ret = m_loader ? m_loader->stringResult() : "";
- if (ret.isEmpty())
- return String();
- return ret;
+ return m_loader ? m_loader->stringResult() : "";
}
} // namespace WebCore
