Chromium Code Reviews| OLD | NEW |
|---|---|
| 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/IOSurfaceAPI.h> | 9 #include <IOSurface/IOSurfaceAPI.h> |
| 10 #include <list> | 10 #include <list> |
| (...skipping 461 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 472 bool defer_compositor_lock) override; | 472 bool defer_compositor_lock) override; |
| 473 void DelegatedFrameHostResizeLockWasReleased() override; | 473 void DelegatedFrameHostResizeLockWasReleased() override; |
| 474 void DelegatedFrameHostSendCompositorSwapAck( | 474 void DelegatedFrameHostSendCompositorSwapAck( |
| 475 int output_surface_id, | 475 int output_surface_id, |
| 476 const cc::CompositorFrameAck& ack) override; | 476 const cc::CompositorFrameAck& ack) override; |
| 477 void DelegatedFrameHostSendReclaimCompositorResources( | 477 void DelegatedFrameHostSendReclaimCompositorResources( |
| 478 int output_surface_id, | 478 int output_surface_id, |
| 479 const cc::CompositorFrameAck& ack) override; | 479 const cc::CompositorFrameAck& ack) override; |
| 480 void DelegatedFrameHostOnLostCompositorResources() override; | 480 void DelegatedFrameHostOnLostCompositorResources() override; |
| 481 void DelegatedFrameHostUpdateVSyncParameters( | 481 void DelegatedFrameHostUpdateVSyncParameters( |
| 482 const base::TimeTicks& timebase, | 482 const cc::BeginFrameArgs& args) override; |
|
brianderson
2015/03/10 23:36:46
Accidental change?
simonhong
2015/03/11 02:03:37
Oops. reverted.
| |
| 483 const base::TimeDelta& interval) override; | 483 void DelegatedFrameHostSendBeginFrame( |
| 484 const cc::BeginFrameArgs& args) override {} | |
| 484 | 485 |
| 485 // AcceleratedWidgetMacNSView implementation. | 486 // AcceleratedWidgetMacNSView implementation. |
| 486 NSView* AcceleratedWidgetGetNSView() const override; | 487 NSView* AcceleratedWidgetGetNSView() const override; |
| 487 bool AcceleratedWidgetShouldIgnoreBackpressure() const override; | 488 bool AcceleratedWidgetShouldIgnoreBackpressure() const override; |
| 488 void AcceleratedWidgetSwapCompleted( | 489 void AcceleratedWidgetSwapCompleted( |
| 489 const std::vector<ui::LatencyInfo>& latency_info) override; | 490 const std::vector<ui::LatencyInfo>& latency_info) override; |
| 490 void AcceleratedWidgetHitError() override; | 491 void AcceleratedWidgetHitError() override; |
| 491 | 492 |
| 492 // Transition from being in the Suspended state to being in the Destroyed | 493 // Transition from being in the Suspended state to being in the Destroyed |
| 493 // state, if appropriate (see BrowserCompositorViewState for details). | 494 // state, if appropriate (see BrowserCompositorViewState for details). |
| (...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 574 | 575 |
| 575 // Factory used to safely scope delayed calls to ShutdownHost(). | 576 // Factory used to safely scope delayed calls to ShutdownHost(). |
| 576 base::WeakPtrFactory<RenderWidgetHostViewMac> weak_factory_; | 577 base::WeakPtrFactory<RenderWidgetHostViewMac> weak_factory_; |
| 577 | 578 |
| 578 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewMac); | 579 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewMac); |
| 579 }; | 580 }; |
| 580 | 581 |
| 581 } // namespace content | 582 } // namespace content |
| 582 | 583 |
| 583 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_ | 584 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_ |
| OLD | NEW |