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 1545 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1556 void RenderWidgetHostViewMac::WheelEventAck( | 1556 void RenderWidgetHostViewMac::WheelEventAck( |
1557 const blink::WebMouseWheelEvent& event, | 1557 const blink::WebMouseWheelEvent& event, |
1558 InputEventAckState ack_result) { | 1558 InputEventAckState ack_result) { |
1559 bool consumed = ack_result == INPUT_EVENT_ACK_STATE_CONSUMED; | 1559 bool consumed = ack_result == INPUT_EVENT_ACK_STATE_CONSUMED; |
1560 // Only record a wheel event as unhandled if JavaScript handlers got a chance | 1560 // 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) | 1561 // to see it (no-op wheel events are ignored by the event dispatcher) |
1562 if (event.deltaX || event.deltaY) | 1562 if (event.deltaX || event.deltaY) |
1563 [cocoa_view_ processedWheelEvent:event consumed:consumed]; | 1563 [cocoa_view_ processedWheelEvent:event consumed:consumed]; |
1564 } | 1564 } |
1565 | 1565 |
| 1566 uint32_t RenderWidgetHostViewMac::GetSurfaceIdNamespace() { |
| 1567 return delegated_frame_host_->GetSurfaceIdNamespace(); |
| 1568 } |
| 1569 |
1566 bool RenderWidgetHostViewMac::Send(IPC::Message* message) { | 1570 bool RenderWidgetHostViewMac::Send(IPC::Message* message) { |
1567 if (render_widget_host_) | 1571 if (render_widget_host_) |
1568 return render_widget_host_->Send(message); | 1572 return render_widget_host_->Send(message); |
1569 delete message; | 1573 delete message; |
1570 return false; | 1574 return false; |
1571 } | 1575 } |
1572 | 1576 |
1573 void RenderWidgetHostViewMac::ShutdownHost() { | 1577 void RenderWidgetHostViewMac::ShutdownHost() { |
1574 weak_factory_.InvalidateWeakPtrs(); | 1578 weak_factory_.InvalidateWeakPtrs(); |
1575 render_widget_host_->Shutdown(); | 1579 render_widget_host_->Shutdown(); |
(...skipping 1914 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3490 | 3494 |
3491 // "-webkit-app-region: drag | no-drag" is implemented on Mac by excluding | 3495 // "-webkit-app-region: drag | no-drag" is implemented on Mac by excluding |
3492 // regions that are not draggable. (See ControlRegionView in | 3496 // regions that are not draggable. (See ControlRegionView in |
3493 // native_app_window_cocoa.mm). This requires the render host view to be | 3497 // native_app_window_cocoa.mm). This requires the render host view to be |
3494 // draggable by default. | 3498 // draggable by default. |
3495 - (BOOL)mouseDownCanMoveWindow { | 3499 - (BOOL)mouseDownCanMoveWindow { |
3496 return YES; | 3500 return YES; |
3497 } | 3501 } |
3498 | 3502 |
3499 @end | 3503 @end |
OLD | NEW |