Index: cc/ipc/cc_param_traits.cc |
diff --git a/cc/ipc/cc_param_traits.cc b/cc/ipc/cc_param_traits.cc |
index e12a686d80d47fe6c4542c2abc796e22b46dda16..948b3c21e17fc1757c4c781472fb95add700bc58 100644 |
--- a/cc/ipc/cc_param_traits.cc |
+++ b/cc/ipc/cc_param_traits.cc |
@@ -648,7 +648,6 @@ namespace { |
enum CompositorFrameType { |
NO_FRAME, |
DELEGATED_FRAME, |
- GL_FRAME, |
}; |
} |
@@ -656,12 +655,8 @@ void ParamTraits<cc::CompositorFrame>::Write(base::Pickle* m, |
const param_type& p) { |
WriteParam(m, p.metadata); |
if (p.delegated_frame_data) { |
- DCHECK(!p.gl_frame_data); |
WriteParam(m, static_cast<int>(DELEGATED_FRAME)); |
WriteParam(m, *p.delegated_frame_data); |
- } else if (p.gl_frame_data) { |
- WriteParam(m, static_cast<int>(GL_FRAME)); |
- WriteParam(m, *p.gl_frame_data); |
} else { |
WriteParam(m, static_cast<int>(NO_FRAME)); |
} |
@@ -683,11 +678,6 @@ bool ParamTraits<cc::CompositorFrame>::Read(const base::Pickle* m, |
if (!ReadParam(m, iter, p->delegated_frame_data.get())) |
return false; |
break; |
- case GL_FRAME: |
- p->gl_frame_data.reset(new cc::GLFrameData()); |
- if (!ReadParam(m, iter, p->gl_frame_data.get())) |
- return false; |
- break; |
case NO_FRAME: |
break; |
default: |
@@ -703,8 +693,6 @@ void ParamTraits<cc::CompositorFrame>::Log(const param_type& p, |
l->append(", "); |
if (p.delegated_frame_data) |
LogParam(*p.delegated_frame_data, l); |
- else if (p.gl_frame_data) |
- LogParam(*p.gl_frame_data, l); |
l->append(")"); |
} |