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

Unified Diff: mojo/converters/surfaces/surfaces_type_converters.cc

Issue 1082723005: Fix html_viewer crash in cc when logging into gmail. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 | « components/view_manager/display_manager.cc ('k') | mojo/converters/surfaces/surfaces_utils.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/converters/surfaces/surfaces_type_converters.cc
diff --git a/mojo/converters/surfaces/surfaces_type_converters.cc b/mojo/converters/surfaces/surfaces_type_converters.cc
index 3874e6a7a374f2ce9d019f98b6f8f0f4d8be9921..f922ebf95c4dddc5b4bb2c28a9d503221ed51d0a 100644
--- a/mojo/converters/surfaces/surfaces_type_converters.cc
+++ b/mojo/converters/surfaces/surfaces_type_converters.cc
@@ -363,7 +363,7 @@ TypeConverter<SharedQuadStatePtr, cc::SharedQuadState>::Convert(
PassPtr TypeConverter<PassPtr, cc::RenderPass>::Convert(
const cc::RenderPass& input) {
PassPtr pass = Pass::New();
- pass->id = input.id.index;
+ pass->id = RenderPassId::From(input.id);
pass->output_rect = Rect::From(input.output_rect);
pass->damage_rect = Rect::From(input.damage_rect);
pass->transform_to_root_target =
@@ -402,7 +402,7 @@ TypeConverter<scoped_ptr<cc::RenderPass>, PassPtr>::Convert(
const PassPtr& input) {
scoped_ptr<cc::RenderPass> pass = cc::RenderPass::Create(
input->shared_quad_states.size(), input->quads.size());
- pass->SetAll(cc::RenderPassId(1, input->id),
+ pass->SetAll(input->id.To<cc::RenderPassId>(),
input->output_rect.To<gfx::Rect>(),
input->damage_rect.To<gfx::Rect>(),
input->transform_to_root_target.To<gfx::Transform>(),
« no previous file with comments | « components/view_manager/display_manager.cc ('k') | mojo/converters/surfaces/surfaces_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698