195990 2019-03-19 22:04:31 -0700 [Cocoa] Refactor some helper functions for building UserAgent strings 2019-03-26 17:47:22 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED DoNotImportToRadar P2 Normal --- 1 wenson_hsieh wenson_hsieh bdakin bfulgham commit-queue thorton webkit-bug-importer oldest_to_newest 1518758 0 wenson_hsieh 2019-03-19 22:04:31 -0700 Work towards <rdar://problem/47228232> 1518769 1 wenson_hsieh 2019-03-19 22:24:25 -0700 Work towards refactoring some codepaths for the "Request Desktop Site" feature in Safari. 1518785 2 365320 wenson_hsieh 2019-03-19 23:03:25 -0700 Created attachment 365320 Patch 1519084 3 365320 bfulgham 2019-03-20 12:32:30 -0700 Comment on attachment 365320 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=365320&action=review I think this all looks fine, bug please consider whether the two methods could be combined into one Cocoa variant. > Source/WebCore/platform/UserAgent.h:34 > +enum class UserAgentType { Default, Desktop }; Do we also need to codify the concept of a Mobile site? > Source/WebCore/platform/ios/UserAgentIOS.mm:79 > +String standardUserAgentWithApplicationName(const String& applicationName, UserAgentType type) It seems weird that we have a Mac and an iOS version of this, rather than just a Cocoa version. Maybe if it we did, we could have a UserAgentType::Mobile to give a mobile UA, and UserAgentType::Desktop to force Desktop UA, and UserAgentType::Default to do the right thing based on build type? > Source/WebCore/platform/ios/UserAgentIOS.mm:83 > + return makeString("Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14) AppleWebKit/605.1.15 (KHTML, like Gecko)", appNameSuffix); I wonder if we could make the 10_14 somehow pick up the current macOS revision for the current source target, since we have TARGET_MAC_OS_X_VERSION_MAJOR. But obviously not for this patch. 1519086 4 365320 bfulgham 2019-03-20 12:33:05 -0700 Comment on attachment 365320 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=365320&action=review > Source/WebCore/platform/ios/UserAgentIOS.mm:88 > CFPropertyListRef override = CFPreferencesCopyAppValue(CFSTR("UserAgent"), CFSTR("com.apple.WebFoundation")); Aside: I do wonder what this is for, and whether it's still needed. 1519646 5 365320 wenson_hsieh 2019-03-21 08:42:03 -0700 Comment on attachment 365320 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=365320&action=review Thanks for taking a look! >> Source/WebCore/platform/ios/UserAgentIOS.mm:79 >> +String standardUserAgentWithApplicationName(const String& applicationName, UserAgentType type) > > It seems weird that we have a Mac and an iOS version of this, rather than just a Cocoa version. Maybe if it we did, we could have a UserAgentType::Mobile to give a mobile UA, and UserAgentType::Desktop to force Desktop UA, and UserAgentType::Default to do the right thing based on build type? Constructing the iOS UA requires a bit more information about the current device model and whether it's running in a simulator, which seems quite iOS-specific, so I left it in this logic in the -IOS file. What do you think we would report as the device version for an iPhone UA on macOS? I suppose on the context of a feature like responsive design mode, we would know whether we're attempting to simulate iPad or iPhone, so we could pass these in as additional arguments (or even different values for UserAgentType)... But since there's no need for grabbing an equivalent mobile UA on macOS, I don't think we need to worry about UserAgentType::Mobile until we need it. >> Source/WebCore/platform/ios/UserAgentIOS.mm:83 >> + return makeString("Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14) AppleWebKit/605.1.15 (KHTML, like Gecko)", appNameSuffix); > > I wonder if we could make the 10_14 somehow pick up the current macOS revision for the current source target, since we have TARGET_MAC_OS_X_VERSION_MAJOR. But obviously not for this patch. I considered ways of trying to do this, but couldn't come up with any mechanism to make this work :( I'm very open to ideas! >> Source/WebCore/platform/ios/UserAgentIOS.mm:88 >> CFPropertyListRef override = CFPreferencesCopyAppValue(CFSTR("UserAgent"), CFSTR("com.apple.WebFoundation")); > > Aside: I do wonder what this is for, and whether it's still needed. ...indeed. 1521480 6 366012 wenson_hsieh 2019-03-26 15:12:45 -0700 Created attachment 366012 Patch for landing 1521522 7 366012 commit-queue 2019-03-26 16:41:47 -0700 Comment on attachment 366012 Patch for landing Clearing flags on attachment: 366012 Committed r243525: <https://trac.webkit.org/changeset/243525> 365320 2019-03-19 23:03:25 -0700 2019-03-20 12:32:30 -0700 Patch bug-195990-20190319230325.patch text/plain 3690 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjQzMTkxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjZkNmI0N2U1MGQwMzg3 YmFjZWZhOTkyNWYwYjhjZTE0MjIzZDhiNi4uZTI5YTllZjNlZmU1NzY3YzFiNTRiM2NlYWFhOTQx MTJjZjYxYWViMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE5LTAzLTE5ICBXZW5z b24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgorCisgICAgICAgIFtDb2NvYV0gUmVm YWN0b3Igc29tZSBoZWxwZXIgZnVuY3Rpb25zIGZvciBidWlsZGluZyBVc2VyQWdlbnQgc3RyaW5n cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk1OTkw CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIGFu IG9wdGlvbmFsIGFyZ3VtZW50IHRvIHN0YW5kYXJkVXNlckFnZW50V2l0aEFwcGxpY2F0aW9uTmFt ZSB0byByZXF1ZXN0IHRoZSBkZXNrdG9wIHZlcnNpb24gb2YgdGhlIHVzZXIKKyAgICAgICAgYWdl bnQgaW4gQ29jb2EgcGxhdGZvcm1zLiBXb3JrIHRvd2FyZHMgcmVmYWN0b3Jpbmcgc29tZSBjb2Rl cGF0aHMgdG8gbWFrZSB0aGUgaW1wbGVtZW50YXRpb24gb2YgdGhlICJSZXF1ZXN0CisgICAgICAg IERlc2t0b3AgU2l0ZSIgZmVhdHVyZSBpbiBTYWZhcmkgYSBiaXQgbW9yZSBzdHJhaWdodGZvcndh cmQuCisKKyAgICAgICAgTm8gY2hhbmdlIGluIGJlaGF2aW9yLgorCisgICAgICAgICogcGxhdGZv cm0vVXNlckFnZW50Lmg6CisgICAgICAgICogcGxhdGZvcm0vaW9zL1VzZXJBZ2VudElPUy5tbToK KyAgICAgICAgKFdlYkNvcmU6OnN0YW5kYXJkVXNlckFnZW50V2l0aEFwcGxpY2F0aW9uTmFtZSk6 CisgICAgICAgICogcGxhdGZvcm0vbWFjL1VzZXJBZ2VudE1hYy5tbToKKyAgICAgICAgKFdlYkNv cmU6OnN0YW5kYXJkVXNlckFnZW50V2l0aEFwcGxpY2F0aW9uTmFtZSk6CisKIDIwMTktMDMtMTgg IE1hY2llaiBTdGFjaG93aWFrICA8bWpzQGFwcGxlLmNvbT4KIAogICAgICAgICBTaW1wbGlmeSBD b2NvYSBwbGF0Zm9ybSB1c2VyIGFnZW50IGxvZ2ljIGJ5IHVzaW5nIHN0cmluZyBjb25zdGFudHMg aW5zdGVhZCBvZiBmdW5jdGlvbiBjYWxscyBmb3IgdGhlIGZyb3plbiBwYXJ0cwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vVXNlckFnZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9Vc2VyQWdlbnQuaAppbmRleCA5ZjVhZWRhN2UzYTBhMmJlYmIwNGE5Mzc0OTk5MDA0 NDMzYTY2OTZmLi4zYzZlYTI5MzA3NDdmZjQ5ZGFiN2Q0YTNhM2MyZWU0NzY5ZTI1ZDc4IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9Vc2VyQWdlbnQuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9Vc2VyQWdlbnQuaApAQCAtMzEsNyArMzEsOCBAQAogbmFtZXNwYWNl IFdlYkNvcmUgewogCiAjaWYgUExBVEZPUk0oQ09DT0EpCi1XRUJDT1JFX0VYUE9SVCBTdHJpbmcg c3RhbmRhcmRVc2VyQWdlbnRXaXRoQXBwbGljYXRpb25OYW1lKGNvbnN0IFN0cmluZyYgYXBwbGlj YXRpb25OYW1lKTsKK2VudW0gY2xhc3MgVXNlckFnZW50VHlwZSB7IERlZmF1bHQsIERlc2t0b3Ag fTsKK1dFQkNPUkVfRVhQT1JUIFN0cmluZyBzdGFuZGFyZFVzZXJBZ2VudFdpdGhBcHBsaWNhdGlv bk5hbWUoY29uc3QgU3RyaW5nJiBhcHBsaWNhdGlvbk5hbWUsIFVzZXJBZ2VudFR5cGUgPSBVc2Vy QWdlbnRUeXBlOjpEZWZhdWx0KTsKIAogU3RyaW5nIHN5c3RlbU1hcmtldGluZ1ZlcnNpb25Gb3JV c2VyQWdlbnRTdHJpbmcoKTsKICNlbHNlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9pb3MvVXNlckFnZW50SU9TLm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1Vz ZXJBZ2VudElPUy5tbQppbmRleCBiM2JmZGNlZWY0MmI1OGQ2YTg1NWIwYzg2MWQ5NTcxODBmZTAz ZGYxLi4xYTlhMWE5ZTZiZjI1YTA4ZWY2ZTA3NzhkN2NhYWU5MDg4NWI1ZjkyIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvVXNlckFnZW50SU9TLm1tCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9Vc2VyQWdlbnRJT1MubW0KQEAgLTc2LDggKzc2LDEzIEBA IHN0YXRpYyBpbmxpbmUgU3RyaW5nIGRldmljZU5hbWVGb3JVc2VyQWdlbnQoKQogICAgIHJldHVy biBuYW1lOwogfQogCi1TdHJpbmcgc3RhbmRhcmRVc2VyQWdlbnRXaXRoQXBwbGljYXRpb25OYW1l KGNvbnN0IFN0cmluZyYgYXBwbGljYXRpb25OYW1lKQorU3RyaW5nIHN0YW5kYXJkVXNlckFnZW50 V2l0aEFwcGxpY2F0aW9uTmFtZShjb25zdCBTdHJpbmcmIGFwcGxpY2F0aW9uTmFtZSwgVXNlckFn ZW50VHlwZSB0eXBlKQogeworICAgIGlmICh0eXBlID09IFVzZXJBZ2VudFR5cGU6OkRlc2t0b3Ap IHsKKyAgICAgICAgU3RyaW5nIGFwcE5hbWVTdWZmaXggPSBhcHBsaWNhdGlvbk5hbWUuaXNFbXB0 eSgpID8gIiIgOiBtYWtlU3RyaW5nKCIgIiwgYXBwbGljYXRpb25OYW1lKTsKKyAgICAgICAgcmV0 dXJuIG1ha2VTdHJpbmcoIk1vemlsbGEvNS4wIChNYWNpbnRvc2g7IEludGVsIE1hYyBPUyBYIDEw XzE0KSBBcHBsZVdlYktpdC82MDUuMS4xNSAoS0hUTUwsIGxpa2UgR2Vja28pIiwgYXBwTmFtZVN1 ZmZpeCk7CisgICAgfQorCiAgICAgLy8gRklYTUU6IElzIHRoaXMgbmVlZGVkIGFueSBtb3JlPyBN YWMgZG9lc24ndCBoYXZlIHRoaXMgY2hlY2ssCiAgICAgLy8gQ2hlY2sgdG8gc2VlIGlmIHRoZXJl IGlzIGEgdXNlciBhZ2VudCBvdmVycmlkZSBmb3IgYWxsIFdlYktpdCBjbGllbnRzLgogICAgIENG UHJvcGVydHlMaXN0UmVmIG92ZXJyaWRlID0gQ0ZQcmVmZXJlbmNlc0NvcHlBcHBWYWx1ZShDRlNU UigiVXNlckFnZW50IiksIENGU1RSKCJjb20uYXBwbGUuV2ViRm91bmRhdGlvbiIpKTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9Vc2VyQWdlbnRNYWMubW0gYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvVXNlckFnZW50TWFjLm1tCmluZGV4IDgwMjA4ODVkNjVl NGE5ZjZiNDFmNTBjM2I5MmU5ZDA0OTcxOTFhNTYuLjMyMGNhZGFkNjUzNTM0M2MxMTdhYjczYTY4 YjllMGU1OTE5N2JlYzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9V c2VyQWdlbnRNYWMubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1VzZXJBZ2Vu dE1hYy5tbQpAQCAtMzIsNyArMzIsNyBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKLVN0cmlu ZyBzdGFuZGFyZFVzZXJBZ2VudFdpdGhBcHBsaWNhdGlvbk5hbWUoY29uc3QgU3RyaW5nJiBhcHBs aWNhdGlvbk5hbWUpCitTdHJpbmcgc3RhbmRhcmRVc2VyQWdlbnRXaXRoQXBwbGljYXRpb25OYW1l KGNvbnN0IFN0cmluZyYgYXBwbGljYXRpb25OYW1lLCBVc2VyQWdlbnRUeXBlKQogewogICAgIFN0 cmluZyBvc1ZlcnNpb24gPSBzeXN0ZW1NYXJrZXRpbmdWZXJzaW9uRm9yVXNlckFnZW50U3RyaW5n KCk7CiAgICAgU3RyaW5nIGFwcE5hbWVTdWZmaXggPSBhcHBsaWNhdGlvbk5hbWUuaXNFbXB0eSgp ID8gIiIgOiBtYWtlU3RyaW5nKCIgIiwgYXBwbGljYXRpb25OYW1lKTsK 366012 2019-03-26 15:12:45 -0700 2019-03-26 16:41:47 -0700 Patch for landing bug-195990-20190326151244.patch text/plain 3859 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjQzNDg0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmFkMTY5NGM3MWE3ZDJl ODA1NTc0ZDVlZDhkNmNjNzJmMjEyMmU3OC4uN2M0ZTQxZGZmMDE3NDhkNzllNDIwZjMxNmZkNWVi ZTliYWJlM2M2NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDE5LTAzLTE5ICBXZW5z b24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgorCisgICAgICAgIFtDb2NvYV0gUmVm YWN0b3Igc29tZSBoZWxwZXIgZnVuY3Rpb25zIGZvciBidWlsZGluZyBVc2VyQWdlbnQgc3RyaW5n cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk1OTkw CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQnJlbnQgRnVsZ2hhbS4KKworICAgICAgICBBZGQgYW4g b3B0aW9uYWwgYXJndW1lbnQgdG8gc3RhbmRhcmRVc2VyQWdlbnRXaXRoQXBwbGljYXRpb25OYW1l IHRvIHJlcXVlc3QgdGhlIGRlc2t0b3AgdmVyc2lvbiBvZiB0aGUgdXNlcgorICAgICAgICBhZ2Vu dCBpbiBDb2NvYSBwbGF0Zm9ybXMuIFdvcmsgdG93YXJkcyByZWZhY3RvcmluZyBzb21lIGNvZGVw YXRocyB0byBtYWtlIHRoZSBpbXBsZW1lbnRhdGlvbiBvZiB0aGUgIlJlcXVlc3QKKyAgICAgICAg RGVza3RvcCBTaXRlIiBmZWF0dXJlIGluIFNhZmFyaSBhIGJpdCBtb3JlIHN0cmFpZ2h0Zm9yd2Fy ZC4KKworICAgICAgICBObyBjaGFuZ2UgaW4gYmVoYXZpb3IuCisKKyAgICAgICAgKiBwbGF0Zm9y bS9Vc2VyQWdlbnQuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9pb3MvVXNlckFnZW50SU9TLm1tOgor ICAgICAgICAoV2ViQ29yZTo6c3RhbmRhcmRVc2VyQWdlbnRXaXRoQXBwbGljYXRpb25OYW1lKToK KworICAgICAgICBUaGUgY29ycmVzcG9uZGluZyBtYWNPUyB2ZXJzaW9uIGlzIGN1cnJlbnRseSBo YXJkLWNvZGVkIOKAlCB0aGUgZm9sbG93dXAgYnVnIHdlYmtpdC5vcmcvYi8xOTYyNzUgdHJhY2tz IG1ha2luZworICAgICAgICB0aGlzIGR5bmFtaWNhbGx5IGZldGNoIHRoZSBwYWlyZWQgbWFjT1Mg dmVyc2lvbiB3aGVuIGJ1aWxkaW5nIGZvciBpT1MuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMv VXNlckFnZW50TWFjLm1tOgorICAgICAgICAoV2ViQ29yZTo6c3RhbmRhcmRVc2VyQWdlbnRXaXRo QXBwbGljYXRpb25OYW1lKToKKwogMjAxOS0wMy0yMCAgUnlvc3VrZSBOaXdhICA8cm5pd2FAd2Vi a2l0Lm9yZz4KIAogICAgICAgICBMZWFrIG9mIFNWR0ZvbnRGYWNlRWxlbWVudCB3aGVuIFJlbmRl clN0eWxlIGhvbGRzIG9udG8gYSBGb250UmFuY2VzIHdoaWNoIHVzZXMgaXQKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1VzZXJBZ2VudC5oIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vVXNlckFnZW50LmgKaW5kZXggOWY1YWVkYTdlM2EwYTJiZWJiMDRhOTM3NDk5OTAwNDQz M2E2Njk2Zi4uM2M2ZWEyOTMwNzQ3ZmY0OWRhYjdkNGEzYTNjMmVlNDc2OWUyNWQ3OCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vVXNlckFnZW50LmgKKysrIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vVXNlckFnZW50LmgKQEAgLTMxLDcgKzMxLDggQEAKIG5hbWVzcGFjZSBX ZWJDb3JlIHsKIAogI2lmIFBMQVRGT1JNKENPQ09BKQotV0VCQ09SRV9FWFBPUlQgU3RyaW5nIHN0 YW5kYXJkVXNlckFnZW50V2l0aEFwcGxpY2F0aW9uTmFtZShjb25zdCBTdHJpbmcmIGFwcGxpY2F0 aW9uTmFtZSk7CitlbnVtIGNsYXNzIFVzZXJBZ2VudFR5cGUgeyBEZWZhdWx0LCBEZXNrdG9wIH07 CitXRUJDT1JFX0VYUE9SVCBTdHJpbmcgc3RhbmRhcmRVc2VyQWdlbnRXaXRoQXBwbGljYXRpb25O YW1lKGNvbnN0IFN0cmluZyYgYXBwbGljYXRpb25OYW1lLCBVc2VyQWdlbnRUeXBlID0gVXNlckFn ZW50VHlwZTo6RGVmYXVsdCk7CiAKIFN0cmluZyBzeXN0ZW1NYXJrZXRpbmdWZXJzaW9uRm9yVXNl ckFnZW50U3RyaW5nKCk7CiAjZWxzZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vaW9zL1VzZXJBZ2VudElPUy5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9Vc2Vy QWdlbnRJT1MubW0KaW5kZXggYjNiZmRjZWVmNDJiNThkNmE4NTViMGM4NjFkOTU3MTgwZmUwM2Rm MS4uMWE5YTFhOWU2YmYyNWEwOGVmNmUwNzc4ZDdjYWFlOTA4ODViNWY5MiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1VzZXJBZ2VudElPUy5tbQorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9pb3MvVXNlckFnZW50SU9TLm1tCkBAIC03Niw4ICs3NiwxMyBAQCBz dGF0aWMgaW5saW5lIFN0cmluZyBkZXZpY2VOYW1lRm9yVXNlckFnZW50KCkKICAgICByZXR1cm4g bmFtZTsKIH0KIAotU3RyaW5nIHN0YW5kYXJkVXNlckFnZW50V2l0aEFwcGxpY2F0aW9uTmFtZShj b25zdCBTdHJpbmcmIGFwcGxpY2F0aW9uTmFtZSkKK1N0cmluZyBzdGFuZGFyZFVzZXJBZ2VudFdp dGhBcHBsaWNhdGlvbk5hbWUoY29uc3QgU3RyaW5nJiBhcHBsaWNhdGlvbk5hbWUsIFVzZXJBZ2Vu dFR5cGUgdHlwZSkKIHsKKyAgICBpZiAodHlwZSA9PSBVc2VyQWdlbnRUeXBlOjpEZXNrdG9wKSB7 CisgICAgICAgIFN0cmluZyBhcHBOYW1lU3VmZml4ID0gYXBwbGljYXRpb25OYW1lLmlzRW1wdHko KSA/ICIiIDogbWFrZVN0cmluZygiICIsIGFwcGxpY2F0aW9uTmFtZSk7CisgICAgICAgIHJldHVy biBtYWtlU3RyaW5nKCJNb3ppbGxhLzUuMCAoTWFjaW50b3NoOyBJbnRlbCBNYWMgT1MgWCAxMF8x NCkgQXBwbGVXZWJLaXQvNjA1LjEuMTUgKEtIVE1MLCBsaWtlIEdlY2tvKSIsIGFwcE5hbWVTdWZm aXgpOworICAgIH0KKwogICAgIC8vIEZJWE1FOiBJcyB0aGlzIG5lZWRlZCBhbnkgbW9yZT8gTWFj IGRvZXNuJ3QgaGF2ZSB0aGlzIGNoZWNrLAogICAgIC8vIENoZWNrIHRvIHNlZSBpZiB0aGVyZSBp cyBhIHVzZXIgYWdlbnQgb3ZlcnJpZGUgZm9yIGFsbCBXZWJLaXQgY2xpZW50cy4KICAgICBDRlBy b3BlcnR5TGlzdFJlZiBvdmVycmlkZSA9IENGUHJlZmVyZW5jZXNDb3B5QXBwVmFsdWUoQ0ZTVFIo IlVzZXJBZ2VudCIpLCBDRlNUUigiY29tLmFwcGxlLldlYkZvdW5kYXRpb24iKSk7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvVXNlckFnZW50TWFjLm1tIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vbWFjL1VzZXJBZ2VudE1hYy5tbQppbmRleCA4MDIwODg1ZDY1ZTRh OWY2YjQxZjUwYzNiOTJlOWQwNDk3MTkxYTU2Li4zMjBjYWRhZDY1MzUzNDNjMTE3YWI3M2E2OGI5 ZTBlNTkxOTdiZWMwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvVXNl ckFnZW50TWFjLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9Vc2VyQWdlbnRN YWMubW0KQEAgLTMyLDcgKzMyLDcgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi1TdHJpbmcg c3RhbmRhcmRVc2VyQWdlbnRXaXRoQXBwbGljYXRpb25OYW1lKGNvbnN0IFN0cmluZyYgYXBwbGlj YXRpb25OYW1lKQorU3RyaW5nIHN0YW5kYXJkVXNlckFnZW50V2l0aEFwcGxpY2F0aW9uTmFtZShj b25zdCBTdHJpbmcmIGFwcGxpY2F0aW9uTmFtZSwgVXNlckFnZW50VHlwZSkKIHsKICAgICBTdHJp bmcgb3NWZXJzaW9uID0gc3lzdGVtTWFya2V0aW5nVmVyc2lvbkZvclVzZXJBZ2VudFN0cmluZygp OwogICAgIFN0cmluZyBhcHBOYW1lU3VmZml4ID0gYXBwbGljYXRpb25OYW1lLmlzRW1wdHkoKSA/ ICIiIDogbWFrZVN0cmluZygiICIsIGFwcGxpY2F0aW9uTmFtZSk7Cg==