Cherry-pick fix to https://bugs.webkit.org/show_bug.cgi?id=42651

because it fixes http://b/issue?id=2838936, but includes more refactoring
than my original fix at https://android-git.corp.google.com/g/#change,58175

Change-Id: I67884fc153bff81c9580f36b7be1662acdda194e

8 files changed, 6 insertions, 17 deletions

diff --git a/WebCore/loader/CachedCSSStyleSheet.h b/WebCore/loader/CachedCSSStyleSheet.h
index 908c4c0..f5bf042 100644
--- a/WebCore/loader/CachedCSSStyleSheet.h
+++ b/WebCore/loader/CachedCSSStyleSheet.h
@@ -51,8 +51,6 @@ namespace WebCore {
         virtual void data(PassRefPtr<SharedBuffer> data, bool allDataReceived);
         virtual void error();
 
-        virtual bool schedule() const { return true; }
-
         void checkNotify();
     
     private:
diff --git a/WebCore/loader/CachedFont.h b/WebCore/loader/CachedFont.h
index 05b28f3..01c8c9c 100644
--- a/WebCore/loader/CachedFont.h
+++ b/WebCore/loader/CachedFont.h
@@ -57,8 +57,6 @@ public:
 
     virtual void allClientsRemoved();
 
-    virtual bool schedule() const { return true; }
-
     void checkNotify();
 
     void beginLoadIfNeeded(DocLoader* dl);
diff --git a/WebCore/loader/CachedImage.h b/WebCore/loader/CachedImage.h
index b4a032a..eb55955 100644
--- a/WebCore/loader/CachedImage.h
+++ b/WebCore/loader/CachedImage.h
@@ -70,8 +70,6 @@ public:
     virtual void httpStatusCodeError() { m_httpStatusCodeErrorOccurred = true; }
     bool httpStatusCodeErrorOccurred() const { return m_httpStatusCodeErrorOccurred; }
     
-    virtual bool schedule() const { return true; }
-
     void checkNotify();
     
     virtual bool isImage() const { return true; }
diff --git a/WebCore/loader/CachedResource.cpp b/WebCore/loader/CachedResource.cpp
index bde5da5..887b0b5 100644
--- a/WebCore/loader/CachedResource.cpp
+++ b/WebCore/loader/CachedResource.cpp
@@ -102,7 +102,7 @@ CachedResource::~CachedResource()
     if (m_docLoader)
         m_docLoader->removeCachedResource(this);
 }
-    
+
 void CachedResource::load(DocLoader* docLoader, bool incremental, SecurityCheckPolicy securityCheck, bool sendResourceLoadCallbacks)
 {
     m_sendResourceLoadCallbacks = sendResourceLoadCallbacks;
diff --git a/WebCore/loader/CachedResource.h b/WebCore/loader/CachedResource.h
index 909e6d1..4b83a8e 100644
--- a/WebCore/loader/CachedResource.h
+++ b/WebCore/loader/CachedResource.h
@@ -125,11 +125,14 @@ public:
     void setLoading(bool b) { m_loading = b; }
 
     virtual bool isImage() const { return false; }
+    bool isPrefetch() const
+    {
 #if ENABLE(LINK_PREFETCH)
-    virtual bool isPrefetch() const { return type() == LinkPrefetch; }
+        return type() == LinkPrefetch;
 #else
-    virtual bool isPrefetch() const { return false; }
+        return false;
 #endif
+    }
 
     unsigned accessCount() const { return m_accessCount; }
     void increaseAccessCount() { m_accessCount++; }
@@ -170,8 +173,6 @@ public:
 
     bool isExpired() const;
 
-    virtual bool schedule() const { return isPrefetch(); }
-
     // List of acceptable MIME types separated by ",".
     // A MIME type may contain a wildcard, e.g. "text/*".
     String accept() const { return m_accept; }
diff --git a/WebCore/loader/CachedScript.h b/WebCore/loader/CachedScript.h
index dff49c3..a36d735 100644
--- a/WebCore/loader/CachedScript.h
+++ b/WebCore/loader/CachedScript.h
@@ -48,8 +48,6 @@ namespace WebCore {
         virtual void data(PassRefPtr<SharedBuffer> data, bool allDataReceived);
         virtual void error();
 
-        virtual bool schedule() const { return false; }
-
         void checkNotify();
 
         virtual void destroyDecodedData();
diff --git a/WebCore/loader/CachedXBLDocument.h b/WebCore/loader/CachedXBLDocument.h
index b92a255..9a8d366 100644
--- a/WebCore/loader/CachedXBLDocument.h
+++ b/WebCore/loader/CachedXBLDocument.h
@@ -51,8 +51,6 @@ namespace WebCore {
         virtual void data(Vector<char>&, bool allDataReceived);
         virtual void error();
         
-        virtual bool schedule() const { return true; }
-        
         void checkNotify();
         
     protected:
diff --git a/WebCore/loader/CachedXSLStyleSheet.h b/WebCore/loader/CachedXSLStyleSheet.h
index b6b0585..a0b5477 100644
--- a/WebCore/loader/CachedXSLStyleSheet.h
+++ b/WebCore/loader/CachedXSLStyleSheet.h
@@ -48,8 +48,6 @@ namespace WebCore {
         virtual void data(PassRefPtr<SharedBuffer> data, bool allDataReceived);
         virtual void error();
         
-        virtual bool schedule() const { return true; }
-        
         void checkNotify();
         
     protected: