Changeset 112245 in webkit
- Timestamp:
- Mar 27, 2012 3:43:36 AM (12 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r112243 r112245 1 2012-03-27 Sheriff Bot <webkit.review.bot@gmail.com> 2 3 Unreviewed, rolling out r112201. 4 http://trac.webkit.org/changeset/112201 5 https://bugs.webkit.org/show_bug.cgi?id=82302 6 7 Breaks chromium's WebPageSerializerTest.HTMLNodes test 8 (Requested by pfeldman on #webkit). 9 10 * loader/cache/CachedCSSStyleSheet.cpp: 11 (WebCore::CachedCSSStyleSheet::error): 12 (WebCore): 13 * loader/cache/CachedCSSStyleSheet.h: 14 (CachedCSSStyleSheet): 15 * loader/cache/CachedFont.cpp: 16 (WebCore): 17 (WebCore::CachedFont::error): 18 * loader/cache/CachedFont.h: 19 (CachedFont): 20 * loader/cache/CachedImage.cpp: 21 (WebCore::CachedImage::error): 22 * loader/cache/CachedResource.h: 23 (CachedResource): 24 * loader/cache/CachedScript.cpp: 25 (WebCore::CachedScript::error): 26 (WebCore): 27 * loader/cache/CachedScript.h: 28 (CachedScript): 29 * loader/cache/CachedXSLStyleSheet.cpp: 30 (WebCore::CachedXSLStyleSheet::error): 31 (WebCore): 32 * loader/cache/CachedXSLStyleSheet.h: 33 (CachedXSLStyleSheet): 34 1 35 2012-03-27 Levi Weintraub <leviw@chromium.org> 2 36 -
trunk/Source/WebCore/loader/cache/CachedCSSStyleSheet.cpp
r112201 r112245 118 118 } 119 119 120 void CachedCSSStyleSheet::error(CachedResource::Status status) 121 { 122 setStatus(status); 123 ASSERT(errorOccurred()); 124 setLoading(false); 125 checkNotify(); 126 } 127 120 128 bool CachedCSSStyleSheet::canUseSheet(bool enforceMIMEType, bool* hasValidMIMEType) const 121 129 { -
trunk/Source/WebCore/loader/cache/CachedCSSStyleSheet.h
r112201 r112245 50 50 virtual String encoding() const; 51 51 virtual void data(PassRefPtr<SharedBuffer> data, bool allDataReceived); 52 virtual void error(CachedResource::Status); 53 54 void checkNotify(); 52 55 53 56 private: … … 56 59 57 60 protected: 58 virtual void checkNotify();59 60 61 RefPtr<TextResourceDecoder> m_decoder; 61 62 String m_decodedSheetText; -
trunk/Source/WebCore/loader/cache/CachedFont.cpp
r112201 r112245 199 199 } 200 200 201 } 201 202 void 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
r112201 r112245 54 54 virtual void didAddClient(CachedResourceClient*); 55 55 virtual void data(PassRefPtr<SharedBuffer> data, bool allDataReceived); 56 virtual void error(CachedResource::Status); 56 57 57 58 virtual void allClientsRemoved(); 59 60 void checkNotify(); 61 58 62 void beginLoadIfNeeded(CachedResourceLoader* dl); 59 63 bool stillNeedsLoad() const { return !m_loadInitiated; } … … 68 72 69 73 private: 70 virtual void checkNotify();71 74 FontCustomPlatformData* m_fontData; 72 75 bool m_loadInitiated; -
trunk/Source/WebCore/loader/cache/CachedImage.cpp
r112229 r112245 376 376 void CachedImage::error(CachedResource::Status status) 377 377 { 378 CachedResource::error(status);379 378 checkShouldPaintBrokenImage(); 380 379 clear(); 380 setStatus(status); 381 ASSERT(errorOccurred()); 381 382 m_data.clear(); 382 383 notifyObservers(); 384 setLoading(false); 385 checkNotify(); 383 386 } 384 387 -
trunk/Source/WebCore/loader/cache/CachedResource.h
r112201 r112245 249 249 250 250 protected: 251 v irtual void checkNotify();251 void checkNotify(); 252 252 253 253 void setEncodedSize(unsigned); -
trunk/Source/WebCore/loader/cache/CachedScript.cpp
r112201 r112245 105 105 } 106 106 107 void CachedScript::error(CachedResource::Status status) 108 { 109 setStatus(status); 110 ASSERT(errorOccurred()); 111 setLoading(false); 112 checkNotify(); 113 } 114 107 115 void CachedScript::destroyDecodedData() 108 116 { -
trunk/Source/WebCore/loader/cache/CachedScript.h
r112201 r112245 54 54 virtual String encoding() const; 55 55 virtual void data(PassRefPtr<SharedBuffer> data, bool allDataReceived); 56 virtual void error(Status); 56 57 57 58 virtual void destroyDecodedData(); -
trunk/Source/WebCore/loader/cache/CachedXSLStyleSheet.cpp
r112201 r112245 89 89 } 90 90 91 void CachedXSLStyleSheet::error(CachedResource::Status status) 92 { 93 setStatus(status); 94 ASSERT(errorOccurred()); 95 setLoading(false); 96 checkNotify(); 97 } 98 91 99 #endif 92 100 -
trunk/Source/WebCore/loader/cache/CachedXSLStyleSheet.h
r112201 r112245 47 47 virtual String encoding() const; 48 48 virtual void data(PassRefPtr<SharedBuffer> data, bool allDataReceived); 49 virtual void error(CachedResource::Status); 50 51 void checkNotify(); 49 52 50 53 protected: 51 virtual void checkNotify();52 53 54 String m_sheet; 54 55 RefPtr<TextResourceDecoder> m_decoder;
Note: See TracChangeset
for help on using the changeset viewer.