diff options
author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-06-18 14:10:49 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-06-18 13:53:24 +0000 |
commit | 813fbf95af77a531c57a8c497345ad2c61d475b3 (patch) | |
tree | 821b2c8de8365f21b6c9ba17a236fb3006a1d506 /chromium/content/common/content_param_traits.cc | |
parent | af6588f8d723931a298c995fa97259bb7f7deb55 (diff) | |
download | qtwebengine-chromium-813fbf95af77a531c57a8c497345ad2c61d475b3.tar.gz |
BASELINE: Update chromium to 44.0.2403.47
Change-Id: Ie056fedba95cf5e5c76b30c4b2c80fca4764aa2f
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'chromium/content/common/content_param_traits.cc')
-rw-r--r-- | chromium/content/common/content_param_traits.cc | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/chromium/content/common/content_param_traits.cc b/chromium/content/common/content_param_traits.cc index 0f1ba055121..8faf97c1f00 100644 --- a/chromium/content/common/content_param_traits.cc +++ b/chromium/content/common/content_param_traits.cc @@ -7,30 +7,9 @@ #include "base/strings/string_number_conversions.h" #include "content/common/input/web_input_event_traits.h" #include "net/base/ip_endpoint.h" -#include "ui/gfx/range/range.h" namespace IPC { -void ParamTraits<gfx::Range>::Write(Message* m, const gfx::Range& r) { - m->WriteSizeT(r.start()); - m->WriteSizeT(r.end()); -} - -bool ParamTraits<gfx::Range>::Read(const Message* m, - PickleIterator* iter, - gfx::Range* r) { - size_t start, end; - if (!m->ReadSizeT(iter, &start) || !m->ReadSizeT(iter, &end)) - return false; - r->set_start(start); - r->set_end(end); - return true; -} - -void ParamTraits<gfx::Range>::Log(const gfx::Range& r, std::string* l) { - l->append(base::StringPrintf("(%" PRIuS ", %" PRIuS ")", r.start(), r.end())); -} - void ParamTraits<WebInputEventPointer>::Write(Message* m, const param_type& p) { m->WriteData(reinterpret_cast<const char*>(p), p->size); } @@ -40,7 +19,7 @@ bool ParamTraits<WebInputEventPointer>::Read(const Message* m, param_type* r) { const char* data; int data_length; - if (!m->ReadData(iter, &data, &data_length)) { + if (!iter->ReadData(&data, &data_length)) { NOTREACHED(); return false; } |