Changeset 110986 in webkit


Ignore:
Timestamp:
Mar 16, 2012 4:29:15 AM (12 years ago)
Author:
commit-queue@webkit.org
Message:

Unreviewed, rolling out r110976.
​http://trac.webkit.org/changeset/110976
​https://bugs.webkit.org/show_bug.cgi?id=81330

webkit_unit_tests crashes. (Requested by morrita on #webkit).

Patch by Sheriff Bot <​webkit.review.bot@gmail.com> on 2012-03-16

  • loader/cache/CachedCSSStyleSheet.cpp:

(WebCore::CachedCSSStyleSheet::error):
(WebCore):

  • loader/cache/CachedCSSStyleSheet.h:

(CachedCSSStyleSheet):

  • loader/cache/CachedFont.cpp:

(WebCore):
(WebCore::CachedFont::error):

  • loader/cache/CachedFont.h:

(CachedFont):

  • loader/cache/CachedImage.cpp:

(WebCore::CachedImage::error):

  • loader/cache/CachedResource.h:

(CachedResource):

  • loader/cache/CachedScript.cpp:

(WebCore::CachedScript::error):
(WebCore):

  • loader/cache/CachedScript.h:

(CachedScript):

  • loader/cache/CachedXSLStyleSheet.cpp:

(WebCore::CachedXSLStyleSheet::error):
(WebCore):

  • loader/cache/CachedXSLStyleSheet.h:

(CachedXSLStyleSheet):

Location:
trunk/Source/WebCore
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r110985 r110986  
     12012-03-16  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r110976.
     4        http://trac.webkit.org/changeset/110976
     5        https://bugs.webkit.org/show_bug.cgi?id=81330
     6
     7        webkit_unit_tests crashes. (Requested by morrita on #webkit).
     8
     9        * loader/cache/CachedCSSStyleSheet.cpp:
     10        (WebCore::CachedCSSStyleSheet::error):
     11        (WebCore):
     12        * loader/cache/CachedCSSStyleSheet.h:
     13        (CachedCSSStyleSheet):
     14        * loader/cache/CachedFont.cpp:
     15        (WebCore):
     16        (WebCore::CachedFont::error):
     17        * loader/cache/CachedFont.h:
     18        (CachedFont):
     19        * loader/cache/CachedImage.cpp:
     20        (WebCore::CachedImage::error):
     21        * loader/cache/CachedResource.h:
     22        (CachedResource):
     23        * loader/cache/CachedScript.cpp:
     24        (WebCore::CachedScript::error):
     25        (WebCore):
     26        * loader/cache/CachedScript.h:
     27        (CachedScript):
     28        * loader/cache/CachedXSLStyleSheet.cpp:
     29        (WebCore::CachedXSLStyleSheet::error):
     30        (WebCore):
     31        * loader/cache/CachedXSLStyleSheet.h:
     32        (CachedXSLStyleSheet):
     33
    1342012-03-16  Luke Macpherson   <macpherson@chromium.org>
    235

  • trunk/Source/WebCore/loader/cache/CachedCSSStyleSheet.cpp

    r110976 r110986  
    118118}
    119119
     120void CachedCSSStyleSheet::error(CachedResource::Status status)
     121{
     122    setStatus(status);
     123    ASSERT(errorOccurred());
     124    setLoading(false);
     125    checkNotify();
     126}
     127
    120128bool CachedCSSStyleSheet::canUseSheet(bool enforceMIMEType, bool* hasValidMIMEType) const
    121129{

  • trunk/Source/WebCore/loader/cache/CachedCSSStyleSheet.h

    r110976 r110986  
    5050        virtual String encoding() const;
    5151        virtual void data(PassRefPtr<SharedBuffer> data, bool allDataReceived);
     52        virtual void error(CachedResource::Status);
     53
     54        void checkNotify();
    5255   
    5356    private:
    … …  
    5659
    5760    protected:
    58         virtual void checkNotify();
    59 
    6061        RefPtr<TextResourceDecoder> m_decoder;
    6162        String m_decodedSheetText;

  • trunk/Source/WebCore/loader/cache/CachedFont.cpp

    r110976 r110986  
    199199}
    200200
    201 }
     201
     202void CachedFont::error(CachedResource::Status status)
     203{
     204    setStatus(status);
     205    ASSERT(errorOccurred());
     206    setLoading(false);
     207    checkNotify();
     208}
     209
     210}

  • trunk/Source/WebCore/loader/cache/CachedFont.h

    r110976 r110986  
    5454    virtual void didAddClient(CachedResourceClient*);
    5555    virtual void data(PassRefPtr<SharedBuffer> data, bool allDataReceived);
     56    virtual void error(CachedResource::Status);
    5657
    5758    virtual void allClientsRemoved();
     59
     60    void checkNotify();
     61
    5862    void beginLoadIfNeeded(CachedResourceLoader* dl);
    5963    bool stillNeedsLoad() const { return !m_loadInitiated; }
    … …  
    6872
    6973private:
    70     virtual void checkNotify();
    7174    FontCustomPlatformData* m_fontData;
    7275    bool m_loadInitiated;

  • trunk/Source/WebCore/loader/cache/CachedImage.cpp

    r110976 r110986  
    381381void CachedImage::error(CachedResource::Status status)
    382382{
    383     CachedResource::error(status);
    384383    checkShouldPaintBrokenImage();
    385384    clear();
     385    setStatus(status);
     386    ASSERT(errorOccurred());
    386387    m_data.clear();
    387388    notifyObservers();
     389    setLoading(false);
     390    checkNotify();
    388391}
    389392

  • trunk/Source/WebCore/loader/cache/CachedResource.h

    r110976 r110986  
    249249
    250250protected:
    251     virtual void checkNotify();
     251    void checkNotify();
    252252
    253253    void setEncodedSize(unsigned);

  • trunk/Source/WebCore/loader/cache/CachedScript.cpp

    r110976 r110986  
    105105}
    106106
     107void CachedScript::error(CachedResource::Status status)
     108{
     109    setStatus(status);
     110    ASSERT(errorOccurred());
     111    setLoading(false);
     112    checkNotify();
     113}
     114
    107115void CachedScript::destroyDecodedData()
    108116{

  • trunk/Source/WebCore/loader/cache/CachedScript.h

    r110976 r110986  
    5454        virtual String encoding() const;
    5555        virtual void data(PassRefPtr<SharedBuffer> data, bool allDataReceived);
     56        virtual void error(Status);
    5657
    5758        virtual void destroyDecodedData();

  • trunk/Source/WebCore/loader/cache/CachedXSLStyleSheet.cpp

    r110976 r110986  
    8989}
    9090
     91void CachedXSLStyleSheet::error(CachedResource::Status status)
     92{
     93    setStatus(status);
     94    ASSERT(errorOccurred());
     95    setLoading(false);
     96    checkNotify();
     97}
     98
    9199#endif
    92100

  • trunk/Source/WebCore/loader/cache/CachedXSLStyleSheet.h

    r110976 r110986  
    4747        virtual String encoding() const;
    4848        virtual void data(PassRefPtr<SharedBuffer> data, bool allDataReceived);
     49        virtual void error(CachedResource::Status);
     50       
     51        void checkNotify();
    4952       
    5053    protected:
    51         virtual void checkNotify();
    52 
    5354        String m_sheet;
    5455        RefPtr<TextResourceDecoder> m_decoder;
Note: See TracChangeset for help on using the changeset viewer.