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

Unified Diff: android_webview/browser/surfaces_instance.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/surfaces_instance.h ('k') | cc/surfaces/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: android_webview/browser/surfaces_instance.cc
diff --git a/android_webview/browser/surfaces_instance.cc b/android_webview/browser/surfaces_instance.cc
index 751b55399f7f49198cab74886d1706512729b72f..bdb7166cae085152626b5f8bbb77291cbadb7172 100644
--- a/android_webview/browser/surfaces_instance.cc
+++ b/android_webview/browser/surfaces_instance.cc
@@ -19,7 +19,7 @@
#include "cc/surfaces/compositor_frame_sink_support.h"
#include "cc/surfaces/display.h"
#include "cc/surfaces/display_scheduler.h"
-#include "cc/surfaces/surface_id_allocator.h"
+#include "cc/surfaces/local_surface_id_allocator.h"
#include "cc/surfaces/surface_manager.h"
#include "ui/gfx/geometry/rect.h"
#include "ui/gfx/geometry/size.h"
@@ -50,7 +50,7 @@ SurfacesInstance::SurfacesInstance()
settings.should_clear_root_render_pass = false;
surface_manager_.reset(new cc::SurfaceManager);
- surface_id_allocator_.reset(new cc::SurfaceIdAllocator());
+ local_surface_id_allocator_.reset(new cc::LocalSurfaceIdAllocator());
constexpr bool is_root = true;
constexpr bool handles_frame_sink_id_invalidation = true;
@@ -134,7 +134,7 @@ void SurfacesInstance::DrawAndSwap(const gfx::Size& viewport,
frame.metadata.referenced_surfaces = child_ids_;
if (!root_id_.is_valid()) {
- root_id_ = surface_id_allocator_->GenerateId();
+ root_id_ = local_surface_id_allocator_->GenerateId();
display_->SetLocalSurfaceId(root_id_, 1.f);
}
support_->SubmitCompositorFrame(root_id_, std::move(frame));
« no previous file with comments | « android_webview/browser/surfaces_instance.h ('k') | cc/surfaces/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698