Skip to content
This repository was archived by the owner on Jul 9, 2025. It is now read-only.

Commit 94537a3

Browse files
committed
Bug 1691167 - Stop accessing the deprecated 'context' property on NSEvent, it's always nil. r=spohl
Differential Revision: https://phabricator.services.mozilla.com/D104299
1 parent 219ba6a commit 94537a3

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

widget/cocoa/NativeKeyBindings.mm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@
234234
modifierFlags:[originalEvent modifierFlags]
235235
timestamp:[originalEvent timestamp]
236236
windowNumber:[originalEvent windowNumber]
237-
context:[originalEvent context]
237+
context:nil
238238
characters:chars
239239
charactersIgnoringModifiers:chars
240240
isARepeat:[originalEvent isARepeat]

widget/cocoa/TextInputHandler.mm

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2156,7 +2156,7 @@ inline NSRange MakeNSRangeFrom(const Maybe<OffsetAndData<uint32_t>>& aOffsetAndD
21562156
modifierFlags:modifiers
21572157
timestamp:[aNativeEvent timestamp]
21582158
windowNumber:[aNativeEvent windowNumber]
2159-
context:[aNativeEvent context]
2159+
context:nil
21602160
characters:@""
21612161
charactersIgnoringModifiers:@""
21622162
isARepeat:NO
@@ -4754,7 +4754,7 @@ inline NSRange MakeNSRangeFrom(const Maybe<OffsetAndData<uint32_t>>& aOffsetAndD
47544754
modifierFlags:modifierFlags
47554755
timestamp:0
47564756
windowNumber:windowNumber
4757-
context:[NSGraphicsContext currentContext]
4757+
context:nil
47584758
characters:nsCocoaUtils::ToNSString(aCharacters)
47594759
charactersIgnoringModifiers:nsCocoaUtils::ToNSString(aUnmodifiedCharacters)
47604760
isARepeat:NO
@@ -5007,7 +5007,7 @@ inline NSRange MakeNSRangeFrom(const Maybe<OffsetAndData<uint32_t>>& aOffsetAndD
50075007
modifierFlags:[mKeyEvent modifierFlags]
50085008
timestamp:[mKeyEvent timestamp]
50095009
windowNumber:[mKeyEvent windowNumber]
5010-
context:[mKeyEvent context]
5010+
context:nil
50115011
characters:unhandledNSString
50125012
charactersIgnoringModifiers:[mKeyEvent charactersIgnoringModifiers]
50135013
isARepeat:[mKeyEvent isARepeat]

widget/cocoa/nsChildView.mm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3121,7 +3121,7 @@ - (void)rightMouseUp:(NSEvent*)theEvent {
31213121
modifierFlags:theEvent.modifierFlags
31223122
timestamp:theEvent.timestamp
31233123
windowNumber:theEvent.windowNumber
3124-
context:theEvent.context
3124+
context:nil
31253125
eventNumber:theEvent.eventNumber
31263126
clickCount:theEvent.clickCount
31273127
pressure:theEvent.pressure];

widget/cocoa/nsCocoaUtils.mm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -623,7 +623,7 @@ static bool ComputeIsEntirelyBlack(const DataSourceSurface::MappedSurface& aMap,
623623
modifierFlags:[aEvent modifierFlags]
624624
timestamp:[aEvent timestamp]
625625
windowNumber:[aEvent windowNumber]
626-
context:[aEvent context]
626+
context:nil
627627
characters:[aEvent characters]
628628
charactersIgnoringModifiers:[aEvent charactersIgnoringModifiers]
629629
isARepeat:[aEvent isARepeat]

0 commit comments

Comments
 (0)