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

Unified Diff: android_webview/browser/hardware_renderer.cc

Issue 2708153005: Rename SurfaceIdAllocator to LocalSurfaceIdAllocator (Closed)
Patch Set: Delete useless include 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « android_webview/browser/hardware_renderer.h ('k') | android_webview/browser/surfaces_instance.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: android_webview/browser/hardware_renderer.cc
diff --git a/android_webview/browser/hardware_renderer.cc b/android_webview/browser/hardware_renderer.cc
index e4b7a86303b615b92e4ac8cd6569412fae7cb1a8..af54706875572c2971b04d2c118e21d3b0ad4ad3 100644
--- a/android_webview/browser/hardware_renderer.cc
+++ b/android_webview/browser/hardware_renderer.cc
@@ -15,8 +15,8 @@
#include "base/memory/ptr_util.h"
#include "base/trace_event/trace_event.h"
#include "cc/output/compositor_frame.h"
+#include "cc/surfaces/local_surface_id_allocator.h"
#include "cc/surfaces/surface_factory.h"
-#include "cc/surfaces/surface_id_allocator.h"
#include "cc/surfaces/surface_manager.h"
#include "ui/gfx/transform.h"
#include "ui/gl/gl_bindings.h"
@@ -28,7 +28,8 @@ HardwareRenderer::HardwareRenderer(RenderThreadManager* state)
last_egl_context_(eglGetCurrentContext()),
surfaces_(SurfacesInstance::GetOrCreateInstance()),
frame_sink_id_(surfaces_->AllocateFrameSinkId()),
- surface_id_allocator_(base::MakeUnique<cc::SurfaceIdAllocator>()),
+ local_surface_id_allocator_(
+ base::MakeUnique<cc::LocalSurfaceIdAllocator>()),
surface_factory_(new cc::SurfaceFactory(frame_sink_id_,
surfaces_->GetSurfaceManager(),
this)),
@@ -166,7 +167,7 @@ void HardwareRenderer::DrawGL(AwDrawGLInfo* draw_info) {
void HardwareRenderer::AllocateSurface() {
DCHECK(!child_id_.is_valid());
- child_id_ = surface_id_allocator_->GenerateId();
+ child_id_ = local_surface_id_allocator_->GenerateId();
surfaces_->AddChildId(cc::SurfaceId(frame_sink_id_, child_id_));
}
« no previous file with comments | « android_webview/browser/hardware_renderer.h ('k') | android_webview/browser/surfaces_instance.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698