Changeset 127695 in webkit


Ignore:
Timestamp:
Sep 5, 2012 10:51:46 PM (12 years ago)
Author:
Nate Chapin
Message:

Remove duplicate error() impls in CachedResource subclasses
​https://bugs.webkit.org/show_bug.cgi?id=81161

Reviewed by Antti Koivisto.

No new tests, refactor only.

  • loader/cache/CachedCSSStyleSheet.cpp:
  • loader/cache/CachedCSSStyleSheet.h:
  • loader/cache/CachedFont.cpp:
  • loader/cache/CachedFont.h:
  • loader/cache/CachedImage.cpp:
  • loader/cache/CachedResource.h: Make checkNotify()

virtual, so the right checkNotify() gets called in error().

  • loader/cache/CachedScript.cpp:
  • loader/cache/CachedScript.h:
  • loader/cache/CachedXSLStyleSheet.cpp:
  • loader/cache/CachedXSLStyleSheet.h:
Location:
trunk/Source/WebCore
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r127693 r127695  
     12012-09-05  Nate Chapin  <japhet@chromium.org>
     2
     3        Remove duplicate error() impls in CachedResource subclasses
     4        https://bugs.webkit.org/show_bug.cgi?id=81161
     5
     6        Reviewed by Antti Koivisto.
     7
     8        No new tests, refactor only.
     9
     10        * loader/cache/CachedCSSStyleSheet.cpp:
     11        * loader/cache/CachedCSSStyleSheet.h:
     12        * loader/cache/CachedFont.cpp:
     13        * loader/cache/CachedFont.h:
     14        * loader/cache/CachedImage.cpp:
     15        * loader/cache/CachedResource.h: Make checkNotify()
     16             virtual, so the right checkNotify() gets called in error().
     17        * loader/cache/CachedScript.cpp:
     18        * loader/cache/CachedScript.h:
     19        * loader/cache/CachedXSLStyleSheet.cpp:
     20        * loader/cache/CachedXSLStyleSheet.h:
     21
    1222012-09-05  James Robinson  <jamesr@chromium.org>
    223

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

    r127593 r127695  
    121121    while (CachedStyleSheetClient* c = w.next())
    122122        c->setCSSStyleSheet(m_resourceRequest.url(), m_response.url(), m_decoder->encoding().name(), this);
    123 }
    124 
    125 void CachedCSSStyleSheet::error(CachedResource::Status status)
    126 {
    127     setStatus(status);
    128     ASSERT(errorOccurred());
    129     setLoading(false);
    130     checkNotify();
    131123}
    132124

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

    r124744 r127695  
    5151        virtual String encoding() const;
    5252        virtual void data(PassRefPtr<SharedBuffer> data, bool allDataReceived);
    53         virtual void error(CachedResource::Status);
    54 
    5553        virtual void destroyDecodedData() OVERRIDE;
    56 
    57         void checkNotify();
    5854
    5955        PassRefPtr<StyleSheetContents> restoreParsedStyleSheet(const CSSParserContext&);
    … …  
    6763
    6864    protected:
     65        virtual void checkNotify();
     66
    6967        RefPtr<TextResourceDecoder> m_decoder;
    7068        String m_decodedSheetText;

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

    r127593 r127695  
    199199}
    200200
    201 
    202 void CachedFont::error(CachedResource::Status status)
    203 {
    204     setStatus(status);
    205     ASSERT(errorOccurred());
    206     setLoading(false);
    207     checkNotify();
    208 }
    209 
    210201void CachedFont::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
    211202{

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

    r124744 r127695  
    5454    virtual void didAddClient(CachedResourceClient*);
    5555    virtual void data(PassRefPtr<SharedBuffer> data, bool allDataReceived);
    56     virtual void error(CachedResource::Status);
    5756
    5857    virtual void allClientsRemoved();
    59 
    60     void checkNotify();
    61 
    6258    void beginLoadIfNeeded(CachedResourceLoader* dl);
    6359    bool stillNeedsLoad() const { return !m_loadInitiated; }
    … …  
    7470
    7571private:
     72    virtual void checkNotify();
    7673    FontCustomPlatformData* m_fontData;
    7774    bool m_loadInitiated;

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

    r127593 r127695  
    386386    checkShouldPaintBrokenImage();
    387387    clear();
    388     setStatus(status);
    389     ASSERT(errorOccurred());
    390     m_data.clear();
     388    CachedResource::error(status);
    391389    notifyObservers();
    392     setLoading(false);
    393     checkNotify();
    394390}
    395391

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

    r124744 r127695  
    255255
    256256protected:
    257     void checkNotify();
     257    virtual void checkNotify();
    258258
    259259    void setEncodedSize(unsigned);

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

    r127593 r127695  
    9191}
    9292
    93 void CachedScript::error(CachedResource::Status status)
    94 {
    95     setStatus(status);
    96     ASSERT(errorOccurred());
    97     setLoading(false);
    98     checkNotify();
    99 }
    100 
    10193void CachedScript::destroyDecodedData()
    10294{

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

    r124744 r127695  
    5151        virtual String encoding() const;
    5252        virtual void data(PassRefPtr<SharedBuffer> data, bool allDataReceived);
    53         virtual void error(Status);
    5453
    5554        virtual void destroyDecodedData();

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

    r127593 r127695  
    9090}
    9191
    92 void CachedXSLStyleSheet::error(CachedResource::Status status)
    93 {
    94     setStatus(status);
    95     ASSERT(errorOccurred());
    96     setLoading(false);
    97     checkNotify();
    98 }
    99 
    10092void CachedXSLStyleSheet::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
    10193{

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

    r124744 r127695  
    4848        virtual String encoding() const;
    4949        virtual void data(PassRefPtr<SharedBuffer> data, bool allDataReceived);
    50         virtual void error(CachedResource::Status);
    51        
    52         void checkNotify();
    5350       
    5451        virtual void reportMemoryUsage(MemoryObjectInfo*) const OVERRIDE;
    5552
    5653    protected:
     54        virtual void checkNotify();
     55
    5756        String m_sheet;
    5857        RefPtr<TextResourceDecoder> m_decoder;
Note: See TracChangeset for help on using the changeset viewer.