Diff
Modified: trunk/Source/WebCore/ChangeLog (112200 => 112201)
--- trunk/Source/WebCore/ChangeLog 2012-03-27 03:16:34 UTC (rev 112200)
+++ trunk/Source/WebCore/ChangeLog 2012-03-27 03:50:00 UTC (rev 112201)
@@ -1,3 +1,24 @@
+2012-03-26 Nate Chapin <[email protected]>
+
+ Remove duplicate error() impls in CachedResource subclasses
+ https://bugs.webkit.org/show_bug.cgi?id=81161
+
+ Reviewed by Alexey Proskuryakov.
+
+ 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:
+
2012-03-26 Ken Buchanan <[email protected]>
Assert failure from capitalized RenderTextFragment
Modified: trunk/Source/WebCore/loader/cache/CachedCSSStyleSheet.cpp (112200 => 112201)
--- trunk/Source/WebCore/loader/cache/CachedCSSStyleSheet.cpp 2012-03-27 03:16:34 UTC (rev 112200)
+++ trunk/Source/WebCore/loader/cache/CachedCSSStyleSheet.cpp 2012-03-27 03:50:00 UTC (rev 112201)
@@ -117,14 +117,6 @@
c->setCSSStyleSheet(m_resourceRequest.url(), m_response.url(), m_decoder->encoding().name(), this);
}
-void CachedCSSStyleSheet::error(CachedResource::Status status)
-{
- setStatus(status);
- ASSERT(errorOccurred());
- setLoading(false);
- checkNotify();
-}
-
bool CachedCSSStyleSheet::canUseSheet(bool enforceMIMEType, bool* hasValidMIMEType) const
{
if (errorOccurred())
Modified: trunk/Source/WebCore/loader/cache/CachedCSSStyleSheet.h (112200 => 112201)
--- trunk/Source/WebCore/loader/cache/CachedCSSStyleSheet.h 2012-03-27 03:16:34 UTC (rev 112200)
+++ trunk/Source/WebCore/loader/cache/CachedCSSStyleSheet.h 2012-03-27 03:50:00 UTC (rev 112201)
@@ -49,15 +49,14 @@
virtual void setEncoding(const String&);
virtual String encoding() const;
virtual void data(PassRefPtr<SharedBuffer> data, bool allDataReceived);
- virtual void error(CachedResource::Status);
-
- void checkNotify();
private:
bool canUseSheet(bool enforceMIMEType, bool* hasValidMIMEType) const;
virtual PurgePriority purgePriority() const { return PurgeLast; }
protected:
+ virtual void checkNotify();
+
RefPtr<TextResourceDecoder> m_decoder;
String m_decodedSheetText;
};
Modified: trunk/Source/WebCore/loader/cache/CachedFont.cpp (112200 => 112201)
--- trunk/Source/WebCore/loader/cache/CachedFont.cpp 2012-03-27 03:16:34 UTC (rev 112200)
+++ trunk/Source/WebCore/loader/cache/CachedFont.cpp 2012-03-27 03:50:00 UTC (rev 112201)
@@ -198,13 +198,4 @@
c->fontLoaded(this);
}
-
-void CachedFont::error(CachedResource::Status status)
-{
- setStatus(status);
- ASSERT(errorOccurred());
- setLoading(false);
- checkNotify();
}
-
-}
Modified: trunk/Source/WebCore/loader/cache/CachedFont.h (112200 => 112201)
--- trunk/Source/WebCore/loader/cache/CachedFont.h 2012-03-27 03:16:34 UTC (rev 112200)
+++ trunk/Source/WebCore/loader/cache/CachedFont.h 2012-03-27 03:50:00 UTC (rev 112201)
@@ -53,12 +53,8 @@
virtual void didAddClient(CachedResourceClient*);
virtual void data(PassRefPtr<SharedBuffer> data, bool allDataReceived);
- virtual void error(CachedResource::Status);
virtual void allClientsRemoved();
-
- void checkNotify();
-
void beginLoadIfNeeded(CachedResourceLoader* dl);
bool stillNeedsLoad() const { return !m_loadInitiated; }
@@ -71,6 +67,7 @@
#endif
private:
+ virtual void checkNotify();
FontCustomPlatformData* m_fontData;
bool m_loadInitiated;
Modified: trunk/Source/WebCore/loader/cache/CachedImage.cpp (112200 => 112201)
--- trunk/Source/WebCore/loader/cache/CachedImage.cpp 2012-03-27 03:16:34 UTC (rev 112200)
+++ trunk/Source/WebCore/loader/cache/CachedImage.cpp 2012-03-27 03:50:00 UTC (rev 112201)
@@ -380,14 +380,11 @@
void CachedImage::error(CachedResource::Status status)
{
+ CachedResource::error(status);
checkShouldPaintBrokenImage();
clear();
- setStatus(status);
- ASSERT(errorOccurred());
m_data.clear();
notifyObservers();
- setLoading(false);
- checkNotify();
}
void CachedImage::setResponse(const ResourceResponse& response)
Modified: trunk/Source/WebCore/loader/cache/CachedResource.h (112200 => 112201)
--- trunk/Source/WebCore/loader/cache/CachedResource.h 2012-03-27 03:16:34 UTC (rev 112200)
+++ trunk/Source/WebCore/loader/cache/CachedResource.h 2012-03-27 03:50:00 UTC (rev 112201)
@@ -248,7 +248,7 @@
double loadFinishTime() const { return m_loadFinishTime; }
protected:
- void checkNotify();
+ virtual void checkNotify();
void setEncodedSize(unsigned);
void setDecodedSize(unsigned);
Modified: trunk/Source/WebCore/loader/cache/CachedScript.cpp (112200 => 112201)
--- trunk/Source/WebCore/loader/cache/CachedScript.cpp 2012-03-27 03:16:34 UTC (rev 112200)
+++ trunk/Source/WebCore/loader/cache/CachedScript.cpp 2012-03-27 03:50:00 UTC (rev 112201)
@@ -104,14 +104,6 @@
checkNotify();
}
-void CachedScript::error(CachedResource::Status status)
-{
- setStatus(status);
- ASSERT(errorOccurred());
- setLoading(false);
- checkNotify();
-}
-
void CachedScript::destroyDecodedData()
{
m_script = String();
Modified: trunk/Source/WebCore/loader/cache/CachedScript.h (112200 => 112201)
--- trunk/Source/WebCore/loader/cache/CachedScript.h 2012-03-27 03:16:34 UTC (rev 112200)
+++ trunk/Source/WebCore/loader/cache/CachedScript.h 2012-03-27 03:50:00 UTC (rev 112201)
@@ -53,7 +53,6 @@
virtual void setEncoding(const String&);
virtual String encoding() const;
virtual void data(PassRefPtr<SharedBuffer> data, bool allDataReceived);
- virtual void error(Status);
virtual void destroyDecodedData();
#if USE(JSC)
Modified: trunk/Source/WebCore/loader/cache/CachedXSLStyleSheet.cpp (112200 => 112201)
--- trunk/Source/WebCore/loader/cache/CachedXSLStyleSheet.cpp 2012-03-27 03:16:34 UTC (rev 112200)
+++ trunk/Source/WebCore/loader/cache/CachedXSLStyleSheet.cpp 2012-03-27 03:50:00 UTC (rev 112201)
@@ -88,14 +88,6 @@
c->setXSLStyleSheet(m_resourceRequest.url(), m_response.url(), m_sheet);
}
-void CachedXSLStyleSheet::error(CachedResource::Status status)
-{
- setStatus(status);
- ASSERT(errorOccurred());
- setLoading(false);
- checkNotify();
-}
-
#endif
}
Modified: trunk/Source/WebCore/loader/cache/CachedXSLStyleSheet.h (112200 => 112201)
--- trunk/Source/WebCore/loader/cache/CachedXSLStyleSheet.h 2012-03-27 03:16:34 UTC (rev 112200)
+++ trunk/Source/WebCore/loader/cache/CachedXSLStyleSheet.h 2012-03-27 03:50:00 UTC (rev 112201)
@@ -46,11 +46,10 @@
virtual void setEncoding(const String&);
virtual String encoding() const;
virtual void data(PassRefPtr<SharedBuffer> data, bool allDataReceived);
- virtual void error(CachedResource::Status);
- void checkNotify();
-
protected:
+ virtual void checkNotify();
+
String m_sheet;
RefPtr<TextResourceDecoder> m_decoder;
};
