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

Side by Side Diff: android_webview/browser/surfaces_instance.cc

Issue 2661543002: Rename LocalFrameId to LocalSurfaceId (Closed)
Patch Set: c Created 3 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 | « android_webview/browser/surfaces_instance.h ('k') | cc/ipc/BUILD.gn » ('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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 "android_webview/browser/surfaces_instance.h" 5 #include "android_webview/browser/surfaces_instance.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <utility> 8 #include <utility>
9 9
10 #include "android_webview/browser/aw_gl_surface.h" 10 #include "android_webview/browser/aw_gl_surface.h"
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 render_pass->CreateAndAppendDrawQuad<cc::SurfaceDrawQuad>(); 128 render_pass->CreateAndAppendDrawQuad<cc::SurfaceDrawQuad>();
129 surface_quad->SetNew(quad_state, gfx::Rect(quad_state->quad_layer_bounds), 129 surface_quad->SetNew(quad_state, gfx::Rect(quad_state->quad_layer_bounds),
130 gfx::Rect(quad_state->quad_layer_bounds), child_id); 130 gfx::Rect(quad_state->quad_layer_bounds), child_id);
131 131
132 cc::CompositorFrame frame; 132 cc::CompositorFrame frame;
133 frame.render_pass_list.push_back(std::move(render_pass)); 133 frame.render_pass_list.push_back(std::move(render_pass));
134 frame.metadata.referenced_surfaces = child_ids_; 134 frame.metadata.referenced_surfaces = child_ids_;
135 135
136 if (!root_id_.is_valid()) { 136 if (!root_id_.is_valid()) {
137 root_id_ = surface_id_allocator_->GenerateId(); 137 root_id_ = surface_id_allocator_->GenerateId();
138 display_->SetLocalFrameId(root_id_, 1.f); 138 display_->SetLocalSurfaceId(root_id_, 1.f);
139 } 139 }
140 surface_factory_->SubmitCompositorFrame(root_id_, std::move(frame), 140 surface_factory_->SubmitCompositorFrame(root_id_, std::move(frame),
141 cc::SurfaceFactory::DrawCallback()); 141 cc::SurfaceFactory::DrawCallback());
142 142
143 display_->Resize(viewport); 143 display_->Resize(viewport);
144 display_->DrawAndSwap(); 144 display_->DrawAndSwap();
145 } 145 }
146 146
147 void SurfacesInstance::AddChildId(const cc::SurfaceId& child_id) { 147 void SurfacesInstance::AddChildId(const cc::SurfaceId& child_id) {
148 DCHECK(std::find(child_ids_.begin(), child_ids_.end(), child_id) == 148 DCHECK(std::find(child_ids_.begin(), child_ids_.end(), child_id) ==
(...skipping 24 matching lines...) Expand all
173 CHECK(resources.empty()); 173 CHECK(resources.empty());
174 } 174 }
175 175
176 void SurfacesInstance::SetBeginFrameSource( 176 void SurfacesInstance::SetBeginFrameSource(
177 cc::BeginFrameSource* begin_frame_source) { 177 cc::BeginFrameSource* begin_frame_source) {
178 // Parent compsitor calls DrawAndSwap directly and doesn't use 178 // Parent compsitor calls DrawAndSwap directly and doesn't use
179 // BeginFrameSource. 179 // BeginFrameSource.
180 } 180 }
181 181
182 } // namespace android_webview 182 } // namespace android_webview
OLDNEW
« no previous file with comments | « android_webview/browser/surfaces_instance.h ('k') | cc/ipc/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698