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

Unified Diff: chrome/browser/renderer_host/chrome_render_widget_host_view_mac_delegate.mm

Issue 300863002: mac: History swiping doesn't work right with iframes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase against top of tree. Created 6 years, 7 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/renderer_host/chrome_render_widget_host_view_mac_delegate.mm
diff --git a/chrome/browser/renderer_host/chrome_render_widget_host_view_mac_delegate.mm b/chrome/browser/renderer_host/chrome_render_widget_host_view_mac_delegate.mm
index a6b260fbd4a75905f18e445f9faf1c151f3e5931..c862b86330bc9b8431fc2e030cc0b6f250fac10e 100644
--- a/chrome/browser/renderer_host/chrome_render_widget_host_view_mac_delegate.mm
+++ b/chrome/browser/renderer_host/chrome_render_widget_host_view_mac_delegate.mm
@@ -106,19 +106,12 @@ class SpellCheckObserver : public content::WebContentsObserver {
return [historySwiper_ handleEvent:event];
}
-// Notification that a wheel event was unhandled.
-- (void)gotUnhandledWheelEvent {
- [historySwiper_ gotUnhandledWheelEvent];
-}
-
// Notification of scroll offset pinning.
- (void)scrollOffsetPinnedToLeft:(BOOL)left toRight:(BOOL)right {
- [historySwiper_ scrollOffsetPinnedToLeft:left toRight:right];
}
// Notification of whether the view has a horizontal scrollbar.
- (void)setHasHorizontalScrollbar:(BOOL)has_horizontal_scrollbar {
- [historySwiper_ setHasHorizontalScrollbar:has_horizontal_scrollbar];
}
// NSWindow events.
@@ -207,6 +200,11 @@ class SpellCheckObserver : public content::WebContentsObserver {
return NO;
}
+- (void)rendererHandledWheelEvent:(const blink::WebMouseWheelEvent&)event
+ consumed:(BOOL)consumed {
+ [historySwiper_ rendererHandledWheelEvent:event consumed:consumed];
+}
+
// Spellchecking methods
// The next five methods are implemented here since this class is the first
// responder for anything in the browser.

Powered by Google App Engine
This is Rietveld 408576698