186065 2018-05-29 15:17:05 -0700 Auto-pip should use main content heuristic. 2018-05-30 11:00:37 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jer.noble jer.noble commit-queue eric.carlson jeremyj-wk webkit-bug-importer oldest_to_newest 1428239 0 jer.noble 2018-05-29 15:17:05 -0700 Auto-pip should use main content heuristic. 1428240 1 jer.noble 2018-05-29 15:17:28 -0700 <rdar://problem/35862502> 1428243 2 341525 jer.noble 2018-05-29 15:20:21 -0700 Created attachment 341525 Patch 1428272 3 341535 jer.noble 2018-05-29 16:29:36 -0700 Created attachment 341535 Patch 1428507 4 341535 commit-queue 2018-05-30 11:00:36 -0700 Comment on attachment 341535 Patch Clearing flags on attachment: 341535 Committed r232301: <https://trac.webkit.org/changeset/232301> 1428508 5 commit-queue 2018-05-30 11:00:37 -0700 All reviewed patches have been landed. Closing bug. 341525 2018-05-29 15:20:21 -0700 2018-05-29 16:29:34 -0700 Patch bug-186065-20180529152020.patch text/plain 8807 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMjMyMTE1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGQ1ODM3ZTMwYmUxMGUyYzdk NjA5Njk4ZWZiMzFkMWI4MWMxNDc5MDIuLmQ5MjM5MzBhMTQ4YTVmYmUwNjM1YzkzYjA2NTUyOGI3 MGFiOGY0ZGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjkgQEAKKzIwMTgtMDUtMjkgIEplciBOb2Js ZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CisKKyAgICAgICAgQXV0by1waXAgc2hvdWxkIHVzZSBt YWluIGNvbnRlbnQgaGV1cmlzdGljLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTg2MDY1CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zNTg2MjUwMj4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNYWtlIHRo ZSBtX3BpcFN0YW5kYnlFbGVtZW50IGNsZWFyYWJsZSwgd2hpY2ggd2lsbCBhbGxvdyB0aGUgYXV0 by1waXAgbWVjaGFuaXNtIHRvIGJlIHRvcm4gZG93bi4gQWRkCisgICAgICAgIGEgV2ViUHJvY2Vz cy1zaWRlIG5vdGlmaWNhdGlvbiB3aGVuIHRoZSBtYWluIGNvbnRlbnQgY2hhbmdlcywgdG8gZmFj aWxpdGF0ZSB0aGlzLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9GdWxsU2NyZWVuL1dlYkZ1bGxT Y3JlZW5NYW5hZ2VyLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViRnVsbFNjcmVlbk1hbmFnZXI6 OnZpZGVvQ29udHJvbHNNYW5hZ2VyRGlkQ2hhbmdlKToKKyAgICAgICAgKFdlYktpdDo6V2ViRnVs bFNjcmVlbk1hbmFnZXI6OnNldFBJUFN0YW5kYnlFbGVtZW50KToKKyAgICAgICAgKFdlYktpdDo6 V2ViRnVsbFNjcmVlbk1hbmFnZXI6OmRpZEVudGVyRnVsbFNjcmVlbik6CisgICAgICAgIChXZWJL aXQ6OldlYkZ1bGxTY3JlZW5NYW5hZ2VyOjp3aWxsRXhpdEZ1bGxTY3JlZW4pOgorICAgICAgICAq IFdlYlByb2Nlc3MvRnVsbFNjcmVlbi9XZWJGdWxsU2NyZWVuTWFuYWdlci5oOgorICAgICAgICAq IFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFn ZTo6dmlkZW9Db250cm9sc01hbmFnZXJEaWRDaGFuZ2UpOgorICAgICAgICAqIFdlYlByb2Nlc3Mv V2ViUGFnZS9XZWJQYWdlLmg6CisgICAgICAgICogV2ViUHJvY2Vzcy9jb2NvYS9QbGF5YmFja1Nl c3Npb25NYW5hZ2VyLmg6CisgICAgICAgICogV2ViUHJvY2Vzcy9jb2NvYS9QbGF5YmFja1Nlc3Np b25NYW5hZ2VyLm1tOgorICAgICAgICAoV2ViS2l0OjpQbGF5YmFja1Nlc3Npb25NYW5hZ2VyOjpz ZXRVcFBsYXliYWNrQ29udHJvbHNNYW5hZ2VyKToKKyAgICAgICAgKFdlYktpdDo6UGxheWJhY2tT ZXNzaW9uTWFuYWdlcjo6Y2xlYXJQbGF5YmFja0NvbnRyb2xzTWFuYWdlcik6CisgICAgICAgIChX ZWJLaXQ6OlBsYXliYWNrU2Vzc2lvbk1hbmFnZXI6OmN1cnJlbnRQbGF5YmFja0NvbnRyb2xzRWxl bWVudCBjb25zdCk6CisKIDIwMTgtMDUtMjMgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNp YUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHVEtdIFdlYkRyaXZlcjogaW1wbGVtZW50IEF1dG9t YXRpb25TZXNzaW9uQ2xpZW50OjpkaWREaXNjb25uZWN0RnJvbVJlbW90ZQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0Z1bGxTY3JlZW4vV2ViRnVsbFNjcmVlbk1hbmFnZXIu Y3BwIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0Z1bGxTY3JlZW4vV2ViRnVsbFNjcmVlbk1h bmFnZXIuY3BwCmluZGV4IDk2M2YxYjlkNWY2NjZhMWNlNTFkN2E3MzU2OGYxODgxYzVhYjIyNWEu LmEzM2QzOWZiYTY3NDExOGM5YTRmODlmMGQ4YTViMWU1M2NkZjBmMDggMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9GdWxsU2NyZWVuL1dlYkZ1bGxTY3JlZW5NYW5hZ2VyLmNw cAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvRnVsbFNjcmVlbi9XZWJGdWxsU2NyZWVu TWFuYWdlci5jcHAKQEAgLTI4LDYgKzI4LDcgQEAKICNpZiBFTkFCTEUoRlVMTFNDUkVFTl9BUEkp CiAKICNpbmNsdWRlICJDb25uZWN0aW9uLmgiCisjaW5jbHVkZSAiUGxheWJhY2tTZXNzaW9uTWFu YWdlci5oIgogI2luY2x1ZGUgIldlYkNvcmVBcmd1bWVudENvZGVycy5oIgogI2luY2x1ZGUgIldl YkZyYW1lLmgiCiAjaW5jbHVkZSAiV2ViRnVsbFNjcmVlbk1hbmFnZXJQcm94eU1lc3NhZ2VzLmgi CkBAIC04MSw2ICs4MiwyOCBAQCBXZWJDb3JlOjpFbGVtZW50KiBXZWJGdWxsU2NyZWVuTWFuYWdl cjo6ZWxlbWVudCgpCiAgICAgcmV0dXJuIG1fZWxlbWVudC5nZXQoKTsgCiB9CiAKK3ZvaWQgV2Vi RnVsbFNjcmVlbk1hbmFnZXI6OnZpZGVvQ29udHJvbHNNYW5hZ2VyRGlkQ2hhbmdlKCkKK3sKKyNp ZiBFTkFCTEUoVklERU8pCisgICAgYXV0byogY3VycmVudFBsYXliYWNrQ29udHJvbHNFbGVtZW50 ID0gbV9wYWdlLT5wbGF5YmFja1Nlc3Npb25NYW5hZ2VyKCkuY3VycmVudFBsYXliYWNrQ29udHJv bHNFbGVtZW50KCk7CisgICAgc2V0UElQU3RhbmRieUVsZW1lbnQoaXM8SFRNTFZpZGVvRWxlbWVu dD4oY3VycmVudFBsYXliYWNrQ29udHJvbHNFbGVtZW50KSA/IGRvd25jYXN0PEhUTUxWaWRlb0Vs ZW1lbnQ+KGN1cnJlbnRQbGF5YmFja0NvbnRyb2xzRWxlbWVudCkgOiBudWxscHRyKTsKKyNlbmRp ZgorfQorCit2b2lkIFdlYkZ1bGxTY3JlZW5NYW5hZ2VyOjpzZXRQSVBTdGFuZGJ5RWxlbWVudChX ZWJDb3JlOjpIVE1MVmlkZW9FbGVtZW50KiBwaXBTdGFuZGJ5RWxlbWVudCkKK3sKKyAgICBpZiAo cGlwU3RhbmRieUVsZW1lbnQgPT0gbV9waXBTdGFuZGJ5RWxlbWVudCkKKyAgICAgICAgcmV0dXJu OworCisgICAgaWYgKG1fcGlwU3RhbmRieUVsZW1lbnQpCisgICAgICAgIG1fcGlwU3RhbmRieUVs ZW1lbnQtPnNldFZpZGVvRnVsbHNjcmVlblN0YW5kYnkoZmFsc2UpOworCisgICAgbV9waXBTdGFu ZGJ5RWxlbWVudCA9IHBpcFN0YW5kYnlFbGVtZW50OworCisgICAgaWYgKG1fcGlwU3RhbmRieUVs ZW1lbnQpCisgICAgICAgIG1fcGlwU3RhbmRieUVsZW1lbnQtPnNldFZpZGVvRnVsbHNjcmVlblN0 YW5kYnkodHJ1ZSk7Cit9CisKIHZvaWQgV2ViRnVsbFNjcmVlbk1hbmFnZXI6OmRpZFJlY2VpdmVN ZXNzYWdlKElQQzo6Q29ubmVjdGlvbiYgY29ubmVjdGlvbiwgSVBDOjpEZWNvZGVyJiBkZWNvZGVy KQogewogICAgIGRpZFJlY2VpdmVXZWJGdWxsU2NyZWVuTWFuYWdlck1lc3NhZ2UoY29ubmVjdGlv biwgZGVjb2Rlcik7CkBAIC0xMjYsOSArMTQ5LDggQEAgdm9pZCBXZWJGdWxsU2NyZWVuTWFuYWdl cjo6ZGlkRW50ZXJGdWxsU2NyZWVuKCkKICAgICBtX2VsZW1lbnQtPmRvY3VtZW50KCkud2Via2l0 RGlkRW50ZXJGdWxsU2NyZWVuRm9yRWxlbWVudChtX2VsZW1lbnQuZ2V0KCkpOwogCiAjaWYgRU5B QkxFKFZJREVPKQotICAgIG1fcGlwU3RhbmRieUVsZW1lbnQgPSBkZXNjZW5kYW50c09mVHlwZTxI VE1MVmlkZW9FbGVtZW50PigqbV9lbGVtZW50KS5maXJzdCgpOwotICAgIGlmIChtX3BpcFN0YW5k YnlFbGVtZW50KQotICAgICAgICBtX3BpcFN0YW5kYnlFbGVtZW50LT5zZXRWaWRlb0Z1bGxzY3Jl ZW5TdGFuZGJ5KHRydWUpOworICAgIGF1dG8qIGN1cnJlbnRQbGF5YmFja0NvbnRyb2xzRWxlbWVu dCA9IG1fcGFnZS0+cGxheWJhY2tTZXNzaW9uTWFuYWdlcigpLmN1cnJlbnRQbGF5YmFja0NvbnRy b2xzRWxlbWVudCgpOworICAgIHNldFBJUFN0YW5kYnlFbGVtZW50KGlzPEhUTUxWaWRlb0VsZW1l bnQ+KGN1cnJlbnRQbGF5YmFja0NvbnRyb2xzRWxlbWVudCkgPyBkb3duY2FzdDxIVE1MVmlkZW9F bGVtZW50PihjdXJyZW50UGxheWJhY2tDb250cm9sc0VsZW1lbnQpIDogbnVsbHB0cik7CiAjZW5k aWYKIH0KIApAQCAtMTM3LDkgKzE1OSw3IEBAIHZvaWQgV2ViRnVsbFNjcmVlbk1hbmFnZXI6Ondp bGxFeGl0RnVsbFNjcmVlbigpCiAgICAgQVNTRVJUKG1fZWxlbWVudCk7CiAKICNpZiBFTkFCTEUo VklERU8pCi0gICAgaWYgKG1fcGlwU3RhbmRieUVsZW1lbnQpCi0gICAgICAgIG1fcGlwU3RhbmRi eUVsZW1lbnQtPnNldFZpZGVvRnVsbHNjcmVlblN0YW5kYnkoZmFsc2UpOwotICAgIG1fcGlwU3Rh bmRieUVsZW1lbnQgPSBudWxscHRyOworICAgIHNldFBJUFN0YW5kYnlFbGVtZW50KG51bGxwdHIp OwogI2VuZGlmCiAKICAgICBtX2ZpbmFsRnJhbWUgPSBzY3JlZW5SZWN0T2ZDb250ZW50cyhtX2Vs ZW1lbnQuZ2V0KCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0Z1bGxT Y3JlZW4vV2ViRnVsbFNjcmVlbk1hbmFnZXIuaCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9G dWxsU2NyZWVuL1dlYkZ1bGxTY3JlZW5NYW5hZ2VyLmgKaW5kZXggY2Q5NDc4MDM3YzRmMWU0MTRi NjNjOWFiNDAwYTI3ZDIwN2FhOTlmYy4uYzE3MGZhMmFlYWE3MmU1Y2YxZjMwMjYxOTY5ZGU0MjI4 ZGEwNWE3OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0Z1bGxTY3JlZW4v V2ViRnVsbFNjcmVlbk1hbmFnZXIuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvRnVs bFNjcmVlbi9XZWJGdWxsU2NyZWVuTWFuYWdlci5oCkBAIC02NSwxMSArNjUsMTUgQEAgcHVibGlj OgogCiAgICAgV2ViQ29yZTo6RWxlbWVudCogZWxlbWVudCgpOwogCisgICAgdm9pZCB2aWRlb0Nv bnRyb2xzTWFuYWdlckRpZENoYW5nZSgpOworCiAgICAgdm9pZCBjbG9zZSgpOwogCiBwcm90ZWN0 ZWQ6CiAgICAgV2ViRnVsbFNjcmVlbk1hbmFnZXIoV2ViUGFnZSopOwogCisgICAgdm9pZCBzZXRQ SVBTdGFuZGJ5RWxlbWVudChXZWJDb3JlOjpIVE1MVmlkZW9FbGVtZW50Kik7CisKICAgICB2b2lk IHNldEFuaW1hdGluZ0Z1bGxTY3JlZW4oYm9vbCk7CiAgICAgdm9pZCByZXF1ZXN0RXhpdEZ1bGxT Y3JlZW4oKTsKICAgICB2b2lkIHNhdmVTY3JvbGxQb3NpdGlvbigpOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0 L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAppbmRleCBjMWEzMTNlODA3MjM0YjNmODYx NGUyYmI5NjU2Nzg5MDRkOGQzOThkLi5mMTYzZTg0YjY0MGZhNDYxODAzMTI0YWIwZGM2YWRhZTFl NWU3NGQxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQ YWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNw cApAQCAtMzI5Niw2ICszMjk2LDE1IEBAIFZpZGVvRnVsbHNjcmVlbk1hbmFnZXImIFdlYlBhZ2U6 OnZpZGVvRnVsbHNjcmVlbk1hbmFnZXIoKQogICAgICAgICBtX3ZpZGVvRnVsbHNjcmVlbk1hbmFn ZXIgPSBWaWRlb0Z1bGxzY3JlZW5NYW5hZ2VyOjpjcmVhdGUoKnRoaXMsIHBsYXliYWNrU2Vzc2lv bk1hbmFnZXIoKSk7CiAgICAgcmV0dXJuICptX3ZpZGVvRnVsbHNjcmVlbk1hbmFnZXI7CiB9CisK K3ZvaWQgV2ViUGFnZTo6dmlkZW9Db250cm9sc01hbmFnZXJEaWRDaGFuZ2UoKQoreworI2lmIEVO QUJMRShGVUxMU0NSRUVOX0FQSSkKKyAgICBpZiAoYXV0byogbWFuYWdlciA9IGZ1bGxTY3JlZW5N YW5hZ2VyKCkpCisgICAgICAgIG1hbmFnZXItPnZpZGVvQ29udHJvbHNNYW5hZ2VyRGlkQ2hhbmdl KCk7CisjZW5kaWYKK30KKwogI2VuZGlmCiAKICNpZiBQTEFURk9STShJT1MpCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmggYi9Tb3VyY2UvV2Vi S2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgKaW5kZXggNjdlZmZkYjg0NDNlYWNjYTZi YjllYTYyNjBhOTU3NWJjMzg3NzI4My4uMDMzNDZjM2UwYzk1MWRhYmZiN2FiYTAwMjQxYWE0NzY5 YzEzODRjMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2Vi UGFnZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaApA QCAtMjk4LDYgKzI5OCw3IEBAIHB1YmxpYzoKICNpZiBQTEFURk9STShJT1MpIHx8IChQTEFURk9S TShNQUMpICYmIEVOQUJMRShWSURFT19QUkVTRU5UQVRJT05fTU9ERSkpCiAgICAgUGxheWJhY2tT ZXNzaW9uTWFuYWdlciYgcGxheWJhY2tTZXNzaW9uTWFuYWdlcigpOwogICAgIFZpZGVvRnVsbHNj cmVlbk1hbmFnZXImIHZpZGVvRnVsbHNjcmVlbk1hbmFnZXIoKTsKKyAgICB2b2lkIHZpZGVvQ29u dHJvbHNNYW5hZ2VyRGlkQ2hhbmdlKCk7CiAjZW5kaWYKIAogI2lmIFBMQVRGT1JNKElPUykKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9jb2NvYS9QbGF5YmFja1Nlc3Npb25N YW5hZ2VyLmggYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29jb2EvUGxheWJhY2tTZXNzaW9u TWFuYWdlci5oCmluZGV4IDdmNDA2ODU0Y2FjNmYyYTY1ZGFjMjkwODE3NDQ1ODExMTFmMjUzMzYu LmQyOTdkYWMyMjk3ZmZmOWFiODhmNjE4MGI5ZTlkOTI4ZTUwMjgxMmYgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9jb2NvYS9QbGF5YmFja1Nlc3Npb25NYW5hZ2VyLmgKKysr IGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL2NvY29hL1BsYXliYWNrU2Vzc2lvbk1hbmFnZXIu aApAQCAtMTA5LDYgKzEwOSw4IEBAIHB1YmxpYzoKICAgICB2b2lkIGNsZWFyUGxheWJhY2tDb250 cm9sc01hbmFnZXIoKTsKICAgICB1aW50NjRfdCBjb250ZXh0SWRGb3JNZWRpYUVsZW1lbnQoV2Vi Q29yZTo6SFRNTE1lZGlhRWxlbWVudCYpOwogCisgICAgV2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVu dCogY3VycmVudFBsYXliYWNrQ29udHJvbHNFbGVtZW50KCkgY29uc3Q7CisKIHByb3RlY3RlZDoK ICAgICBmcmllbmQgY2xhc3MgUGxheWJhY2tTZXNzaW9uSW50ZXJmYWNlQ29udGV4dDsKICAgICBm cmllbmQgY2xhc3MgVmlkZW9GdWxsc2NyZWVuTWFuYWdlcjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvV2ViUHJvY2Vzcy9jb2NvYS9QbGF5YmFja1Nlc3Npb25NYW5hZ2VyLm1tIGIvU291cmNl L1dlYktpdC9XZWJQcm9jZXNzL2NvY29hL1BsYXliYWNrU2Vzc2lvbk1hbmFnZXIubW0KaW5kZXgg YzVkZjMxZTBmY2U5NDBiNTc0M2IxZmRmOGY3ZjMxMzFhZDgzZmQzYS4uYjAxMGQzMDc2YjBiMzBj OTgwNTAzMTkwOTFiZjcwOTNmOGMwMjdiNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQ cm9jZXNzL2NvY29hL1BsYXliYWNrU2Vzc2lvbk1hbmFnZXIubW0KKysrIGIvU291cmNlL1dlYktp dC9XZWJQcm9jZXNzL2NvY29hL1BsYXliYWNrU2Vzc2lvbk1hbmFnZXIubW0KQEAgLTI3OCwxOSAr Mjc4LDIxIEBAIHZvaWQgUGxheWJhY2tTZXNzaW9uTWFuYWdlcjo6c2V0VXBQbGF5YmFja0NvbnRy b2xzTWFuYWdlcihXZWJDb3JlOjpIVE1MTWVkaWFFbGVtCiAgICAgfQogCiAgICAgYWRkQ2xpZW50 Rm9yQ29udGV4dChtX2NvbnRyb2xzTWFuYWdlckNvbnRleHRJZCk7CisKKyAgICBtX3BhZ2UtPnZp ZGVvQ29udHJvbHNNYW5hZ2VyRGlkQ2hhbmdlKCk7CiAgICAgbV9wYWdlLT5zZW5kKE1lc3NhZ2Vz OjpQbGF5YmFja1Nlc3Npb25NYW5hZ2VyUHJveHk6OlNldFVwUGxheWJhY2tDb250cm9sc01hbmFn ZXJXaXRoSUQobV9jb250cm9sc01hbmFnZXJDb250ZXh0SWQpLCBtX3BhZ2UtPnBhZ2VJRCgpKTsK IH0KIAogdm9pZCBQbGF5YmFja1Nlc3Npb25NYW5hZ2VyOjpjbGVhclBsYXliYWNrQ29udHJvbHNN YW5hZ2VyKCkKIHsKLSNpZiBQTEFURk9STShNQUMpCiAgICAgaWYgKCFtX2NvbnRyb2xzTWFuYWdl ckNvbnRleHRJZCkKICAgICAgICAgcmV0dXJuOwogCiAgICAgcmVtb3ZlQ2xpZW50Rm9yQ29udGV4 dChtX2NvbnRyb2xzTWFuYWdlckNvbnRleHRJZCk7CiAgICAgbV9jb250cm9sc01hbmFnZXJDb250 ZXh0SWQgPSAwOworCisgICAgbV9wYWdlLT52aWRlb0NvbnRyb2xzTWFuYWdlckRpZENoYW5nZSgp OwogICAgIG1fcGFnZS0+c2VuZChNZXNzYWdlczo6UGxheWJhY2tTZXNzaW9uTWFuYWdlclByb3h5 OjpDbGVhclBsYXliYWNrQ29udHJvbHNNYW5hZ2VyKCksIG1fcGFnZS0+cGFnZUlEKCkpOwotI2Vu ZGlmCiB9CiAKIHVpbnQ2NF90IFBsYXliYWNrU2Vzc2lvbk1hbmFnZXI6OmNvbnRleHRJZEZvck1l ZGlhRWxlbWVudChXZWJDb3JlOjpIVE1MTWVkaWFFbGVtZW50JiBtZWRpYUVsZW1lbnQpCkBAIC0z MDEsNiArMzAzLDE4IEBAIHVpbnQ2NF90IFBsYXliYWNrU2Vzc2lvbk1hbmFnZXI6OmNvbnRleHRJ ZEZvck1lZGlhRWxlbWVudChXZWJDb3JlOjpIVE1MTWVkaWFFbGVtCiAgICAgcmV0dXJuIGNvbnRl eHRJZDsKIH0KIAorV2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudCogUGxheWJhY2tTZXNzaW9uTWFu YWdlcjo6Y3VycmVudFBsYXliYWNrQ29udHJvbHNFbGVtZW50KCkgY29uc3QKK3sKKyAgICBpZiAo IW1fY29udHJvbHNNYW5hZ2VyQ29udGV4dElkKQorICAgICAgICByZXR1cm4gbnVsbHB0cjsKKwor ICAgIGF1dG8gaXRlciA9IG1fY29udGV4dE1hcC5maW5kKG1fY29udHJvbHNNYW5hZ2VyQ29udGV4 dElkKTsKKyAgICBpZiAoaXRlciA9PSBtX2NvbnRleHRNYXAuZW5kKCkpCisgICAgICAgIHJldHVy biBudWxscHRyOworCisgICAgcmV0dXJuIHN0ZDo6Z2V0PDA+KGl0ZXItPnZhbHVlKS0+bWVkaWFF bGVtZW50KCk7Cit9CisKICNwcmFnbWEgbWFyayBJbnRlcmZhY2UgdG8gUGxheWJhY2tTZXNzaW9u SW50ZXJmYWNlQ29udGV4dDoKIAogdm9pZCBQbGF5YmFja1Nlc3Npb25NYW5hZ2VyOjpyZXNldE1l ZGlhU3RhdGUodWludDY0X3QgY29udGV4dElkKQo= 341535 2018-05-29 16:29:36 -0700 2018-05-30 11:00:36 -0700 Patch bug-186065-20180529162934.patch text/plain 8976 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMjMyMjYxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDNjNzFkYTFmNDJjZjQ1YTdj MjJjMGZjNjdlZjI1NWViNDdkNmVhNTUuLjM0MTk5ZDM0MzhiNWMxMTVlYmRkNTVmYmFjMDlkMzI0 ZDBhYzBiMGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjkgQEAKKzIwMTgtMDUtMjkgIEplciBOb2Js ZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CisKKyAgICAgICAgQXV0by1waXAgc2hvdWxkIHVzZSBt YWluIGNvbnRlbnQgaGV1cmlzdGljLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTg2MDY1CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zNTg2MjUwMj4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNYWtlIHRo ZSBtX3BpcFN0YW5kYnlFbGVtZW50IGNsZWFyYWJsZSwgd2hpY2ggd2lsbCBhbGxvdyB0aGUgYXV0 by1waXAgbWVjaGFuaXNtIHRvIGJlIHRvcm4gZG93bi4gQWRkCisgICAgICAgIGEgV2ViUHJvY2Vz cy1zaWRlIG5vdGlmaWNhdGlvbiB3aGVuIHRoZSBtYWluIGNvbnRlbnQgY2hhbmdlcywgdG8gZmFj aWxpdGF0ZSB0aGlzLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9GdWxsU2NyZWVuL1dlYkZ1bGxT Y3JlZW5NYW5hZ2VyLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViRnVsbFNjcmVlbk1hbmFnZXI6 OnZpZGVvQ29udHJvbHNNYW5hZ2VyRGlkQ2hhbmdlKToKKyAgICAgICAgKFdlYktpdDo6V2ViRnVs bFNjcmVlbk1hbmFnZXI6OnNldFBJUFN0YW5kYnlFbGVtZW50KToKKyAgICAgICAgKFdlYktpdDo6 V2ViRnVsbFNjcmVlbk1hbmFnZXI6OmRpZEVudGVyRnVsbFNjcmVlbik6CisgICAgICAgIChXZWJL aXQ6OldlYkZ1bGxTY3JlZW5NYW5hZ2VyOjp3aWxsRXhpdEZ1bGxTY3JlZW4pOgorICAgICAgICAq IFdlYlByb2Nlc3MvRnVsbFNjcmVlbi9XZWJGdWxsU2NyZWVuTWFuYWdlci5oOgorICAgICAgICAq IFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFn ZTo6dmlkZW9Db250cm9sc01hbmFnZXJEaWRDaGFuZ2UpOgorICAgICAgICAqIFdlYlByb2Nlc3Mv V2ViUGFnZS9XZWJQYWdlLmg6CisgICAgICAgICogV2ViUHJvY2Vzcy9jb2NvYS9QbGF5YmFja1Nl c3Npb25NYW5hZ2VyLmg6CisgICAgICAgICogV2ViUHJvY2Vzcy9jb2NvYS9QbGF5YmFja1Nlc3Np b25NYW5hZ2VyLm1tOgorICAgICAgICAoV2ViS2l0OjpQbGF5YmFja1Nlc3Npb25NYW5hZ2VyOjpz ZXRVcFBsYXliYWNrQ29udHJvbHNNYW5hZ2VyKToKKyAgICAgICAgKFdlYktpdDo6UGxheWJhY2tT ZXNzaW9uTWFuYWdlcjo6Y2xlYXJQbGF5YmFja0NvbnRyb2xzTWFuYWdlcik6CisgICAgICAgIChX ZWJLaXQ6OlBsYXliYWNrU2Vzc2lvbk1hbmFnZXI6OmN1cnJlbnRQbGF5YmFja0NvbnRyb2xzRWxl bWVudCBjb25zdCk6CisKIDIwMTgtMDUtMjkgIEplciBOb2JsZSAgPGplci5ub2JsZUBhcHBsZS5j b20+CiAKICAgICAgICAgRml4IGEgZmV3IGlzc3VlcyBpbiBXS0Z1bGxTY3JlZW5WaWV3Q29udHJv bGxlcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0Z1bGxTY3JlZW4vV2Vi RnVsbFNjcmVlbk1hbmFnZXIuY3BwIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0Z1bGxTY3Jl ZW4vV2ViRnVsbFNjcmVlbk1hbmFnZXIuY3BwCmluZGV4IDk2M2YxYjlkNWY2NjZhMWNlNTFkN2E3 MzU2OGYxODgxYzVhYjIyNWEuLjNiZmY1YTQzOTEyOGNjZWQ1NWM4OTRlOTI0Y2E5ZWQ2ZDRlODE1 MWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9GdWxsU2NyZWVuL1dlYkZ1 bGxTY3JlZW5NYW5hZ2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvRnVsbFNj cmVlbi9XZWJGdWxsU2NyZWVuTWFuYWdlci5jcHAKQEAgLTQ1LDYgKzQ1LDEwIEBACiAjaW5jbHVk ZSA8V2ViQ29yZS9TZXR0aW5ncy5oPgogI2luY2x1ZGUgPFdlYkNvcmUvVHlwZWRFbGVtZW50RGVz Y2VuZGFudEl0ZXJhdG9yLmg+CiAKKyNpZiBQTEFURk9STShJT1MpIHx8IChQTEFURk9STShNQUMp ICYmIEVOQUJMRShWSURFT19QUkVTRU5UQVRJT05fTU9ERSkpCisjaW5jbHVkZSAiUGxheWJhY2tT ZXNzaW9uTWFuYWdlci5oIgorI2VuZGlmCisKIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogCiBu YW1lc3BhY2UgV2ViS2l0IHsKQEAgLTgxLDYgKzg1LDI4IEBAIFdlYkNvcmU6OkVsZW1lbnQqIFdl YkZ1bGxTY3JlZW5NYW5hZ2VyOjplbGVtZW50KCkKICAgICByZXR1cm4gbV9lbGVtZW50LmdldCgp OyAKIH0KIAordm9pZCBXZWJGdWxsU2NyZWVuTWFuYWdlcjo6dmlkZW9Db250cm9sc01hbmFnZXJE aWRDaGFuZ2UoKQoreworI2lmIFBMQVRGT1JNKElPUykgfHwgKFBMQVRGT1JNKE1BQykgJiYgRU5B QkxFKFZJREVPX1BSRVNFTlRBVElPTl9NT0RFKSkKKyAgICBhdXRvKiBjdXJyZW50UGxheWJhY2tD b250cm9sc0VsZW1lbnQgPSBtX3BhZ2UtPnBsYXliYWNrU2Vzc2lvbk1hbmFnZXIoKS5jdXJyZW50 UGxheWJhY2tDb250cm9sc0VsZW1lbnQoKTsKKyAgICBzZXRQSVBTdGFuZGJ5RWxlbWVudChpczxI VE1MVmlkZW9FbGVtZW50PihjdXJyZW50UGxheWJhY2tDb250cm9sc0VsZW1lbnQpID8gZG93bmNh c3Q8SFRNTFZpZGVvRWxlbWVudD4oY3VycmVudFBsYXliYWNrQ29udHJvbHNFbGVtZW50KSA6IG51 bGxwdHIpOworI2VuZGlmCit9CisKK3ZvaWQgV2ViRnVsbFNjcmVlbk1hbmFnZXI6OnNldFBJUFN0 YW5kYnlFbGVtZW50KFdlYkNvcmU6OkhUTUxWaWRlb0VsZW1lbnQqIHBpcFN0YW5kYnlFbGVtZW50 KQoreworICAgIGlmIChwaXBTdGFuZGJ5RWxlbWVudCA9PSBtX3BpcFN0YW5kYnlFbGVtZW50KQor ICAgICAgICByZXR1cm47CisKKyAgICBpZiAobV9waXBTdGFuZGJ5RWxlbWVudCkKKyAgICAgICAg bV9waXBTdGFuZGJ5RWxlbWVudC0+c2V0VmlkZW9GdWxsc2NyZWVuU3RhbmRieShmYWxzZSk7CisK KyAgICBtX3BpcFN0YW5kYnlFbGVtZW50ID0gcGlwU3RhbmRieUVsZW1lbnQ7CisKKyAgICBpZiAo bV9waXBTdGFuZGJ5RWxlbWVudCkKKyAgICAgICAgbV9waXBTdGFuZGJ5RWxlbWVudC0+c2V0Vmlk ZW9GdWxsc2NyZWVuU3RhbmRieSh0cnVlKTsKK30KKwogdm9pZCBXZWJGdWxsU2NyZWVuTWFuYWdl cjo6ZGlkUmVjZWl2ZU1lc3NhZ2UoSVBDOjpDb25uZWN0aW9uJiBjb25uZWN0aW9uLCBJUEM6OkRl Y29kZXImIGRlY29kZXIpCiB7CiAgICAgZGlkUmVjZWl2ZVdlYkZ1bGxTY3JlZW5NYW5hZ2VyTWVz c2FnZShjb25uZWN0aW9uLCBkZWNvZGVyKTsKQEAgLTEyNSwxMCArMTUxLDkgQEAgdm9pZCBXZWJG dWxsU2NyZWVuTWFuYWdlcjo6ZGlkRW50ZXJGdWxsU2NyZWVuKCkKICAgICBBU1NFUlQobV9lbGVt ZW50KTsKICAgICBtX2VsZW1lbnQtPmRvY3VtZW50KCkud2Via2l0RGlkRW50ZXJGdWxsU2NyZWVu Rm9yRWxlbWVudChtX2VsZW1lbnQuZ2V0KCkpOwogCi0jaWYgRU5BQkxFKFZJREVPKQotICAgIG1f cGlwU3RhbmRieUVsZW1lbnQgPSBkZXNjZW5kYW50c09mVHlwZTxIVE1MVmlkZW9FbGVtZW50Pigq bV9lbGVtZW50KS5maXJzdCgpOwotICAgIGlmIChtX3BpcFN0YW5kYnlFbGVtZW50KQotICAgICAg ICBtX3BpcFN0YW5kYnlFbGVtZW50LT5zZXRWaWRlb0Z1bGxzY3JlZW5TdGFuZGJ5KHRydWUpOwor I2lmIFBMQVRGT1JNKElPUykgfHwgKFBMQVRGT1JNKE1BQykgJiYgRU5BQkxFKFZJREVPX1BSRVNF TlRBVElPTl9NT0RFKSkKKyAgICBhdXRvKiBjdXJyZW50UGxheWJhY2tDb250cm9sc0VsZW1lbnQg PSBtX3BhZ2UtPnBsYXliYWNrU2Vzc2lvbk1hbmFnZXIoKS5jdXJyZW50UGxheWJhY2tDb250cm9s c0VsZW1lbnQoKTsKKyAgICBzZXRQSVBTdGFuZGJ5RWxlbWVudChpczxIVE1MVmlkZW9FbGVtZW50 PihjdXJyZW50UGxheWJhY2tDb250cm9sc0VsZW1lbnQpID8gZG93bmNhc3Q8SFRNTFZpZGVvRWxl bWVudD4oY3VycmVudFBsYXliYWNrQ29udHJvbHNFbGVtZW50KSA6IG51bGxwdHIpOwogI2VuZGlm CiB9CiAKQEAgLTEzNyw5ICsxNjIsNyBAQCB2b2lkIFdlYkZ1bGxTY3JlZW5NYW5hZ2VyOjp3aWxs RXhpdEZ1bGxTY3JlZW4oKQogICAgIEFTU0VSVChtX2VsZW1lbnQpOwogCiAjaWYgRU5BQkxFKFZJ REVPKQotICAgIGlmIChtX3BpcFN0YW5kYnlFbGVtZW50KQotICAgICAgICBtX3BpcFN0YW5kYnlF bGVtZW50LT5zZXRWaWRlb0Z1bGxzY3JlZW5TdGFuZGJ5KGZhbHNlKTsKLSAgICBtX3BpcFN0YW5k YnlFbGVtZW50ID0gbnVsbHB0cjsKKyAgICBzZXRQSVBTdGFuZGJ5RWxlbWVudChudWxscHRyKTsK ICNlbmRpZgogCiAgICAgbV9maW5hbEZyYW1lID0gc2NyZWVuUmVjdE9mQ29udGVudHMobV9lbGVt ZW50LmdldCgpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9GdWxsU2Ny ZWVuL1dlYkZ1bGxTY3JlZW5NYW5hZ2VyLmggYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvRnVs bFNjcmVlbi9XZWJGdWxsU2NyZWVuTWFuYWdlci5oCmluZGV4IGNkOTQ3ODAzN2M0ZjFlNDE0YjYz YzlhYjQwMGEyN2QyMDdhYTk5ZmMuLmMxNzBmYTJhZWFhNzJlNWNmMWYzMDI2MTk2OWRlNDIyOGRh MDVhNzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9GdWxsU2NyZWVuL1dl YkZ1bGxTY3JlZW5NYW5hZ2VyLmgKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0Z1bGxT Y3JlZW4vV2ViRnVsbFNjcmVlbk1hbmFnZXIuaApAQCAtNjUsMTEgKzY1LDE1IEBAIHB1YmxpYzoK IAogICAgIFdlYkNvcmU6OkVsZW1lbnQqIGVsZW1lbnQoKTsKIAorICAgIHZvaWQgdmlkZW9Db250 cm9sc01hbmFnZXJEaWRDaGFuZ2UoKTsKKwogICAgIHZvaWQgY2xvc2UoKTsKIAogcHJvdGVjdGVk OgogICAgIFdlYkZ1bGxTY3JlZW5NYW5hZ2VyKFdlYlBhZ2UqKTsKIAorICAgIHZvaWQgc2V0UElQ U3RhbmRieUVsZW1lbnQoV2ViQ29yZTo6SFRNTFZpZGVvRWxlbWVudCopOworCiAgICAgdm9pZCBz ZXRBbmltYXRpbmdGdWxsU2NyZWVuKGJvb2wpOwogICAgIHZvaWQgcmVxdWVzdEV4aXRGdWxsU2Ny ZWVuKCk7CiAgICAgdm9pZCBzYXZlU2Nyb2xsUG9zaXRpb24oKTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwIGIvU291cmNlL1dlYktpdC9X ZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKaW5kZXggZjU4Y2M5NDNjZjk2MDAyNmQzZTkx YTAwMmY0ZTY3N2JjZmM0YmJlZC4uNzA3YTAxMjk3YzI1YmE2NzE1NDMyNzNlNGRmMzU5MDhiMDk5 YTRkMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFn ZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAK QEAgLTMyOTMsNiArMzI5MywxNSBAQCBWaWRlb0Z1bGxzY3JlZW5NYW5hZ2VyJiBXZWJQYWdlOjp2 aWRlb0Z1bGxzY3JlZW5NYW5hZ2VyKCkKICAgICAgICAgbV92aWRlb0Z1bGxzY3JlZW5NYW5hZ2Vy ID0gVmlkZW9GdWxsc2NyZWVuTWFuYWdlcjo6Y3JlYXRlKCp0aGlzLCBwbGF5YmFja1Nlc3Npb25N YW5hZ2VyKCkpOwogICAgIHJldHVybiAqbV92aWRlb0Z1bGxzY3JlZW5NYW5hZ2VyOwogfQorCit2 b2lkIFdlYlBhZ2U6OnZpZGVvQ29udHJvbHNNYW5hZ2VyRGlkQ2hhbmdlKCkKK3sKKyNpZiBFTkFC TEUoRlVMTFNDUkVFTl9BUEkpCisgICAgaWYgKGF1dG8qIG1hbmFnZXIgPSBmdWxsU2NyZWVuTWFu YWdlcigpKQorICAgICAgICBtYW5hZ2VyLT52aWRlb0NvbnRyb2xzTWFuYWdlckRpZENoYW5nZSgp OworI2VuZGlmCit9CisKICNlbmRpZgogCiAjaWYgUExBVEZPUk0oSU9TKQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oIGIvU291cmNlL1dlYktp dC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCmluZGV4IDMzM2M3Y2M4M2UzMjQ5MDcwOTEw YzRjM2VhOWI3ODhlYWIwNmI5MDAuLmJiYTZkMzI4ZDkwMjE3ZjJkM2ZjNDViZDhkYjYxZDBhYzZh NzBhNDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBh Z2UuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgKQEAg LTI5OCw2ICsyOTgsNyBAQCBwdWJsaWM6CiAjaWYgUExBVEZPUk0oSU9TKSB8fCAoUExBVEZPUk0o TUFDKSAmJiBFTkFCTEUoVklERU9fUFJFU0VOVEFUSU9OX01PREUpKQogICAgIFBsYXliYWNrU2Vz c2lvbk1hbmFnZXImIHBsYXliYWNrU2Vzc2lvbk1hbmFnZXIoKTsKICAgICBWaWRlb0Z1bGxzY3Jl ZW5NYW5hZ2VyJiB2aWRlb0Z1bGxzY3JlZW5NYW5hZ2VyKCk7CisgICAgdm9pZCB2aWRlb0NvbnRy b2xzTWFuYWdlckRpZENoYW5nZSgpOwogI2VuZGlmCiAKICNpZiBQTEFURk9STShJT1MpCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29jb2EvUGxheWJhY2tTZXNzaW9uTWFu YWdlci5oIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL2NvY29hL1BsYXliYWNrU2Vzc2lvbk1h bmFnZXIuaAppbmRleCA3ZjQwNjg1NGNhYzZmMmE2NWRhYzI5MDgxNzQ0NTgxMTExZjI1MzM2Li5k Mjk3ZGFjMjI5N2ZmZjlhYjg4ZjYxODBiOWU5ZDkyOGU1MDI4MTJmIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L1dlYlByb2Nlc3MvY29jb2EvUGxheWJhY2tTZXNzaW9uTWFuYWdlci5oCisrKyBi L1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9jb2NvYS9QbGF5YmFja1Nlc3Npb25NYW5hZ2VyLmgK QEAgLTEwOSw2ICsxMDksOCBAQCBwdWJsaWM6CiAgICAgdm9pZCBjbGVhclBsYXliYWNrQ29udHJv bHNNYW5hZ2VyKCk7CiAgICAgdWludDY0X3QgY29udGV4dElkRm9yTWVkaWFFbGVtZW50KFdlYkNv cmU6OkhUTUxNZWRpYUVsZW1lbnQmKTsKIAorICAgIFdlYkNvcmU6OkhUTUxNZWRpYUVsZW1lbnQq IGN1cnJlbnRQbGF5YmFja0NvbnRyb2xzRWxlbWVudCgpIGNvbnN0OworCiBwcm90ZWN0ZWQ6CiAg ICAgZnJpZW5kIGNsYXNzIFBsYXliYWNrU2Vzc2lvbkludGVyZmFjZUNvbnRleHQ7CiAgICAgZnJp ZW5kIGNsYXNzIFZpZGVvRnVsbHNjcmVlbk1hbmFnZXI7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L1dlYlByb2Nlc3MvY29jb2EvUGxheWJhY2tTZXNzaW9uTWFuYWdlci5tbSBiL1NvdXJjZS9X ZWJLaXQvV2ViUHJvY2Vzcy9jb2NvYS9QbGF5YmFja1Nlc3Npb25NYW5hZ2VyLm1tCmluZGV4IGM1 ZGYzMWUwZmNlOTQwYjU3NDNiMWZkZjhmN2YzMTMxYWQ4M2ZkM2EuLmIwMTBkMzA3NmIwYjMwYzk4 MDUwMzE5MDkxYmY3MDkzZjhjMDI3YjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJv Y2Vzcy9jb2NvYS9QbGF5YmFja1Nlc3Npb25NYW5hZ2VyLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQv V2ViUHJvY2Vzcy9jb2NvYS9QbGF5YmFja1Nlc3Npb25NYW5hZ2VyLm1tCkBAIC0yNzgsMTkgKzI3 OCwyMSBAQCB2b2lkIFBsYXliYWNrU2Vzc2lvbk1hbmFnZXI6OnNldFVwUGxheWJhY2tDb250cm9s c01hbmFnZXIoV2ViQ29yZTo6SFRNTE1lZGlhRWxlbQogICAgIH0KIAogICAgIGFkZENsaWVudEZv ckNvbnRleHQobV9jb250cm9sc01hbmFnZXJDb250ZXh0SWQpOworCisgICAgbV9wYWdlLT52aWRl b0NvbnRyb2xzTWFuYWdlckRpZENoYW5nZSgpOwogICAgIG1fcGFnZS0+c2VuZChNZXNzYWdlczo6 UGxheWJhY2tTZXNzaW9uTWFuYWdlclByb3h5OjpTZXRVcFBsYXliYWNrQ29udHJvbHNNYW5hZ2Vy V2l0aElEKG1fY29udHJvbHNNYW5hZ2VyQ29udGV4dElkKSwgbV9wYWdlLT5wYWdlSUQoKSk7CiB9 CiAKIHZvaWQgUGxheWJhY2tTZXNzaW9uTWFuYWdlcjo6Y2xlYXJQbGF5YmFja0NvbnRyb2xzTWFu YWdlcigpCiB7Ci0jaWYgUExBVEZPUk0oTUFDKQogICAgIGlmICghbV9jb250cm9sc01hbmFnZXJD b250ZXh0SWQpCiAgICAgICAgIHJldHVybjsKIAogICAgIHJlbW92ZUNsaWVudEZvckNvbnRleHQo bV9jb250cm9sc01hbmFnZXJDb250ZXh0SWQpOwogICAgIG1fY29udHJvbHNNYW5hZ2VyQ29udGV4 dElkID0gMDsKKworICAgIG1fcGFnZS0+dmlkZW9Db250cm9sc01hbmFnZXJEaWRDaGFuZ2UoKTsK ICAgICBtX3BhZ2UtPnNlbmQoTWVzc2FnZXM6OlBsYXliYWNrU2Vzc2lvbk1hbmFnZXJQcm94eTo6 Q2xlYXJQbGF5YmFja0NvbnRyb2xzTWFuYWdlcigpLCBtX3BhZ2UtPnBhZ2VJRCgpKTsKLSNlbmRp ZgogfQogCiB1aW50NjRfdCBQbGF5YmFja1Nlc3Npb25NYW5hZ2VyOjpjb250ZXh0SWRGb3JNZWRp YUVsZW1lbnQoV2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudCYgbWVkaWFFbGVtZW50KQpAQCAtMzAx LDYgKzMwMywxOCBAQCB1aW50NjRfdCBQbGF5YmFja1Nlc3Npb25NYW5hZ2VyOjpjb250ZXh0SWRG b3JNZWRpYUVsZW1lbnQoV2ViQ29yZTo6SFRNTE1lZGlhRWxlbQogICAgIHJldHVybiBjb250ZXh0 SWQ7CiB9CiAKK1dlYkNvcmU6OkhUTUxNZWRpYUVsZW1lbnQqIFBsYXliYWNrU2Vzc2lvbk1hbmFn ZXI6OmN1cnJlbnRQbGF5YmFja0NvbnRyb2xzRWxlbWVudCgpIGNvbnN0Cit7CisgICAgaWYgKCFt X2NvbnRyb2xzTWFuYWdlckNvbnRleHRJZCkKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CisKKyAg ICBhdXRvIGl0ZXIgPSBtX2NvbnRleHRNYXAuZmluZChtX2NvbnRyb2xzTWFuYWdlckNvbnRleHRJ ZCk7CisgICAgaWYgKGl0ZXIgPT0gbV9jb250ZXh0TWFwLmVuZCgpKQorICAgICAgICByZXR1cm4g bnVsbHB0cjsKKworICAgIHJldHVybiBzdGQ6OmdldDwwPihpdGVyLT52YWx1ZSktPm1lZGlhRWxl bWVudCgpOworfQorCiAjcHJhZ21hIG1hcmsgSW50ZXJmYWNlIHRvIFBsYXliYWNrU2Vzc2lvbklu dGVyZmFjZUNvbnRleHQ6CiAKIHZvaWQgUGxheWJhY2tTZXNzaW9uTWFuYWdlcjo6cmVzZXRNZWRp YVN0YXRlKHVpbnQ2NF90IGNvbnRleHRJZCkK