bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-04-03 05:31:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

cefclient: macOS: Fix CefBrowser leak during OSR shutdown (issue #2151)

Browse Source
This commit is contained in:
Marshall Greenblatt 2017-04-26 15:05:12 -04:00
parent 53281ccee2
commit c6b0e0e7cb
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tests/cefclient/browser/browser_window_osr_mac.mm
View File

@ -189,12 +189,19 @@ NSPoint ConvertPointFromWindowToScreen(NSWindow* window, NSPoint point) {
name:NSWindowDidChangeBackingPropertiesNotification name:NSWindowDidChangeBackingPropertiesNotification
object:nil]; object:nil];
if (text_input_context_osr_mac_) {
[GetInputClientFromContext(text_input_context_osr_mac_) release];
[text_input_context_osr_mac_ release];
}
[super dealloc]; [super dealloc];
} }
- (void)detach { - (void)detach {
renderer_ = NULL; renderer_ = NULL;
browser_window_ = NULL; browser_window_ = NULL;
if (text_input_context_osr_mac_)
[GetInputClientFromContext(text_input_context_osr_mac_) detach];
} }
- (CefRefPtr<CefBrowser>)getBrowser { - (CefRefPtr<CefBrowser>)getBrowser {
@ -527,10 +534,11 @@ NSPoint ConvertPointFromWindowToScreen(NSWindow* window, NSPoint point) {
- (NSTextInputContext*)inputContext { - (NSTextInputContext*)inputContext {
if (!text_input_context_osr_mac_) { if (!text_input_context_osr_mac_) {
CefTextInputClientOSRMac* text_input_client = CefTextInputClientOSRMac* text_input_client =
[[CefTextInputClientOSRMac alloc] initWithBrowser:[self getBrowser]]; [[[CefTextInputClientOSRMac alloc]
initWithBrowser:[self getBrowser]] retain];
text_input_context_osr_mac_ = [[NSTextInputContext alloc] initWithClient: text_input_context_osr_mac_ = [[[NSTextInputContext alloc] initWithClient:
text_input_client]; text_input_client] retain];
} }
return text_input_context_osr_mac_; return text_input_context_osr_mac_;

1
tests/cefclient/browser/text_input_client_osr_mac.h
View File

@ -66,6 +66,7 @@
@property(nonatomic) BOOL handlingKeyDown; @property(nonatomic) BOOL handlingKeyDown;
- (id)initWithBrowser:(CefRefPtr<CefBrowser>)browser; - (id)initWithBrowser:(CefRefPtr<CefBrowser>)browser;
- (void)detach;
- (void)HandleKeyEventBeforeTextInputClient:(NSEvent*)keyEvent; - (void)HandleKeyEventBeforeTextInputClient:(NSEvent*)keyEvent;
- (void)HandleKeyEventAfterTextInputClient:(CefKeyEvent)keyEvent; - (void)HandleKeyEventAfterTextInputClient:(CefKeyEvent)keyEvent;
- (void)ChangeCompositionRange:(CefRange)range - (void)ChangeCompositionRange:(CefRange)range

4
tests/cefclient/browser/text_input_client_osr_mac.mm
View File

@ -69,6 +69,10 @@ extern NSString* NSTextInputReplacementRangeAttributeName;
return self; return self;
} }
- (void)detach {
browser_ = NULL;
}
- (NSArray*)validAttributesForMarkedText { - (NSArray*)validAttributesForMarkedText {
if (!validAttributesForMarkedText_) { if (!validAttributesForMarkedText_) {
validAttributesForMarkedText_ = [[NSArray alloc] initWithObjects: validAttributesForMarkedText_ = [[NSArray alloc] initWithObjects: