Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(497)

Side by Side Diff: content/browser/renderer_host/render_widget_host_view_mac.h

Issue 2047093002: Remove enable/disable wheel gestures setting. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@can_scroll_remove
Patch Set: Remove unused, uninitialized variable on mac causing occasional failure Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 311 matching lines...) Expand 10 before | Expand all | Expand 10 after
322 322
323 bool HasAcceleratedSurface(const gfx::Size& desired_size) override; 323 bool HasAcceleratedSurface(const gfx::Size& desired_size) override;
324 void GetScreenInfo(blink::WebScreenInfo* results) override; 324 void GetScreenInfo(blink::WebScreenInfo* results) override;
325 bool GetScreenColorProfile(std::vector<char>* color_profile) override; 325 bool GetScreenColorProfile(std::vector<char>* color_profile) override;
326 gfx::Rect GetBoundsInRootWindow() override; 326 gfx::Rect GetBoundsInRootWindow() override;
327 void LockCompositingSurface() override; 327 void LockCompositingSurface() override;
328 void UnlockCompositingSurface() override; 328 void UnlockCompositingSurface() override;
329 329
330 bool LockMouse() override; 330 bool LockMouse() override;
331 void UnlockMouse() override; 331 void UnlockMouse() override;
332 void WheelEventAck(const blink::WebMouseWheelEvent& event,
333 InputEventAckState ack_result) override;
334 void GestureEventAck(const blink::WebGestureEvent& event, 332 void GestureEventAck(const blink::WebGestureEvent& event,
335 InputEventAckState ack_result) override; 333 InputEventAckState ack_result) override;
336 334
337 std::unique_ptr<SyntheticGestureTarget> CreateSyntheticGestureTarget() 335 std::unique_ptr<SyntheticGestureTarget> CreateSyntheticGestureTarget()
338 override; 336 override;
339 337
340 uint32_t GetSurfaceIdNamespace() override; 338 uint32_t GetSurfaceIdNamespace() override;
341 uint32_t SurfaceIdNamespaceAtPoint(cc::SurfaceHittestDelegate* delegate, 339 uint32_t SurfaceIdNamespaceAtPoint(cc::SurfaceHittestDelegate* delegate,
342 const gfx::Point& point, 340 const gfx::Point& point,
343 gfx::Point* transformed_point) override; 341 gfx::Point* transformed_point) override;
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
575 // The last scroll offset of the view. 573 // The last scroll offset of the view.
576 gfx::Vector2dF last_scroll_offset_; 574 gfx::Vector2dF last_scroll_offset_;
577 575
578 // The text to be shown in the tooltip, supplied by the renderer. 576 // The text to be shown in the tooltip, supplied by the renderer.
579 base::string16 tooltip_text_; 577 base::string16 tooltip_text_;
580 578
581 // True when this view acts as a platform view hack for a 579 // True when this view acts as a platform view hack for a
582 // RenderWidgetHostViewGuest. 580 // RenderWidgetHostViewGuest.
583 bool is_guest_view_hack_; 581 bool is_guest_view_hack_;
584 582
585 // True if gestures are generated for mouse wheel events.
586 bool wheel_gestures_enabled_;
587
588 // selected text on the renderer. 583 // selected text on the renderer.
589 std::string selected_text_; 584 std::string selected_text_;
590 585
591 // The window used for popup widgets. 586 // The window used for popup widgets.
592 base::scoped_nsobject<NSWindow> popup_window_; 587 base::scoped_nsobject<NSWindow> popup_window_;
593 588
594 // The fullscreen window used for pepper flash. 589 // The fullscreen window used for pepper flash.
595 base::scoped_nsobject<NSWindow> pepper_fullscreen_window_; 590 base::scoped_nsobject<NSWindow> pepper_fullscreen_window_;
596 base::scoped_nsobject<FullscreenWindowManager> fullscreen_window_manager_; 591 base::scoped_nsobject<FullscreenWindowManager> fullscreen_window_manager_;
597 // Our parent host view, if this is fullscreen. NULL otherwise. 592 // Our parent host view, if this is fullscreen. NULL otherwise.
(...skipping 24 matching lines...) Expand all
622 617
623 // Factory used to safely scope delayed calls to ShutdownHost(). 618 // Factory used to safely scope delayed calls to ShutdownHost().
624 base::WeakPtrFactory<RenderWidgetHostViewMac> weak_factory_; 619 base::WeakPtrFactory<RenderWidgetHostViewMac> weak_factory_;
625 620
626 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewMac); 621 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewMac);
627 }; 622 };
628 623
629 } // namespace content 624 } // namespace content
630 625
631 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_ 626 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698