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

Unified Diff: content/browser/renderer_host/delegated_frame_host.h

Issue 2661543002: Rename LocalFrameId to LocalSurfaceId (Closed)
Patch Set: c Created 3 years, 11 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
Index: content/browser/renderer_host/delegated_frame_host.h
diff --git a/content/browser/renderer_host/delegated_frame_host.h b/content/browser/renderer_host/delegated_frame_host.h
index 32e539ec57735a10f58160fe1fe4bbb11aa14817..94b12e8b49c4893645a202011824d2b085608e23 100644
--- a/content/browser/renderer_host/delegated_frame_host.h
+++ b/content/browser/renderer_host/delegated_frame_host.h
@@ -113,7 +113,7 @@ class CONTENT_EXPORT DelegatedFrameHost
// cc::SurfaceFactoryClient implementation.
void ReturnResources(const cc::ReturnedResourceArray& resources) override;
- void WillDrawSurface(const cc::LocalFrameId& id,
+ void WillDrawSurface(const cc::LocalSurfaceId& id,
const gfx::Rect& damage_rect) override;
void SetBeginFrameSource(cc::BeginFrameSource* begin_frame_source) override;
@@ -172,11 +172,11 @@ class CONTENT_EXPORT DelegatedFrameHost
// Exposed for tests.
cc::SurfaceId SurfaceIdForTesting() const {
- return cc::SurfaceId(frame_sink_id_, local_frame_id_);
+ return cc::SurfaceId(frame_sink_id_, local_surface_id_);
}
- const cc::LocalFrameId& LocalFrameIdForTesting() const {
- return local_frame_id_;
+ const cc::LocalSurfaceId& LocalSurfaceIdForTesting() const {
+ return local_surface_id_;
}
void OnCompositingDidCommitForTesting(ui::Compositor* compositor) {
@@ -251,7 +251,7 @@ class CONTENT_EXPORT DelegatedFrameHost
void AttemptFrameSubscriberCapture(const gfx::Rect& damage_rect);
const cc::FrameSinkId frame_sink_id_;
- cc::LocalFrameId local_frame_id_;
+ cc::LocalSurfaceId local_surface_id_;
DelegatedFrameHostClient* const client_;
ui::Compositor* compositor_;

Powered by Google App Engine
This is Rietveld 408576698