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

Side by Side Diff: cc/output/gl_renderer.cc

Issue 1587283002: Switch cc to std::unordered_*. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@unordered-map
Patch Set: Fix MSVC build issue Created 4 years, 10 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 unified diff | Download patch
« no previous file with comments | « cc/output/direct_renderer.cc ('k') | cc/output/software_renderer.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2010 The Chromium Authors. All rights reserved. 1 // Copyright 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "cc/output/gl_renderer.h" 5 #include "cc/output/gl_renderer.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <algorithm> 10 #include <algorithm>
(...skipping 853 matching lines...) Expand 10 before | Expand all | Expand 10 after
864 skia::RefPtr<SkImage> background_with_filters = ApplyImageFilter( 864 skia::RefPtr<SkImage> background_with_filters = ApplyImageFilter(
865 ScopedUseGrContext::Create(this, frame), resource_provider_, rect, rect, 865 ScopedUseGrContext::Create(this, frame), resource_provider_, rect, rect,
866 quad->filters_scale, filter.get(), background_texture); 866 quad->filters_scale, filter.get(), background_texture);
867 return background_with_filters; 867 return background_with_filters;
868 } 868 }
869 869
870 void GLRenderer::DrawRenderPassQuad(DrawingFrame* frame, 870 void GLRenderer::DrawRenderPassQuad(DrawingFrame* frame,
871 const RenderPassDrawQuad* quad, 871 const RenderPassDrawQuad* quad,
872 const gfx::QuadF* clip_region) { 872 const gfx::QuadF* clip_region) {
873 ScopedResource* contents_texture = 873 ScopedResource* contents_texture =
874 render_pass_textures_.get(quad->render_pass_id); 874 render_pass_textures_[quad->render_pass_id].get();
875 DCHECK(contents_texture); 875 DCHECK(contents_texture);
876 DCHECK(contents_texture->id()); 876 DCHECK(contents_texture->id());
877 877
878 gfx::Transform quad_rect_matrix; 878 gfx::Transform quad_rect_matrix;
879 QuadRectTransform(&quad_rect_matrix, 879 QuadRectTransform(&quad_rect_matrix,
880 quad->shared_quad_state->quad_to_target_transform, 880 quad->shared_quad_state->quad_to_target_transform,
881 gfx::RectF(quad->rect)); 881 gfx::RectF(quad->rect));
882 gfx::Transform contents_device_transform = 882 gfx::Transform contents_device_transform =
883 frame->window_matrix * frame->projection_matrix * quad_rect_matrix; 883 frame->window_matrix * frame->projection_matrix * quad_rect_matrix;
884 contents_device_transform.FlattenTo2d(); 884 contents_device_transform.FlattenTo2d();
(...skipping 2727 matching lines...) Expand 10 before | Expand all | Expand 10 after
3612 texture_id = pending_overlay_resources_.back()->texture_id(); 3612 texture_id = pending_overlay_resources_.back()->texture_id();
3613 } 3613 }
3614 3614
3615 context_support_->ScheduleOverlayPlane( 3615 context_support_->ScheduleOverlayPlane(
3616 overlay.plane_z_order, overlay.transform, texture_id, 3616 overlay.plane_z_order, overlay.transform, texture_id,
3617 ToNearestRect(overlay.display_rect), overlay.uv_rect); 3617 ToNearestRect(overlay.display_rect), overlay.uv_rect);
3618 } 3618 }
3619 } 3619 }
3620 3620
3621 } // namespace cc 3621 } // namespace cc
OLDNEW
« no previous file with comments | « cc/output/direct_renderer.cc ('k') | cc/output/software_renderer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698