Bug 150379 – clang-700.0.59.5 finds additional deprecated declarations which breaks the build

• Status: RESOLVED
• Resolution: FIXED
• Component: WebKit Misc.

[Gordon Sheridan]

There are two uses of -[NSWindow convertBaseToScreen:] in WebHTMLView.mm. This method has been deprecated since 10.7, but the code has been unchanged since 2005.

[Gordon Sheridan]

Created attachment 263640 [details]
Ignore two additional deprecated-declaration errors found by clang-700.0.59.5.

[Gordon Sheridan]

Created attachment 263647 [details]
Fix build for clang-700.0.59.5 by replacing deprecated calls to convertScreenToBase: with convertRectFromScreen:.

[WebKit Commit Bot]

Comment on attachment 263647 [details]
Fix build for clang-700.0.59.5 by replacing deprecated calls to convertScreenToBase: with convertRectFromScreen:.

Clearing flags on attachment: 263647

Committed r191370: <http://trac.webkit.org/changeset/191370>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.

[Alexey Proskuryakov]

This broke iOS 9 build, rolling out.

https://build.webkit.org/builders/Apple%20iOS%209%20Simulator%20Release%20%28Build%29/builds/571/steps/compile-webkit/logs/stdio

EWS has detected this, please check its status in the future.

[WebKit Commit Bot]

Re-opened since this is blocked by bug 150384

[Andy Estes]

For iOS, we need to define -convertRectFromScreen: and -convertRectToScreen: in WAKWindow.h

[Gordon Sheridan]

Created attachment 263782 [details]
Provide convenience functions to encapsulate differences between Mac and iOS to convert points between the screen and a window.

[Andy Estes]

Comment on attachment 263782 [details]
Provide convenience functions to encapsulate differences between Mac and iOS to convert points between the screen and a window.

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

> Source/WebKit/mac/ChangeLog:10
> +        (convertPointFromScreen):
> +        Added convenience function to encapsulate differences in converting points on Mac vs. iOS.

This is ok as a build fix, but can you please add a FIXME saying that WAKWindow should instead implement -convertRectFromScreen:? After all, the whole point of WAKWindow is to avoid having to write code like this.

> Source/WebKit/mac/ChangeLog:13
> +        (convertPointToScreen):
> +        Ditto.

Ditto for -convertRectToScreen:.

> Source/WebKit/mac/WebView/WebHTMLView.mm:6119
> +    NSRect screenRect = { thePoint, NSZeroSize };

thePoint is in the window's coordinate space, so this should be called windowRect.

[Andy Estes]

Comment on attachment 263782 [details]
Provide convenience functions to encapsulate differences between Mac and iOS to convert points between the screen and a window.

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

> Source/WebKit/mac/WebView/WebHTMLView.mm:6104
> +static NSPoint convertPointFromScreen(NSWindow *window, NSPoint thePoint)

Also, a better name for thePoint would be screenPoint.

> Source/WebKit/mac/WebView/WebHTMLView.mm:6114
> +static NSPoint convertPointToScreen(NSWindow *window, NSPoint thePoint)

And a better name here for thePoint would be windowPoint.

[Gordon Sheridan]

Created attachment 263805 [details]
WAKWindow versions of methods to convert an NSRect between window and screen coordinates.

This patch provides WAKWindow versions of the non-deprecated methods for converting an NSRect between window and screen coordinates, which replace the deprecated methods that operated on an NSPoint.

[Andy Estes]

Comment on attachment 263805 [details]
WAKWindow versions of methods to convert an NSRect between window and screen coordinates.

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

I like this a lot better, but I'm not sure the WAKWindow methods are correctly implemented.

> Source/WebCore/platform/ios/wak/WAKWindow.mm:163
> +- (NSRect)convertRectToScreen:(NSRect)windowRect
> +{
> +    windowRect.origin = [self convertBaseToScreen:windowRect.origin];
> +    return windowRect;
> +}

I'm not sure it's okay to convert a rect just by converting its origin. I would copy the implementation of -convertBaseToScreen:, but call -[CALayer convertRect:toLayer:] instead.

> Source/WebCore/platform/ios/wak/WAKWindow.mm:168
> +    screenRect.origin = [self convertScreenToBase:screenRect.origin];
> +    return screenRect;

Ditto for -[CALayer convertRect:fromLayer:].

[Gordon Sheridan]

Created attachment 263873 [details]
WAKWindow versions of methods to convert an NSRect between window and screen coordinates.

Updated to incorporate Andy's suggestions for WAKWindow implementations of convertRectToScreen: and convertRectFromScreen:.

[WebKit Commit Bot]

Comment on attachment 263873 [details]
WAKWindow versions of methods to convert an NSRect between window and screen coordinates.

Clearing flags on attachment: 263873

Committed r191484: <http://trac.webkit.org/changeset/191484>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.