summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKristian Monsen <kristianm@google.com>2010-11-05 14:44:45 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-11-05 14:44:45 +0000
commita78d3a88c005659775f2a2982a3675b938633857 (patch)
tree047ed7858db86f61957538d4f5fc2bf68f54367f
parent665f41f7fcded45d387e2d23d5ae81f5f9acb17d (diff)
parent18b98c9f527349208c3518828e590cf9652d57bd (diff)
downloadexternal_webkit-a78d3a88c005659775f2a2982a3675b938633857.zip
external_webkit-a78d3a88c005659775f2a2982a3675b938633857.tar.gz
external_webkit-a78d3a88c005659775f2a2982a3675b938633857.tar.bz2
Merge "Update method to take const std::string& argument"
-rw-r--r--WebKit/android/WebCoreSupport/WebRequest.cpp2
-rw-r--r--WebKit/android/WebCoreSupport/WebRequest.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/WebKit/android/WebCoreSupport/WebRequest.cpp b/WebKit/android/WebCoreSupport/WebRequest.cpp
index f21c1a2..e939be4 100644
--- a/WebKit/android/WebCoreSupport/WebRequest.cpp
+++ b/WebKit/android/WebCoreSupport/WebRequest.cpp
@@ -130,7 +130,7 @@ void WebRequest::finish(bool success)
m_urlLoader = 0;
}
-void WebRequest::appendFileToUpload(std::string filename)
+void WebRequest::appendFileToUpload(const std::string& filename)
{
// AppendFileToUpload is only valid before calling start
ASSERT(m_loadState == Created, "appendFileToUpload called on a WebRequest not in CREATED state: (%s)", m_url.c_str());
diff --git a/WebKit/android/WebCoreSupport/WebRequest.h b/WebKit/android/WebCoreSupport/WebRequest.h
index c82096e..c7026a5 100644
--- a/WebKit/android/WebCoreSupport/WebRequest.h
+++ b/WebKit/android/WebCoreSupport/WebRequest.h
@@ -61,7 +61,7 @@ public:
// Optional, but if used has to be called before start
void appendBytesToUpload(Vector<char>* data);
- void appendFileToUpload(std::string filename);
+ void appendFileToUpload(const std::string& filename);
void start(bool isPrivateBrowsing);
void cancel();