summaryrefslogtreecommitdiffstats
path: root/WebKit/android/plugins
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2010-08-11 18:17:05 +0100
committerBen Murdoch <benm@google.com>2010-08-13 12:41:54 +0100
commit45b64f60af3cbfa8c78388e35e9b669a0c284bdc (patch)
treebd6df4524a5532b7b090ab042f90e72da3085b9c /WebKit/android/plugins
parent82eeb7b660065e6e990280e6563ca7eafe4be1cd (diff)
downloadexternal_webkit-45b64f60af3cbfa8c78388e35e9b669a0c284bdc.zip
external_webkit-45b64f60af3cbfa8c78388e35e9b669a0c284bdc.tar.gz
external_webkit-45b64f60af3cbfa8c78388e35e9b669a0c284bdc.tar.bz2
Merge WebKit at r65072: String class has moved to the WTF namespace.
See http://trac.webkit.org/changeset/65021 Change-Id: I779a8ec0c3e1e0aed8f8d1894cfc1e5ca33ee549
Diffstat (limited to 'WebKit/android/plugins')
-rw-r--r--WebKit/android/plugins/ANPSystemInterface.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/WebKit/android/plugins/ANPSystemInterface.cpp b/WebKit/android/plugins/ANPSystemInterface.cpp
index 34fe162..959b93d 100644
--- a/WebKit/android/plugins/ANPSystemInterface.cpp
+++ b/WebKit/android/plugins/ANPSystemInterface.cpp
@@ -46,7 +46,7 @@ static const char* anp_getApplicationDataDirectory() {
if (!client)
return NULL;
- WebCore::String path = client->getPluginSharedDataDirectory();
+ WTF::String path = client->getPluginSharedDataDirectory();
int length = path.length();
if (length == 0)
return NULL;