125240 2013-12-04 12:09:59 -0800 [GTK][WK2] Fix build after r160104 2013-12-04 14:15:52 -0800 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 125231 1 nick.diego nick.diego cgarcia commit-queue gustavo mrobinson oldest_to_newest 956513 0 nick.diego 2013-12-04 12:09:59 -0800 ../../Source/WebKit2/UIProcess/API/gtk/WebKitCookieManager.cpp: In function 'WebKitCookieManager* webkitCookieManagerCreate(WebKit::WebCookieManagerProxy*)': ../../Source/WebKit2/UIProcess/API/gtk/WebKitCookieManager.cpp:108:77: error: cannot convert 'WKCookieManagerClient*' to 'const WKCookieManagerClientBase*' for argument '2' to 'void WKCookieManagerSetClient(WKCookieManagerRef, const WKCookieManagerClientBase*)' WKCookieManagerSetClient(toAPI(webCookieManager), &wkCookieManagerClient); ^ make[1]: *** [Source/WebKit2/UIProcess/API/gtk/libwebkit2gtk_3_0_la-WebKitCookieManager.lo] Error 1 make[1]: *** Waiting for unfinished jobs.... ../../Source/WebKit2/UIProcess/API/gtk/WebKitFaviconDatabase.cpp: In function 'WebKitFaviconDatabase* webkitFaviconDatabaseCreate(WebKit::WebIconDatabase*)': ../../Source/WebKit2/UIProcess/API/gtk/WebKitFaviconDatabase.cpp:224:83: error: cannot convert 'WKIconDatabaseClient*' to 'const WKIconDatabaseClientBase*' for argument '2' to 'void WKIconDatabaseSetIconDatabaseClient(WKIconDatabaseRef, const WKIconDatabaseClientBase*)' WKIconDatabaseSetIconDatabaseClient(toAPI(iconDatabase), &wkIconDatabaseClient); ^ make[1]: *** [Source/WebKit2/UIProcess/API/gtk/libwebkit2gtk_3_0_la-WebKitFaviconDatabase.lo] ErroFailed to run "['Tools/Scripts/build-webkit', '--release', '--gtk', '--update-gtk', '--no-webkit1', '--makeargs="-j8"']" exit_code: 2 Last 500 characters of output: eContextMenuClientBase*' for argument '2' to 'void WKPageSetPageContextMenuClient(WKPageRef, const WKPageContextMenuClientBase*)' WKPageSetPageContextMenuClient(wkPage, &wkContextMenuClient); ^ make[1]: *** [Source/WebKit2/UIProcess/API/gtk/libwebkit2gtk_3_0_la-WebKitContextMenuClient.lo] Error 1 make[1]: Leaving directory `/home/rego/ews/WebKit/WebKitBuild/Release' make: *** [all] Error 2 Failed to build WebKit using 'make'! Failed to run "['Tools/Scripts/build-webkit', '--release', '--gtk', '--update-gtk', '--no-webkit1', '--makeargs="-j8"']" exit_code: 2 r 1 ../../Source/WebKit2/UIProcess/API/gtk/WebKitDownloadClient.cpp: In function 'void attachDownloadClientToContext(WebKitWebContext*)': ../../Source/WebKit2/UIProcess/API/gtk/WebKitDownloadClient.cpp:113:96: error: cannot convert 'WKContextDownloadClient*' to 'const WKContextDownloadClientBase*' for argument '2' to 'void WKContextSetDownloadClient(WKContextRef, const WKContextDownloadClientBase*)' WKContextSetDownloadClient(toAPI(webkitWebContextGetContext(webContext)), &wkDownloadClient); ^ make[1]: *** [Source/WebKit2/UIProcess/API/gtk/libwebkit2gtk_3_0_la-WebKitDownloadClient.lo] Error 1 ../../Source/WebKit2/UIProcess/API/gtk/WebKitContextMenuClient.cpp: In function 'void attachContextMenuClientToView(WebKitWebView*)': ../../Source/WebKit2/UIProcess/API/gtk/WebKitContextMenuClient.cpp:47:64: error: cannot convert 'WKPageContextMenuClient*' to 'const WKPageContextMenuClientBase*' for argument '2' to 'void WKPageSetPageContextMenuClient(WKPageRef, const WKPageContextMenuClientBase*)' WKPageSetPageContextMenuClient(wkPage, &wkContextMenuClient); ^ make[1]: *** [Source/WebKit2/UIProcess/API/gtk/libwebkit2gtk_3_0_la-WebKitContextMenuClient.lo] Error 1 make[1]: Leaving directory `/home/rego/ews/WebKit/WebKitBuild/Release' make: *** [all] Error 2 Failed to build WebKit using 'make'! 956547 1 218434 nick.diego 2013-12-04 13:14:05 -0800 Created attachment 218434 Patch 956549 2 commit-queue 2013-12-04 13:16:23 -0800 Thanks for the patch. If this patch contains new public API please make sure it follows the guidelines for new WebKit2 GTK+ API. See http://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API 956568 3 218442 nick.diego 2013-12-04 13:31:44 -0800 Created attachment 218442 Rebased patch 956598 4 218442 commit-queue 2013-12-04 14:15:50 -0800 Comment on attachment 218442 Rebased patch Clearing flags on attachment: 218442 Committed r160125: <http://trac.webkit.org/changeset/160125> 956599 5 commit-queue 2013-12-04 14:15:52 -0800 All reviewed patches have been landed. Closing bug. 218434 2013-12-04 13:14:05 -0800 2013-12-04 13:31:37 -0800 Patch bug-125240-20131204172601.patch text/plain 17850 nick.diego U3VidmVyc2lvbiBSZXZpc2lvbjogMTYwMTE2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMjdlYTRmNDVlOTU0Y2I4 Y2JhZjgwZmFlNWY3ZTY5MjQ4OWJhNGFjNS4uNmQ1Yzg3ODkwYzc4ODZiMjEzNTg3YTZiNmVlNGY1 YzRiMjRhY2NlOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDEzLTEyLTA0ICBOaWNr IERpZWdvIFlhbWFuZSAgPG5pY2sueWFtYW5lQG9wZW5ib3NzYS5vcmc+CisKKyAgICAgICAgW0dU S11bV0syXSBGaXggYnVpbGQgYWZ0ZXIgcjE2MDEwNAorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI1MjQwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgVXNpbmcgc3BlY2lmaWMgdmVyc2lvbiBvZiBBUEkgY2xp ZW50IHdoZW4gaW5zdGFudGlhdGluZyB0aGVtLgorICAgICAgICBBcHBsaWVkIHRoYXQgc2FtZSBj aGFuZ2UgdG8gdGhlIGZvbGxvd2luZyBmaWxlczoKKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkv Z3RrL1dlYktpdENvbnRleHRNZW51Q2xpZW50LmNwcDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJ L2d0ay9XZWJLaXRDb29raWVNYW5hZ2VyLmNwcDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0 ay9XZWJLaXREb3dubG9hZENsaWVudC5jcHA6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsv V2ViS2l0RmF2aWNvbkRhdGFiYXNlLmNwcDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0ay9X ZWJLaXRGaW5kQ29udHJvbGxlci5jcHA6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsvV2Vi S2l0Rm9ybUNsaWVudC5jcHA6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0R2Vv bG9jYXRpb25Qcm92aWRlci5jcHA6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0 SW5qZWN0ZWRCdW5kbGVDbGllbnQuY3BwOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dl YktpdExvYWRlckNsaWVudC5jcHA6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0 UG9saWN5Q2xpZW50LmNwcDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRVSUNs aWVudC5jcHA6CisgICAgICAgICogV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvZ3RrL1dl YktpdFdlYkV4dGVuc2lvbi5jcHA6CisgICAgICAgICogV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRs ZS9BUEkvZ3RrL1dlYktpdFdlYlBhZ2UuY3BwOgorCiAyMDEzLTEyLTA0ICBDc2FiYSBPc3p0cm9n b27DoWMgIDxvc3N5QHdlYmtpdC5vcmc+CiAKICAgICAgICAgW0VGTF1bV0syXSBCdWlsZGZpeCBh ZnRlciByMTYwMTA0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0 ay9XZWJLaXRDb250ZXh0TWVudUNsaWVudC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL2d0ay9XZWJLaXRDb250ZXh0TWVudUNsaWVudC5jcHAKaW5kZXggZjUwYzUyYWVhMGYyNjA3 NThmZDE0YTc3MWQ2ZmQzYzkzM2I3NGY4Mi4uZWE1ZTQyNzU3Nzk4NWFmNzg0MmRkNDA5MGEyMzVl NDliZDhhNjk0NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsv V2ViS2l0Q29udGV4dE1lbnVDbGllbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvZ3RrL1dlYktpdENvbnRleHRNZW51Q2xpZW50LmNwcApAQCAtMzMsOSArMzMsMTEgQEAg c3RhdGljIHZvaWQgZ2V0Q29udGV4dE1lbnVGcm9tUHJvcG9zZWRNZW51KFdLUGFnZVJlZiwgV0tB cnJheVJlZiBwcm9wb3NlZE1lbnUsIFcKIAogdm9pZCBhdHRhY2hDb250ZXh0TWVudUNsaWVudFRv VmlldyhXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3KQogewotICAgIFdLUGFnZUNvbnRleHRNZW51Q2xp ZW50IHdrQ29udGV4dE1lbnVDbGllbnQgPSB7Ci0gICAgICAgIGtXS1BhZ2VDb250ZXh0TWVudUNs aWVudEN1cnJlbnRWZXJzaW9uLAotICAgICAgICB3ZWJWaWV3LCAvLyBjbGllbnRJbmZvCisgICAg V0tQYWdlQ29udGV4dE1lbnVDbGllbnRWMyB3a0NvbnRleHRNZW51Q2xpZW50ID0geworICAgICAg ICB7CisgICAgICAgICAgICAzLCAvLyB2ZXJzaW9uCisgICAgICAgICAgICB3ZWJWaWV3LCAvLyBj bGllbnRJbmZvCisgICAgICAgIH0sCiAgICAgICAgIDAsIC8vIGdldENvbnRleHRNZW51RnJvbVBy b3Bvc2VkTWVudV9kZXByZWNhdGVkRm9yVXNlV2l0aFYwCiAgICAgICAgIDAsIC8vIGN1c3RvbUNv bnRleHRNZW51SXRlbVNlbGVjdGVkCiAgICAgICAgIDAsIC8vIGNvbnRleHRNZW51RGlzbWlzc2Vk CkBAIC00NCw2ICs0Niw2IEBAIHZvaWQgYXR0YWNoQ29udGV4dE1lbnVDbGllbnRUb1ZpZXcoV2Vi S2l0V2ViVmlldyogd2ViVmlldykKICAgICAgICAgMCwgLy8gaGlkZUNvbnRleHRNZW51CiAgICAg fTsKICAgICBXS1BhZ2VSZWYgd2tQYWdlID0gdG9BUEkod2Via2l0V2ViVmlld0Jhc2VHZXRQYWdl KFdFQktJVF9XRUJfVklFV19CQVNFKHdlYlZpZXcpKSk7Ci0gICAgV0tQYWdlU2V0UGFnZUNvbnRl eHRNZW51Q2xpZW50KHdrUGFnZSwgJndrQ29udGV4dE1lbnVDbGllbnQpOworICAgIFdLUGFnZVNl dFBhZ2VDb250ZXh0TWVudUNsaWVudCh3a1BhZ2UsICZ3a0NvbnRleHRNZW51Q2xpZW50LmJhc2Up OwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJL aXRDb29raWVNYW5hZ2VyLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dl YktpdENvb2tpZU1hbmFnZXIuY3BwCmluZGV4IGNkNTM5YmNjN2IyMThlNGJlZGMzOGZkYmM2MThh OGQ3ZjIxYTVjNmMuLjI4ZTMyODRkM2RhMjExZjY2MTI5M2FkODE2Yjg3OTEyYmFhMzdjZWEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdENvb2tpZU1h bmFnZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdENv b2tpZU1hbmFnZXIuY3BwCkBAIC0xMDAsMTIgKzEwMCwxNCBAQCBXZWJLaXRDb29raWVNYW5hZ2Vy KiB3ZWJraXRDb29raWVNYW5hZ2VyQ3JlYXRlKFdlYkNvb2tpZU1hbmFnZXJQcm94eSogd2ViQ29v a2llTQogICAgIFdlYktpdENvb2tpZU1hbmFnZXIqIG1hbmFnZXIgPSBXRUJLSVRfQ09PS0lFX01B TkFHRVIoZ19vYmplY3RfbmV3KFdFQktJVF9UWVBFX0NPT0tJRV9NQU5BR0VSLCBOVUxMKSk7CiAg ICAgbWFuYWdlci0+cHJpdi0+d2ViQ29va2llTWFuYWdlciA9IHdlYkNvb2tpZU1hbmFnZXI7CiAK LSAgICBXS0Nvb2tpZU1hbmFnZXJDbGllbnQgd2tDb29raWVNYW5hZ2VyQ2xpZW50ID0gewotICAg ICAgICBrV0tDb29raWVNYW5hZ2VyQ2xpZW50Q3VycmVudFZlcnNpb24sCi0gICAgICAgIG1hbmFn ZXIsIC8vIGNsaWVudEluZm8KKyAgICBXS0Nvb2tpZU1hbmFnZXJDbGllbnRWMCB3a0Nvb2tpZU1h bmFnZXJDbGllbnQgPSB7CisgICAgICAgIHsKKyAgICAgICAgICAgIDAsIC8vIHZlcnNpb24KKyAg ICAgICAgICAgIG1hbmFnZXIsIC8vIGNsaWVudEluZm8KKyAgICAgICAgfSwKICAgICAgICAgY29v a2llc0RpZENoYW5nZQogICAgIH07Ci0gICAgV0tDb29raWVNYW5hZ2VyU2V0Q2xpZW50KHRvQVBJ KHdlYkNvb2tpZU1hbmFnZXIpLCAmd2tDb29raWVNYW5hZ2VyQ2xpZW50KTsKKyAgICBXS0Nvb2tp ZU1hbmFnZXJTZXRDbGllbnQodG9BUEkod2ViQ29va2llTWFuYWdlciksICZ3a0Nvb2tpZU1hbmFn ZXJDbGllbnQuYmFzZSk7CiAgICAgbWFuYWdlci0+cHJpdi0+d2ViQ29va2llTWFuYWdlci0+c3Rh cnRPYnNlcnZpbmdDb29raWVDaGFuZ2VzKCk7CiAKICAgICByZXR1cm4gbWFuYWdlcjsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdERvd25sb2FkQ2xp ZW50LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdERvd25sb2Fk Q2xpZW50LmNwcAppbmRleCA3OWMxYzNlMmFkZDQ5ZGZjZTg4MmViNzk5YjM2NzBkNWVlNDc5NDE1 Li4xYTRlYmE2OGIwMTdlMTEwODBhMTAyMTI5NDVmZjBjMWI0NjE4NjdhIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXREb3dubG9hZENsaWVudC5jcHAK KysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0RG93bmxvYWRDbGll bnQuY3BwCkBAIC05NSw5ICs5NSwxMSBAQCBzdGF0aWMgdm9pZCBkaWRGaW5pc2goV0tDb250ZXh0 UmVmIHdrQ29udGV4dCwgV0tEb3dubG9hZFJlZiB3a0Rvd25sb2FkLCBjb25zdCB2bwogCiB2b2lk IGF0dGFjaERvd25sb2FkQ2xpZW50VG9Db250ZXh0KFdlYktpdFdlYkNvbnRleHQqIHdlYkNvbnRl eHQpCiB7Ci0gICAgV0tDb250ZXh0RG93bmxvYWRDbGllbnQgd2tEb3dubG9hZENsaWVudCA9IHsK LSAgICAgICAga1dLQ29udGV4dERvd25sb2FkQ2xpZW50Q3VycmVudFZlcnNpb24sCi0gICAgICAg IHdlYkNvbnRleHQsIC8vIENsaWVudEluZm8KKyAgICBXS0NvbnRleHREb3dubG9hZENsaWVudFYw IHdrRG93bmxvYWRDbGllbnQgPSB7CisgICAgICAgIHsKKyAgICAgICAgICAgIDAsIC8vIHZlcnNp b24KKyAgICAgICAgICAgIHdlYkNvbnRleHQsIC8vIENsaWVudEluZm8KKyAgICAgICAgfSwKICAg ICAgICAgZGlkU3RhcnQsCiAgICAgICAgIDAsIC8vIGRpZFJlY2VpdmVBdXRoZW50aWNhdGlvbkNo YWxsZW5nZQogICAgICAgICBkaWRSZWNlaXZlUmVzcG9uc2UsCkBAIC0xMTAsNiArMTEyLDYgQEAg dm9pZCBhdHRhY2hEb3dubG9hZENsaWVudFRvQ29udGV4dChXZWJLaXRXZWJDb250ZXh0KiB3ZWJD b250ZXh0KQogICAgICAgICBkaWRDYW5jZWwsCiAgICAgICAgIDAsIC8vIHByb2Nlc3NEaWRDcmFz aAogICAgIH07Ci0gICAgV0tDb250ZXh0U2V0RG93bmxvYWRDbGllbnQodG9BUEkod2Via2l0V2Vi Q29udGV4dEdldENvbnRleHQod2ViQ29udGV4dCkpLCAmd2tEb3dubG9hZENsaWVudCk7CisgICAg V0tDb250ZXh0U2V0RG93bmxvYWRDbGllbnQodG9BUEkod2Via2l0V2ViQ29udGV4dEdldENvbnRl eHQod2ViQ29udGV4dCkpLCAmd2tEb3dubG9hZENsaWVudC5iYXNlKTsKIH0KIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0RmF2aWNvbkRhdGFiYXNl LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdEZhdmljb25EYXRh YmFzZS5jcHAKaW5kZXggNjdjOGZkNDMwNDkyZTIxZDE4YThkN2ExMzc2ZDUyNjMzYTMwYzE5Yi4u YzAyYTgzNGRiOWQ1Mjk2Y2IwZDhmN2FkZmIzZDdiNGM2NDgzNDJmZCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0RmF2aWNvbkRhdGFiYXNlLmNwcAor KysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRGYXZpY29uRGF0YWJh c2UuY3BwCkBAIC0yMTQsMTQgKzIxNCwxNiBAQCBXZWJLaXRGYXZpY29uRGF0YWJhc2UqIHdlYmtp dEZhdmljb25EYXRhYmFzZUNyZWF0ZShXZWJJY29uRGF0YWJhc2UqIGljb25EYXRhYmFzZQogICAg IFdlYktpdEZhdmljb25EYXRhYmFzZSogZmF2aWNvbkRhdGFiYXNlID0gV0VCS0lUX0ZBVklDT05f REFUQUJBU0UoZ19vYmplY3RfbmV3KFdFQktJVF9UWVBFX0ZBVklDT05fREFUQUJBU0UsIE5VTEwp KTsKICAgICBmYXZpY29uRGF0YWJhc2UtPnByaXYtPmljb25EYXRhYmFzZSA9IGljb25EYXRhYmFz ZTsKIAotICAgIFdLSWNvbkRhdGFiYXNlQ2xpZW50IHdrSWNvbkRhdGFiYXNlQ2xpZW50ID0gewot ICAgICAgICBrV0tJY29uRGF0YWJhc2VDbGllbnRDdXJyZW50VmVyc2lvbiwKLSAgICAgICAgZmF2 aWNvbkRhdGFiYXNlLCAvLyBjbGllbnRJbmZvCisgICAgV0tJY29uRGF0YWJhc2VDbGllbnRWMSB3 a0ljb25EYXRhYmFzZUNsaWVudCA9IHsKKyAgICAgICAgeworICAgICAgICAgICAgMSwgLy8gdmVy c2lvbgorICAgICAgICAgICAgZmF2aWNvbkRhdGFiYXNlLCAvLyBjbGllbnRJbmZvCisgICAgICAg IH0sCiAgICAgICAgIGRpZENoYW5nZUljb25Gb3JQYWdlVVJMQ2FsbGJhY2ssCiAgICAgICAgIDAs IC8vIGRpZFJlbW92ZUFsbEljb25zQ2FsbGJhY2sKICAgICAgICAgaWNvbkRhdGFSZWFkeUZvclBh Z2VVUkxDYWxsYmFjaywKICAgICB9OwotICAgIFdLSWNvbkRhdGFiYXNlU2V0SWNvbkRhdGFiYXNl Q2xpZW50KHRvQVBJKGljb25EYXRhYmFzZSksICZ3a0ljb25EYXRhYmFzZUNsaWVudCk7CisgICAg V0tJY29uRGF0YWJhc2VTZXRJY29uRGF0YWJhc2VDbGllbnQodG9BUEkoaWNvbkRhdGFiYXNlKSwg JndrSWNvbkRhdGFiYXNlQ2xpZW50LmJhc2UpOwogICAgIHJldHVybiBmYXZpY29uRGF0YWJhc2U7 CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktp dEZpbmRDb250cm9sbGVyLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dl YktpdEZpbmRDb250cm9sbGVyLmNwcAppbmRleCA1MTZjNTgyMzdhNDQ2NDIwYjgxZjVkMjkzYTNi MDA4ZTc1ZjJkZWU3Li44NzU5MzA2ZTJiY2YxZjk2MWU1Nzg0MWNiMTQ2YjYwZmMyNmQ1OWY2IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRGaW5kQ29u dHJvbGxlci5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0 RmluZENvbnRyb2xsZXIuY3BwCkBAIC0xMTEsMTUgKzExMSwxNyBAQCBzdGF0aWMgaW5saW5lIFdl YlBhZ2VQcm94eSogZ2V0UGFnZShXZWJLaXRGaW5kQ29udHJvbGxlciogZmluZENvbnRyb2xsZXIp CiBzdGF0aWMgdm9pZCB3ZWJraXRGaW5kQ29udHJvbGxlckNvbnN0cnVjdGVkKEdPYmplY3QqIG9i amVjdCkKIHsKICAgICBXZWJLaXRGaW5kQ29udHJvbGxlciogZmluZENvbnRyb2xsZXIgPSBXRUJL SVRfRklORF9DT05UUk9MTEVSKG9iamVjdCk7Ci0gICAgV0tQYWdlRmluZENsaWVudCB3a0ZpbmRD bGllbnQgPSB7Ci0gICAgICAgIGtXS1BhZ2VGaW5kQ2xpZW50Q3VycmVudFZlcnNpb24sCi0gICAg ICAgIGZpbmRDb250cm9sbGVyLCAvLyBjbGllbnRJbmZvCisgICAgV0tQYWdlRmluZENsaWVudFYw IHdrRmluZENsaWVudCA9IHsKKyAgICAgICAgeworICAgICAgICAgICAgMCwgLy8gdmVyc2lvbgor ICAgICAgICAgICAgZmluZENvbnRyb2xsZXIsIC8vIGNsaWVudEluZm8KKyAgICAgICAgfSwKICAg ICAgICAgZGlkRmluZFN0cmluZywKICAgICAgICAgZGlkRmFpbFRvRmluZFN0cmluZywKICAgICAg ICAgZGlkQ291bnRTdHJpbmdNYXRjaGVzCiAgICAgfTsKIAotICAgIFdLUGFnZVNldFBhZ2VGaW5k Q2xpZW50KHRvQVBJKGdldFBhZ2UoZmluZENvbnRyb2xsZXIpKSwgJndrRmluZENsaWVudCk7Cisg ICAgV0tQYWdlU2V0UGFnZUZpbmRDbGllbnQodG9BUEkoZ2V0UGFnZShmaW5kQ29udHJvbGxlcikp LCAmd2tGaW5kQ2xpZW50LmJhc2UpOwogfQogCiBzdGF0aWMgdm9pZCB3ZWJraXRGaW5kQ29udHJv bGxlckdldFByb3BlcnR5KEdPYmplY3QqIG9iamVjdCwgZ3VpbnQgcHJvcElkLCBHVmFsdWUqIHZh bHVlLCBHUGFyYW1TcGVjKiBwYXJhbVNwZWMpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRGb3JtQ2xpZW50LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvZ3RrL1dlYktpdEZvcm1DbGllbnQuY3BwCmluZGV4IDc1OTc4Y2YxMzIwYjBi YjliZjlkZjFhNDIyMDE2NmFkMGVjYjk3MjQuLmEwN2YwNDk0ODc5ZTc3MTFkOTQ4MGExNzRjOTYw OTc2OWZlNjU1MGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3Rr L1dlYktpdEZvcm1DbGllbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv Z3RrL1dlYktpdEZvcm1DbGllbnQuY3BwCkBAIC0zNiwxMSArMzYsMTMgQEAgc3RhdGljIHZvaWQg d2lsbFN1Ym1pdEZvcm0oV0tQYWdlUmVmIHBhZ2UsIFdLRnJhbWVSZWYgZnJhbWUsIFdLRnJhbWVS ZWYgc291cmNlRnIKIAogdm9pZCBhdHRhY2hGb3JtQ2xpZW50VG9WaWV3KFdlYktpdFdlYlZpZXcq IHdlYlZpZXcpCiB7Ci0gICAgV0tQYWdlRm9ybUNsaWVudCB3a0Zvcm1DbGllbnQgPSB7Ci0gICAg ICAgIGtXS1BhZ2VGb3JtQ2xpZW50Q3VycmVudFZlcnNpb24sCi0gICAgICAgIHdlYlZpZXcsIC8v IGNsaWVudEluZm8KKyAgICBXS1BhZ2VGb3JtQ2xpZW50VjAgd2tGb3JtQ2xpZW50ID0geworICAg ICAgICB7CisgICAgICAgICAgICAwLCAvLyB2ZXJzaW9uCisgICAgICAgICAgICB3ZWJWaWV3LCAv LyBjbGllbnRJbmZvCisgICAgICAgIH0sCiAgICAgICAgIHdpbGxTdWJtaXRGb3JtCiAgICAgfTsK ICAgICBXS1BhZ2VSZWYgd2tQYWdlID0gdG9BUEkod2Via2l0V2ViVmlld0Jhc2VHZXRQYWdlKFdF QktJVF9XRUJfVklFV19CQVNFKHdlYlZpZXcpKSk7Ci0gICAgV0tQYWdlU2V0UGFnZUZvcm1DbGll bnQod2tQYWdlLCAmd2tGb3JtQ2xpZW50KTsKKyAgICBXS1BhZ2VTZXRQYWdlRm9ybUNsaWVudCh3 a1BhZ2UsICZ3a0Zvcm1DbGllbnQuYmFzZSk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRHZW9sb2NhdGlvblByb3ZpZGVyLmNwcCBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdEdlb2xvY2F0aW9uUHJvdmlkZXIuY3Bw CmluZGV4IGNkZWFjOTE3ZGJmZmExMzUwNDkzYTAwNTBiN2EzOWFkNTE1N2Y5MzUuLjI2MWFiZjgx YTc5NDM3NWM1NTA1ZDQwNjFjYmE4NDQ3NjIxZTIzMDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdEdlb2xvY2F0aW9uUHJvdmlkZXIuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdEdlb2xvY2F0aW9uUHJvdmlk ZXIuY3BwCkBAIC02NCwxMyArNjQsMTYgQEAgV2ViS2l0R2VvbG9jYXRpb25Qcm92aWRlcjo6V2Vi S2l0R2VvbG9jYXRpb25Qcm92aWRlcihXZWJHZW9sb2NhdGlvbk1hbmFnZXJQcm94eSoKIHsKICAg ICBBU1NFUlQoZ2VvbG9jYXRpb25NYW5hZ2VyKTsKIAotICAgIFdLR2VvbG9jYXRpb25Qcm92aWRl ciB3a0dlb2xvY2F0aW9uUHJvdmlkZXIgPSB7Ci0gICAgICAgIGtXS0dlb2xvY2F0aW9uUHJvdmlk ZXJDdXJyZW50VmVyc2lvbiwKLSAgICAgICAgdGhpcywgLy8gY2xpZW50SW5mbworICAgIFdLR2Vv bG9jYXRpb25Qcm92aWRlclYxIHdrR2VvbG9jYXRpb25Qcm92aWRlciA9IHsKKyAgICAgICAgewor ICAgICAgICAgICAgMSwgLy8gdmVyc2lvbgorICAgICAgICAgICAgdGhpcywgLy8gY2xpZW50SW5m bworICAgICAgICB9LAogICAgICAgICBzdGFydFVwZGF0aW5nQ2FsbGJhY2ssCi0gICAgICAgIHN0 b3BVcGRhdGluZ0NhbGxiYWNrCisgICAgICAgIHN0b3BVcGRhdGluZ0NhbGxiYWNrLAorICAgICAg ICAwIC8vIHNldEVuYWJsZUhpZ2hBY2N1cmFjeQogICAgIH07Ci0gICAgV0tHZW9sb2NhdGlvbk1h bmFnZXJTZXRQcm92aWRlcih0b0FQSShnZW9sb2NhdGlvbk1hbmFnZXIpLCAmd2tHZW9sb2NhdGlv blByb3ZpZGVyKTsKKyAgICBXS0dlb2xvY2F0aW9uTWFuYWdlclNldFByb3ZpZGVyKHRvQVBJKGdl b2xvY2F0aW9uTWFuYWdlciksICZ3a0dlb2xvY2F0aW9uUHJvdmlkZXIuYmFzZSk7CiB9CiAKIHZv aWQgV2ViS2l0R2VvbG9jYXRpb25Qcm92aWRlcjo6c3RhcnRVcGRhdGluZygpCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRJbmplY3RlZEJ1bmRsZUNs aWVudC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRJbmplY3Rl ZEJ1bmRsZUNsaWVudC5jcHAKaW5kZXggMjZhNmY4ZjEwZjYzY2FiNDcyZGRjYjZjZWNlNDFmNWYw ZDA4NDkxNi4uMmE0ZmRlYWMxZjE3YTI4YjEyMzUwZWZlNzBhZGIyY2RiMmRlN2YyNCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0SW5qZWN0ZWRCdW5k bGVDbGllbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktp dEluamVjdGVkQnVuZGxlQ2xpZW50LmNwcApAQCAtMTIwLDEyICsxMjAsMTQgQEAgc3RhdGljIHZv aWQgZGlkUmVjZWl2ZU1lc3NhZ2VGcm9tSW5qZWN0ZWRCdW5kbGUoV0tDb250ZXh0UmVmLCBXS1N0 cmluZ1JlZiBtZXNzYWcKIAogdm9pZCBhdHRhY2hJbmplY3RlZEJ1bmRsZUNsaWVudFRvQ29udGV4 dChXZWJLaXRXZWJDb250ZXh0KiB3ZWJDb250ZXh0KQogewotICAgIFdLQ29udGV4dEluamVjdGVk QnVuZGxlQ2xpZW50IHdrSW5qZWN0ZWRCdW5kbGVDbGllbnQgPSB7Ci0gICAgICAgIGtXS0NvbnRl eHRJbmplY3RlZEJ1bmRsZUNsaWVudEN1cnJlbnRWZXJzaW9uLAotICAgICAgICB3ZWJDb250ZXh0 LCAvLyBjbGllbnRJbmZvCisgICAgV0tDb250ZXh0SW5qZWN0ZWRCdW5kbGVDbGllbnRWMSB3a0lu amVjdGVkQnVuZGxlQ2xpZW50ID0geworICAgICAgICB7CisgICAgICAgICAgICAwLCAvLyB2ZXJz aW9uCisgICAgICAgICAgICB3ZWJDb250ZXh0LCAvLyBjbGllbnRJbmZvCisgICAgICAgIH0sCiAg ICAgICAgIGRpZFJlY2VpdmVNZXNzYWdlRnJvbUluamVjdGVkQnVuZGxlLAogICAgICAgICAwLCAv LyBkaWRSZWNlaXZlU3luY2hyb25vdXNNZXNzYWdlRnJvbUluamVjdGVkQnVuZGxlCiAgICAgICAg IDAgLy8gZ2V0SW5qZWN0ZWRCdW5kbGVJbml0aWFsaXphdGlvblVzZXJEYXRhCiAgICAgfTsKLSAg ICBXS0NvbnRleHRTZXRJbmplY3RlZEJ1bmRsZUNsaWVudCh0b0FQSSh3ZWJraXRXZWJDb250ZXh0 R2V0Q29udGV4dCh3ZWJDb250ZXh0KSksICZ3a0luamVjdGVkQnVuZGxlQ2xpZW50KTsKKyAgICBX S0NvbnRleHRTZXRJbmplY3RlZEJ1bmRsZUNsaWVudCh0b0FQSSh3ZWJraXRXZWJDb250ZXh0R2V0 Q29udGV4dCh3ZWJDb250ZXh0KSksICZ3a0luamVjdGVkQnVuZGxlQ2xpZW50LmJhc2UpOwogfQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0TG9hZGVy Q2xpZW50LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdExvYWRl ckNsaWVudC5jcHAKaW5kZXggYzNjNGEyM2IyY2NmYWFjYzZjOWFiYTAyMzMwZDZlN2ZlNjRiNjky YS4uNmU0ZDJmOWM3ZTc0Y2E5MGZlNjhhZTVjMTNjYjE2NjJkYjA1NTVkNyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0TG9hZGVyQ2xpZW50LmNwcAor KysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRMb2FkZXJDbGllbnQu Y3BwCkBAIC0xNDAsOSArMTQwLDExIEBAIHN0YXRpYyB2b2lkIHByb2Nlc3NEaWRDcmFzaChXS1Bh Z2VSZWYgcGFnZSwgY29uc3Qgdm9pZCogY2xpZW50SW5mbykKIAogdm9pZCBhdHRhY2hMb2FkZXJD bGllbnRUb1ZpZXcoV2ViS2l0V2ViVmlldyogd2ViVmlldykKIHsKLSAgICBXS1BhZ2VMb2FkZXJD bGllbnQgd2tMb2FkZXJDbGllbnQgPSB7Ci0gICAgICAgIGtXS1BhZ2VMb2FkZXJDbGllbnRDdXJy ZW50VmVyc2lvbiwKLSAgICAgICAgd2ViVmlldywgLy8gY2xpZW50SW5mbworICAgIFdLUGFnZUxv YWRlckNsaWVudFYzIHdrTG9hZGVyQ2xpZW50ID0geworICAgICAgICB7CisgICAgICAgICAgICAz LCAvLyB2ZXJzaW9uCisgICAgICAgICAgICB3ZWJWaWV3LCAvLyBjbGllbnRJbmZvCisgICAgICAg IH0sCiAgICAgICAgIGRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUsCiAgICAgICAgIGRp ZFJlY2VpdmVTZXJ2ZXJSZWRpcmVjdEZvclByb3Zpc2lvbmFsTG9hZEZvckZyYW1lLAogICAgICAg ICBkaWRGYWlsUHJvdmlzaW9uYWxMb2FkV2l0aEVycm9yRm9yRnJhbWUsCkBAIC0xODEsNiArMTgz LDYgQEAgdm9pZCBhdHRhY2hMb2FkZXJDbGllbnRUb1ZpZXcoV2ViS2l0V2ViVmlldyogd2ViVmll dykKICAgICAgICAgMCwgLy8gcGx1Z2luTG9hZFBvbGljeQogICAgIH07CiAgICAgV0tQYWdlUmVm IHdrUGFnZSA9IHRvQVBJKHdlYmtpdFdlYlZpZXdCYXNlR2V0UGFnZShXRUJLSVRfV0VCX1ZJRVdf QkFTRSh3ZWJWaWV3KSkpOwotICAgIFdLUGFnZVNldFBhZ2VMb2FkZXJDbGllbnQod2tQYWdlLCAm d2tMb2FkZXJDbGllbnQpOworICAgIFdLUGFnZVNldFBhZ2VMb2FkZXJDbGllbnQod2tQYWdlLCAm d2tMb2FkZXJDbGllbnQuYmFzZSk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFBvbGljeUNsaWVudC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRQb2xpY3lDbGllbnQuY3BwCmluZGV4IDBlYWE5YmVjNzhm NTQ1ZTA2MmI5MWY5YjhkZGUxYjlkY2RiNDQ3M2UuLjVmZGNiZTVjYzA5ZDkyMDJjMDIwZWQwYmQz OWEyYTM4MmUyZDA0NTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv Z3RrL1dlYktpdFBvbGljeUNsaWVudC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9ndGsvV2ViS2l0UG9saWN5Q2xpZW50LmNwcApAQCAtNjgsOSArNjgsMTEgQEAgc3RhdGlj IHZvaWQgZGVjaWRlUG9saWN5Rm9yUmVzcG9uc2UoV0tQYWdlUmVmIHBhZ2UsIFdLRnJhbWVSZWYg ZnJhbWUsIFdLVVJMUmVzcG8KIAogdm9pZCBhdHRhY2hQb2xpY3lDbGllbnRUb1ZpZXcoV2ViS2l0 V2ViVmlldyogd2ViVmlldykKIHsKLSAgICBXS1BhZ2VQb2xpY3lDbGllbnQgcG9saWN5Q2xpZW50 ID0gewotICAgICAgICBrV0tQYWdlUG9saWN5Q2xpZW50Q3VycmVudFZlcnNpb24sCi0gICAgICAg IHdlYlZpZXcsIC8vIGNsaWVudEluZm8KKyAgICBXS1BhZ2VQb2xpY3lDbGllbnRWMSBwb2xpY3lD bGllbnQgPSB7CisgICAgICAgIHsKKyAgICAgICAgICAgIDEsIC8vIHZlcnNpb24KKyAgICAgICAg ICAgIHdlYlZpZXcsIC8vIGNsaWVudEluZm8KKyAgICAgICAgfSwKICAgICAgICAgMCwgLy8gZGVj aWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbl9kZXByZWNhdGVkRm9yVXNlV2l0aFYwCiAgICAg ICAgIGRlY2lkZVBvbGljeUZvck5ld1dpbmRvd0FjdGlvbiwKICAgICAgICAgMCwgLy8gZGVjaWRl UG9saWN5Rm9yUmVzcG9uc2VfZGVwcmVjYXRlZEZvclVzZVdpdGhWMApAQCAtNzgsNSArODAsNSBA QCB2b2lkIGF0dGFjaFBvbGljeUNsaWVudFRvVmlldyhXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3KQog ICAgICAgICBkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uLAogICAgICAgICBkZWNpZGVQ b2xpY3lGb3JSZXNwb25zZQogICAgIH07Ci0gICAgV0tQYWdlU2V0UGFnZVBvbGljeUNsaWVudCh0 b0FQSSh3ZWJraXRXZWJWaWV3QmFzZUdldFBhZ2UoV0VCS0lUX1dFQl9WSUVXX0JBU0Uod2ViVmll dykpKSwgJnBvbGljeUNsaWVudCk7CisgICAgV0tQYWdlU2V0UGFnZVBvbGljeUNsaWVudCh0b0FQ SSh3ZWJraXRXZWJWaWV3QmFzZUdldFBhZ2UoV0VCS0lUX1dFQl9WSUVXX0JBU0Uod2ViVmlldykp KSwgJnBvbGljeUNsaWVudC5iYXNlKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFVJQ2xpZW50LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvZ3RrL1dlYktpdFVJQ2xpZW50LmNwcAppbmRleCAwODk5Yjg1NjM4OTRhNDAwNWEx MjgzMWY2NWUzZjllYjJiNjcyOGM4Li40ODNiODI3ODYwY2U2NTcyZjNjZjdiYzUzNTdhZWQ1ZmI1 Mjg4YWUyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJL aXRVSUNsaWVudC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2Vi S2l0VUlDbGllbnQuY3BwCkBAIC0xNjAsOSArMTYwLDExIEBAIHN0YXRpYyB2b2lkIHJ1bk1vZGFs KFdLUGFnZVJlZiBwYWdlLCBjb25zdCB2b2lkKiBjbGllbnRJbmZvKQogCiB2b2lkIGF0dGFjaFVJ Q2xpZW50VG9WaWV3KFdlYktpdFdlYlZpZXcqIHdlYlZpZXcpCiB7Ci0gICAgV0tQYWdlVUlDbGll bnQgd2tVSUNsaWVudCA9IHsKLSAgICAgICAga1dLUGFnZVVJQ2xpZW50Q3VycmVudFZlcnNpb24s Ci0gICAgICAgIHdlYlZpZXcsIC8vIGNsaWVudEluZm8KKyAgICBXS1BhZ2VVSUNsaWVudFYyIHdr VUlDbGllbnQgPSB7CisgICAgICAgIHsKKyAgICAgICAgICAgIDIsIC8vIHZlcnNpb24KKyAgICAg ICAgICAgIHdlYlZpZXcsIC8vIGNsaWVudEluZm8KKyAgICAgICAgfSwKICAgICAgICAgMCwgLy8g Y3JlYXRlTmV3UGFnZV9kZXByZWNhdGVkRm9yVXNlV2l0aFYwCiAgICAgICAgIHNob3dQYWdlLAog ICAgICAgICBjbG9zZVBhZ2UsCkBAIC0yMTEsNiArMjEzLDYgQEAgdm9pZCBhdHRhY2hVSUNsaWVu dFRvVmlldyhXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3KQogICAgICAgICAwLCAvLyBwbHVnaW5Mb2Fk UG9saWN5CiAgICAgfTsKICAgICBXS1BhZ2VSZWYgd2tQYWdlID0gdG9BUEkod2Via2l0V2ViVmll d0Jhc2VHZXRQYWdlKFdFQktJVF9XRUJfVklFV19CQVNFKHdlYlZpZXcpKSk7Ci0gICAgV0tQYWdl U2V0UGFnZVVJQ2xpZW50KHdrUGFnZSwgJndrVUlDbGllbnQpOworICAgIFdLUGFnZVNldFBhZ2VV SUNsaWVudCh3a1BhZ2UsICZ3a1VJQ2xpZW50LmJhc2UpOwogfQogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9ndGsvV2ViS2l0V2ViRXh0 ZW5zaW9uLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJ L2d0ay9XZWJLaXRXZWJFeHRlbnNpb24uY3BwCmluZGV4IDQwNzRlNTk0N2U2ZTA5NmIxYjBjZWQ4 OWMxMDVhOTQ5MzZlYmU1ZGQuLjQwZDA1YmIzMTBkM2FmMWZiNzEwYjExMDk2NzhjNGQ0ZWZmMGNi ODkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUv QVBJL2d0ay9XZWJLaXRXZWJFeHRlbnNpb24uY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlBy b2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2d0ay9XZWJLaXRXZWJFeHRlbnNpb24uY3BwCkBAIC0x MTYsMTYgKzExNiwxOCBAQCBXZWJLaXRXZWJFeHRlbnNpb24qIHdlYmtpdFdlYkV4dGVuc2lvbkNy ZWF0ZShJbmplY3RlZEJ1bmRsZSogYnVuZGxlKQogewogICAgIFdlYktpdFdlYkV4dGVuc2lvbiog ZXh0ZW5zaW9uID0gV0VCS0lUX1dFQl9FWFRFTlNJT04oZ19vYmplY3RfbmV3KFdFQktJVF9UWVBF X1dFQl9FWFRFTlNJT04sIE5VTEwpKTsKIAotICAgIFdLQnVuZGxlQ2xpZW50IHdrQnVuZGxlQ2xp ZW50ID0gewotICAgICAgICBrV0tCdW5kbGVDbGllbnRDdXJyZW50VmVyc2lvbiwKLSAgICAgICAg ZXh0ZW5zaW9uLCAvLyBjbGllbnRJbmZvCisgICAgV0tCdW5kbGVDbGllbnRWMSB3a0J1bmRsZUNs aWVudCA9IHsKKyAgICAgICAgeworICAgICAgICAgICAgMSwgLy8gdmVyc2lvbgorICAgICAgICAg ICAgZXh0ZW5zaW9uLCAvLyBjbGllbnRJbmZvCisgICAgICAgIH0sCiAgICAgICAgIGRpZENyZWF0 ZVBhZ2UsCiAgICAgICAgIHdpbGxEZXN0cm95UGFnZSwKICAgICAgICAgMCwgLy8gZGlkSW5pdGlh bGl6ZVBhZ2VHcm91cAogICAgICAgICBkaWRSZWNlaXZlTWVzc2FnZSwKICAgICAgICAgZGlkUmVj ZWl2ZU1lc3NhZ2VUb1BhZ2UKICAgICB9OwotICAgIFdLQnVuZGxlU2V0Q2xpZW50KHRvQVBJKGJ1 bmRsZSksICZ3a0J1bmRsZUNsaWVudCk7CisgICAgV0tCdW5kbGVTZXRDbGllbnQodG9BUEkoYnVu ZGxlKSwgJndrQnVuZGxlQ2xpZW50LmJhc2UpOwogCiAgICAgcmV0dXJuIGV4dGVuc2lvbjsKIH0K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJ L2d0ay9XZWJLaXRXZWJQYWdlLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0 ZWRCdW5kbGUvQVBJL2d0ay9XZWJLaXRXZWJQYWdlLmNwcAppbmRleCBlOTk4YTIzZTRlMjM5ZTBm ODc3MGVjYWI3MWFlYWI2MGQ0ZmIwOTczLi40NzRhNzA4YWRkMzM1ODAyNjkzOGE4MWRjOGE1NGU4 NDNjZDNjZTdjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0luamVjdGVk QnVuZGxlL0FQSS9ndGsvV2ViS2l0V2ViUGFnZS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvV2Vi UHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvZ3RrL1dlYktpdFdlYlBhZ2UuY3BwCkBAIC0zMDks OSArMzA5LDExIEBAIFdlYktpdFdlYlBhZ2UqIHdlYmtpdFdlYlBhZ2VDcmVhdGUoV2ViUGFnZSog d2ViUGFnZSkKICAgICBXZWJLaXRXZWJQYWdlKiBwYWdlID0gV0VCS0lUX1dFQl9QQUdFKGdfb2Jq ZWN0X25ldyhXRUJLSVRfVFlQRV9XRUJfUEFHRSwgTlVMTCkpOwogICAgIHBhZ2UtPnByaXYtPndl YlBhZ2UgPSB3ZWJQYWdlOwogCi0gICAgV0tCdW5kbGVQYWdlTG9hZGVyQ2xpZW50IGxvYWRlckNs aWVudCA9IHsKLSAgICAgICAga1dLQnVuZGxlUGFnZUxvYWRlckNsaWVudEN1cnJlbnRWZXJzaW9u LAotICAgICAgICBwYWdlLAorICAgIFdLQnVuZGxlUGFnZUxvYWRlckNsaWVudFY3IGxvYWRlckNs aWVudCA9IHsKKyAgICAgICAgeworICAgICAgICAgICAgNywgLy8gdmVyc2lvbgorICAgICAgICAg ICAgcGFnZSwgLy8gY2xpZW50SW5mbworICAgICAgICB9LAogICAgICAgICBkaWRTdGFydFByb3Zp c2lvbmFsTG9hZEZvckZyYW1lLAogICAgICAgICBkaWRSZWNlaXZlU2VydmVyUmVkaXJlY3RGb3JQ cm92aXNpb25hbExvYWRGb3JGcmFtZSwKICAgICAgICAgMCwgLy8gZGlkRmFpbFByb3Zpc2lvbmFs TG9hZFdpdGhFcnJvckZvckZyYW1lCkBAIC0zNDgsMTEgKzM1MCwxMyBAQCBXZWJLaXRXZWJQYWdl KiB3ZWJraXRXZWJQYWdlQ3JlYXRlKFdlYlBhZ2UqIHdlYlBhZ2UpCiAgICAgICAgIDAsIC8vIHdp bGxMb2FkRGF0YVJlcXVlc3QKICAgICAgICAgd2lsbERlc3Ryb3lGcmFtZQogICAgIH07Ci0gICAg V0tCdW5kbGVQYWdlU2V0UGFnZUxvYWRlckNsaWVudCh0b0FQSSh3ZWJQYWdlKSwgJmxvYWRlckNs aWVudCk7CisgICAgV0tCdW5kbGVQYWdlU2V0UGFnZUxvYWRlckNsaWVudCh0b0FQSSh3ZWJQYWdl KSwgJmxvYWRlckNsaWVudC5iYXNlKTsKIAotICAgIFdLQnVuZGxlUGFnZVJlc291cmNlTG9hZENs aWVudCByZXNvdXJjZUxvYWRDbGllbnQgPSB7Ci0gICAgICAgIGtXS0J1bmRsZVBhZ2VSZXNvdXJj ZUxvYWRDbGllbnRDdXJyZW50VmVyc2lvbiwKLSAgICAgICAgcGFnZSwKKyAgICBXS0J1bmRsZVBh Z2VSZXNvdXJjZUxvYWRDbGllbnRWMSByZXNvdXJjZUxvYWRDbGllbnQgPSB7CisgICAgICAgIHsK KyAgICAgICAgICAgIDEsIC8vIHZlcnNpb24KKyAgICAgICAgICAgIHBhZ2UsIC8vIGNsaWVudElu Zm8KKyAgICAgICAgfSwKICAgICAgICAgZGlkSW5pdGlhdGVMb2FkRm9yUmVzb3VyY2UsCiAgICAg ICAgIHdpbGxTZW5kUmVxdWVzdEZvckZyYW1lLAogICAgICAgICBkaWRSZWNlaXZlUmVzcG9uc2VG b3JSZXNvdXJjZSwKQEAgLTM2Miw3ICszNjYsNyBAQCBXZWJLaXRXZWJQYWdlKiB3ZWJraXRXZWJQ YWdlQ3JlYXRlKFdlYlBhZ2UqIHdlYlBhZ2UpCiAgICAgICAgIDAsIC8vIHNob3VsZENhY2hlUmVz cG9uc2UKICAgICAgICAgMCAvLyBzaG91bGRVc2VDcmVkZW50aWFsU3RvcmFnZQogICAgIH07Ci0g ICAgV0tCdW5kbGVQYWdlU2V0UmVzb3VyY2VMb2FkQ2xpZW50KHRvQVBJKHdlYlBhZ2UpLCAmcmVz b3VyY2VMb2FkQ2xpZW50KTsKKyAgICBXS0J1bmRsZVBhZ2VTZXRSZXNvdXJjZUxvYWRDbGllbnQo dG9BUEkod2ViUGFnZSksICZyZXNvdXJjZUxvYWRDbGllbnQuYmFzZSk7CiAKICAgICByZXR1cm4g cGFnZTsKIH0K 218442 2013-12-04 13:31:44 -0800 2013-12-04 14:15:50 -0800 Rebased patch bug-125240-20131204174340.patch text/plain 17869 nick.diego U3VidmVyc2lvbiBSZXZpc2lvbjogMTYwMTE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMjBlMWZmNTgwNTVmMzkw ZDM4N2FjYzIyMzM3NDUyNDI2NWVhMDM2OC4uNGRkNjdlY2M4YmI4ZjU1NWMyMDkwOTYxZjdkNGJl OTU3NmJmOGFkOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDEzLTEyLTA0ICBOaWNr IERpZWdvIFlhbWFuZSAgPG5pY2sueWFtYW5lQG9wZW5ib3NzYS5vcmc+CisKKyAgICAgICAgW0dU S11bV0syXSBGaXggYnVpbGQgYWZ0ZXIgcjE2MDEwNAorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI1MjQwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgVXNpbmcgc3BlY2lmaWMgdmVyc2lvbiBvZiBBUEkgY2xp ZW50IHdoZW4gaW5zdGFudGlhdGluZyB0aGVtLgorICAgICAgICBBcHBsaWVkIHRoYXQgc2FtZSBj aGFuZ2UgdG8gdGhlIGZvbGxvd2luZyBmaWxlczoKKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkv Z3RrL1dlYktpdENvbnRleHRNZW51Q2xpZW50LmNwcDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJ L2d0ay9XZWJLaXRDb29raWVNYW5hZ2VyLmNwcDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0 ay9XZWJLaXREb3dubG9hZENsaWVudC5jcHA6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsv V2ViS2l0RmF2aWNvbkRhdGFiYXNlLmNwcDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0ay9X ZWJLaXRGaW5kQ29udHJvbGxlci5jcHA6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsvV2Vi S2l0Rm9ybUNsaWVudC5jcHA6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0R2Vv bG9jYXRpb25Qcm92aWRlci5jcHA6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0 SW5qZWN0ZWRCdW5kbGVDbGllbnQuY3BwOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dl YktpdExvYWRlckNsaWVudC5jcHA6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0 UG9saWN5Q2xpZW50LmNwcDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRVSUNs aWVudC5jcHA6CisgICAgICAgICogV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvZ3RrL1dl YktpdFdlYkV4dGVuc2lvbi5jcHA6CisgICAgICAgICogV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRs ZS9BUEkvZ3RrL1dlYktpdFdlYlBhZ2UuY3BwOgorCiAyMDEzLTEyLTA0ICBEYW4gQmVybnN0ZWlu ICA8bWl0ekBhcHBsZS5jb20+CiAKICAgICAgICAgUmVwbGFjZSBVU0UoU0VDVVJJVFlfRlJBTUVX T1JLKSB3aXRoIGZpbmVyLWdyYWluZWQgZGVmaW5lcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0Q29udGV4dE1lbnVDbGllbnQuY3BwIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0Q29udGV4dE1lbnVDbGllbnQuY3BwCmlu ZGV4IGY1MGM1MmFlYTBmMjYwNzU4ZmQxNGE3NzFkNmZkM2M5MzNiNzRmODIuLmVhNWU0Mjc1Nzc5 ODVhZjc4NDJkZDQwOTBhMjM1ZTQ5YmQ4YTY5NDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdENvbnRleHRNZW51Q2xpZW50LmNwcAorKysgYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRDb250ZXh0TWVudUNsaWVudC5jcHAK QEAgLTMzLDkgKzMzLDExIEBAIHN0YXRpYyB2b2lkIGdldENvbnRleHRNZW51RnJvbVByb3Bvc2Vk TWVudShXS1BhZ2VSZWYsIFdLQXJyYXlSZWYgcHJvcG9zZWRNZW51LCBXCiAKIHZvaWQgYXR0YWNo Q29udGV4dE1lbnVDbGllbnRUb1ZpZXcoV2ViS2l0V2ViVmlldyogd2ViVmlldykKIHsKLSAgICBX S1BhZ2VDb250ZXh0TWVudUNsaWVudCB3a0NvbnRleHRNZW51Q2xpZW50ID0gewotICAgICAgICBr V0tQYWdlQ29udGV4dE1lbnVDbGllbnRDdXJyZW50VmVyc2lvbiwKLSAgICAgICAgd2ViVmlldywg Ly8gY2xpZW50SW5mbworICAgIFdLUGFnZUNvbnRleHRNZW51Q2xpZW50VjMgd2tDb250ZXh0TWVu dUNsaWVudCA9IHsKKyAgICAgICAgeworICAgICAgICAgICAgMywgLy8gdmVyc2lvbgorICAgICAg ICAgICAgd2ViVmlldywgLy8gY2xpZW50SW5mbworICAgICAgICB9LAogICAgICAgICAwLCAvLyBn ZXRDb250ZXh0TWVudUZyb21Qcm9wb3NlZE1lbnVfZGVwcmVjYXRlZEZvclVzZVdpdGhWMAogICAg ICAgICAwLCAvLyBjdXN0b21Db250ZXh0TWVudUl0ZW1TZWxlY3RlZAogICAgICAgICAwLCAvLyBj b250ZXh0TWVudURpc21pc3NlZApAQCAtNDQsNiArNDYsNiBAQCB2b2lkIGF0dGFjaENvbnRleHRN ZW51Q2xpZW50VG9WaWV3KFdlYktpdFdlYlZpZXcqIHdlYlZpZXcpCiAgICAgICAgIDAsIC8vIGhp ZGVDb250ZXh0TWVudQogICAgIH07CiAgICAgV0tQYWdlUmVmIHdrUGFnZSA9IHRvQVBJKHdlYmtp dFdlYlZpZXdCYXNlR2V0UGFnZShXRUJLSVRfV0VCX1ZJRVdfQkFTRSh3ZWJWaWV3KSkpOwotICAg IFdLUGFnZVNldFBhZ2VDb250ZXh0TWVudUNsaWVudCh3a1BhZ2UsICZ3a0NvbnRleHRNZW51Q2xp ZW50KTsKKyAgICBXS1BhZ2VTZXRQYWdlQ29udGV4dE1lbnVDbGllbnQod2tQYWdlLCAmd2tDb250 ZXh0TWVudUNsaWVudC5iYXNlKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9ndGsvV2ViS2l0Q29va2llTWFuYWdlci5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRDb29raWVNYW5hZ2VyLmNwcAppbmRleCBjZDUzOWJjYzdi MjE4ZTRiZWRjMzhmZGJjNjE4YThkN2YyMWE1YzZjLi4yOGUzMjg0ZDNkYTIxMWY2NjEyOTNhZDgx NmI4NzkxMmJhYTM3Y2VhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L2d0ay9XZWJLaXRDb29raWVNYW5hZ2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL2d0ay9XZWJLaXRDb29raWVNYW5hZ2VyLmNwcApAQCAtMTAwLDEyICsxMDAsMTQgQEAg V2ViS2l0Q29va2llTWFuYWdlciogd2Via2l0Q29va2llTWFuYWdlckNyZWF0ZShXZWJDb29raWVN YW5hZ2VyUHJveHkqIHdlYkNvb2tpZU0KICAgICBXZWJLaXRDb29raWVNYW5hZ2VyKiBtYW5hZ2Vy ID0gV0VCS0lUX0NPT0tJRV9NQU5BR0VSKGdfb2JqZWN0X25ldyhXRUJLSVRfVFlQRV9DT09LSUVf TUFOQUdFUiwgTlVMTCkpOwogICAgIG1hbmFnZXItPnByaXYtPndlYkNvb2tpZU1hbmFnZXIgPSB3 ZWJDb29raWVNYW5hZ2VyOwogCi0gICAgV0tDb29raWVNYW5hZ2VyQ2xpZW50IHdrQ29va2llTWFu YWdlckNsaWVudCA9IHsKLSAgICAgICAga1dLQ29va2llTWFuYWdlckNsaWVudEN1cnJlbnRWZXJz aW9uLAotICAgICAgICBtYW5hZ2VyLCAvLyBjbGllbnRJbmZvCisgICAgV0tDb29raWVNYW5hZ2Vy Q2xpZW50VjAgd2tDb29raWVNYW5hZ2VyQ2xpZW50ID0geworICAgICAgICB7CisgICAgICAgICAg ICAwLCAvLyB2ZXJzaW9uCisgICAgICAgICAgICBtYW5hZ2VyLCAvLyBjbGllbnRJbmZvCisgICAg ICAgIH0sCiAgICAgICAgIGNvb2tpZXNEaWRDaGFuZ2UKICAgICB9OwotICAgIFdLQ29va2llTWFu YWdlclNldENsaWVudCh0b0FQSSh3ZWJDb29raWVNYW5hZ2VyKSwgJndrQ29va2llTWFuYWdlckNs aWVudCk7CisgICAgV0tDb29raWVNYW5hZ2VyU2V0Q2xpZW50KHRvQVBJKHdlYkNvb2tpZU1hbmFn ZXIpLCAmd2tDb29raWVNYW5hZ2VyQ2xpZW50LmJhc2UpOwogICAgIG1hbmFnZXItPnByaXYtPndl YkNvb2tpZU1hbmFnZXItPnN0YXJ0T2JzZXJ2aW5nQ29va2llQ2hhbmdlcygpOwogCiAgICAgcmV0 dXJuIG1hbmFnZXI7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0 ay9XZWJLaXREb3dubG9hZENsaWVudC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L2d0ay9XZWJLaXREb3dubG9hZENsaWVudC5jcHAKaW5kZXggNzljMWMzZTJhZGQ0OWRmY2U4ODJl Yjc5OWIzNjcwZDVlZTQ3OTQxNS4uMWE0ZWJhNjhiMDE3ZTExMDgwYTEwMjEyOTQ1ZmYwYzFiNDYx ODY3YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0 RG93bmxvYWRDbGllbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3Rr L1dlYktpdERvd25sb2FkQ2xpZW50LmNwcApAQCAtOTUsOSArOTUsMTEgQEAgc3RhdGljIHZvaWQg ZGlkRmluaXNoKFdLQ29udGV4dFJlZiB3a0NvbnRleHQsIFdLRG93bmxvYWRSZWYgd2tEb3dubG9h ZCwgY29uc3Qgdm8KIAogdm9pZCBhdHRhY2hEb3dubG9hZENsaWVudFRvQ29udGV4dChXZWJLaXRX ZWJDb250ZXh0KiB3ZWJDb250ZXh0KQogewotICAgIFdLQ29udGV4dERvd25sb2FkQ2xpZW50IHdr RG93bmxvYWRDbGllbnQgPSB7Ci0gICAgICAgIGtXS0NvbnRleHREb3dubG9hZENsaWVudEN1cnJl bnRWZXJzaW9uLAotICAgICAgICB3ZWJDb250ZXh0LCAvLyBDbGllbnRJbmZvCisgICAgV0tDb250 ZXh0RG93bmxvYWRDbGllbnRWMCB3a0Rvd25sb2FkQ2xpZW50ID0geworICAgICAgICB7CisgICAg ICAgICAgICAwLCAvLyB2ZXJzaW9uCisgICAgICAgICAgICB3ZWJDb250ZXh0LCAvLyBDbGllbnRJ bmZvCisgICAgICAgIH0sCiAgICAgICAgIGRpZFN0YXJ0LAogICAgICAgICAwLCAvLyBkaWRSZWNl aXZlQXV0aGVudGljYXRpb25DaGFsbGVuZ2UKICAgICAgICAgZGlkUmVjZWl2ZVJlc3BvbnNlLApA QCAtMTEwLDYgKzExMiw2IEBAIHZvaWQgYXR0YWNoRG93bmxvYWRDbGllbnRUb0NvbnRleHQoV2Vi S2l0V2ViQ29udGV4dCogd2ViQ29udGV4dCkKICAgICAgICAgZGlkQ2FuY2VsLAogICAgICAgICAw LCAvLyBwcm9jZXNzRGlkQ3Jhc2gKICAgICB9OwotICAgIFdLQ29udGV4dFNldERvd25sb2FkQ2xp ZW50KHRvQVBJKHdlYmtpdFdlYkNvbnRleHRHZXRDb250ZXh0KHdlYkNvbnRleHQpKSwgJndrRG93 bmxvYWRDbGllbnQpOworICAgIFdLQ29udGV4dFNldERvd25sb2FkQ2xpZW50KHRvQVBJKHdlYmtp dFdlYkNvbnRleHRHZXRDb250ZXh0KHdlYkNvbnRleHQpKSwgJndrRG93bmxvYWRDbGllbnQuYmFz ZSk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dl YktpdEZhdmljb25EYXRhYmFzZS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0 ay9XZWJLaXRGYXZpY29uRGF0YWJhc2UuY3BwCmluZGV4IDY3YzhmZDQzMDQ5MmUyMWQxOGE4ZDdh MTM3NmQ1MjYzM2EzMGMxOWIuLmMwMmE4MzRkYjlkNTI5NmNiMGQ4ZjdhZGZiM2Q3YjRjNjQ4MzQy ZmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdEZh dmljb25EYXRhYmFzZS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsv V2ViS2l0RmF2aWNvbkRhdGFiYXNlLmNwcApAQCAtMjE0LDE0ICsyMTQsMTYgQEAgV2ViS2l0RmF2 aWNvbkRhdGFiYXNlKiB3ZWJraXRGYXZpY29uRGF0YWJhc2VDcmVhdGUoV2ViSWNvbkRhdGFiYXNl KiBpY29uRGF0YWJhc2UKICAgICBXZWJLaXRGYXZpY29uRGF0YWJhc2UqIGZhdmljb25EYXRhYmFz ZSA9IFdFQktJVF9GQVZJQ09OX0RBVEFCQVNFKGdfb2JqZWN0X25ldyhXRUJLSVRfVFlQRV9GQVZJ Q09OX0RBVEFCQVNFLCBOVUxMKSk7CiAgICAgZmF2aWNvbkRhdGFiYXNlLT5wcml2LT5pY29uRGF0 YWJhc2UgPSBpY29uRGF0YWJhc2U7CiAKLSAgICBXS0ljb25EYXRhYmFzZUNsaWVudCB3a0ljb25E YXRhYmFzZUNsaWVudCA9IHsKLSAgICAgICAga1dLSWNvbkRhdGFiYXNlQ2xpZW50Q3VycmVudFZl cnNpb24sCi0gICAgICAgIGZhdmljb25EYXRhYmFzZSwgLy8gY2xpZW50SW5mbworICAgIFdLSWNv bkRhdGFiYXNlQ2xpZW50VjEgd2tJY29uRGF0YWJhc2VDbGllbnQgPSB7CisgICAgICAgIHsKKyAg ICAgICAgICAgIDEsIC8vIHZlcnNpb24KKyAgICAgICAgICAgIGZhdmljb25EYXRhYmFzZSwgLy8g Y2xpZW50SW5mbworICAgICAgICB9LAogICAgICAgICBkaWRDaGFuZ2VJY29uRm9yUGFnZVVSTENh bGxiYWNrLAogICAgICAgICAwLCAvLyBkaWRSZW1vdmVBbGxJY29uc0NhbGxiYWNrCiAgICAgICAg IGljb25EYXRhUmVhZHlGb3JQYWdlVVJMQ2FsbGJhY2ssCiAgICAgfTsKLSAgICBXS0ljb25EYXRh YmFzZVNldEljb25EYXRhYmFzZUNsaWVudCh0b0FQSShpY29uRGF0YWJhc2UpLCAmd2tJY29uRGF0 YWJhc2VDbGllbnQpOworICAgIFdLSWNvbkRhdGFiYXNlU2V0SWNvbkRhdGFiYXNlQ2xpZW50KHRv QVBJKGljb25EYXRhYmFzZSksICZ3a0ljb25EYXRhYmFzZUNsaWVudC5iYXNlKTsKICAgICByZXR1 cm4gZmF2aWNvbkRhdGFiYXNlOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL2d0ay9XZWJLaXRGaW5kQ29udHJvbGxlci5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRGaW5kQ29udHJvbGxlci5jcHAKaW5kZXggNTE2YzU4MjM3 YTQ0NjQyMGI4MWY1ZDI5M2EzYjAwOGU3NWYyZGVlNy4uODc1OTMwNmUyYmNmMWY5NjFlNTc4NDFj YjE0NmI2MGZjMjZkNTlmNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9ndGsvV2ViS2l0RmluZENvbnRyb2xsZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvZ3RrL1dlYktpdEZpbmRDb250cm9sbGVyLmNwcApAQCAtMTExLDE1ICsxMTEsMTcg QEAgc3RhdGljIGlubGluZSBXZWJQYWdlUHJveHkqIGdldFBhZ2UoV2ViS2l0RmluZENvbnRyb2xs ZXIqIGZpbmRDb250cm9sbGVyKQogc3RhdGljIHZvaWQgd2Via2l0RmluZENvbnRyb2xsZXJDb25z dHJ1Y3RlZChHT2JqZWN0KiBvYmplY3QpCiB7CiAgICAgV2ViS2l0RmluZENvbnRyb2xsZXIqIGZp bmRDb250cm9sbGVyID0gV0VCS0lUX0ZJTkRfQ09OVFJPTExFUihvYmplY3QpOwotICAgIFdLUGFn ZUZpbmRDbGllbnQgd2tGaW5kQ2xpZW50ID0gewotICAgICAgICBrV0tQYWdlRmluZENsaWVudEN1 cnJlbnRWZXJzaW9uLAotICAgICAgICBmaW5kQ29udHJvbGxlciwgLy8gY2xpZW50SW5mbworICAg IFdLUGFnZUZpbmRDbGllbnRWMCB3a0ZpbmRDbGllbnQgPSB7CisgICAgICAgIHsKKyAgICAgICAg ICAgIDAsIC8vIHZlcnNpb24KKyAgICAgICAgICAgIGZpbmRDb250cm9sbGVyLCAvLyBjbGllbnRJ bmZvCisgICAgICAgIH0sCiAgICAgICAgIGRpZEZpbmRTdHJpbmcsCiAgICAgICAgIGRpZEZhaWxU b0ZpbmRTdHJpbmcsCiAgICAgICAgIGRpZENvdW50U3RyaW5nTWF0Y2hlcwogICAgIH07CiAKLSAg ICBXS1BhZ2VTZXRQYWdlRmluZENsaWVudCh0b0FQSShnZXRQYWdlKGZpbmRDb250cm9sbGVyKSks ICZ3a0ZpbmRDbGllbnQpOworICAgIFdLUGFnZVNldFBhZ2VGaW5kQ2xpZW50KHRvQVBJKGdldFBh Z2UoZmluZENvbnRyb2xsZXIpKSwgJndrRmluZENsaWVudC5iYXNlKTsKIH0KIAogc3RhdGljIHZv aWQgd2Via2l0RmluZENvbnRyb2xsZXJHZXRQcm9wZXJ0eShHT2JqZWN0KiBvYmplY3QsIGd1aW50 IHByb3BJZCwgR1ZhbHVlKiB2YWx1ZSwgR1BhcmFtU3BlYyogcGFyYW1TcGVjKQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0Rm9ybUNsaWVudC5jcHAg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRGb3JtQ2xpZW50LmNwcApp bmRleCA3NTk3OGNmMTMyMGIwYmI5YmY5ZGYxYTQyMjAxNjZhZDBlY2I5NzI0Li5hMDdmMDQ5NDg3 OWU3NzExZDk0ODBhMTc0Yzk2MDk3NjlmZTY1NTBhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRGb3JtQ2xpZW50LmNwcAorKysgYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRGb3JtQ2xpZW50LmNwcApAQCAtMzYsMTEgKzM2 LDEzIEBAIHN0YXRpYyB2b2lkIHdpbGxTdWJtaXRGb3JtKFdLUGFnZVJlZiBwYWdlLCBXS0ZyYW1l UmVmIGZyYW1lLCBXS0ZyYW1lUmVmIHNvdXJjZUZyCiAKIHZvaWQgYXR0YWNoRm9ybUNsaWVudFRv VmlldyhXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3KQogewotICAgIFdLUGFnZUZvcm1DbGllbnQgd2tG b3JtQ2xpZW50ID0gewotICAgICAgICBrV0tQYWdlRm9ybUNsaWVudEN1cnJlbnRWZXJzaW9uLAot ICAgICAgICB3ZWJWaWV3LCAvLyBjbGllbnRJbmZvCisgICAgV0tQYWdlRm9ybUNsaWVudFYwIHdr Rm9ybUNsaWVudCA9IHsKKyAgICAgICAgeworICAgICAgICAgICAgMCwgLy8gdmVyc2lvbgorICAg ICAgICAgICAgd2ViVmlldywgLy8gY2xpZW50SW5mbworICAgICAgICB9LAogICAgICAgICB3aWxs U3VibWl0Rm9ybQogICAgIH07CiAgICAgV0tQYWdlUmVmIHdrUGFnZSA9IHRvQVBJKHdlYmtpdFdl YlZpZXdCYXNlR2V0UGFnZShXRUJLSVRfV0VCX1ZJRVdfQkFTRSh3ZWJWaWV3KSkpOwotICAgIFdL UGFnZVNldFBhZ2VGb3JtQ2xpZW50KHdrUGFnZSwgJndrRm9ybUNsaWVudCk7CisgICAgV0tQYWdl U2V0UGFnZUZvcm1DbGllbnQod2tQYWdlLCAmd2tGb3JtQ2xpZW50LmJhc2UpOwogfQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0R2VvbG9jYXRpb25Q cm92aWRlci5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRHZW9s b2NhdGlvblByb3ZpZGVyLmNwcAppbmRleCBjZGVhYzkxN2RiZmZhMTM1MDQ5M2EwMDUwYjdhMzlh ZDUxNTdmOTM1Li4yNjFhYmY4MWE3OTQzNzVjNTUwNWQ0MDYxY2JhODQ0NzYyMWUyMzA0IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRHZW9sb2NhdGlv blByb3ZpZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJL aXRHZW9sb2NhdGlvblByb3ZpZGVyLmNwcApAQCAtNjQsMTMgKzY0LDE2IEBAIFdlYktpdEdlb2xv Y2F0aW9uUHJvdmlkZXI6OldlYktpdEdlb2xvY2F0aW9uUHJvdmlkZXIoV2ViR2VvbG9jYXRpb25N YW5hZ2VyUHJveHkqCiB7CiAgICAgQVNTRVJUKGdlb2xvY2F0aW9uTWFuYWdlcik7CiAKLSAgICBX S0dlb2xvY2F0aW9uUHJvdmlkZXIgd2tHZW9sb2NhdGlvblByb3ZpZGVyID0gewotICAgICAgICBr V0tHZW9sb2NhdGlvblByb3ZpZGVyQ3VycmVudFZlcnNpb24sCi0gICAgICAgIHRoaXMsIC8vIGNs aWVudEluZm8KKyAgICBXS0dlb2xvY2F0aW9uUHJvdmlkZXJWMSB3a0dlb2xvY2F0aW9uUHJvdmlk ZXIgPSB7CisgICAgICAgIHsKKyAgICAgICAgICAgIDEsIC8vIHZlcnNpb24KKyAgICAgICAgICAg IHRoaXMsIC8vIGNsaWVudEluZm8KKyAgICAgICAgfSwKICAgICAgICAgc3RhcnRVcGRhdGluZ0Nh bGxiYWNrLAotICAgICAgICBzdG9wVXBkYXRpbmdDYWxsYmFjaworICAgICAgICBzdG9wVXBkYXRp bmdDYWxsYmFjaywKKyAgICAgICAgMCAvLyBzZXRFbmFibGVIaWdoQWNjdXJhY3kKICAgICB9Owot ICAgIFdLR2VvbG9jYXRpb25NYW5hZ2VyU2V0UHJvdmlkZXIodG9BUEkoZ2VvbG9jYXRpb25NYW5h Z2VyKSwgJndrR2VvbG9jYXRpb25Qcm92aWRlcik7CisgICAgV0tHZW9sb2NhdGlvbk1hbmFnZXJT ZXRQcm92aWRlcih0b0FQSShnZW9sb2NhdGlvbk1hbmFnZXIpLCAmd2tHZW9sb2NhdGlvblByb3Zp ZGVyLmJhc2UpOwogfQogCiB2b2lkIFdlYktpdEdlb2xvY2F0aW9uUHJvdmlkZXI6OnN0YXJ0VXBk YXRpbmcoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2Vi S2l0SW5qZWN0ZWRCdW5kbGVDbGllbnQuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9ndGsvV2ViS2l0SW5qZWN0ZWRCdW5kbGVDbGllbnQuY3BwCmluZGV4IDI2YTZmOGYxMGY2M2Nh YjQ3MmRkY2I2Y2VjZTQxZjVmMGQwODQ5MTYuLjJhNGZkZWFjMWYxN2EyOGIxMjM1MGVmZTcwYWRi MmNkYjJkZTdmMjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3Rr L1dlYktpdEluamVjdGVkQnVuZGxlQ2xpZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL2d0ay9XZWJLaXRJbmplY3RlZEJ1bmRsZUNsaWVudC5jcHAKQEAgLTEyMCwxMiAr MTIwLDE0IEBAIHN0YXRpYyB2b2lkIGRpZFJlY2VpdmVNZXNzYWdlRnJvbUluamVjdGVkQnVuZGxl KFdLQ29udGV4dFJlZiwgV0tTdHJpbmdSZWYgbWVzc2FnCiAKIHZvaWQgYXR0YWNoSW5qZWN0ZWRC dW5kbGVDbGllbnRUb0NvbnRleHQoV2ViS2l0V2ViQ29udGV4dCogd2ViQ29udGV4dCkKIHsKLSAg ICBXS0NvbnRleHRJbmplY3RlZEJ1bmRsZUNsaWVudCB3a0luamVjdGVkQnVuZGxlQ2xpZW50ID0g ewotICAgICAgICBrV0tDb250ZXh0SW5qZWN0ZWRCdW5kbGVDbGllbnRDdXJyZW50VmVyc2lvbiwK LSAgICAgICAgd2ViQ29udGV4dCwgLy8gY2xpZW50SW5mbworICAgIFdLQ29udGV4dEluamVjdGVk QnVuZGxlQ2xpZW50VjEgd2tJbmplY3RlZEJ1bmRsZUNsaWVudCA9IHsKKyAgICAgICAgeworICAg ICAgICAgICAgMCwgLy8gdmVyc2lvbgorICAgICAgICAgICAgd2ViQ29udGV4dCwgLy8gY2xpZW50 SW5mbworICAgICAgICB9LAogICAgICAgICBkaWRSZWNlaXZlTWVzc2FnZUZyb21JbmplY3RlZEJ1 bmRsZSwKICAgICAgICAgMCwgLy8gZGlkUmVjZWl2ZVN5bmNocm9ub3VzTWVzc2FnZUZyb21Jbmpl Y3RlZEJ1bmRsZQogICAgICAgICAwIC8vIGdldEluamVjdGVkQnVuZGxlSW5pdGlhbGl6YXRpb25V c2VyRGF0YQogICAgIH07Ci0gICAgV0tDb250ZXh0U2V0SW5qZWN0ZWRCdW5kbGVDbGllbnQodG9B UEkod2Via2l0V2ViQ29udGV4dEdldENvbnRleHQod2ViQ29udGV4dCkpLCAmd2tJbmplY3RlZEJ1 bmRsZUNsaWVudCk7CisgICAgV0tDb250ZXh0U2V0SW5qZWN0ZWRCdW5kbGVDbGllbnQodG9BUEko d2Via2l0V2ViQ29udGV4dEdldENvbnRleHQod2ViQ29udGV4dCkpLCAmd2tJbmplY3RlZEJ1bmRs ZUNsaWVudC5iYXNlKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvZ3RrL1dlYktpdExvYWRlckNsaWVudC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL2d0ay9XZWJLaXRMb2FkZXJDbGllbnQuY3BwCmluZGV4IGMzYzRhMjNiMmNjZmFhY2M2Yzlh YmEwMjMzMGQ2ZTdmZTY0YjY5MmEuLjZlNGQyZjljN2U3NGNhOTBmZTY4YWU1YzEzY2IxNjYyZGIw NTU1ZDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktp dExvYWRlckNsaWVudC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsv V2ViS2l0TG9hZGVyQ2xpZW50LmNwcApAQCAtMTQwLDkgKzE0MCwxMSBAQCBzdGF0aWMgdm9pZCBw cm9jZXNzRGlkQ3Jhc2goV0tQYWdlUmVmIHBhZ2UsIGNvbnN0IHZvaWQqIGNsaWVudEluZm8pCiAK IHZvaWQgYXR0YWNoTG9hZGVyQ2xpZW50VG9WaWV3KFdlYktpdFdlYlZpZXcqIHdlYlZpZXcpCiB7 Ci0gICAgV0tQYWdlTG9hZGVyQ2xpZW50IHdrTG9hZGVyQ2xpZW50ID0gewotICAgICAgICBrV0tQ YWdlTG9hZGVyQ2xpZW50Q3VycmVudFZlcnNpb24sCi0gICAgICAgIHdlYlZpZXcsIC8vIGNsaWVu dEluZm8KKyAgICBXS1BhZ2VMb2FkZXJDbGllbnRWMyB3a0xvYWRlckNsaWVudCA9IHsKKyAgICAg ICAgeworICAgICAgICAgICAgMywgLy8gdmVyc2lvbgorICAgICAgICAgICAgd2ViVmlldywgLy8g Y2xpZW50SW5mbworICAgICAgICB9LAogICAgICAgICBkaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZv ckZyYW1lLAogICAgICAgICBkaWRSZWNlaXZlU2VydmVyUmVkaXJlY3RGb3JQcm92aXNpb25hbExv YWRGb3JGcmFtZSwKICAgICAgICAgZGlkRmFpbFByb3Zpc2lvbmFsTG9hZFdpdGhFcnJvckZvckZy YW1lLApAQCAtMTgxLDYgKzE4Myw2IEBAIHZvaWQgYXR0YWNoTG9hZGVyQ2xpZW50VG9WaWV3KFdl YktpdFdlYlZpZXcqIHdlYlZpZXcpCiAgICAgICAgIDAsIC8vIHBsdWdpbkxvYWRQb2xpY3kKICAg ICB9OwogICAgIFdLUGFnZVJlZiB3a1BhZ2UgPSB0b0FQSSh3ZWJraXRXZWJWaWV3QmFzZUdldFBh Z2UoV0VCS0lUX1dFQl9WSUVXX0JBU0Uod2ViVmlldykpKTsKLSAgICBXS1BhZ2VTZXRQYWdlTG9h ZGVyQ2xpZW50KHdrUGFnZSwgJndrTG9hZGVyQ2xpZW50KTsKKyAgICBXS1BhZ2VTZXRQYWdlTG9h ZGVyQ2xpZW50KHdrUGFnZSwgJndrTG9hZGVyQ2xpZW50LmJhc2UpOwogfQogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRQb2xpY3lDbGllbnQuY3Bw IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0UG9saWN5Q2xpZW50LmNw cAppbmRleCAwZWFhOWJlYzc4ZjU0NWUwNjJiOTFmOWI4ZGRlMWI5ZGNkYjQ0NzNlLi41ZmRjYmU1 Y2MwOWQ5MjAyYzAyMGVkMGJkMzlhMmEzODJlMmQwNDUxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRQb2xpY3lDbGllbnQuY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFBvbGljeUNsaWVudC5jcHAKQEAgLTY4 LDkgKzY4LDExIEBAIHN0YXRpYyB2b2lkIGRlY2lkZVBvbGljeUZvclJlc3BvbnNlKFdLUGFnZVJl ZiBwYWdlLCBXS0ZyYW1lUmVmIGZyYW1lLCBXS1VSTFJlc3BvCiAKIHZvaWQgYXR0YWNoUG9saWN5 Q2xpZW50VG9WaWV3KFdlYktpdFdlYlZpZXcqIHdlYlZpZXcpCiB7Ci0gICAgV0tQYWdlUG9saWN5 Q2xpZW50IHBvbGljeUNsaWVudCA9IHsKLSAgICAgICAga1dLUGFnZVBvbGljeUNsaWVudEN1cnJl bnRWZXJzaW9uLAotICAgICAgICB3ZWJWaWV3LCAvLyBjbGllbnRJbmZvCisgICAgV0tQYWdlUG9s aWN5Q2xpZW50VjEgcG9saWN5Q2xpZW50ID0geworICAgICAgICB7CisgICAgICAgICAgICAxLCAv LyB2ZXJzaW9uCisgICAgICAgICAgICB3ZWJWaWV3LCAvLyBjbGllbnRJbmZvCisgICAgICAgIH0s CiAgICAgICAgIDAsIC8vIGRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb25fZGVwcmVjYXRl ZEZvclVzZVdpdGhWMAogICAgICAgICBkZWNpZGVQb2xpY3lGb3JOZXdXaW5kb3dBY3Rpb24sCiAg ICAgICAgIDAsIC8vIGRlY2lkZVBvbGljeUZvclJlc3BvbnNlX2RlcHJlY2F0ZWRGb3JVc2VXaXRo VjAKQEAgLTc4LDUgKzgwLDUgQEAgdm9pZCBhdHRhY2hQb2xpY3lDbGllbnRUb1ZpZXcoV2ViS2l0 V2ViVmlldyogd2ViVmlldykKICAgICAgICAgZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlv biwKICAgICAgICAgZGVjaWRlUG9saWN5Rm9yUmVzcG9uc2UKICAgICB9OwotICAgIFdLUGFnZVNl dFBhZ2VQb2xpY3lDbGllbnQodG9BUEkod2Via2l0V2ViVmlld0Jhc2VHZXRQYWdlKFdFQktJVF9X RUJfVklFV19CQVNFKHdlYlZpZXcpKSksICZwb2xpY3lDbGllbnQpOworICAgIFdLUGFnZVNldFBh Z2VQb2xpY3lDbGllbnQodG9BUEkod2Via2l0V2ViVmlld0Jhc2VHZXRQYWdlKFdFQktJVF9XRUJf VklFV19CQVNFKHdlYlZpZXcpKSksICZwb2xpY3lDbGllbnQuYmFzZSk7CiB9CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRVSUNsaWVudC5jcHAgYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRVSUNsaWVudC5jcHAKaW5kZXgg MDg5OWI4NTYzODk0YTQwMDVhMTI4MzFmNjVlM2Y5ZWIyYjY3MjhjOC4uNDgzYjgyNzg2MGNlNjU3 MmYzY2Y3YmM1MzU3YWVkNWZiNTI4OGFlMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9ndGsvV2ViS2l0VUlDbGllbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFVJQ2xpZW50LmNwcApAQCAtMTYwLDkgKzE2MCwxMSBAQCBz dGF0aWMgdm9pZCBydW5Nb2RhbChXS1BhZ2VSZWYgcGFnZSwgY29uc3Qgdm9pZCogY2xpZW50SW5m bykKIAogdm9pZCBhdHRhY2hVSUNsaWVudFRvVmlldyhXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3KQog ewotICAgIFdLUGFnZVVJQ2xpZW50IHdrVUlDbGllbnQgPSB7Ci0gICAgICAgIGtXS1BhZ2VVSUNs aWVudEN1cnJlbnRWZXJzaW9uLAotICAgICAgICB3ZWJWaWV3LCAvLyBjbGllbnRJbmZvCisgICAg V0tQYWdlVUlDbGllbnRWMiB3a1VJQ2xpZW50ID0geworICAgICAgICB7CisgICAgICAgICAgICAy LCAvLyB2ZXJzaW9uCisgICAgICAgICAgICB3ZWJWaWV3LCAvLyBjbGllbnRJbmZvCisgICAgICAg IH0sCiAgICAgICAgIDAsIC8vIGNyZWF0ZU5ld1BhZ2VfZGVwcmVjYXRlZEZvclVzZVdpdGhWMAog ICAgICAgICBzaG93UGFnZSwKICAgICAgICAgY2xvc2VQYWdlLApAQCAtMjExLDYgKzIxMyw2IEBA IHZvaWQgYXR0YWNoVUlDbGllbnRUb1ZpZXcoV2ViS2l0V2ViVmlldyogd2ViVmlldykKICAgICAg ICAgMCwgLy8gcGx1Z2luTG9hZFBvbGljeQogICAgIH07CiAgICAgV0tQYWdlUmVmIHdrUGFnZSA9 IHRvQVBJKHdlYmtpdFdlYlZpZXdCYXNlR2V0UGFnZShXRUJLSVRfV0VCX1ZJRVdfQkFTRSh3ZWJW aWV3KSkpOwotICAgIFdLUGFnZVNldFBhZ2VVSUNsaWVudCh3a1BhZ2UsICZ3a1VJQ2xpZW50KTsK KyAgICBXS1BhZ2VTZXRQYWdlVUlDbGllbnQod2tQYWdlLCAmd2tVSUNsaWVudC5iYXNlKTsKIH0K IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9B UEkvZ3RrL1dlYktpdFdlYkV4dGVuc2lvbi5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNz L0luamVjdGVkQnVuZGxlL0FQSS9ndGsvV2ViS2l0V2ViRXh0ZW5zaW9uLmNwcAppbmRleCA0MDc0 ZTU5NDdlNmUwOTZiMWIwY2VkODljMTA1YTk0OTM2ZWJlNWRkLi40MGQwNWJiMzEwZDNhZjFmYjcx MGIxMTA5Njc4YzRkNGVmZjBjYjg5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9j ZXNzL0luamVjdGVkQnVuZGxlL0FQSS9ndGsvV2ViS2l0V2ViRXh0ZW5zaW9uLmNwcAorKysgYi9T b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9ndGsvV2ViS2l0V2Vi RXh0ZW5zaW9uLmNwcApAQCAtMTE2LDE2ICsxMTYsMTggQEAgV2ViS2l0V2ViRXh0ZW5zaW9uKiB3 ZWJraXRXZWJFeHRlbnNpb25DcmVhdGUoSW5qZWN0ZWRCdW5kbGUqIGJ1bmRsZSkKIHsKICAgICBX ZWJLaXRXZWJFeHRlbnNpb24qIGV4dGVuc2lvbiA9IFdFQktJVF9XRUJfRVhURU5TSU9OKGdfb2Jq ZWN0X25ldyhXRUJLSVRfVFlQRV9XRUJfRVhURU5TSU9OLCBOVUxMKSk7CiAKLSAgICBXS0J1bmRs ZUNsaWVudCB3a0J1bmRsZUNsaWVudCA9IHsKLSAgICAgICAga1dLQnVuZGxlQ2xpZW50Q3VycmVu dFZlcnNpb24sCi0gICAgICAgIGV4dGVuc2lvbiwgLy8gY2xpZW50SW5mbworICAgIFdLQnVuZGxl Q2xpZW50VjEgd2tCdW5kbGVDbGllbnQgPSB7CisgICAgICAgIHsKKyAgICAgICAgICAgIDEsIC8v IHZlcnNpb24KKyAgICAgICAgICAgIGV4dGVuc2lvbiwgLy8gY2xpZW50SW5mbworICAgICAgICB9 LAogICAgICAgICBkaWRDcmVhdGVQYWdlLAogICAgICAgICB3aWxsRGVzdHJveVBhZ2UsCiAgICAg ICAgIDAsIC8vIGRpZEluaXRpYWxpemVQYWdlR3JvdXAKICAgICAgICAgZGlkUmVjZWl2ZU1lc3Nh Z2UsCiAgICAgICAgIGRpZFJlY2VpdmVNZXNzYWdlVG9QYWdlCiAgICAgfTsKLSAgICBXS0J1bmRs ZVNldENsaWVudCh0b0FQSShidW5kbGUpLCAmd2tCdW5kbGVDbGllbnQpOworICAgIFdLQnVuZGxl U2V0Q2xpZW50KHRvQVBJKGJ1bmRsZSksICZ3a0J1bmRsZUNsaWVudC5iYXNlKTsKIAogICAgIHJl dHVybiBleHRlbnNpb247CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNz L0luamVjdGVkQnVuZGxlL0FQSS9ndGsvV2ViS2l0V2ViUGFnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9ndGsvV2ViS2l0V2ViUGFnZS5jcHAKaW5k ZXggZTk5OGEyM2U0ZTIzOWUwZjg3NzBlY2FiNzFhZWFiNjBkNGZiMDk3My4uNDc0YTcwOGFkZDMz NTgwMjY5MzhhODFkYzhhNTRlODQzY2QzY2U3YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvZ3RrL1dlYktpdFdlYlBhZ2UuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL2d0ay9XZWJLaXRX ZWJQYWdlLmNwcApAQCAtMzA5LDkgKzMwOSwxMSBAQCBXZWJLaXRXZWJQYWdlKiB3ZWJraXRXZWJQ YWdlQ3JlYXRlKFdlYlBhZ2UqIHdlYlBhZ2UpCiAgICAgV2ViS2l0V2ViUGFnZSogcGFnZSA9IFdF QktJVF9XRUJfUEFHRShnX29iamVjdF9uZXcoV0VCS0lUX1RZUEVfV0VCX1BBR0UsIE5VTEwpKTsK ICAgICBwYWdlLT5wcml2LT53ZWJQYWdlID0gd2ViUGFnZTsKIAotICAgIFdLQnVuZGxlUGFnZUxv YWRlckNsaWVudCBsb2FkZXJDbGllbnQgPSB7Ci0gICAgICAgIGtXS0J1bmRsZVBhZ2VMb2FkZXJD bGllbnRDdXJyZW50VmVyc2lvbiwKLSAgICAgICAgcGFnZSwKKyAgICBXS0J1bmRsZVBhZ2VMb2Fk ZXJDbGllbnRWNyBsb2FkZXJDbGllbnQgPSB7CisgICAgICAgIHsKKyAgICAgICAgICAgIDcsIC8v IHZlcnNpb24KKyAgICAgICAgICAgIHBhZ2UsIC8vIGNsaWVudEluZm8KKyAgICAgICAgfSwKICAg ICAgICAgZGlkU3RhcnRQcm92aXNpb25hbExvYWRGb3JGcmFtZSwKICAgICAgICAgZGlkUmVjZWl2 ZVNlcnZlclJlZGlyZWN0Rm9yUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUsCiAgICAgICAgIDAsIC8v IGRpZEZhaWxQcm92aXNpb25hbExvYWRXaXRoRXJyb3JGb3JGcmFtZQpAQCAtMzQ4LDExICszNTAs MTMgQEAgV2ViS2l0V2ViUGFnZSogd2Via2l0V2ViUGFnZUNyZWF0ZShXZWJQYWdlKiB3ZWJQYWdl KQogICAgICAgICAwLCAvLyB3aWxsTG9hZERhdGFSZXF1ZXN0CiAgICAgICAgIHdpbGxEZXN0cm95 RnJhbWUKICAgICB9OwotICAgIFdLQnVuZGxlUGFnZVNldFBhZ2VMb2FkZXJDbGllbnQodG9BUEko d2ViUGFnZSksICZsb2FkZXJDbGllbnQpOworICAgIFdLQnVuZGxlUGFnZVNldFBhZ2VMb2FkZXJD bGllbnQodG9BUEkod2ViUGFnZSksICZsb2FkZXJDbGllbnQuYmFzZSk7CiAKLSAgICBXS0J1bmRs ZVBhZ2VSZXNvdXJjZUxvYWRDbGllbnQgcmVzb3VyY2VMb2FkQ2xpZW50ID0gewotICAgICAgICBr V0tCdW5kbGVQYWdlUmVzb3VyY2VMb2FkQ2xpZW50Q3VycmVudFZlcnNpb24sCi0gICAgICAgIHBh Z2UsCisgICAgV0tCdW5kbGVQYWdlUmVzb3VyY2VMb2FkQ2xpZW50VjEgcmVzb3VyY2VMb2FkQ2xp ZW50ID0geworICAgICAgICB7CisgICAgICAgICAgICAxLCAvLyB2ZXJzaW9uCisgICAgICAgICAg ICBwYWdlLCAvLyBjbGllbnRJbmZvCisgICAgICAgIH0sCiAgICAgICAgIGRpZEluaXRpYXRlTG9h ZEZvclJlc291cmNlLAogICAgICAgICB3aWxsU2VuZFJlcXVlc3RGb3JGcmFtZSwKICAgICAgICAg ZGlkUmVjZWl2ZVJlc3BvbnNlRm9yUmVzb3VyY2UsCkBAIC0zNjIsNyArMzY2LDcgQEAgV2ViS2l0 V2ViUGFnZSogd2Via2l0V2ViUGFnZUNyZWF0ZShXZWJQYWdlKiB3ZWJQYWdlKQogICAgICAgICAw LCAvLyBzaG91bGRDYWNoZVJlc3BvbnNlCiAgICAgICAgIDAgLy8gc2hvdWxkVXNlQ3JlZGVudGlh bFN0b3JhZ2UKICAgICB9OwotICAgIFdLQnVuZGxlUGFnZVNldFJlc291cmNlTG9hZENsaWVudCh0 b0FQSSh3ZWJQYWdlKSwgJnJlc291cmNlTG9hZENsaWVudCk7CisgICAgV0tCdW5kbGVQYWdlU2V0 UmVzb3VyY2VMb2FkQ2xpZW50KHRvQVBJKHdlYlBhZ2UpLCAmcmVzb3VyY2VMb2FkQ2xpZW50LmJh c2UpOwogCiAgICAgcmV0dXJuIHBhZ2U7CiB9Cg==