146117 2015-06-18 12:26:58 -0700 Fix crash when entering fullscreen during exit fullscreen animation. 2015-06-18 16:58:06 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) iPhone / iPad Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jeremyj-wk jeremyj-wk commit-queue simon.fraser oldest_to_newest 1102993 0 jeremyj-wk 2015-06-18 12:26:58 -0700 Fix crash when entering fullscreen during exit fullscreen animation. 1102999 1 255123 jeremyj-wk 2015-06-18 12:36:04 -0700 Created attachment 255123 Patch 1103000 2 jeremyj-wk 2015-06-18 12:36:58 -0700 rdar://problem/20692847 1103024 3 255123 simon.fraser 2015-06-18 13:45:36 -0700 Comment on attachment 255123 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=255123&action=review > Source/WebCore/ChangeLog:8 > + If exitFullscreen is called from javascript, it may be called from mainThread. I don't think this line adds anything. 1103061 4 255144 jeremyj-wk 2015-06-18 15:43:33 -0700 Created attachment 255144 Patch for landing. 1103062 5 jeremyj-wk 2015-06-18 15:43:51 -0700 (In reply to comment #3) > Comment on attachment 255123 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=255123&action=review > > > Source/WebCore/ChangeLog:8 > > + If exitFullscreen is called from javascript, it may be called from mainThread. > > I don't think this line adds anything. Removed. 1103084 6 255144 commit-queue 2015-06-18 16:39:38 -0700 Comment on attachment 255144 Patch for landing. Clearing flags on attachment: 255144 Committed r185726: <http://trac.webkit.org/changeset/185726> 255123 2015-06-18 12:36:04 -0700 2015-06-18 13:45:36 -0700 Patch bug-146117-20150618123527.patch text/plain 6584 jeremyj-wk U3VidmVyc2lvbiBSZXZpc2lvbjogMTg1MTY2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzVmYzFiNmEzZTIwYWVk NjIzZGYyYzg3Y2YxMTJiNmMwMjgwMDg5My4uYzc2ZDlhMjNkOWM2MjBkNWFmNjdmZTNmNGE0ZjUz YzE0ZjdjZGU5NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE1LTA2LTE4ICBKZXJl bXkgSm9uZXMgIDxqZXJlbXlqQGFwcGxlLmNvbT4KKworICAgICAgICBGaXggY3Jhc2ggd2hlbiBl bnRlcmluZyBmdWxsc2NyZWVuIGR1cmluZyBleGl0IGZ1bGxzY3JlZW4gYW5pbWF0aW9uLgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ2MTE3CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSWYgZXhpdEZ1bGxz Y3JlZW4gaXMgY2FsbGVkIGZyb20gamF2YXNjcmlwdCwgaXQgbWF5IGJlIGNhbGxlZCBmcm9tIG1h aW5UaHJlYWQuCisgICAgICAgIEJlY2F1c2UgZW50ZXJGdWxsc2NyZWVuIGNhbiBiZSBjYWxsZWQg ZHVyaW5nIGV4aXRGdWxsc2NyZWVuIGFuaW1hdGlvbiwgdGhlIGV4aXQgZnVsbHNjcmVlbiB0ZWFy ZG93bgorICAgICAgICBzaG91bGQgbm90IGltcGx5IGEgZnVsbHNjcmVlbiBzdGF0ZSBjaGFuZ2Ug b24gdmlkZW8gZWxlbWVudC4KKworICAgICAgICAqIHBsYXRmb3JtL2lvcy9XZWJWaWRlb0Z1bGxz Y3JlZW5Db250cm9sbGVyQVZLaXQubW06CisgICAgICAgIChXZWJWaWRlb0Z1bGxzY3JlZW5Db250 cm9sbGVyQ29udGV4dDo6ZXhpdEZ1bGxzY3JlZW4pOiBNYXkgYmUgY2FsbGVkIGZyb20gbWFpblRo cmVhZAorICAgICAgICAoLVtXZWJWaWRlb0Z1bGxzY3JlZW5Db250cm9sbGVyIGV4aXRGdWxsc2Ny ZWVuXSk6IE1heSBiZSBjYWxsZWQgZnJvbSBtYWluVGhyZWFkCisgICAgICAgICogcGxhdGZvcm0v aW9zL1dlYlZpZGVvRnVsbHNjcmVlbk1vZGVsVmlkZW9FbGVtZW50Lm1tOgorICAgICAgICAoV2Vi VmlkZW9GdWxsc2NyZWVuTW9kZWxWaWRlb0VsZW1lbnQ6OnNldFZpZGVvRWxlbWVudCk6IAorICAg ICAgICBDaGFuZ2luZyBhc3NvY2lhdGVkIHZpZGVvIGVsZW1lbnQgZG9lcyBub3QgaW1wbHkgZnVs bHNjcmVlbiBtb2RlIGNoYW5nZS4KKwogMjAxNS0wNi0wMyAgRGFuaWVsIEJhdGVzICA8ZGFiYXRl c0BhcHBsZS5jb20+CiAKICAgICAgICAgQXV0b0ZpbGwgYnV0dG9uIHNob3VsZCBub3QgYmUgc2hv d24gaW4gcmVhZC1vbmx5IG9yIGRpc2FibGVkIGZpZWxkCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMDI3OWFjMmNl NWIwNTI3ZTQxNjcwN2IxMWJkMGQzZDRiMjkyNTgzNy4uNWVlODk4YjExODNlZTMzN2U0MDFlZjZm MzBiOGZmMDNmNWY2MDAzMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisr KyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE1LTA2LTE4 ICBKZXJlbXkgSm9uZXMgIDxqZXJlbXlqQGFwcGxlLmNvbT4KKworICAgICAgICBGaXggY3Jhc2gg d2hlbiBlbnRlcmluZyBmdWxsc2NyZWVuIGR1cmluZyBleGl0IGZ1bGxzY3JlZW4gYW5pbWF0aW9u LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ2MTE3 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQSBwYXJ0 aWFsIHRlYXJkb3duIGxlZnQgdGhlIExheWVySG9zdGluZ0NvbnRleHQgaW4gYSBiYWQgc3RhdGUg d2hlbiBhdHRlbXB0aW5nIHRvIHJldXNlIHRoZSBtb2RlbCBhbmQgaW50ZXJmYWNlCisgICAgICAg IG9iamVjdHMuIEluc3RlYWQsIGNvbXBsZXRlIHRoZSB0ZWFyZG93biBhbmQgZG9uJ3QgcmV1c2Ug dGhlIG9iamVjdHMuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL2lvcy9XZWJWaWRlb0Z1bGxzY3Jl ZW5NYW5hZ2VyLm1tOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWRlb0Z1bGxzY3JlZW5NYW5hZ2Vy OjpkaWRFbnRlckZ1bGxzY3JlZW4pOiBXZWJUaHJlYWRSdW4gaXMgYSBuby1vcCBpbiBXSzIuIFVz ZSBkaXNwYXRjaF9hc3luYy4KKyAgICAgICAgKFdlYktpdDo6V2ViVmlkZW9GdWxsc2NyZWVuTWFu YWdlcjo6ZGlkQ2xlYW51cEZ1bGxzY3JlZW4pOiBEbyBjb21wbGV0ZSB0ZWFyZG93biBiZWZvcmUg ZW50ZXJpbmcgZnVsbHNjcmVlbiBhZ2Fpbi4KKwogMjAxNS0wNi0wMiAgSHl1bmd3b29rIExlZSAg PGh5dW5nd29vay5sZWVAbmF2ZXJjb3JwLmNvbT4KIAogICAgICAgICBbRUZMXSBJbXBsZW1lbnQg bG9hZF9zdGFydGVkIGNhbGxiYWNrIGluIEV3a1BhZ2VDbGllbnQuCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvV2ViVmlkZW9GdWxsc2NyZWVuQ29udHJvbGxlckFWS2l0 Lm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1dlYlZpZGVvRnVsbHNjcmVlbkNvbnRy b2xsZXJBVktpdC5tbQppbmRleCAxN2I2NzJmYmRkZTBhZjc2OWVjNzI2YjhmMDRlNDhjNDJlYzcz NmFiLi5jNzE4ZjE1N2YwOTZiMzU3ZDhkZjAxNGZkODYyM2RjMDlkN2FlOTAxIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvV2ViVmlkZW9GdWxsc2NyZWVuQ29udHJvbGxl ckFWS2l0Lm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9XZWJWaWRlb0Z1bGxz Y3JlZW5Db250cm9sbGVyQVZLaXQubW0KQEAgLTUyOSw3ICs1MjksNyBAQCB2b2lkIFdlYlZpZGVv RnVsbHNjcmVlbkNvbnRyb2xsZXJDb250ZXh0OjpzZXRVcEZ1bGxzY3JlZW4oSFRNTFZpZGVvRWxl bWVudCYgdmlkZQogCiB2b2lkIFdlYlZpZGVvRnVsbHNjcmVlbkNvbnRyb2xsZXJDb250ZXh0Ojpl eGl0RnVsbHNjcmVlbigpCiB7Ci0gICAgQVNTRVJUKFdlYlRocmVhZElzQ3VycmVudCgpKTsKKyAg ICBBU1NFUlQoV2ViVGhyZWFkSXNDdXJyZW50KCkgfHwgaXNNYWluVGhyZWFkKCkpOwogICAgIElu dFJlY3Qgc2NyZWVuUmVjdCA9IG1fdmlkZW9FbGVtZW50LT5zY3JlZW5SZWN0KCk7CiAgICAgUmVm UHRyPFdlYlZpZGVvRnVsbHNjcmVlbkNvbnRyb2xsZXJDb250ZXh0PiBzdHJvbmdUaGlzKHRoaXMp OwogICAgIGRpc3BhdGNoX2FzeW5jKGRpc3BhdGNoX2dldF9tYWluX3F1ZXVlKCksIFtzdHJvbmdU aGlzLCB0aGlzLCBzY3JlZW5SZWN0XSB7CkBAIC01NzcsNyArNTc3LDcgQEAgdm9pZCBXZWJWaWRl b0Z1bGxzY3JlZW5Db250cm9sbGVyQ29udGV4dDo6cmVxdWVzdEhpZGVBbmRFeGl0RnVsbHNjcmVl bigpCiAKIC0gKHZvaWQpZXhpdEZ1bGxzY3JlZW4KIHsKLSAgICBBU1NFUlQoV2ViVGhyZWFkSXND dXJyZW50KCkpOworICAgIEFTU0VSVChXZWJUaHJlYWRJc0N1cnJlbnQoKSB8fCBpc01haW5UaHJl YWQoKSk7CiAgICAgX2NvbnRleHQtPmV4aXRGdWxsc2NyZWVuKCk7CiB9CiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9XZWJWaWRlb0Z1bGxzY3JlZW5Nb2RlbFZpZGVv RWxlbWVudC5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9XZWJWaWRlb0Z1bGxzY3Jl ZW5Nb2RlbFZpZGVvRWxlbWVudC5tbQppbmRleCA3ZmNhZDk0MDA4MmFiOTg5YjdlM2I0OTM1ODU0 YjVmZDAwMGQ0YWQyLi45Yzg5NWFiZjIzY2ZmNDIyMDBmNjM2OGU3NmVlOGY3YTQyMTU2MTBlIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvV2ViVmlkZW9GdWxsc2NyZWVu TW9kZWxWaWRlb0VsZW1lbnQubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1dl YlZpZGVvRnVsbHNjcmVlbk1vZGVsVmlkZW9FbGVtZW50Lm1tCkBAIC04Miw5ICs4Miw2IEBAIHZv aWQgV2ViVmlkZW9GdWxsc2NyZWVuTW9kZWxWaWRlb0VsZW1lbnQ6OnNldFZpZGVvRWxlbWVudChI VE1MVmlkZW9FbGVtZW50KiB2aWRlCiAgICAgaWYgKG1fdmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNl KQogICAgICAgICBtX3ZpZGVvRnVsbHNjcmVlbkludGVyZmFjZS0+cmVzZXRNZWRpYVN0YXRlKCk7 CiAKLSAgICBpZiAobV92aWRlb0VsZW1lbnQgJiYgbV92aWRlb0VsZW1lbnQtPmZ1bGxzY3JlZW5N b2RlKCkpCi0gICAgICAgIG1fdmlkZW9FbGVtZW50LT5mdWxsc2NyZWVuTW9kZUNoYW5nZWQoSFRN TE1lZGlhRWxlbWVudEVudW1zOjpWaWRlb0Z1bGxzY3JlZW5Nb2RlTm9uZSk7Ci0KICAgICBpZiAo bV92aWRlb0VsZW1lbnQgJiYgbV92aWRlb0VsZW1lbnQtPnZpZGVvRnVsbHNjcmVlbkxheWVyKCkp CiAgICAgICAgIG1fdmlkZW9FbGVtZW50LT5zZXRWaWRlb0Z1bGxzY3JlZW5MYXllcihudWxscHRy KTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9pb3MvV2ViVmlkZW9G dWxsc2NyZWVuTWFuYWdlci5tbSBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvaW9zL1dlYlZp ZGVvRnVsbHNjcmVlbk1hbmFnZXIubW0KaW5kZXggY2JkMWVjMjViNjRlNGM5OTgzNDhlNmVlYWY5 YWM2NGU3M2NkOGZkZS4uM2ZlZjY4NzQ1NzE3YjNkNzljNzk3ODAyYmJmYWNiN2Q1ZGM3NzcxZCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9pb3MvV2ViVmlkZW9GdWxsc2Ny ZWVuTWFuYWdlci5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL2lvcy9XZWJWaWRl b0Z1bGxzY3JlZW5NYW5hZ2VyLm1tCkBAIC00NDksNyArNDQ5LDcgQEAgdm9pZCBXZWJWaWRlb0Z1 bGxzY3JlZW5NYW5hZ2VyOjpkaWRFbnRlckZ1bGxzY3JlZW4odWludDY0X3QgY29udGV4dElkKQog CiAgICAgLy8gZXhpdCBmdWxsc2NyZWVuIG5vdyBpZiBpdCB3YXMgcHJldmlvdXNseSByZXF1ZXN0 ZWQgZHVyaW5nIGFuIGFuaW1hdGlvbi4KICAgICBSZWZQdHI8V2ViVmlkZW9GdWxsc2NyZWVuTWFu YWdlcj4gc3Ryb25nVGhpcyh0aGlzKTsKLSAgICBXZWJUaHJlYWRSdW4oW3N0cm9uZ1RoaXMsIHZp ZGVvRWxlbWVudF0geworICAgIGRpc3BhdGNoX2FzeW5jKGRpc3BhdGNoX2dldF9tYWluX3F1ZXVl KCksIFtzdHJvbmdUaGlzLCB2aWRlb0VsZW1lbnRdIHsKICAgICAgICAgc3Ryb25nVGhpcy0+ZXhp dFZpZGVvRnVsbHNjcmVlbkZvclZpZGVvRWxlbWVudCgqdmlkZW9FbGVtZW50KTsKICAgICB9KTsK IH0KQEAgLTQ4MiwyNSArNDgyLDIyIEBAIHZvaWQgV2ViVmlkZW9GdWxsc2NyZWVuTWFuYWdlcjo6 ZGlkQ2xlYW51cEZ1bGxzY3JlZW4odWludDY0X3QgY29udGV4dElkKQogICAgIGludGVyZmFjZS0+ c2V0SXNBbmltYXRpbmcoZmFsc2UpOwogICAgIGludGVyZmFjZS0+c2V0SXNGdWxsc2NyZWVuKGZh bHNlKTsKICAgICBIVE1MTWVkaWFFbGVtZW50RW51bXM6OlZpZGVvRnVsbHNjcmVlbk1vZGUgbW9k ZSA9IGludGVyZmFjZS0+ZnVsbHNjcmVlbk1vZGUoKTsKKyAgICBib29sIHRhcmdldElzRnVsbHNj cmVlbiA9IGludGVyZmFjZS0+dGFyZ2V0SXNGdWxsc2NyZWVuKCk7CiAKICAgICBtb2RlbC0+c2V0 VmlkZW9GdWxsc2NyZWVuTGF5ZXIobmlsKTsKICAgICBSZWZQdHI8SFRNTFZpZGVvRWxlbWVudD4g dmlkZW9FbGVtZW50ID0gbW9kZWwtPnZpZGVvRWxlbWVudCgpOwogCi0gICAgaWYgKCFpbnRlcmZh Y2UtPnRhcmdldElzRnVsbHNjcmVlbigpKSB7Ci0gICAgICAgIG1vZGVsLT5zZXRWaWRlb0VsZW1l bnQobnVsbHB0cik7Ci0gICAgICAgIG1vZGVsLT5zZXRXZWJWaWRlb0Z1bGxzY3JlZW5JbnRlcmZh Y2UobnVsbHB0cik7Ci0gICAgICAgIGludGVyZmFjZS0+aW52YWxpZGF0ZSgpOwotICAgICAgICBt X3ZpZGVvRWxlbWVudHMucmVtb3ZlKHZpZGVvRWxlbWVudC5nZXQoKSk7Ci0gICAgICAgIG1fY29u dGV4dE1hcC5yZW1vdmUoY29udGV4dElkKTsKLSAgICAgICAgcmV0dXJuOwotICAgIH0KKyAgICBt b2RlbC0+c2V0VmlkZW9FbGVtZW50KG51bGxwdHIpOworICAgIG1vZGVsLT5zZXRXZWJWaWRlb0Z1 bGxzY3JlZW5JbnRlcmZhY2UobnVsbHB0cik7CisgICAgaW50ZXJmYWNlLT5pbnZhbGlkYXRlKCk7 CisgICAgbV92aWRlb0VsZW1lbnRzLnJlbW92ZSh2aWRlb0VsZW1lbnQuZ2V0KCkpOworICAgIG1f Y29udGV4dE1hcC5yZW1vdmUoY29udGV4dElkKTsKIAotICAgIGlmICghdmlkZW9FbGVtZW50KQor ICAgIGlmICghdmlkZW9FbGVtZW50IHx8ICF0YXJnZXRJc0Z1bGxzY3JlZW4pCiAgICAgICAgIHJl dHVybjsKIAotICAgIC8vIGV4aXQgZnVsbHNjcmVlbiBub3cgaWYgaXQgd2FzIHByZXZpb3VzbHkg cmVxdWVzdGVkIGR1cmluZyBhbiBhbmltYXRpb24uCiAgICAgUmVmUHRyPFdlYlZpZGVvRnVsbHNj cmVlbk1hbmFnZXI+IHN0cm9uZ1RoaXModGhpcyk7Ci0gICAgV2ViVGhyZWFkUnVuKFtzdHJvbmdU aGlzLCB2aWRlb0VsZW1lbnQsIG1vZGVdIHsKKyAgICBkaXNwYXRjaF9hc3luYyhkaXNwYXRjaF9n ZXRfbWFpbl9xdWV1ZSgpLCBbc3Ryb25nVGhpcywgdmlkZW9FbGVtZW50LCBtb2RlXSB7CiAgICAg ICAgIHN0cm9uZ1RoaXMtPmVudGVyVmlkZW9GdWxsc2NyZWVuRm9yVmlkZW9FbGVtZW50KCp2aWRl b0VsZW1lbnQsIG1vZGUpOwogICAgIH0pOwogfQo= 255144 2015-06-18 15:43:33 -0700 2015-06-18 16:39:38 -0700 Patch for landing. bug-146117-20150618154256.patch text/plain 6492 jeremyj-wk U3VidmVyc2lvbiBSZXZpc2lvbjogMTg1MTY2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzVmYzFiNmEzZTIwYWVk NjIzZGYyYzg3Y2YxMTJiNmMwMjgwMDg5My4uMTRiNjk4ZThiYzNkMmJhYTQxZTFiNjQ1MDZiMTJk YWRhZDQ1NzBhNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE1LTA2LTE4ICBKZXJl bXkgSm9uZXMgIDxqZXJlbXlqQGFwcGxlLmNvbT4KKworICAgICAgICBGaXggY3Jhc2ggd2hlbiBl bnRlcmluZyBmdWxsc2NyZWVuIGR1cmluZyBleGl0IGZ1bGxzY3JlZW4gYW5pbWF0aW9uLgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ2MTE3CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgU2ltb24gRnJhc2VyLgorCisgICAgICAgIEJlY2F1c2UgZW50ZXJG dWxsc2NyZWVuIGNhbiBiZSBjYWxsZWQgZHVyaW5nIGV4aXRGdWxsc2NyZWVuIGFuaW1hdGlvbiwg dGhlIGV4aXQgZnVsbHNjcmVlbiB0ZWFyZG93bgorICAgICAgICBzaG91bGQgbm90IGltcGx5IGEg ZnVsbHNjcmVlbiBzdGF0ZSBjaGFuZ2Ugb24gdmlkZW8gZWxlbWVudC4KKworICAgICAgICAqIHBs YXRmb3JtL2lvcy9XZWJWaWRlb0Z1bGxzY3JlZW5Db250cm9sbGVyQVZLaXQubW06CisgICAgICAg IChXZWJWaWRlb0Z1bGxzY3JlZW5Db250cm9sbGVyQ29udGV4dDo6ZXhpdEZ1bGxzY3JlZW4pOiBN YXkgYmUgY2FsbGVkIGZyb20gbWFpblRocmVhZAorICAgICAgICAoLVtXZWJWaWRlb0Z1bGxzY3Jl ZW5Db250cm9sbGVyIGV4aXRGdWxsc2NyZWVuXSk6IE1heSBiZSBjYWxsZWQgZnJvbSBtYWluVGhy ZWFkCisgICAgICAgICogcGxhdGZvcm0vaW9zL1dlYlZpZGVvRnVsbHNjcmVlbk1vZGVsVmlkZW9F bGVtZW50Lm1tOgorICAgICAgICAoV2ViVmlkZW9GdWxsc2NyZWVuTW9kZWxWaWRlb0VsZW1lbnQ6 OnNldFZpZGVvRWxlbWVudCk6IAorICAgICAgICBDaGFuZ2luZyBhc3NvY2lhdGVkIHZpZGVvIGVs ZW1lbnQgZG9lcyBub3QgaW1wbHkgZnVsbHNjcmVlbiBtb2RlIGNoYW5nZS4KKwogMjAxNS0wNi0w MyAgRGFuaWVsIEJhdGVzICA8ZGFiYXRlc0BhcHBsZS5jb20+CiAKICAgICAgICAgQXV0b0ZpbGwg YnV0dG9uIHNob3VsZCBub3QgYmUgc2hvd24gaW4gcmVhZC1vbmx5IG9yIGRpc2FibGVkIGZpZWxk CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cKaW5kZXggMDI3OWFjMmNlNWIwNTI3ZTQxNjcwN2IxMWJkMGQzZDRiMjkyNTgzNy4u YjBmOTg5ZDQzYmZiNGUwN2ZhYWE5M2MzOTc2YWQzMGNjNmM1ZGMwMSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAt MSwzICsxLDE3IEBACisyMDE1LTA2LTE4ICBKZXJlbXkgSm9uZXMgIDxqZXJlbXlqQGFwcGxlLmNv bT4KKworICAgICAgICBGaXggY3Jhc2ggd2hlbiBlbnRlcmluZyBmdWxsc2NyZWVuIGR1cmluZyBl eGl0IGZ1bGxzY3JlZW4gYW5pbWF0aW9uLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTQ2MTE3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgU2ltb24gRnJh c2VyLgorCisgICAgICAgIEEgcGFydGlhbCB0ZWFyZG93biBsZWZ0IHRoZSBMYXllckhvc3RpbmdD b250ZXh0IGluIGEgYmFkIHN0YXRlIHdoZW4gYXR0ZW1wdGluZyB0byByZXVzZSB0aGUgbW9kZWwg YW5kIGludGVyZmFjZQorICAgICAgICBvYmplY3RzLiBJbnN0ZWFkLCBjb21wbGV0ZSB0aGUgdGVh cmRvd24gYW5kIGRvbid0IHJldXNlIHRoZSBvYmplY3RzLgorCisgICAgICAgICogV2ViUHJvY2Vz cy9pb3MvV2ViVmlkZW9GdWxsc2NyZWVuTWFuYWdlci5tbToKKyAgICAgICAgKFdlYktpdDo6V2Vi VmlkZW9GdWxsc2NyZWVuTWFuYWdlcjo6ZGlkRW50ZXJGdWxsc2NyZWVuKTogV2ViVGhyZWFkUnVu IGlzIGEgbm8tb3AgaW4gV0syLiBVc2UgZGlzcGF0Y2hfYXN5bmMuCisgICAgICAgIChXZWJLaXQ6 OldlYlZpZGVvRnVsbHNjcmVlbk1hbmFnZXI6OmRpZENsZWFudXBGdWxsc2NyZWVuKTogRG8gY29t cGxldGUgdGVhcmRvd24gYmVmb3JlIGVudGVyaW5nIGZ1bGxzY3JlZW4gYWdhaW4uCisKIDIwMTUt MDYtMDIgIEh5dW5nd29vayBMZWUgIDxoeXVuZ3dvb2subGVlQG5hdmVyY29ycC5jb20+CiAKICAg ICAgICAgW0VGTF0gSW1wbGVtZW50IGxvYWRfc3RhcnRlZCBjYWxsYmFjayBpbiBFd2tQYWdlQ2xp ZW50LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1dlYlZpZGVvRnVs bHNjcmVlbkNvbnRyb2xsZXJBVktpdC5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9X ZWJWaWRlb0Z1bGxzY3JlZW5Db250cm9sbGVyQVZLaXQubW0KaW5kZXggMTdiNjcyZmJkZGUwYWY3 NjllYzcyNmI4ZjA0ZTQ4YzQyZWM3MzZhYi4uYzcxOGYxNTdmMDk2YjM1N2Q4ZGYwMTRmZDg2MjNk YzA5ZDdhZTkwMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1dlYlZp ZGVvRnVsbHNjcmVlbkNvbnRyb2xsZXJBVktpdC5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9pb3MvV2ViVmlkZW9GdWxsc2NyZWVuQ29udHJvbGxlckFWS2l0Lm1tCkBAIC01MjksNyAr NTI5LDcgQEAgdm9pZCBXZWJWaWRlb0Z1bGxzY3JlZW5Db250cm9sbGVyQ29udGV4dDo6c2V0VXBG dWxsc2NyZWVuKEhUTUxWaWRlb0VsZW1lbnQmIHZpZGUKIAogdm9pZCBXZWJWaWRlb0Z1bGxzY3Jl ZW5Db250cm9sbGVyQ29udGV4dDo6ZXhpdEZ1bGxzY3JlZW4oKQogewotICAgIEFTU0VSVChXZWJU aHJlYWRJc0N1cnJlbnQoKSk7CisgICAgQVNTRVJUKFdlYlRocmVhZElzQ3VycmVudCgpIHx8IGlz TWFpblRocmVhZCgpKTsKICAgICBJbnRSZWN0IHNjcmVlblJlY3QgPSBtX3ZpZGVvRWxlbWVudC0+ c2NyZWVuUmVjdCgpOwogICAgIFJlZlB0cjxXZWJWaWRlb0Z1bGxzY3JlZW5Db250cm9sbGVyQ29u dGV4dD4gc3Ryb25nVGhpcyh0aGlzKTsKICAgICBkaXNwYXRjaF9hc3luYyhkaXNwYXRjaF9nZXRf bWFpbl9xdWV1ZSgpLCBbc3Ryb25nVGhpcywgdGhpcywgc2NyZWVuUmVjdF0gewpAQCAtNTc3LDcg KzU3Nyw3IEBAIHZvaWQgV2ViVmlkZW9GdWxsc2NyZWVuQ29udHJvbGxlckNvbnRleHQ6OnJlcXVl c3RIaWRlQW5kRXhpdEZ1bGxzY3JlZW4oKQogCiAtICh2b2lkKWV4aXRGdWxsc2NyZWVuCiB7Ci0g ICAgQVNTRVJUKFdlYlRocmVhZElzQ3VycmVudCgpKTsKKyAgICBBU1NFUlQoV2ViVGhyZWFkSXND dXJyZW50KCkgfHwgaXNNYWluVGhyZWFkKCkpOwogICAgIF9jb250ZXh0LT5leGl0RnVsbHNjcmVl bigpOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvV2ViVmlk ZW9GdWxsc2NyZWVuTW9kZWxWaWRlb0VsZW1lbnQubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9pb3MvV2ViVmlkZW9GdWxsc2NyZWVuTW9kZWxWaWRlb0VsZW1lbnQubW0KaW5kZXggN2ZjYWQ5 NDAwODJhYjk4OWI3ZTNiNDkzNTg1NGI1ZmQwMDBkNGFkMi4uOWM4OTVhYmYyM2NmZjQyMjAwZjYz NjhlNzZlZThmN2E0MjE1NjEwZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v aW9zL1dlYlZpZGVvRnVsbHNjcmVlbk1vZGVsVmlkZW9FbGVtZW50Lm1tCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2lvcy9XZWJWaWRlb0Z1bGxzY3JlZW5Nb2RlbFZpZGVvRWxlbWVudC5t bQpAQCAtODIsOSArODIsNiBAQCB2b2lkIFdlYlZpZGVvRnVsbHNjcmVlbk1vZGVsVmlkZW9FbGVt ZW50OjpzZXRWaWRlb0VsZW1lbnQoSFRNTFZpZGVvRWxlbWVudCogdmlkZQogICAgIGlmIChtX3Zp ZGVvRnVsbHNjcmVlbkludGVyZmFjZSkKICAgICAgICAgbV92aWRlb0Z1bGxzY3JlZW5JbnRlcmZh Y2UtPnJlc2V0TWVkaWFTdGF0ZSgpOwogCi0gICAgaWYgKG1fdmlkZW9FbGVtZW50ICYmIG1fdmlk ZW9FbGVtZW50LT5mdWxsc2NyZWVuTW9kZSgpKQotICAgICAgICBtX3ZpZGVvRWxlbWVudC0+ZnVs bHNjcmVlbk1vZGVDaGFuZ2VkKEhUTUxNZWRpYUVsZW1lbnRFbnVtczo6VmlkZW9GdWxsc2NyZWVu TW9kZU5vbmUpOwotCiAgICAgaWYgKG1fdmlkZW9FbGVtZW50ICYmIG1fdmlkZW9FbGVtZW50LT52 aWRlb0Z1bGxzY3JlZW5MYXllcigpKQogICAgICAgICBtX3ZpZGVvRWxlbWVudC0+c2V0VmlkZW9G dWxsc2NyZWVuTGF5ZXIobnVsbHB0cik7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3MvaW9zL1dlYlZpZGVvRnVsbHNjcmVlbk1hbmFnZXIubW0gYi9Tb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL2lvcy9XZWJWaWRlb0Z1bGxzY3JlZW5NYW5hZ2VyLm1tCmluZGV4IGNiZDFl YzI1YjY0ZTRjOTk4MzQ4ZTZlZWFmOWFjNjRlNzNjZDhmZGUuLjNmZWY2ODc0NTcxN2IzZDc5Yzc5 NzgwMmJiZmFjYjdkNWRjNzc3MWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nl c3MvaW9zL1dlYlZpZGVvRnVsbHNjcmVlbk1hbmFnZXIubW0KKysrIGIvU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9pb3MvV2ViVmlkZW9GdWxsc2NyZWVuTWFuYWdlci5tbQpAQCAtNDQ5LDcgKzQ0 OSw3IEBAIHZvaWQgV2ViVmlkZW9GdWxsc2NyZWVuTWFuYWdlcjo6ZGlkRW50ZXJGdWxsc2NyZWVu KHVpbnQ2NF90IGNvbnRleHRJZCkKIAogICAgIC8vIGV4aXQgZnVsbHNjcmVlbiBub3cgaWYgaXQg d2FzIHByZXZpb3VzbHkgcmVxdWVzdGVkIGR1cmluZyBhbiBhbmltYXRpb24uCiAgICAgUmVmUHRy PFdlYlZpZGVvRnVsbHNjcmVlbk1hbmFnZXI+IHN0cm9uZ1RoaXModGhpcyk7Ci0gICAgV2ViVGhy ZWFkUnVuKFtzdHJvbmdUaGlzLCB2aWRlb0VsZW1lbnRdIHsKKyAgICBkaXNwYXRjaF9hc3luYyhk aXNwYXRjaF9nZXRfbWFpbl9xdWV1ZSgpLCBbc3Ryb25nVGhpcywgdmlkZW9FbGVtZW50XSB7CiAg ICAgICAgIHN0cm9uZ1RoaXMtPmV4aXRWaWRlb0Z1bGxzY3JlZW5Gb3JWaWRlb0VsZW1lbnQoKnZp ZGVvRWxlbWVudCk7CiAgICAgfSk7CiB9CkBAIC00ODIsMjUgKzQ4MiwyMiBAQCB2b2lkIFdlYlZp ZGVvRnVsbHNjcmVlbk1hbmFnZXI6OmRpZENsZWFudXBGdWxsc2NyZWVuKHVpbnQ2NF90IGNvbnRl eHRJZCkKICAgICBpbnRlcmZhY2UtPnNldElzQW5pbWF0aW5nKGZhbHNlKTsKICAgICBpbnRlcmZh Y2UtPnNldElzRnVsbHNjcmVlbihmYWxzZSk7CiAgICAgSFRNTE1lZGlhRWxlbWVudEVudW1zOjpW aWRlb0Z1bGxzY3JlZW5Nb2RlIG1vZGUgPSBpbnRlcmZhY2UtPmZ1bGxzY3JlZW5Nb2RlKCk7Cisg ICAgYm9vbCB0YXJnZXRJc0Z1bGxzY3JlZW4gPSBpbnRlcmZhY2UtPnRhcmdldElzRnVsbHNjcmVl bigpOwogCiAgICAgbW9kZWwtPnNldFZpZGVvRnVsbHNjcmVlbkxheWVyKG5pbCk7CiAgICAgUmVm UHRyPEhUTUxWaWRlb0VsZW1lbnQ+IHZpZGVvRWxlbWVudCA9IG1vZGVsLT52aWRlb0VsZW1lbnQo KTsKIAotICAgIGlmICghaW50ZXJmYWNlLT50YXJnZXRJc0Z1bGxzY3JlZW4oKSkgewotICAgICAg ICBtb2RlbC0+c2V0VmlkZW9FbGVtZW50KG51bGxwdHIpOwotICAgICAgICBtb2RlbC0+c2V0V2Vi VmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlKG51bGxwdHIpOwotICAgICAgICBpbnRlcmZhY2UtPmlu dmFsaWRhdGUoKTsKLSAgICAgICAgbV92aWRlb0VsZW1lbnRzLnJlbW92ZSh2aWRlb0VsZW1lbnQu Z2V0KCkpOwotICAgICAgICBtX2NvbnRleHRNYXAucmVtb3ZlKGNvbnRleHRJZCk7Ci0gICAgICAg IHJldHVybjsKLSAgICB9CisgICAgbW9kZWwtPnNldFZpZGVvRWxlbWVudChudWxscHRyKTsKKyAg ICBtb2RlbC0+c2V0V2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlKG51bGxwdHIpOworICAgIGlu dGVyZmFjZS0+aW52YWxpZGF0ZSgpOworICAgIG1fdmlkZW9FbGVtZW50cy5yZW1vdmUodmlkZW9F bGVtZW50LmdldCgpKTsKKyAgICBtX2NvbnRleHRNYXAucmVtb3ZlKGNvbnRleHRJZCk7CiAKLSAg ICBpZiAoIXZpZGVvRWxlbWVudCkKKyAgICBpZiAoIXZpZGVvRWxlbWVudCB8fCAhdGFyZ2V0SXNG dWxsc2NyZWVuKQogICAgICAgICByZXR1cm47CiAKLSAgICAvLyBleGl0IGZ1bGxzY3JlZW4gbm93 IGlmIGl0IHdhcyBwcmV2aW91c2x5IHJlcXVlc3RlZCBkdXJpbmcgYW4gYW5pbWF0aW9uLgogICAg IFJlZlB0cjxXZWJWaWRlb0Z1bGxzY3JlZW5NYW5hZ2VyPiBzdHJvbmdUaGlzKHRoaXMpOwotICAg IFdlYlRocmVhZFJ1bihbc3Ryb25nVGhpcywgdmlkZW9FbGVtZW50LCBtb2RlXSB7CisgICAgZGlz cGF0Y2hfYXN5bmMoZGlzcGF0Y2hfZ2V0X21haW5fcXVldWUoKSwgW3N0cm9uZ1RoaXMsIHZpZGVv RWxlbWVudCwgbW9kZV0gewogICAgICAgICBzdHJvbmdUaGlzLT5lbnRlclZpZGVvRnVsbHNjcmVl bkZvclZpZGVvRWxlbWVudCgqdmlkZW9FbGVtZW50LCBtb2RlKTsKICAgICB9KTsKIH0K