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

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

Issue 2835403004: Revert "Use MojoCompositorFrameSink in RendererCompositorFrameSink"
Patch Set: Rebased Created 3 years, 8 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_AURA_H_ 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_
6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ 6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 override; 157 override;
158 InputEventAckState FilterInputEvent( 158 InputEventAckState FilterInputEvent(
159 const blink::WebInputEvent& input_event) override; 159 const blink::WebInputEvent& input_event) override;
160 BrowserAccessibilityManager* CreateBrowserAccessibilityManager( 160 BrowserAccessibilityManager* CreateBrowserAccessibilityManager(
161 BrowserAccessibilityDelegate* delegate, bool for_root_frame) override; 161 BrowserAccessibilityDelegate* delegate, bool for_root_frame) override;
162 gfx::AcceleratedWidget AccessibilityGetAcceleratedWidget() override; 162 gfx::AcceleratedWidget AccessibilityGetAcceleratedWidget() override;
163 gfx::NativeViewAccessible AccessibilityGetNativeViewAccessible() override; 163 gfx::NativeViewAccessible AccessibilityGetNativeViewAccessible() override;
164 void SetMainFrameAXTreeID(ui::AXTreeIDRegistry::AXTreeID id) override; 164 void SetMainFrameAXTreeID(ui::AXTreeIDRegistry::AXTreeID id) override;
165 bool LockMouse() override; 165 bool LockMouse() override;
166 void UnlockMouse() override; 166 void UnlockMouse() override;
167 void DidCreateNewRendererCompositorFrameSink( 167 void DidCreateNewRendererCompositorFrameSink() override;
168 cc::mojom::MojoCompositorFrameSinkClient* renderer_compositor_frame_sink)
169 override;
170 void SubmitCompositorFrame(const cc::LocalSurfaceId& local_surface_id, 168 void SubmitCompositorFrame(const cc::LocalSurfaceId& local_surface_id,
171 cc::CompositorFrame frame) override; 169 cc::CompositorFrame frame) override;
172 void OnBeginFrameDidNotSwap(const cc::BeginFrameAck& ack) override; 170 void OnBeginFrameDidNotSwap(const cc::BeginFrameAck& ack) override;
173 void ClearCompositorFrame() override; 171 void ClearCompositorFrame() override;
174 void DidStopFlinging() override; 172 void DidStopFlinging() override;
175 void OnDidNavigateMainFrameToNewPage() override; 173 void OnDidNavigateMainFrameToNewPage() override;
176 cc::FrameSinkId GetFrameSinkId() override; 174 cc::FrameSinkId GetFrameSinkId() override;
177 cc::FrameSinkId FrameSinkIdAtPoint(cc::SurfaceHittestDelegate* delegate, 175 cc::FrameSinkId FrameSinkIdAtPoint(cc::SurfaceHittestDelegate* delegate,
178 const gfx::Point& point, 176 const gfx::Point& point,
179 gfx::Point* transformed_point) override; 177 gfx::Point* transformed_point) override;
(...skipping 396 matching lines...) Expand 10 before | Expand all | Expand 10 after
576 std::vector<ui::LatencyInfo> software_latency_info_; 574 std::vector<ui::LatencyInfo> software_latency_info_;
577 575
578 std::unique_ptr<aura::client::ScopedTooltipDisabler> tooltip_disabler_; 576 std::unique_ptr<aura::client::ScopedTooltipDisabler> tooltip_disabler_;
579 577
580 // True when this view acts as a platform view hack for a 578 // True when this view acts as a platform view hack for a
581 // RenderWidgetHostViewGuest. 579 // RenderWidgetHostViewGuest.
582 bool is_guest_view_hack_; 580 bool is_guest_view_hack_;
583 581
584 float device_scale_factor_; 582 float device_scale_factor_;
585 583
586 cc::mojom::MojoCompositorFrameSinkClient* renderer_compositor_frame_sink_ =
587 nullptr;
588
589 // While this is a ui::EventHandler for targetting, |event_handler_| actually 584 // While this is a ui::EventHandler for targetting, |event_handler_| actually
590 // provides an implementation, and directs events to |host_|. 585 // provides an implementation, and directs events to |host_|.
591 std::unique_ptr<RenderWidgetHostViewEventHandler> event_handler_; 586 std::unique_ptr<RenderWidgetHostViewEventHandler> event_handler_;
592 587
593 base::WeakPtrFactory<RenderWidgetHostViewAura> weak_ptr_factory_; 588 base::WeakPtrFactory<RenderWidgetHostViewAura> weak_ptr_factory_;
594 589
595 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); 590 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura);
596 }; 591 };
597 592
598 } // namespace content 593 } // namespace content
599 594
600 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ 595 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698