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

Side by Side Diff: content/browser/renderer_host/render_widget_host_view_aura.cc

Issue 1996783002: Make cc::SurfaceId unguessable (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed Ben's comment Created 4 years, 6 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "content/browser/renderer_host/render_widget_host_view_aura.h" 5 #include "content/browser/renderer_host/render_widget_host_view_aura.h"
6 6
7 #include <set> 7 #include <set>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 2044 matching lines...) Expand 10 before | Expand all | Expand 10 after
2055 gfx::ConvertPointToPixel(device_scale_factor_, point); 2055 gfx::ConvertPointToPixel(device_scale_factor_, point);
2056 cc::SurfaceId id = delegated_frame_host_->SurfaceIdAtPoint( 2056 cc::SurfaceId id = delegated_frame_host_->SurfaceIdAtPoint(
2057 delegate, point_in_pixels, transformed_point); 2057 delegate, point_in_pixels, transformed_point);
2058 *transformed_point = 2058 *transformed_point =
2059 gfx::ConvertPointToDIP(device_scale_factor_, *transformed_point); 2059 gfx::ConvertPointToDIP(device_scale_factor_, *transformed_point);
2060 2060
2061 // It is possible that the renderer has not yet produced a surface, in which 2061 // It is possible that the renderer has not yet produced a surface, in which
2062 // case we return our current namespace. 2062 // case we return our current namespace.
2063 if (id.is_null()) 2063 if (id.is_null())
2064 return GetSurfaceIdNamespace(); 2064 return GetSurfaceIdNamespace();
2065 return cc::SurfaceIdAllocator::NamespaceForId(id); 2065 return id.id_namespace();
2066 } 2066 }
2067 2067
2068 void RenderWidgetHostViewAura::ProcessMouseEvent( 2068 void RenderWidgetHostViewAura::ProcessMouseEvent(
2069 const blink::WebMouseEvent& event) { 2069 const blink::WebMouseEvent& event) {
2070 host_->ForwardMouseEvent(event); 2070 host_->ForwardMouseEvent(event);
2071 } 2071 }
2072 2072
2073 void RenderWidgetHostViewAura::ProcessMouseWheelEvent( 2073 void RenderWidgetHostViewAura::ProcessMouseWheelEvent(
2074 const blink::WebMouseWheelEvent& event) { 2074 const blink::WebMouseWheelEvent& event) {
2075 host_->ForwardWheelEvent(event); 2075 host_->ForwardWheelEvent(event);
(...skipping 917 matching lines...) Expand 10 before | Expand all | Expand 10 after
2993 2993
2994 //////////////////////////////////////////////////////////////////////////////// 2994 ////////////////////////////////////////////////////////////////////////////////
2995 // RenderWidgetHostViewBase, public: 2995 // RenderWidgetHostViewBase, public:
2996 2996
2997 // static 2997 // static
2998 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) { 2998 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) {
2999 GetScreenInfoForWindow(results, NULL); 2999 GetScreenInfoForWindow(results, NULL);
3000 } 3000 }
3001 3001
3002 } // namespace content 3002 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698