Changeset 68242 in webkit


Ignore:
Timestamp:
Sep 24, 2010 1:15:20 AM (14 years ago)
Author:
commit-queue@webkit.org
Message:

2010-09-24 Eric Uhrhane <​ericu@chromium.org>

Reviewed by David Levin.

Remove unnecessary parameter from AsyncFileWriterClient::didTruncate
​https://bugs.webkit.org/show_bug.cgi?id=46390

  • fileapi/AsyncFileWriterClient.h:

Added state to FileWriter to replace the parameter.

  • fileapi/FileWriter.h:
  • fileapi/FileWriter.cpp: (WebCore::FileWriter::truncate): (WebCore::FileWriter::didTruncate):

2010-09-24 Eric Uhrhane <​ericu@chromium.org>

Reviewed by David Levin.

Remove unnecessary parameter from AsyncFileWriterClient::didTruncate
​https://bugs.webkit.org/show_bug.cgi?id=46390

  • public/WebFileWriterClient.h:
  • src/AsyncFileWriterChromium.cpp:
  • src/AsyncFileWriterChromium.h:
Location:
trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebCore/ChangeLog

    r68241 r68242  
     12010-09-24  Eric Uhrhane  <ericu@chromium.org>
     2
     3        Reviewed by David Levin.
     4
     5        Remove unnecessary parameter from AsyncFileWriterClient::didTruncate
     6        https://bugs.webkit.org/show_bug.cgi?id=46390
     7
     8        * fileapi/AsyncFileWriterClient.h:
     9
     10        Added state to FileWriter to replace the parameter.
     11        * fileapi/FileWriter.h:
     12        * fileapi/FileWriter.cpp:
     13        (WebCore::FileWriter::truncate):
     14        (WebCore::FileWriter::didTruncate):
     15
    1162010-09-24  Sheriff Bot  <webkit.review.bot@gmail.com>
    217

  • trunk/WebCore/fileapi/AsyncFileWriterClient.h

    r68180 r68242  
    4343
    4444    virtual void didWrite(long long bytes, bool complete) = 0;
    45     virtual void didTruncate(long long position) = 0;
     45    virtual void didTruncate() = 0;
    4646    virtual void didFail(ExceptionCode) = 0;
    4747};

  • trunk/WebCore/fileapi/FileWriter.cpp

    r67614 r68242  
    4949    , m_bytesWritten(0)
    5050    , m_bytesToWrite(0)
     51    , m_truncateLength(-1)
    5152{
    5253}
    … …  
    123124{
    124125    ASSERT(m_writer);
    125     if (m_readyState == WRITING || position >= m_length) {
     126    if (m_readyState == WRITING || position < 0) {
    126127        ec = INVALID_STATE_ERR;
    127128        m_error = FileError::create(ec);
    … …  
    131132    m_bytesWritten = 0;
    132133    m_bytesToWrite = 0;
     134    m_truncateLength = position;
    133135    fireEvent(eventNames().writestartEvent);
    134136    m_writer->truncate(position);
    … …  
    168170}
    169171
    170 void FileWriter::didTruncate(long long length)
    171 {
    172     ASSERT(length > 0);
    173     ASSERT(length >= 0);
    174     ASSERT(length < m_length);
    175     m_length = length;
     172void FileWriter::didTruncate()
     173{
     174    ASSERT(m_truncateLength >= 0);
     175    m_length = m_truncateLength;
    176176    if (m_position > m_length)
    177177        m_position = m_length;
    178178    m_readyState = DONE;
     179    m_truncateLength = -1;
    179180    fireEvent(eventNames().writeEvent);
    180181    fireEvent(eventNames().writeendEvent);

  • trunk/WebCore/fileapi/FileWriter.h

    r68180 r68242  
    7777    // AsyncFileWriterClient
    7878    void didWrite(long long bytes, bool complete);
    79     void didTruncate(long long length);
     79    void didTruncate();
    8080    void didFail(ExceptionCode ec);
    8181
    … …  
    122122    long long m_bytesWritten;
    123123    long long m_bytesToWrite;
     124    long long m_truncateLength;
    124125};
    125126

  • trunk/WebKit/chromium/ChangeLog

    r68240 r68242  
     12010-09-24  Eric Uhrhane  <ericu@chromium.org>
     2
     3        Reviewed by David Levin.
     4
     5        Remove unnecessary parameter from AsyncFileWriterClient::didTruncate
     6        https://bugs.webkit.org/show_bug.cgi?id=46390
     7
     8        * public/WebFileWriterClient.h:
     9        * src/AsyncFileWriterChromium.cpp:
     10        * src/AsyncFileWriterChromium.h:
     11
    1122010-09-24  Chris Guillory   <chris.guillory@google.com>
    213

  • trunk/WebKit/chromium/public/WebFileWriterClient.h

    r67446 r68242  
    4444
    4545    // Called once when the truncate completes successfully.
    46     virtual void didTruncate(long long length) = 0;
     46    virtual void didTruncate() = 0;
    4747
    4848    // Called if the write or truncate fails, or if it is cancelled before the write or truncate completes.  Completion of an operation will be signalled exactly once, either by didFail, didTruncate, or didWrite(..., true).

  • trunk/WebKit/chromium/src/AsyncFileWriterChromium.cpp

    r68180 r68242  
    7979}
    8080
    81 void AsyncFileWriterChromium::didTruncate(long long length)
     81void AsyncFileWriterChromium::didTruncate()
    8282{
    83     m_client->didTruncate(length);
     83    m_client->didTruncate();
    8484}
    8585

  • trunk/WebKit/chromium/src/AsyncFileWriterChromium.h

    r68180 r68242  
    6262    // WebFileWriterClient
    6363    virtual void didWrite(long long bytes, bool complete);
    64     virtual void didTruncate(long long length);
     64    virtual void didTruncate();
    6565    virtual void didFail(WebKit::WebFileError);
    6666
Note: See TracChangeset for help on using the changeset viewer.