2018-10-24 18:24:11 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2018-09-21 00:30:26 +00:00
|
|
|
From: Cheng Zhao <zcbenz@gmail.com>
|
|
|
|
Date: Thu, 20 Sep 2018 17:46:28 -0700
|
|
|
|
Subject: render_widget_host_view_mac.patch
|
|
|
|
|
|
|
|
|
2019-05-13 18:49:01 +00:00
|
|
|
diff --git a/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm b/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm
|
2019-07-09 01:00:24 +00:00
|
|
|
index b7b9ee725214ef3a7adc25c5d542d1ad2f0eec17..2218cc5cc37c3566efd107f56ee794288678931e 100644
|
2019-05-13 18:49:01 +00:00
|
|
|
--- a/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm
|
|
|
|
+++ b/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm
|
2019-07-09 01:00:24 +00:00
|
|
|
@@ -145,6 +145,11 @@ void ExtractUnderlines(NSAttributedString* string,
|
2018-09-14 05:02:16 +00:00
|
|
|
|
|
|
|
} // namespace
|
|
|
|
|
|
|
|
+@interface NSWindow (AtomCustomMethods)
|
|
|
|
+- (BOOL)acceptsFirstMouse;
|
|
|
|
+- (BOOL)disableAutoHideCursor;
|
|
|
|
+@end
|
|
|
|
+
|
|
|
|
// These are not documented, so use only after checking -respondsToSelector:.
|
|
|
|
@interface NSApplication (UndocumentedSpeechMethods)
|
|
|
|
- (void)speakString:(NSString*)string;
|
2019-07-09 01:00:24 +00:00
|
|
|
@@ -563,6 +568,9 @@ - (BOOL)acceptsMouseEventsWhenInactive {
|
2018-09-14 05:02:16 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
- (BOOL)acceptsFirstMouse:(NSEvent*)theEvent {
|
|
|
|
+ if ([self.window respondsToSelector:@selector(acceptsFirstMouse)] &&
|
|
|
|
+ [self.window acceptsFirstMouse])
|
|
|
|
+ return YES;
|
|
|
|
return [self acceptsMouseEventsWhenInactive];
|
|
|
|
}
|
|
|
|
|
2019-07-09 01:00:24 +00:00
|
|
|
@@ -982,6 +990,10 @@ - (void)keyEvent:(NSEvent*)theEvent wasKeyEquivalent:(BOOL)equiv {
|
2018-09-14 05:02:16 +00:00
|
|
|
eventType == NSKeyDown &&
|
|
|
|
!(modifierFlags & NSCommandKeyMask);
|
|
|
|
|
|
|
|
+ if ([theEvent.window respondsToSelector:@selector(disableAutoHideCursor)] &&
|
|
|
|
+ [theEvent.window disableAutoHideCursor])
|
|
|
|
+ shouldAutohideCursor = NO;
|
|
|
|
+
|
|
|
|
// We only handle key down events and just simply forward other events.
|
|
|
|
if (eventType != NSKeyDown) {
|
2019-06-04 03:44:12 +00:00
|
|
|
hostHelper_->ForwardKeyboardEvent(event, latency_info);
|
2019-07-09 01:00:24 +00:00
|
|
|
@@ -1737,9 +1749,11 @@ - (NSAccessibilityRole)accessibilityRole {
|
2018-09-14 05:02:16 +00:00
|
|
|
// Since this implementation doesn't have to wait any IPC calls, this doesn't
|
|
|
|
// make any key-typing jank. --hbono 7/23/09
|
|
|
|
//
|
|
|
|
+#ifndef MAS_BUILD
|
|
|
|
extern "C" {
|
|
|
|
extern NSString* NSTextInputReplacementRangeAttributeName;
|
|
|
|
}
|
|
|
|
+#endif
|
|
|
|
|
|
|
|
- (NSArray*)validAttributesForMarkedText {
|
|
|
|
// This code is just copied from WebKit except renaming variables.
|
2019-07-09 01:00:24 +00:00
|
|
|
@@ -1748,7 +1762,10 @@ - (NSArray*)validAttributesForMarkedText {
|
2018-09-14 05:02:16 +00:00
|
|
|
initWithObjects:NSUnderlineStyleAttributeName,
|
|
|
|
NSUnderlineColorAttributeName,
|
|
|
|
NSMarkedClauseSegmentAttributeName,
|
|
|
|
- NSTextInputReplacementRangeAttributeName, nil]);
|
|
|
|
+#ifndef MAS_BUILD
|
|
|
|
+ NSTextInputReplacementRangeAttributeName,
|
|
|
|
+#endif
|
|
|
|
+ nil]);
|
|
|
|
}
|
|
|
|
return validAttributesForMarkedText_.get();
|
|
|
|
}
|
2018-09-14 18:03:43 +00:00
|
|
|
diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm
|
2019-07-09 01:00:24 +00:00
|
|
|
index 66edee6f3dd734b86f6c63b037a19937e5b8ca86..d98f25ac7748b82c77e47d318437ae3de4ea6d42 100644
|
2018-09-14 18:03:43 +00:00
|
|
|
--- a/content/browser/renderer_host/render_widget_host_view_mac.mm
|
|
|
|
+++ b/content/browser/renderer_host/render_widget_host_view_mac.mm
|
2019-07-03 01:22:09 +00:00
|
|
|
@@ -63,6 +63,7 @@
|
2018-09-21 00:30:26 +00:00
|
|
|
#include "ui/events/keycodes/dom/dom_keyboard_layout_map.h"
|
2018-09-14 18:03:43 +00:00
|
|
|
#include "ui/gfx/geometry/dip_util.h"
|
|
|
|
#include "ui/gfx/mac/coordinate_conversion.h"
|
|
|
|
+#include "ui/gl/gpu_switching_manager.h"
|
|
|
|
|
|
|
|
using blink::WebInputEvent;
|
|
|
|
using blink::WebMouseEvent;
|