158667 2016-06-11 15:57:57 -0700 Tweak and tighten the code in WebVideoFullscreenManager.mm 2016-12-11 06:42:41 -0800 1 1 1 Unclassified WebKit Media WebKit Nightly Build Unspecified Unspecified RESOLVED WONTFIX P2 Normal --- 1 darin darin adachan cdumez eric.carlson jer.noble oldest_to_newest 1201650 0 darin 2016-06-11 15:57:57 -0700 Tweak and tighten the code in WebVideoFullscreenManager.mm 1201653 1 281112 darin 2016-06-11 16:06:56 -0700 Created attachment 281112 Patch 1201660 2 darin 2016-06-11 16:24:25 -0700 I found some problems in this code and I have a patch with wider scope coming. 1258851 3 darin 2016-12-11 06:42:41 -0800 I might return to this, but I won’t use this bug report. 281112 2016-06-11 16:06:56 -0700 2016-06-11 16:29:14 -0700 Patch bug-158667-20160611160827.patch text/plain 13710 darin U3VidmVyc2lvbiBSZXZpc2lvbjogMjAxOTc5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMDUyYzE3NTE5ZDEzMWRm OGI3MjQ5NGI4ZjVlMDdkYmIxYzY1MzIyNC4uNWE4ZWJiODQzZDhjYzA2YWJkM2FiN2NjZjNkMTYy ZDQ3ZjViODU5YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQwIEBACisyMDE2LTA2LTExICBEYXJp biBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KKworICAgICAgICBUd2VhayBhbmQgdGlnaHRlbiB0 aGUgY29kZSBpbiBXZWJWaWRlb0Z1bGxzY3JlZW5NYW5hZ2VyLm1tCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTg2NjcKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYlByb2Nlc3MvY29jb2EvV2ViVmlk ZW9GdWxsc2NyZWVuTWFuYWdlci5tbToKKyAgICAgICAgKFdlYktpdDo6aW5saW5lVmlkZW9GcmFt ZSk6IFB1bGxlZCBvdXQgdGhlIGhhbGYgb2YgdGhpcyBmdW5jdGlvbiBvbmNlIHdlIGhhdmUgYW4g dXAKKyAgICAgICAgdG8gZGF0ZSByZW5kZXJlciBpbnRvIGEgc2VwYXJhdGUgZnVuY3Rpb24gZm9y IGdyZWF0ZXIgY2xhcml0eS4gR2V0IHRvIHRoZSBzY3JvbGwgdmlldworICAgICAgICB0aHJvdWdo IHRoZSByZW5kZXJlciByYXRoZXIgdGhhbiB0aHJvdWdoIHRoZSBET00uCisgICAgICAgIChXZWJL aXQ6OldlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUNvbnRleHQ6OnNldFNlZWthYmxlUmFuZ2Vz KTogUmVtb3ZlZCB1bm5lZWRlZAorICAgICAgICBXZWJDb3JlIHByZWZpeC4KKyAgICAgICAgKFdl YktpdDo6V2ViVmlkZW9GdWxsc2NyZWVuTWFuYWdlcjo6Y3JlYXRlTW9kZWxBbmRJbnRlcmZhY2Up OiBVc2UgYXV0byBpbnN0ZWFkIG9mCisgICAgICAgIHdyaXRpbmcgb3V0IHR5cGUgbmFtZXMgdHdp Y2UgaW4gbGluZXMgb2YgY29kZSB0aGF0IGNhbGwgY3JlYXRlLgorICAgICAgICAoV2ViS2l0OjpX ZWJWaWRlb0Z1bGxzY3JlZW5NYW5hZ2VyOjplbnN1cmVNb2RlbCk6IFJlbW92ZWQgdW5uZWVkZWQg V2ViQ29yZSBwcmVmaXguCisgICAgICAgIChXZWJLaXQ6OldlYlZpZGVvRnVsbHNjcmVlbk1hbmFn ZXI6OmFkZENsaWVudEZvckNvbnRleHQpOiBVc2UgcHJlaW5jcmVtZW50IGluc3RlYWQKKyAgICAg ICAgb2YgcG9zdGluY3JlbWVudCBzaW5jZSB0aGF0J3Mgb3VyIHVzdWFsIHN0eWxlLgorICAgICAg ICAoV2ViS2l0OjpXZWJWaWRlb0Z1bGxzY3JlZW5NYW5hZ2VyOjpyZW1vdmVDbGllbnRGb3JDb250 ZXh0KTogUmV3cm90ZSB0byBhdm9pZAorICAgICAgICBtdWx0aXBsZSBoYXNoIHRhYmxlIGxvb2t1 cHMuCisgICAgICAgIChXZWJLaXQ6OldlYlZpZGVvRnVsbHNjcmVlbk1hbmFnZXI6OnN1cHBvcnRz VmlkZW9GdWxsc2NyZWVuKTogUmVtb3ZlZCB1bm5lZWRlZAorICAgICAgICBXZWJDb3JlIHByZWZp eCwgYW5kIGFkZGVkIG1pc3NpbmcgVU5VU0VEX1BBUkFNLgorICAgICAgICAoV2ViS2l0OjpXZWJW aWRlb0Z1bGxzY3JlZW5NYW5hZ2VyOjplbnRlclZpZGVvRnVsbHNjcmVlbkZvclZpZGVvRWxlbWVu dCk6IFNpbXBsaWZpZWQKKyAgICAgICAgdGhlIGNvZGUgdG8gc2V0IHVwIHRoZSB2aWRlbyBsYXll ciBmcmFtZS4gRG9uJ3QgY29udmVydCB0byBhIEZsb2F0UmVjdCB1bnRpbCB0aGUKKyAgICAgICAg YWN0dWFsIGxpbmUgb2YgY29kZSB0aGF0IHVzZXMgaXQsIGJlY2F1c2UgdGhlcmUgaXMgbm8gbmVl ZCB0byBkbyBzbyBlYXJsaWVyLiBBbHNvCisgICAgICAgIHVzZSBhdXRvIGluc3RlYWQgb2Ygd3Jp dGluZyBvdXQgdGhlIHJlYWxseSBsb25nIG5hbWUgb2YgdGhlIGVudW1lcmF0aW9uIHR5cGUuCisg ICAgICAgIChXZWJLaXQ6OldlYlZpZGVvRnVsbHNjcmVlbk1hbmFnZXI6OmV4aXRWaWRlb0Z1bGxz Y3JlZW5Gb3JWaWRlb0VsZW1lbnQpOiBSZW1vdmVkCisgICAgICAgIHVubmVlZGVkIFdlYkNvcmUg cHJlZml4LgorICAgICAgICAoV2ViS2l0OjpXZWJWaWRlb0Z1bGxzY3JlZW5NYW5hZ2VyOjpleGl0 VmlkZW9GdWxsc2NyZWVuVG9Nb2RlV2l0aG91dEFuaW1hdGlvbik6IERpdHRvLgorICAgICAgICAo V2ViS2l0OjpXZWJWaWRlb0Z1bGxzY3JlZW5NYW5hZ2VyOjpyZXF1ZXN0RnVsbHNjcmVlbk1vZGUp OiBEaXR0by4KKyAgICAgICAgKFdlYktpdDo6V2ViVmlkZW9GdWxsc2NyZWVuTWFuYWdlcjo6ZnVs bHNjcmVlbk1vZGVDaGFuZ2VkKTogRGl0dG8uCisgICAgICAgIChXZWJLaXQ6OldlYlZpZGVvRnVs bHNjcmVlbk1hbmFnZXI6OmRpZFNldHVwRnVsbHNjcmVlbik6IEFkZGVkIGEgRklYTUU7IGZvciBz b21lIHJlYXNvbgorICAgICAgICB3ZSBkb24ndCBzZXQgdGhlIGxheWVyIG5hbWUgaW4gcHJvZHVj dGlvbiBjb2RlLCBidXQgSSBkb24ndCBzZWUgYSByZWFzb24gbm90IHRvLiBBbHNvCisgICAgICAg IHJlbW92ZWQgYW4gdW5uZWVkZWQgV2ViQ29yZSBwcmVmaXguCisgICAgICAgIChXZWJLaXQ6Oldl YlZpZGVvRnVsbHNjcmVlbk1hbmFnZXI6OmRpZENsZWFudXBGdWxsc2NyZWVuKTogVXNlIGF1dG8u CisgICAgICAgIChXZWJLaXQ6OldlYlZpZGVvRnVsbHNjcmVlbk1hbmFnZXI6OnNldFZpZGVvTGF5 ZXJGcmFtZUZlbmNlZCk6IFNpbXBsaWZpZWQgY29kZSB0byBzZXQgYm91bmRzLgorCiAyMDE2LTA2 LTEwICBBZGEgQ2hhbiAgPGFkYWNoYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFVzZSB0aGUgdmlk ZW8gZWxlbWVudCdzIHZpZGVvIGJveCB3aGVuIGdldHRpbmcgdGhlIGlubGluZSB2aWRlbyByZWN0 IGluIFdlYlZpZGVvRnVsbHNjcmVlbk1hbmFnZXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L1dlYlByb2Nlc3MvY29jb2EvV2ViVmlkZW9GdWxsc2NyZWVuTWFuYWdlci5tbSBiL1NvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvY29jb2EvV2ViVmlkZW9GdWxsc2NyZWVuTWFuYWdlci5tbQppbmRl eCA2ZWY2ZjViZjEyNzJhN2I5YTI4NzFkN2Q0YjcyNGY2MzI2OTQ3NjUwLi44OTY4N2FmMjdiZDQ1 Nzc4ZThlYzY0ZDVkOGUwZWEzNGY5OWYzYmJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL2NvY29hL1dlYlZpZGVvRnVsbHNjcmVlbk1hbmFnZXIubW0KKysrIGIvU291cmNl L1dlYktpdDIvV2ViUHJvY2Vzcy9jb2NvYS9XZWJWaWRlb0Z1bGxzY3JlZW5NYW5hZ2VyLm1tCkBA IC0xLDUgKzEsNSBAQAogLyoKLSAqIENvcHlyaWdodCAoQykgMjAxNCBBcHBsZSBJbmMuIEFsbCBy aWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmlnaHQgKEMpIDIwMTQtMjAxNiBBcHBsZSBJbmMuIEFs bCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3Vy Y2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CiAgKiBtb2RpZmljYXRpb24sIGFy ZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTIy LDYgKzIyLDcgQEAKICAqIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRSBPRiBUSElT IFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YKICAqIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNI IERBTUFHRS4KICAqLworCiAjaW1wb3J0ICJjb25maWcuaCIKICNpbXBvcnQgIldlYlZpZGVvRnVs bHNjcmVlbk1hbmFnZXIuaCIKIApAQCAtNTMsMTUgKzU0LDE4IEBAIHVzaW5nIG5hbWVzcGFjZSBX ZWJDb3JlOwogCiBuYW1lc3BhY2UgV2ViS2l0IHsKIAorc3RhdGljIGlubGluZSBJbnRSZWN0IGlu bGluZVZpZGVvRnJhbWUoUmVuZGVyVmlkZW8mIHJlbmRlcmVyKQoreworICAgIGF1dG8gcmVjdCA9 IHJlbmRlcmVyLnZpZGVvQm94KCk7CisgICAgcmVjdC5tb3ZlQnkocmVuZGVyZXIuYWJzb2x1dGVC b3VuZGluZ0JveFJlY3QoKS5sb2NhdGlvbigpKTsKKyAgICByZXR1cm4gcmVuZGVyZXIudmlldygp LmZyYW1lVmlldygpLmNvbnRlbnRzVG9Sb290VmlldyhyZWN0KTsKK30KKwogc3RhdGljIEludFJl Y3QgaW5saW5lVmlkZW9GcmFtZShIVE1MVmlkZW9FbGVtZW50JiBlbGVtZW50KQogewogICAgIGVs ZW1lbnQuZG9jdW1lbnQoKS51cGRhdGVMYXlvdXRJZ25vcmVQZW5kaW5nU3R5bGVzaGVldHMoKTsK ICAgICBhdXRvKiByZW5kZXJlciA9IGVsZW1lbnQucmVuZGVyZXIoKTsKLSAgICBpZiAoIXJlbmRl cmVyKQotICAgICAgICByZXR1cm4geyB9OwotICAgIGF1dG8gcmVjdCA9IHJlbmRlcmVyLT52aWRl b0JveCgpOwotICAgIHJlY3QubW92ZUJ5KHJlbmRlcmVyLT5hYnNvbHV0ZUJvdW5kaW5nQm94UmVj dCgpLmxvY2F0aW9uKCkpOwotICAgIHJldHVybiBlbGVtZW50LmRvY3VtZW50KCkudmlldygpLT5j b250ZW50c1RvUm9vdFZpZXcocmVjdCk7CisgICAgcmV0dXJuIHJlbmRlcmVyID8gaW5saW5lVmlk ZW9GcmFtZSgqcmVuZGVyZXIpIDogeyB9OwogfQogCiAjcHJhZ21hIG1hcmsgLSBXZWJWaWRlb0Z1 bGxzY3JlZW5JbnRlcmZhY2VDb250ZXh0CkBAIC0xMTMsNyArMTE3LDcgQEAgdm9pZCBXZWJWaWRl b0Z1bGxzY3JlZW5JbnRlcmZhY2VDb250ZXh0OjpzZXRWaWRlb0RpbWVuc2lvbnMoYm9vbCBoYXNW aWRlbywgZmxvYXQKICAgICAgICAgbV9tYW5hZ2VyLT5zZXRWaWRlb0RpbWVuc2lvbnMobV9jb250 ZXh0SWQsIGhhc1ZpZGVvLCB3aWR0aCwgaGVpZ2h0KTsKIH0KIAotdm9pZCBXZWJWaWRlb0Z1bGxz Y3JlZW5JbnRlcmZhY2VDb250ZXh0OjpzZXRTZWVrYWJsZVJhbmdlcyhjb25zdCBXZWJDb3JlOjpU aW1lUmFuZ2VzJiByYW5nZXMpCit2b2lkIFdlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUNvbnRl eHQ6OnNldFNlZWthYmxlUmFuZ2VzKGNvbnN0IFRpbWVSYW5nZXMmIHJhbmdlcykKIHsKICAgICBt X3BsYXliYWNrU2Vzc2lvbkludGVyZmFjZS0+c2V0U2Vla2FibGVSYW5nZXMocmFuZ2VzKTsKIH0K QEAgLTE4MCw5ICsxODQsOSBAQCBXZWJWaWRlb0Z1bGxzY3JlZW5NYW5hZ2VyOjp+V2ViVmlkZW9G dWxsc2NyZWVuTWFuYWdlcigpCiBXZWJWaWRlb0Z1bGxzY3JlZW5NYW5hZ2VyOjpNb2RlbEludGVy ZmFjZVR1cGxlIFdlYlZpZGVvRnVsbHNjcmVlbk1hbmFnZXI6OmNyZWF0ZU1vZGVsQW5kSW50ZXJm YWNlKHVpbnQ2NF90IGNvbnRleHRJZCkKIHsKICAgICBhdXRvJiBwbGF5YmFja1Nlc3Npb25Nb2Rl bCA9IG1fcGxheWJhY2tTZXNzaW9uTWFuYWdlci0+ZW5zdXJlTW9kZWwoY29udGV4dElkKTsKLSAg ICBSZWZQdHI8V2ViVmlkZW9GdWxsc2NyZWVuTW9kZWxWaWRlb0VsZW1lbnQ+IG1vZGVsID0gV2Vi VmlkZW9GdWxsc2NyZWVuTW9kZWxWaWRlb0VsZW1lbnQ6OmNyZWF0ZShwbGF5YmFja1Nlc3Npb25N b2RlbCk7CisgICAgYXV0byBtb2RlbCA9IFdlYlZpZGVvRnVsbHNjcmVlbk1vZGVsVmlkZW9FbGVt ZW50OjpjcmVhdGUocGxheWJhY2tTZXNzaW9uTW9kZWwpOwogICAgIGF1dG8mIHBsYXliYWNrU2Vz c2lvbkludGVyZmFjZSA9IG1fcGxheWJhY2tTZXNzaW9uTWFuYWdlci0+ZW5zdXJlSW50ZXJmYWNl KGNvbnRleHRJZCk7Ci0gICAgUmVmUHRyPFdlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUNvbnRl eHQ+IGludGVyZmFjZSA9IFdlYlZpZGVvRnVsbHNjcmVlbkludGVyZmFjZUNvbnRleHQ6OmNyZWF0 ZSgqdGhpcywgcGxheWJhY2tTZXNzaW9uSW50ZXJmYWNlLCBjb250ZXh0SWQpOworICAgIGF1dG8g aW50ZXJmYWNlID0gV2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQ29udGV4dDo6Y3JlYXRlKCp0 aGlzLCBwbGF5YmFja1Nlc3Npb25JbnRlcmZhY2UsIGNvbnRleHRJZCk7CiAgICAgbV9wbGF5YmFj a1Nlc3Npb25NYW5hZ2VyLT5hZGRDbGllbnRGb3JDb250ZXh0KGNvbnRleHRJZCk7CiAKICAgICBp bnRlcmZhY2UtPnNldExheWVySG9zdGluZ0NvbnRleHQoTGF5ZXJIb3N0aW5nQ29udGV4dDo6Y3Jl YXRlRm9yRXh0ZXJuYWxIb3N0aW5nUHJvY2VzcygpKTsKQEAgLTE5OSw3ICsyMDMsNyBAQCBXZWJW aWRlb0Z1bGxzY3JlZW5NYW5hZ2VyOjpNb2RlbEludGVyZmFjZVR1cGxlJiBXZWJWaWRlb0Z1bGxz Y3JlZW5NYW5hZ2VyOjplbnN1cgogICAgIHJldHVybiBhZGRSZXN1bHQuaXRlcmF0b3ItPnZhbHVl OwogfQogCi1XZWJDb3JlOjpXZWJWaWRlb0Z1bGxzY3JlZW5Nb2RlbFZpZGVvRWxlbWVudCYgV2Vi VmlkZW9GdWxsc2NyZWVuTWFuYWdlcjo6ZW5zdXJlTW9kZWwodWludDY0X3QgY29udGV4dElkKQor V2ViVmlkZW9GdWxsc2NyZWVuTW9kZWxWaWRlb0VsZW1lbnQmIFdlYlZpZGVvRnVsbHNjcmVlbk1h bmFnZXI6OmVuc3VyZU1vZGVsKHVpbnQ2NF90IGNvbnRleHRJZCkKIHsKICAgICByZXR1cm4gKnN0 ZDo6Z2V0PDA+KGVuc3VyZU1vZGVsQW5kSW50ZXJmYWNlKGNvbnRleHRJZCkpOwogfQpAQCAtMjI5 LDI5ICsyMzMsMjkgQEAgdm9pZCBXZWJWaWRlb0Z1bGxzY3JlZW5NYW5hZ2VyOjphZGRDbGllbnRG b3JDb250ZXh0KHVpbnQ2NF90IGNvbnRleHRJZCkKIHsKICAgICBhdXRvIGFkZFJlc3VsdCA9IG1f Y2xpZW50Q291bnRzLmFkZChjb250ZXh0SWQsIDEpOwogICAgIGlmICghYWRkUmVzdWx0LmlzTmV3 RW50cnkpCi0gICAgICAgIGFkZFJlc3VsdC5pdGVyYXRvci0+dmFsdWUrKzsKKyAgICAgICAgKyth ZGRSZXN1bHQuaXRlcmF0b3ItPnZhbHVlOwogfQogCiB2b2lkIFdlYlZpZGVvRnVsbHNjcmVlbk1h bmFnZXI6OnJlbW92ZUNsaWVudEZvckNvbnRleHQodWludDY0X3QgY29udGV4dElkKQogewotICAg IEFTU0VSVChtX2NsaWVudENvdW50cy5jb250YWlucyhjb250ZXh0SWQpKTsKKyAgICBBU1NFUlQo bV9jbGllbnRDb3VudHMuZ2V0KGNvbnRleHRJZCkgPiAwKTsKIAotICAgIGludCBjbGllbnRDb3Vu dCA9IG1fY2xpZW50Q291bnRzLmdldChjb250ZXh0SWQpOwotICAgIEFTU0VSVChjbGllbnRDb3Vu dCA+IDApOwotICAgIGNsaWVudENvdW50LS07CisgICAgYXV0byBpdGVyYXRvciA9IG1fY2xpZW50 Q291bnRzLmZpbmQoY29udGV4dElkKTsKKyAgICBpZiAoaXRlcmF0b3IgPT0gbV9jbGllbnRDb3Vu dHMuZW5kKCkpCisgICAgICAgIHJldHVybjsKIAotICAgIGlmIChjbGllbnRDb3VudCA8PSAwKSB7 Ci0gICAgICAgIG1fY2xpZW50Q291bnRzLnJlbW92ZShjb250ZXh0SWQpOworICAgIGlmIChpdGVy YXRvci0+dmFsdWUgPD0gMSkgeworICAgICAgICBtX2NsaWVudENvdW50cy5yZW1vdmUoaXRlcmF0 b3IpOwogICAgICAgICByZW1vdmVDb250ZXh0KGNvbnRleHRJZCk7CiAgICAgICAgIHJldHVybjsK ICAgICB9CiAKLSAgICBtX2NsaWVudENvdW50cy5zZXQoY29udGV4dElkLCBjbGllbnRDb3VudCk7 CisgICAgLS1pdGVyYXRvci0+dmFsdWU7CiB9CiAKICNwcmFnbWEgbWFyayBJbnRlcmZhY2UgdG8g Q2hyb21lQ2xpZW50OgogCi1ib29sIFdlYlZpZGVvRnVsbHNjcmVlbk1hbmFnZXI6OnN1cHBvcnRz VmlkZW9GdWxsc2NyZWVuKFdlYkNvcmU6OkhUTUxNZWRpYUVsZW1lbnRFbnVtczo6VmlkZW9GdWxs c2NyZWVuTW9kZSBtb2RlKSBjb25zdAorYm9vbCBXZWJWaWRlb0Z1bGxzY3JlZW5NYW5hZ2VyOjpz dXBwb3J0c1ZpZGVvRnVsbHNjcmVlbihIVE1MTWVkaWFFbGVtZW50RW51bXM6OlZpZGVvRnVsbHNj cmVlbk1vZGUgbW9kZSkgY29uc3QKIHsKICNpZiBQTEFURk9STShJT1MpCiAgICAgVU5VU0VEX1BB UkFNKG1vZGUpOwpAQCAtMjU5LDYgKzI2Myw3IEBAIGJvb2wgV2ViVmlkZW9GdWxsc2NyZWVuTWFu YWdlcjo6c3VwcG9ydHNWaWRlb0Z1bGxzY3JlZW4oV2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVuCiAj ZWxpZiBVU0UoQVBQTEVfSU5URVJOQUxfU0RLKQogI2ltcG9ydCA8V2ViS2l0QWRkaXRpb25zL1dl YlZpZGVvRnVsbHNjcmVlbk1hbmFnZXJTdXBwb3J0c1ZpZGVvRnVsbHNjcmVlbk1hYy5tbT4KICNl bHNlCisgICAgVU5VU0VEX1BBUkFNKG1vZGUpOwogICAgIHJldHVybiBmYWxzZTsKICNlbmRpZgog fQpAQCAtMjgwLDkgKzI4NSw5IEBAIHZvaWQgV2ViVmlkZW9GdWxsc2NyZWVuTWFuYWdlcjo6ZW50 ZXJWaWRlb0Z1bGxzY3JlZW5Gb3JWaWRlb0VsZW1lbnQoSFRNTFZpZGVvRWxlCiAgICAgICAgIGlu dGVyZmFjZS0+c2V0TGF5ZXJIb3N0aW5nQ29udGV4dChMYXllckhvc3RpbmdDb250ZXh0OjpjcmVh dGVGb3JFeHRlcm5hbEhvc3RpbmdQcm9jZXNzKCkpOwogCiAgICAgYXV0byB2aWRlb1JlY3QgPSBp bmxpbmVWaWRlb0ZyYW1lKHZpZGVvRWxlbWVudCk7Ci0gICAgRmxvYXRSZWN0IHZpZGVvTGF5ZXJG cmFtZSA9IEZsb2F0UmVjdCgwLCAwLCB2aWRlb1JlY3Qud2lkdGgoKSwgdmlkZW9SZWN0LmhlaWdo dCgpKTsKKyAgICBJbnRSZWN0IHZpZGVvTGF5ZXJGcmFtZSB7IHsgMCwgMCB9LCB2aWRlb1JlY3Qu c2l6ZSgpIH07CiAKLSAgICBIVE1MTWVkaWFFbGVtZW50RW51bXM6OlZpZGVvRnVsbHNjcmVlbk1v ZGUgb2xkTW9kZSA9IGludGVyZmFjZS0+ZnVsbHNjcmVlbk1vZGUoKTsKKyAgICBhdXRvIG9sZE1v ZGUgPSBpbnRlcmZhY2UtPmZ1bGxzY3JlZW5Nb2RlKCk7CiAgICAgaW50ZXJmYWNlLT5zZXRUYXJn ZXRJc0Z1bGxzY3JlZW4odHJ1ZSk7CiAgICAgaW50ZXJmYWNlLT5zZXRGdWxsc2NyZWVuTW9kZSht b2RlKTsKICAgICBtb2RlbC0+c2V0VmlkZW9FbGVtZW50KCZ2aWRlb0VsZW1lbnQpOwpAQCAtMjk4 LDcgKzMwMyw3IEBAIHZvaWQgV2ViVmlkZW9GdWxsc2NyZWVuTWFuYWdlcjo6ZW50ZXJWaWRlb0Z1 bGxzY3JlZW5Gb3JWaWRlb0VsZW1lbnQoSFRNTFZpZGVvRWxlCiAgICAgbV9wYWdlLT5zZW5kKE1l c3NhZ2VzOjpXZWJWaWRlb0Z1bGxzY3JlZW5NYW5hZ2VyUHJveHk6OlNldHVwRnVsbHNjcmVlbldp dGhJRChjb250ZXh0SWQsIGludGVyZmFjZS0+bGF5ZXJIb3N0aW5nQ29udGV4dCgpLT5jb250ZXh0 SUQoKSwgdmlkZW9SZWN0LCBtX3BhZ2UtPmRldmljZVNjYWxlRmFjdG9yKCksIGludGVyZmFjZS0+ ZnVsbHNjcmVlbk1vZGUoKSwgYWxsb3dzUGljdHVyZUluUGljdHVyZSksIG1fcGFnZS0+cGFnZUlE KCkpOwogfQogCi12b2lkIFdlYlZpZGVvRnVsbHNjcmVlbk1hbmFnZXI6OmV4aXRWaWRlb0Z1bGxz Y3JlZW5Gb3JWaWRlb0VsZW1lbnQoV2ViQ29yZTo6SFRNTFZpZGVvRWxlbWVudCYgdmlkZW9FbGVt ZW50KQordm9pZCBXZWJWaWRlb0Z1bGxzY3JlZW5NYW5hZ2VyOjpleGl0VmlkZW9GdWxsc2NyZWVu Rm9yVmlkZW9FbGVtZW50KEhUTUxWaWRlb0VsZW1lbnQmIHZpZGVvRWxlbWVudCkKIHsKICAgICBB U1NFUlQobV92aWRlb0VsZW1lbnRzLmNvbnRhaW5zKCZ2aWRlb0VsZW1lbnQpKTsKIApAQCAtMzE0 LDcgKzMxOSw3IEBAIHZvaWQgV2ViVmlkZW9GdWxsc2NyZWVuTWFuYWdlcjo6ZXhpdFZpZGVvRnVs bHNjcmVlbkZvclZpZGVvRWxlbWVudChXZWJDb3JlOjpIVE1MCiAgICAgbV9wYWdlLT5zZW5kKE1l c3NhZ2VzOjpXZWJWaWRlb0Z1bGxzY3JlZW5NYW5hZ2VyUHJveHk6OkV4aXRGdWxsc2NyZWVuKGNv bnRleHRJZCwgaW5saW5lVmlkZW9GcmFtZSh2aWRlb0VsZW1lbnQpKSwgbV9wYWdlLT5wYWdlSUQo KSk7CiB9CiAKLXZvaWQgV2ViVmlkZW9GdWxsc2NyZWVuTWFuYWdlcjo6ZXhpdFZpZGVvRnVsbHNj cmVlblRvTW9kZVdpdGhvdXRBbmltYXRpb24oV2ViQ29yZTo6SFRNTFZpZGVvRWxlbWVudCYgdmlk ZW9FbGVtZW50LCBXZWJDb3JlOjpIVE1MTWVkaWFFbGVtZW50RW51bXM6OlZpZGVvRnVsbHNjcmVl bk1vZGUgdGFyZ2V0TW9kZSkKK3ZvaWQgV2ViVmlkZW9GdWxsc2NyZWVuTWFuYWdlcjo6ZXhpdFZp ZGVvRnVsbHNjcmVlblRvTW9kZVdpdGhvdXRBbmltYXRpb24oSFRNTFZpZGVvRWxlbWVudCYgdmlk ZW9FbGVtZW50LCBIVE1MTWVkaWFFbGVtZW50RW51bXM6OlZpZGVvRnVsbHNjcmVlbk1vZGUgdGFy Z2V0TW9kZSkKIHsKICNpZiBQTEFURk9STShNQUMpICYmIEVOQUJMRShWSURFT19QUkVTRU5UQVRJ T05fTU9ERSkKICAgICBBU1NFUlQobV92aWRlb0VsZW1lbnRzLmNvbnRhaW5zKCZ2aWRlb0VsZW1l bnQpKTsKQEAgLTM0MCwxMiArMzQ1LDEyIEBAIHZvaWQgV2ViVmlkZW9GdWxsc2NyZWVuTWFuYWdl cjo6c2V0VmlkZW9EaW1lbnNpb25zKHVpbnQ2NF90IGNvbnRleHRJZCwgYm9vbCBoYXNWCiAKICNw cmFnbWEgbWFyayBNZXNzYWdlcyBmcm9tIFdlYlZpZGVvRnVsbHNjcmVlbk1hbmFnZXJQcm94eToK IAotdm9pZCBXZWJWaWRlb0Z1bGxzY3JlZW5NYW5hZ2VyOjpyZXF1ZXN0RnVsbHNjcmVlbk1vZGUo dWludDY0X3QgY29udGV4dElkLCBXZWJDb3JlOjpIVE1MTWVkaWFFbGVtZW50RW51bXM6OlZpZGVv RnVsbHNjcmVlbk1vZGUgbW9kZSkKK3ZvaWQgV2ViVmlkZW9GdWxsc2NyZWVuTWFuYWdlcjo6cmVx dWVzdEZ1bGxzY3JlZW5Nb2RlKHVpbnQ2NF90IGNvbnRleHRJZCwgSFRNTE1lZGlhRWxlbWVudEVu dW1zOjpWaWRlb0Z1bGxzY3JlZW5Nb2RlIG1vZGUpCiB7CiAgICAgZW5zdXJlTW9kZWwoY29udGV4 dElkKS5yZXF1ZXN0RnVsbHNjcmVlbk1vZGUobW9kZSk7CiB9CiAKLXZvaWQgV2ViVmlkZW9GdWxs c2NyZWVuTWFuYWdlcjo6ZnVsbHNjcmVlbk1vZGVDaGFuZ2VkKHVpbnQ2NF90IGNvbnRleHRJZCwg V2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudEVudW1zOjpWaWRlb0Z1bGxzY3JlZW5Nb2RlIHZpZGVv RnVsbHNjcmVlbk1vZGUpCit2b2lkIFdlYlZpZGVvRnVsbHNjcmVlbk1hbmFnZXI6OmZ1bGxzY3Jl ZW5Nb2RlQ2hhbmdlZCh1aW50NjRfdCBjb250ZXh0SWQsIEhUTUxNZWRpYUVsZW1lbnRFbnVtczo6 VmlkZW9GdWxsc2NyZWVuTW9kZSB2aWRlb0Z1bGxzY3JlZW5Nb2RlKQogewogICAgIGVuc3VyZU1v ZGVsKGNvbnRleHRJZCkuZnVsbHNjcmVlbk1vZGVDaGFuZ2VkKHZpZGVvRnVsbHNjcmVlbk1vZGUp OwogfQpAQCAtMzUzLDcgKzM1OCw5IEBAIHZvaWQgV2ViVmlkZW9GdWxsc2NyZWVuTWFuYWdlcjo6 ZnVsbHNjcmVlbk1vZGVDaGFuZ2VkKHVpbnQ2NF90IGNvbnRleHRJZCwgV2ViQ29yCiB2b2lkIFdl YlZpZGVvRnVsbHNjcmVlbk1hbmFnZXI6OmRpZFNldHVwRnVsbHNjcmVlbih1aW50NjRfdCBjb250 ZXh0SWQpCiB7CiAgICAgUGxhdGZvcm1MYXllciogdmlkZW9MYXllciA9IFtDQUxheWVyIGxheWVy XTsKKwogI2lmbmRlZiBOREVCVUcKKyAgICAvLyBGSVhNRTogV2h5IGRvIHRoaXMgaW4gZGVidWcg YnVpbGRzIG9ubHk/CiAgICAgW3ZpZGVvTGF5ZXIgc2V0TmFtZTpAIldlYiB2aWRlbyBmdWxsc2Ny ZWVuIG1hbmFnZXIgbGF5ZXIiXTsKICNlbmRpZgogCkBAIC0zNjEsNyArMzY4LDcgQEAgdm9pZCBX ZWJWaWRlb0Z1bGxzY3JlZW5NYW5hZ2VyOjpkaWRTZXR1cEZ1bGxzY3JlZW4odWludDY0X3QgY29u dGV4dElkKQogICAgIFtDQVRyYW5zYWN0aW9uIHNldERpc2FibGVBY3Rpb25zOllFU107CiAKICAg ICBbdmlkZW9MYXllciBzZXRQb3NpdGlvbjpDR1BvaW50TWFrZSgwLCAwKV07Ci0gICAgW3ZpZGVv TGF5ZXIgc2V0QmFja2dyb3VuZENvbG9yOmNhY2hlZENHQ29sb3IoV2ViQ29yZTo6Q29sb3I6OnRy YW5zcGFyZW50KV07CisgICAgW3ZpZGVvTGF5ZXIgc2V0QmFja2dyb3VuZENvbG9yOmNhY2hlZENH Q29sb3IoQ29sb3I6OnRyYW5zcGFyZW50KV07CiAKICAgICAvLyBTZXQgYSBzY2FsZSBmYWN0b3Ig aGVyZSB0byBtYWtlIGNvbnZlcnRSZWN0OnRvTGF5ZXI6bmlsIHRha2Ugc2NhbGUgZmFjdG9yIGlu dG8gYWNjb3VudC4gPHJkYXI6Ly9wcm9ibGVtLzE4MzE2NTQyPi4KICAgICAvLyBUaGlzIHNjYWxl IGZhY3RvciBpcyBpbnZlcnRlZCBpbiB0aGUgaG9zdGluZyBwcm9jZXNzLgpAQCAtNDM5LDcgKzQ0 Niw3IEBAIHZvaWQgV2ViVmlkZW9GdWxsc2NyZWVuTWFuYWdlcjo6ZGlkQ2xlYW51cEZ1bGxzY3Jl ZW4odWludDY0X3QgY29udGV4dElkKQogCiAgICAgaW50ZXJmYWNlLT5zZXRJc0FuaW1hdGluZyhm YWxzZSk7CiAgICAgaW50ZXJmYWNlLT5zZXRJc0Z1bGxzY3JlZW4oZmFsc2UpOwotICAgIEhUTUxN ZWRpYUVsZW1lbnRFbnVtczo6VmlkZW9GdWxsc2NyZWVuTW9kZSBtb2RlID0gaW50ZXJmYWNlLT5m dWxsc2NyZWVuTW9kZSgpOworICAgIGF1dG8gbW9kZSA9IGludGVyZmFjZS0+ZnVsbHNjcmVlbk1v ZGUoKTsKICAgICBib29sIHRhcmdldElzRnVsbHNjcmVlbiA9IGludGVyZmFjZS0+dGFyZ2V0SXNG dWxsc2NyZWVuKCk7CiAKICAgICBtb2RlbC0+c2V0VmlkZW9GdWxsc2NyZWVuTGF5ZXIobmlsKTsK QEAgLTQ3MSwxNyArNDc4LDE1IEBAIHZvaWQgV2ViVmlkZW9GdWxsc2NyZWVuTWFuYWdlcjo6ZnVs bHNjcmVlbk1heVJldHVyblRvSW5saW5lKHVpbnQ2NF90IGNvbnRleHRJZCwKICAgICBtX3BhZ2Ut PnNlbmQoTWVzc2FnZXM6OldlYlZpZGVvRnVsbHNjcmVlbk1hbmFnZXJQcm94eTo6UHJlcGFyZWRU b1JldHVyblRvSW5saW5lKGNvbnRleHRJZCwgdHJ1ZSwgaW5saW5lVmlkZW9GcmFtZSgqbW9kZWwu dmlkZW9FbGVtZW50KCkpKSwgbV9wYWdlLT5wYWdlSUQoKSk7CiB9CiAgICAgCi12b2lkIFdlYlZp ZGVvRnVsbHNjcmVlbk1hbmFnZXI6OnNldFZpZGVvTGF5ZXJGcmFtZUZlbmNlZCh1aW50NjRfdCBj b250ZXh0SWQsIFdlYkNvcmU6OkZsb2F0UmVjdCBib3VuZHMsIElQQzo6QXR0YWNobWVudCBmZW5j ZVBvcnQpCit2b2lkIFdlYlZpZGVvRnVsbHNjcmVlbk1hbmFnZXI6OnNldFZpZGVvTGF5ZXJGcmFt ZUZlbmNlZCh1aW50NjRfdCBjb250ZXh0SWQsIEZsb2F0UmVjdCBib3VuZHMsIElQQzo6QXR0YWNo bWVudCBmZW5jZVBvcnQpCiB7CiAgICAgUmVmUHRyPFdlYlZpZGVvRnVsbHNjcmVlbk1vZGVsVmlk ZW9FbGVtZW50PiBtb2RlbDsKICAgICBSZWZQdHI8V2ViVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNl Q29udGV4dD4gaW50ZXJmYWNlOwogICAgIHN0ZDo6dGllKG1vZGVsLCBpbnRlcmZhY2UpID0gZW5z dXJlTW9kZWxBbmRJbnRlcmZhY2UoY29udGV4dElkKTsKIAotICAgIGlmIChzdGQ6OmlzbmFuKGJv dW5kcy54KCkpIHx8IHN0ZDo6aXNuYW4oYm91bmRzLnkoKSkgfHwgc3RkOjppc25hbihib3VuZHMu d2lkdGgoKSkgfHwgc3RkOjppc25hbihib3VuZHMuaGVpZ2h0KCkpKSB7Ci0gICAgICAgIGF1dG8g dmlkZW9SZWN0ID0gaW5saW5lVmlkZW9GcmFtZSgqbW9kZWwtPnZpZGVvRWxlbWVudCgpKTsKLSAg ICAgICAgYm91bmRzID0gRmxvYXRSZWN0KDAsIDAsIHZpZGVvUmVjdC53aWR0aCgpLCB2aWRlb1Jl Y3QuaGVpZ2h0KCkpOwotICAgIH0KLSAgICAKKyAgICBpZiAoc3RkOjppc25hbihib3VuZHMueCgp KSB8fCBzdGQ6OmlzbmFuKGJvdW5kcy55KCkpIHx8IHN0ZDo6aXNuYW4oYm91bmRzLndpZHRoKCkp IHx8IHN0ZDo6aXNuYW4oYm91bmRzLmhlaWdodCgpKSkKKyAgICAgICAgYm91bmRzID0gSW50UmVj dCB7IHsgMCwgMCB9LCBpbmxpbmVWaWRlb0ZyYW1lKCptb2RlbC0+dmlkZW9FbGVtZW50KCkpLnNp emUoKSB9OworCiAgICAgW0NBVHJhbnNhY3Rpb24gYmVnaW5dOwogICAgIFtDQVRyYW5zYWN0aW9u IHNldEFuaW1hdGlvbkR1cmF0aW9uOjBdOwogICAgIGlmIChpbnRlcmZhY2UtPmxheWVySG9zdGlu Z0NvbnRleHQoKSkKQEAgLTQ5Myw0ICs0OTgsNCBAQCB2b2lkIFdlYlZpZGVvRnVsbHNjcmVlbk1h bmFnZXI6OnNldFZpZGVvTGF5ZXJGcmFtZUZlbmNlZCh1aW50NjRfdCBjb250ZXh0SWQsIFdlYgog CiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKIAotI2VuZGlmIC8vIFBMQVRGT1JNKElPUykgfHwgKFBM QVRGT1JNKE1BQykgJiYgRU5BQkxFKFZJREVPX1BSRVNFTlRBVElPTl9NT0RFKSkKKyNlbmRpZiAv LyAoUExBVEZPUk0oSU9TKSAmJiBIQVZFKEFWS0lUKSkgfHwgKFBMQVRGT1JNKE1BQykgJiYgRU5B QkxFKFZJREVPX1BSRVNFTlRBVElPTl9NT0RFKSkK