summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authordarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-29 20:11:58 +0000
committerdarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-29 20:11:58 +0000
commit97cd4aca5dac2e27970580aa74db317542d3856c (patch)
tree6eefaccdf9e9eb9d0f903faae8732b882d437f54 /webkit
parentdae12ee6df766d9cd3af83277f6e8d0f0e9bb20d (diff)
downloadchromium_src-97cd4aca5dac2e27970580aa74db317542d3856c.zip
chromium_src-97cd4aca5dac2e27970580aa74db317542d3856c.tar.gz
chromium_src-97cd4aca5dac2e27970580aa74db317542d3856c.tar.bz2
Update webkit from 46531 to 46536 to help get the canary bot
past the latest compile bustage. TBR=tony BUG=none TEST=none Review URL: http://codereview.chromium.org/160349 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21985 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/api/src/ResourceHandle.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/webkit/api/src/ResourceHandle.cpp b/webkit/api/src/ResourceHandle.cpp
index b7def8d..ef398e9 100644
--- a/webkit/api/src/ResourceHandle.cpp
+++ b/webkit/api/src/ResourceHandle.cpp
@@ -259,7 +259,7 @@ void ResourceHandle::loadResourceSynchronously(const ResourceRequest& request,
}
// static
-bool ResourceHandle::willLoadFromCache(ResourceRequest& request)
+bool ResourceHandle::willLoadFromCache(ResourceRequest& request, Frame*)
{
// This method is used to determine if a POST request can be repeated from
// cache, but you cannot really know until you actually try to read from the