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

Unified Diff: content/browser/renderer_host/render_widget_host_view_aura.cc

Issue 2136413002: Update Surface ID Terminology (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed webkit_unit_tests Created 4 years, 5 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/render_widget_host_view_aura.cc
diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc
index 7940896835bfe89771a903f186ec65da81513879..d78f695a4a3a566417747a1bf817c7fcec10b37d 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura.cc
+++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -475,8 +475,8 @@ RenderWidgetHostViewAura::RenderWidgetHostViewAura(RenderWidgetHost* host,
// Let the page-level input event router know about our surface ID
// namespace for surface-based hit testing.
if (host_->delegate() && host_->delegate()->GetInputEventRouter()) {
- host_->delegate()->GetInputEventRouter()->AddSurfaceIdNamespaceOwner(
- GetSurfaceIdNamespace(), this);
+ host_->delegate()->GetInputEventRouter()->AddSurfaceClientIdOwner(
+ GetSurfaceClientId(), this);
}
// We should start observing the TextInputManager for IME-related events as
@@ -1994,7 +1994,7 @@ void RenderWidgetHostViewAura::OnMouseEvent(ui::MouseEvent* event) {
event->SetHandled();
}
-uint32_t RenderWidgetHostViewAura::SurfaceIdNamespaceAtPoint(
+uint32_t RenderWidgetHostViewAura::SurfaceClientIdAtPoint(
cc::SurfaceHittestDelegate* delegate,
const gfx::Point& point,
gfx::Point* transformed_point) {
@@ -2012,8 +2012,8 @@ uint32_t RenderWidgetHostViewAura::SurfaceIdNamespaceAtPoint(
// It is possible that the renderer has not yet produced a surface, in which
// case we return our current namespace.
if (id.is_null())
- return GetSurfaceIdNamespace();
- return id.id_namespace();
+ return GetSurfaceClientId();
+ return id.client_id();
}
void RenderWidgetHostViewAura::ProcessMouseEvent(
@@ -2953,8 +2953,8 @@ void RenderWidgetHostViewAura::UnlockCompositingSurface() {
NOTIMPLEMENTED();
}
-uint32_t RenderWidgetHostViewAura::GetSurfaceIdNamespace() {
- return delegated_frame_host_->GetSurfaceIdNamespace();
+uint32_t RenderWidgetHostViewAura::GetSurfaceClientId() {
+ return delegated_frame_host_->GetSurfaceClientId();
}
cc::SurfaceId RenderWidgetHostViewAura::SurfaceIdForTesting() const {

Powered by Google App Engine
This is Rietveld 408576698