Changeset 69140 in webkit
- Timestamp:
- Oct 5, 2010 1:28:59 PM (14 years ago)
- Location:
- trunk/WebCore
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/ChangeLog
r69138 r69140 1 2010-10-05 Eric Uhrhane <ericu@chromium.org> 2 3 Reviewed by David Levin. 4 5 Relax restrictions on FileWriter::didWrite calls 6 https://bugs.webkit.org/show_bug.cgi?id=47139 7 8 No new tests; they're still waiting on the first implementation. 9 10 * fileapi/FileWriter.cpp: 11 (WebCore::FileWriter::FileWriter): 12 (WebCore::FileWriter::write): 13 (WebCore::FileWriter::didWrite): 14 * fileapi/FileWriter.h: 15 1 16 2010-10-05 Daniel Cheng <dcheng@chromium.org> 2 17 -
trunk/WebCore/fileapi/FileWriter.cpp
r68483 r69140 47 47 , m_readyState(INIT) 48 48 , m_position(0) 49 , m_startedWriting(false) 49 50 , m_bytesWritten(0) 50 51 , m_bytesToWrite(0) … … 93 94 return; 94 95 } 96 if (!data) { 97 ec = TYPE_MISMATCH_ERR; 98 m_error = FileError::create(ec); 99 return; 100 } 95 101 96 102 m_readyState = WRITING; 103 m_startedWriting = false; 97 104 m_bytesWritten = 0; 98 105 m_bytesToWrite = data->size(); … … 150 157 void FileWriter::didWrite(long long bytes, bool complete) 151 158 { 152 ASSERT(bytes > 0);153 159 ASSERT(bytes + m_bytesWritten > 0); 154 160 ASSERT(bytes + m_bytesWritten <= m_bytesToWrite); 155 if (!m_ bytesWritten)161 if (!m_startedWriting) { 156 162 fireEvent(eventNames().writestartEvent); 163 m_startedWriting = true; 164 } 157 165 m_bytesWritten += bytes; 158 ASSERT((m_bytesWritten == m_bytesToWrite) ==complete);166 ASSERT((m_bytesWritten == m_bytesToWrite) || !complete); 159 167 m_position += bytes; 160 168 if (m_position > m_length) -
trunk/WebCore/fileapi/FileWriter.h
r68242 r69140 120 120 long long m_position; 121 121 long long m_length; 122 bool m_startedWriting; 122 123 long long m_bytesWritten; 123 124 long long m_bytesToWrite;
Note: See TracChangeset
for help on using the changeset viewer.