diff options
| author | Ben Murdoch <benm@google.com> | 2010-11-18 18:32:45 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-11-18 18:38:07 +0000 |
| commit | 513209b27ff55e2841eac0e4120199c23acce758 (patch) | |
| tree | aeba30bb08c5f47c57003544e378a377c297eee6 /chrome/common/webkit_param_traits.cc | |
| parent | 164f7496de0fbee436b385a79ead9e3cb81a50c1 (diff) | |
| download | external_chromium-513209b27ff55e2841eac0e4120199c23acce758.zip external_chromium-513209b27ff55e2841eac0e4120199c23acce758.tar.gz external_chromium-513209b27ff55e2841eac0e4120199c23acce758.tar.bz2 | |
Merge Chromium at r65505: Initial merge by git.
Change-Id: I31d8f1d8cd33caaf7f47ffa7350aef42d5fbdb45
Diffstat (limited to 'chrome/common/webkit_param_traits.cc')
| -rw-r--r-- | chrome/common/webkit_param_traits.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/common/webkit_param_traits.cc b/chrome/common/webkit_param_traits.cc index 26465dd..909d7fd 100644 --- a/chrome/common/webkit_param_traits.cc +++ b/chrome/common/webkit_param_traits.cc @@ -40,7 +40,8 @@ void ParamTraits<WebKit::WebRect>::Log(const param_type& p, std::string* l) { l->append(")"); } -void ParamTraits<WebKit::WebScreenInfo>::Write(Message* m, const param_type& p) { +void ParamTraits<WebKit::WebScreenInfo>::Write(Message* m, + const param_type& p) { WriteParam(m, p.depth); WriteParam(m, p.depthPerComponent); WriteParam(m, p.isMonochrome); @@ -101,8 +102,8 @@ void ParamTraits<WebKit::WebFindOptions>::Log(const param_type& p, void ParamTraits<WebKit::WebCache::ResourceTypeStat>::Log( const param_type& p, std::string* l) { - l->append(StringPrintf("%" PRIuS " %" PRIuS " %" PRIuS " %" PRIuS, - p.count, p.size, p.liveSize, p.decodedSize)); + l->append(base::StringPrintf("%" PRIuS " %" PRIuS " %" PRIuS " %" PRIuS, + p.count, p.size, p.liveSize, p.decodedSize)); } void ParamTraits<WebKit::WebMediaPlayerAction>::Write(Message* m, |