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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/common/cc_messages.cc

Issue 16968002: Move implementation of WebFilterOperations into cc (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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
« cc/trees/layer_tree_host_unittest_occlusion.cc ('K') | « content/common/cc_messages.h ('k') | content/common/cc_messages_unittest.cc » ('j') | webkit/renderer/compositor_bindings/web_layer_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/cc_messages.cc
diff --git a/content/common/cc_messages.cc b/content/common/cc_messages.cc
index 79832169ed13784af6e0abdf663c159a6aed22f1..a5226eb717e911cb800c3cc67196643a18f892de 100644
--- a/content/common/cc_messages.cc
+++ b/content/common/cc_messages.cc
@@ -5,103 +5,103 @@
#include "content/common/cc_messages.h"
#include "cc/output/compositor_frame.h"
+#include "cc/output/filter_operations.h"
#include "content/public/common/common_param_traits.h"
-#include "third_party/WebKit/public/platform/WebFilterOperations.h"
#include "ui/gfx/transform.h"
namespace IPC {
-void ParamTraits<WebKit::WebFilterOperation>::Write(
+void ParamTraits<cc::FilterOperation>::Write(
Message* m, const param_type& p) {
WriteParam(m, p.type());
switch (p.type()) {
- case WebKit::WebFilterOperation::FilterTypeGrayscale:
- case WebKit::WebFilterOperation::FilterTypeSepia:
- case WebKit::WebFilterOperation::FilterTypeSaturate:
- case WebKit::WebFilterOperation::FilterTypeHueRotate:
- case WebKit::WebFilterOperation::FilterTypeInvert:
- case WebKit::WebFilterOperation::FilterTypeBrightness:
- case WebKit::WebFilterOperation::FilterTypeSaturatingBrightness:
- case WebKit::WebFilterOperation::FilterTypeContrast:
- case WebKit::WebFilterOperation::FilterTypeOpacity:
- case WebKit::WebFilterOperation::FilterTypeBlur:
+ case cc::FilterOperation::FilterTypeGrayscale:
+ case cc::FilterOperation::FilterTypeSepia:
+ case cc::FilterOperation::FilterTypeSaturate:
+ case cc::FilterOperation::FilterTypeHueRotate:
+ case cc::FilterOperation::FilterTypeInvert:
+ case cc::FilterOperation::FilterTypeBrightness:
+ case cc::FilterOperation::FilterTypeSaturatingBrightness:
+ case cc::FilterOperation::FilterTypeContrast:
+ case cc::FilterOperation::FilterTypeOpacity:
+ case cc::FilterOperation::FilterTypeBlur:
WriteParam(m, p.amount());
break;
- case WebKit::WebFilterOperation::FilterTypeDropShadow:
- WriteParam(m, p.dropShadowOffset());
+ case cc::FilterOperation::FilterTypeDropShadow:
+ WriteParam(m, p.drop_shadow_offset());
WriteParam(m, p.amount());
- WriteParam(m, p.dropShadowColor());
+ WriteParam(m, p.drop_shadow_color());
break;
- case WebKit::WebFilterOperation::FilterTypeColorMatrix:
+ case cc::FilterOperation::FilterTypeColorMatrix:
for (int i = 0; i < 20; ++i)
WriteParam(m, p.matrix()[i]);
break;
- case WebKit::WebFilterOperation::FilterTypeZoom:
+ case cc::FilterOperation::FilterTypeZoom:
WriteParam(m, p.amount());
- WriteParam(m, p.zoomInset());
+ WriteParam(m, p.zoom_inset());
break;
}
}
-bool ParamTraits<WebKit::WebFilterOperation>::Read(
+bool ParamTraits<cc::FilterOperation>::Read(
const Message* m, PickleIterator* iter, param_type* r) {
- WebKit::WebFilterOperation::FilterType type;
+ cc::FilterOperation::FilterType type;
float amount;
- WebKit::WebPoint dropShadowOffset;
- WebKit::WebColor dropShadowColor;
+ gfx::Point drop_shadow_offset;
+ SkColor drop_shadow_color;
SkScalar matrix[20];
int zoom_inset;
if (!ReadParam(m, iter, &type))
return false;
- r->setType(type);
+ r->set_type(type);
bool success = false;
switch (type) {
- case WebKit::WebFilterOperation::FilterTypeGrayscale:
- case WebKit::WebFilterOperation::FilterTypeSepia:
- case WebKit::WebFilterOperation::FilterTypeSaturate:
- case WebKit::WebFilterOperation::FilterTypeHueRotate:
- case WebKit::WebFilterOperation::FilterTypeInvert:
- case WebKit::WebFilterOperation::FilterTypeBrightness:
- case WebKit::WebFilterOperation::FilterTypeSaturatingBrightness:
- case WebKit::WebFilterOperation::FilterTypeContrast:
- case WebKit::WebFilterOperation::FilterTypeOpacity:
- case WebKit::WebFilterOperation::FilterTypeBlur:
+ case cc::FilterOperation::FilterTypeGrayscale:
+ case cc::FilterOperation::FilterTypeSepia:
+ case cc::FilterOperation::FilterTypeSaturate:
+ case cc::FilterOperation::FilterTypeHueRotate:
+ case cc::FilterOperation::FilterTypeInvert:
+ case cc::FilterOperation::FilterTypeBrightness:
+ case cc::FilterOperation::FilterTypeSaturatingBrightness:
+ case cc::FilterOperation::FilterTypeContrast:
+ case cc::FilterOperation::FilterTypeOpacity:
+ case cc::FilterOperation::FilterTypeBlur:
if (ReadParam(m, iter, &amount)) {
- r->setAmount(amount);
+ r->set_amount(amount);
success = true;
}
break;
- case WebKit::WebFilterOperation::FilterTypeDropShadow:
- if (ReadParam(m, iter, &dropShadowOffset) &&
+ case cc::FilterOperation::FilterTypeDropShadow:
+ if (ReadParam(m, iter, &drop_shadow_offset) &&
ReadParam(m, iter, &amount) &&
- ReadParam(m, iter, &dropShadowColor)) {
- r->setDropShadowOffset(dropShadowOffset);
- r->setAmount(amount);
- r->setDropShadowColor(dropShadowColor);
+ ReadParam(m, iter, &drop_shadow_color)) {
+ r->set_drop_shadow_offset(drop_shadow_offset);
+ r->set_amount(amount);
+ r->set_drop_shadow_color(drop_shadow_color);
success = true;
}
break;
- case WebKit::WebFilterOperation::FilterTypeColorMatrix: {
+ case cc::FilterOperation::FilterTypeColorMatrix: {
int i;
for (i = 0; i < 20; ++i) {
if (!ReadParam(m, iter, &matrix[i]))
break;
}
if (i == 20) {
- r->setMatrix(matrix);
+ r->set_matrix(matrix);
success = true;
}
break;
}
- case WebKit::WebFilterOperation::FilterTypeZoom:
+ case cc::FilterOperation::FilterTypeZoom:
if (ReadParam(m, iter, &amount) &&
ReadParam(m, iter, &zoom_inset) &&
amount >= 0.f &&
zoom_inset >= 0) {
- r->setAmount(amount);
- r->setZoomInset(zoom_inset);
+ r->set_amount(amount);
+ r->set_zoom_inset(zoom_inset);
success = true;
}
break;
@@ -109,49 +109,49 @@ bool ParamTraits<WebKit::WebFilterOperation>::Read(
return success;
}
-void ParamTraits<WebKit::WebFilterOperation>::Log(
+void ParamTraits<cc::FilterOperation>::Log(
const param_type& p, std::string* l) {
l->append("(");
LogParam(static_cast<unsigned>(p.type()), l);
l->append(", ");
switch (p.type()) {
- case WebKit::WebFilterOperation::FilterTypeGrayscale:
- case WebKit::WebFilterOperation::FilterTypeSepia:
- case WebKit::WebFilterOperation::FilterTypeSaturate:
- case WebKit::WebFilterOperation::FilterTypeHueRotate:
- case WebKit::WebFilterOperation::FilterTypeInvert:
- case WebKit::WebFilterOperation::FilterTypeBrightness:
- case WebKit::WebFilterOperation::FilterTypeSaturatingBrightness:
- case WebKit::WebFilterOperation::FilterTypeContrast:
- case WebKit::WebFilterOperation::FilterTypeOpacity:
- case WebKit::WebFilterOperation::FilterTypeBlur:
+ case cc::FilterOperation::FilterTypeGrayscale:
+ case cc::FilterOperation::FilterTypeSepia:
+ case cc::FilterOperation::FilterTypeSaturate:
+ case cc::FilterOperation::FilterTypeHueRotate:
+ case cc::FilterOperation::FilterTypeInvert:
+ case cc::FilterOperation::FilterTypeBrightness:
+ case cc::FilterOperation::FilterTypeSaturatingBrightness:
+ case cc::FilterOperation::FilterTypeContrast:
+ case cc::FilterOperation::FilterTypeOpacity:
+ case cc::FilterOperation::FilterTypeBlur:
LogParam(p.amount(), l);
break;
- case WebKit::WebFilterOperation::FilterTypeDropShadow:
- LogParam(p.dropShadowOffset(), l);
+ case cc::FilterOperation::FilterTypeDropShadow:
+ LogParam(p.drop_shadow_offset(), l);
l->append(", ");
LogParam(p.amount(), l);
l->append(", ");
- LogParam(p.dropShadowColor(), l);
+ LogParam(p.drop_shadow_color(), l);
break;
- case WebKit::WebFilterOperation::FilterTypeColorMatrix:
+ case cc::FilterOperation::FilterTypeColorMatrix:
for (int i = 0; i < 20; ++i) {
if (i)
l->append(", ");
LogParam(p.matrix()[i], l);
}
break;
- case WebKit::WebFilterOperation::FilterTypeZoom:
+ case cc::FilterOperation::FilterTypeZoom:
LogParam(p.amount(), l);
l->append(", ");
- LogParam(p.zoomInset(), l);
+ LogParam(p.zoom_inset(), l);
break;
}
l->append(")");
}
-void ParamTraits<WebKit::WebFilterOperations>::Write(
+void ParamTraits<cc::FilterOperations>::Write(
Message* m, const param_type& p) {
WriteParam(m, p.size());
for (std::size_t i = 0; i < p.size(); ++i) {
@@ -159,23 +159,22 @@ void ParamTraits<WebKit::WebFilterOperations>::Write(
}
}
-bool ParamTraits<WebKit::WebFilterOperations>::Read(
+bool ParamTraits<cc::FilterOperations>::Read(
const Message* m, PickleIterator* iter, param_type* r) {
size_t count;
if (!ReadParam(m, iter, &count))
return false;
for (std::size_t i = 0; i < count; ++i) {
- WebKit::WebFilterOperation op =
- WebKit::WebFilterOperation::createEmptyFilter();
+ cc::FilterOperation op = cc::FilterOperation::CreateEmptyFilter();
if (!ReadParam(m, iter, &op))
return false;
- r->append(op);
+ r->Append(op);
}
return true;
}
-void ParamTraits<WebKit::WebFilterOperations>::Log(
+void ParamTraits<cc::FilterOperations>::Log(
const param_type& p, std::string* l) {
l->append("(");
for (std::size_t i = 0; i < p.size(); ++i) {
« cc/trees/layer_tree_host_unittest_occlusion.cc ('K') | « content/common/cc_messages.h ('k') | content/common/cc_messages_unittest.cc » ('j') | webkit/renderer/compositor_bindings/web_layer_impl.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698