diff options
| author | Andrei Popescu <andreip@google.com> | 2009-08-17 13:41:56 +0100 |
|---|---|---|
| committer | Andrei Popescu <andreip@google.com> | 2009-08-17 13:53:08 +0100 |
| commit | 6d289e80ffb2e1dcc0a3bdce9f2bf7fa3263745d (patch) | |
| tree | 56d317410e95ea0b1852350a285a01e3a6a3a90c /WebCore | |
| parent | 6461f0be0cee2f8080a648fabd883943614e672c (diff) | |
| download | external_webkit-6d289e80ffb2e1dcc0a3bdce9f2bf7fa3263745d.zip external_webkit-6d289e80ffb2e1dcc0a3bdce9f2bf7fa3263745d.tar.gz external_webkit-6d289e80ffb2e1dcc0a3bdce9f2bf7fa3263745d.tar.bz2 | |
ResourceHandleAndroid fix
Diffstat (limited to 'WebCore')
| -rw-r--r-- | WebCore/platform/network/android/ResourceHandleAndroid.cpp | 2 | ||||
| -rw-r--r-- | WebCore/plugins/PluginDatabase.h | 7 |
2 files changed, 1 insertions, 8 deletions
diff --git a/WebCore/platform/network/android/ResourceHandleAndroid.cpp b/WebCore/platform/network/android/ResourceHandleAndroid.cpp index d67bc2b..8da2446 100644 --- a/WebCore/platform/network/android/ResourceHandleAndroid.cpp +++ b/WebCore/platform/network/android/ResourceHandleAndroid.cpp @@ -93,7 +93,7 @@ void ResourceHandle::setDefersLoading(bool defers) * side may be slow, but is only used during a navigation to * a POST response. */ -bool ResourceHandle::willLoadFromCache(ResourceRequest& request) +bool ResourceHandle::willLoadFromCache(ResourceRequest& request, Frame*) { // set the cache policy correctly, copied from // network/mac/ResourceHandleMac.mm diff --git a/WebCore/plugins/PluginDatabase.h b/WebCore/plugins/PluginDatabase.h index e5e4d4f..14a6fb3 100644 --- a/WebCore/plugins/PluginDatabase.h +++ b/WebCore/plugins/PluginDatabase.h @@ -81,14 +81,7 @@ namespace WebCore { static Vector<String> defaultPluginDirectories(); Vector<String> pluginDirectories() const { return m_pluginDirectories; } -#ifdef ANDROID_PLUGINS - void setPluginDirectories(const Vector<String>& directories) { m_pluginDirectories = directories; } -#endif - private: -#ifndef ANDROID_PLUGINS - void setPluginDirectories(const Vector<String>& directories) { m_pluginDirectories = directories; } -#endif void getPluginPathsInDirectories(HashSet<String>&) const; void getDeletedPlugins(PluginSet&) const; |