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

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

Issue 1848063002: Fix page navigation being incorrectly fired on Mac OSX. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rename variable, add comments and remove ack in unittest Created 4 years, 8 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 330 matching lines...) Expand 10 before | Expand all | Expand 10 after
341 void GetScreenInfo(blink::WebScreenInfo* results) override; 341 void GetScreenInfo(blink::WebScreenInfo* results) override;
342 bool GetScreenColorProfile(std::vector<char>* color_profile) override; 342 bool GetScreenColorProfile(std::vector<char>* color_profile) override;
343 gfx::Rect GetBoundsInRootWindow() override; 343 gfx::Rect GetBoundsInRootWindow() override;
344 void LockCompositingSurface() override; 344 void LockCompositingSurface() override;
345 void UnlockCompositingSurface() override; 345 void UnlockCompositingSurface() override;
346 346
347 bool LockMouse() override; 347 bool LockMouse() override;
348 void UnlockMouse() override; 348 void UnlockMouse() override;
349 void WheelEventAck(const blink::WebMouseWheelEvent& event, 349 void WheelEventAck(const blink::WebMouseWheelEvent& event,
350 InputEventAckState ack_result) override; 350 InputEventAckState ack_result) override;
351 void GestureEventAck(const blink::WebGestureEvent& event,
352 InputEventAckState ack_result) override;
351 353
352 scoped_ptr<SyntheticGestureTarget> CreateSyntheticGestureTarget() override; 354 scoped_ptr<SyntheticGestureTarget> CreateSyntheticGestureTarget() override;
353 355
354 uint32_t GetSurfaceIdNamespace() override; 356 uint32_t GetSurfaceIdNamespace() override;
355 uint32_t SurfaceIdNamespaceAtPoint(cc::SurfaceHittestDelegate* delegate, 357 uint32_t SurfaceIdNamespaceAtPoint(cc::SurfaceHittestDelegate* delegate,
356 const gfx::Point& point, 358 const gfx::Point& point,
357 gfx::Point* transformed_point) override; 359 gfx::Point* transformed_point) override;
358 // Returns true when we can do SurfaceHitTesting for the event type. 360 // Returns true when we can do SurfaceHitTesting for the event type.
359 bool ShouldRouteEvent(const blink::WebInputEvent& event) const; 361 bool ShouldRouteEvent(const blink::WebInputEvent& event) const;
360 void ProcessMouseEvent(const blink::WebMouseEvent& event) override; 362 void ProcessMouseEvent(const blink::WebMouseEvent& event) override;
(...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after
581 // The last scroll offset of the view. 583 // The last scroll offset of the view.
582 gfx::Vector2dF last_scroll_offset_; 584 gfx::Vector2dF last_scroll_offset_;
583 585
584 // The text to be shown in the tooltip, supplied by the renderer. 586 // The text to be shown in the tooltip, supplied by the renderer.
585 base::string16 tooltip_text_; 587 base::string16 tooltip_text_;
586 588
587 // True when this view acts as a platform view hack for a 589 // True when this view acts as a platform view hack for a
588 // RenderWidgetHostViewGuest. 590 // RenderWidgetHostViewGuest.
589 bool is_guest_view_hack_; 591 bool is_guest_view_hack_;
590 592
593 // True if gestures are generated for mouse wheel events.
594 bool wheel_gestures_enabled_;
595
591 // selected text on the renderer. 596 // selected text on the renderer.
592 std::string selected_text_; 597 std::string selected_text_;
593 598
594 // The window used for popup widgets. 599 // The window used for popup widgets.
595 base::scoped_nsobject<NSWindow> popup_window_; 600 base::scoped_nsobject<NSWindow> popup_window_;
596 601
597 // The fullscreen window used for pepper flash. 602 // The fullscreen window used for pepper flash.
598 base::scoped_nsobject<NSWindow> pepper_fullscreen_window_; 603 base::scoped_nsobject<NSWindow> pepper_fullscreen_window_;
599 base::scoped_nsobject<FullscreenWindowManager> fullscreen_window_manager_; 604 base::scoped_nsobject<FullscreenWindowManager> fullscreen_window_manager_;
600 // Our parent host view, if this is fullscreen. NULL otherwise. 605 // Our parent host view, if this is fullscreen. NULL otherwise.
(...skipping 19 matching lines...) Expand all
620 625
621 // Factory used to safely scope delayed calls to ShutdownHost(). 626 // Factory used to safely scope delayed calls to ShutdownHost().
622 base::WeakPtrFactory<RenderWidgetHostViewMac> weak_factory_; 627 base::WeakPtrFactory<RenderWidgetHostViewMac> weak_factory_;
623 628
624 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewMac); 629 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewMac);
625 }; 630 };
626 631
627 } // namespace content 632 } // namespace content
628 633
629 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_ 634 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698