132849 2014-05-12 18:35:34 -0700 [iOS][WK2] When the secondary UIScrollView delegates respond to callbacks, delay the state change until both delegates have finished 2014-05-13 15:48:22 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 benjamin benjamin andersca oldest_to_newest 1008832 0 benjamin 2014-05-12 18:35:34 -0700 [iOS][WK2] When the secondary UIScrollView delegates respond to callbacks, delay the state change until both delegates have finished 1008833 1 231354 benjamin 2014-05-12 18:41:41 -0700 Created attachment 231354 Patch 1008834 2 benjamin 2014-05-12 18:42:09 -0700 <rdar://problem/16863716> 1009114 3 231354 benjamin 2014-05-13 15:48:20 -0700 Comment on attachment 231354 Patch Clearing flags on attachment: 231354 Committed r168747: <http://trac.webkit.org/changeset/168747> 1009115 4 benjamin 2014-05-13 15:48:22 -0700 All reviewed patches have been landed. Closing bug. 231354 2014-05-12 18:41:41 -0700 2014-05-13 15:48:20 -0700 Patch bug-132849-20140512184116.patch text/plain 9181 benjamin U3VidmVyc2lvbiBSZXZpc2lvbjogMTY4NjQ5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZjkyNjhjOTIzYWFhZTM1 MmE0MmExZTRhY2Y2NWEwZDE1MTFmZjY5MS4uMGJkMmY4NjcwZTkzMTI0MmZiNTcyMjZmYTJmOWU5 ODVhOGI3ZDgxNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQwIEBACisyMDE0LTA1LTEyICBCZW5q YW1pbiBQb3VsYWluICA8YnBvdWxhaW5AYXBwbGUuY29tPgorCisgICAgICAgIFtpT1NdW1dLMl0g V2hlbiB0aGUgc2Vjb25kYXJ5IFVJU2Nyb2xsVmlldyBkZWxlZ2F0ZXMgcmVzcG9uZCB0byBjYWxs YmFja3MsIGRlbGF5IHRoZSBzdGF0ZSBjaGFuZ2UgdW50aWwgYm90aCBkZWxlZ2F0ZXMgaGF2ZSBm aW5pc2hlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTMyODQ5CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xNjg2MzcxNj4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXaGVuIHRoZXJlIGFyZSB0d28gZGVs ZWdhdGVzIHJlc3BvbmRpbmcgdG8gVUlTY3JvbGxWaWV3IGNoYW5nZXMsIHRoZXJlIHdhcyBvZnRl biBhbiBpbnRlcm1lZGlhdGUgaW52YWxpZAorICAgICAgICBzdGF0ZSBmb3J3YXJkZWQgdG8gdGhl IFVJUHJvY2Vzcy4KKworICAgICAgICBGb3IgZXhhbXBsZSwgb24gc2Nyb2xsLCBXS1dlYlZpZXcg d291bGQgdXBkYXRlIHRoZSBzdGF0ZSBiYXNlZCBvbiB0aGUgY3VycmVudCBvYnNjdXJlZCBpbnNl dHMgaW4gcmVzcG9uc2UgdG8KKyAgICAgICAgZGVsZWdhdGUgY2FsbGJhY2tzLgorICAgICAgICBB ZnRlciB0aGF0IHVwZGF0ZSwgU2FmYXJpIHdvdWxkIG1vZGlmeSB0aGUgaW5zZXRzLCB0aHVzIHVw ZGF0aW5nIHRoZSBzdGF0ZSBhZ2Fpbi4KKyAgICAgICAgVGhlIGZpcnN0IHN0YXRlIGNoYW5nZWQg YnkgV0tXZWJWaWV3IGlzIGluY29tcGxldGUsIGFuZCBzaG91bGQgbmV2ZXIgaGF2ZSBiZWVuIHNl dC4KKworICAgICAgICBUaGlzIHBhdGNoIHdvcmtzIGFyb3VuZCB0aGUgaXNzdWUgYnkgZGVsYXlp bmcgdmlzaWJsZSB1cGRhdGUgcmVjdCBpbiB0aG9zZSBjYXNlcy4KKworICAgICAgICBXaGVuIHRo ZSB0d28gZGVsZWdhdGVzIG9mIFdLU2Nyb2xsVmlldyByZXNwb25kIHRvIHRoZSBzYW1lIHNlbGVj dG9yLCBXS1Njcm9sbFZpZXcgaW52b2tlcyAKKyAgICAgICAgW1VJV2ViVmlldyBfd2lsbEludm9r ZVVJU2Nyb2xsVmlld0RlbGVnYXRlQ2FsbGJhY2tdIG9uIGVudHJ5LCBhbmQKKyAgICAgICAgW1VJ V2ViVmlldyBfZGlkSW52b2tlVUlTY3JvbGxWaWV3RGVsZWdhdGVDYWxsYmFja10gb24gZXhpdC4K KworICAgICAgICBCZXR3ZWVuIHRob3NlIHR3byBjYWxscywgV0tXZWJWaWV3IGRvZXMgbm90IGZv cndhcmQgdGhlIG5ldyBVSSBzdGF0ZSB0byB0aGUgV2ViUHJvY2Vzcy4KKworICAgICAgICAqIFVJ UHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tOgorICAgICAgICAoLVtXS1dlYlZpZXcgX3dp bGxJbnZva2VVSVNjcm9sbFZpZXdEZWxlZ2F0ZUNhbGxiYWNrXSk6CisgICAgICAgICgtW1dLV2Vi VmlldyBfZGlkSW52b2tlVUlTY3JvbGxWaWV3RGVsZWdhdGVDYWxsYmFja10pOgorICAgICAgICAo LVtXS1dlYlZpZXcgX3VwZGF0ZVZpc2libGVDb250ZW50UmVjdHNdKToKKyAgICAgICAgKiBVSVBy b2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlld0ludGVybmFsLmg6CisgICAgICAgICogVUlQcm9jZXNz L0FQSS9pb3MvV0tWaWV3SU9TLm1tOgorICAgICAgICAoLVtXS1ZpZXcgX2NvbW1vbkluaXRpYWxp emF0aW9uV2l0aENvbnRleHRSZWY6cGFnZUdyb3VwUmVmOnJlbGF0ZWRUb1BhZ2U6XSk6CisgICAg ICAgICogVUlQcm9jZXNzL2lvcy9XS1Njcm9sbFZpZXcuaDoKKyAgICAgICAgKiBVSVByb2Nlc3Mv aW9zL1dLU2Nyb2xsVmlldy5tbToKKyAgICAgICAgKC1bV0tTY3JvbGxWaWV3RGVsZWdhdGVGb3J3 YXJkZXIgaW5pdFdpdGhJbnRlcm5hbERlbGVnYXRlOmV4dGVybmFsRGVsZWdhdGU6XSk6CisgICAg ICAgICgtW1dLU2Nyb2xsVmlld0RlbGVnYXRlRm9yd2FyZGVyIGZvcndhcmRJbnZvY2F0aW9uOl0p OgorICAgICAgICAoLVtXS1Njcm9sbFZpZXcgc2V0SW50ZXJuYWxEZWxlZ2F0ZTpdKToKKwogMjAx NC0wNS0xMiAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgogCiAg ICAgICAgIFByb2dyZXNzIG9uIHdlYiB0aW1pbmcuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tCmluZGV4IGJiNDliOGI1ZjY2YTZjNjA0ZjFlZGIy ODY1Y2EyNDQxMDhkNTlhMjguLjYzZDVlZGUwNmRlYTViYTk0NmQxOTljNDVjZjZjMWMyNTQ1ZmQx OWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJW aWV3Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3 Lm1tCkBAIC0xMjcsNiArMTI3LDkgQEAKICAgICBSZXRhaW5QdHI8VUlWaWV3IDxXS1dlYlZpZXdD b250ZW50UHJvdmlkZXI+PiBfY3VzdG9tQ29udGVudFZpZXc7CiAKICAgICBXZWJDb3JlOjpDb2xv ciBfc2Nyb2xsVmlld0JhY2tncm91bmRDb2xvcjsKKworICAgIEJPT0wgX2RlbGF5VXBkYXRlVmlz aWJsZUNvbnRlbnRSZWN0czsKKyAgICBCT09MIF9oYWREZWxheWVkVXBkYXRlVmlzaWJsZUNvbnRl bnRSZWN0czsKICNlbmRpZgogI2lmIFBMQVRGT1JNKE1BQykKICAgICBSZXRhaW5QdHI8V0tWaWV3 PiBfd2tWaWV3OwpAQCAtNDEyLDYgKzQxNSwyMCBAQAogICAgIFtfY3VzdG9tQ29udGVudFZpZXcg d2ViX3NldENvbnRlbnRQcm92aWRlckRhdGE6ZGF0YSBzdWdnZXN0ZWRGaWxlbmFtZTpzdWdnZXN0 ZWRGaWxlbmFtZV07CiB9CiAKKy0gKHZvaWQpX3dpbGxJbnZva2VVSVNjcm9sbFZpZXdEZWxlZ2F0 ZUNhbGxiYWNrCit7CisgICAgX2RlbGF5VXBkYXRlVmlzaWJsZUNvbnRlbnRSZWN0cyA9IFlFUzsK K30KKworLSAodm9pZClfZGlkSW52b2tlVUlTY3JvbGxWaWV3RGVsZWdhdGVDYWxsYmFjaworewor ICAgIF9kZWxheVVwZGF0ZVZpc2libGVDb250ZW50UmVjdHMgPSBOTzsKKyAgICBpZiAoX2hhZERl bGF5ZWRVcGRhdGVWaXNpYmxlQ29udGVudFJlY3RzKSB7CisgICAgICAgIF9oYWREZWxheWVkVXBk YXRlVmlzaWJsZUNvbnRlbnRSZWN0cyA9IE5POworICAgICAgICBbc2VsZiBfdXBkYXRlVmlzaWJs ZUNvbnRlbnRSZWN0c107CisgICAgfQorfQorCiBzdGF0aWMgQ0dGbG9hdCBjb250ZW50Wm9vbVNj YWxlKFdLV2ViVmlldyogd2ViVmlldykKIHsKICAgICBVSVZpZXcgKnpvb21WaWV3OwpAQCAtNzY4 LDYgKzc4NSwxMSBAQCBzdGF0aWMgaW5saW5lIHZvaWQgc2V0Vmlld3BvcnRDb25maWd1cmF0aW9u TWluaW11bUxheW91dFNpemUoV2ViS2l0OjpXZWJQYWdlUHJveAogICAgIGlmICghW3NlbGYgdXNl c1N0YW5kYXJkQ29udGVudFZpZXddKQogICAgICAgICByZXR1cm47CiAKKyAgICBpZiAoX2RlbGF5 VXBkYXRlVmlzaWJsZUNvbnRlbnRSZWN0cykgeworICAgICAgICBfaGFkRGVsYXllZFVwZGF0ZVZp c2libGVDb250ZW50UmVjdHMgPSBZRVM7CisgICAgICAgIHJldHVybjsKKyAgICB9CisKICAgICBp ZiAoX2lzQW5pbWF0aW5nUmVzaXplKQogICAgICAgICByZXR1cm47CiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3SW50ZXJuYWwuaCBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3SW50ZXJuYWwuaAppbmRl eCBlOTU3ZGYxNzU1MDMxOTM1ZmY2NGRmNDMwY2Q0ZDhhNmY5YWIwYjliLi5jOTM3NzRhNWQ1N2Qy ZDc0MGIwMGNhZTI4YjY1MmVjNzg2Mjc5MDA2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlld0ludGVybmFsLmgKKysrIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXdJbnRlcm5hbC5oCkBAIC03Miw2ICs3Miw5 IEBAIHN0cnVjdCBWaWV3U25hcHNob3Q7CiAKIC0gKHZvaWQpX3NldEhhc0N1c3RvbUNvbnRlbnRW aWV3OihCT09MKWhhc0N1c3RvbUNvbnRlbnRWaWV3IGxvYWRlZE1JTUVUeXBlOihjb25zdCBXVEY6 OlN0cmluZyYpbWltZVR5cGU7CiAtICh2b2lkKV9kaWRGaW5pc2hMb2FkaW5nRGF0YUZvckN1c3Rv bUNvbnRlbnRQcm92aWRlcldpdGhTdWdnZXN0ZWRGaWxlbmFtZTooY29uc3QgV1RGOjpTdHJpbmcm KXN1Z2dlc3RlZEZpbGVuYW1lIGRhdGE6KE5TRGF0YSAqKWRhdGE7CisKKy0gKHZvaWQpX3dpbGxJ bnZva2VVSVNjcm9sbFZpZXdEZWxlZ2F0ZUNhbGxiYWNrOworLSAodm9pZClfZGlkSW52b2tlVUlT Y3JvbGxWaWV3RGVsZWdhdGVDYWxsYmFjazsKICNlbmRpZgogQGVuZAogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2lvcy9XS1ZpZXdJT1MubW0gYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL2lvcy9XS1ZpZXdJT1MubW0KaW5kZXggZmQ5ODZiZjNhMDg1NDYz NDRmYjk4NGUzMWRjZWNkZDEwMTlkODRiYy4uNjcwNTcyYzgyMGRlZDgwY2UxYmUyNGU1OWM0MDJk MTYyYmEyOWQ0YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9pb3Mv V0tWaWV3SU9TLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvaW9zL1dLVmll d0lPUy5tbQpAQCAtMjIxLDcgKzIyMSw2IEBAIHVzaW5nIG5hbWVzcGFjZSBXZWJLaXQ7CiAgICAg Q0dSZWN0IGJvdW5kcyA9IHNlbGYuYm91bmRzOwogCiAgICAgX3Njcm9sbFZpZXcgPSBhZG9wdE5T KFtbV0tTY3JvbGxWaWV3IGFsbG9jXSBpbml0V2l0aEZyYW1lOmJvdW5kc10pOwotICAgIFtfc2Ny b2xsVmlldyBzZXRJbnRlcm5hbERlbGVnYXRlOnNlbGZdOwogICAgIFtfc2Nyb2xsVmlldyBzZXRC b3VuY2VzWm9vbTpZRVNdOwogCiAgICAgW3NlbGYgYWRkU3Vidmlldzpfc2Nyb2xsVmlldy5nZXQo KV07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1dLU2Nyb2xsVmll dy5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9XS1Njcm9sbFZpZXcuaAppbmRleCA5 M2NhOWJlNTcwNjliNGIzMWNlMjA3ZDliNzVmZjAwMTE2YTU0ZDM0Li5hODdmNDc1ZTdkNDRkNjAy OGNjZWUxNDUyYzYzOWQ0YzIwZmIzZTk0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvaW9zL1dLU2Nyb2xsVmlldy5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9p b3MvV0tTY3JvbGxWaWV3LmgKQEAgLTEsNSArMSw1IEBACiAvKgotICogQ29weXJpZ2h0IChDKSAy MDEzIEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAx MywgMjAxNCBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICogUmVkaXN0cmli dXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0 CiAgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93 aW5nIGNvbmRpdGlvbnMKQEAgLTI3LDkgKzI3LDExIEBACiAKICNpbXBvcnQgPFVJS2l0L1VJV2Vi U2Nyb2xsVmlldy5oPgogCitAY2xhc3MgV0tXZWJWaWV3OworCiBAaW50ZXJmYWNlIFdLU2Nyb2xs VmlldyA6IFVJV2ViU2Nyb2xsVmlldwogCi1AcHJvcGVydHkgKG5vbmF0b21pYywgYXNzaWduKSBp ZCA8VUlTY3JvbGxWaWV3RGVsZWdhdGU+IGludGVybmFsRGVsZWdhdGU7CitAcHJvcGVydHkgKG5v bmF0b21pYywgYXNzaWduKSBXS1dlYlZpZXcgPFVJU2Nyb2xsVmlld0RlbGVnYXRlPiAqaW50ZXJu YWxEZWxlZ2F0ZTsKIAogQGVuZAogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvaW9zL1dLU2Nyb2xsVmlldy5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV0tT Y3JvbGxWaWV3Lm1tCmluZGV4IGY0MTIxMGMzOTMwYzAzNDNiMmJlNDYxNDYyMDU0MDZhNTM4NDAx NzUuLjZiOTBiYzMyOTY1Yzc2NjY3MmQ3YmMyYTQyOTRkOGI0YjdhZmE0MGIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV0tTY3JvbGxWaWV3Lm1tCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV0tTY3JvbGxWaWV3Lm1tCkBAIC0xLDUgKzEsNSBAQAog LyoKLSAqIENvcHlyaWdodCAoQykgMjAxMyBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQu CisgKiBDb3B5cmlnaHQgKEMpIDIwMTMsIDIwMTQgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2Vy dmVkLgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkg Zm9ybXMsIHdpdGggb3Igd2l0aG91dAogICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHBy b3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC0yOCw2ICsyOCw3IEBACiAK ICNpZiBQTEFURk9STShJT1MpCiAKKyNpbXBvcnQgIldLV2ViVmlld0ludGVybmFsLmgiCiAjaW1w b3J0IDxDb3JlR3JhcGhpY3MvQ0dGbG9hdC5oPgogCiBAaW50ZXJmYWNlIFVJU2Nyb2xsVmlldyAo VUlTY3JvbGxWaWV3SW50ZXJuYWxIYWNrKQpAQCAtMzYsMTYgKzM3LDE2IEBACiAKIEBpbnRlcmZh Y2UgV0tTY3JvbGxWaWV3RGVsZWdhdGVGb3J3YXJkZXIgOiBOU09iamVjdCA8VUlTY3JvbGxWaWV3 RGVsZWdhdGU+CiAKLS0gKGluc3RhbmNldHlwZSlpbml0V2l0aEludGVybmFsRGVsZWdhdGU6KGlk IDxVSVNjcm9sbFZpZXdEZWxlZ2F0ZT4paW50ZXJuYWxEZWxlZ2F0ZSBleHRlcm5hbERlbGVnYXRl OihpZCA8VUlTY3JvbGxWaWV3RGVsZWdhdGU+KWV4dGVybmFsRGVsZWdhdGU7CistIChpbnN0YW5j ZXR5cGUpaW5pdFdpdGhJbnRlcm5hbERlbGVnYXRlOihXS1dlYlZpZXcgKilpbnRlcm5hbERlbGVn YXRlIGV4dGVybmFsRGVsZWdhdGU6KGlkIDxVSVNjcm9sbFZpZXdEZWxlZ2F0ZT4pZXh0ZXJuYWxE ZWxlZ2F0ZTsKIAogQGVuZAogCiBAaW1wbGVtZW50YXRpb24gV0tTY3JvbGxWaWV3RGVsZWdhdGVG b3J3YXJkZXIgewotICAgIGlkIDxVSVNjcm9sbFZpZXdEZWxlZ2F0ZT4gX2ludGVybmFsRGVsZWdh dGU7CisgICAgV0tXZWJWaWV3ICpfaW50ZXJuYWxEZWxlZ2F0ZTsKICAgICBpZCA8VUlTY3JvbGxW aWV3RGVsZWdhdGU+IF9leHRlcm5hbERlbGVnYXRlOwogfQogCi0tIChpbnN0YW5jZXR5cGUpaW5p dFdpdGhJbnRlcm5hbERlbGVnYXRlOihpZCA8VUlTY3JvbGxWaWV3RGVsZWdhdGU+KWludGVybmFs RGVsZWdhdGUgZXh0ZXJuYWxEZWxlZ2F0ZTooaWQgPFVJU2Nyb2xsVmlld0RlbGVnYXRlPilleHRl cm5hbERlbGVnYXRlCistIChpbnN0YW5jZXR5cGUpaW5pdFdpdGhJbnRlcm5hbERlbGVnYXRlOihX S1dlYlZpZXcgPFVJU2Nyb2xsVmlld0RlbGVnYXRlPiAqKWludGVybmFsRGVsZWdhdGUgZXh0ZXJu YWxEZWxlZ2F0ZTooaWQgPFVJU2Nyb2xsVmlld0RlbGVnYXRlPilleHRlcm5hbERlbGVnYXRlCiB7 CiAgICAgc2VsZiA9IFtzdXBlciBpbml0XTsKICAgICBpZiAoIXNlbGYpCkBAIC03MiwxNiArNzMs MjIgQEAKIAogLSAodm9pZClmb3J3YXJkSW52b2NhdGlvbjooTlNJbnZvY2F0aW9uICopYW5JbnZv Y2F0aW9uCiB7Ci0gICAgQk9PTCBtZXNzYWdlSGFuZGxlZCA9IE5POwotICAgIGlmIChbX2ludGVy bmFsRGVsZWdhdGUgcmVzcG9uZHNUb1NlbGVjdG9yOlthbkludm9jYXRpb24gc2VsZWN0b3JdXSkg eworICAgIFNFTCBhU2VsZWN0b3IgPSBbYW5JbnZvY2F0aW9uIHNlbGVjdG9yXTsKKyAgICBCT09M IGludGVybmFsRGVsZWdhdGVXaWxsUmVzcG9uZCA9IFtfaW50ZXJuYWxEZWxlZ2F0ZSByZXNwb25k c1RvU2VsZWN0b3I6YVNlbGVjdG9yXTsKKyAgICBCT09MIGV4dGVybmFsRGVsZWdhdGVXaWxsUmVz cG9uZCA9IFtfZXh0ZXJuYWxEZWxlZ2F0ZSByZXNwb25kc1RvU2VsZWN0b3I6YVNlbGVjdG9yXTsK KworICAgIGlmIChpbnRlcm5hbERlbGVnYXRlV2lsbFJlc3BvbmQgJiYgZXh0ZXJuYWxEZWxlZ2F0 ZVdpbGxSZXNwb25kKQorICAgICAgICBbX2ludGVybmFsRGVsZWdhdGUgX3dpbGxJbnZva2VVSVNj cm9sbFZpZXdEZWxlZ2F0ZUNhbGxiYWNrXTsKKworICAgIGlmIChpbnRlcm5hbERlbGVnYXRlV2ls bFJlc3BvbmQpCiAgICAgICAgIFthbkludm9jYXRpb24gaW52b2tlV2l0aFRhcmdldDpfaW50ZXJu YWxEZWxlZ2F0ZV07Ci0gICAgICAgIG1lc3NhZ2VIYW5kbGVkID0gWUVTOwotICAgIH0KLSAgICBp ZiAoW19leHRlcm5hbERlbGVnYXRlIHJlc3BvbmRzVG9TZWxlY3RvcjpbYW5JbnZvY2F0aW9uIHNl bGVjdG9yXV0pIHsKKyAgICBpZiAoZXh0ZXJuYWxEZWxlZ2F0ZVdpbGxSZXNwb25kKQogICAgICAg ICBbYW5JbnZvY2F0aW9uIGludm9rZVdpdGhUYXJnZXQ6X2V4dGVybmFsRGVsZWdhdGVdOwotICAg ICAgICBtZXNzYWdlSGFuZGxlZCA9IFlFUzsKLSAgICB9Ci0gICAgaWYgKCFtZXNzYWdlSGFuZGxl ZCkKKworICAgIGlmIChpbnRlcm5hbERlbGVnYXRlV2lsbFJlc3BvbmQgJiYgZXh0ZXJuYWxEZWxl Z2F0ZVdpbGxSZXNwb25kKQorICAgICAgICBbX2ludGVybmFsRGVsZWdhdGUgX2RpZEludm9rZVVJ U2Nyb2xsVmlld0RlbGVnYXRlQ2FsbGJhY2tdOworCisgICAgaWYgKCFpbnRlcm5hbERlbGVnYXRl V2lsbFJlc3BvbmQgJiYgIWV4dGVybmFsRGVsZWdhdGVXaWxsUmVzcG9uZCkKICAgICAgICAgW3N1 cGVyIGZvcndhcmRJbnZvY2F0aW9uOmFuSW52b2NhdGlvbl07CiB9CiAKQEAgLTEwNCw3ICsxMTEs NyBAQAogICAgIFdLU2Nyb2xsVmlld0RlbGVnYXRlRm9yd2FyZGVyICpfZGVsZWdhdGVGb3J3YXJk ZXI7CiB9CiAKLS0gKHZvaWQpc2V0SW50ZXJuYWxEZWxlZ2F0ZTooaWQgPFVJU2Nyb2xsVmlld0Rl bGVnYXRlPilpbnRlcm5hbERlbGVnYXRlCistICh2b2lkKXNldEludGVybmFsRGVsZWdhdGU6KFdL V2ViVmlldyA8VUlTY3JvbGxWaWV3RGVsZWdhdGU+ICopaW50ZXJuYWxEZWxlZ2F0ZQogewogICAg IGlmIChpbnRlcm5hbERlbGVnYXRlID09IF9pbnRlcm5hbERlbGVnYXRlKQogICAgICAgICByZXR1 cm47Cg==