Index: cc/ipc/compositor_frame_struct_traits.cc |
diff --git a/cc/ipc/compositor_frame_struct_traits.cc b/cc/ipc/compositor_frame_struct_traits.cc |
index e3d5442855a752282ea5f16cf7f5f13e4b354a08..f06f3704e64e4311b1e18e8efa8fd5f226d5c7b5 100644 |
--- a/cc/ipc/compositor_frame_struct_traits.cc |
+++ b/cc/ipc/compositor_frame_struct_traits.cc |
@@ -14,11 +14,9 @@ bool StructTraits<cc::mojom::CompositorFrameDataView, |
cc::CompositorFrame>::Read(cc::mojom::CompositorFrameDataView |
data, |
cc::CompositorFrame* out) { |
- if (!data.ReadMetadata(&out->metadata)) |
- return false; |
- |
- return data.ReadResources(&out->resource_list) && |
- data.ReadPasses(&out->render_pass_list); |
+ return data.ReadPasses(&out->render_pass_list) && |
+ !out->render_pass_list.empty() && data.ReadMetadata(&out->metadata) && |
+ data.ReadResources(&out->resource_list); |
} |
} // namespace mojo |