168528 2017-02-17 12:30:46 -0800 [WK2] Action sheet should not dismiss when a DDAction with user interface is being presented 2017-02-20 08:43:46 -0800 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 wenson_hsieh wenson_hsieh bdakin commit-queue thorton webkit-bug-importer oldest_to_newest 1278361 0 wenson_hsieh 2017-02-17 12:30:46 -0800 <rdar://problem/30515324> 1278369 1 301968 wenson_hsieh 2017-02-17 12:47:36 -0800 Created attachment 301968 Patch 1278406 2 301980 wenson_hsieh 2017-02-17 13:31:03 -0800 Created attachment 301980 Patch for landing 1278418 3 301980 commit-queue 2017-02-17 13:45:23 -0800 Comment on attachment 301980 Patch for landing Clearing flags on attachment: 301980 Committed r212574: <http://trac.webkit.org/changeset/212574> 301968 2017-02-17 12:47:36 -0800 2017-02-17 12:54:00 -0800 Patch bug-168528-20170217124458.patch text/plain 5447 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjEyNTA3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggOGI0NTIyNzYxYmZjYzEw NzY4YTU0NDhmYWE2ODI4NmM2ZTYzY2Q3Mi4uYzhiMTliNmVjNzQ3ZmRjODZhM2I0NDlmNmU0NGEx Mzg3ZGQwYmY1NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE3LTAyLTE3ICBXZW5z b24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgorCisgICAgICAgIFtXSzJdIEFjdGlv biBzaGVldCBzaG91bGQgbm90IGRpc21pc3Mgd2hlbiBhIEREQWN0aW9uIHdpdGggdXNlciBpbnRl cmZhY2UgaXMgYmVpbmcgcHJlc2VudGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xNjg1MjgKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzMwNTE1MzI0 PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFmdGVy IHIyMTE2NDMsIC1bV0tBY3Rpb25TaGVldCBkb25lV2l0aFNoZWV0XSBub3cgZGlzbWlzc2VzIHRo ZSBwcmVzZW50aW5nIHZpZXcgY29udHJvbGxlci4gVGhpcyBpcyBjYWxsZWQgd2hlbgorICAgICAg ICBpbnRlcmFjdGlvbiB3aXRoIHRoZSBzaGVldCBpcyBmaW5pc2hlZCBhbmQgaXMgYSByZWFzb25h YmxlIHRoaW5nIHRvIGRvIGluIG1vc3QgY2FzZXMuIEhvd2V2ZXIsIHdoZW4gdXNpbmcgZGF0YQor ICAgICAgICBkZXRlY3RvcnMsIHdlIGRvbid0IHdhbnQgdG8gZGlzbWlzcyB0aGUgcHJlc2VudGlu ZyB2aWV3IGNvbnRyb2xsZXIsIHNpbmNlIERhdGFEZXRlY3RvciBoYW5kbGVzIGRpc21pc3Npbmcg b24gaXRzCisgICAgICAgIG93biBhbmQgZXhwZWN0cyB0aGF0IGl0cyBjb21wbGV0aW9uIGhhbmRs ZXIgd2lsbCBiZSBpbnZva2VkLgorCisgICAgICAgIFRvIGZpeCB0aGlzLCB3ZSBhZGQgYSBwYXJh bWV0ZXIgdG8gZG9uZVdpdGhTaGVldDogdG8gaW5kaWNhdGUgd2hldGhlciBvciBub3Qgd2Ugc2hv dWxkIGFkZGl0aW9uYWxseSBkaXNtaXNzIHRoZQorICAgICAgICBwcmVzZW50aW5nIHZpZXcgY29u dHJvbGxlciwgYW5kIHBhc3MgaW4gTk8gaW4gdGhlIGNhc2Ugd2hlcmUgd2UgYXJlIGhhbmRsaW5n IGNvbnRyb2wgb3ZlciB0byBEYXRhRGV0ZWN0b3IuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9z L1dLQWN0aW9uU2hlZXQuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dLQWN0aW9uU2hlZXQu bW06CisgICAgICAgICgtW1dLQWN0aW9uU2hlZXQgZG9uZVdpdGhTaGVldDpdKToKKyAgICAgICAg KC1bV0tBY3Rpb25TaGVldCBkb25lV2l0aFNoZWV0XSk6IERlbGV0ZWQuCisgICAgICAgICogVUlQ cm9jZXNzL2lvcy9XS0FjdGlvblNoZWV0QXNzaXN0YW50Lm1tOgorICAgICAgICAoLVtXS0FjdGlv blNoZWV0QXNzaXN0YW50IHNob3dEYXRhRGV0ZWN0b3JzU2hlZXRdKToKKyAgICAgICAgKC1bV0tB Y3Rpb25TaGVldEFzc2lzdGFudCBjbGVhbnVwU2hlZXRdKToKKwogMjAxNy0wMi0xNiAgV2Vuc29u IEhzaWVoICA8d2Vuc29uX2hzaWVoQGFwcGxlLmNvbT4KIAogICAgICAgICBbV0syXSBBZGQgYWRk aXRpb25hbCB0ZXN0IGluZnJhc3RydWN0dXJlIGFuZCB1bml0IHRlc3RzIGZvciBkYXRhIGludGVy YWN0aW9uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1dLQWN0aW9u U2hlZXQuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV0tBY3Rpb25TaGVldC5oCmlu ZGV4IGUzYmE4ODQxMjk2Yzc5YTNjYTEzMmU2ZWFjZDU4YWQ4YmI4MzQ4MTUuLmMyZTAwZGRkYjE4 ZTBjNTYwNmUyY2QwZTI2NDc2OWFjNzE2NmFmZDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9pb3MvV0tBY3Rpb25TaGVldC5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9pb3MvV0tBY3Rpb25TaGVldC5oCkBAIC00MSw3ICs0MSw3IEBAIHR5cGVkZWYgTlNfRU5V TShOU0ludGVnZXIsIFdLQWN0aW9uU2hlZXRQcmVzZW50YXRpb25TdHlsZSkgewogCiBAcHJvcGVy dHkgKG5vbmF0b21pYywgYXNzaWduKSBpZCA8V0tBY3Rpb25TaGVldERlbGVnYXRlPiBzaGVldERl bGVnYXRlOwogQHByb3BlcnR5IChub25hdG9taWMpIFVJUG9wb3ZlckFycm93RGlyZWN0aW9uIGFy cm93RGlyZWN0aW9uczsKLS0gKHZvaWQpZG9uZVdpdGhTaGVldDsKKy0gKHZvaWQpZG9uZVdpdGhT aGVldDooQk9PTClkaXNtaXNzOwogLSAoQk9PTClwcmVzZW50U2hlZXQ6KFdLQWN0aW9uU2hlZXRQ cmVzZW50YXRpb25TdHlsZSlzdHlsZTsKIC0gKEJPT0wpcHJlc2VudFNoZWV0RnJvbVJlY3Q6KENH UmVjdClwcmVzZW50YXRpb25SZWN0OwogLSAodm9pZCl1cGRhdGVTaGVldFBvc2l0aW9uOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9XS0FjdGlvblNoZWV0Lm1tIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9XS0FjdGlvblNoZWV0Lm1tCmluZGV4IDkwZDA3 NTZmYTcwNmE1OTMzMjlmMTJmZjhlZmViZWRlOTMxODI1YzcuLjZmYjI5NTc0NTM5OWNjMzJhNWVk YWE4NDE1NDJmNjIyY2Q4OWRlNTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9pb3MvV0tBY3Rpb25TaGVldC5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9z L1dLQWN0aW9uU2hlZXQubW0KQEAgLTExOSw5ICsxMTksOSBAQAogICAgIHJldHVybiBZRVM7CiB9 CiAKLS0gKHZvaWQpZG9uZVdpdGhTaGVldAorLSAodm9pZClkb25lV2l0aFNoZWV0OihCT09MKWRp c21pc3MKIHsKLSAgICBpZiAoX2N1cnJlbnRQcmVzZW50aW5nVmlld0NvbnRyb2xsZXIpCisgICAg aWYgKGRpc21pc3MgJiYgX2N1cnJlbnRQcmVzZW50aW5nVmlld0NvbnRyb2xsZXIpCiAgICAgICAg IFtfY3VycmVudFByZXNlbnRpbmdWaWV3Q29udHJvbGxlciBkaXNtaXNzVmlld0NvbnRyb2xsZXJB bmltYXRlZDpZRVMgY29tcGxldGlvbjpuaWxdOwogCiAgICAgX2N1cnJlbnRQcmVzZW50aW5nVmll d0NvbnRyb2xsZXIgPSBuaWw7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv aW9zL1dLQWN0aW9uU2hlZXRBc3Npc3RhbnQubW0gYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv aW9zL1dLQWN0aW9uU2hlZXRBc3Npc3RhbnQubW0KaW5kZXggNzFlMzk4ZDRlMTZkOGYyMjJmZDhj NjNjYTg2NjEyMTNiYTEyOWQ5Ni4uMTE4OWRkZDAwMjk4NjczYTI0NTBjMmQ0NzVmMzhlNjg2ZTQ0 MGZkOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9XS0FjdGlvblNo ZWV0QXNzaXN0YW50Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV0tBY3Rp b25TaGVldEFzc2lzdGFudC5tbQpAQCAtOTAsNiArOTAsNyBAQCBzdGF0aWMgTFNBcHBMaW5rICph cHBMaW5rRm9yVVJMKE5TVVJMICp1cmwpCiAgICAgUmV0YWluUHRyPF9XS0FjdGl2YXRlZEVsZW1l bnRJbmZvPiBfZWxlbWVudEluZm87CiAgICAgVUlWaWV3ICpfdmlldzsKICAgICBCT09MIF9uZWVk c0xpbmtJbmRpY2F0b3I7CisgICAgQk9PTCBfaXNQcmVzZW50aW5nRERVc2VySW50ZXJmYWNlOwog fQogCiAtIChpZCA8V0tBY3Rpb25TaGVldEFzc2lzdGFudERlbGVnYXRlPilkZWxlZ2F0ZQpAQCAt NTQ1LDEwICs1NDYsMTAgQEAgc3RhdGljIGNvbnN0IENHRmxvYXQgcHJlc2VudGF0aW9uRWxlbWVu dFJlY3RQYWRkaW5nID0gMTU7CiAgICAgTlNNdXRhYmxlQXJyYXkgKmVsZW1lbnRBY3Rpb25zID0g W05TTXV0YWJsZUFycmF5IGFycmF5XTsKICAgICBmb3IgKE5TVUludGVnZXIgYWN0aW9uTnVtYmVy ID0gMDsgYWN0aW9uTnVtYmVyIDwgW2RhdGFEZXRlY3RvcnNBY3Rpb25zIGNvdW50XTsgYWN0aW9u TnVtYmVyKyspIHsKICAgICAgICAgRERBY3Rpb24gKmFjdGlvbiA9IFtkYXRhRGV0ZWN0b3JzQWN0 aW9ucyBvYmplY3RBdEluZGV4OmFjdGlvbk51bWJlcl07CisgICAgICAgIFJldGFpblB0cjxXS0Fj dGlvblNoZWV0QXNzaXN0YW50PiByZXRhaW5lZFNlbGYgPSBzZWxmOwogICAgICAgICBfV0tFbGVt ZW50QWN0aW9uICplbGVtZW50QWN0aW9uID0gW19XS0VsZW1lbnRBY3Rpb24gZWxlbWVudEFjdGlv bldpdGhUaXRsZTpbYWN0aW9uIGxvY2FsaXplZE5hbWVdIGFjdGlvbkhhbmRsZXI6XihfV0tBY3Rp dmF0ZWRFbGVtZW50SW5mbyAqYWN0aW9uSW5mbykgewotICAgICAgICAgICAgW1tnZXRERERldGVj dGlvbkNvbnRyb2xsZXJDbGFzcygpIHNoYXJlZENvbnRyb2xsZXJdIHBlcmZvcm1BY3Rpb246YWN0 aW9uCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgZnJvbUFsZXJ0Q29udHJvbGxlcjpfaW50ZXJhY3Rpb25TaGVldC5nZXQoKQotICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGludGVy YWN0aW9uRGVsZWdhdGU6c2VsZl07CisgICAgICAgICAgICByZXRhaW5lZFNlbGYuZ2V0KCktPl9p c1ByZXNlbnRpbmdERFVzZXJJbnRlcmZhY2UgPSBhY3Rpb24uaGFzVXNlckludGVyZmFjZTsKKyAg ICAgICAgICAgIFtbZ2V0REREZXRlY3Rpb25Db250cm9sbGVyQ2xhc3MoKSBzaGFyZWRDb250cm9s bGVyXSBwZXJmb3JtQWN0aW9uOmFjdGlvbiBmcm9tQWxlcnRDb250cm9sbGVyOnJldGFpbmVkU2Vs Zi5nZXQoKS0+X2ludGVyYWN0aW9uU2hlZXQuZ2V0KCkgaW50ZXJhY3Rpb25EZWxlZ2F0ZTpyZXRh aW5lZFNlbGYuZ2V0KCldOwogICAgICAgICB9XTsKICAgICAgICAgZWxlbWVudEFjdGlvbi5kaXNt aXNzYWxIYW5kbGVyID0gXnsKICAgICAgICAgICAgIHJldHVybiAoQk9PTCkhYWN0aW9uLmhhc1Vz ZXJJbnRlcmZhY2U7CkBAIC01NzMsMTEgKzU3NCwxMiBAQCBzdGF0aWMgY29uc3QgQ0dGbG9hdCBw cmVzZW50YXRpb25FbGVtZW50UmVjdFBhZGRpbmcgPSAxNTsKICAgICBpZiAoW2RlbGVnYXRlIHJl c3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3IoYWN0aW9uU2hlZXRBc3Npc3RhbnREaWRTdG9wSW50 ZXJhY3Rpb246KV0pCiAgICAgICAgIFtkZWxlZ2F0ZSBhY3Rpb25TaGVldEFzc2lzdGFudERpZFN0 b3BJbnRlcmFjdGlvbjpzZWxmXTsKIAotICAgIFtfaW50ZXJhY3Rpb25TaGVldCBkb25lV2l0aFNo ZWV0XTsKKyAgICBbX2ludGVyYWN0aW9uU2hlZXQgZG9uZVdpdGhTaGVldDohX2lzUHJlc2VudGlu Z0REVXNlckludGVyZmFjZV07CiAgICAgW19pbnRlcmFjdGlvblNoZWV0IHNldFNoZWV0RGVsZWdh dGU6bmlsXTsKICAgICBfaW50ZXJhY3Rpb25TaGVldCA9IG5pbDsKICAgICBfZWxlbWVudEluZm8g PSBuaWw7CiAgICAgX25lZWRzTGlua0luZGljYXRvciA9IE5POworICAgIF9pc1ByZXNlbnRpbmdE RFVzZXJJbnRlcmZhY2UgPSBOTzsKIH0KIAogQGVuZAo= 301980 2017-02-17 13:31:03 -0800 2017-02-17 13:45:23 -0800 Patch for landing bug-168528-20170217132824.patch text/plain 5442 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjEyNTA3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggOGI0NTIyNzYxYmZjYzEw NzY4YTU0NDhmYWE2ODI4NmM2ZTYzY2Q3Mi4uNmY0MWI1M2FhOGZjODU0MzQ1ZTUyOTQxZTdmZjY0 YjU4MWVmNDkyMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE3LTAyLTE3ICBXZW5z b24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgorCisgICAgICAgIFtXSzJdIEFjdGlv biBzaGVldCBzaG91bGQgbm90IGRpc21pc3Mgd2hlbiBhIEREQWN0aW9uIHdpdGggdXNlciBpbnRl cmZhY2UgaXMgYmVpbmcgcHJlc2VudGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xNjg1MjgKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzMwNTE1MzI0 PgorCisgICAgICAgIFJldmlld2VkIGJ5IEJldGggRGFraW4uCisKKyAgICAgICAgQWZ0ZXIgcjIx MTY0MywgLVtXS0FjdGlvblNoZWV0IGRvbmVXaXRoU2hlZXRdIG5vdyBkaXNtaXNzZXMgdGhlIHBy ZXNlbnRpbmcgdmlldyBjb250cm9sbGVyLiBUaGlzIGlzIGNhbGxlZCB3aGVuCisgICAgICAgIGlu dGVyYWN0aW9uIHdpdGggdGhlIHNoZWV0IGlzIGZpbmlzaGVkIGFuZCBpcyBhIHJlYXNvbmFibGUg dGhpbmcgdG8gZG8gaW4gbW9zdCBjYXNlcy4gSG93ZXZlciwgd2hlbiB1c2luZyBkYXRhCisgICAg ICAgIGRldGVjdG9ycywgd2UgZG9uJ3Qgd2FudCB0byBkaXNtaXNzIHRoZSBwcmVzZW50aW5nIHZp ZXcgY29udHJvbGxlciwgc2luY2UgRGF0YURldGVjdG9yIGhhbmRsZXMgZGlzbWlzc2luZyBvbiBp dHMKKyAgICAgICAgb3duIGFuZCBleHBlY3RzIHRoYXQgaXRzIGNvbXBsZXRpb24gaGFuZGxlciB3 aWxsIGJlIGludm9rZWQuCisKKyAgICAgICAgVG8gZml4IHRoaXMsIHdlIGFkZCBhIHBhcmFtZXRl ciB0byBkb25lV2l0aFNoZWV0OiB0byBpbmRpY2F0ZSB3aGV0aGVyIG9yIG5vdCB3ZSBzaG91bGQg YWRkaXRpb25hbGx5IGRpc21pc3MgdGhlCisgICAgICAgIHByZXNlbnRpbmcgdmlldyBjb250cm9s bGVyLCBhbmQgcGFzcyBpbiBOTyBpbiB0aGUgY2FzZSB3aGVyZSB3ZSBhcmUgaGFuZGluZyBjb250 cm9sIG92ZXIgdG8gRGF0YURldGVjdG9yLgorCisgICAgICAgICogVUlQcm9jZXNzL2lvcy9XS0Fj dGlvblNoZWV0Lmg6CisgICAgICAgICogVUlQcm9jZXNzL2lvcy9XS0FjdGlvblNoZWV0Lm1tOgor ICAgICAgICAoLVtXS0FjdGlvblNoZWV0IGRvbmVXaXRoU2hlZXQ6XSk6CisgICAgICAgICgtW1dL QWN0aW9uU2hlZXQgZG9uZVdpdGhTaGVldF0pOiBEZWxldGVkLgorICAgICAgICAqIFVJUHJvY2Vz cy9pb3MvV0tBY3Rpb25TaGVldEFzc2lzdGFudC5tbToKKyAgICAgICAgKC1bV0tBY3Rpb25TaGVl dEFzc2lzdGFudCBzaG93RGF0YURldGVjdG9yc1NoZWV0XSk6CisgICAgICAgICgtW1dLQWN0aW9u U2hlZXRBc3Npc3RhbnQgY2xlYW51cFNoZWV0XSk6CisKIDIwMTctMDItMTYgIFdlbnNvbiBIc2ll aCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CiAKICAgICAgICAgW1dLMl0gQWRkIGFkZGl0aW9u YWwgdGVzdCBpbmZyYXN0cnVjdHVyZSBhbmQgdW5pdCB0ZXN0cyBmb3IgZGF0YSBpbnRlcmFjdGlv bgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9XS0FjdGlvblNoZWV0 LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1dLQWN0aW9uU2hlZXQuaAppbmRleCBl M2JhODg0MTI5NmM3OWEzY2ExMzJlNmVhY2Q1OGFkOGJiODM0ODE1Li5jMmUwMGRkZGIxOGUwYzU2 MDZlMmNkMGUyNjQ3NjlhYzcxNjZhZmQ2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvaW9zL1dLQWN0aW9uU2hlZXQuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv aW9zL1dLQWN0aW9uU2hlZXQuaApAQCAtNDEsNyArNDEsNyBAQCB0eXBlZGVmIE5TX0VOVU0oTlNJ bnRlZ2VyLCBXS0FjdGlvblNoZWV0UHJlc2VudGF0aW9uU3R5bGUpIHsKIAogQHByb3BlcnR5IChu b25hdG9taWMsIGFzc2lnbikgaWQgPFdLQWN0aW9uU2hlZXREZWxlZ2F0ZT4gc2hlZXREZWxlZ2F0 ZTsKIEBwcm9wZXJ0eSAobm9uYXRvbWljKSBVSVBvcG92ZXJBcnJvd0RpcmVjdGlvbiBhcnJvd0Rp cmVjdGlvbnM7Ci0tICh2b2lkKWRvbmVXaXRoU2hlZXQ7CistICh2b2lkKWRvbmVXaXRoU2hlZXQ6 KEJPT0wpZGlzbWlzczsKIC0gKEJPT0wpcHJlc2VudFNoZWV0OihXS0FjdGlvblNoZWV0UHJlc2Vu dGF0aW9uU3R5bGUpc3R5bGU7CiAtIChCT09MKXByZXNlbnRTaGVldEZyb21SZWN0OihDR1JlY3Qp cHJlc2VudGF0aW9uUmVjdDsKIC0gKHZvaWQpdXBkYXRlU2hlZXRQb3NpdGlvbjsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV0tBY3Rpb25TaGVldC5tbSBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV0tBY3Rpb25TaGVldC5tbQppbmRleCA5MGQwNzU2ZmE3 MDZhNTkzMzI5ZjEyZmY4ZWZlYmVkZTkzMTgyNWM3Li42ZmIyOTU3NDUzOTljYzMyYTVlZGFhODQx NTQyZjYyMmNkODlkZTUyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9z L1dLQWN0aW9uU2hlZXQubW0KKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9XS0Fj dGlvblNoZWV0Lm1tCkBAIC0xMTksOSArMTE5LDkgQEAKICAgICByZXR1cm4gWUVTOwogfQogCi0t ICh2b2lkKWRvbmVXaXRoU2hlZXQKKy0gKHZvaWQpZG9uZVdpdGhTaGVldDooQk9PTClkaXNtaXNz CiB7Ci0gICAgaWYgKF9jdXJyZW50UHJlc2VudGluZ1ZpZXdDb250cm9sbGVyKQorICAgIGlmIChk aXNtaXNzICYmIF9jdXJyZW50UHJlc2VudGluZ1ZpZXdDb250cm9sbGVyKQogICAgICAgICBbX2N1 cnJlbnRQcmVzZW50aW5nVmlld0NvbnRyb2xsZXIgZGlzbWlzc1ZpZXdDb250cm9sbGVyQW5pbWF0 ZWQ6WUVTIGNvbXBsZXRpb246bmlsXTsKIAogICAgIF9jdXJyZW50UHJlc2VudGluZ1ZpZXdDb250 cm9sbGVyID0gbmlsOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9X S0FjdGlvblNoZWV0QXNzaXN0YW50Lm1tIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9X S0FjdGlvblNoZWV0QXNzaXN0YW50Lm1tCmluZGV4IDcxZTM5OGQ0ZTE2ZDhmMjIyZmQ4YzYzY2E4 NjYxMjEzYmExMjlkOTYuLjExODlkZGQwMDI5ODY3M2EyNDUwYzJkNDc1ZjM4ZTY4NmU0NDBmZDgg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV0tBY3Rpb25TaGVldEFz c2lzdGFudC5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1dLQWN0aW9uU2hl ZXRBc3Npc3RhbnQubW0KQEAgLTkwLDYgKzkwLDcgQEAgc3RhdGljIExTQXBwTGluayAqYXBwTGlu a0ZvclVSTChOU1VSTCAqdXJsKQogICAgIFJldGFpblB0cjxfV0tBY3RpdmF0ZWRFbGVtZW50SW5m bz4gX2VsZW1lbnRJbmZvOwogICAgIFVJVmlldyAqX3ZpZXc7CiAgICAgQk9PTCBfbmVlZHNMaW5r SW5kaWNhdG9yOworICAgIEJPT0wgX2lzUHJlc2VudGluZ0REVXNlckludGVyZmFjZTsKIH0KIAog LSAoaWQgPFdLQWN0aW9uU2hlZXRBc3Npc3RhbnREZWxlZ2F0ZT4pZGVsZWdhdGUKQEAgLTU0NSwx MCArNTQ2LDEwIEBAIHN0YXRpYyBjb25zdCBDR0Zsb2F0IHByZXNlbnRhdGlvbkVsZW1lbnRSZWN0 UGFkZGluZyA9IDE1OwogICAgIE5TTXV0YWJsZUFycmF5ICplbGVtZW50QWN0aW9ucyA9IFtOU011 dGFibGVBcnJheSBhcnJheV07CiAgICAgZm9yIChOU1VJbnRlZ2VyIGFjdGlvbk51bWJlciA9IDA7 IGFjdGlvbk51bWJlciA8IFtkYXRhRGV0ZWN0b3JzQWN0aW9ucyBjb3VudF07IGFjdGlvbk51bWJl cisrKSB7CiAgICAgICAgIEREQWN0aW9uICphY3Rpb24gPSBbZGF0YURldGVjdG9yc0FjdGlvbnMg b2JqZWN0QXRJbmRleDphY3Rpb25OdW1iZXJdOworICAgICAgICBSZXRhaW5QdHI8V0tBY3Rpb25T aGVldEFzc2lzdGFudD4gcmV0YWluZWRTZWxmID0gc2VsZjsKICAgICAgICAgX1dLRWxlbWVudEFj dGlvbiAqZWxlbWVudEFjdGlvbiA9IFtfV0tFbGVtZW50QWN0aW9uIGVsZW1lbnRBY3Rpb25XaXRo VGl0bGU6W2FjdGlvbiBsb2NhbGl6ZWROYW1lXSBhY3Rpb25IYW5kbGVyOl4oX1dLQWN0aXZhdGVk RWxlbWVudEluZm8gKmFjdGlvbkluZm8pIHsKLSAgICAgICAgICAgIFtbZ2V0REREZXRlY3Rpb25D b250cm9sbGVyQ2xhc3MoKSBzaGFyZWRDb250cm9sbGVyXSBwZXJmb3JtQWN0aW9uOmFjdGlvbgot ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IGZyb21BbGVydENvbnRyb2xsZXI6X2ludGVyYWN0aW9uU2hlZXQuZ2V0KCkKLSAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpbnRlcmFjdGlv bkRlbGVnYXRlOnNlbGZdOworICAgICAgICAgICAgcmV0YWluZWRTZWxmLmdldCgpLT5faXNQcmVz ZW50aW5nRERVc2VySW50ZXJmYWNlID0gYWN0aW9uLmhhc1VzZXJJbnRlcmZhY2U7CisgICAgICAg ICAgICBbW2dldERERGV0ZWN0aW9uQ29udHJvbGxlckNsYXNzKCkgc2hhcmVkQ29udHJvbGxlcl0g cGVyZm9ybUFjdGlvbjphY3Rpb24gZnJvbUFsZXJ0Q29udHJvbGxlcjpyZXRhaW5lZFNlbGYuZ2V0 KCktPl9pbnRlcmFjdGlvblNoZWV0LmdldCgpIGludGVyYWN0aW9uRGVsZWdhdGU6cmV0YWluZWRT ZWxmLmdldCgpXTsKICAgICAgICAgfV07CiAgICAgICAgIGVsZW1lbnRBY3Rpb24uZGlzbWlzc2Fs SGFuZGxlciA9IF57CiAgICAgICAgICAgICByZXR1cm4gKEJPT0wpIWFjdGlvbi5oYXNVc2VySW50 ZXJmYWNlOwpAQCAtNTczLDExICs1NzQsMTIgQEAgc3RhdGljIGNvbnN0IENHRmxvYXQgcHJlc2Vu dGF0aW9uRWxlbWVudFJlY3RQYWRkaW5nID0gMTU7CiAgICAgaWYgKFtkZWxlZ2F0ZSByZXNwb25k c1RvU2VsZWN0b3I6QHNlbGVjdG9yKGFjdGlvblNoZWV0QXNzaXN0YW50RGlkU3RvcEludGVyYWN0 aW9uOildKQogICAgICAgICBbZGVsZWdhdGUgYWN0aW9uU2hlZXRBc3Npc3RhbnREaWRTdG9wSW50 ZXJhY3Rpb246c2VsZl07CiAKLSAgICBbX2ludGVyYWN0aW9uU2hlZXQgZG9uZVdpdGhTaGVldF07 CisgICAgW19pbnRlcmFjdGlvblNoZWV0IGRvbmVXaXRoU2hlZXQ6IV9pc1ByZXNlbnRpbmdERFVz ZXJJbnRlcmZhY2VdOwogICAgIFtfaW50ZXJhY3Rpb25TaGVldCBzZXRTaGVldERlbGVnYXRlOm5p bF07CiAgICAgX2ludGVyYWN0aW9uU2hlZXQgPSBuaWw7CiAgICAgX2VsZW1lbnRJbmZvID0gbmls OwogICAgIF9uZWVkc0xpbmtJbmRpY2F0b3IgPSBOTzsKKyAgICBfaXNQcmVzZW50aW5nRERVc2Vy SW50ZXJmYWNlID0gTk87CiB9CiAKIEBlbmQK