Changeset 21497 in webkit


Ignore:
Timestamp:
May 15, 2007 3:03:05 PM (17 years ago)
Author:
beidson
Message:

LayoutTests:

Reviewed by Brady

  • http/tests/misc/multipart-expected.txt: Added.
  • http/tests/misc/multipart.html: Added.
  • http/tests/misc/resources/1x1-blue.png: Added.
  • http/tests/misc/resources/multipart.php: Added.

WebCore:

Reviewed by Brady

Test: http/tests/misc/multipart.html

  • loader/ResourceLoader.cpp: (WebCore::ResourceLoader::didFail): Avoid calling didFailToLoad() if didFinishLoad() has already been called (when the first part of a multipart resource arrived). (WebCore::ResourceLoader::didCancel): Ditto.
Location:
trunk
Files:
4 added
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r21489 r21497  
     12007-05-15  Mitz Pettel  <mitz@webkit.org>
     2
     3        Reviewed by Brady
     4
     5        - test for http://bugs.webkit.org/show_bug.cgi?id=13360
     6          REGRESSION: Crash closing live web cam viewer page
     7
     8        * http/tests/misc/multipart-expected.txt: Added.
     9        * http/tests/misc/multipart.html: Added.
     10        * http/tests/misc/resources/1x1-blue.png: Added.
     11        * http/tests/misc/resources/multipart.php: Added.
     12
    1132007-05-15  Sam Weinig  <sam@webkit.org>
    214

  • trunk/WebCore/ChangeLog

    r21489 r21497  
     12007-05-15  Mitz Pettel  <mitz@webkit.org>
     2
     3        Reviewed by Brady
     4
     5        - fix http://bugs.webkit.org/show_bug.cgi?id=13360
     6          REGRESSION: Crash closing live web cam viewer page
     7
     8        Test: http/tests/misc/multipart.html
     9
     10        * loader/ResourceLoader.cpp:
     11        (WebCore::ResourceLoader::didFail): Avoid calling didFailToLoad() if
     12        didFinishLoad() has already been called (when the first part of a
     13        multipart resource arrived).
     14        (WebCore::ResourceLoader::didCancel): Ditto.
     15
    1162007-05-15  Sam Weinig  <sam@webkit.org>
    217

  • trunk/WebCore/loader/ResourceLoader.cpp

    r20227 r21497  
    251251    RefPtr<ResourceLoader> protector(this);
    252252
    253     frameLoader()->didFailToLoad(this, error);
     253    if (!m_calledDidFinishLoad)
     254        frameLoader()->didFailToLoad(this, error);
    254255
    255256    releaseResources();
    … …  
    281282        m_handle = 0;
    282283    }
    283     frameLoader()->didFailToLoad(this, error);
     284    if (!m_calledDidFinishLoad)
     285        frameLoader()->didFailToLoad(this, error);
    284286
    285287    releaseResources();
Note: See TracChangeset for help on using the changeset viewer.