150379 2015-10-20 17:21:59 -0700 clang-700.0.59.5 finds additional deprecated declarations which breaks the build 2015-10-22 15:37:49 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Local Build Mac OS X 10.11 RESOLVED FIXED P2 Normal --- 150384 1 gordon_sheridan gordon_sheridan aestes commit-queue ddkilzer oldest_to_newest 1135069 0 gordon_sheridan 2015-10-20 17:21:59 -0700 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. 1135074 1 263640 gordon_sheridan 2015-10-20 17:32:32 -0700 Created attachment 263640 Ignore two additional deprecated-declaration errors found by clang-700.0.59.5. 1135087 2 263647 gordon_sheridan 2015-10-20 18:22:48 -0700 Created attachment 263647 Fix build for clang-700.0.59.5 by replacing deprecated calls to convertScreenToBase: with convertRectFromScreen:. 1135100 3 263647 commit-queue 2015-10-20 19:21:43 -0700 Comment on attachment 263647 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> 1135101 4 commit-queue 2015-10-20 19:21:47 -0700 All reviewed patches have been landed. Closing bug. 1135114 5 ap 2015-10-20 21:57:49 -0700 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. 1135116 6 commit-queue 2015-10-20 22:00:51 -0700 Re-opened since this is blocked by bug 150384 1135324 7 aestes 2015-10-21 12:15:45 -0700 For iOS, we need to define -convertRectFromScreen: and -convertRectToScreen: in WAKWindow.h 1135535 8 263782 gordon_sheridan 2015-10-21 19:19:57 -0700 Created attachment 263782 Provide convenience functions to encapsulate differences between Mac and iOS to convert points between the screen and a window. 1135564 9 263782 aestes 2015-10-21 21:38:01 -0700 Comment on attachment 263782 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. 1135567 10 263782 aestes 2015-10-21 21:40:02 -0700 Comment on attachment 263782 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. 1135615 11 263805 gordon_sheridan 2015-10-22 00:46:07 -0700 Created attachment 263805 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. 1135838 12 263805 aestes 2015-10-22 14:13:25 -0700 Comment on attachment 263805 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:]. 1135868 13 263873 gordon_sheridan 2015-10-22 15:21:50 -0700 Created attachment 263873 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:. 1135875 14 263873 commit-queue 2015-10-22 15:37:42 -0700 Comment on attachment 263873 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> 1135876 15 commit-queue 2015-10-22 15:37:49 -0700 All reviewed patches have been landed. Closing bug. 263640 2015-10-20 17:32:32 -0700 2015-10-20 18:22:48 -0700 Ignore two additional deprecated-declaration errors found by clang-700.0.59.5. add-ignore-deprecated-declarations-patch.diff text/plain 2159 gordon_sheridan ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQv bWFjL0NoYW5nZUxvZwppbmRleCAzM2I5MzA2Li5iMTY3YmJlIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L21hYy9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTcgQEAKKzIwMTUtMTAtMjAgIEdvcmRvbiBTaGVyaWRhbiAgPGdvcmRvbl9zaGVy aWRhbkBhcHBsZS5jb20+CisKKyAgICAgICAgSWdub3JlIHR3byBhZGRpdGlvbmFsIGRlcHJlY2F0 ZWQtZGVjbGFyYXRpb24gZXJyb3JzIHRoYXQgY2xhbmctNzAwLjAuNTkuNSBub3cgZmluZHMuCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTAzNzkKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYlZpZXcv V2ViSFRNTFZpZXcubW06CisgICAgICAgICgtW1dlYkhUTUxWaWV3IGNoYXJhY3RlckluZGV4Rm9y UG9pbnQ6XSk6CisgICAgICAgIEFkZCAjcHJhZ21hIGNsYW5nIGRpYWdub3N0aWMgcHVzaC9pZ25v cmVkICItV2RlcHJlY2F0ZWQtZGVjbGFyYXRpb25zIi9wb3AuCisKKyAgICAgICAgKC1bV2ViSFRN TFZpZXcgZmlyc3RSZWN0Rm9yQ2hhcmFjdGVyUmFuZ2U6XSk6CisgICAgICAgIERpdHRvLgorCiAy MDE1LTEwLTE5ICBUaW0gSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgogCiAgICAg ICAgIFRyeSB0byBmaXggdGhlIGlPUyBidWlsZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9t YWMvV2ViVmlldy9XZWJIVE1MVmlldy5tbSBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2Vi SFRNTFZpZXcubW0KaW5kZXggMWYxYzQ4Mi4uMjU1ZWE3YiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9tYWMvV2ViVmlldy9XZWJIVE1MVmlldy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L21hYy9X ZWJWaWV3L1dlYkhUTUxWaWV3Lm1tCkBAIC02MTA4LDggKzYxMDgsMTEgQEAgc3RhdGljIEJPT0wg d3JpdGluZ0RpcmVjdGlvbktleUJpbmRpbmdzRW5hYmxlZCgpCiAgICAgTlNXaW5kb3cgKndpbmRv dyA9IFtzZWxmIHdpbmRvd107CiAgICAgV2ViRnJhbWUgKmZyYW1lID0gW3NlbGYgX2ZyYW1lXTsK IAorI3ByYWdtYSBjbGFuZyBkaWFnbm9zdGljIHB1c2gKKyNwcmFnbWEgY2xhbmcgZGlhZ25vc3Rp YyBpZ25vcmVkICItV2RlcHJlY2F0ZWQtZGVjbGFyYXRpb25zIgogICAgIGlmICh3aW5kb3cpCiAg ICAgICAgIHRoZVBvaW50ID0gW3dpbmRvdyBjb252ZXJ0U2NyZWVuVG9CYXNlOnRoZVBvaW50XTsK KyNwcmFnbWEgY2xhbmcgZGlhZ25vc3RpYyBwb3AKICAgICB0aGVQb2ludCA9IFtzZWxmIGNvbnZl cnRQb2ludDp0aGVQb2ludCBmcm9tVmlldzpuaWxdOwogCiAgICAgRE9NUmFuZ2UgKnJhbmdlID0g W2ZyYW1lIF9jaGFyYWN0ZXJSYW5nZUF0UG9pbnQ6dGhlUG9pbnRdOwpAQCAtNjE0NywxMCArNjE1 MCwxMyBAQCBzdGF0aWMgQk9PTCB3cml0aW5nRGlyZWN0aW9uS2V5QmluZGluZ3NFbmFibGVkKCkK ICAgICBOU1JlY3QgcmVzdWx0UmVjdCA9IFtmcmFtZSBfZmlyc3RSZWN0Rm9yRE9NUmFuZ2U6cmFu Z2VdOwogICAgIHJlc3VsdFJlY3QgPSBbc2VsZiBjb252ZXJ0UmVjdDpyZXN1bHRSZWN0IHRvVmll dzpuaWxdOwogCisjcHJhZ21hIGNsYW5nIGRpYWdub3N0aWMgcHVzaAorI3ByYWdtYSBjbGFuZyBk aWFnbm9zdGljIGlnbm9yZWQgIi1XZGVwcmVjYXRlZC1kZWNsYXJhdGlvbnMiCiAgICAgTlNXaW5k b3cgKndpbmRvdyA9IFtzZWxmIHdpbmRvd107CiAgICAgaWYgKHdpbmRvdykKICAgICAgICAgcmVz dWx0UmVjdC5vcmlnaW4gPSBbd2luZG93IGNvbnZlcnRCYXNlVG9TY3JlZW46cmVzdWx0UmVjdC5v cmlnaW5dOwotICAgIAorI3ByYWdtYSBjbGFuZyBkaWFnbm9zdGljIHBvcAorCiAgICAgTE9HKFRl eHRJbnB1dCwgImZpcnN0UmVjdEZvckNoYXJhY3RlclJhbmdlOigldSwgJXUpIC0+ICglZiwgJWYs ICVmLCAlZikiLCB0aGVSYW5nZS5sb2NhdGlvbiwgdGhlUmFuZ2UubGVuZ3RoLCByZXN1bHRSZWN0 Lm9yaWdpbi54LCByZXN1bHRSZWN0Lm9yaWdpbi55LCByZXN1bHRSZWN0LnNpemUud2lkdGgsIHJl c3VsdFJlY3Quc2l6ZS5oZWlnaHQpOwogICAgIHJldHVybiByZXN1bHRSZWN0OwogfQo= 263647 2015-10-20 18:22:48 -0700 2015-10-21 19:19:57 -0700 Fix build for clang-700.0.59.5 by replacing deprecated calls to convertScreenToBase: with convertRectFromScreen:. replace-convertScreenToBase-with-convertRectFromScreen.diff text/plain 2062 gordon_sheridan ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQv bWFjL0NoYW5nZUxvZwppbmRleCAzM2I5MzA2Li40YTUxODJhIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L21hYy9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTcgQEAKKzIwMTUtMTAtMjAgIEdvcmRvbiBTaGVyaWRhbiAgPGdvcmRvbl9zaGVy aWRhbkBhcHBsZS5jb20+CisKKyAgICAgICAgRml4IGJ1aWxkIGZvciBjbGFuZy03MDAuMC41OS41 IGJ5IHJlcGxhY2luZyBkZXByZWNhdGVkIGNhbGxzIHRvIGNvbnZlcnRTY3JlZW5Ub0Jhc2U6IHdp dGggY29udmVydFJlY3RGcm9tU2NyZWVuOi4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTE1MDM3OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogV2ViVmlldy9XZWJIVE1MVmlldy5tbToKKyAgICAgICAgKC1b V2ViSFRNTFZpZXcgY2hhcmFjdGVySW5kZXhGb3JQb2ludDpdKToKKyAgICAgICAgQ29udmVydCBw b2ludCB0byByZWN0LCBhbmQgY2FsbCBjb252ZXJ0UmVjdEZyb21TY3JlZW46LgorCisgICAgICAg ICgtW1dlYkhUTUxWaWV3IGZpcnN0UmVjdEZvckNoYXJhY3RlclJhbmdlOl0pOgorICAgICAgICBS ZXBsYWNlIGNvbnZlcnRCYXNlVG9TY3JlZW46IHdpdGggY29udmVydFJlY3RUb1NjcmVlbjouCisK IDIwMTUtMTAtMTkgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CiAKICAg ICAgICAgVHJ5IHRvIGZpeCB0aGUgaU9TIGJ1aWxkCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L21hYy9XZWJWaWV3L1dlYkhUTUxWaWV3Lm1tIGIvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9X ZWJIVE1MVmlldy5tbQppbmRleCAxZjFjNDgyLi42MGU4NzIzIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L21hYy9XZWJWaWV3L1dlYkhUTUxWaWV3Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvbWFj L1dlYlZpZXcvV2ViSFRNTFZpZXcubW0KQEAgLTYxMDgsOCArNjEwOCwxMCBAQCBzdGF0aWMgQk9P TCB3cml0aW5nRGlyZWN0aW9uS2V5QmluZGluZ3NFbmFibGVkKCkKICAgICBOU1dpbmRvdyAqd2lu ZG93ID0gW3NlbGYgd2luZG93XTsKICAgICBXZWJGcmFtZSAqZnJhbWUgPSBbc2VsZiBfZnJhbWVd OwogCi0gICAgaWYgKHdpbmRvdykKLSAgICAgICAgdGhlUG9pbnQgPSBbd2luZG93IGNvbnZlcnRT Y3JlZW5Ub0Jhc2U6dGhlUG9pbnRdOworICAgIGlmICh3aW5kb3cpIHsKKyAgICAgICAgTlNSZWN0 IHNjcmVlblJlY3QgPSB7IHRoZVBvaW50LCBOU1plcm9TaXplIH07CisgICAgICAgIHRoZVBvaW50 ID0gW3dpbmRvdyBjb252ZXJ0UmVjdEZyb21TY3JlZW46c2NyZWVuUmVjdF0ub3JpZ2luOworICAg IH0gICAgIAogICAgIHRoZVBvaW50ID0gW3NlbGYgY29udmVydFBvaW50OnRoZVBvaW50IGZyb21W aWV3Om5pbF07CiAKICAgICBET01SYW5nZSAqcmFuZ2UgPSBbZnJhbWUgX2NoYXJhY3RlclJhbmdl QXRQb2ludDp0aGVQb2ludF07CkBAIC02MTQ5LDcgKzYxNTEsNyBAQCBzdGF0aWMgQk9PTCB3cml0 aW5nRGlyZWN0aW9uS2V5QmluZGluZ3NFbmFibGVkKCkKIAogICAgIE5TV2luZG93ICp3aW5kb3cg PSBbc2VsZiB3aW5kb3ddOwogICAgIGlmICh3aW5kb3cpCi0gICAgICAgIHJlc3VsdFJlY3Qub3Jp Z2luID0gW3dpbmRvdyBjb252ZXJ0QmFzZVRvU2NyZWVuOnJlc3VsdFJlY3Qub3JpZ2luXTsKKyAg ICAgICAgcmVzdWx0UmVjdCA9IFt3aW5kb3cgY29udmVydFJlY3RUb1NjcmVlbjpyZXN1bHRSZWN0 XTsKICAgICAKICAgICBMT0coVGV4dElucHV0LCAiZmlyc3RSZWN0Rm9yQ2hhcmFjdGVyUmFuZ2U6 KCV1LCAldSkgLT4gKCVmLCAlZiwgJWYsICVmKSIsIHRoZVJhbmdlLmxvY2F0aW9uLCB0aGVSYW5n ZS5sZW5ndGgsIHJlc3VsdFJlY3Qub3JpZ2luLngsIHJlc3VsdFJlY3Qub3JpZ2luLnksIHJlc3Vs dFJlY3Quc2l6ZS53aWR0aCwgcmVzdWx0UmVjdC5zaXplLmhlaWdodCk7CiAgICAgcmV0dXJuIHJl c3VsdFJlY3Q7Cg== 263782 2015-10-21 19:19:57 -0700 2015-10-22 15:21:50 -0700 Provide convenience functions to encapsulate differences between Mac and iOS to convert points between the screen and a window. replace-point-conversion-methods.diff text/plain 2893 gordon_sheridan ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQv bWFjL0NoYW5nZUxvZwppbmRleCAyOWYxNTExLi5kNTcwZGMzIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L21hYy9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjMgQEAKKzIwMTUtMTAtMjEgIEdvcmRvbiBTaGVyaWRhbiAgPGdvcmRvbl9zaGVy aWRhbkBhcHBsZS5jb20+CisKKyAgICAgICAgRml4IGJ1aWxkIGZvciBjbGFuZy03MDAuMC41OS41 IGJ5IHJlcGxhY2luZyBkZXByZWNhdGVkIGNhbGxzIHRvIGNvbnZlcnQgcG9pbnRzIGJldHdlZW4g c2NyZWVuIGFuZCB3aW5kb3cgY29vcmRpbmF0ZXMgZm9yIE1hYy4KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MDM3OQorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViVmlldy9XZWJIVE1MVmlldy5tbToK KyAgICAgICAgKGNvbnZlcnRQb2ludEZyb21TY3JlZW4pOgorICAgICAgICBBZGRlZCBjb252ZW5p ZW5jZSBmdW5jdGlvbiB0byBlbmNhcHN1bGF0ZSBkaWZmZXJlbmNlcyBpbiBjb252ZXJ0aW5nIHBv aW50cyBvbiBNYWMgdnMuIGlPUy4KKworICAgICAgICAoY29udmVydFBvaW50VG9TY3JlZW4pOgor ICAgICAgICBEaXR0by4KKworICAgICAgICAoLVtXZWJIVE1MVmlldyBjaGFyYWN0ZXJJbmRleEZv clBvaW50Ol0pOgorICAgICAgICBEZXBsb3kgY29udmVydFBvaW50RnJvbVNjcmVlbigpLgorCisg ICAgICAgICgtW1dlYkhUTUxWaWV3IGZpcnN0UmVjdEZvckNoYXJhY3RlclJhbmdlOl0pOgorICAg ICAgICBEZXBsb3kgY29udmVydFBvaW50VG9TY3JlZW4oKS4KKwogMjAxNS0xMC0yMSAgQ2FybG9z IEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgTmV0d29ya1By b2Nlc3M6IEROUyBwcmVmZXRjaCBoYXBwZW5zIGluIHRoZSBXZWIgUHJvY2VzcwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJIVE1MVmlldy5tbSBiL1NvdXJjZS9XZWJL aXQvbWFjL1dlYlZpZXcvV2ViSFRNTFZpZXcubW0KaW5kZXggMWYxYzQ4Mi4uYzU0N2M1YiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJIVE1MVmlldy5tbQorKysgYi9T b3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYkhUTUxWaWV3Lm1tCkBAIC02MTAxLDYgKzYxMDEs MjYgQEAgc3RhdGljIEJPT0wgd3JpdGluZ0RpcmVjdGlvbktleUJpbmRpbmdzRW5hYmxlZCgpCiB9 CiAjZW5kaWYgLy8gIVBMQVRGT1JNKElPUykKIAorc3RhdGljIE5TUG9pbnQgY29udmVydFBvaW50 RnJvbVNjcmVlbihOU1dpbmRvdyAqd2luZG93LCBOU1BvaW50IHRoZVBvaW50KQoreworI2lmIFBM QVRGT1JNKElPUykKKyAgICByZXR1cm4gW3dpbmRvdyBjb252ZXJ0U2NyZWVuVG9CYXNlOnRoZVBv aW50XTsKKyNlbHNlCisgICAgTlNSZWN0IHNjcmVlblJlY3QgPSB7IHRoZVBvaW50LCBOU1plcm9T aXplIH07CisgICAgcmV0dXJuIFt3aW5kb3cgY29udmVydFJlY3RGcm9tU2NyZWVuOnNjcmVlblJl Y3RdLm9yaWdpbjsKKyNlbmRpZgorfQorCitzdGF0aWMgTlNQb2ludCBjb252ZXJ0UG9pbnRUb1Nj cmVlbihOU1dpbmRvdyAqd2luZG93LCBOU1BvaW50IHRoZVBvaW50KQoreworI2lmIFBMQVRGT1JN KElPUykKKyAgICByZXR1cm4gW3dpbmRvdyBjb252ZXJ0QmFzZVRvU2NyZWVuOnRoZVBvaW50XTsK KyNlbHNlCisgICAgTlNSZWN0IHNjcmVlblJlY3QgPSB7IHRoZVBvaW50LCBOU1plcm9TaXplIH07 CisgICAgcmV0dXJuIFt3aW5kb3cgY29udmVydFJlY3RUb1NjcmVlbjpzY3JlZW5SZWN0XS5vcmln aW47CisjZW5kaWYKK30KKwogLSAoTlNVSW50ZWdlciljaGFyYWN0ZXJJbmRleEZvclBvaW50OihO U1BvaW50KXRoZVBvaW50CiB7CiAgICAgW3NlbGYgX2V4ZWN1dGVTYXZlZEtleXByZXNzQ29tbWFu ZHNdOwpAQCAtNjEwOSw3ICs2MTI5LDcgQEAgc3RhdGljIEJPT0wgd3JpdGluZ0RpcmVjdGlvbktl eUJpbmRpbmdzRW5hYmxlZCgpCiAgICAgV2ViRnJhbWUgKmZyYW1lID0gW3NlbGYgX2ZyYW1lXTsK IAogICAgIGlmICh3aW5kb3cpCi0gICAgICAgIHRoZVBvaW50ID0gW3dpbmRvdyBjb252ZXJ0U2Ny ZWVuVG9CYXNlOnRoZVBvaW50XTsKKyAgICAgICAgdGhlUG9pbnQgPSBjb252ZXJ0UG9pbnRGcm9t U2NyZWVuKHdpbmRvdywgdGhlUG9pbnQpOwogICAgIHRoZVBvaW50ID0gW3NlbGYgY29udmVydFBv aW50OnRoZVBvaW50IGZyb21WaWV3Om5pbF07CiAKICAgICBET01SYW5nZSAqcmFuZ2UgPSBbZnJh bWUgX2NoYXJhY3RlclJhbmdlQXRQb2ludDp0aGVQb2ludF07CkBAIC02MTQ5LDcgKzYxNjksNyBA QCBzdGF0aWMgQk9PTCB3cml0aW5nRGlyZWN0aW9uS2V5QmluZGluZ3NFbmFibGVkKCkKIAogICAg IE5TV2luZG93ICp3aW5kb3cgPSBbc2VsZiB3aW5kb3ddOwogICAgIGlmICh3aW5kb3cpCi0gICAg ICAgIHJlc3VsdFJlY3Qub3JpZ2luID0gW3dpbmRvdyBjb252ZXJ0QmFzZVRvU2NyZWVuOnJlc3Vs dFJlY3Qub3JpZ2luXTsKKyAgICAgICAgcmVzdWx0UmVjdC5vcmlnaW4gPSBjb252ZXJ0UG9pbnRU b1NjcmVlbih3aW5kb3csIHJlc3VsdFJlY3Qub3JpZ2luKTsKICAgICAKICAgICBMT0coVGV4dElu cHV0LCAiZmlyc3RSZWN0Rm9yQ2hhcmFjdGVyUmFuZ2U6KCV1LCAldSkgLT4gKCVmLCAlZiwgJWYs ICVmKSIsIHRoZVJhbmdlLmxvY2F0aW9uLCB0aGVSYW5nZS5sZW5ndGgsIHJlc3VsdFJlY3Qub3Jp Z2luLngsIHJlc3VsdFJlY3Qub3JpZ2luLnksIHJlc3VsdFJlY3Quc2l6ZS53aWR0aCwgcmVzdWx0 UmVjdC5zaXplLmhlaWdodCk7CiAgICAgcmV0dXJuIHJlc3VsdFJlY3Q7Cg== 263805 2015-10-22 00:46:07 -0700 2015-10-22 15:21:50 -0700 WAKWindow versions of methods to convert an NSRect between window and screen coordinates. WAKWindow-versions-of-NSRect-conversion-methods.diff text/plain 4517 gordon_sheridan ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBiN2JjYjRmLi4xOWM0ZDU3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTgg QEAKKzIwMTUtMTAtMjIgIEdvcmRvbiBTaGVyaWRhbiAgPGdvcmRvbl9zaGVyaWRhbkBhcHBsZS5j b20+CisKKyAgICAgICAgRml4IGJ1aWxkIGZvciBjbGFuZy03MDAuMC41OS41IGJ5IHJlcGxhY2lu ZyBkZXByZWNhdGVkIGNhbGxzIHRvIGNvbnZlcnQgcG9pbnRzIGJldHdlZW4gc2NyZWVuIGFuZCB3 aW5kb3cgY29vcmRpbmF0ZXMgZm9yIE1hYy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTE1MDM3OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFByb3ZpZGUgV0FLV2luZG93IHZlcnNpb25zIG9mIHRoZSBub24t ZGVwcmVjYXRlZCBtZXRob2RzIGZvciBjb252ZXJ0aW5nIGFuIE5TUmVjdCBiZXR3ZWVuCisgICAg ICAgIHdpbmRvdyBhbmQgc2NyZWVuIGNvb3JkaW5hdGVzLCB3aGljaCByZXBsYWNlIHRoZSBkZXBy ZWNhdGVkIG1ldGhvZHMgdGhhdCBvcGVyYXRlZCBvbiBhbiBOU1BvaW50LgorCisgICAgICAgICog cGxhdGZvcm0vaW9zL3dhay9XQUtXaW5kb3cuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9pb3Mvd2Fr L1dBS1dpbmRvdy5tbToKKyAgICAgICAgKC1bV0FLV2luZG93IGNvbnZlcnRSZWN0VG9TY3JlZW46 XSk6IEFkZGVkLgorICAgICAgICAoLVtXQUtXaW5kb3cgY29udmVydFJlY3RGcm9tU2NyZWVuOl0p OiBBZGRlZC4KKwogMjAxNS0xMC0yMSAgRGVhbiBKYWNrc29uICA8ZGlub0BhcHBsZS5jb20+CiAK ICAgICAgICAgTnVsbCBkZXJlZmVyZW5jZSBsb2FkaW5nIEJsaW5rIGxheW91dCB0ZXN0IHN2Zy9m aWx0ZXJzL2Rpc3BsYXktbm9uZS1maWx0ZXItcHJpbWl0aXZlLmh0bWwKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy93YWsvV0FLV2luZG93LmggYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9pb3Mvd2FrL1dBS1dpbmRvdy5oCmluZGV4IDRiYzIyZjQuLjJiNWI5OWQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy93YWsvV0FLV2luZG93LmgKKysr IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL3dhay9XQUtXaW5kb3cuaApAQCAtMTA3LDYg KzEwNyw4IEBAIFdFQkNPUkVfRVhQT1JUIEBpbnRlcmZhY2UgV0FLV2luZG93IDogV0FLUmVzcG9u ZGVyCiAKIC0gKE5TUG9pbnQpY29udmVydEJhc2VUb1NjcmVlbjooTlNQb2ludClhUG9pbnQ7CiAt IChOU1BvaW50KWNvbnZlcnRTY3JlZW5Ub0Jhc2U6KE5TUG9pbnQpYVBvaW50OworLSAoTlNSZWN0 KWNvbnZlcnRSZWN0VG9TY3JlZW46KE5TUmVjdClhUmVjdDsKKy0gKE5TUmVjdCljb252ZXJ0UmVj dEZyb21TY3JlZW46KE5TUmVjdClhUmVjdDsKIC0gKEJPT0wpaXNLZXlXaW5kb3c7CiAtICh2b2lk KW1ha2VLZXlXaW5kb3c7CiAtIChCT09MKWlzVmlzaWJsZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2lvcy93YWsvV0FLV2luZG93Lm1tIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vaW9zL3dhay9XQUtXaW5kb3cubW0KaW5kZXggYmMzZmRhNC4uYjNmNDc2YSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL3dhay9XQUtXaW5kb3cubW0KKysrIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL3dhay9XQUtXaW5kb3cubW0KQEAgLTE1Niw2ICsx NTYsMTggQEAgc3RhdGljIGlkPE9yaWVudGF0aW9uUHJvdmlkZXI+IGdPcmllbnRhdGlvblByb3Zp ZGVyOwogICAgIHJldHVybiBbX2hvc3RMYXllciBjb252ZXJ0UG9pbnQ6YVBvaW50IGZyb21MYXll cjpyb290TGF5ZXJdOwogfQogCistIChOU1JlY3QpY29udmVydFJlY3RUb1NjcmVlbjooTlNSZWN0 KXdpbmRvd1JlY3QKK3sKKyAgICB3aW5kb3dSZWN0Lm9yaWdpbiA9IFtzZWxmIGNvbnZlcnRCYXNl VG9TY3JlZW46d2luZG93UmVjdC5vcmlnaW5dOworICAgIHJldHVybiB3aW5kb3dSZWN0OworfQor CistIChOU1JlY3QpY29udmVydFJlY3RGcm9tU2NyZWVuOihOU1JlY3Qpc2NyZWVuUmVjdAorewor ICAgIHNjcmVlblJlY3Qub3JpZ2luID0gW3NlbGYgY29udmVydFNjcmVlblRvQmFzZTpzY3JlZW5S ZWN0Lm9yaWdpbl07CisgICAgcmV0dXJuIHNjcmVlblJlY3Q7Cit9CisKIC0gKEJPT0wpaXNLZXlX aW5kb3cKIHsKICAgICByZXR1cm4gWUVTIHx8IHNlbGYgPT0gX1dBS0tleVdpbmRvdzsgCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L21hYy9D aGFuZ2VMb2cKaW5kZXggMjlmMTUxMS4uNmY3ZDU4MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9tYWMvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwpAQCAtMSwz ICsxLDE3IEBACisyMDE1LTEwLTIyICBHb3Jkb24gU2hlcmlkYW4gIDxnb3Jkb25fc2hlcmlkYW5A YXBwbGUuY29tPgorCisgICAgICAgIEZpeCBidWlsZCBmb3IgY2xhbmctNzAwLjAuNTkuNSBieSBy ZXBsYWNpbmcgZGVwcmVjYXRlZCBjYWxscyB0byBjb252ZXJ0IHBvaW50cyBiZXR3ZWVuIHNjcmVl biBhbmQgd2luZG93IGNvb3JkaW5hdGVzIGZvciBNYWMuCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTAzNzkKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYlZpZXcvV2ViSFRNTFZpZXcubW06CisgICAg ICAgICgtW1dlYkhUTUxWaWV3IGNoYXJhY3RlckluZGV4Rm9yUG9pbnQ6XSk6CisgICAgICAgIENv bnZlcnQgcG9pbnQgdG8gcmVjdCwgYW5kIHJlcGxhY2UgY2FsbCB0byBkZXByZWNhdGVkIGNvbnZl cnRTY3JlZW5Ub0Jhc2U6IHdpdGggY29udmVydFJlY3RGcm9tU2NyZWVuOi4KKworICAgICAgICAo LVtXZWJIVE1MVmlldyBmaXJzdFJlY3RGb3JDaGFyYWN0ZXJSYW5nZTpdKToKKyAgICAgICAgUmVw bGFjZSBjYWxsIHRvIGRlcHJlY2F0ZWQgY29udmVydEJhc2VUb1NjcmVlbjogd2l0aCBjb252ZXJ0 UmVjdFRvU2NyZWVuOi4KKwogMjAxNS0xMC0yMSAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2Fy Y2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgTmV0d29ya1Byb2Nlc3M6IEROUyBwcmVmZXRjaCBo YXBwZW5zIGluIHRoZSBXZWIgUHJvY2VzcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9tYWMv V2ViVmlldy9XZWJIVE1MVmlldy5tbSBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViSFRN TFZpZXcubW0KaW5kZXggMWYxYzQ4Mi4uMDdiODZjNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9tYWMvV2ViVmlldy9XZWJIVE1MVmlldy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJW aWV3L1dlYkhUTUxWaWV3Lm1tCkBAIC02MTA4LDggKzYxMDgsMTAgQEAgc3RhdGljIEJPT0wgd3Jp dGluZ0RpcmVjdGlvbktleUJpbmRpbmdzRW5hYmxlZCgpCiAgICAgTlNXaW5kb3cgKndpbmRvdyA9 IFtzZWxmIHdpbmRvd107CiAgICAgV2ViRnJhbWUgKmZyYW1lID0gW3NlbGYgX2ZyYW1lXTsKIAot ICAgIGlmICh3aW5kb3cpCi0gICAgICAgIHRoZVBvaW50ID0gW3dpbmRvdyBjb252ZXJ0U2NyZWVu VG9CYXNlOnRoZVBvaW50XTsKKyAgICBpZiAod2luZG93KSB7CisgICAgICAgIE5TUmVjdCBzY3Jl ZW5SZWN0ID0geyB0aGVQb2ludCwgTlNaZXJvU2l6ZSB9OworICAgICAgICB0aGVQb2ludCA9IFt3 aW5kb3cgY29udmVydFJlY3RGcm9tU2NyZWVuOnNjcmVlblJlY3RdLm9yaWdpbjsKKyAgICB9CiAg ICAgdGhlUG9pbnQgPSBbc2VsZiBjb252ZXJ0UG9pbnQ6dGhlUG9pbnQgZnJvbVZpZXc6bmlsXTsK IAogICAgIERPTVJhbmdlICpyYW5nZSA9IFtmcmFtZSBfY2hhcmFjdGVyUmFuZ2VBdFBvaW50OnRo ZVBvaW50XTsKQEAgLTYxNDksNyArNjE1MSw3IEBAIHN0YXRpYyBCT09MIHdyaXRpbmdEaXJlY3Rp b25LZXlCaW5kaW5nc0VuYWJsZWQoKQogCiAgICAgTlNXaW5kb3cgKndpbmRvdyA9IFtzZWxmIHdp bmRvd107CiAgICAgaWYgKHdpbmRvdykKLSAgICAgICAgcmVzdWx0UmVjdC5vcmlnaW4gPSBbd2lu ZG93IGNvbnZlcnRCYXNlVG9TY3JlZW46cmVzdWx0UmVjdC5vcmlnaW5dOworICAgICAgICByZXN1 bHRSZWN0Lm9yaWdpbiA9IFt3aW5kb3cgY29udmVydFJlY3RUb1NjcmVlbjpyZXN1bHRSZWN0XS5v cmlnaW47CiAgICAgCiAgICAgTE9HKFRleHRJbnB1dCwgImZpcnN0UmVjdEZvckNoYXJhY3RlclJh bmdlOigldSwgJXUpIC0+ICglZiwgJWYsICVmLCAlZikiLCB0aGVSYW5nZS5sb2NhdGlvbiwgdGhl UmFuZ2UubGVuZ3RoLCByZXN1bHRSZWN0Lm9yaWdpbi54LCByZXN1bHRSZWN0Lm9yaWdpbi55LCBy ZXN1bHRSZWN0LnNpemUud2lkdGgsIHJlc3VsdFJlY3Quc2l6ZS5oZWlnaHQpOwogICAgIHJldHVy biByZXN1bHRSZWN0Owo= 263873 2015-10-22 15:21:50 -0700 2015-10-22 15:37:42 -0700 WAKWindow versions of methods to convert an NSRect between window and screen coordinates. WAKWindow-versions-of-NSRect-conversion-methods-2.diff text/plain 4697 gordon_sheridan ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBiN2JjYjRmLi4xOWM0ZDU3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTgg QEAKKzIwMTUtMTAtMjIgIEdvcmRvbiBTaGVyaWRhbiAgPGdvcmRvbl9zaGVyaWRhbkBhcHBsZS5j b20+CisKKyAgICAgICAgRml4IGJ1aWxkIGZvciBjbGFuZy03MDAuMC41OS41IGJ5IHJlcGxhY2lu ZyBkZXByZWNhdGVkIGNhbGxzIHRvIGNvbnZlcnQgcG9pbnRzIGJldHdlZW4gc2NyZWVuIGFuZCB3 aW5kb3cgY29vcmRpbmF0ZXMgZm9yIE1hYy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTE1MDM3OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFByb3ZpZGUgV0FLV2luZG93IHZlcnNpb25zIG9mIHRoZSBub24t ZGVwcmVjYXRlZCBtZXRob2RzIGZvciBjb252ZXJ0aW5nIGFuIE5TUmVjdCBiZXR3ZWVuCisgICAg ICAgIHdpbmRvdyBhbmQgc2NyZWVuIGNvb3JkaW5hdGVzLCB3aGljaCByZXBsYWNlIHRoZSBkZXBy ZWNhdGVkIG1ldGhvZHMgdGhhdCBvcGVyYXRlZCBvbiBhbiBOU1BvaW50LgorCisgICAgICAgICog cGxhdGZvcm0vaW9zL3dhay9XQUtXaW5kb3cuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9pb3Mvd2Fr L1dBS1dpbmRvdy5tbToKKyAgICAgICAgKC1bV0FLV2luZG93IGNvbnZlcnRSZWN0VG9TY3JlZW46 XSk6IEFkZGVkLgorICAgICAgICAoLVtXQUtXaW5kb3cgY29udmVydFJlY3RGcm9tU2NyZWVuOl0p OiBBZGRlZC4KKwogMjAxNS0xMC0yMSAgRGVhbiBKYWNrc29uICA8ZGlub0BhcHBsZS5jb20+CiAK ICAgICAgICAgTnVsbCBkZXJlZmVyZW5jZSBsb2FkaW5nIEJsaW5rIGxheW91dCB0ZXN0IHN2Zy9m aWx0ZXJzL2Rpc3BsYXktbm9uZS1maWx0ZXItcHJpbWl0aXZlLmh0bWwKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy93YWsvV0FLV2luZG93LmggYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9pb3Mvd2FrL1dBS1dpbmRvdy5oCmluZGV4IDRiYzIyZjQuLjJiNWI5OWQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy93YWsvV0FLV2luZG93LmgKKysr IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL3dhay9XQUtXaW5kb3cuaApAQCAtMTA3LDYg KzEwNyw4IEBAIFdFQkNPUkVfRVhQT1JUIEBpbnRlcmZhY2UgV0FLV2luZG93IDogV0FLUmVzcG9u ZGVyCiAKIC0gKE5TUG9pbnQpY29udmVydEJhc2VUb1NjcmVlbjooTlNQb2ludClhUG9pbnQ7CiAt IChOU1BvaW50KWNvbnZlcnRTY3JlZW5Ub0Jhc2U6KE5TUG9pbnQpYVBvaW50OworLSAoTlNSZWN0 KWNvbnZlcnRSZWN0VG9TY3JlZW46KE5TUmVjdClhUmVjdDsKKy0gKE5TUmVjdCljb252ZXJ0UmVj dEZyb21TY3JlZW46KE5TUmVjdClhUmVjdDsKIC0gKEJPT0wpaXNLZXlXaW5kb3c7CiAtICh2b2lk KW1ha2VLZXlXaW5kb3c7CiAtIChCT09MKWlzVmlzaWJsZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2lvcy93YWsvV0FLV2luZG93Lm1tIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vaW9zL3dhay9XQUtXaW5kb3cubW0KaW5kZXggYmMzZmRhNC4uOWQ4M2M1ZCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL3dhay9XQUtXaW5kb3cubW0KKysrIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL3dhay9XQUtXaW5kb3cubW0KQEAgLTE1Niw2ICsx NTYsMjQgQEAgc3RhdGljIGlkPE9yaWVudGF0aW9uUHJvdmlkZXI+IGdPcmllbnRhdGlvblByb3Zp ZGVyOwogICAgIHJldHVybiBbX2hvc3RMYXllciBjb252ZXJ0UG9pbnQ6YVBvaW50IGZyb21MYXll cjpyb290TGF5ZXJdOwogfQogCistIChOU1JlY3QpY29udmVydFJlY3RUb1NjcmVlbjooTlNSZWN0 KXdpbmRvd1JlY3QKK3sKKyAgICBDQUxheWVyKiByb290TGF5ZXIgPSBfaG9zdExheWVyOworICAg IHdoaWxlIChyb290TGF5ZXIuc3VwZXJsYXllcikKKyAgICAgICAgcm9vdExheWVyID0gcm9vdExh eWVyLnN1cGVybGF5ZXI7CisKKyAgICByZXR1cm4gW19ob3N0TGF5ZXIgY29udmVydFJlY3Q6d2lu ZG93UmVjdCB0b0xheWVyOnJvb3RMYXllcl07Cit9CisKKy0gKE5TUmVjdCljb252ZXJ0UmVjdEZy b21TY3JlZW46KE5TUmVjdClzY3JlZW5SZWN0Cit7CisgICAgQ0FMYXllciogcm9vdExheWVyID0g X2hvc3RMYXllcjsKKyAgICB3aGlsZSAocm9vdExheWVyLnN1cGVybGF5ZXIpCisgICAgICAgIHJv b3RMYXllciA9IHJvb3RMYXllci5zdXBlcmxheWVyOworCisgICAgcmV0dXJuIFtfaG9zdExheWVy IGNvbnZlcnRSZWN0OnNjcmVlblJlY3QgZnJvbUxheWVyOnJvb3RMYXllcl07Cit9CisKIC0gKEJP T0wpaXNLZXlXaW5kb3cKIHsKICAgICByZXR1cm4gWUVTIHx8IHNlbGYgPT0gX1dBS0tleVdpbmRv dzsgCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi S2l0L21hYy9DaGFuZ2VMb2cKaW5kZXggMjlmMTUxMS4uNmY3ZDU4MyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDE3IEBACisyMDE1LTEwLTIyICBHb3Jkb24gU2hlcmlkYW4gIDxnb3Jkb25f c2hlcmlkYW5AYXBwbGUuY29tPgorCisgICAgICAgIEZpeCBidWlsZCBmb3IgY2xhbmctNzAwLjAu NTkuNSBieSByZXBsYWNpbmcgZGVwcmVjYXRlZCBjYWxscyB0byBjb252ZXJ0IHBvaW50cyBiZXR3 ZWVuIHNjcmVlbiBhbmQgd2luZG93IGNvb3JkaW5hdGVzIGZvciBNYWMuCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTAzNzkKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYlZpZXcvV2ViSFRNTFZpZXcu bW06CisgICAgICAgICgtW1dlYkhUTUxWaWV3IGNoYXJhY3RlckluZGV4Rm9yUG9pbnQ6XSk6Cisg ICAgICAgIENvbnZlcnQgcG9pbnQgdG8gcmVjdCwgYW5kIHJlcGxhY2UgY2FsbCB0byBkZXByZWNh dGVkIGNvbnZlcnRTY3JlZW5Ub0Jhc2U6IHdpdGggY29udmVydFJlY3RGcm9tU2NyZWVuOi4KKwor ICAgICAgICAoLVtXZWJIVE1MVmlldyBmaXJzdFJlY3RGb3JDaGFyYWN0ZXJSYW5nZTpdKToKKyAg ICAgICAgUmVwbGFjZSBjYWxsIHRvIGRlcHJlY2F0ZWQgY29udmVydEJhc2VUb1NjcmVlbjogd2l0 aCBjb252ZXJ0UmVjdFRvU2NyZWVuOi4KKwogMjAxNS0xMC0yMSAgQ2FybG9zIEdhcmNpYSBDYW1w b3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgTmV0d29ya1Byb2Nlc3M6IEROUyBw cmVmZXRjaCBoYXBwZW5zIGluIHRoZSBXZWIgUHJvY2VzcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9tYWMvV2ViVmlldy9XZWJIVE1MVmlldy5tbSBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZp ZXcvV2ViSFRNTFZpZXcubW0KaW5kZXggMWYxYzQ4Mi4uMDdiODZjNiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJIVE1MVmlldy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0 L21hYy9XZWJWaWV3L1dlYkhUTUxWaWV3Lm1tCkBAIC02MTA4LDggKzYxMDgsMTAgQEAgc3RhdGlj IEJPT0wgd3JpdGluZ0RpcmVjdGlvbktleUJpbmRpbmdzRW5hYmxlZCgpCiAgICAgTlNXaW5kb3cg KndpbmRvdyA9IFtzZWxmIHdpbmRvd107CiAgICAgV2ViRnJhbWUgKmZyYW1lID0gW3NlbGYgX2Zy YW1lXTsKIAotICAgIGlmICh3aW5kb3cpCi0gICAgICAgIHRoZVBvaW50ID0gW3dpbmRvdyBjb252 ZXJ0U2NyZWVuVG9CYXNlOnRoZVBvaW50XTsKKyAgICBpZiAod2luZG93KSB7CisgICAgICAgIE5T UmVjdCBzY3JlZW5SZWN0ID0geyB0aGVQb2ludCwgTlNaZXJvU2l6ZSB9OworICAgICAgICB0aGVQ b2ludCA9IFt3aW5kb3cgY29udmVydFJlY3RGcm9tU2NyZWVuOnNjcmVlblJlY3RdLm9yaWdpbjsK KyAgICB9CiAgICAgdGhlUG9pbnQgPSBbc2VsZiBjb252ZXJ0UG9pbnQ6dGhlUG9pbnQgZnJvbVZp ZXc6bmlsXTsKIAogICAgIERPTVJhbmdlICpyYW5nZSA9IFtmcmFtZSBfY2hhcmFjdGVyUmFuZ2VB dFBvaW50OnRoZVBvaW50XTsKQEAgLTYxNDksNyArNjE1MSw3IEBAIHN0YXRpYyBCT09MIHdyaXRp bmdEaXJlY3Rpb25LZXlCaW5kaW5nc0VuYWJsZWQoKQogCiAgICAgTlNXaW5kb3cgKndpbmRvdyA9 IFtzZWxmIHdpbmRvd107CiAgICAgaWYgKHdpbmRvdykKLSAgICAgICAgcmVzdWx0UmVjdC5vcmln aW4gPSBbd2luZG93IGNvbnZlcnRCYXNlVG9TY3JlZW46cmVzdWx0UmVjdC5vcmlnaW5dOworICAg ICAgICByZXN1bHRSZWN0Lm9yaWdpbiA9IFt3aW5kb3cgY29udmVydFJlY3RUb1NjcmVlbjpyZXN1 bHRSZWN0XS5vcmlnaW47CiAgICAgCiAgICAgTE9HKFRleHRJbnB1dCwgImZpcnN0UmVjdEZvckNo YXJhY3RlclJhbmdlOigldSwgJXUpIC0+ICglZiwgJWYsICVmLCAlZikiLCB0aGVSYW5nZS5sb2Nh dGlvbiwgdGhlUmFuZ2UubGVuZ3RoLCByZXN1bHRSZWN0Lm9yaWdpbi54LCByZXN1bHRSZWN0Lm9y aWdpbi55LCByZXN1bHRSZWN0LnNpemUud2lkdGgsIHJlc3VsdFJlY3Quc2l6ZS5oZWlnaHQpOwog ICAgIHJldHVybiByZXN1bHRSZWN0Owo=