187751 2018-07-18 00:52:12 -0700 [CoordGraphics] Start tracking Nicosia layers in CoordinatedGraphicsState 2018-07-18 03:21:25 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 187385 1 zan zan cgarcia magomez webkit-bug-importer oldest_to_newest 1442945 0 zan 2018-07-18 00:52:12 -0700 [CoordGraphics] Start tracking Nicosia layers in CoordinatedGraphicsState 1442946 1 345232 zan 2018-07-18 01:05:25 -0700 Created attachment 345232 Patch 1442947 2 345232 cgarcia 2018-07-18 01:34:21 -0700 Comment on attachment 345232 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=345232&action=review > Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp:1116 > + return m_nicosia.layer; Can this RefPtr contain nullptr? If not, we could probably return a const Nicosia::CompositionLayer& instead. > Source/WebKit/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp:435 > + // TODO: Start using the Nicosia layer state for updates. Use FIXME instead of TODO 1442951 3 345232 zan 2018-07-18 03:13:55 -0700 Comment on attachment 345232 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=345232&action=review >> Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp:1116 >> + return m_nicosia.layer; > > Can this RefPtr contain nullptr? If not, we could probably return a const Nicosia::CompositionLayer& instead. It can't be null. But every time this is called, it wants a RefPtr that can then be copied. Changing this into a const reference means bending over backwards to get it back into a RefPtr<> at every callsite. 1442952 4 345234 zan 2018-07-18 03:17:23 -0700 Created attachment 345234 Patch for landing 1442953 5 345234 zan 2018-07-18 03:20:23 -0700 Comment on attachment 345234 Patch for landing Clearing flags on attachment: 345234 Committed r233909: <https://trac.webkit.org/changeset/233909> 1442954 6 zan 2018-07-18 03:20:26 -0700 All reviewed patches have been landed. Closing bug. 1442955 7 webkit-bug-importer 2018-07-18 03:21:25 -0700 <rdar://problem/42328098> 345232 2018-07-18 01:05:25 -0700 2018-07-18 03:17:20 -0700 Patch bug-187751-20180718100524.patch text/plain 9908 zan U3VidmVyc2lvbiBSZXZpc2lvbjogMjMzOTA1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzE3NjZhOGQzNDI3Zjk5 NTMyNjBhZGY2YTBjODE3OGYwYzczMTg1NS4uYWI1ZTkyY2U4M2M3Y2ZkNDI5OTYxNTdhZDJiN2U2 NmM0OTJhZGJlOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE4LTA3LTE4ICBaYW4g RG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KKworICAgICAgICBbQ29vcmRHcmFwaGlj c10gU3RhcnQgdHJhY2tpbmcgTmljb3NpYSBsYXllcnMgaW4gQ29vcmRpbmF0ZWRHcmFwaGljc1N0 YXRlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODc3 NTEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTdGFy dCBpbmNsdWRpbmcgdGhlIE5pY29zaWE6OkNvbXBvc2l0aW9uTGF5ZXIgb2JqZWN0cyBpbiB0aGUK KyAgICAgICAgQ29vcmRpbmF0ZWRHcmFwaGljc1N0YXRlIHN0cnVjdCwgdW5kZXIgYSBzZXBhcmF0 ZSBOaWNvc2lhU3RhdGUgc3RydWN0LgorICAgICAgICBSZWZlcmVuY2VzIHRvIGFsbCB0aGUgbGF5 ZXJzIGluIGEgZ2l2ZW4gc2NlbmUgYXJlIGtlcHQgaW4gYSBIYXNoU2V0LAorICAgICAgICBhbmQg YSBzZXBhcmF0ZSByZWZlcmVuY2UgdG8gdGhlIHJvb3QgbGF5ZXIga2VwdCBpbiBhIHNlcGFyYXRl IG1lbWJlcgorICAgICAgICB2YXJpYWJsZS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNz L3RleG1hcC9jb29yZGluYXRlZC9Db29yZGluYXRlZEdyYXBoaWNzTGF5ZXIuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6Q29vcmRpbmF0ZWRHcmFwaGljc0xheWVyOjpjb21wb3NpdGlvbkxheWVyIGNv bnN0KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvY29vcmRpbmF0ZWQvQ29v cmRpbmF0ZWRHcmFwaGljc0xheWVyLmg6CisgICAgICAgIEFkZCB0aGUgZ2V0dGVyIG1ldGhvZCB0 aGF0IHJldHVybnMgaW50ZXJuYWwgTmljb3NpYTo6Q29tcG9zaXRpb25MYXllcgorICAgICAgICBv YmplY3QuIFRoaXMgY2FuJ3QgYmUgZGVmaW5lZCBpbiB0aGUgY2xhc3MgZGVmaW5pdGlvbiBiZWNh dXNlIG9mCisgICAgICAgIFdFQkNPUkVfRVhQT1JUIHVzZWQgb24gdGhlIENvb3JkaW5hdGVkR3Jh cGhpY3NMYXllciBjbGFzcy4KKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvY29v cmRpbmF0ZWQvQ29vcmRpbmF0ZWRHcmFwaGljc1N0YXRlLmg6CisKIDIwMTgtMDctMTcgIEFudG9p bmUgUXVpbnQgIDxncmFvdXRzQGFwcGxlLmNvbT4KIAogICAgICAgICBFbnN1cmUgdGltaW5nRnVu Y3Rpb25Gb3JLZXlmcmFtZUF0SW5kZXgoKSBjYW4gYmUgdXNlZCBmcm9tIHNldEFuaW1hdGVkUHJv cGVydGllc0luU3R5bGUoKS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIv U291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggMGQ5MjhhYjBiOTgxMzYzZjg5MzYwZThhODcx MzMxYjczZjY2NjgwNC4uNjBmMjU4NWI2MzQyMDg2MmM4NzY1Y2YzMWJiYWU1ZWQyMmQ2YmI0YSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9D aGFuZ2VMb2cKQEAgLTEsMyArMSwzNyBAQAorMjAxOC0wNy0xOCAgWmFuIERvYmVyc2VrICA8emRv YmVyc2VrQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0Nvb3JkR3JhcGhpY3NdIFN0YXJ0IHRyYWNr aW5nIE5pY29zaWEgbGF5ZXJzIGluIENvb3JkaW5hdGVkR3JhcGhpY3NTdGF0ZQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg3NzUxCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU3RhcnQgaW5jbHVkaW5nIHRo ZSBOaWNvc2lhOjpDb21wb3NpdGlvbkxheWVyIG9iamVjdHMgaW4gdGhlCisgICAgICAgIENvb3Jk aW5hdGVkR3JhcGhpY3NTdGF0ZSBzdHJ1Y3QsIHVuZGVyIGEgc2VwYXJhdGUgTmljb3NpYVN0YXRl IHN0cnVjdC4KKyAgICAgICAgUmVmZXJlbmNlcyB0byBhbGwgdGhlIGxheWVycyBpbiBhIGdpdmVu IHNjZW5lIGFyZSBrZXB0IGluIGEgSGFzaFNldCwKKyAgICAgICAgYW5kIGEgc2VwYXJhdGUgcmVm ZXJlbmNlIHRvIHRoZSByb290IGxheWVyIGtlcHQgaW4gYSBzZXBhcmF0ZSBtZW1iZXIKKyAgICAg ICAgdmFyaWFibGUuCisKKyAgICAgICAgQ29tcG9zaXRpbmdDb29yZGluYXRvciBub3cgdGFrZXMg Y2FyZSBvZiBhZGRpbmcgb3IgcmVtb3ZpbmcgdGhlCisgICAgICAgIE5pY29zaWE6OkNvbXBvc2l0 aW9uTGF5ZXIgb2JqZWN0cyB0byB0aGUgTmljb3NpYVN0YXRlJ3MgSGFzaFNldCwgYXMgd2VsbAor ICAgICAgICBhcyBzZXR0aW5nIHRoZSByb290IGxheWVyIG9iamVjdCB3aGVuIGl0J3MgYmVpbmcg aW5pdGlhbGl6ZWQuIEFkZGl0aW9ucworICAgICAgICBhbmQgcmVtb3ZhbHMgb2YgTmljb3NpYTo6 Q29tcG9zaXRpb25MYXllciBjb3JyZXNwb25kIHRvIHRoZSBhZGRpdGlvbnMKKyAgICAgICAgYW5k IHJlbW92YWxzIG9mIENvb3JkaW5hdGVkR3JhcGhpY3NMYXllciBvYmplY3RzIHRvIHRoZSBjb29y ZGluYXRvcidzCisgICAgICAgIG1fcmVnaXN0ZXJlZExheWVycyBIYXNoTWFwLgorCisgICAgICAg IFVwb24gZWFjaCBzdGF0ZSBjb21taXQgdGhhdCdzIGRvbmUgaW4gQ29vcmRpbmF0ZWRHcmFwaGlj c1NjZW5lLCB0aGUKKyAgICAgICAgTmljb3NpYVN0YXRlIG9iamVjdCB3aWxsIGJlIGNvcGllZCBp bnRvIHRoZSBtZW1iZXIgdmFyaWFibGUuIE5vdGhpbmcgaXMKKyAgICAgICAgZG9uZSB5ZXQgd2l0 aCB0aGF0IHN0YXRlIG9iamVjdCwgYnV0IGluIHRoZSBuZWFyIGZ1dHVyZSBpdCB3aWxsIGJlIHVz ZWQKKyAgICAgICAgdG8gZmluYWxseSBjb21taXQgYWxsIHRoZSBzdGF0ZSBkZXRhaWxzIGludG8g dGhlIFRleHR1cmVNYXBwZXIgbGF5ZXJzLgorCisgICAgICAgICogU2hhcmVkL0Nvb3JkaW5hdGVk R3JhcGhpY3MvQ29vcmRpbmF0ZWRHcmFwaGljc1NjZW5lLmNwcDoKKyAgICAgICAgKFdlYktpdDo6 Q29vcmRpbmF0ZWRHcmFwaGljc1NjZW5lOjpjb21taXRTY2VuZVN0YXRlKToKKyAgICAgICAgKiBT aGFyZWQvQ29vcmRpbmF0ZWRHcmFwaGljcy9Db29yZGluYXRlZEdyYXBoaWNzU2NlbmUuaDoKKyAg ICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvQ29vcmRpbmF0ZWRHcmFwaGljcy9Db21wb3NpdGlu Z0Nvb3JkaW5hdG9yLmNwcDoKKyAgICAgICAgKFdlYktpdDo6Q29tcG9zaXRpbmdDb29yZGluYXRv cjo6aW5pdGlhbGl6ZVJvb3RDb21wb3NpdGluZ0xheWVySWZOZWVkZWQpOgorICAgICAgICAoV2Vi S2l0OjpDb21wb3NpdGluZ0Nvb3JkaW5hdG9yOjpjcmVhdGVHcmFwaGljc0xheWVyKToKKyAgICAg ICAgKFdlYktpdDo6Q29tcG9zaXRpbmdDb29yZGluYXRvcjo6ZGV0YWNoTGF5ZXIpOgorICAgICAg ICAoV2ViS2l0OjpDb21wb3NpdGluZ0Nvb3JkaW5hdG9yOjphdHRhY2hMYXllcik6CisKIDIwMTgt MDctMTcgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CiAKICAgICAgICAg UkVHUkVTU0lPTiAoaU9TIDEyKTogQ2FuJ3Qgc2Nyb2xsIHRvIHRoZSBib3R0b20gb2YgdGhlIHBh Z2UgaW4gV0tXZWJWaWV3IHdoaWxlIGtleWJvYXJkIGlzIHVwIG9uIHBhZ2VzIHdpdGggdmlld3Bv cnQtZml0PWNvdmVyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy90ZXhtYXAvY29vcmRpbmF0ZWQvQ29vcmRpbmF0ZWRHcmFwaGljc0xheWVyLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9jb29yZGluYXRlZC9Db29yZGluYXRl ZEdyYXBoaWNzTGF5ZXIuY3BwCmluZGV4IDZhNDk5OTFmNzdiOTNmMzI3ODk3YjdlZjFlMmUwYjU5 MjNhODBjNmEuLjA1MGE5ZTA1ZTdjMDg2ZjA2NTdhYmVkYWI4NWM4N2IwNzVkYmM0ZTQgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9jb29yZGluYXRl ZC9Db29yZGluYXRlZEdyYXBoaWNzTGF5ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL3RleG1hcC9jb29yZGluYXRlZC9Db29yZGluYXRlZEdyYXBoaWNzTGF5ZXIu Y3BwCkBAIC0xMTExLDYgKzExMTEsMTEgQEAgdm9pZCBDb29yZGluYXRlZEdyYXBoaWNzTGF5ZXI6 OnNldENvb3JkaW5hdG9ySW5jbHVkaW5nU3ViTGF5ZXJzSWZOZWVkZWQoQ29vcmRpbmEKICAgICAg ICAgZG93bmNhc3Q8Q29vcmRpbmF0ZWRHcmFwaGljc0xheWVyPigqY2hpbGQpLnNldENvb3JkaW5h dG9ySW5jbHVkaW5nU3ViTGF5ZXJzSWZOZWVkZWQoY29vcmRpbmF0b3IpOwogfQogCitjb25zdCBS ZWZQdHI8Tmljb3NpYTo6Q29tcG9zaXRpb25MYXllcj4mIENvb3JkaW5hdGVkR3JhcGhpY3NMYXll cjo6Y29tcG9zaXRpb25MYXllcigpIGNvbnN0Cit7CisgICAgcmV0dXJuIG1fbmljb3NpYS5sYXll cjsKK30KKwogdm9pZCBDb29yZGluYXRlZEdyYXBoaWNzTGF5ZXI6OnNldE5lZWRzVmlzaWJsZVJl Y3RBZGp1c3RtZW50KCkKIHsKICAgICBpZiAoc2hvdWxkSGF2ZUJhY2tpbmdTdG9yZSgpKQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL2Nvb3JkaW5h dGVkL0Nvb3JkaW5hdGVkR3JhcGhpY3NMYXllci5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvdGV4bWFwL2Nvb3JkaW5hdGVkL0Nvb3JkaW5hdGVkR3JhcGhpY3NMYXllci5oCmlu ZGV4IGIzOTMyOGJjZDAwNGNhZWY0NWViMjgzNDFlMGI5MDQzMzNiZjJjODguLmMxMzU0OWMwOTlk YjNiNDVlMGZkNDVhMzhlYjQ0ZTYxY2VlNzhkZDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9jb29yZGluYXRlZC9Db29yZGluYXRlZEdyYXBoaWNz TGF5ZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvY29v cmRpbmF0ZWQvQ29vcmRpbmF0ZWRHcmFwaGljc0xheWVyLmgKQEAgLTEzNCw2ICsxMzQsOCBAQCBw dWJsaWM6CiAgICAgdm9pZCBzZXROZWVkc1Zpc2libGVSZWN0QWRqdXN0bWVudCgpOwogICAgIHZv aWQgcHVyZ2VCYWNraW5nU3RvcmVzKCk7CiAKKyAgICBjb25zdCBSZWZQdHI8Tmljb3NpYTo6Q29t cG9zaXRpb25MYXllcj4mIGNvbXBvc2l0aW9uTGF5ZXIoKSBjb25zdDsKKwogcHJpdmF0ZToKICAg ICBib29sIGlzQ29vcmRpbmF0ZWRHcmFwaGljc0xheWVyKCkgY29uc3Qgb3ZlcnJpZGUgeyByZXR1 cm4gdHJ1ZTsgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy90ZXhtYXAvY29vcmRpbmF0ZWQvQ29vcmRpbmF0ZWRHcmFwaGljc1N0YXRlLmggYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvY29vcmRpbmF0ZWQvQ29vcmRpbmF0ZWRH cmFwaGljc1N0YXRlLmgKaW5kZXggMGNlNjU5ZTZjOGJmMjBjNDE2NTdmMTg3MjFiYmRjMmJmY2Nh OTRmZS4uYTllNjAwN2EzNDgxZDI1YjI0NzFlMmQ4ZjA0ZjI0YThiMjUzNjBhMSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL2Nvb3JkaW5hdGVkL0Nv b3JkaW5hdGVkR3JhcGhpY3NTdGF0ZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL3RleG1hcC9jb29yZGluYXRlZC9Db29yZGluYXRlZEdyYXBoaWNzU3RhdGUuaApAQCAt MzcsNiArMzcsNyBAQAogI2luY2x1ZGUgIkludFJlY3QuaCIKICNpbmNsdWRlICJJbnRTaXplLmgi CiAjaW5jbHVkZSAiTmljb3NpYUJ1ZmZlci5oIgorI2luY2x1ZGUgIk5pY29zaWFQbGF0Zm9ybUxh eWVyLmgiCiAjaW5jbHVkZSAiU3VyZmFjZVVwZGF0ZUluZm8uaCIKICNpbmNsdWRlICJUZXh0dXJl TWFwcGVyQW5pbWF0aW9uLmgiCiAjaW5jbHVkZSAiVHJhbnNmb3JtYXRpb25NYXRyaXguaCIKQEAg LTE3NCw2ICsxNzUsMTEgQEAgc3RydWN0IENvb3JkaW5hdGVkR3JhcGhpY3NMYXllclN0YXRlIHsK IH07CiAKIHN0cnVjdCBDb29yZGluYXRlZEdyYXBoaWNzU3RhdGUgeworICAgIHN0cnVjdCBOaWNv c2lhU3RhdGUgeworICAgICAgICBIYXNoU2V0PFJlZlB0cjxOaWNvc2lhOjpDb21wb3NpdGlvbkxh eWVyPj4gbGF5ZXJzOworICAgICAgICBSZWZQdHI8Tmljb3NpYTo6Q29tcG9zaXRpb25MYXllcj4g cm9vdExheWVyOworICAgIH0gbmljb3NpYTsKKwogICAgIHVpbnQzMl90IHJvb3RDb21wb3NpdGlu Z0xheWVyOwogCiAgICAgVmVjdG9yPENvb3JkaW5hdGVkTGF5ZXJJRD4gbGF5ZXJzVG9DcmVhdGU7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9Db29yZGluYXRlZEdyYXBoaWNzL0Nv b3JkaW5hdGVkR3JhcGhpY3NTY2VuZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9Db29yZGlu YXRlZEdyYXBoaWNzL0Nvb3JkaW5hdGVkR3JhcGhpY3NTY2VuZS5jcHAKaW5kZXggNjJkYmViNGY4 NWMzYzFjODhmMmEyNWExMjJhOTExODZhN2YwMGIyNC4uNjZiYzEzYTAxZGFkYWY1MjcxNjgyNzQ0 ZWZkNmFkN2I2OTUyZDE4OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9TaGFyZWQvQ29vcmRp bmF0ZWRHcmFwaGljcy9Db29yZGluYXRlZEdyYXBoaWNzU2NlbmUuY3BwCisrKyBiL1NvdXJjZS9X ZWJLaXQvU2hhcmVkL0Nvb3JkaW5hdGVkR3JhcGhpY3MvQ29vcmRpbmF0ZWRHcmFwaGljc1NjZW5l LmNwcApAQCAtNDMxLDYgKzQzMSw5IEBAIHZvaWQgQ29vcmRpbmF0ZWRHcmFwaGljc1NjZW5lOjpj b21taXRTY2VuZVN0YXRlKGNvbnN0IENvb3JkaW5hdGVkR3JhcGhpY3NTdGF0ZSYKICAgICBpZiAo IW1fY2xpZW50KQogICAgICAgICByZXR1cm47CiAKKyAgICBtX25pY29zaWEgPSBzdGF0ZS5uaWNv c2lhOworICAgIC8vIFRPRE86IFN0YXJ0IHVzaW5nIHRoZSBOaWNvc2lhIGxheWVyIHN0YXRlIGZv ciB1cGRhdGVzLgorCiAgICAgQ29tbWl0U2NvcGUgY29tbWl0U2NvcGU7CiAKICAgICBjcmVhdGVM YXllcnMoc3RhdGUubGF5ZXJzVG9DcmVhdGUpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9T aGFyZWQvQ29vcmRpbmF0ZWRHcmFwaGljcy9Db29yZGluYXRlZEdyYXBoaWNzU2NlbmUuaCBiL1Nv dXJjZS9XZWJLaXQvU2hhcmVkL0Nvb3JkaW5hdGVkR3JhcGhpY3MvQ29vcmRpbmF0ZWRHcmFwaGlj c1NjZW5lLmgKaW5kZXggYzViY2I1MDY0ZWQ3MDY1Y2YwOWZlYzgyNmJmMGMwNzUyOGU1MGUwMS4u YmE1YjFhZjhkOWY2NjVhNWViMzFlYTEzMTMwZTU3NjM3ZTQ4OGNiOSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9TaGFyZWQvQ29vcmRpbmF0ZWRHcmFwaGljcy9Db29yZGluYXRlZEdyYXBoaWNz U2NlbmUuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9Db29yZGluYXRlZEdyYXBoaWNzL0Nv b3JkaW5hdGVkR3JhcGhpY3NTY2VuZS5oCkBAIC0xNDIsNiArMTQyLDggQEAgcHJpdmF0ZToKICAg ICB2b2lkIG9uTmV3QnVmZmVyQXZhaWxhYmxlKCkgb3ZlcnJpZGU7CiAjZW5kaWYKIAorICAgIFdl YkNvcmU6OkNvb3JkaW5hdGVkR3JhcGhpY3NTdGF0ZTo6Tmljb3NpYVN0YXRlIG1fbmljb3NpYTsK KwogICAgIHN0ZDo6dW5pcXVlX3B0cjxXZWJDb3JlOjpUZXh0dXJlTWFwcGVyPiBtX3RleHR1cmVN YXBwZXI7CiAKICAgICBIYXNoTWFwPFdlYkNvcmU6OkNvb3JkaW5hdGVkSW1hZ2VCYWNraW5nSUQs IFJlZlB0cjxDb29yZGluYXRlZEJhY2tpbmdTdG9yZT4+IG1faW1hZ2VCYWNraW5nczsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL0Nvb3JkaW5hdGVkR3JhcGhp Y3MvQ29tcG9zaXRpbmdDb29yZGluYXRvci5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3Mv V2ViUGFnZS9Db29yZGluYXRlZEdyYXBoaWNzL0NvbXBvc2l0aW5nQ29vcmRpbmF0b3IuY3BwCmlu ZGV4IGJhYWUxNDFlZDYwYzk3NTUwMTNiM2JiMjEzMGVlOTUzMmMwNTQ5NzAuLmJmMTlhMzE5YzRi MTE5MGIzY2RkNDFmNTRlYjJhYjVmMmIzMzY5ZmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv V2ViUHJvY2Vzcy9XZWJQYWdlL0Nvb3JkaW5hdGVkR3JhcGhpY3MvQ29tcG9zaXRpbmdDb29yZGlu YXRvci5jcHAKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvQ29vcmRpbmF0 ZWRHcmFwaGljcy9Db21wb3NpdGluZ0Nvb3JkaW5hdG9yLmNwcApAQCAtMTcxLDcgKzE3MSw5IEBA IHZvaWQgQ29tcG9zaXRpbmdDb29yZGluYXRvcjo6aW5pdGlhbGl6ZVJvb3RDb21wb3NpdGluZ0xh eWVySWZOZWVkZWQoKQogICAgIGlmIChtX2RpZEluaXRpYWxpemVSb290Q29tcG9zaXRpbmdMYXll cikKICAgICAgICAgcmV0dXJuOwogCi0gICAgbV9zdGF0ZS5yb290Q29tcG9zaXRpbmdMYXllciA9 IGRvd25jYXN0PENvb3JkaW5hdGVkR3JhcGhpY3NMYXllcj4oKm1fcm9vdExheWVyKS5pZCgpOwor ICAgIGF1dG8mIHJvb3RMYXllciA9IGRvd25jYXN0PENvb3JkaW5hdGVkR3JhcGhpY3NMYXllcj4o Km1fcm9vdExheWVyKTsKKyAgICBtX3N0YXRlLm5pY29zaWEucm9vdExheWVyID0gcm9vdExheWVy LmNvbXBvc2l0aW9uTGF5ZXIoKTsKKyAgICBtX3N0YXRlLnJvb3RDb21wb3NpdGluZ0xheWVyID0g cm9vdExheWVyLmlkKCk7CiAgICAgbV9kaWRJbml0aWFsaXplUm9vdENvbXBvc2l0aW5nTGF5ZXIg PSB0cnVlOwogICAgIG1fc2hvdWxkU3luY0ZyYW1lID0gdHJ1ZTsKIH0KQEAgLTI2MSw2ICsyNjMs NyBAQCBzdGQ6OnVuaXF1ZV9wdHI8R3JhcGhpY3NMYXllcj4gQ29tcG9zaXRpbmdDb29yZGluYXRv cjo6Y3JlYXRlR3JhcGhpY3NMYXllcihHcmFwaAogewogICAgIENvb3JkaW5hdGVkR3JhcGhpY3NM YXllciogbGF5ZXIgPSBuZXcgQ29vcmRpbmF0ZWRHcmFwaGljc0xheWVyKGxheWVyVHlwZSwgY2xp ZW50KTsKICAgICBsYXllci0+c2V0Q29vcmRpbmF0b3IodGhpcyk7CisgICAgbV9zdGF0ZS5uaWNv c2lhLmxheWVycy5hZGQobGF5ZXItPmNvbXBvc2l0aW9uTGF5ZXIoKSk7CiAgICAgbV9yZWdpc3Rl cmVkTGF5ZXJzLmFkZChsYXllci0+aWQoKSwgbGF5ZXIpOwogICAgIG1fc3RhdGUubGF5ZXJzVG9D cmVhdGUuYXBwZW5kKGxheWVyLT5pZCgpKTsKICAgICBsYXllci0+c2V0TmVlZHNWaXNpYmxlUmVj dEFkanVzdG1lbnQoKTsKQEAgLTMwMSw2ICszMDQsNyBAQCB2b2lkIENvbXBvc2l0aW5nQ29vcmRp bmF0b3I6OmRldGFjaExheWVyKENvb3JkaW5hdGVkR3JhcGhpY3NMYXllciogbGF5ZXIpCiAgICAg aWYgKG1faXNQdXJnaW5nKQogICAgICAgICByZXR1cm47CiAKKyAgICBtX3N0YXRlLm5pY29zaWEu bGF5ZXJzLnJlbW92ZShsYXllci0+Y29tcG9zaXRpb25MYXllcigpKTsKICAgICBtX3JlZ2lzdGVy ZWRMYXllcnMucmVtb3ZlKGxheWVyLT5pZCgpKTsKIAogICAgIHNpemVfdCBpbmRleCA9IG1fc3Rh dGUubGF5ZXJzVG9DcmVhdGUuZmluZChsYXllci0+aWQoKSk7CkBAIC0zMTYsNiArMzIwLDcgQEAg dm9pZCBDb21wb3NpdGluZ0Nvb3JkaW5hdG9yOjpkZXRhY2hMYXllcihDb29yZGluYXRlZEdyYXBo aWNzTGF5ZXIqIGxheWVyKQogdm9pZCBDb21wb3NpdGluZ0Nvb3JkaW5hdG9yOjphdHRhY2hMYXll cihDb29yZGluYXRlZEdyYXBoaWNzTGF5ZXIqIGxheWVyKQogewogICAgIGxheWVyLT5zZXRDb29y ZGluYXRvcih0aGlzKTsKKyAgICBtX3N0YXRlLm5pY29zaWEubGF5ZXJzLmFkZChsYXllci0+Y29t cG9zaXRpb25MYXllcigpKTsKICAgICBtX3JlZ2lzdGVyZWRMYXllcnMuYWRkKGxheWVyLT5pZCgp LCBsYXllcik7CiAgICAgbV9zdGF0ZS5sYXllcnNUb0NyZWF0ZS5hcHBlbmQobGF5ZXItPmlkKCkp OwogICAgIGxheWVyLT5zZXROZWVkc1Zpc2libGVSZWN0QWRqdXN0bWVudCgpOwo= 345234 2018-07-18 03:17:23 -0700 2018-07-18 03:17:23 -0700 Patch for landing bug-187751-20180718121722.patch text/plain 9921 zan U3VidmVyc2lvbiBSZXZpc2lvbjogMjMzOTA1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzE3NjZhOGQzNDI3Zjk5 NTMyNjBhZGY2YTBjODE3OGYwYzczMTg1NS4uMmExMTNmMzEwZjJhZGJkNjQxZTNhNzEyOTVkZjc4 YTVkZTVjYzBmYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE4LTA3LTE4ICBaYW4g RG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KKworICAgICAgICBbQ29vcmRHcmFwaGlj c10gU3RhcnQgdHJhY2tpbmcgTmljb3NpYSBsYXllcnMgaW4gQ29vcmRpbmF0ZWRHcmFwaGljc1N0 YXRlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODc3 NTEKKworICAgICAgICBSZXZpZXdlZCBieSBDYXJsb3MgR2FyY2lhIENhbXBvcy4KKworICAgICAg ICBTdGFydCBpbmNsdWRpbmcgdGhlIE5pY29zaWE6OkNvbXBvc2l0aW9uTGF5ZXIgb2JqZWN0cyBp biB0aGUKKyAgICAgICAgQ29vcmRpbmF0ZWRHcmFwaGljc1N0YXRlIHN0cnVjdCwgdW5kZXIgYSBz ZXBhcmF0ZSBOaWNvc2lhU3RhdGUgc3RydWN0LgorICAgICAgICBSZWZlcmVuY2VzIHRvIGFsbCB0 aGUgbGF5ZXJzIGluIGEgZ2l2ZW4gc2NlbmUgYXJlIGtlcHQgaW4gYSBIYXNoU2V0LAorICAgICAg ICBhbmQgYSBzZXBhcmF0ZSByZWZlcmVuY2UgdG8gdGhlIHJvb3QgbGF5ZXIga2VwdCBpbiBhIHNl cGFyYXRlIG1lbWJlcgorICAgICAgICB2YXJpYWJsZS4KKworICAgICAgICAqIHBsYXRmb3JtL2dy YXBoaWNzL3RleG1hcC9jb29yZGluYXRlZC9Db29yZGluYXRlZEdyYXBoaWNzTGF5ZXIuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6Q29vcmRpbmF0ZWRHcmFwaGljc0xheWVyOjpjb21wb3NpdGlvbkxh eWVyIGNvbnN0KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvY29vcmRpbmF0 ZWQvQ29vcmRpbmF0ZWRHcmFwaGljc0xheWVyLmg6CisgICAgICAgIEFkZCB0aGUgZ2V0dGVyIG1l dGhvZCB0aGF0IHJldHVybnMgaW50ZXJuYWwgTmljb3NpYTo6Q29tcG9zaXRpb25MYXllcgorICAg ICAgICBvYmplY3QuIFRoaXMgY2FuJ3QgYmUgZGVmaW5lZCBpbiB0aGUgY2xhc3MgZGVmaW5pdGlv biBiZWNhdXNlIG9mCisgICAgICAgIFdFQkNPUkVfRVhQT1JUIHVzZWQgb24gdGhlIENvb3JkaW5h dGVkR3JhcGhpY3NMYXllciBjbGFzcy4KKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy90ZXht YXAvY29vcmRpbmF0ZWQvQ29vcmRpbmF0ZWRHcmFwaGljc1N0YXRlLmg6CisKIDIwMTgtMDctMTcg IEFudG9pbmUgUXVpbnQgIDxncmFvdXRzQGFwcGxlLmNvbT4KIAogICAgICAgICBFbnN1cmUgdGlt aW5nRnVuY3Rpb25Gb3JLZXlmcmFtZUF0SW5kZXgoKSBjYW4gYmUgdXNlZCBmcm9tIHNldEFuaW1h dGVkUHJvcGVydGllc0luU3R5bGUoKS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdl TG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggMGQ5MjhhYjBiOTgxMzYzZjg5MzYw ZThhODcxMzMxYjczZjY2NjgwNC4uMjU3ODY2OTI0OGFjY2MwYTNmYTFkNGZiMGFlY2Q4YTc4MjNj ZmM5NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl YktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzNyBAQAorMjAxOC0wNy0xOCAgWmFuIERvYmVyc2Vr ICA8emRvYmVyc2VrQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0Nvb3JkR3JhcGhpY3NdIFN0YXJ0 IHRyYWNraW5nIE5pY29zaWEgbGF5ZXJzIGluIENvb3JkaW5hdGVkR3JhcGhpY3NTdGF0ZQorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg3NzUxCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgQ2FybG9zIEdhcmNpYSBDYW1wb3MuCisKKyAgICAgICAgU3RhcnQg aW5jbHVkaW5nIHRoZSBOaWNvc2lhOjpDb21wb3NpdGlvbkxheWVyIG9iamVjdHMgaW4gdGhlCisg ICAgICAgIENvb3JkaW5hdGVkR3JhcGhpY3NTdGF0ZSBzdHJ1Y3QsIHVuZGVyIGEgc2VwYXJhdGUg Tmljb3NpYVN0YXRlIHN0cnVjdC4KKyAgICAgICAgUmVmZXJlbmNlcyB0byBhbGwgdGhlIGxheWVy cyBpbiBhIGdpdmVuIHNjZW5lIGFyZSBrZXB0IGluIGEgSGFzaFNldCwKKyAgICAgICAgYW5kIGEg c2VwYXJhdGUgcmVmZXJlbmNlIHRvIHRoZSByb290IGxheWVyIGtlcHQgaW4gYSBzZXBhcmF0ZSBt ZW1iZXIKKyAgICAgICAgdmFyaWFibGUuCisKKyAgICAgICAgQ29tcG9zaXRpbmdDb29yZGluYXRv ciBub3cgdGFrZXMgY2FyZSBvZiBhZGRpbmcgb3IgcmVtb3ZpbmcgdGhlCisgICAgICAgIE5pY29z aWE6OkNvbXBvc2l0aW9uTGF5ZXIgb2JqZWN0cyB0byB0aGUgTmljb3NpYVN0YXRlJ3MgSGFzaFNl dCwgYXMgd2VsbAorICAgICAgICBhcyBzZXR0aW5nIHRoZSByb290IGxheWVyIG9iamVjdCB3aGVu IGl0J3MgYmVpbmcgaW5pdGlhbGl6ZWQuIEFkZGl0aW9ucworICAgICAgICBhbmQgcmVtb3ZhbHMg b2YgTmljb3NpYTo6Q29tcG9zaXRpb25MYXllciBjb3JyZXNwb25kIHRvIHRoZSBhZGRpdGlvbnMK KyAgICAgICAgYW5kIHJlbW92YWxzIG9mIENvb3JkaW5hdGVkR3JhcGhpY3NMYXllciBvYmplY3Rz IHRvIHRoZSBjb29yZGluYXRvcidzCisgICAgICAgIG1fcmVnaXN0ZXJlZExheWVycyBIYXNoTWFw LgorCisgICAgICAgIFVwb24gZWFjaCBzdGF0ZSBjb21taXQgdGhhdCdzIGRvbmUgaW4gQ29vcmRp bmF0ZWRHcmFwaGljc1NjZW5lLCB0aGUKKyAgICAgICAgTmljb3NpYVN0YXRlIG9iamVjdCB3aWxs IGJlIGNvcGllZCBpbnRvIHRoZSBtZW1iZXIgdmFyaWFibGUuIE5vdGhpbmcgaXMKKyAgICAgICAg ZG9uZSB5ZXQgd2l0aCB0aGF0IHN0YXRlIG9iamVjdCwgYnV0IGluIHRoZSBuZWFyIGZ1dHVyZSBp dCB3aWxsIGJlIHVzZWQKKyAgICAgICAgdG8gZmluYWxseSBjb21taXQgYWxsIHRoZSBzdGF0ZSBk ZXRhaWxzIGludG8gdGhlIFRleHR1cmVNYXBwZXIgbGF5ZXJzLgorCisgICAgICAgICogU2hhcmVk L0Nvb3JkaW5hdGVkR3JhcGhpY3MvQ29vcmRpbmF0ZWRHcmFwaGljc1NjZW5lLmNwcDoKKyAgICAg ICAgKFdlYktpdDo6Q29vcmRpbmF0ZWRHcmFwaGljc1NjZW5lOjpjb21taXRTY2VuZVN0YXRlKToK KyAgICAgICAgKiBTaGFyZWQvQ29vcmRpbmF0ZWRHcmFwaGljcy9Db29yZGluYXRlZEdyYXBoaWNz U2NlbmUuaDoKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvQ29vcmRpbmF0ZWRHcmFwaGlj cy9Db21wb3NpdGluZ0Nvb3JkaW5hdG9yLmNwcDoKKyAgICAgICAgKFdlYktpdDo6Q29tcG9zaXRp bmdDb29yZGluYXRvcjo6aW5pdGlhbGl6ZVJvb3RDb21wb3NpdGluZ0xheWVySWZOZWVkZWQpOgor ICAgICAgICAoV2ViS2l0OjpDb21wb3NpdGluZ0Nvb3JkaW5hdG9yOjpjcmVhdGVHcmFwaGljc0xh eWVyKToKKyAgICAgICAgKFdlYktpdDo6Q29tcG9zaXRpbmdDb29yZGluYXRvcjo6ZGV0YWNoTGF5 ZXIpOgorICAgICAgICAoV2ViS2l0OjpDb21wb3NpdGluZ0Nvb3JkaW5hdG9yOjphdHRhY2hMYXll cik6CisKIDIwMTgtMDctMTcgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+ CiAKICAgICAgICAgUkVHUkVTU0lPTiAoaU9TIDEyKTogQ2FuJ3Qgc2Nyb2xsIHRvIHRoZSBib3R0 b20gb2YgdGhlIHBhZ2UgaW4gV0tXZWJWaWV3IHdoaWxlIGtleWJvYXJkIGlzIHVwIG9uIHBhZ2Vz IHdpdGggdmlld3BvcnQtZml0PWNvdmVyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy90ZXhtYXAvY29vcmRpbmF0ZWQvQ29vcmRpbmF0ZWRHcmFwaGljc0xheWVy LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9jb29yZGluYXRl ZC9Db29yZGluYXRlZEdyYXBoaWNzTGF5ZXIuY3BwCmluZGV4IDZhNDk5OTFmNzdiOTNmMzI3ODk3 YjdlZjFlMmUwYjU5MjNhODBjNmEuLjA1MGE5ZTA1ZTdjMDg2ZjA2NTdhYmVkYWI4NWM4N2IwNzVk YmM0ZTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1h cC9jb29yZGluYXRlZC9Db29yZGluYXRlZEdyYXBoaWNzTGF5ZXIuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9jb29yZGluYXRlZC9Db29yZGluYXRlZEdy YXBoaWNzTGF5ZXIuY3BwCkBAIC0xMTExLDYgKzExMTEsMTEgQEAgdm9pZCBDb29yZGluYXRlZEdy YXBoaWNzTGF5ZXI6OnNldENvb3JkaW5hdG9ySW5jbHVkaW5nU3ViTGF5ZXJzSWZOZWVkZWQoQ29v cmRpbmEKICAgICAgICAgZG93bmNhc3Q8Q29vcmRpbmF0ZWRHcmFwaGljc0xheWVyPigqY2hpbGQp LnNldENvb3JkaW5hdG9ySW5jbHVkaW5nU3ViTGF5ZXJzSWZOZWVkZWQoY29vcmRpbmF0b3IpOwog fQogCitjb25zdCBSZWZQdHI8Tmljb3NpYTo6Q29tcG9zaXRpb25MYXllcj4mIENvb3JkaW5hdGVk R3JhcGhpY3NMYXllcjo6Y29tcG9zaXRpb25MYXllcigpIGNvbnN0Cit7CisgICAgcmV0dXJuIG1f bmljb3NpYS5sYXllcjsKK30KKwogdm9pZCBDb29yZGluYXRlZEdyYXBoaWNzTGF5ZXI6OnNldE5l ZWRzVmlzaWJsZVJlY3RBZGp1c3RtZW50KCkKIHsKICAgICBpZiAoc2hvdWxkSGF2ZUJhY2tpbmdT dG9yZSgpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4 bWFwL2Nvb3JkaW5hdGVkL0Nvb3JkaW5hdGVkR3JhcGhpY3NMYXllci5oIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL2Nvb3JkaW5hdGVkL0Nvb3JkaW5hdGVkR3JhcGhp Y3NMYXllci5oCmluZGV4IGIzOTMyOGJjZDAwNGNhZWY0NWViMjgzNDFlMGI5MDQzMzNiZjJjODgu LmMxMzU0OWMwOTlkYjNiNDVlMGZkNDVhMzhlYjQ0ZTYxY2VlNzhkZDUgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9jb29yZGluYXRlZC9Db29yZGlu YXRlZEdyYXBoaWNzTGF5ZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy90ZXhtYXAvY29vcmRpbmF0ZWQvQ29vcmRpbmF0ZWRHcmFwaGljc0xheWVyLmgKQEAgLTEzNCw2 ICsxMzQsOCBAQCBwdWJsaWM6CiAgICAgdm9pZCBzZXROZWVkc1Zpc2libGVSZWN0QWRqdXN0bWVu dCgpOwogICAgIHZvaWQgcHVyZ2VCYWNraW5nU3RvcmVzKCk7CiAKKyAgICBjb25zdCBSZWZQdHI8 Tmljb3NpYTo6Q29tcG9zaXRpb25MYXllcj4mIGNvbXBvc2l0aW9uTGF5ZXIoKSBjb25zdDsKKwog cHJpdmF0ZToKICAgICBib29sIGlzQ29vcmRpbmF0ZWRHcmFwaGljc0xheWVyKCkgY29uc3Qgb3Zl cnJpZGUgeyByZXR1cm4gdHJ1ZTsgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy90ZXhtYXAvY29vcmRpbmF0ZWQvQ29vcmRpbmF0ZWRHcmFwaGljc1N0YXRl LmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvY29vcmRpbmF0ZWQv Q29vcmRpbmF0ZWRHcmFwaGljc1N0YXRlLmgKaW5kZXggMGNlNjU5ZTZjOGJmMjBjNDE2NTdmMTg3 MjFiYmRjMmJmY2NhOTRmZS4uYTllNjAwN2EzNDgxZDI1YjI0NzFlMmQ4ZjA0ZjI0YThiMjUzNjBh MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL2Nv b3JkaW5hdGVkL0Nvb3JkaW5hdGVkR3JhcGhpY3NTdGF0ZS5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9jb29yZGluYXRlZC9Db29yZGluYXRlZEdyYXBoaWNz U3RhdGUuaApAQCAtMzcsNiArMzcsNyBAQAogI2luY2x1ZGUgIkludFJlY3QuaCIKICNpbmNsdWRl ICJJbnRTaXplLmgiCiAjaW5jbHVkZSAiTmljb3NpYUJ1ZmZlci5oIgorI2luY2x1ZGUgIk5pY29z aWFQbGF0Zm9ybUxheWVyLmgiCiAjaW5jbHVkZSAiU3VyZmFjZVVwZGF0ZUluZm8uaCIKICNpbmNs dWRlICJUZXh0dXJlTWFwcGVyQW5pbWF0aW9uLmgiCiAjaW5jbHVkZSAiVHJhbnNmb3JtYXRpb25N YXRyaXguaCIKQEAgLTE3NCw2ICsxNzUsMTEgQEAgc3RydWN0IENvb3JkaW5hdGVkR3JhcGhpY3NM YXllclN0YXRlIHsKIH07CiAKIHN0cnVjdCBDb29yZGluYXRlZEdyYXBoaWNzU3RhdGUgeworICAg IHN0cnVjdCBOaWNvc2lhU3RhdGUgeworICAgICAgICBIYXNoU2V0PFJlZlB0cjxOaWNvc2lhOjpD b21wb3NpdGlvbkxheWVyPj4gbGF5ZXJzOworICAgICAgICBSZWZQdHI8Tmljb3NpYTo6Q29tcG9z aXRpb25MYXllcj4gcm9vdExheWVyOworICAgIH0gbmljb3NpYTsKKwogICAgIHVpbnQzMl90IHJv b3RDb21wb3NpdGluZ0xheWVyOwogCiAgICAgVmVjdG9yPENvb3JkaW5hdGVkTGF5ZXJJRD4gbGF5 ZXJzVG9DcmVhdGU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9Db29yZGluYXRl ZEdyYXBoaWNzL0Nvb3JkaW5hdGVkR3JhcGhpY3NTY2VuZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1No YXJlZC9Db29yZGluYXRlZEdyYXBoaWNzL0Nvb3JkaW5hdGVkR3JhcGhpY3NTY2VuZS5jcHAKaW5k ZXggNjJkYmViNGY4NWMzYzFjODhmMmEyNWExMjJhOTExODZhN2YwMGIyNC4uMTNkOWE0MGQyODcz YzA3OGFlMTg5MTU1NTY1NDU5NjQzZDFlMjc1YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9T aGFyZWQvQ29vcmRpbmF0ZWRHcmFwaGljcy9Db29yZGluYXRlZEdyYXBoaWNzU2NlbmUuY3BwCisr KyBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL0Nvb3JkaW5hdGVkR3JhcGhpY3MvQ29vcmRpbmF0ZWRH cmFwaGljc1NjZW5lLmNwcApAQCAtNDMxLDYgKzQzMSw5IEBAIHZvaWQgQ29vcmRpbmF0ZWRHcmFw aGljc1NjZW5lOjpjb21taXRTY2VuZVN0YXRlKGNvbnN0IENvb3JkaW5hdGVkR3JhcGhpY3NTdGF0 ZSYKICAgICBpZiAoIW1fY2xpZW50KQogICAgICAgICByZXR1cm47CiAKKyAgICBtX25pY29zaWEg PSBzdGF0ZS5uaWNvc2lhOworICAgIC8vIEZJWE1FOiBTdGFydCB1c2luZyB0aGUgTmljb3NpYSBs YXllciBzdGF0ZSBmb3IgdXBkYXRlcy4KKwogICAgIENvbW1pdFNjb3BlIGNvbW1pdFNjb3BlOwog CiAgICAgY3JlYXRlTGF5ZXJzKHN0YXRlLmxheWVyc1RvQ3JlYXRlKTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvU2hhcmVkL0Nvb3JkaW5hdGVkR3JhcGhpY3MvQ29vcmRpbmF0ZWRHcmFwaGlj c1NjZW5lLmggYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9Db29yZGluYXRlZEdyYXBoaWNzL0Nvb3Jk aW5hdGVkR3JhcGhpY3NTY2VuZS5oCmluZGV4IGM1YmNiNTA2NGVkNzA2NWNmMDlmZWM4MjZiZjBj MDc1MjhlNTBlMDEuLmJhNWIxYWY4ZDlmNjY1YTVlYjMxZWExMzEzMGU1NzYzN2U0ODhjYjkgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL0Nvb3JkaW5hdGVkR3JhcGhpY3MvQ29vcmRp bmF0ZWRHcmFwaGljc1NjZW5lLmgKKysrIGIvU291cmNlL1dlYktpdC9TaGFyZWQvQ29vcmRpbmF0 ZWRHcmFwaGljcy9Db29yZGluYXRlZEdyYXBoaWNzU2NlbmUuaApAQCAtMTQyLDYgKzE0Miw4IEBA IHByaXZhdGU6CiAgICAgdm9pZCBvbk5ld0J1ZmZlckF2YWlsYWJsZSgpIG92ZXJyaWRlOwogI2Vu ZGlmCiAKKyAgICBXZWJDb3JlOjpDb29yZGluYXRlZEdyYXBoaWNzU3RhdGU6Ok5pY29zaWFTdGF0 ZSBtX25pY29zaWE7CisKICAgICBzdGQ6OnVuaXF1ZV9wdHI8V2ViQ29yZTo6VGV4dHVyZU1hcHBl cj4gbV90ZXh0dXJlTWFwcGVyOwogCiAgICAgSGFzaE1hcDxXZWJDb3JlOjpDb29yZGluYXRlZElt YWdlQmFja2luZ0lELCBSZWZQdHI8Q29vcmRpbmF0ZWRCYWNraW5nU3RvcmU+PiBtX2ltYWdlQmFj a2luZ3M7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9Db29y ZGluYXRlZEdyYXBoaWNzL0NvbXBvc2l0aW5nQ29vcmRpbmF0b3IuY3BwIGIvU291cmNlL1dlYktp dC9XZWJQcm9jZXNzL1dlYlBhZ2UvQ29vcmRpbmF0ZWRHcmFwaGljcy9Db21wb3NpdGluZ0Nvb3Jk aW5hdG9yLmNwcAppbmRleCBiYWFlMTQxZWQ2MGM5NzU1MDEzYjNiYjIxMzBlZTk1MzJjMDU0OTcw Li5iZjE5YTMxOWM0YjExOTBiM2NkZDQxZjU0ZWIyYWI1ZjJiMzM2OWZkIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9Db29yZGluYXRlZEdyYXBoaWNzL0NvbXBv c2l0aW5nQ29vcmRpbmF0b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQ YWdlL0Nvb3JkaW5hdGVkR3JhcGhpY3MvQ29tcG9zaXRpbmdDb29yZGluYXRvci5jcHAKQEAgLTE3 MSw3ICsxNzEsOSBAQCB2b2lkIENvbXBvc2l0aW5nQ29vcmRpbmF0b3I6OmluaXRpYWxpemVSb290 Q29tcG9zaXRpbmdMYXllcklmTmVlZGVkKCkKICAgICBpZiAobV9kaWRJbml0aWFsaXplUm9vdENv bXBvc2l0aW5nTGF5ZXIpCiAgICAgICAgIHJldHVybjsKIAotICAgIG1fc3RhdGUucm9vdENvbXBv c2l0aW5nTGF5ZXIgPSBkb3duY2FzdDxDb29yZGluYXRlZEdyYXBoaWNzTGF5ZXI+KCptX3Jvb3RM YXllcikuaWQoKTsKKyAgICBhdXRvJiByb290TGF5ZXIgPSBkb3duY2FzdDxDb29yZGluYXRlZEdy YXBoaWNzTGF5ZXI+KCptX3Jvb3RMYXllcik7CisgICAgbV9zdGF0ZS5uaWNvc2lhLnJvb3RMYXll ciA9IHJvb3RMYXllci5jb21wb3NpdGlvbkxheWVyKCk7CisgICAgbV9zdGF0ZS5yb290Q29tcG9z aXRpbmdMYXllciA9IHJvb3RMYXllci5pZCgpOwogICAgIG1fZGlkSW5pdGlhbGl6ZVJvb3RDb21w b3NpdGluZ0xheWVyID0gdHJ1ZTsKICAgICBtX3Nob3VsZFN5bmNGcmFtZSA9IHRydWU7CiB9CkBA IC0yNjEsNiArMjYzLDcgQEAgc3RkOjp1bmlxdWVfcHRyPEdyYXBoaWNzTGF5ZXI+IENvbXBvc2l0 aW5nQ29vcmRpbmF0b3I6OmNyZWF0ZUdyYXBoaWNzTGF5ZXIoR3JhcGgKIHsKICAgICBDb29yZGlu YXRlZEdyYXBoaWNzTGF5ZXIqIGxheWVyID0gbmV3IENvb3JkaW5hdGVkR3JhcGhpY3NMYXllcihs YXllclR5cGUsIGNsaWVudCk7CiAgICAgbGF5ZXItPnNldENvb3JkaW5hdG9yKHRoaXMpOworICAg IG1fc3RhdGUubmljb3NpYS5sYXllcnMuYWRkKGxheWVyLT5jb21wb3NpdGlvbkxheWVyKCkpOwog ICAgIG1fcmVnaXN0ZXJlZExheWVycy5hZGQobGF5ZXItPmlkKCksIGxheWVyKTsKICAgICBtX3N0 YXRlLmxheWVyc1RvQ3JlYXRlLmFwcGVuZChsYXllci0+aWQoKSk7CiAgICAgbGF5ZXItPnNldE5l ZWRzVmlzaWJsZVJlY3RBZGp1c3RtZW50KCk7CkBAIC0zMDEsNiArMzA0LDcgQEAgdm9pZCBDb21w b3NpdGluZ0Nvb3JkaW5hdG9yOjpkZXRhY2hMYXllcihDb29yZGluYXRlZEdyYXBoaWNzTGF5ZXIq IGxheWVyKQogICAgIGlmIChtX2lzUHVyZ2luZykKICAgICAgICAgcmV0dXJuOwogCisgICAgbV9z dGF0ZS5uaWNvc2lhLmxheWVycy5yZW1vdmUobGF5ZXItPmNvbXBvc2l0aW9uTGF5ZXIoKSk7CiAg ICAgbV9yZWdpc3RlcmVkTGF5ZXJzLnJlbW92ZShsYXllci0+aWQoKSk7CiAKICAgICBzaXplX3Qg aW5kZXggPSBtX3N0YXRlLmxheWVyc1RvQ3JlYXRlLmZpbmQobGF5ZXItPmlkKCkpOwpAQCAtMzE2 LDYgKzMyMCw3IEBAIHZvaWQgQ29tcG9zaXRpbmdDb29yZGluYXRvcjo6ZGV0YWNoTGF5ZXIoQ29v cmRpbmF0ZWRHcmFwaGljc0xheWVyKiBsYXllcikKIHZvaWQgQ29tcG9zaXRpbmdDb29yZGluYXRv cjo6YXR0YWNoTGF5ZXIoQ29vcmRpbmF0ZWRHcmFwaGljc0xheWVyKiBsYXllcikKIHsKICAgICBs YXllci0+c2V0Q29vcmRpbmF0b3IodGhpcyk7CisgICAgbV9zdGF0ZS5uaWNvc2lhLmxheWVycy5h ZGQobGF5ZXItPmNvbXBvc2l0aW9uTGF5ZXIoKSk7CiAgICAgbV9yZWdpc3RlcmVkTGF5ZXJzLmFk ZChsYXllci0+aWQoKSwgbGF5ZXIpOwogICAgIG1fc3RhdGUubGF5ZXJzVG9DcmVhdGUuYXBwZW5k KGxheWVyLT5pZCgpKTsKICAgICBsYXllci0+c2V0TmVlZHNWaXNpYmxlUmVjdEFkanVzdG1lbnQo KTsK