Diff
Modified: trunk/Source/WebCore/ChangeLog (110985 => 110986)
--- trunk/Source/WebCore/ChangeLog 2012-03-16 11:25:54 UTC (rev 110985)
+++ trunk/Source/WebCore/ChangeLog 2012-03-16 11:29:15 UTC (rev 110986)
@@ -1,3 +1,36 @@
+2012-03-16 Sheriff Bot <[email protected]>
+
+ 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).
+
+ * 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):
+
2012-03-16 Luke Macpherson <[email protected]>
Implement cast between CSSPrimitiveValue and LineClampValue.
Modified: trunk/Source/WebCore/loader/cache/CachedCSSStyleSheet.cpp (110985 => 110986)
--- trunk/Source/WebCore/loader/cache/CachedCSSStyleSheet.cpp 2012-03-16 11:25:54 UTC (rev 110985)
+++ trunk/Source/WebCore/loader/cache/CachedCSSStyleSheet.cpp 2012-03-16 11:29:15 UTC (rev 110986)
@@ -117,6 +117,14 @@
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 (110985 => 110986)
--- trunk/Source/WebCore/loader/cache/CachedCSSStyleSheet.h 2012-03-16 11:25:54 UTC (rev 110985)
+++ trunk/Source/WebCore/loader/cache/CachedCSSStyleSheet.h 2012-03-16 11:29:15 UTC (rev 110986)
@@ -49,14 +49,15 @@
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 (110985 => 110986)
--- trunk/Source/WebCore/loader/cache/CachedFont.cpp 2012-03-16 11:25:54 UTC (rev 110985)
+++ trunk/Source/WebCore/loader/cache/CachedFont.cpp 2012-03-16 11:29:15 UTC (rev 110986)
@@ -198,4 +198,13 @@
c->fontLoaded(this);
}
+
+void CachedFont::error(CachedResource::Status status)
+{
+ setStatus(status);
+ ASSERT(errorOccurred());
+ setLoading(false);
+ checkNotify();
}
+
+}
Modified: trunk/Source/WebCore/loader/cache/CachedFont.h (110985 => 110986)
--- trunk/Source/WebCore/loader/cache/CachedFont.h 2012-03-16 11:25:54 UTC (rev 110985)
+++ trunk/Source/WebCore/loader/cache/CachedFont.h 2012-03-16 11:29:15 UTC (rev 110986)
@@ -53,8 +53,12 @@
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; }
@@ -67,7 +71,6 @@
#endif
private:
- virtual void checkNotify();
FontCustomPlatformData* m_fontData;
bool m_loadInitiated;
Modified: trunk/Source/WebCore/loader/cache/CachedImage.cpp (110985 => 110986)
--- trunk/Source/WebCore/loader/cache/CachedImage.cpp 2012-03-16 11:25:54 UTC (rev 110985)
+++ trunk/Source/WebCore/loader/cache/CachedImage.cpp 2012-03-16 11:29:15 UTC (rev 110986)
@@ -380,11 +380,14 @@
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 (110985 => 110986)
--- trunk/Source/WebCore/loader/cache/CachedResource.h 2012-03-16 11:25:54 UTC (rev 110985)
+++ trunk/Source/WebCore/loader/cache/CachedResource.h 2012-03-16 11:29:15 UTC (rev 110986)
@@ -248,7 +248,7 @@
double loadFinishTime() const { return m_loadFinishTime; }
protected:
- virtual void checkNotify();
+ void checkNotify();
void setEncodedSize(unsigned);
void setDecodedSize(unsigned);
Modified: trunk/Source/WebCore/loader/cache/CachedScript.cpp (110985 => 110986)
--- trunk/Source/WebCore/loader/cache/CachedScript.cpp 2012-03-16 11:25:54 UTC (rev 110985)
+++ trunk/Source/WebCore/loader/cache/CachedScript.cpp 2012-03-16 11:29:15 UTC (rev 110986)
@@ -104,6 +104,14 @@
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 (110985 => 110986)
--- trunk/Source/WebCore/loader/cache/CachedScript.h 2012-03-16 11:25:54 UTC (rev 110985)
+++ trunk/Source/WebCore/loader/cache/CachedScript.h 2012-03-16 11:29:15 UTC (rev 110986)
@@ -53,6 +53,7 @@
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 (110985 => 110986)
--- trunk/Source/WebCore/loader/cache/CachedXSLStyleSheet.cpp 2012-03-16 11:25:54 UTC (rev 110985)
+++ trunk/Source/WebCore/loader/cache/CachedXSLStyleSheet.cpp 2012-03-16 11:29:15 UTC (rev 110986)
@@ -88,6 +88,14 @@
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 (110985 => 110986)
--- trunk/Source/WebCore/loader/cache/CachedXSLStyleSheet.h 2012-03-16 11:25:54 UTC (rev 110985)
+++ trunk/Source/WebCore/loader/cache/CachedXSLStyleSheet.h 2012-03-16 11:29:15 UTC (rev 110986)
@@ -46,10 +46,11 @@
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;
};
