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 #include "content/browser/renderer_host/render_widget_host_view_mac.h" | 5 #include "content/browser/renderer_host/render_widget_host_view_mac.h" |
6 | 6 |
7 #import <objc/runtime.h> | 7 #import <objc/runtime.h> |
8 #include <OpenGL/gl.h> | 8 #include <OpenGL/gl.h> |
9 #include <QuartzCore/QuartzCore.h> | 9 #include <QuartzCore/QuartzCore.h> |
10 | 10 |
(...skipping 447 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
458 void RenderWidgetHostViewMac::DelegatedFrameHostOnLostCompositorResources() { | 458 void RenderWidgetHostViewMac::DelegatedFrameHostOnLostCompositorResources() { |
459 render_widget_host_->ScheduleComposite(); | 459 render_widget_host_->ScheduleComposite(); |
460 } | 460 } |
461 | 461 |
462 void RenderWidgetHostViewMac::DelegatedFrameHostUpdateVSyncParameters( | 462 void RenderWidgetHostViewMac::DelegatedFrameHostUpdateVSyncParameters( |
463 const base::TimeTicks& timebase, | 463 const base::TimeTicks& timebase, |
464 const base::TimeDelta& interval) { | 464 const base::TimeDelta& interval) { |
465 render_widget_host_->UpdateVSyncParameters(timebase, interval); | 465 render_widget_host_->UpdateVSyncParameters(timebase, interval); |
466 } | 466 } |
467 | 467 |
| 468 void RenderWidgetHostViewMac::DelegatedFrameHostUpdateSurfaceIdNamespace( |
| 469 uint32_t surface_id_namespace) { |
| 470 render_widget_host_->Send(new ViewMsg_UpdateSurfaceIdNamespace( |
| 471 render_widget_host_->GetRoutingID(), surface_id_namespace)); |
| 472 } |
| 473 |
468 //////////////////////////////////////////////////////////////////////////////// | 474 //////////////////////////////////////////////////////////////////////////////// |
469 // AcceleratedWidgetMacNSView, public: | 475 // AcceleratedWidgetMacNSView, public: |
470 | 476 |
471 NSView* RenderWidgetHostViewMac::AcceleratedWidgetGetNSView() const { | 477 NSView* RenderWidgetHostViewMac::AcceleratedWidgetGetNSView() const { |
472 return cocoa_view_; | 478 return cocoa_view_; |
473 } | 479 } |
474 | 480 |
475 bool RenderWidgetHostViewMac::AcceleratedWidgetShouldIgnoreBackpressure() | 481 bool RenderWidgetHostViewMac::AcceleratedWidgetShouldIgnoreBackpressure() |
476 const { | 482 const { |
477 // If vsync is disabled, then always draw and ack frames immediately. | 483 // If vsync is disabled, then always draw and ack frames immediately. |
(...skipping 1078 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1556 void RenderWidgetHostViewMac::WheelEventAck( | 1562 void RenderWidgetHostViewMac::WheelEventAck( |
1557 const blink::WebMouseWheelEvent& event, | 1563 const blink::WebMouseWheelEvent& event, |
1558 InputEventAckState ack_result) { | 1564 InputEventAckState ack_result) { |
1559 bool consumed = ack_result == INPUT_EVENT_ACK_STATE_CONSUMED; | 1565 bool consumed = ack_result == INPUT_EVENT_ACK_STATE_CONSUMED; |
1560 // Only record a wheel event as unhandled if JavaScript handlers got a chance | 1566 // Only record a wheel event as unhandled if JavaScript handlers got a chance |
1561 // to see it (no-op wheel events are ignored by the event dispatcher) | 1567 // to see it (no-op wheel events are ignored by the event dispatcher) |
1562 if (event.deltaX || event.deltaY) | 1568 if (event.deltaX || event.deltaY) |
1563 [cocoa_view_ processedWheelEvent:event consumed:consumed]; | 1569 [cocoa_view_ processedWheelEvent:event consumed:consumed]; |
1564 } | 1570 } |
1565 | 1571 |
| 1572 uint32_t RenderWidgetHostViewMac::GetSurfaceIdNamespace() { |
| 1573 return delegated_frame_host_->GetSurfaceIdNamespace(); |
| 1574 } |
| 1575 |
1566 bool RenderWidgetHostViewMac::Send(IPC::Message* message) { | 1576 bool RenderWidgetHostViewMac::Send(IPC::Message* message) { |
1567 if (render_widget_host_) | 1577 if (render_widget_host_) |
1568 return render_widget_host_->Send(message); | 1578 return render_widget_host_->Send(message); |
1569 delete message; | 1579 delete message; |
1570 return false; | 1580 return false; |
1571 } | 1581 } |
1572 | 1582 |
1573 void RenderWidgetHostViewMac::ShutdownHost() { | 1583 void RenderWidgetHostViewMac::ShutdownHost() { |
1574 weak_factory_.InvalidateWeakPtrs(); | 1584 weak_factory_.InvalidateWeakPtrs(); |
1575 render_widget_host_->Shutdown(); | 1585 render_widget_host_->Shutdown(); |
(...skipping 1914 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3490 | 3500 |
3491 // "-webkit-app-region: drag | no-drag" is implemented on Mac by excluding | 3501 // "-webkit-app-region: drag | no-drag" is implemented on Mac by excluding |
3492 // regions that are not draggable. (See ControlRegionView in | 3502 // regions that are not draggable. (See ControlRegionView in |
3493 // native_app_window_cocoa.mm). This requires the render host view to be | 3503 // native_app_window_cocoa.mm). This requires the render host view to be |
3494 // draggable by default. | 3504 // draggable by default. |
3495 - (BOOL)mouseDownCanMoveWindow { | 3505 - (BOOL)mouseDownCanMoveWindow { |
3496 return YES; | 3506 return YES; |
3497 } | 3507 } |
3498 | 3508 |
3499 @end | 3509 @end |
OLD | NEW |