diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-07-14 17:41:05 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-08-04 12:37:36 +0000 |
| commit | 399c965b6064c440ddcf4015f5f8e9d131c7a0a6 (patch) | |
| tree | 6b06b60ff365abef0e13b3503d593a0df48d20e8 /chromium/url/ipc | |
| parent | 7366110654eec46f21b6824f302356426f48cd74 (diff) | |
| download | qtwebengine-chromium-399c965b6064c440ddcf4015f5f8e9d131c7a0a6.tar.gz | |
BASELINE: Update Chromium to 52.0.2743.76 and Ninja to 1.7.1
Change-Id: I382f51b959689505a60f8b707255ecb344f7d8b4
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/url/ipc')
| -rw-r--r-- | chromium/url/ipc/url_param_traits.cc | 9 | ||||
| -rw-r--r-- | chromium/url/ipc/url_param_traits.h | 1 |
2 files changed, 10 insertions, 0 deletions
diff --git a/chromium/url/ipc/url_param_traits.cc b/chromium/url/ipc/url_param_traits.cc index e40ae8f9a3c..b41e4716204 100644 --- a/chromium/url/ipc/url_param_traits.cc +++ b/chromium/url/ipc/url_param_traits.cc @@ -8,6 +8,15 @@ namespace IPC { +void ParamTraits<GURL>::GetSize(base::PickleSizer* s, const GURL& p) { + if (p.possibly_invalid_spec().length() > url::kMaxURLChars || !p.is_valid()) { + GetParamSize(s, std::string()); + return; + } + + GetParamSize(s, p.possibly_invalid_spec()); +} + void ParamTraits<GURL>::Write(base::Pickle* m, const GURL& p) { if (p.possibly_invalid_spec().length() > url::kMaxURLChars) { m->WriteString(std::string()); diff --git a/chromium/url/ipc/url_param_traits.h b/chromium/url/ipc/url_param_traits.h index f40150f110d..8db40294846 100644 --- a/chromium/url/ipc/url_param_traits.h +++ b/chromium/url/ipc/url_param_traits.h @@ -14,6 +14,7 @@ namespace IPC { template <> struct URL_IPC_EXPORT ParamTraits<GURL> { typedef GURL param_type; + static void GetSize(base::PickleSizer* s, const param_type& p); static void Write(base::Pickle* m, const param_type& p); static bool Read(const base::Pickle* m, base::PickleIterator* iter, |