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

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

Issue 300863002: mac: History swiping doesn't work right with iframes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix unit tests. Created 6 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_BASE_H_ 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_BASE_H_
6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_BASE_H_ 6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_BASE_H_
7 7
8 #if defined(OS_MACOSX) 8 #if defined(OS_MACOSX)
9 #include <OpenGL/OpenGL.h> 9 #include <OpenGL/OpenGL.h>
10 #endif 10 #endif
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 virtual bool IsMouseLocked() OVERRIDE; 73 virtual bool IsMouseLocked() OVERRIDE;
74 virtual gfx::Size GetVisibleViewportSize() const OVERRIDE; 74 virtual gfx::Size GetVisibleViewportSize() const OVERRIDE;
75 virtual void SetInsets(const gfx::Insets& insets) OVERRIDE; 75 virtual void SetInsets(const gfx::Insets& insets) OVERRIDE;
76 virtual void BeginFrameSubscription( 76 virtual void BeginFrameSubscription(
77 scoped_ptr<RenderWidgetHostViewFrameSubscriber> subscriber) OVERRIDE; 77 scoped_ptr<RenderWidgetHostViewFrameSubscriber> subscriber) OVERRIDE;
78 virtual void EndFrameSubscription() OVERRIDE; 78 virtual void EndFrameSubscription() OVERRIDE;
79 79
80 // IPC::Listener implementation: 80 // IPC::Listener implementation:
81 virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE; 81 virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
82 82
83 // Called when a mousewheel event was not processed by the renderer. 83 // Called after the renderer has ACKed a mousewheel event. |consumed|
84 // reflects whether the event was consumed by the renderer or the render
85 // widget host's delegate.
84 // virtual for testing. 86 // virtual for testing.
85 virtual void UnhandledWheelEvent(const blink::WebMouseWheelEvent& event); 87 virtual void ProcessedWheelEvent(const blink::WebMouseWheelEvent& event,
88 bool consumed);
86 89
87 // Called by the host when the input flush has completed. 90 // Called by the host when the input flush has completed.
88 void OnDidFlushInput(); 91 void OnDidFlushInput();
89 92
90 void SetPopupType(blink::WebPopupType popup_type); 93 void SetPopupType(blink::WebPopupType popup_type);
91 94
92 blink::WebPopupType GetPopupType(); 95 blink::WebPopupType GetPopupType();
93 96
94 // Get the BrowserAccessibilityManager if it exists, may return NULL. 97 // Get the BrowserAccessibilityManager if it exists, may return NULL.
95 BrowserAccessibilityManager* GetBrowserAccessibilityManager() const; 98 BrowserAccessibilityManager* GetBrowserAccessibilityManager() const;
(...skipping 333 matching lines...) Expand 10 before | Expand all | Expand 10 after
429 uint32 renderer_frame_number_; 432 uint32 renderer_frame_number_;
430 433
431 base::OneShotTimer<RenderWidgetHostViewBase> flush_input_timer_; 434 base::OneShotTimer<RenderWidgetHostViewBase> flush_input_timer_;
432 435
433 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewBase); 436 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewBase);
434 }; 437 };
435 438
436 } // namespace content 439 } // namespace content
437 440
438 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_BASE_H_ 441 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_BASE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698