Bug 140655 – [WK2] Stop using WKDiagnosticLoggingResultType.h C API header in Cocoa API

• Status: RESOLVED
• Resolution: FIXED
• Component: WebKit2

[Chris Dumez]

Stop using WKDiagnosticLoggingResultType.h C API header in Cocoa API. Instead, introduce a _WKDiagnosticLoggingResultType.h Cocoa header to define the WKDiagnosticLoggingResultType enum.

[Chris Dumez]

Created attachment 244963 [details]
WIP Patch

[Chris Dumez]

Comment on attachment 244963 [details]
WIP Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=244963&action=review

> Source/WebKit2/UIProcess/API/Cocoa/_WKDiagnosticLoggingDelegate.h:45
> +- (void)_webView:(WKWebView *)webView logDiagnosticMessageWithResult:(NSString *)message description:(NSString *)description result:(_WKDiagnosticLoggingResultType)result;

This breaks API compatibility unfortunately:
error: conflicting parameter types in declaration of '_webView:logDiagnosticMessageWithResult:description:result:': '_WKDiagnosticLoggingResultType' vs 'WKDiagnosticLoggingResultType' (aka 'unsigned int') [-Werror,-Woverriding-method-mismatch]

Any suggestion how to do the transition? I tried using "typedef NS_ENUM(uint32_t, _WKDiagnosticLoggingResultType)" above so that _WKDiagnosticLoggingResultType and WKDiagnosticLoggingResultType are typedefs to the same type but this does not seem to help...

[Brent Fulgham]

Created attachment 244967 [details]
Patch

[Brent Fulgham]

Comment on attachment 244967 [details]
Patch

Sorry. I typed the wrong value in the ChangeLog. This patch is not related to this bug.

[Chris Dumez]

Created attachment 245042 [details]
Patch

[WebKit Commit Bot]

Comment on attachment 245042 [details]
Patch

Clearing flags on attachment: 245042

Committed r178848: <http://trac.webkit.org/changeset/178848>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.