Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1042)

Unified Diff: content/public/common/common_param_traits.cc

Issue 1755363003: Revert of Mustash: Move GURL ParamTraits to url/ipc (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/public/common/common_param_traits.h ('k') | content/public/common/content_constants.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/public/common/common_param_traits.cc
diff --git a/content/public/common/common_param_traits.cc b/content/public/common/common_param_traits.cc
index f402cca31b34f0365b6b5abf0906c59778432324..6a937c62c53218c774a7488ae665f88742127df7 100644
--- a/content/public/common/common_param_traits.cc
+++ b/content/public/common/common_param_traits.cc
@@ -14,6 +14,47 @@
#include "net/base/ip_endpoint.h"
namespace IPC {
+
+void ParamTraits<GURL>::Write(base::Pickle* m, const GURL& p) {
+ if (p.possibly_invalid_spec().length() > content::kMaxURLChars) {
+ m->WriteString(std::string());
+ return;
+ }
+
+ // Beware of print-parse inconsistency which would change an invalid
+ // URL into a valid one. Ideally, the message would contain this flag
+ // so that the read side could make the check, but performing it here
+ // avoids changing the on-the-wire representation of such a fundamental
+ // type as GURL. See https://crbug.com/166486 for additional work in
+ // this area.
+ if (!p.is_valid()) {
+ m->WriteString(std::string());
+ return;
+ }
+
+ m->WriteString(p.possibly_invalid_spec());
+ // TODO(brettw) bug 684583: Add encoding for query params.
+}
+
+bool ParamTraits<GURL>::Read(const base::Pickle* m,
+ base::PickleIterator* iter,
+ GURL* p) {
+ std::string s;
+ if (!iter->ReadString(&s) || s.length() > content::kMaxURLChars) {
+ *p = GURL();
+ return false;
+ }
+ *p = GURL(s);
+ if (!s.empty() && !p->is_valid()) {
+ *p = GURL();
+ return false;
+ }
+ return true;
+}
+
+void ParamTraits<GURL>::Log(const GURL& p, std::string* l) {
+ l->append(p.spec());
+}
void ParamTraits<url::Origin>::Write(base::Pickle* m, const url::Origin& p) {
WriteParam(m, p.unique());
« no previous file with comments | « content/public/common/common_param_traits.h ('k') | content/public/common/content_constants.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698