Turn on webcore's request management and remove our hacks.

With only turning on request management (no fine tuning of parameters), loading
cnn.com was 3-4 seconds faster and the main content displayed about 1-2 seconds
sooner.

2 files changed, 2 insertions, 16 deletions

diff --git a/WebCore/platform/network/android/ResourceHandleAndroid.cpp b/WebCore/platform/network/android/ResourceHandleAndroid.cpp
index 7fe8ecf..3d9b576 100644
--- a/WebCore/platform/network/android/ResourceHandleAndroid.cpp
+++ b/WebCore/platform/network/android/ResourceHandleAndroid.cpp
@@ -54,15 +54,8 @@ ResourceHandle::~ResourceHandle()
 bool ResourceHandle::start(Frame* frame)
 {
     WebCoreResourceLoader* loader;
-    bool highPriority = true;
-    CachedResource* r = d->m_request.getCachedResource();
-    if (r) {
-        CachedResource::Type t = r->type();
-        highPriority = !(t == CachedResource::ImageResource ||
-                       t == CachedResource::FontResource);
-    }
     FrameLoaderClientAndroid* client = static_cast<FrameLoaderClientAndroid*> (frame->loader()->client());
-    loader = client->webFrame()->startLoadingResource(this, d->m_request, highPriority, false);
+    loader = client->webFrame()->startLoadingResource(this, d->m_request, false);
 
     if (loader) {
         Release(d->m_loader);
@@ -152,7 +145,7 @@ void ResourceHandle::loadResourceSynchronously(const ResourceRequest& request,
     ResourceHandle h(request, &s, false, false, false);
     // This blocks until the load is finished.
     FrameLoaderClientAndroid* client = static_cast<FrameLoaderClientAndroid*> (frame->loader()->client());
-    client->webFrame()->startLoadingResource(&h, request, true, true);
+    client->webFrame()->startLoadingResource(&h, request, true);
 }
 
 } // namespace WebCore
diff --git a/WebCore/platform/network/android/ResourceRequest.h b/WebCore/platform/network/android/ResourceRequest.h
index 937707f..22c8104 100644
--- a/WebCore/platform/network/android/ResourceRequest.h
+++ b/WebCore/platform/network/android/ResourceRequest.h
@@ -37,36 +37,29 @@ namespace WebCore {
 
         ResourceRequest(const String& url) 
             : ResourceRequestBase(KURL(url), UseProtocolCachePolicy)
-            , m_cachedResource(0)
         {
         }
 
         ResourceRequest(const KURL& url) 
             : ResourceRequestBase(url, UseProtocolCachePolicy)
-            , m_cachedResource(0)
         {
         }
 
         ResourceRequest(const KURL& url, const String& referrer, ResourceRequestCachePolicy policy = UseProtocolCachePolicy) 
             : ResourceRequestBase(url, policy)
-            , m_cachedResource(0)
         {
             setHTTPReferrer(referrer);
         }
         
         ResourceRequest()
             : ResourceRequestBase(KURL(), UseProtocolCachePolicy)
-            , m_cachedResource(0)
         {
         }
         
         void doUpdatePlatformRequest() {}
         void doUpdateResourceRequest() {}
-        void setCachedResource(CachedResource* r) { m_cachedResource = r; }
-        CachedResource* getCachedResource() const { return m_cachedResource; }
     private:
         friend class ResourceRequestBase;
-        CachedResource* m_cachedResource;
     };
 
 } // namespace WebCore