From 0cfe5dae9265f8d3be8648e33421c7c76cb31b4e Mon Sep 17 00:00:00 2001 From: "erg@google.com" Date: Tue, 17 Aug 2010 00:24:54 +0000 Subject: Completely revert all my IPC work to see if this was what regressed the page cycler. BUG=51411,52103 TEST=page cycler Review URL: http://codereview.chromium.org/3170020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56272 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/common/webkit_param_traits.cc | 170 ----------------------------------- 1 file changed, 170 deletions(-) delete mode 100644 chrome/common/webkit_param_traits.cc (limited to 'chrome/common/webkit_param_traits.cc') diff --git a/chrome/common/webkit_param_traits.cc b/chrome/common/webkit_param_traits.cc deleted file mode 100644 index 4a81d46..0000000 --- a/chrome/common/webkit_param_traits.cc +++ /dev/null @@ -1,170 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "chrome/common/webkit_param_traits.h" - -#include "third_party/WebKit/WebKit/chromium/public/WebCompositionUnderline.h" -#include "third_party/WebKit/WebKit/chromium/public/WebFindOptions.h" -#include "third_party/WebKit/WebKit/chromium/public/WebMediaPlayerAction.h" -#include "third_party/WebKit/WebKit/chromium/public/WebScreenInfo.h" - -namespace IPC { - -void ParamTraits::Write(Message* m, const param_type& p) { - WriteParam(m, p.x); - WriteParam(m, p.y); - WriteParam(m, p.width); - WriteParam(m, p.height); - } - -bool ParamTraits::Read(const Message* m, void** iter, - param_type* p) { - return - ReadParam(m, iter, &p->x) && - ReadParam(m, iter, &p->y) && - ReadParam(m, iter, &p->width) && - ReadParam(m, iter, &p->height); -} - -void ParamTraits::Log(const param_type& p, std::wstring* l) { - l->append(L"("); - LogParam(p.x, l); - l->append(L", "); - LogParam(p.y, l); - l->append(L", "); - LogParam(p.width, l); - l->append(L", "); - LogParam(p.height, l); - l->append(L")"); -} - -void ParamTraits::Write(Message* m, const param_type& p) { - WriteParam(m, p.depth); - WriteParam(m, p.depthPerComponent); - WriteParam(m, p.isMonochrome); - WriteParam(m, p.rect); - WriteParam(m, p.availableRect); -} - -bool ParamTraits::Read(const Message* m, void** iter, - param_type* p) { - return - ReadParam(m, iter, &p->depth) && - ReadParam(m, iter, &p->depthPerComponent) && - ReadParam(m, iter, &p->isMonochrome) && - ReadParam(m, iter, &p->rect) && - ReadParam(m, iter, &p->availableRect); -} - -void ParamTraits::Log(const param_type& p, - std::wstring* l) { - l->append(L"("); - LogParam(p.depth, l); - l->append(L", "); - LogParam(p.depthPerComponent, l); - l->append(L", "); - LogParam(p.isMonochrome, l); - l->append(L", "); - LogParam(p.rect, l); - l->append(L", "); - LogParam(p.availableRect, l); - l->append(L")"); -} - -void ParamTraits::Write(Message* m, - const param_type& p) { - WriteParam(m, p.forward); - WriteParam(m, p.matchCase); - WriteParam(m, p.findNext); -} - -bool ParamTraits::Read(const Message* m, void** iter, - param_type* p) { - return - ReadParam(m, iter, &p->forward) && - ReadParam(m, iter, &p->matchCase) && - ReadParam(m, iter, &p->findNext); -} - -void ParamTraits::Log(const param_type& p, - std::wstring* l) { - l->append(L"("); - LogParam(p.forward, l); - l->append(L", "); - LogParam(p.matchCase, l); - l->append(L", "); - LogParam(p.findNext, l); - l->append(L")"); -} - -void ParamTraits::Write(Message* m, - const param_type& p) { - WriteParam(m, static_cast(p.type)); - WriteParam(m, p.enable); -} - -bool ParamTraits::Read(const Message* m, - void** iter, - param_type* r) { - int temp; - if (!ReadParam(m, iter, &temp)) - return false; - r->type = static_cast(temp); - return ReadParam(m, iter, &r->enable); -} - -void ParamTraits::Log(const param_type& p, - std::wstring* l) { - l->append(L"("); - switch (p.type) { - case WebKit::WebMediaPlayerAction::Play: - l->append(L"Play"); - break; - case WebKit::WebMediaPlayerAction::Mute: - l->append(L"Mute"); - break; - case WebKit::WebMediaPlayerAction::Loop: - l->append(L"Loop"); - break; - default: - l->append(L"Unknown"); - break; - } - l->append(L", "); - LogParam(p.enable, l); - l->append(L")"); -} - -void ParamTraits::Write(Message* m, - const param_type& p) { - WriteParam(m, p.startOffset); - WriteParam(m, p.endOffset); - WriteParam(m, p.color); - WriteParam(m, p.thick); -} - -bool ParamTraits::Read( - const Message* m, void** iter, - param_type* p) { - return - ReadParam(m, iter, &p->startOffset) && - ReadParam(m, iter, &p->endOffset) && - ReadParam(m, iter, &p->color) && - ReadParam(m, iter, &p->thick); -} - -void ParamTraits::Log(const param_type& p, - std::wstring* l) { - l->append(L"("); - LogParam(p.startOffset, l); - l->append(L","); - LogParam(p.endOffset, l); - l->append(L":"); - LogParam(p.color, l); - l->append(L":"); - LogParam(p.thick, l); - l->append(L")"); -} - -} // namespace IPC -- cgit v1.1