From 4aa97a6e1bae1610b0563ef8f1988187612126ca Mon Sep 17 00:00:00 2001 From: "timothy_horton@apple.com" Date: Tue, 10 Mar 2015 19:36:28 +0000 Subject: [PATCH] Fix the Mac build with a newer compiler * Plugins/WebPluginController.mm: (WebKit_TSUpdateCheck_alertDidEnd_returnCode_contextInfo_): (WebKit_NSAlert_beginSheetModalForWindow_modalDelegate_didEndSelector_contextInfo_): git-svn-id: https://svn.webkit.org/repository/webkit/trunk@181335 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Source/WebKit/mac/ChangeLog | 8 ++++++++ Source/WebKit/mac/Plugins/WebPluginController.mm | 6 ++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/Source/WebKit/mac/ChangeLog b/Source/WebKit/mac/ChangeLog index 6ddcae9..83598de 100644 --- a/Source/WebKit/mac/ChangeLog +++ b/Source/WebKit/mac/ChangeLog @@ -1,3 +1,11 @@ +2015-03-10 Tim Horton + + Fix the Mac build with a newer compiler + + * Plugins/WebPluginController.mm: + (WebKit_TSUpdateCheck_alertDidEnd_returnCode_contextInfo_): + (WebKit_NSAlert_beginSheetModalForWindow_modalDelegate_didEndSelector_contextInfo_): + 2015-03-09 David Kilzer [iOS] Fix build when compiling with dead code stripping disabled diff --git a/Source/WebKit/mac/Plugins/WebPluginController.mm b/Source/WebKit/mac/Plugins/WebPluginController.mm index a149ff2..8db02f7 100644 --- a/Source/WebKit/mac/Plugins/WebPluginController.mm +++ b/Source/WebKit/mac/Plugins/WebPluginController.mm @@ -667,9 +667,11 @@ static beginSheetModalForWindowIMP original_NSAlert_beginSheetModalForWindow_mod typedef void (*alertDidEndIMP)(id, SEL, NSAlert *, NSInteger, void*); static alertDidEndIMP original_TSUpdateCheck_alertDidEnd_returnCode_contextInfo_; +@class TSUpdateCheck; + static void WebKit_TSUpdateCheck_alertDidEnd_returnCode_contextInfo_(id object, SEL selector, NSAlert *alert, NSInteger returnCode, void* contextInfo) { - [[object delegate] autorelease]; + [[(TSUpdateCheck *)object delegate] autorelease]; original_TSUpdateCheck_alertDidEnd_returnCode_contextInfo_(object, selector, alert, returnCode, contextInfo); } @@ -677,7 +679,7 @@ static void WebKit_TSUpdateCheck_alertDidEnd_returnCode_contextInfo_(id object, static void WebKit_NSAlert_beginSheetModalForWindow_modalDelegate_didEndSelector_contextInfo_(id object, SEL selector, NSWindow *window, id modalDelegate, SEL didEndSelector, void* contextInfo) { if (isKindOfClass(modalDelegate, @"TSUpdateCheck")) - [[modalDelegate delegate] retain]; + [[(TSUpdateCheck *)modalDelegate delegate] retain]; original_NSAlert_beginSheetModalForWindow_modalDelegate_didEndSelector_contextInfo_(object, selector, window, modalDelegate, didEndSelector, contextInfo); } -- 1.8.3.1