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

Unified Diff: cc/ipc/compositor_frame_struct_traits.cc

Issue 2835203002: Reject CompositorFrames with no render passes when deserializing (Closed)
Patch Set: Fixed Android Webview Created 3 years, 8 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 | « cc/ipc/cc_param_traits.cc ('k') | content/browser/android/synchronous_compositor_host.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« no previous file with comments | « cc/ipc/cc_param_traits.cc ('k') | content/browser/android/synchronous_compositor_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698