145690 2015-06-05 02:44:37 -0700 [iOS] Replace deprecated -[UIDocumentMenuViewController _setIgnoreApplicationEntitlementForImport:] 2016-01-16 11:07:18 -0800 1 1 1 Unclassified WebKit Forms 528+ (Nightly build) Unspecified iOS 8.2 RESOLVED FIXED InRadar, PlatformOnly P2 Normal --- 1 jhoneycutt jhoneycutt aestes andersca commit-queue dbates ddkilzer lforschler mitz sam oldest_to_newest 1099781 0 jhoneycutt 2015-06-05 02:44:37 -0700 -[UIDocumentMenuViewController _setIgnoreApplicationEntitlementForImport:] is deprecated. 1099782 1 jhoneycutt 2015-06-05 02:46:51 -0700 <rdar://problem/20636577> 1099783 2 254349 jhoneycutt 2015-06-05 02:52:43 -0700 Created attachment 254349 Patch 1099799 3 254349 ddkilzer 2015-06-05 06:33:55 -0700 Comment on attachment 254349 Patch Unless the new method is supported in iOS 8.x, we need to add a #if version check here. 1099859 4 254349 ddkilzer 2015-06-05 10:57:13 -0700 Comment on attachment 254349 Patch As I noted in the previous comment, to support building on iOS 8.x, we need to add version checks: #if __IPHONE_OS_VERSION_MIN_REQUIRED < 90000 // iOS 8 code #else // Mysterious future code #endif 1099909 5 ddkilzer 2015-06-05 12:43:48 -0700 The content of attachment 254349 has been deleted by David Kilzer (:ddkilzer) <ddkilzer@webkit.org> without providing any reason. The token used to delete this attachment was generated at 2015-06-05 12:43:37 PDT. 1099976 6 254390 jhoneycutt 2015-06-05 14:49:41 -0700 Created attachment 254390 Patch 1155227 7 254390 bfulgham 2016-01-13 14:08:55 -0800 Comment on attachment 254390 Patch This looks correct. I'll attempt to merge and land if it builds and runs. 1155474 8 268977 bfulgham 2016-01-14 09:39:56 -0800 Created attachment 268977 Rebaselined Patch 1156143 9 268977 mitz 2016-01-16 00:54:33 -0800 Comment on attachment 268977 Rebaselined Patch View in context: https://bugs.webkit.org/attachment.cgi?id=268977&action=review > Source/WebKit2/Platform/spi/ios/UIKitSPI.h:88 > #import <UIKit/UIDocumentMenuViewController_Private.h> > #else > @interface UIDocumentMenuViewController () > -@property (nonatomic, assign, setter = _setIgnoreApplicationEntitlementForImport:, getter = _ignoreApplicationEntitlementForImport) BOOL _ignoreApplicationEntitlementForImport; > +- (instancetype)_initIgnoringApplicationEntitlementForImportOfTypes:(NSArray *)types; > @end > #endif I suggest that you address the FIXME on line 81 instead of doing this here. > Source/WebKit2/UIProcess/ios/forms/WKFileUploadPanel.mm:378 > // FIXME: Remove this check and the fallback code when a new SDK is available. <rdar://problem/20150072> > - if ([UIDocumentMenuViewController instancesRespondToSelector:@selector(_setIgnoreApplicationEntitlementForImport:)]) { > + if ([UIDocumentMenuViewController instancesRespondToSelector:@selector(_initIgnoringApplicationEntitlementForImportOfTypes:)]) { You should address the FIXME instead of changing this. > Source/WebKit2/UIProcess/ios/forms/WKFileUploadPanel.mm:518 > + _documentMenuController = adoptNS([[UIDocumentMenuViewController alloc] _initIgnoringApplicationEntitlementForImportOfTypes:[self _documentPickerMenuMediaTypes]]); You can write self._documentPickerMenuMediaTypes instead of using brackets. 1156189 10 268977 commit-queue 2016-01-16 11:03:21 -0800 Comment on attachment 268977 Rebaselined Patch Clearing flags on attachment: 268977 Committed r195171: <http://trac.webkit.org/changeset/195171> 1156190 11 commit-queue 2016-01-16 11:03:25 -0800 All reviewed patches have been landed. Closing bug. 1156192 12 mitz 2016-01-16 11:07:18 -0800 Kind of disappointing that none of my comments were addressed. 254349 2015-06-05 02:52:43 -0700 2015-06-05 10:57:13 -0700 Patch 0001-iOS-Replace-deprecated-UIDocumentMenuViewController.patch text/plain 0 jhoneycutt 254390 2015-06-05 14:49:41 -0700 2016-01-14 09:39:54 -0800 Patch 0001-iOS-Replace-deprecated-UIDocumentMenuViewController.patch text/plain 4915 jhoneycutt RnJvbSBhNDdiNWMzYWRkYmUzMTk1NTE0M2JiZTQ4MTI0Y2I4Y2E2NGU4NDI0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKb24gSG9uZXljdXR0IDxqaG9uZXljdXR0QGFwcGxlLmNvbT4K RGF0ZTogRnJpLCA1IEp1biAyMDE1IDAyOjQ5OjE1IC0wNzAwClN1YmplY3Q6IFtQQVRDSF0gW2lP U10gUmVwbGFjZSBkZXByZWNhdGVkIC1bVUlEb2N1bWVudE1lbnVWaWV3Q29udHJvbGxlcgogX3Nl dElnbm9yZUFwcGxpY2F0aW9uRW50aXRsZW1lbnRGb3JJbXBvcnQ6XQoKPGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDU2OTA+CjxyZGFyOi8vcHJvYmxlbS8yMDYzNjU3 Nz4KClJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKKiBQbGF0Zm9ybS9zcGkvaW9zL1VJS2l0 U1BJLmg6ClJlcGxhY2UgZGVwcmVjYXRlZCBTUEkgd2l0aCBuZXdlciBTUEkuCgoqIFVJUHJvY2Vz cy9pb3MvZm9ybXMvV0tGaWxlVXBsb2FkUGFuZWwubW06CigtW1dLRmlsZVVwbG9hZFBhbmVsIHBy ZXNlbnRXaXRoUGFyYW1ldGVyczpyZXN1bHRMaXN0ZW5lcjpdKToKKC1bV0tGaWxlVXBsb2FkUGFu ZWwgX3Nob3dEb2N1bWVudFBpY2tlck1lbnVdKToKRGl0dG8uCi0tLQogU291cmNlL1dlYktpdDIv Q2hhbmdlTG9nICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgMTggKysrKysrKysrKysr KysrKysrCiBTb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9zcGkvaW9zL1VJS2l0U1BJLmggICAgICAg ICAgICAgfCAgNCArKy0tCiAuLi4vV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL2Zvcm1zL1dLRmlsZVVw bG9hZFBhbmVsLm1tICAgfCAxMSArKy0tLS0tLS0tLQogMyBmaWxlcyBjaGFuZ2VkLCAyMiBpbnNl cnRpb25zKCspLCAxMSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNzVlZjRlNy4uMDIwMmRh YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJL aXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE1LTA2LTA1ICBKb24gSG9uZXljdXR0 ICA8amhvbmV5Y3V0dEBhcHBsZS5jb20+CisKKyAgICAgICAgW2lPU10gUmVwbGFjZSBkZXByZWNh dGVkIC1bVUlEb2N1bWVudE1lbnVWaWV3Q29udHJvbGxlcgorICAgICAgICBfc2V0SWdub3JlQXBw bGljYXRpb25FbnRpdGxlbWVudEZvckltcG9ydDpdCisKKyAgICAgICAgPGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDU2OTA+CisgICAgICAgIDxyZGFyOi8vcHJvYmxl bS8yMDYzNjU3Nz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIFBsYXRmb3JtL3NwaS9pb3MvVUlLaXRTUEkuaDoKKyAgICAgICAgUmVwbGFjZSBkZXBy ZWNhdGVkIFNQSSB3aXRoIG5ld2VyIFNQSS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvZm9y bXMvV0tGaWxlVXBsb2FkUGFuZWwubW06CisgICAgICAgICgtW1dLRmlsZVVwbG9hZFBhbmVsIHBy ZXNlbnRXaXRoUGFyYW1ldGVyczpyZXN1bHRMaXN0ZW5lcjpdKToKKyAgICAgICAgKC1bV0tGaWxl VXBsb2FkUGFuZWwgX3Nob3dEb2N1bWVudFBpY2tlck1lbnVdKToKKyAgICAgICAgRGl0dG8uCisK IDIwMTUtMDYtMDIgIEpvbiBIb25leWN1dHQgIDxqaG9uZXljdXR0QGFwcGxlLmNvbT4KIAogICAg ICAgICBbaU9TXSBVSSBwcm9jZXNzIG1lbW9yeSBzcGlrZSwgaGFuZyB3aGVuIHVwbG9hZGluZyBh IHZlcnkgbGFyZ2UgSlBFRwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvUGxhdGZvcm0vc3Bp L2lvcy9VSUtpdFNQSS5oIGIvU291cmNlL1dlYktpdDIvUGxhdGZvcm0vc3BpL2lvcy9VSUtpdFNQ SS5oCmluZGV4IGEyMWIwNGEuLmRiMzUxYjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1Bs YXRmb3JtL3NwaS9pb3MvVUlLaXRTUEkuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9z cGkvaW9zL1VJS2l0U1BJLmgKQEAgLTc3LDcgKzc3LDcgQEAKICNpbXBvcnQgPFVJS2l0L1VJRG9j dW1lbnRNZW51Vmlld0NvbnRyb2xsZXJfUHJpdmF0ZS5oPgogI2Vsc2UKIEBpbnRlcmZhY2UgVUlE b2N1bWVudE1lbnVWaWV3Q29udHJvbGxlciAoRGV0YWlscykKLUBwcm9wZXJ0eSAobm9uYXRvbWlj LCBhc3NpZ24sIHNldHRlciA9IF9zZXRJZ25vcmVBcHBsaWNhdGlvbkVudGl0bGVtZW50Rm9ySW1w b3J0OiwgZ2V0dGVyID0gX2lnbm9yZUFwcGxpY2F0aW9uRW50aXRsZW1lbnRGb3JJbXBvcnQpIEJP T0wgX2lnbm9yZUFwcGxpY2F0aW9uRW50aXRsZW1lbnRGb3JJbXBvcnQ7CistIChpbnN0YW5jZXR5 cGUpX2luaXRJZ25vcmluZ0FwcGxpY2F0aW9uRW50aXRsZW1lbnRGb3JJbXBvcnRPZlR5cGVzOihO U0FycmF5ICopdHlwZXM7CiBAZW5kCiAjZW5kaWYKIApAQCAtNjc1LDcgKzY3NSw3IEBAIHR5cGVk ZWYgZW51bSB7CiBAZW5kCiAKIEBpbnRlcmZhY2UgVUlEb2N1bWVudE1lbnVWaWV3Q29udHJvbGxl ciAoRGV0YWlscykKLUBwcm9wZXJ0eSAobm9uYXRvbWljLCBhc3NpZ24sIHNldHRlciA9IF9zZXRJ Z25vcmVBcHBsaWNhdGlvbkVudGl0bGVtZW50Rm9ySW1wb3J0OiwgZ2V0dGVyID0gX2lnbm9yZUFw cGxpY2F0aW9uRW50aXRsZW1lbnRGb3JJbXBvcnQpIEJPT0wgX2lnbm9yZUFwcGxpY2F0aW9uRW50 aXRsZW1lbnRGb3JJbXBvcnQ7CistIChpbnN0YW5jZXR5cGUpX2luaXRJZ25vcmluZ0FwcGxpY2F0 aW9uRW50aXRsZW1lbnRGb3JJbXBvcnRPZlR5cGVzOihOU0FycmF5ICopdHlwZXM7CiBAZW5kCiAK IEBwcm90b2NvbCBVSURvY3VtZW50UGFzc3dvcmRWaWV3RGVsZWdhdGU7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL2Zvcm1zL1dLRmlsZVVwbG9hZFBhbmVsLm1tIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9mb3Jtcy9XS0ZpbGVVcGxvYWRQYW5lbC5tbQpp bmRleCAzNzcxZGExLi4zZGE1MGU4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvaW9zL2Zvcm1zL1dLRmlsZVVwbG9hZFBhbmVsLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9pb3MvZm9ybXMvV0tGaWxlVXBsb2FkUGFuZWwubW0KQEAgLTM3Niw3ICszNzYsNyBA QCAtICh2b2lkKXByZXNlbnRXaXRoUGFyYW1ldGVyczooV2ViS2l0OjpXZWJPcGVuUGFuZWxQYXJh bWV0ZXJzKilwYXJhbWV0ZXJzIHJlc3VsdAogICAgIF9taW1lVHlwZXMgPSBhZG9wdE5TKFttaW1l VHlwZXMgY29weV0pOwogCiAgICAgLy8gRklYTUU6IFJlbW92ZSB0aGlzIGNoZWNrIGFuZCB0aGUg ZmFsbGJhY2sgY29kZSB3aGVuIGEgbmV3IFNESyBpcyBhdmFpbGFibGUuIDxyZGFyOi8vcHJvYmxl bS8yMDE1MDA3Mj4KLSAgICBpZiAoW1VJRG9jdW1lbnRNZW51Vmlld0NvbnRyb2xsZXIgaW5zdGFu Y2VzUmVzcG9uZFRvU2VsZWN0b3I6QHNlbGVjdG9yKF9zZXRJZ25vcmVBcHBsaWNhdGlvbkVudGl0 bGVtZW50Rm9ySW1wb3J0OildKSB7CisgICAgaWYgKFtVSURvY3VtZW50TWVudVZpZXdDb250cm9s bGVyIGluc3RhbmNlc1Jlc3BvbmRUb1NlbGVjdG9yOkBzZWxlY3RvcihfaW5pdElnbm9yaW5nQXBw bGljYXRpb25FbnRpdGxlbWVudEZvckltcG9ydE9mVHlwZXM6KV0pIHsKICAgICAgICAgW3NlbGYg X3Nob3dEb2N1bWVudFBpY2tlck1lbnVdOwogICAgICAgICByZXR1cm47CiAgICAgfQpAQCAtNTE2 LDE0ICs1MTYsNyBAQCAtICh2b2lkKV9zaG93TWVkaWFTb3VyY2VTZWxlY3Rpb25TaGVldAogLSAo dm9pZClfc2hvd0RvY3VtZW50UGlja2VyTWVudQogewogICAgIC8vIEZJWE1FOiBTdXBwb3J0IG11 bHRpcGxlIGZpbGUgc2VsZWN0aW9uIHdoZW4gaW1wbGVtZW50ZWQuIDxyZGFyOi8vMTcxNzc5ODE+ Ci0gICAgLy8gRklYTUU6IFdlIGNhbGwgLV9zZXRJZ25vcmVBcHBsaWNhdGlvbkVudGl0bGVtZW50 Rm9ySW1wb3J0OiBiZWZvcmUgaW5pdGlhbGl6YXRpb24sIGJlY2F1c2UgdGhlIGFzc2VydGlvbiB3 ZSdyZSB0cnlpbmcKLSAgICAvLyB0byBzdXBwcmVzcyBpcyBpbiB0aGUgaW5pdGlhbGl6ZXIuIDxy ZGFyOi8vcHJvYmxlbS8yMDEzNzY5Mj4gdHJhY2tzIGRvaW5nIHRoaXMgd2l0aCBhIHByaXZhdGUg aW5pdGlhbGl6ZXIuCi0gICAgX2RvY3VtZW50TWVudUNvbnRyb2xsZXIgPSBhZG9wdE5TKFtVSURv Y3VtZW50TWVudVZpZXdDb250cm9sbGVyIGFsbG9jXSk7Ci0jcHJhZ21hIGNsYW5nIGRpYWdub3N0 aWMgcHVzaAotI3ByYWdtYSBjbGFuZyBkaWFnbm9zdGljIGlnbm9yZWQgIi1XZGVwcmVjYXRlZC1k ZWNsYXJhdGlvbnMiCi0gICAgW19kb2N1bWVudE1lbnVDb250cm9sbGVyIF9zZXRJZ25vcmVBcHBs aWNhdGlvbkVudGl0bGVtZW50Rm9ySW1wb3J0OllFU107Ci0jcHJhZ21hIGNsYW5nIGRpYWdub3N0 aWMgcG9wCi0gICAgW19kb2N1bWVudE1lbnVDb250cm9sbGVyIGluaXRXaXRoRG9jdW1lbnRUeXBl czpbc2VsZiBfZG9jdW1lbnRQaWNrZXJNZW51TWVkaWFUeXBlc10gaW5Nb2RlOlVJRG9jdW1lbnRQ aWNrZXJNb2RlSW1wb3J0XTsKKyAgICBfZG9jdW1lbnRNZW51Q29udHJvbGxlciA9IGFkb3B0TlMo W1tVSURvY3VtZW50TWVudVZpZXdDb250cm9sbGVyIGFsbG9jXSBfaW5pdElnbm9yaW5nQXBwbGlj YXRpb25FbnRpdGxlbWVudEZvckltcG9ydE9mVHlwZXM6W3NlbGYgX2RvY3VtZW50UGlja2VyTWVu dU1lZGlhVHlwZXNdXSk7CiAgICAgW19kb2N1bWVudE1lbnVDb250cm9sbGVyIHNldERlbGVnYXRl OnNlbGZdOwogCiAgICAgW19kb2N1bWVudE1lbnVDb250cm9sbGVyIGFkZE9wdGlvbldpdGhUaXRs ZTpbc2VsZiBfcGhvdG9MaWJyYXJ5QnV0dG9uTGFiZWxdIGltYWdlOnBob3RvTGlicmFyeUljb24o KSBvcmRlcjpVSURvY3VtZW50TWVudU9yZGVyRmlyc3QgaGFuZGxlcjpeewotLSAKMi4zLjcgKEFw cGxlIEdpdC01NykKCg== 268977 2016-01-14 09:39:56 -0800 2016-01-16 11:03:21 -0800 Rebaselined Patch bug-145690-20160114093926.patch text/plain 4580 bfulgham SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE5NTA1OCkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDE2LTAxLTE0ICBKb24gSG9u ZXljdXR0ICA8amhvbmV5Y3V0dEBhcHBsZS5jb20+CisKKyAgICAgICAgW2lPU10gUmVwbGFjZSBk ZXByZWNhdGVkIC1bVUlEb2N1bWVudE1lbnVWaWV3Q29udHJvbGxlcgorICAgICAgICBfc2V0SWdu b3JlQXBwbGljYXRpb25FbnRpdGxlbWVudEZvckltcG9ydDpdCisKKyAgICAgICAgPGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDU2OTA+CisgICAgICAgIDxyZGFyOi8v cHJvYmxlbS8yMDYzNjU3Nz4KKworICAgICAgICBSZXZpZXdlZCBieSBCcmVudCBGdWxnaGFtLgor CisgICAgICAgICogUGxhdGZvcm0vc3BpL2lvcy9VSUtpdFNQSS5oOgorICAgICAgICBSZXBsYWNl IGRlcHJlY2F0ZWQgU1BJIHdpdGggbmV3ZXIgU1BJLgorCisgICAgICAgICogVUlQcm9jZXNzL2lv cy9mb3Jtcy9XS0ZpbGVVcGxvYWRQYW5lbC5tbToKKyAgICAgICAgKC1bV0tGaWxlVXBsb2FkUGFu ZWwgcHJlc2VudFdpdGhQYXJhbWV0ZXJzOnJlc3VsdExpc3RlbmVyOl0pOgorICAgICAgICAoLVtX S0ZpbGVVcGxvYWRQYW5lbCBfc2hvd0RvY3VtZW50UGlja2VyTWVudV0pOgorICAgICAgICBEaXR0 by4KKwogMjAxNi0wMS0xNCAgR3l1eW91bmcgS2ltICA8Z3l1eW91bmcua2ltQHdlYmtpdC5vcmc+ CiAKICAgICAgICAgW0VGTF1bR1RLXVtTZWNjb21wRmlsdGVyXSBGaXggYnVpbGQgYnJlYWsgd2hl biBlbmFibGluZyAtLXNlY2NvbXAtZmlsdGVycwpJbmRleDogU291cmNlL1dlYktpdDIvUGxhdGZv cm0vc3BpL2lvcy9VSUtpdFNQSS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1BsYXRm b3JtL3NwaS9pb3MvVUlLaXRTUEkuaAkocmV2aXNpb24gMTk1MDU4KQorKysgU291cmNlL1dlYktp dDIvUGxhdGZvcm0vc3BpL2lvcy9VSUtpdFNQSS5oCSh3b3JraW5nIGNvcHkpCkBAIC0xLDUgKzEs NSBAQAogLyoKLSAqIENvcHlyaWdodCAoQykgMjAxNCwgMjAxNSBBcHBsZSBJbmMuIEFsbCByaWdo dHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmlnaHQgKEMpIDIwMTQtMjAxNiBBcHBsZSBJbmMuIEFsbCBy aWdodHMgcmVzZXJ2ZWQuCiAgKgogICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2Ug YW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CiAgKiBtb2RpZmljYXRpb24sIGFyZSBw ZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTgzLDcg KzgzLDcgQEAKICNpbXBvcnQgPFVJS2l0L1VJRG9jdW1lbnRNZW51Vmlld0NvbnRyb2xsZXJfUHJp dmF0ZS5oPgogI2Vsc2UKIEBpbnRlcmZhY2UgVUlEb2N1bWVudE1lbnVWaWV3Q29udHJvbGxlciAo KQotQHByb3BlcnR5IChub25hdG9taWMsIGFzc2lnbiwgc2V0dGVyID0gX3NldElnbm9yZUFwcGxp Y2F0aW9uRW50aXRsZW1lbnRGb3JJbXBvcnQ6LCBnZXR0ZXIgPSBfaWdub3JlQXBwbGljYXRpb25F bnRpdGxlbWVudEZvckltcG9ydCkgQk9PTCBfaWdub3JlQXBwbGljYXRpb25FbnRpdGxlbWVudEZv ckltcG9ydDsKKy0gKGluc3RhbmNldHlwZSlfaW5pdElnbm9yaW5nQXBwbGljYXRpb25FbnRpdGxl bWVudEZvckltcG9ydE9mVHlwZXM6KE5TQXJyYXkgKil0eXBlczsKIEBlbmQKICNlbmRpZgogCkBA IC03NjMsNyArNzYzLDcgQEAgdHlwZWRlZiBlbnVtIHsKIEBlbmQKIAogQGludGVyZmFjZSBVSURv Y3VtZW50TWVudVZpZXdDb250cm9sbGVyICgpCi1AcHJvcGVydHkgKG5vbmF0b21pYywgYXNzaWdu LCBzZXR0ZXIgPSBfc2V0SWdub3JlQXBwbGljYXRpb25FbnRpdGxlbWVudEZvckltcG9ydDosIGdl dHRlciA9IF9pZ25vcmVBcHBsaWNhdGlvbkVudGl0bGVtZW50Rm9ySW1wb3J0KSBCT09MIF9pZ25v cmVBcHBsaWNhdGlvbkVudGl0bGVtZW50Rm9ySW1wb3J0OworLSAoaW5zdGFuY2V0eXBlKV9pbml0 SWdub3JpbmdBcHBsaWNhdGlvbkVudGl0bGVtZW50Rm9ySW1wb3J0T2ZUeXBlczooTlNBcnJheSAq KXR5cGVzOwogQGVuZAogCiBAcHJvdG9jb2wgVUlEb2N1bWVudFBhc3N3b3JkVmlld0RlbGVnYXRl OwpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9mb3Jtcy9XS0ZpbGVVcGxvYWRQ YW5lbC5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL2Zvcm1z L1dLRmlsZVVwbG9hZFBhbmVsLm1tCShyZXZpc2lvbiAxOTUwNTgpCisrKyBTb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvaW9zL2Zvcm1zL1dLRmlsZVVwbG9hZFBhbmVsLm1tCSh3b3JraW5nIGNvcHkp CkBAIC0xLDUgKzEsNSBAQAogLyoKLSAqIENvcHlyaWdodCAoQykgMjAxNCBBcHBsZSBJbmMuIEFs bCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmlnaHQgKEMpIDIwMTQsIDIwMTYgQXBwbGUgSW5j LiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4g c291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogICogbW9kaWZpY2F0aW9u LCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBA IC0zNzUsNyArMzc1LDcgQEAgLSAodm9pZClwcmVzZW50V2l0aFBhcmFtZXRlcnM6KFdlYktpdDo6 VwogICAgIF9taW1lVHlwZXMgPSBhZG9wdE5TKFttaW1lVHlwZXMgY29weV0pOwogCiAgICAgLy8g RklYTUU6IFJlbW92ZSB0aGlzIGNoZWNrIGFuZCB0aGUgZmFsbGJhY2sgY29kZSB3aGVuIGEgbmV3 IFNESyBpcyBhdmFpbGFibGUuIDxyZGFyOi8vcHJvYmxlbS8yMDE1MDA3Mj4KLSAgICBpZiAoW1VJ RG9jdW1lbnRNZW51Vmlld0NvbnRyb2xsZXIgaW5zdGFuY2VzUmVzcG9uZFRvU2VsZWN0b3I6QHNl bGVjdG9yKF9zZXRJZ25vcmVBcHBsaWNhdGlvbkVudGl0bGVtZW50Rm9ySW1wb3J0OildKSB7Cisg ICAgaWYgKFtVSURvY3VtZW50TWVudVZpZXdDb250cm9sbGVyIGluc3RhbmNlc1Jlc3BvbmRUb1Nl bGVjdG9yOkBzZWxlY3RvcihfaW5pdElnbm9yaW5nQXBwbGljYXRpb25FbnRpdGxlbWVudEZvcklt cG9ydE9mVHlwZXM6KV0pIHsKICAgICAgICAgW3NlbGYgX3Nob3dEb2N1bWVudFBpY2tlck1lbnVd OwogICAgICAgICByZXR1cm47CiAgICAgfQpAQCAtNTE1LDE0ICs1MTUsNyBAQCAtICh2b2lkKV9z aG93TWVkaWFTb3VyY2VTZWxlY3Rpb25TaGVldAogLSAodm9pZClfc2hvd0RvY3VtZW50UGlja2Vy TWVudQogewogICAgIC8vIEZJWE1FOiBTdXBwb3J0IG11bHRpcGxlIGZpbGUgc2VsZWN0aW9uIHdo ZW4gaW1wbGVtZW50ZWQuIDxyZGFyOi8vMTcxNzc5ODE+Ci0gICAgLy8gRklYTUU6IFdlIGNhbGwg LV9zZXRJZ25vcmVBcHBsaWNhdGlvbkVudGl0bGVtZW50Rm9ySW1wb3J0OiBiZWZvcmUgaW5pdGlh bGl6YXRpb24sIGJlY2F1c2UgdGhlIGFzc2VydGlvbiB3ZSdyZSB0cnlpbmcKLSAgICAvLyB0byBz dXBwcmVzcyBpcyBpbiB0aGUgaW5pdGlhbGl6ZXIuIDxyZGFyOi8vcHJvYmxlbS8yMDEzNzY5Mj4g dHJhY2tzIGRvaW5nIHRoaXMgd2l0aCBhIHByaXZhdGUgaW5pdGlhbGl6ZXIuCi0gICAgX2RvY3Vt ZW50TWVudUNvbnRyb2xsZXIgPSBhZG9wdE5TKFtVSURvY3VtZW50TWVudVZpZXdDb250cm9sbGVy IGFsbG9jXSk7Ci0jcHJhZ21hIGNsYW5nIGRpYWdub3N0aWMgcHVzaAotI3ByYWdtYSBjbGFuZyBk aWFnbm9zdGljIGlnbm9yZWQgIi1XZGVwcmVjYXRlZC1kZWNsYXJhdGlvbnMiCi0gICAgW19kb2N1 bWVudE1lbnVDb250cm9sbGVyIF9zZXRJZ25vcmVBcHBsaWNhdGlvbkVudGl0bGVtZW50Rm9ySW1w b3J0OllFU107Ci0jcHJhZ21hIGNsYW5nIGRpYWdub3N0aWMgcG9wCi0gICAgW19kb2N1bWVudE1l bnVDb250cm9sbGVyIGluaXRXaXRoRG9jdW1lbnRUeXBlczpbc2VsZiBfZG9jdW1lbnRQaWNrZXJN ZW51TWVkaWFUeXBlc10gaW5Nb2RlOlVJRG9jdW1lbnRQaWNrZXJNb2RlSW1wb3J0XTsKKyAgICBf ZG9jdW1lbnRNZW51Q29udHJvbGxlciA9IGFkb3B0TlMoW1tVSURvY3VtZW50TWVudVZpZXdDb250 cm9sbGVyIGFsbG9jXSBfaW5pdElnbm9yaW5nQXBwbGljYXRpb25FbnRpdGxlbWVudEZvckltcG9y dE9mVHlwZXM6W3NlbGYgX2RvY3VtZW50UGlja2VyTWVudU1lZGlhVHlwZXNdXSk7CiAgICAgW19k b2N1bWVudE1lbnVDb250cm9sbGVyIHNldERlbGVnYXRlOnNlbGZdOwogCiAgICAgW19kb2N1bWVu dE1lbnVDb250cm9sbGVyIGFkZE9wdGlvbldpdGhUaXRsZTpbc2VsZiBfcGhvdG9MaWJyYXJ5QnV0 dG9uTGFiZWxdIGltYWdlOnBob3RvTGlicmFyeUljb24oKSBvcmRlcjpVSURvY3VtZW50TWVudU9y ZGVyRmlyc3QgaGFuZGxlcjpeewo=