| 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 157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 168 // |gestureBeginEvent_|. If set, a GesturePinchEnd will be sent when the | 168 // |gestureBeginEvent_|. If set, a GesturePinchEnd will be sent when the |
| 169 // gesture ends. | 169 // gesture ends. |
| 170 BOOL gestureBeginPinchSent_; | 170 BOOL gestureBeginPinchSent_; |
| 171 | 171 |
| 172 // If true then escape key down events are suppressed until the first escape | 172 // If true then escape key down events are suppressed until the first escape |
| 173 // key up event. (The up event is suppressed as well). This is used by the | 173 // key up event. (The up event is suppressed as well). This is used by the |
| 174 // flash fullscreen code to avoid sending a key up event without a matching | 174 // flash fullscreen code to avoid sending a key up event without a matching |
| 175 // key down event. | 175 // key down event. |
| 176 BOOL suppressNextEscapeKeyUp_; | 176 BOOL suppressNextEscapeKeyUp_; |
| 177 | 177 |
| 178 // This is used to indicate if a stylus is currently in the proximity of the |
| 179 // tablet. |
| 180 bool isStylusEnteringProximity_; |
| 181 blink::WebPointerProperties::PointerType pointerType_; |
| 182 |
| 178 // The set of key codes from key down events that we haven't seen the matching | 183 // The set of key codes from key down events that we haven't seen the matching |
| 179 // key up events yet. | 184 // key up events yet. |
| 180 // Used for filtering out non-matching NSKeyUp events. | 185 // Used for filtering out non-matching NSKeyUp events. |
| 181 std::set<unsigned short> keyDownCodes_; | 186 std::set<unsigned short> keyDownCodes_; |
| 182 | 187 |
| 183 // The filter used to guide touch events towards a horizontal or vertical | 188 // The filter used to guide touch events towards a horizontal or vertical |
| 184 // orientation. | 189 // orientation. |
| 185 content::MouseWheelRailsFilterMac mouseWheelFilter_; | 190 content::MouseWheelRailsFilterMac mouseWheelFilter_; |
| 186 } | 191 } |
| 187 | 192 |
| (...skipping 359 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 547 | 552 |
| 548 // Factory used to safely scope delayed calls to ShutdownHost(). | 553 // Factory used to safely scope delayed calls to ShutdownHost(). |
| 549 base::WeakPtrFactory<RenderWidgetHostViewMac> weak_factory_; | 554 base::WeakPtrFactory<RenderWidgetHostViewMac> weak_factory_; |
| 550 | 555 |
| 551 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewMac); | 556 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewMac); |
| 552 }; | 557 }; |
| 553 | 558 |
| 554 } // namespace content | 559 } // namespace content |
| 555 | 560 |
| 556 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_ | 561 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_ |
| OLD | NEW |