140655 2015-01-19 19:06:07 -0800 [WK2] Stop using WKDiagnosticLoggingResultType.h C API header in Cocoa API 2015-01-21 10:55:01 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 cdumez cdumez andersca commit-queue joepeck mitz sam oldest_to_newest 1062591 0 cdumez 2015-01-19 19:06:07 -0800 Stop using WKDiagnosticLoggingResultType.h C API header in Cocoa API. Instead, introduce a _WKDiagnosticLoggingResultType.h Cocoa header to define the WKDiagnosticLoggingResultType enum. 1062635 1 244963 cdumez 2015-01-19 21:08:46 -0800 Created attachment 244963 WIP Patch 1062640 2 244963 cdumez 2015-01-19 21:13:15 -0800 Comment on attachment 244963 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... 1062648 3 244967 bfulgham 2015-01-19 21:45:51 -0800 Created attachment 244967 Patch 1062649 4 244967 bfulgham 2015-01-19 21:47:10 -0800 Comment on attachment 244967 Patch Sorry. I typed the wrong value in the ChangeLog. This patch is not related to this bug. 1062982 5 245042 cdumez 2015-01-20 19:06:45 -0800 Created attachment 245042 Patch 1063098 6 245042 commit-queue 2015-01-21 10:54:57 -0800 Comment on attachment 245042 Patch Clearing flags on attachment: 245042 Committed r178848: <http://trac.webkit.org/changeset/178848> 1063099 7 commit-queue 2015-01-21 10:55:01 -0800 All reviewed patches have been landed. Closing bug. 244963 2015-01-19 21:08:46 -0800 2015-01-20 19:06:41 -0800 WIP Patch 140655_WKDiagnosticResultType_Cocoa_wip.patch text/plain 3084 cdumez ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLRGlhZ25v c3RpY0xvZ2dpbmdEZWxlZ2F0ZS5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2Nv YS9fV0tEaWFnbm9zdGljTG9nZ2luZ0RlbGVnYXRlLmgKaW5kZXggMTBlYzg1Ni4uYzJjNmU1ZSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tEaWFnbm9z dGljTG9nZ2luZ0RlbGVnYXRlLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9D b2NvYS9fV0tEaWFnbm9zdGljTG9nZ2luZ0RlbGVnYXRlLmgKQEAgLTI4LDEzICsyOCwyMSBAQAog I2lmIFdLX0FQSV9FTkFCTEVECiAKICNpbXBvcnQgPEZvdW5kYXRpb24vRm91bmRhdGlvbi5oPgor CisvLyBGSVhNRTogUmVtb3ZlIHRoaXMgaGVhZGVyIG9uY2UgY2xpZW50LXNpZGUgaGFzIGJlZW4g dXBkYXRlZC4KICNpbXBvcnQgPFdlYktpdC9XS0RpYWdub3N0aWNMb2dnaW5nUmVzdWx0VHlwZS5o PgogCit0eXBlZGVmIE5TX0VOVU0oTlNJbnRlZ2VyLCBfV0tEaWFnbm9zdGljTG9nZ2luZ1Jlc3Vs dFR5cGUpIHsKKyAgICBfV0tEaWFnbm9zdGljTG9nZ2luZ1Jlc3VsdFBhc3MsCisgICAgX1dLRGlh Z25vc3RpY0xvZ2dpbmdSZXN1bHRGYWlsLAorICAgIF9XS0RpYWdub3N0aWNMb2dnaW5nUmVzdWx0 Tm9vcCwKK30gV0tfRU5VTV9BVkFJTEFCTEUoV0tfTUFDX1RCQSwgV0tfSU9TX1RCQSk7CisKIEBw cm90b2NvbCBfV0tEaWFnbm9zdGljTG9nZ2luZ0RlbGVnYXRlIDxOU09iamVjdD4KIEBvcHRpb25h bAogCiAtICh2b2lkKV93ZWJWaWV3OihXS1dlYlZpZXcgKil3ZWJWaWV3IGxvZ0RpYWdub3N0aWNN ZXNzYWdlOihOU1N0cmluZyAqKW1lc3NhZ2UgZGVzY3JpcHRpb246KE5TU3RyaW5nICopZGVzY3Jp cHRpb247Ci0tICh2b2lkKV93ZWJWaWV3OihXS1dlYlZpZXcgKil3ZWJWaWV3IGxvZ0RpYWdub3N0 aWNNZXNzYWdlV2l0aFJlc3VsdDooTlNTdHJpbmcgKiltZXNzYWdlIGRlc2NyaXB0aW9uOihOU1N0 cmluZyAqKWRlc2NyaXB0aW9uIHJlc3VsdDooV0tEaWFnbm9zdGljTG9nZ2luZ1Jlc3VsdFR5cGUp cmVzdWx0OworLSAodm9pZClfd2ViVmlldzooV0tXZWJWaWV3ICopd2ViVmlldyBsb2dEaWFnbm9z dGljTWVzc2FnZVdpdGhSZXN1bHQ6KE5TU3RyaW5nICopbWVzc2FnZSBkZXNjcmlwdGlvbjooTlNT dHJpbmcgKilkZXNjcmlwdGlvbiByZXN1bHQ6KF9XS0RpYWdub3N0aWNMb2dnaW5nUmVzdWx0VHlw ZSlyZXN1bHQ7CiAtICh2b2lkKV93ZWJWaWV3OihXS1dlYlZpZXcgKil3ZWJWaWV3IGxvZ0RpYWdu b3N0aWNNZXNzYWdlV2l0aFZhbHVlOihOU1N0cmluZyAqKW1lc3NhZ2UgZGVzY3JpcHRpb246KE5T U3RyaW5nICopZGVzY3JpcHRpb24gdmFsdWU6KE5TU3RyaW5nICopIHZhbHVlOwogCiBAZW5kCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQ29jb2EvRGlhZ25vc3RpY0xvZ2dp bmdDbGllbnQubW0gYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQ29jb2EvRGlhZ25vc3RpY0xv Z2dpbmdDbGllbnQubW0KaW5kZXggZTcwZThlNi4uMjMwOGRiYSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0NvY29hL0RpYWdub3N0aWNMb2dnaW5nQ2xpZW50Lm1tCisrKyBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Db2NvYS9EaWFnbm9zdGljTG9nZ2luZ0NsaWVudC5t bQpAQCAtNTgsMTAgKzU4LDIyIEBAIHZvaWQgRGlhZ25vc3RpY0xvZ2dpbmdDbGllbnQ6OmxvZ0Rp YWdub3N0aWNNZXNzYWdlKFdlYktpdDo6V2ViUGFnZVByb3h5KiwgY29uc3QKICAgICAgICAgW21f ZGVsZWdhdGUuZ2V0KCkgX3dlYlZpZXc6bV93ZWJWaWV3IGxvZ0RpYWdub3N0aWNNZXNzYWdlOm1l c3NhZ2UgZGVzY3JpcHRpb246ZGVzY3JpcHRpb25dOwogfQogCitzdGF0aWMgX1dLRGlhZ25vc3Rp Y0xvZ2dpbmdSZXN1bHRUeXBlIHRvV0tEaWFnbm9zdGljTG9nZ2luZ1Jlc3VsdFR5cGUoV2ViQ29y ZTo6RGlhZ25vc3RpY0xvZ2dpbmdSZXN1bHRUeXBlIHJlc3VsdCkKK3sKKyAgICBzd2l0Y2ggKHJl c3VsdCkgeworICAgIGNhc2UgV2ViQ29yZTo6RGlhZ25vc3RpY0xvZ2dpbmdSZXN1bHRQYXNzOgor ICAgICAgICByZXR1cm4gX1dLRGlhZ25vc3RpY0xvZ2dpbmdSZXN1bHRQYXNzOworICAgIGNhc2Ug V2ViQ29yZTo6RGlhZ25vc3RpY0xvZ2dpbmdSZXN1bHRGYWlsOgorICAgICAgICByZXR1cm4gX1dL RGlhZ25vc3RpY0xvZ2dpbmdSZXN1bHRGYWlsOworICAgIGNhc2UgV2ViQ29yZTo6RGlhZ25vc3Rp Y0xvZ2dpbmdSZXN1bHROb29wOgorICAgICAgICByZXR1cm4gX1dLRGlhZ25vc3RpY0xvZ2dpbmdS ZXN1bHROb29wOworICAgIH0KK30KKwogdm9pZCBEaWFnbm9zdGljTG9nZ2luZ0NsaWVudDo6bG9n RGlhZ25vc3RpY01lc3NhZ2VXaXRoUmVzdWx0KFdlYktpdDo6V2ViUGFnZVByb3h5KiwgY29uc3Qg V1RGOjpTdHJpbmcmIG1lc3NhZ2UsIGNvbnN0IFdURjo6U3RyaW5nJiBkZXNjcmlwdGlvbiwgV2Vi Q29yZTo6RGlhZ25vc3RpY0xvZ2dpbmdSZXN1bHRUeXBlIHJlc3VsdCkKIHsKICAgICBpZiAobV9k ZWxlZ2F0ZU1ldGhvZHMud2Vidmlld0xvZ0RpYWdub3N0aWNNZXNzYWdlV2l0aFJlc3VsdCkKLSAg ICAgICAgW21fZGVsZWdhdGUuZ2V0KCkgX3dlYlZpZXc6bV93ZWJWaWV3IGxvZ0RpYWdub3N0aWNN ZXNzYWdlV2l0aFJlc3VsdDptZXNzYWdlIGRlc2NyaXB0aW9uOmRlc2NyaXB0aW9uIHJlc3VsdDp0 b0FQSShyZXN1bHQpXTsKKyAgICAgICAgW21fZGVsZWdhdGUuZ2V0KCkgX3dlYlZpZXc6bV93ZWJW aWV3IGxvZ0RpYWdub3N0aWNNZXNzYWdlV2l0aFJlc3VsdDptZXNzYWdlIGRlc2NyaXB0aW9uOmRl c2NyaXB0aW9uIHJlc3VsdDp0b1dLRGlhZ25vc3RpY0xvZ2dpbmdSZXN1bHRUeXBlKHJlc3VsdCld OwogfQogCiB2b2lkIERpYWdub3N0aWNMb2dnaW5nQ2xpZW50Ojpsb2dEaWFnbm9zdGljTWVzc2Fn ZVdpdGhWYWx1ZShXZWJLaXQ6OldlYlBhZ2VQcm94eSosIGNvbnN0IFdURjo6U3RyaW5nJiBtZXNz YWdlLCBjb25zdCBXVEY6OlN0cmluZyYgZGVzY3JpcHRpb24sIGNvbnN0IFdURjo6U3RyaW5nJiB2 YWx1ZSkK 244967 2015-01-19 21:45:51 -0800 2015-01-19 21:58:47 -0800 Patch bug-140655-20150119215321.patch text/plain 1590 bfulgham SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE3ODY5NikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE0IEBACisyMDE1LTAxLTE5ICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29t PgorCisgICAgICAgIFtXaW5dIExheW91dCBUZXN0IGZhc3QveG1saHR0cHJlcXVlc3QveG1saHR0 cHJlcXVlc3Qtbm8tZmlsZS1hY2Nlc3MuaHRtbCBpcyBmYWlsaW5nCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDA2NTUKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIER1bXBSZW5kZXJUcmVlL3dpbi9VSURl bGVnYXRlLmNwcDoKKyAgICAgICAgKFVJRGVsZWdhdGU6OndlYlZpZXdBZGRNZXNzYWdlVG9Db25z b2xlKTogQ29ycmVjdCBzdHJpbmcgc2VhcmNoIGFuZCBjb25jYXRlbmF0aW9uIHRvCisgICAgICAg IG1hdGNoIGV4cGVjdGVkIHRlc3Qgb3V0cHV0LgorCiAyMDE1LTAxLTE5ICBCZW5qYW1pbiBQb3Vs YWluICA8YnBvdWxhaW5AYXBwbGUuY29tPgogCiAgICAgICAgIFJlbW92ZSB0aGUgc3VwcG9ydCBm b3IgY3VzdG9tIHN1ZmZpeGVzIG9uIENoYW5nZUxvZwpJbmRleDogVG9vbHMvRHVtcFJlbmRlclRy ZWUvd2luL1VJRGVsZWdhdGUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0R1bXBSZW5kZXJUcmVl L3dpbi9VSURlbGVnYXRlLmNwcAkocmV2aXNpb24gMTc4Njc0KQorKysgVG9vbHMvRHVtcFJlbmRl clRyZWUvd2luL1VJRGVsZWdhdGUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00MTYsOSArNDE2LDEw IEBAIEhSRVNVTFQgVUlEZWxlZ2F0ZTo6d2ViVmlld0FkZE1lc3NhZ2VUb0MKICAgICB3c3RyaW5n IG5ld01lc3NhZ2U7CiAgICAgaWYgKG1lc3NhZ2UpIHsKICAgICAgICAgbmV3TWVzc2FnZSA9IG1l c3NhZ2U7Ci0gICAgICAgIHNpemVfdCBmaWxlUHJvdG9jb2wgPSBuZXdNZXNzYWdlLmZpbmQoTCJm aWxlOi8vIik7CisgICAgICAgIGNvbnN0IHN0ZDo6d3N0cmluZyBmaWxlVVJMKEwiZmlsZTovLyIp OworICAgICAgICBzaXplX3QgZmlsZVByb3RvY29sID0gbmV3TWVzc2FnZS5maW5kKGZpbGVVUkwp OwogICAgICAgICBpZiAoZmlsZVByb3RvY29sICE9IHdzdHJpbmc6Om5wb3MpCi0gICAgICAgICAg ICBuZXdNZXNzYWdlID0gbmV3TWVzc2FnZS5zdWJzdHIoMCwgZmlsZVByb3RvY29sKSArIGxhc3RQ YXRoQ29tcG9uZW50KG5ld01lc3NhZ2Uuc3Vic3RyKGZpbGVQcm90b2NvbCkpOworICAgICAgICAg ICAgbmV3TWVzc2FnZSA9IG5ld01lc3NhZ2Uuc3Vic3RyKDAsIGZpbGVQcm90b2NvbCkgKyBsYXN0 UGF0aENvbXBvbmVudChuZXdNZXNzYWdlLnN1YnN0cihmaWxlUHJvdG9jb2wgKyBmaWxlVVJMLnNp emUoKSkpOwogICAgIH0KIAogICAgIHByaW50ZigiQ09OU09MRSBNRVNTQUdFOiAiKTsK 245042 2015-01-20 19:06:45 -0800 2015-01-21 10:54:57 -0800 Patch bug-140655-20150120190652.patch text/plain 4751 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMTc4NzU0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZGJmODY2YmExZDU2ZGQ2 Mjg5MzlkZTFkYjU1MWM0ZjRiMTE3YjVhMS4uNzc0NTcwZTRkY2FiYzliN2M2ZGJiNzc2MjI5ZDE2 MDE2ZGRiYTgwZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE1LTAxLTIwICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgW1dLMl0gU3RvcCB1c2luZyBX S0RpYWdub3N0aWNMb2dnaW5nUmVzdWx0VHlwZS5oIEMgQVBJIGhlYWRlciBpbiBDb2NvYSBBUEkK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MDY1NQor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFN0b3AgdXNp bmcgV0tEaWFnbm9zdGljTG9nZ2luZ1Jlc3VsdFR5cGUuaCBDIEFQSSBoZWFkZXIgaW4gQ29jb2Eg QVBJLgorICAgICAgICBJbnN0ZWFkLCBpbnRyb2R1Y2UgYSBuZXcgX1dLRGlhZ25vc3RpY0xvZ2dp bmdSZXN1bHRUeXBlIGVudW0gaW4KKyAgICAgICAgX1dLRGlhZ25vc3RpY0xvZ2dpbmdEZWxlZ2F0 ZS5oLgorCisgICAgICAgIEEgZmV3IGRlZmluZXMgbWFwcGluZyBXS0RpYWdub3N0aWNMb2dnaW5n UmVzdWx0VHlwZSBlbnVtIGFuZCBpdHMgdmFsdWVzCisgICAgICAgIHRvIHRoZSBuZXcgX1dLRGlh Z25vc3RpY0xvZ2dpbmdSZXN1bHRUeXBlIGFyZSB0ZW1wb3JhcmlseSBhZGRlZCB1bnRpbAorICAg ICAgICB0aGUgY2xpZW50LXNpZGUgaXMgdHJhbnNpdGlvbmVkLgorCisgICAgICAgICogVUlQcm9j ZXNzL0FQSS9Db2NvYS9fV0tEaWFnbm9zdGljTG9nZ2luZ0RlbGVnYXRlLmg6CisgICAgICAgICog VUlQcm9jZXNzL0NvY29hL0RpYWdub3N0aWNMb2dnaW5nQ2xpZW50Lm1tOgorICAgICAgICAoV2Vi S2l0Ojp0b1dLRGlhZ25vc3RpY0xvZ2dpbmdSZXN1bHRUeXBlKToKKyAgICAgICAgKFdlYktpdDo6 RGlhZ25vc3RpY0xvZ2dpbmdDbGllbnQ6OmxvZ0RpYWdub3N0aWNNZXNzYWdlV2l0aFJlc3VsdCk6 CisKIDIwMTUtMDEtMjAgIERhdmlkIEtpbHplciAgPGRka2lsemVyQGFwcGxlLmNvbT4KIAogICAg ICAgICBTd2l0Y2ggdG8gY29tcGFyaW5nIFBMQVRGT1JNX05BTUUgaW4gdGVybXMgb2YgbWFjb3N4 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL19XS0RpYWdu b3N0aWNMb2dnaW5nRGVsZWdhdGUuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29j b2EvX1dLRGlhZ25vc3RpY0xvZ2dpbmdEZWxlZ2F0ZS5oCmluZGV4IDEwZWM4NTY3YzgzZTM2OTZm ZTU5YjUzOGM5ZDc4OWM5MDc5ZjZiOGUuLmFiZTY0Y2JhMzM1YTk0N2M3NjRjMWQ2MTQyZWZjYjlm MTBjYWNhYmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2Ev X1dLRGlhZ25vc3RpY0xvZ2dpbmdEZWxlZ2F0ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvQ29jb2EvX1dLRGlhZ25vc3RpY0xvZ2dpbmdEZWxlZ2F0ZS5oCkBAIC0yOCwxMyAr MjgsMjQgQEAKICNpZiBXS19BUElfRU5BQkxFRAogCiAjaW1wb3J0IDxGb3VuZGF0aW9uL0ZvdW5k YXRpb24uaD4KLSNpbXBvcnQgPFdlYktpdC9XS0RpYWdub3N0aWNMb2dnaW5nUmVzdWx0VHlwZS5o PgorCit0eXBlZGVmIE5TX0VOVU0oTlNJbnRlZ2VyLCBfV0tEaWFnbm9zdGljTG9nZ2luZ1Jlc3Vs dFR5cGUpIHsKKyAgICBfV0tEaWFnbm9zdGljTG9nZ2luZ1Jlc3VsdFBhc3MsCisgICAgX1dLRGlh Z25vc3RpY0xvZ2dpbmdSZXN1bHRGYWlsLAorICAgIF9XS0RpYWdub3N0aWNMb2dnaW5nUmVzdWx0 Tm9vcCwKK30gV0tfRU5VTV9BVkFJTEFCTEUoV0tfTUFDX1RCQSwgV0tfSU9TX1RCQSk7CisKKy8v IEZJWE1FOiBSZW1vdmUgdGhlc2Ugb25jZSB0aGUgY2xpZW50LXNpZGUgaGFzIGJlZW4gcG9ydGVk LgorI2RlZmluZSBXS0RpYWdub3N0aWNMb2dnaW5nUmVzdWx0VHlwZSBfV0tEaWFnbm9zdGljTG9n Z2luZ1Jlc3VsdFR5cGUKKyNkZWZpbmUga1dLRGlhZ25vc3RpY0xvZ2dpbmdSZXN1bHRQYXNzIF9X S0RpYWdub3N0aWNMb2dnaW5nUmVzdWx0UGFzcworI2RlZmluZSBrV0tEaWFnbm9zdGljTG9nZ2lu Z1Jlc3VsdEZhaWwgX1dLRGlhZ25vc3RpY0xvZ2dpbmdSZXN1bHRGYWlsCisjZGVmaW5lIGtXS0Rp YWdub3N0aWNMb2dnaW5nUmVzdWx0Tm9vcCBfV0tEaWFnbm9zdGljTG9nZ2luZ1Jlc3VsdE5vb3AK IAogQHByb3RvY29sIF9XS0RpYWdub3N0aWNMb2dnaW5nRGVsZWdhdGUgPE5TT2JqZWN0PgogQG9w dGlvbmFsCiAKIC0gKHZvaWQpX3dlYlZpZXc6KFdLV2ViVmlldyAqKXdlYlZpZXcgbG9nRGlhZ25v c3RpY01lc3NhZ2U6KE5TU3RyaW5nICopbWVzc2FnZSBkZXNjcmlwdGlvbjooTlNTdHJpbmcgKilk ZXNjcmlwdGlvbjsKLS0gKHZvaWQpX3dlYlZpZXc6KFdLV2ViVmlldyAqKXdlYlZpZXcgbG9nRGlh Z25vc3RpY01lc3NhZ2VXaXRoUmVzdWx0OihOU1N0cmluZyAqKW1lc3NhZ2UgZGVzY3JpcHRpb246 KE5TU3RyaW5nICopZGVzY3JpcHRpb24gcmVzdWx0OihXS0RpYWdub3N0aWNMb2dnaW5nUmVzdWx0 VHlwZSlyZXN1bHQ7CistICh2b2lkKV93ZWJWaWV3OihXS1dlYlZpZXcgKil3ZWJWaWV3IGxvZ0Rp YWdub3N0aWNNZXNzYWdlV2l0aFJlc3VsdDooTlNTdHJpbmcgKiltZXNzYWdlIGRlc2NyaXB0aW9u OihOU1N0cmluZyAqKWRlc2NyaXB0aW9uIHJlc3VsdDooX1dLRGlhZ25vc3RpY0xvZ2dpbmdSZXN1 bHRUeXBlKXJlc3VsdDsKIC0gKHZvaWQpX3dlYlZpZXc6KFdLV2ViVmlldyAqKXdlYlZpZXcgbG9n RGlhZ25vc3RpY01lc3NhZ2VXaXRoVmFsdWU6KE5TU3RyaW5nICopbWVzc2FnZSBkZXNjcmlwdGlv bjooTlNTdHJpbmcgKilkZXNjcmlwdGlvbiB2YWx1ZTooTlNTdHJpbmcgKikgdmFsdWU7CiAKIEBl bmQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Db2NvYS9EaWFnbm9zdGlj TG9nZ2luZ0NsaWVudC5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Db2NvYS9EaWFnbm9z dGljTG9nZ2luZ0NsaWVudC5tbQppbmRleCBlNzBlOGU2ZDNlYWM0Yjk5MzUyNTEwOWJiMTQ2OGM2 N2MwYzNjMzkxLi4yMzA4ZGJhNmI3OTczZWJjZmI4NDNhYTk5NWI2MzE2M2Q2NWRmODI1IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQ29jb2EvRGlhZ25vc3RpY0xvZ2dpbmdD bGllbnQubW0KKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0NvY29hL0RpYWdub3N0aWNM b2dnaW5nQ2xpZW50Lm1tCkBAIC01OCwxMCArNTgsMjIgQEAgdm9pZCBEaWFnbm9zdGljTG9nZ2lu Z0NsaWVudDo6bG9nRGlhZ25vc3RpY01lc3NhZ2UoV2ViS2l0OjpXZWJQYWdlUHJveHkqLCBjb25z dAogICAgICAgICBbbV9kZWxlZ2F0ZS5nZXQoKSBfd2ViVmlldzptX3dlYlZpZXcgbG9nRGlhZ25v c3RpY01lc3NhZ2U6bWVzc2FnZSBkZXNjcmlwdGlvbjpkZXNjcmlwdGlvbl07CiB9CiAKK3N0YXRp YyBfV0tEaWFnbm9zdGljTG9nZ2luZ1Jlc3VsdFR5cGUgdG9XS0RpYWdub3N0aWNMb2dnaW5nUmVz dWx0VHlwZShXZWJDb3JlOjpEaWFnbm9zdGljTG9nZ2luZ1Jlc3VsdFR5cGUgcmVzdWx0KQorewor ICAgIHN3aXRjaCAocmVzdWx0KSB7CisgICAgY2FzZSBXZWJDb3JlOjpEaWFnbm9zdGljTG9nZ2lu Z1Jlc3VsdFBhc3M6CisgICAgICAgIHJldHVybiBfV0tEaWFnbm9zdGljTG9nZ2luZ1Jlc3VsdFBh c3M7CisgICAgY2FzZSBXZWJDb3JlOjpEaWFnbm9zdGljTG9nZ2luZ1Jlc3VsdEZhaWw6CisgICAg ICAgIHJldHVybiBfV0tEaWFnbm9zdGljTG9nZ2luZ1Jlc3VsdEZhaWw7CisgICAgY2FzZSBXZWJD b3JlOjpEaWFnbm9zdGljTG9nZ2luZ1Jlc3VsdE5vb3A6CisgICAgICAgIHJldHVybiBfV0tEaWFn bm9zdGljTG9nZ2luZ1Jlc3VsdE5vb3A7CisgICAgfQorfQorCiB2b2lkIERpYWdub3N0aWNMb2dn aW5nQ2xpZW50Ojpsb2dEaWFnbm9zdGljTWVzc2FnZVdpdGhSZXN1bHQoV2ViS2l0OjpXZWJQYWdl UHJveHkqLCBjb25zdCBXVEY6OlN0cmluZyYgbWVzc2FnZSwgY29uc3QgV1RGOjpTdHJpbmcmIGRl c2NyaXB0aW9uLCBXZWJDb3JlOjpEaWFnbm9zdGljTG9nZ2luZ1Jlc3VsdFR5cGUgcmVzdWx0KQog ewogICAgIGlmIChtX2RlbGVnYXRlTWV0aG9kcy53ZWJ2aWV3TG9nRGlhZ25vc3RpY01lc3NhZ2VX aXRoUmVzdWx0KQotICAgICAgICBbbV9kZWxlZ2F0ZS5nZXQoKSBfd2ViVmlldzptX3dlYlZpZXcg bG9nRGlhZ25vc3RpY01lc3NhZ2VXaXRoUmVzdWx0Om1lc3NhZ2UgZGVzY3JpcHRpb246ZGVzY3Jp cHRpb24gcmVzdWx0OnRvQVBJKHJlc3VsdCldOworICAgICAgICBbbV9kZWxlZ2F0ZS5nZXQoKSBf d2ViVmlldzptX3dlYlZpZXcgbG9nRGlhZ25vc3RpY01lc3NhZ2VXaXRoUmVzdWx0Om1lc3NhZ2Ug ZGVzY3JpcHRpb246ZGVzY3JpcHRpb24gcmVzdWx0OnRvV0tEaWFnbm9zdGljTG9nZ2luZ1Jlc3Vs dFR5cGUocmVzdWx0KV07CiB9CiAKIHZvaWQgRGlhZ25vc3RpY0xvZ2dpbmdDbGllbnQ6OmxvZ0Rp YWdub3N0aWNNZXNzYWdlV2l0aFZhbHVlKFdlYktpdDo6V2ViUGFnZVByb3h5KiwgY29uc3QgV1RG OjpTdHJpbmcmIG1lc3NhZ2UsIGNvbnN0IFdURjo6U3RyaW5nJiBkZXNjcmlwdGlvbiwgY29uc3Qg V1RGOjpTdHJpbmcmIHZhbHVlKQo=