summaryrefslogtreecommitdiffstats
path: root/WebCore/platform
diff options
context:
space:
mode:
authorGrace Kloba <klobag@google.com>2009-04-22 09:45:00 -0700
committerGrace Kloba <klobag@google.com>2009-04-22 11:44:58 -0700
commit14f586c9666e68bd7b138911aa63a3081d5b2e49 (patch)
tree2af9d352476d25f61e0d841c7b4133f6b6aa6560 /WebCore/platform
parent38eb0cdb2b416fb660584adf6f277a27ce519568 (diff)
downloadexternal_webkit-14f586c9666e68bd7b138911aa63a3081d5b2e49.zip
external_webkit-14f586c9666e68bd7b138911aa63a3081d5b2e49.tar.gz
external_webkit-14f586c9666e68bd7b138911aa63a3081d5b2e49.tar.bz2
Adding WTF to Vector as both Android and WTF has Vector<>.
Diffstat (limited to 'WebCore/platform')
-rw-r--r--WebCore/platform/network/android/ResourceHandleAndroid.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/WebCore/platform/network/android/ResourceHandleAndroid.cpp b/WebCore/platform/network/android/ResourceHandleAndroid.cpp
index 4d9199a..59084ab 100644
--- a/WebCore/platform/network/android/ResourceHandleAndroid.cpp
+++ b/WebCore/platform/network/android/ResourceHandleAndroid.cpp
@@ -118,7 +118,7 @@ bool ResourceHandle::loadsBlocked()
// Class to handle synchronized loading of resources.
class SyncLoader : public ResourceHandleClient {
public:
- SyncLoader(ResourceError& error, ResourceResponse& response, Vector<char>& data) {
+ SyncLoader(ResourceError& error, ResourceResponse& response, WTF::Vector<char>& data) {
m_error = &error;
m_response = &response;
m_data = &data;
@@ -140,11 +140,11 @@ public:
private:
ResourceError* m_error;
ResourceResponse* m_response;
- Vector<char>* m_data;
+ WTF::Vector<char>* m_data;
};
void ResourceHandle::loadResourceSynchronously(const ResourceRequest& request,
- ResourceError& error, ResourceResponse& response, Vector<char>& data,
+ ResourceError& error, ResourceResponse& response, WTF::Vector<char>& data,
Frame* frame)
{
SyncLoader s(error, response, data);