Attachment 133990 Details for Bug 82302 – ROLLOUT of r112201

[patch] ROLLOUT of r112201

bug-82302-20120327071248.patch (text/plain), 8.48 KB, created by WebKit Review Bot on 2012-03-27 00:10:00 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: WebKit Review Bot

Created: 2012-03-27 00:10:00 PDT

Size: 8.48 KB

patch

obsolete

>Subversion Revision: 112213
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 2c8997f84d1a7800f51d1c6ab88f2938800afbdf..c099ce202b09b02df72dbf98fe3754a484ff9b88 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,37 @@
>+2012-03-27  Sheriff Bot  <webkit.review.bot@gmail.com>
>+
>+        Unreviewed, rolling out r112201.
>+        http://trac.webkit.org/changeset/112201
>+        https://bugs.webkit.org/show_bug.cgi?id=82302
>+
>+        Breaks chromium's WebPageSerializerTest.HTMLNodes test
>+        (Requested by pfeldman 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-26  Sheriff Bot  <webkit.review.bot@gmail.com>
> 
>         Unreviewed, rolling out r112199.
>diff --git a/Source/WebCore/loader/cache/CachedCSSStyleSheet.cpp b/Source/WebCore/loader/cache/CachedCSSStyleSheet.cpp
>index e8f00b74e4b7f68cc0671b9ddff9e5c9872c374d..3b52cd6dc605b1e2d348c9391ab63469beaacd94 100644
>--- a/Source/WebCore/loader/cache/CachedCSSStyleSheet.cpp
>+++ b/Source/WebCore/loader/cache/CachedCSSStyleSheet.cpp
>@@ -117,6 +117,14 @@ void CachedCSSStyleSheet::checkNotify()
>         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())
>diff --git a/Source/WebCore/loader/cache/CachedCSSStyleSheet.h b/Source/WebCore/loader/cache/CachedCSSStyleSheet.h
>index 1015f3d4771b44ba0284b299b28bede1633687c6..1c0ae78b1b7308814f1479049947e0a9be16319c 100644
>--- a/Source/WebCore/loader/cache/CachedCSSStyleSheet.h
>+++ b/Source/WebCore/loader/cache/CachedCSSStyleSheet.h
>@@ -49,14 +49,15 @@ namespace WebCore {
>         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;
>     };
>diff --git a/Source/WebCore/loader/cache/CachedFont.cpp b/Source/WebCore/loader/cache/CachedFont.cpp
>index ae791d31252d3918b90ca9474f8b5fb1e8e3ddb2..dc8567fb317a931366797a240c21b3808742c1af 100644
>--- a/Source/WebCore/loader/cache/CachedFont.cpp
>+++ b/Source/WebCore/loader/cache/CachedFont.cpp
>@@ -198,4 +198,13 @@ void CachedFont::checkNotify()
>          c->fontLoaded(this);
> }
> 
>+
>+void CachedFont::error(CachedResource::Status status)
>+{
>+    setStatus(status);
>+    ASSERT(errorOccurred());
>+    setLoading(false);
>+    checkNotify();
>+}
>+
> }
>diff --git a/Source/WebCore/loader/cache/CachedFont.h b/Source/WebCore/loader/cache/CachedFont.h
>index f1fe5f303f003cffa342b8bef2a324b21e734953..e0b5b7dac49f194581274ad30829bd735e735261 100644
>--- a/Source/WebCore/loader/cache/CachedFont.h
>+++ b/Source/WebCore/loader/cache/CachedFont.h
>@@ -53,8 +53,12 @@ public:
> 
>     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 @@ public:
> #endif
> 
> private:
>-    virtual void checkNotify();
>     FontCustomPlatformData* m_fontData;
>     bool m_loadInitiated;
> 
>diff --git a/Source/WebCore/loader/cache/CachedImage.cpp b/Source/WebCore/loader/cache/CachedImage.cpp
>index e81a1b8fea91d20864b3009631d01bc15b567203..44e210a2a1d8d9a0882613da14ea869695053e78 100644
>--- a/Source/WebCore/loader/cache/CachedImage.cpp
>+++ b/Source/WebCore/loader/cache/CachedImage.cpp
>@@ -380,11 +380,14 @@ void CachedImage::data(PassRefPtr<SharedBuffer> data, bool allDataReceived)
> 
> 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)
>diff --git a/Source/WebCore/loader/cache/CachedResource.h b/Source/WebCore/loader/cache/CachedResource.h
>index 14430e568f49f2deb6e43836b4c9a8ab717fdd4d..c07b231d4d5985751ccca0621d3757a9566b4698 100644
>--- a/Source/WebCore/loader/cache/CachedResource.h
>+++ b/Source/WebCore/loader/cache/CachedResource.h
>@@ -248,7 +248,7 @@ public:
>     double loadFinishTime() const { return m_loadFinishTime; }
> 
> protected:
>-    virtual void checkNotify();
>+    void checkNotify();
> 
>     void setEncodedSize(unsigned);
>     void setDecodedSize(unsigned);
>diff --git a/Source/WebCore/loader/cache/CachedScript.cpp b/Source/WebCore/loader/cache/CachedScript.cpp
>index 93dc6701f5af8497255a9e86e94e93ac683dafe8..8c83bca88265124e28ea0a884c8ff890b45ae700 100644
>--- a/Source/WebCore/loader/cache/CachedScript.cpp
>+++ b/Source/WebCore/loader/cache/CachedScript.cpp
>@@ -104,6 +104,14 @@ void CachedScript::data(PassRefPtr<SharedBuffer> data, bool allDataReceived)
>     checkNotify();
> }
> 
>+void CachedScript::error(CachedResource::Status status)
>+{
>+    setStatus(status);
>+    ASSERT(errorOccurred());
>+    setLoading(false);
>+    checkNotify();
>+}
>+
> void CachedScript::destroyDecodedData()
> {
>     m_script = String();
>diff --git a/Source/WebCore/loader/cache/CachedScript.h b/Source/WebCore/loader/cache/CachedScript.h
>index e8d56aee0e5f2ef7e2fe1ffd3da581ad6e48289b..1a76c18f467e40bd059360d1df3780bff7914daf 100644
>--- a/Source/WebCore/loader/cache/CachedScript.h
>+++ b/Source/WebCore/loader/cache/CachedScript.h
>@@ -53,6 +53,7 @@ namespace WebCore {
>         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)        
>diff --git a/Source/WebCore/loader/cache/CachedXSLStyleSheet.cpp b/Source/WebCore/loader/cache/CachedXSLStyleSheet.cpp
>index ca4d0e12f9b79248409ad9ea465781cb817a47d4..336fce4ac60ff33837405e8bebe171dd84bfca22 100644
>--- a/Source/WebCore/loader/cache/CachedXSLStyleSheet.cpp
>+++ b/Source/WebCore/loader/cache/CachedXSLStyleSheet.cpp
>@@ -88,6 +88,14 @@ void CachedXSLStyleSheet::checkNotify()
>         c->setXSLStyleSheet(m_resourceRequest.url(), m_response.url(), m_sheet);
> }
> 
>+void CachedXSLStyleSheet::error(CachedResource::Status status)
>+{
>+    setStatus(status);
>+    ASSERT(errorOccurred());
>+    setLoading(false);
>+    checkNotify();
>+}
>+
> #endif
> 
> }
>diff --git a/Source/WebCore/loader/cache/CachedXSLStyleSheet.h b/Source/WebCore/loader/cache/CachedXSLStyleSheet.h
>index dce263cdfcec1dc0ee084c3f8004aa32b027fcc2..b8f7283d364929f2856ea58a27e077d848f28a6b 100644
>--- a/Source/WebCore/loader/cache/CachedXSLStyleSheet.h
>+++ b/Source/WebCore/loader/cache/CachedXSLStyleSheet.h
>@@ -46,10 +46,11 @@ namespace WebCore {
>         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;
>     };

Actions: View | Formatted Diff | Diff

Attachments on bug 82302: 133990