mac: Remove redundant processedWheelEvent and related callings
Remove unused processedWheelEvent and rendererHandledWheelEvent methods since they are not used anymore. Bug: 404394298 Change-Id: I09a5fe87ff0cdeb721c63b6d570dda07341bd39f Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6367567 Reviewed-by: Marijn Kruisselbrink <mek@chromium.org> Reviewed-by: Erik Chen <erikchen@chromium.org> Reviewed-by: Leon Han <shulianghan@microsoft.com> Commit-Queue: Xiaochen Wu <xiaocw@microsoft.com> Reviewed-by: Camille Lamy <clamy@chromium.org> Cr-Commit-Position: refs/heads/main@{#1435831}
This commit is contained in:

committed by
Chromium LUCI CQ

parent
9b95d71e11
commit
1342b6a681
chrome
app_shim
browser
content
app_shim_remote_cocoa
browser
renderer_host
public
shell
browser
renderer_host
@ -70,11 +70,6 @@
|
||||
[_historySwiper touchesEndedWithEvent:event];
|
||||
}
|
||||
|
||||
- (void)rendererHandledWheelEvent:(const blink::WebMouseWheelEvent&)event
|
||||
consumed:(BOOL)consumed {
|
||||
[_historySwiper rendererHandledWheelEvent:event consumed:consumed];
|
||||
}
|
||||
|
||||
- (void)rendererHandledGestureScrollEvent:(const blink::WebGestureEvent&)event
|
||||
consumed:(BOOL)consumed {
|
||||
[_historySwiper rendererHandledGestureScrollEvent:event consumed:consumed];
|
||||
|
@ -252,11 +252,6 @@
|
||||
return NO;
|
||||
}
|
||||
|
||||
- (void)rendererHandledWheelEvent:(const blink::WebMouseWheelEvent&)event
|
||||
consumed:(BOOL)consumed {
|
||||
[_historySwiper rendererHandledWheelEvent:event consumed:consumed];
|
||||
}
|
||||
|
||||
- (void)rendererHandledGestureScrollEvent:(const blink::WebGestureEvent&)event
|
||||
consumed:(BOOL)consumed {
|
||||
[_historySwiper rendererHandledGestureScrollEvent:event consumed:consumed];
|
||||
|
@ -9,7 +9,6 @@
|
||||
|
||||
namespace blink {
|
||||
class WebGestureEvent;
|
||||
class WebMouseWheelEvent;
|
||||
}
|
||||
|
||||
namespace ui {
|
||||
@ -145,8 +144,6 @@ enum RecognitionState {
|
||||
// NSEventTypeScrollWheel. We look at the phase to determine whether to trigger
|
||||
// history swiping
|
||||
- (BOOL)handleEvent:(NSEvent*)event;
|
||||
- (void)rendererHandledWheelEvent:(const blink::WebMouseWheelEvent&)event
|
||||
consumed:(BOOL)consumed;
|
||||
- (void)rendererHandledGestureScrollEvent:(const blink::WebGestureEvent&)event
|
||||
consumed:(BOOL)consumed;
|
||||
|
||||
@ -189,4 +186,4 @@ enum RecognitionState {
|
||||
+ (void)resetMagicMouseState;
|
||||
@end
|
||||
|
||||
#endif // CHROME_BROWSER_RENDERER_HOST_CHROME_RENDER_WIDGET_HOST_VIEW_MAC_HISTORY_SWIPER_H_
|
||||
#endif // CHROME_BROWSER_RENDERER_HOST_CHROME_RENDER_WIDGET_HOST_VIEW_MAC_HISTORY_SWIPER_H_
|
||||
|
@ -6,7 +6,6 @@
|
||||
|
||||
#import "chrome/browser/ui/cocoa/history_overlay_controller.h"
|
||||
#include "third_party/blink/public/common/input/web_gesture_event.h"
|
||||
#include "third_party/blink/public/common/input/web_mouse_wheel_event.h"
|
||||
#include "ui/events/blink/did_overscroll_params.h"
|
||||
|
||||
namespace {
|
||||
@ -165,14 +164,6 @@ BOOL forceMagicMouse = NO;
|
||||
return [self handleScrollWheelEvent:event];
|
||||
}
|
||||
|
||||
- (void)rendererHandledWheelEvent:(const blink::WebMouseWheelEvent&)event
|
||||
consumed:(BOOL)consumed {
|
||||
if (event.phase != blink::WebMouseWheelEvent::kPhaseBegan) {
|
||||
return;
|
||||
}
|
||||
_firstScrollUnconsumed = !consumed;
|
||||
}
|
||||
|
||||
- (void)rendererHandledGestureScrollEvent:(const blink::WebGestureEvent&)event
|
||||
consumed:(BOOL)consumed {
|
||||
switch (event.GetType()) {
|
||||
|
@ -3,11 +3,10 @@
|
||||
// found in the LICENSE file.
|
||||
|
||||
#import "chrome/browser/renderer_host/chrome_render_widget_host_view_mac_history_swiper.h"
|
||||
|
||||
#import "chrome/browser/ui/cocoa/test/cocoa_test_helper.h"
|
||||
#include "testing/gtest/include/gtest/gtest.h"
|
||||
#include "third_party/blink/public/common/input/web_gesture_event.h"
|
||||
#include "third_party/blink/public/common/input/web_input_event.h"
|
||||
#include "third_party/blink/public/common/input/web_mouse_wheel_event.h"
|
||||
#import "third_party/ocmock/OCMock/OCMock.h"
|
||||
#import "third_party/ocmock/ocmock_extensions.h"
|
||||
#include "ui/events/blink/did_overscroll_params.h"
|
||||
@ -203,9 +202,15 @@ void MacHistorySwiperTest::onOverscrolled(
|
||||
}
|
||||
|
||||
void MacHistorySwiperTest::rendererACKForBeganEvent() {
|
||||
blink::WebMouseWheelEvent event;
|
||||
event.phase = blink::WebMouseWheelEvent::kPhaseBegan;
|
||||
[historySwiper_ rendererHandledWheelEvent:event consumed:NO];
|
||||
blink::WebGestureEvent begin_event;
|
||||
begin_event.SetType(blink::WebInputEvent::Type::kGestureScrollBegin);
|
||||
begin_event.data.scroll_begin.synthetic = false;
|
||||
begin_event.data.scroll_begin.inertial_phase =
|
||||
blink::WebGestureEvent::InertialPhaseState::kNonMomentum;
|
||||
[historySwiper_ rendererHandledGestureScrollEvent:begin_event consumed:NO];
|
||||
blink::WebGestureEvent update_event;
|
||||
update_event.SetType(blink::WebInputEvent::Type::kGestureScrollUpdate);
|
||||
[historySwiper_ rendererHandledGestureScrollEvent:update_event consumed:NO];
|
||||
}
|
||||
|
||||
void MacHistorySwiperTest::sendBeginGestureEventInMiddle() {
|
||||
|
@ -184,8 +184,6 @@ void ExtractUnderlines(NSAttributedString* string,
|
||||
@property(getter=isAutomaticDashSubstitutionEnabled)
|
||||
BOOL automaticDashSubstitutionEnabled;
|
||||
|
||||
- (void)processedWheelEvent:(const blink::WebMouseWheelEvent&)event
|
||||
consumed:(BOOL)consumed;
|
||||
- (void)keyEvent:(NSEvent*)theEvent wasKeyEquivalent:(BOOL)equiv;
|
||||
- (void)windowDidChangeScreenOrBackingProperties:(NSNotification*)notification;
|
||||
- (void)windowChangedGlobalFrame:(NSNotification*)notification;
|
||||
@ -723,11 +721,6 @@ void ExtractUnderlines(NSAttributedString* string,
|
||||
[self addCursorRect:[self visibleRect] cursor:_currentCursor];
|
||||
}
|
||||
|
||||
- (void)processedWheelEvent:(const blink::WebMouseWheelEvent&)event
|
||||
consumed:(BOOL)consumed {
|
||||
[_responderDelegate rendererHandledWheelEvent:event consumed:consumed];
|
||||
}
|
||||
|
||||
- (void)processedGestureScrollEvent:(const blink::WebGestureEvent&)event
|
||||
consumed:(BOOL)consumed {
|
||||
[_responderDelegate rendererHandledGestureScrollEvent:event
|
||||
|
@ -110,12 +110,6 @@ using testing::_;
|
||||
|
||||
@synthesize unhandledWheelEventReceived = _unhandledWheelEventReceived;
|
||||
|
||||
- (void)rendererHandledWheelEvent:(const blink::WebMouseWheelEvent&)event
|
||||
consumed:(BOOL)consumed {
|
||||
if (!consumed)
|
||||
_unhandledWheelEventReceived = true;
|
||||
}
|
||||
|
||||
- (void)rendererHandledGestureScrollEvent:(const blink::WebGestureEvent&)event
|
||||
consumed:(BOOL)consumed {
|
||||
if (!consumed &&
|
||||
|
@ -51,10 +51,6 @@ enum AcceptMouseEventsOption {
|
||||
- (void)touchesCancelledWithEvent:(NSEvent*)event;
|
||||
- (void)touchesEndedWithEvent:(NSEvent*)event;
|
||||
|
||||
// The browser process received an ACK from the renderer after it processed
|
||||
// |event|.
|
||||
- (void)rendererHandledWheelEvent:(const blink::WebMouseWheelEvent&)event
|
||||
consumed:(BOOL)consumed;
|
||||
- (void)rendererHandledGestureScrollEvent:(const blink::WebGestureEvent&)event
|
||||
consumed:(BOOL)consumed;
|
||||
- (void)rendererHandledOverscrollEvent:(const ui::DidOverscrollParams&)params;
|
||||
|
@ -42,10 +42,6 @@
|
||||
- (void)touchesEndedWithEvent:(NSEvent*)event {
|
||||
}
|
||||
|
||||
- (void)rendererHandledWheelEvent:(const blink::WebMouseWheelEvent&)event
|
||||
consumed:(BOOL)consumed {
|
||||
}
|
||||
|
||||
- (void)rendererHandledGestureScrollEvent:(const blink::WebGestureEvent&)event
|
||||
consumed:(BOOL)consumed {
|
||||
}
|
||||
|
Reference in New Issue
Block a user