diff options
| author | Steve Block <steveblock@google.com> | 2012-02-22 04:17:33 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-02-22 04:17:33 -0800 |
| commit | de300297b89e1786d745a2971bd0e2df50a407df (patch) | |
| tree | a047378f7452bcae9058007e40da50aad3abb083 /Source/WebCore | |
| parent | a994d85ef91efe1bf973dbd930ab5ed0ae234048 (diff) | |
| parent | 13c343328386eea539a0c767c2f5d62b1440cbf3 (diff) | |
| download | external_webkit-de300297b89e1786d745a2971bd0e2df50a407df.zip external_webkit-de300297b89e1786d745a2971bd0e2df50a407df.tar.gz external_webkit-de300297b89e1786d745a2971bd0e2df50a407df.tar.bz2 | |
Merge changes I6312736c,I55a2ecd2
* changes:
Remove benchmark tool
Fix comments for willLoadFromCache()
Diffstat (limited to 'Source/WebCore')
| -rw-r--r-- | Source/WebCore/platform/network/android/ResourceHandleAndroid.cpp | 4 | ||||
| -rw-r--r-- | Source/WebCore/platform/network/android/ResourceLoaderAndroid.h | 1 |
2 files changed, 1 insertions, 4 deletions
diff --git a/Source/WebCore/platform/network/android/ResourceHandleAndroid.cpp b/Source/WebCore/platform/network/android/ResourceHandleAndroid.cpp index 13a26f0..4bc918b 100644 --- a/Source/WebCore/platform/network/android/ResourceHandleAndroid.cpp +++ b/Source/WebCore/platform/network/android/ResourceHandleAndroid.cpp @@ -96,9 +96,7 @@ void ResourceHandle::platformSetDefersLoading(bool) } // This static method is called to check to see if a POST response is in -// the cache. The JNI call through to the HTTP cache stored on the Java -// side may be slow, but is only used during a navigation to -// a POST response. +// the cache. bool ResourceHandle::willLoadFromCache(ResourceRequest& request, Frame*) { // set the cache policy correctly, copied from diff --git a/Source/WebCore/platform/network/android/ResourceLoaderAndroid.h b/Source/WebCore/platform/network/android/ResourceLoaderAndroid.h index f627d62..5ff2322 100644 --- a/Source/WebCore/platform/network/android/ResourceLoaderAndroid.h +++ b/Source/WebCore/platform/network/android/ResourceLoaderAndroid.h @@ -46,7 +46,6 @@ public: virtual void pauseLoad(bool) = 0; // END ANDROID TODO - // Call to java to find out if this URL is in the cache static bool willLoadFromCache(const WebCore::KURL&, int64_t identifier); protected: ResourceLoaderAndroid() { } |