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

Side by Side Diff: content/browser/renderer_host/render_widget_host_view_mac.h

Issue 2382873002: Replace usage of SurfaceId's client_id with FrameSinkId (Closed)
Patch Set: Rebased Created 4 years, 2 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 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_ 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_
6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_ 6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_
7 7
8 #import <Cocoa/Cocoa.h> 8 #import <Cocoa/Cocoa.h>
9 #include <IOSurface/IOSurface.h> 9 #include <IOSurface/IOSurface.h>
10 #include <stddef.h> 10 #include <stddef.h>
(...skipping 309 matching lines...) Expand 10 before | Expand all | Expand 10 after
320 320
321 bool LockMouse() override; 321 bool LockMouse() override;
322 void UnlockMouse() override; 322 void UnlockMouse() override;
323 void OnSetNeedsFlushInput() override; 323 void OnSetNeedsFlushInput() override;
324 void GestureEventAck(const blink::WebGestureEvent& event, 324 void GestureEventAck(const blink::WebGestureEvent& event,
325 InputEventAckState ack_result) override; 325 InputEventAckState ack_result) override;
326 326
327 std::unique_ptr<SyntheticGestureTarget> CreateSyntheticGestureTarget() 327 std::unique_ptr<SyntheticGestureTarget> CreateSyntheticGestureTarget()
328 override; 328 override;
329 329
330 uint32_t GetSurfaceClientId() override; 330 cc::FrameSinkId GetFrameSinkId() override;
331 uint32_t SurfaceClientIdAtPoint(cc::SurfaceHittestDelegate* delegate, 331 cc::FrameSinkId FrameSinkIdAtPoint(cc::SurfaceHittestDelegate* delegate,
332 const gfx::Point& point, 332 const gfx::Point& point,
333 gfx::Point* transformed_point) override; 333 gfx::Point* transformed_point) override;
334 // Returns true when we can do SurfaceHitTesting for the event type. 334 // Returns true when we can do SurfaceHitTesting for the event type.
335 bool ShouldRouteEvent(const blink::WebInputEvent& event) const; 335 bool ShouldRouteEvent(const blink::WebInputEvent& event) const;
336 void ProcessMouseEvent(const blink::WebMouseEvent& event, 336 void ProcessMouseEvent(const blink::WebMouseEvent& event,
337 const ui::LatencyInfo& latency) override; 337 const ui::LatencyInfo& latency) override;
338 void ProcessMouseWheelEvent(const blink::WebMouseWheelEvent& event, 338 void ProcessMouseWheelEvent(const blink::WebMouseWheelEvent& event,
339 const ui::LatencyInfo& latency) override; 339 const ui::LatencyInfo& latency) override;
340 void ProcessTouchEvent(const blink::WebTouchEvent& event, 340 void ProcessTouchEvent(const blink::WebTouchEvent& event,
341 const ui::LatencyInfo& latency) override; 341 const ui::LatencyInfo& latency) override;
342 void ProcessGestureEvent(const blink::WebGestureEvent& event, 342 void ProcessGestureEvent(const blink::WebGestureEvent& event,
343 const ui::LatencyInfo& latency) override; 343 const ui::LatencyInfo& latency) override;
(...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after
557 557
558 // Factory used to safely scope delayed calls to ShutdownHost(). 558 // Factory used to safely scope delayed calls to ShutdownHost().
559 base::WeakPtrFactory<RenderWidgetHostViewMac> weak_factory_; 559 base::WeakPtrFactory<RenderWidgetHostViewMac> weak_factory_;
560 560
561 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewMac); 561 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewMac);
562 }; 562 };
563 563
564 } // namespace content 564 } // namespace content
565 565
566 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_ 566 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698