| 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/IOSurface.h> | 9 #include <IOSurface/IOSurface.h> |
| 10 #include <stddef.h> | 10 #include <stddef.h> |
| (...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 163 // |gestureBeginEvent_|. If set, a GesturePinchEnd will be sent when the | 163 // |gestureBeginEvent_|. If set, a GesturePinchEnd will be sent when the |
| 164 // gesture ends. | 164 // gesture ends. |
| 165 BOOL gestureBeginPinchSent_; | 165 BOOL gestureBeginPinchSent_; |
| 166 | 166 |
| 167 // If true then escape key down events are suppressed until the first escape | 167 // If true then escape key down events are suppressed until the first escape |
| 168 // key up event. (The up event is suppressed as well). This is used by the | 168 // key up event. (The up event is suppressed as well). This is used by the |
| 169 // flash fullscreen code to avoid sending a key up event without a matching | 169 // flash fullscreen code to avoid sending a key up event without a matching |
| 170 // key down event. | 170 // key down event. |
| 171 BOOL suppressNextEscapeKeyUp_; | 171 BOOL suppressNextEscapeKeyUp_; |
| 172 | 172 |
| 173 // This is used to indicate if a stylus is currently in the proximity of the |
| 174 // tablet. |
| 175 bool isStylusEnteringProximity_; |
| 176 blink::WebPointerProperties::PointerType pointerType_; |
| 177 |
| 173 // The set of key codes from key down events that we haven't seen the matching | 178 // The set of key codes from key down events that we haven't seen the matching |
| 174 // key up events yet. | 179 // key up events yet. |
| 175 // Used for filtering out non-matching NSKeyUp events. | 180 // Used for filtering out non-matching NSKeyUp events. |
| 176 std::set<unsigned short> keyDownCodes_; | 181 std::set<unsigned short> keyDownCodes_; |
| 177 | 182 |
| 178 // The filter used to guide touch events towards a horizontal or vertical | 183 // The filter used to guide touch events towards a horizontal or vertical |
| 179 // orientation. | 184 // orientation. |
| 180 content::MouseWheelRailsFilterMac mouseWheelFilter_; | 185 content::MouseWheelRailsFilterMac mouseWheelFilter_; |
| 181 } | 186 } |
| 182 | 187 |
| (...skipping 375 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 558 | 563 |
| 559 // Factory used to safely scope delayed calls to ShutdownHost(). | 564 // Factory used to safely scope delayed calls to ShutdownHost(). |
| 560 base::WeakPtrFactory<RenderWidgetHostViewMac> weak_factory_; | 565 base::WeakPtrFactory<RenderWidgetHostViewMac> weak_factory_; |
| 561 | 566 |
| 562 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewMac); | 567 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewMac); |
| 563 }; | 568 }; |
| 564 | 569 |
| 565 } // namespace content | 570 } // namespace content |
| 566 | 571 |
| 567 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_ | 572 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_ |
| OLD | NEW |