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

Unified Diff: content/common/cc_messages.cc

Issue 303143002: Removed disable-filters-over-ipc flag (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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
« no previous file with comments | « content/browser/renderer_host/render_process_host_impl.cc ('k') | content/public/common/content_switches.h » ('j') | no next file with comments »
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 87201c463233a52851f3b50ba0014d3d35b2f3d8..8d93e1f9744f7ddd5eb31b4a3431976ff3601a85 100644
--- a/content/common/cc_messages.cc
+++ b/content/common/cc_messages.cc
@@ -4,7 +4,6 @@
#include "content/common/cc_messages.h"
-#include "base/command_line.h"
#include "cc/output/compositor_frame.h"
#include "cc/output/filter_operations.h"
#include "content/public/common/common_param_traits.h"
@@ -216,8 +215,7 @@ void ParamTraits<cc::FilterOperations>::Log(
void ParamTraits<skia::RefPtr<SkImageFilter> >::Write(
Message* m, const param_type& p) {
SkImageFilter* filter = p.get();
- const CommandLine& command_line = *CommandLine::ForCurrentProcess();
- if (filter && !command_line.HasSwitch(switches::kDisableFiltersOverIPC)) {
+ if (filter) {
skia::RefPtr<SkData> data =
skia::AdoptRef(SkValidatingSerializeFlattenable(filter));
m->WriteData(static_cast<const char*>(data->data()), data->size());
@@ -232,9 +230,7 @@ bool ParamTraits<skia::RefPtr<SkImageFilter> >::Read(
int length = 0;
if (!m->ReadData(iter, &data, &length))
return false;
- const CommandLine& command_line = *CommandLine::ForCurrentProcess();
- if ((length > 0) &&
- !command_line.HasSwitch(switches::kDisableFiltersOverIPC)) {
+ if (length > 0) {
SkFlattenable* flattenable = SkValidatingDeserializeFlattenable(
data, length, SkImageFilter::GetFlattenableType());
*r = skia::AdoptRef(static_cast<SkImageFilter*>(flattenable));
« no previous file with comments | « content/browser/renderer_host/render_process_host_impl.cc ('k') | content/public/common/content_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698