152946 2016-01-09 11:15:16 -0800 Hook up display-list drawing in GraphicsLayerCA 2016-01-09 22:40:25 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 152808 1 simon.fraser simon.fraser jonlee mmaxfield sabouhallawa simon.fraser thorton zalan oldest_to_newest 1154155 0 simon.fraser 2016-01-09 11:15:16 -0800 Hook up display-list drawing in GraphicsLayerCA 1154156 1 268624 simon.fraser 2016-01-09 11:21:45 -0800 Created attachment 268624 Patch 1154160 2 268624 dbates 2016-01-09 12:34:00 -0800 Comment on attachment 268624 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=268624&action=review > Source/WebCore/ChangeLog:44 > + * platform/graphics/displaylists/DisplayList.h: Sadly need to include DisplayListItems.h > + to get things to compile. I wasn't able to avoid this even when making functions non-inline. I take it you tried including DisplayListItems.h from GraphicsLayerCA.cpp? > Source/WebCore/platform/graphics/ca/PlatformCALayerClient.h:67 > + virtual bool isUsingDisplayListDrawing(PlatformCALayer*) const { return false; } I take it you are planning to make use of the parameter, PlatformCALayer, in the future? 1154199 3 simon.fraser 2016-01-09 22:40:25 -0800 https://trac.webkit.org/changeset/194825 268624 2016-01-09 11:21:45 -0800 2016-01-09 15:39:46 -0800 Patch bug-152946-20160109112113.patch text/plain 22524 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTk0ODE2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjZiYmYwZTk4ZWUwMWQx ZmM4ZDE5NWEwYTQ2NTViYWUxNGMyMGQwOC4uMTk0Mzc3YzJhYTI4NGQ4ZjQyYjhiMDliNDYzMzVl ZWUwNDBiZWJiMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDU0IEBACisyMDE2LTAxLTA5ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIEhvb2sgdXAgZGlz cGxheS1saXN0IGRyYXdpbmcgaW4gR3JhcGhpY3NMYXllckNBCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTI5NDYKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBIYXZlIEdyYXBoaWNzTGF5ZXJDQSBob2xkIGEg RGlzcGxheUxpc3QuIElmIGVuYWJsZWQsIGRvIGEgZGlzcGxheS1saXN0IHJlY29yZAorICAgICAg ICBpbiBHcmFwaGljc0xheWVyQ0E6OnJlY3Vyc2l2ZUNvbW1pdENoYW5nZXMoKSwgYW5kIGEgcGxh eWJhY2sgaW4gR3JhcGhpY3NMYXllckNBOjpwbGF0Zm9ybUNBTGF5ZXJQYWludENvbnRlbnRzKCku CisgICAgICAgIAorICAgICAgICBHcmFwaGljc0xheWVyQ0EgbmVlZHMgdG8gbWFpbnRhaW4gYSBt X2hhc0V2ZXJQYWludGVkIGZsYWcgdG8ga25vdyB0byBkbyBhIGZ1bGwgcmVjb3JkCisgICAgICAg IGF0IGZpcnN0IHBhaW50ICh3aGVuIHRoZXJlIGFyZSBubyBkaXJ0eSByZWN0cykuCisgICAgICAg IAorICAgICAgICBQbHVtYiAnaXNVc2luZ0Rpc3BsYXlMaXN0RHJhd2luZycgdGhyb3VnaCB0byBU aWxlR3JpZCB2aWEgUGxhdGZvcm1DQUxheWVye0NsaWVudH0KKyAgICAgICAgc28gdGhhdCB3ZSBj YW4gZGVjb3JhdGUgdGhlIHRpbGUgcGFpbnQgY291bnRlcnMgd2l0aCBhbiBvdXRsaW5lLgorICAg ICAgICAKKyAgICAgICAgSGF2ZSBSZW5kZXJMYXllckNvbXBvc2l0b3IgcHVzaCB0aGUgZGlzcGxh eUxpc3REcmF3aW5nRW5hYmxlZCBzdGF0ZSBkb3duIHRocm91Z2gKKyAgICAgICAgUmVuZGVyTGF5 ZXJCYWNraW5ncyB0byBHcmFwaGljc0xheWVycy4KKyAgICAgICAgCisgICAgICAgIENvbnZlcnQg UmVuZGVyTGF5ZXJDb21wb3NpdG9yIHRvIHVzZSBpbml0aWFsaXplcnMuCisKKyAgICAgICAgKiBw bGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0xheWVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okdy YXBoaWNzTGF5ZXI6OkdyYXBoaWNzTGF5ZXIpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNz L0dyYXBoaWNzTGF5ZXIuaDoKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXI6OnVzZXNE aXNwbGF5TGlzdERyYXdpbmcpOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NMYXllcjo6c2V0 VXNlc0Rpc3BsYXlMaXN0RHJhd2luZyk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2Ev R3JhcGhpY3NMYXllckNBLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXJDQTo6 R3JhcGhpY3NMYXllckNBKToKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXJDQTo6c2V0 VXNlc0Rpc3BsYXlMaXN0RHJhd2luZyk6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0xheWVy Q0E6OnJlY3Vyc2l2ZUNvbW1pdENoYW5nZXMpOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NM YXllckNBOjpwbGF0Zm9ybUNBTGF5ZXJQYWludENvbnRlbnRzKToKKyAgICAgICAgKFdlYkNvcmU6 OkdyYXBoaWNzTGF5ZXJDQTo6dXBkYXRlRHJhd3NDb250ZW50KToKKyAgICAgICAgKFdlYkNvcmU6 OkdyYXBoaWNzTGF5ZXJDQTo6ZHVtcEFkZGl0aW9uYWxQcm9wZXJ0aWVzKToKKyAgICAgICAgKiBw bGF0Zm9ybS9ncmFwaGljcy9jYS9HcmFwaGljc0xheWVyQ0EuaDoKKyAgICAgICAgKiBwbGF0Zm9y bS9ncmFwaGljcy9jYS9QbGF0Zm9ybUNBTGF5ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UGxh dGZvcm1DQUxheWVyOjpkcmF3UmVwYWludEluZGljYXRvcik6CisgICAgICAgICogcGxhdGZvcm0v Z3JhcGhpY3MvY2EvUGxhdGZvcm1DQUxheWVyQ2xpZW50Lmg6CisgICAgICAgIChXZWJDb3JlOjpQ bGF0Zm9ybUNBTGF5ZXJDbGllbnQ6OmlzVXNpbmdEaXNwbGF5TGlzdERyYXdpbmcpOgorICAgICAg ICAqIHBsYXRmb3JtL2dyYXBoaWNzL2NhL1RpbGVHcmlkLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OlRpbGVHcmlkOjpwbGF0Zm9ybUNBTGF5ZXJTaG93UmVwYWludENvdW50ZXIpOgorICAgICAgICAo V2ViQ29yZTo6VGlsZUdyaWQ6OmlzVXNpbmdEaXNwbGF5TGlzdERyYXdpbmcpOgorICAgICAgICAq IHBsYXRmb3JtL2dyYXBoaWNzL2NhL1RpbGVHcmlkLmg6CisgICAgICAgICogcGxhdGZvcm0vZ3Jh cGhpY3MvZGlzcGxheWxpc3RzL0Rpc3BsYXlMaXN0Lmg6IFNhZGx5IG5lZWQgdG8gaW5jbHVkZSBE aXNwbGF5TGlzdEl0ZW1zLmgKKyAgICAgICAgdG8gZ2V0IHRoaW5ncyB0byBjb21waWxlLiBJIHdh c24ndCBhYmxlIHRvIGF2b2lkIHRoaXMgZXZlbiB3aGVuIG1ha2luZyBmdW5jdGlvbnMgbm9uLWlu bGluZS4KKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQmFja2luZzo6Y3JlYXRlR3JhcGhpY3NMYXllcik6Cisg ICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpSZW5kZXJMYXllckNvbXBvc2l0b3I6OlJlbmRlckxheWVyQ29tcG9zaXRvcik6Cisg ICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckNvbXBvc2l0b3I6OmNhY2hlQWNjZWxlcmF0ZWRD b21wb3NpdGluZ0ZsYWdzKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3Np dG9yLmg6CisKIDIwMTYtMDEtMDggIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5j b20+CiAKICAgICAgICAgQWRkIGRpc3BsYXktbGlzdCBkcmF3aW5nIGhvb2tzIHRvIHBsYXRmb3Jt LXNwZWNpZmljIEdyYXBoaWNzQ29udGV4dCBmaWxlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NMYXllci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0xheWVyLmNwcAppbmRleCBlM2VhODZhYWM1NWI4MDAw OGJhZDNkYjczOThmNjkyMmRlNWZiODlkLi44NDAxYjM5ZTY0MGY4MWNkNDQ2NTA0M2ExOGQzODFj NTZhNTcwMGZkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9H cmFwaGljc0xheWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9H cmFwaGljc0xheWVyLmNwcApAQCAtMTIxLDYgKzEyMSw3IEBAIEdyYXBoaWNzTGF5ZXI6OkdyYXBo aWNzTGF5ZXIoVHlwZSB0eXBlLCBHcmFwaGljc0xheWVyQ2xpZW50JiBjbGllbnQpCiAgICAgLCBt X2RyYXdzQ29udGVudChmYWxzZSkKICAgICAsIG1fY29udGVudHNWaXNpYmxlKHRydWUpCiAgICAg LCBtX2FjY2VsZXJhdGVzRHJhd2luZyhmYWxzZSkKKyAgICAsIG1fdXNlc0Rpc3BsYXlMaXN0RHJh d2luZyhmYWxzZSkKICAgICAsIG1fYXBwbGllc1BhZ2VTY2FsZShmYWxzZSkKICAgICAsIG1fc2hv d0RlYnVnQm9yZGVyKGZhbHNlKQogICAgICwgbV9zaG93UmVwYWludENvdW50ZXIoZmFsc2UpCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0xheWVy LmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0xheWVyLmgKaW5k ZXggMGI3NjY4MTZlMzI5NzE5NjdlNTIwZjMzMDZkYzEzMzkxOWMwNDY0Ni4uNzJjNjY3OGU1ZDFk Njg5ZWI1YzY5MDRhNzY4MjgwNDFmMGMyMDA1NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NMYXllci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzTGF5ZXIuaApAQCAtMzQ1LDYgKzM0NSw5IEBAIHB1Ymxp YzoKICAgICBib29sIGFjY2VsZXJhdGVzRHJhd2luZygpIGNvbnN0IHsgcmV0dXJuIG1fYWNjZWxl cmF0ZXNEcmF3aW5nOyB9CiAgICAgdmlydHVhbCB2b2lkIHNldEFjY2VsZXJhdGVzRHJhd2luZyhi b29sIGIpIHsgbV9hY2NlbGVyYXRlc0RyYXdpbmcgPSBiOyB9CiAKKyAgICBib29sIHVzZXNEaXNw bGF5TGlzdERyYXdpbmcoKSBjb25zdCB7IHJldHVybiBtX3VzZXNEaXNwbGF5TGlzdERyYXdpbmc7 IH0KKyAgICB2aXJ0dWFsIHZvaWQgc2V0VXNlc0Rpc3BsYXlMaXN0RHJhd2luZyhib29sIGIpIHsg bV91c2VzRGlzcGxheUxpc3REcmF3aW5nID0gYjsgfQorCiAgICAgYm9vbCBuZWVkc0JhY2tkcm9w KCkgY29uc3QgeyByZXR1cm4gIW1fYmFja2Ryb3BGaWx0ZXJzLmlzRW1wdHkoKTsgfQogCiAgICAg Ly8gVGhlIGNvbG9yIHVzZWQgdG8gcGFpbnQgdGhlIGxheWVyIGJhY2tncm91bmQuIFBhc3MgYW4g aW52YWxpZCBjb2xvciB0byByZW1vdmUgaXQuCkBAIC02MDYsNiArNjA5LDcgQEAgcHJvdGVjdGVk OgogICAgIGJvb2wgbV9kcmF3c0NvbnRlbnQgOiAxOwogICAgIGJvb2wgbV9jb250ZW50c1Zpc2li bGUgOiAxOwogICAgIGJvb2wgbV9hY2NlbGVyYXRlc0RyYXdpbmcgOiAxOworICAgIGJvb2wgbV91 c2VzRGlzcGxheUxpc3REcmF3aW5nIDogMTsKICAgICBib29sIG1fYXBwbGllc1BhZ2VTY2FsZSA6 IDE7IC8vIFNldCBmb3IgdGhlIGxheWVyIHdoaWNoIGhhcyB0aGUgcGFnZSBzY2FsZSBhcHBsaWVk IHRvIGl0LgogICAgIGJvb2wgbV9zaG93RGVidWdCb3JkZXIgOiAxOwogICAgIGJvb2wgbV9zaG93 UmVwYWludENvdW50ZXIgOiAxOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvY2EvR3JhcGhpY3NMYXllckNBLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2NhL0dyYXBoaWNzTGF5ZXJDQS5jcHAKaW5kZXggOWRjN2NkMzMxN2MyMzFlM2Fk YzZlNjVkOGZkYmY5N2MxNmQ1ZjZiZi4uMDQ5ZjIyNGE1NzNlZWJlZjc1OGM4ZTU5OTFmMzE5ZjI5 MjBhZDRlNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Ev R3JhcGhpY3NMYXllckNBLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9jYS9HcmFwaGljc0xheWVyQ0EuY3BwCkBAIC0yOCw2ICsyOCw4IEBACiAjaW5jbHVkZSAiR3Jh cGhpY3NMYXllckNBLmgiCiAKICNpbmNsdWRlICJBbmltYXRpb24uaCIKKyNpbmNsdWRlICJEaXNw bGF5TGlzdFJlY29yZGVyLmgiCisjaW5jbHVkZSAiRGlzcGxheUxpc3RSZXBsYXllci5oIgogI2lu Y2x1ZGUgIkZsb2F0Q29udmVyc2lvbi5oIgogI2luY2x1ZGUgIkZsb2F0UmVjdC5oIgogI2luY2x1 ZGUgIkdyYXBoaWNzTGF5ZXJGYWN0b3J5LmgiCkBAIC0zNjAsNiArMzYyLDcgQEAgR3JhcGhpY3NM YXllckNBOjpHcmFwaGljc0xheWVyQ0EoVHlwZSBsYXllclR5cGUsIEdyYXBoaWNzTGF5ZXJDbGll bnQmIGNsaWVudCkKICAgICAsIG1fdXNpbmdCYWNrZHJvcExheWVyVHlwZShmYWxzZSkKICAgICAs IG1faXNWaWV3cG9ydENvbnN0cmFpbmVkKGZhbHNlKQogICAgICwgbV9pbnRlcnNlY3RzQ292ZXJh Z2VSZWN0KGZhbHNlKQorICAgICwgbV9oYXNFdmVyUGFpbnRlZChmYWxzZSkKIHsKIH0KIApAQCAt NjY2LDYgKzY2OSwxNCBAQCB2b2lkIEdyYXBoaWNzTGF5ZXJDQTo6c2V0QWNjZWxlcmF0ZXNEcmF3 aW5nKGJvb2wgYWNjZWxlcmF0ZXNEcmF3aW5nKQogICAgIG5vdGVMYXllclByb3BlcnR5Q2hhbmdl ZChBY2NlbGVyYXRlc0RyYXdpbmdDaGFuZ2VkKTsKIH0KIAordm9pZCBHcmFwaGljc0xheWVyQ0E6 OnNldFVzZXNEaXNwbGF5TGlzdERyYXdpbmcoYm9vbCB1c2VzRGlzcGxheUxpc3REcmF3aW5nKQor eworICAgIGlmICh1c2VzRGlzcGxheUxpc3REcmF3aW5nID09IG1fdXNlc0Rpc3BsYXlMaXN0RHJh d2luZykKKyAgICAgICAgcmV0dXJuOworCisgICAgR3JhcGhpY3NMYXllcjo6c2V0VXNlc0Rpc3Bs YXlMaXN0RHJhd2luZyh1c2VzRGlzcGxheUxpc3REcmF3aW5nKTsKK30KKwogdm9pZCBHcmFwaGlj c0xheWVyQ0E6OnNldEJhY2tncm91bmRDb2xvcihjb25zdCBDb2xvciYgY29sb3IpCiB7CiAgICAg aWYgKG1fYmFja2dyb3VuZENvbG9yID09IGNvbG9yKQpAQCAtMTM4NCw2ICsxMzk1LDcgQEAgdm9p ZCBHcmFwaGljc0xheWVyQ0E6OnJlY3Vyc2l2ZUNvbW1pdENoYW5nZXMoY29uc3QgQ29tbWl0U3Rh dGUmIGNvbW1pdFN0YXRlLCBjb24KICAgICBpZiAoR3JhcGhpY3NMYXllckNBKiBtYXNrTGF5ZXIg PSBkb3duY2FzdDxHcmFwaGljc0xheWVyQ0E+KG1fbWFza0xheWVyKSkKICAgICAgICAgbWFza0xh eWVyLT5jb21taXRMYXllckNoYW5nZXNBZnRlclN1YmxheWVycyhjaGlsZENvbW1pdFN0YXRlKTsK IAorICAgIGJvb2wgaGFkRGlydHlSZWN0cyA9IG1fdW5jb21taXR0ZWRDaGFuZ2VzICYgRGlydHlS ZWN0c0NoYW5nZWQ7CiAgICAgY29tbWl0TGF5ZXJDaGFuZ2VzQWZ0ZXJTdWJsYXllcnMoY2hpbGRD b21taXRTdGF0ZSk7CiAKICAgICBpZiAoYWZmZWN0ZWRCeVRyYW5zZm9ybUFuaW1hdGlvbiAmJiBt X2xheWVyLT5sYXllclR5cGUoKSA9PSBQbGF0Zm9ybUNBTGF5ZXI6OkxheWVyVHlwZVRpbGVkQmFj a2luZ0xheWVyKQpAQCAtMTM5MSw2ICsxNDAzLDI0IEBAIHZvaWQgR3JhcGhpY3NMYXllckNBOjpy ZWN1cnNpdmVDb21taXRDaGFuZ2VzKGNvbnN0IENvbW1pdFN0YXRlJiBjb21taXRTdGF0ZSwgY29u CiAKICAgICBpZiAoaGFkQ2hhbmdlcykKICAgICAgICAgY2xpZW50KCkuZGlkQ29tbWl0Q2hhbmdl c0ZvckxheWVyKHRoaXMpOworCisgICAgaWYgKHVzZXNEaXNwbGF5TGlzdERyYXdpbmcoKSAmJiBt X2RyYXdzQ29udGVudCAmJiAoIW1faGFzRXZlclBhaW50ZWQgfHwgaGFkRGlydHlSZWN0cykpIHsK KyNpZmRlZiBMT0dfUkVDT1JESU5HX1RJTUUKKyAgICAgICAgZG91YmxlIHN0YXJ0VGltZSA9IGN1 cnJlbnRUaW1lKCk7CisjZW5kaWYKKyAgICAgICAgbV9kaXNwbGF5TGlzdCA9IHN0ZDo6bWFrZV91 bmlxdWU8RGlzcGxheUxpc3Q6OkRpc3BsYXlMaXN0PigpOworICAgICAgICAKKyAgICAgICAgRmxv YXRSZWN0IGluaXRpYWxDbGlwKGJvdW5kc09yaWdpbigpLCBzaXplKCkpOworCisgICAgICAgIEdy YXBoaWNzQ29udGV4dCBjb250ZXh0OworICAgICAgICBEaXNwbGF5TGlzdDo6UmVjb3JkZXIgcmVj b3JkZXIoY29udGV4dCwgKm1fZGlzcGxheUxpc3QsIGluaXRpYWxDbGlwLCBBZmZpbmVUcmFuc2Zv cm0oKSk7CisgICAgICAgIGNvbnRleHQuc2V0RGlzcGxheUxpc3RSZWNvcmRlcigmcmVjb3JkZXIp OworICAgICAgICBwYWludEdyYXBoaWNzTGF5ZXJDb250ZW50cyhjb250ZXh0LCBGbG9hdFJlY3Qo RmxvYXRQb2ludCgpLCBzaXplKCkpKTsKKyNpZmRlZiBMT0dfUkVDT1JESU5HX1RJTUUKKyAgICAg ICAgZG91YmxlIGR1cmF0aW9uID0gY3VycmVudFRpbWUoKSAtIHN0YXJ0VGltZTsKKyAgICAgICAg V1RGTG9nQWx3YXlzKCJSZWNvcmRpbmcgdG9vayAlLjVmbXMiLCBkdXJhdGlvbiAqIDEwMDAuMCk7 CisjZW5kaWYKKyAgICB9CiB9CiAKIHZvaWQgR3JhcGhpY3NMYXllckNBOjpwbGF0Zm9ybUNBTGF5 ZXJDdXN0b21TdWJsYXllcnNDaGFuZ2VkKFBsYXRmb3JtQ0FMYXllciopCkBAIC0xNDEwLDYgKzE0 NDAsMTIgQEAgYm9vbCBHcmFwaGljc0xheWVyQ0E6OnBsYXRmb3JtQ0FMYXllclNob3dSZXBhaW50 Q291bnRlcihQbGF0Zm9ybUNBTGF5ZXIqIHBsYXRmb3IKIAogdm9pZCBHcmFwaGljc0xheWVyQ0E6 OnBsYXRmb3JtQ0FMYXllclBhaW50Q29udGVudHMoUGxhdGZvcm1DQUxheWVyKiwgR3JhcGhpY3ND b250ZXh0JiBjb250ZXh0LCBjb25zdCBGbG9hdFJlY3QmIGNsaXApCiB7CisgICAgbV9oYXNFdmVy UGFpbnRlZCA9IHRydWU7CisgICAgaWYgKG1fZGlzcGxheUxpc3QpIHsKKyAgICAgICAgRGlzcGxh eUxpc3Q6OlJlcGxheWVyIHJlcGxheWVyKGNvbnRleHQsICptX2Rpc3BsYXlMaXN0KTsKKyAgICAg ICAgcmVwbGF5ZXIucmVwbGF5KGNsaXApOworICAgICAgICByZXR1cm47CisgICAgfQogICAgIHBh aW50R3JhcGhpY3NMYXllckNvbnRlbnRzKGNvbnRleHQsIGNsaXApOwogfQogCkBAIC0yMDIxLDkg KzIwNTcsMTAgQEAgR3JhcGhpY3NMYXllckNBOjpTdHJ1Y3R1cmFsTGF5ZXJQdXJwb3NlIEdyYXBo aWNzTGF5ZXJDQTo6c3RydWN0dXJhbExheWVyUHVycG9zZSgKIAogdm9pZCBHcmFwaGljc0xheWVy Q0E6OnVwZGF0ZURyYXdzQ29udGVudCgpCiB7Ci0gICAgaWYgKG1fZHJhd3NDb250ZW50KQorICAg IGlmIChtX2RyYXdzQ29udGVudCkgewogICAgICAgICBtX2xheWVyLT5zZXROZWVkc0Rpc3BsYXko KTsKLSAgICBlbHNlIHsKKyAgICAgICAgbV9oYXNFdmVyUGFpbnRlZCA9IGZhbHNlOworICAgIH0g ZWxzZSB7CiAgICAgICAgIG1fbGF5ZXItPnNldENvbnRlbnRzKDApOwogICAgICAgICBpZiAobV9s YXllckNsb25lcykgewogICAgICAgICAgICAgTGF5ZXJNYXA6OmNvbnN0X2l0ZXJhdG9yIGVuZCA9 IG1fbGF5ZXJDbG9uZXMtPmVuZCgpOwpAQCAtMzMwOSw2ICszMzQ2LDEzIEBAIHZvaWQgR3JhcGhp Y3NMYXllckNBOjpkdW1wQWRkaXRpb25hbFByb3BlcnRpZXMoVGV4dFN0cmVhbSYgdGV4dFN0cmVh bSwgaW50IGluZGVuCiAgICAgICAgIGR1bXBJbm5lckxheWVyKHRleHRTdHJlYW0sICJjb250ZW50 cyBzaGFwZSBtYXNrIGxheWVyIiwgbV9jb250ZW50c1NoYXBlTWFza0xheWVyLmdldCgpLCBpbmRl bnQsIGJlaGF2aW9yKTsKICAgICAgICAgZHVtcElubmVyTGF5ZXIodGV4dFN0cmVhbSwgImJhY2tk cm9wIGxheWVyIiwgbV9iYWNrZHJvcExheWVyLmdldCgpLCBpbmRlbnQsIGJlaGF2aW9yKTsKICAg ICB9CisKKyAgICBpZiAoYmVoYXZpb3IgJiBMYXllclRyZWVBc1RleHREZWJ1ZykgeworICAgICAg ICB3cml0ZUluZGVudCh0ZXh0U3RyZWFtLCBpbmRlbnQgKyAxKTsKKyAgICAgICAgdGV4dFN0cmVh bSA8PCAiKGFjY2VsZXJhdGV0ZXMgZHJhd2luZyAiIDw8IG1fYWNjZWxlcmF0ZXNEcmF3aW5nIDw8 ICIpXG4iOworICAgICAgICB3cml0ZUluZGVudCh0ZXh0U3RyZWFtLCBpbmRlbnQgKyAxKTsKKyAg ICAgICAgdGV4dFN0cmVhbSA8PCAiKHVzZXMgZGlzcGxheS1saXN0IGRyYXdpbmcgIiA8PCBtX3Vz ZXNEaXNwbGF5TGlzdERyYXdpbmcgPDwgIilcbiI7CisgICAgfQogfQogCiB2b2lkIEdyYXBoaWNz TGF5ZXJDQTo6c2V0RGVidWdCb3JkZXIoY29uc3QgQ29sb3ImIGNvbG9yLCBmbG9hdCBib3JkZXJX aWR0aCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhL0dy YXBoaWNzTGF5ZXJDQS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2EvR3Jh cGhpY3NMYXllckNBLmgKaW5kZXggZDMzODY1NTllNzBlOGFjM2MwMzRiZWMwYzg3Yzc3ZTE2NGNk OTUwMC4uOTVhMjI2ZTBkZTEwNDYxNzczZDJjNmRhZjU1NmNkZWUxOTYxOTg3MSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2EvR3JhcGhpY3NMYXllckNBLmgK KysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2EvR3JhcGhpY3NMYXllckNB LmgKQEAgLTQxLDYgKzQxLDEwIEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAorbmFtZXNwYWNl IERpc3BsYXlMaXN0IHsKK2NsYXNzIERpc3BsYXlMaXN0OworfQorCiBjbGFzcyBGbG9hdFJvdW5k ZWRSZWN0OwogY2xhc3MgSW1hZ2U7CiBjbGFzcyBUcmFuc2Zvcm1TdGF0ZTsKQEAgLTg2LDYgKzkw LDcgQEAgcHVibGljOgogICAgIFdFQkNPUkVfRVhQT1JUIHZpcnR1YWwgdm9pZCBzZXREcmF3c0Nv bnRlbnQoYm9vbCkgb3ZlcnJpZGU7CiAgICAgV0VCQ09SRV9FWFBPUlQgdmlydHVhbCB2b2lkIHNl dENvbnRlbnRzVmlzaWJsZShib29sKSBvdmVycmlkZTsKICAgICBXRUJDT1JFX0VYUE9SVCB2aXJ0 dWFsIHZvaWQgc2V0QWNjZWxlcmF0ZXNEcmF3aW5nKGJvb2wpIG92ZXJyaWRlOworICAgIFdFQkNP UkVfRVhQT1JUIHZpcnR1YWwgdm9pZCBzZXRVc2VzRGlzcGxheUxpc3REcmF3aW5nKGJvb2wpIG92 ZXJyaWRlOwogCiAgICAgV0VCQ09SRV9FWFBPUlQgdmlydHVhbCB2b2lkIHNldEJhY2tncm91bmRD b2xvcihjb25zdCBDb2xvciYpIG92ZXJyaWRlOwogCkBAIC0xOTgsNiArMjAzLDcgQEAgcHJpdmF0 ZToKICAgICBXRUJDT1JFX0VYUE9SVCB2aXJ0dWFsIEludFNpemUgcGxhdGZvcm1DQUxheWVyVGls ZVNpemUoKSBjb25zdCBvdmVycmlkZTsKIAogICAgIHZpcnR1YWwgYm9vbCBpc0NvbW1pdHRpbmdD aGFuZ2VzKCkgY29uc3Qgb3ZlcnJpZGUgeyByZXR1cm4gbV9pc0NvbW1pdHRpbmdDaGFuZ2VzOyB9 CisgICAgdmlydHVhbCBib29sIGlzVXNpbmdEaXNwbGF5TGlzdERyYXdpbmcoUGxhdGZvcm1DQUxh eWVyKikgY29uc3Qgb3ZlcnJpZGUgeyByZXR1cm4gbV91c2VzRGlzcGxheUxpc3REcmF3aW5nOyB9 CiAKICAgICBXRUJDT1JFX0VYUE9SVCB2aXJ0dWFsIHZvaWQgc2V0SXNWaWV3cG9ydENvbnN0cmFp bmVkKGJvb2wpIG92ZXJyaWRlOwogICAgIHZpcnR1YWwgYm9vbCBpc1ZpZXdwb3J0Q29uc3RyYWlu ZWQoKSBjb25zdCBvdmVycmlkZSB7IHJldHVybiBtX2lzVmlld3BvcnRDb25zdHJhaW5lZDsgfQpA QCAtNTIxLDYgKzUyNyw3IEBAIHByaXZhdGU6CiAgICAgYm9vbCBtX3VzaW5nQmFja2Ryb3BMYXll clR5cGUgOiAxOwogICAgIGJvb2wgbV9pc1ZpZXdwb3J0Q29uc3RyYWluZWQgOiAxOwogICAgIGJv b2wgbV9pbnRlcnNlY3RzQ292ZXJhZ2VSZWN0IDogMTsKKyAgICBib29sIG1faGFzRXZlclBhaW50 ZWQgOiAxOwogCiAgICAgQ29sb3IgbV9jb250ZW50c1NvbGlkQ29sb3I7CiAKQEAgLTU2OCw2ICs1 NzUsOCBAQCBwcml2YXRlOgogICAgIEFuaW1hdGlvbnNNYXAgbV9ydW5uaW5nQW5pbWF0aW9uczsK IAogICAgIFZlY3RvcjxGbG9hdFJlY3Q+IG1fZGlydHlSZWN0czsKKyAgICAKKyAgICBzdGQ6OnVu aXF1ZV9wdHI8RGlzcGxheUxpc3Q6OkRpc3BsYXlMaXN0PiBtX2Rpc3BsYXlMaXN0OwogCiAgICAg RmxvYXRTaXplIG1fcGl4ZWxBbGlnbm1lbnRPZmZzZXQ7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhL1BsYXRmb3JtQ0FMYXllci5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9QbGF0Zm9ybUNBTGF5ZXIuY3BwCmluZGV4IGIz OGQ3NWFlYTAxOTBlOTk5YzU3NTg2YjkwNDE3Yzg4ZDE1YjIzMTUuLjgxN2NjMjA5Zjg3N2E0ZTM0 ZjY4YTc1YWUwNmM2ODU1MGVmZWY0ZDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2NhL1BsYXRmb3JtQ0FMYXllci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvY2EvUGxhdGZvcm1DQUxheWVyLmNwcApAQCAtMjcsNiArMjcsNyBA QAogI2luY2x1ZGUgIlBsYXRmb3JtQ0FMYXllci5oIgogCiAjaW5jbHVkZSAiTGF5ZXJQb29sLmgi CisjaW5jbHVkZSAiUGxhdGZvcm1DQUxheWVyQ2xpZW50LmgiCiAjaW5jbHVkZSAiVGV4dFN0cmVh bS5oIgogI2luY2x1ZGUgPHd0Zi9TdHJpbmdFeHRyYXMuaD4KIApAQCAtODQsNiArODUsMTIgQEAg dm9pZCBQbGF0Zm9ybUNBTGF5ZXI6OmRyYXdSZXBhaW50SW5kaWNhdG9yKENHQ29udGV4dFJlZiBj b250ZXh0LCBQbGF0Zm9ybUNBTGF5ZXIKICAgICAgICAgQ0dDb250ZXh0U2V0UkdCRmlsbENvbG9y KGNvbnRleHQsIDEsIDAsIDAsIDEpOwogICAgIGVsc2UKICAgICAgICAgQ0dDb250ZXh0U2V0UkdC RmlsbENvbG9yKGNvbnRleHQsIDEsIDEsIDEsIDEpOworCisgICAgaWYgKHBsYXRmb3JtQ0FMYXll ci0+b3duZXIoKS0+aXNVc2luZ0Rpc3BsYXlMaXN0RHJhd2luZyhwbGF0Zm9ybUNBTGF5ZXIpKSB7 CisgICAgICAgIENHQ29udGV4dFNldFJHQlN0cm9rZUNvbG9yKGNvbnRleHQsIDAsIDAsIDAsIDAu NjUpOworICAgICAgICBDR0NvbnRleHRTZXRMaW5lV2lkdGgoY29udGV4dCwgMik7CisgICAgICAg IENHQ29udGV4dFN0cm9rZVJlY3QoY29udGV4dCwgaW5kaWNhdG9yQm94KTsKKyAgICB9CiAgICAg CiAgICAgcGxhdGZvcm1DQUxheWVyLT5kcmF3VGV4dEF0UG9pbnQoY29udGV4dCwgaW5kaWNhdG9y Qm94Lm9yaWdpbi54ICsgNSwgaW5kaWNhdG9yQm94Lm9yaWdpbi55ICsgMjIsIENHU2l6ZU1ha2Uo MSwgLTEpLCAyMiwgdGV4dCwgc3RybGVuKHRleHQpKTsKICAgICAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhL1BsYXRmb3JtQ0FMYXllckNsaWVudC5oIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2EvUGxhdGZvcm1DQUxheWVyQ2xpZW50 LmgKaW5kZXggNDlkY2EzZjAxZDkwMmQ4MGNiNTA0MWIzODgzMGRiNWM5YTI0ODY3MS4uOWFmMWRm ZjkzOGY5MjdmMmIwMmRjYTM0MDhlZWU5NmUyYmNlMjgzMiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2EvUGxhdGZvcm1DQUxheWVyQ2xpZW50LmgKKysrIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2EvUGxhdGZvcm1DQUxheWVyQ2xpZW50 LmgKQEAgLTY0LDYgKzY0LDggQEAgcHVibGljOgogCiAgICAgdmlydHVhbCBib29sIGlzQ29tbWl0 dGluZ0NoYW5nZXMoKSBjb25zdCB7IHJldHVybiBmYWxzZTsgfQogCisgICAgdmlydHVhbCBib29s IGlzVXNpbmdEaXNwbGF5TGlzdERyYXdpbmcoUGxhdGZvcm1DQUxheWVyKikgY29uc3QgeyByZXR1 cm4gZmFsc2U7IH0KKwogcHJvdGVjdGVkOgogICAgIHZpcnR1YWwgflBsYXRmb3JtQ0FMYXllckNs aWVudCgpIHt9CiB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY2EvVGlsZUdyaWQuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Ev VGlsZUdyaWQuY3BwCmluZGV4IDY4Yjk1NjI4NDA1YWUwZTIxNmUzNDE0ZjNhMThiOTE3NjRiNDRm YTkuLmU1YWFlNGQ1M2IyMTZkYjcyMmMzNjQyMTRjZTM3NWU0ZDY1M2ExMzAgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhL1RpbGVHcmlkLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9UaWxlR3JpZC5jcHAKQEAgLTY5Myw3 ICs2OTMsMTIgQEAgYm9vbCBUaWxlR3JpZDo6cGxhdGZvcm1DQUxheWVyU2hvd0RlYnVnQm9yZGVy cygpIGNvbnN0CiAKIGJvb2wgVGlsZUdyaWQ6OnBsYXRmb3JtQ0FMYXllclNob3dSZXBhaW50Q291 bnRlcihQbGF0Zm9ybUNBTGF5ZXIqKSBjb25zdAogewotICAgIHJldHVybiBtX2NvbnRyb2xsZXIu cm9vdExheWVyKCkub3duZXIoKS0+cGxhdGZvcm1DQUxheWVyU2hvd1JlcGFpbnRDb3VudGVyKDAp OworICAgIHJldHVybiBtX2NvbnRyb2xsZXIucm9vdExheWVyKCkub3duZXIoKS0+cGxhdGZvcm1D QUxheWVyU2hvd1JlcGFpbnRDb3VudGVyKG51bGxwdHIpOworfQorCitib29sIFRpbGVHcmlkOjpp c1VzaW5nRGlzcGxheUxpc3REcmF3aW5nKFBsYXRmb3JtQ0FMYXllciopIGNvbnN0Cit7CisgICAg cmV0dXJuIG1fY29udHJvbGxlci5yb290TGF5ZXIoKS5vd25lcigpLT5pc1VzaW5nRGlzcGxheUxp c3REcmF3aW5nKG51bGxwdHIpOwogfQogCiBib29sIFRpbGVHcmlkOjpwbGF0Zm9ybUNBTGF5ZXJD b250ZW50c09wYXF1ZSgpIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9jYS9UaWxlR3JpZC5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY2EvVGlsZUdyaWQuaAppbmRleCA0MWE0YjQzNDllN2I2ODIwNzExMmU3Njg1NzRlYzhmMzZl MDkyODY3Li5hNmZhZThjY2Y0MTI0NDM2ODFhMzk1MjhjYjEyNGMxZTBiNTc1YzAwIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9UaWxlR3JpZC5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhL1RpbGVHcmlkLmgKQEAgLTE0Myw2 ICsxNDMsNyBAQCBwcml2YXRlOgogICAgIHZpcnR1YWwgYm9vbCBwbGF0Zm9ybUNBTGF5ZXJDb250 ZW50c09wYXF1ZSgpIGNvbnN0IG92ZXJyaWRlOwogICAgIHZpcnR1YWwgYm9vbCBwbGF0Zm9ybUNB TGF5ZXJEcmF3c0NvbnRlbnQoKSBjb25zdCBvdmVycmlkZSB7IHJldHVybiB0cnVlOyB9CiAgICAg dmlydHVhbCBmbG9hdCBwbGF0Zm9ybUNBTGF5ZXJEZXZpY2VTY2FsZUZhY3RvcigpIGNvbnN0IG92 ZXJyaWRlOworICAgIHZpcnR1YWwgYm9vbCBpc1VzaW5nRGlzcGxheUxpc3REcmF3aW5nKFBsYXRm b3JtQ0FMYXllciopIGNvbnN0IG92ZXJyaWRlOwogCiAgICAgVGlsZUNvbnRyb2xsZXImIG1fY29u dHJvbGxlcjsKICAgICBSZWY8UGxhdGZvcm1DQUxheWVyPiBtX2NvbnRhaW5lckxheWVyOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZGlzcGxheWxpc3RzL0Rp c3BsYXlMaXN0LmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9kaXNwbGF5bGlz dHMvRGlzcGxheUxpc3QuaAppbmRleCAxZTE4MTNmOTA3MzVjZjFmNTgzNzEwYWY4NTI4NDg4M2Rk YTZlMGMxLi42NDNiZDI0YjEzNTdiMGJlZDI2ZWEzYzMxYjBkNjAxNWRjNDY1M2RlIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9kaXNwbGF5bGlzdHMvRGlzcGxh eUxpc3QuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9kaXNwbGF5bGlz dHMvRGlzcGxheUxpc3QuaApAQCAtMjYsNiArMjYsNyBAQAogI2lmbmRlZiBEaXNwbGF5TGlzdF9o CiAjZGVmaW5lIERpc3BsYXlMaXN0X2gKIAorI2luY2x1ZGUgIkRpc3BsYXlMaXN0SXRlbXMuaCIK ICNpbmNsdWRlIDx3dGYvRmFzdE1hbGxvYy5oPgogI2luY2x1ZGUgPHd0Zi9Ob25jb3B5YWJsZS5o PgogI2luY2x1ZGUgPHd0Zi90ZXh0L1dURlN0cmluZy5oPgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcAppbmRleCAxNDQ5YzRmMTZhZDY5ZDNhMzAx OWI0YzQ4ZWIwNmYxMDFlMzkzYzcyLi43Njk0M2Q2ZWQ4MWEzOGVkMTA1ODZhYmEzMTgzMzA4MzBh MTE4NmVkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJC YWNraW5nLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNr aW5nLmNwcApAQCAtMTc2LDcgKzE3Niw4IEBAIHN0ZDo6dW5pcXVlX3B0cjxHcmFwaGljc0xheWVy PiBSZW5kZXJMYXllckJhY2tpbmc6OmNyZWF0ZUdyYXBoaWNzTGF5ZXIoY29uc3QgU3RyCiAjZW5k aWYKICNpZiBQTEFURk9STShDT0NPQSkgJiYgVVNFKENBKQogICAgIGdyYXBoaWNzTGF5ZXItPnNl dEFjY2VsZXJhdGVzRHJhd2luZyhjb21wb3NpdG9yKCkuYWNjZWxlcmF0ZWREcmF3aW5nRW5hYmxl ZCgpKTsKLSNlbmRpZiAgICAKKyAgICBncmFwaGljc0xheWVyLT5zZXRVc2VzRGlzcGxheUxpc3RE cmF3aW5nKGNvbXBvc2l0b3IoKS5kaXNwbGF5TGlzdERyYXdpbmdFbmFibGVkKCkpOworI2VuZGlm CiAgICAgCiAgICAgcmV0dXJuIGdyYXBoaWNzTGF5ZXI7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcCBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwCmluZGV4IDdmZTFiY2Q4Zjlm ZWViMTUxNWFhMWY3MjZkZGE2YzEwNDY3OWE0ZTcuLjQzMmUwZjJmNGViYTQwYjAyMjcxYTI4ZThh OTExMDhiMjMyMDI0MDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJMYXllckNvbXBvc2l0b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJMYXllckNvbXBvc2l0b3IuY3BwCkBAIC0yNzMsMjYgKzI3Myw4IEBAIHN0YXRpYyBpbmxpbmUg Ym9vbCBjb21wb3NpdGluZ0xvZ0VuYWJsZWQoKQogUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpSZW5k ZXJMYXllckNvbXBvc2l0b3IoUmVuZGVyVmlldyYgcmVuZGVyVmlldykKICAgICA6IG1fcmVuZGVy VmlldyhyZW5kZXJWaWV3KQogICAgICwgbV91cGRhdGVDb21wb3NpdGluZ0xheWVyc1RpbWVyKCp0 aGlzLCAmUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjp1cGRhdGVDb21wb3NpdGluZ0xheWVyc1RpbWVy RmlyZWQpCi0gICAgLCBtX2hhc0FjY2VsZXJhdGVkQ29tcG9zaXRpbmcodHJ1ZSkKLSAgICAsIG1f Y29tcG9zaXRpbmdUcmlnZ2VycyhzdGF0aWNfY2FzdDxDaHJvbWVDbGllbnQ6OkNvbXBvc2l0aW5n VHJpZ2dlckZsYWdzPihDaHJvbWVDbGllbnQ6OkFsbFRyaWdnZXJzKSkKLSAgICAsIG1fc2hvd0Rl YnVnQm9yZGVycyhmYWxzZSkKLSAgICAsIG1fc2hvd1JlcGFpbnRDb3VudGVyKGZhbHNlKQotICAg ICwgbV9hY2NlbGVyYXRlZERyYXdpbmdFbmFibGVkKGZhbHNlKQotICAgICwgbV9yZWV2YWx1YXRl Q29tcG9zaXRpbmdBZnRlckxheW91dChmYWxzZSkKLSAgICAsIG1fY29tcG9zaXRpbmcoZmFsc2Up Ci0gICAgLCBtX2NvbXBvc2l0aW5nTGF5ZXJzTmVlZFJlYnVpbGQoZmFsc2UpCi0gICAgLCBtX2Zs dXNoaW5nTGF5ZXJzKGZhbHNlKQotICAgICwgbV9zaG91bGRGbHVzaE9uUmVhdHRhY2goZmFsc2Up Ci0gICAgLCBtX2ZvcmNlQ29tcG9zaXRpbmdNb2RlKGZhbHNlKQotICAgICwgbV9pblBvc3RMYXlv dXRVcGRhdGUoZmFsc2UpCi0gICAgLCBtX3N1YmZyYW1lU2Nyb2xsTGF5ZXJzTmVlZFJlYXR0YWNo KGZhbHNlKQotICAgICwgbV9pc1RyYWNraW5nUmVwYWludHMoZmFsc2UpCi0gICAgLCBtX3Jvb3RM YXllckF0dGFjaG1lbnQoUm9vdExheWVyVW5hdHRhY2hlZCkKLSAgICAsIG1fbGF5ZXJGbHVzaFRp bWVyKCp0aGlzLCAmUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpsYXllckZsdXNoVGltZXJGaXJlZCkK LSAgICAsIG1fbGF5ZXJGbHVzaFRocm90dGxpbmdFbmFibGVkKGZhbHNlKQotICAgICwgbV9sYXll ckZsdXNoVGhyb3R0bGluZ1RlbXBvcmFyaWx5RGlzYWJsZWRGb3JJbnRlcmFjdGlvbihmYWxzZSkK LSAgICAsIG1faGFzUGVuZGluZ0xheWVyRmx1c2goZmFsc2UpCiAgICAgLCBtX3BhaW50UmVsYXRl ZE1pbGVzdG9uZXNUaW1lcigqdGhpcywgJlJlbmRlckxheWVyQ29tcG9zaXRvcjo6cGFpbnRSZWxh dGVkTWlsZXN0b25lc1RpbWVyRmlyZWQpCisgICAgLCBtX2xheWVyRmx1c2hUaW1lcigqdGhpcywg JlJlbmRlckxheWVyQ29tcG9zaXRvcjo6bGF5ZXJGbHVzaFRpbWVyRmlyZWQpCiB7CiB9CiAKQEAg LTMyNCw2ICszMDYsNyBAQCB2b2lkIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6Y2FjaGVBY2NlbGVy YXRlZENvbXBvc2l0aW5nRmxhZ3MoKQogICAgIGJvb2wgc2hvd1JlcGFpbnRDb3VudGVyID0gZmFs c2U7CiAgICAgYm9vbCBmb3JjZUNvbXBvc2l0aW5nTW9kZSA9IGZhbHNlOwogICAgIGJvb2wgYWNj ZWxlcmF0ZWREcmF3aW5nRW5hYmxlZCA9IGZhbHNlOworICAgIGJvb2wgZGlzcGxheUxpc3REcmF3 aW5nRW5hYmxlZCA9IGZhbHNlOwogCiAgICAgY29uc3QgU2V0dGluZ3MmIHNldHRpbmdzID0gbV9y ZW5kZXJWaWV3LmZyYW1lVmlldygpLmZyYW1lKCkuc2V0dGluZ3MoKTsKICAgICBoYXNBY2NlbGVy YXRlZENvbXBvc2l0aW5nID0gc2V0dGluZ3MuYWNjZWxlcmF0ZWRDb21wb3NpdGluZ0VuYWJsZWQo KTsKQEAgLTM0NSw3ICszMjgsOCBAQCB2b2lkIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6Y2FjaGVB Y2NlbGVyYXRlZENvbXBvc2l0aW5nRmxhZ3MoKQogICAgICAgICBmb3JjZUNvbXBvc2l0aW5nTW9k ZSA9IHJlcXVpcmVzQ29tcG9zaXRpbmdGb3JTY3JvbGxhYmxlRnJhbWUoKTsKIAogICAgIGFjY2Vs ZXJhdGVkRHJhd2luZ0VuYWJsZWQgPSBzZXR0aW5ncy5hY2NlbGVyYXRlZERyYXdpbmdFbmFibGVk KCk7Ci0KKyAgICBkaXNwbGF5TGlzdERyYXdpbmdFbmFibGVkID0gc2V0dGluZ3MuZGlzcGxheUxp c3REcmF3aW5nRW5hYmxlZCgpOworICAgIAogICAgIGlmIChoYXNBY2NlbGVyYXRlZENvbXBvc2l0 aW5nICE9IG1faGFzQWNjZWxlcmF0ZWRDb21wb3NpdGluZyB8fCBzaG93RGVidWdCb3JkZXJzICE9 IG1fc2hvd0RlYnVnQm9yZGVycyB8fCBzaG93UmVwYWludENvdW50ZXIgIT0gbV9zaG93UmVwYWlu dENvdW50ZXIgfHwgZm9yY2VDb21wb3NpdGluZ01vZGUgIT0gbV9mb3JjZUNvbXBvc2l0aW5nTW9k ZSkKICAgICAgICAgc2V0Q29tcG9zaXRpbmdMYXllcnNOZWVkUmVidWlsZCgpOwogCkBAIC0zNTUs NiArMzM5LDcgQEAgdm9pZCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OmNhY2hlQWNjZWxlcmF0ZWRD b21wb3NpdGluZ0ZsYWdzKCkKICAgICBtX3Nob3dSZXBhaW50Q291bnRlciA9IHNob3dSZXBhaW50 Q291bnRlcjsKICAgICBtX2ZvcmNlQ29tcG9zaXRpbmdNb2RlID0gZm9yY2VDb21wb3NpdGluZ01v ZGU7CiAgICAgbV9hY2NlbGVyYXRlZERyYXdpbmdFbmFibGVkID0gYWNjZWxlcmF0ZWREcmF3aW5n RW5hYmxlZDsKKyAgICBtX2Rpc3BsYXlMaXN0RHJhd2luZ0VuYWJsZWQgPSBkaXNwbGF5TGlzdERy YXdpbmdFbmFibGVkOwogICAgIAogICAgIGlmIChkZWJ1Z0JvcmRlcnNDaGFuZ2VkKSB7CiAgICAg ICAgIGlmIChtX2xheWVyRm9ySG9yaXpvbnRhbFNjcm9sbGJhcikKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuaCBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuaAppbmRleCAzNDVjZmZlNGFkZDgy ZjcyYjZhMWY1Y2UzMDEwOTQ2NjFlYWJjMzMxLi44NWYzYTBiYWM1OWZjN2YxMWFiZGMxZTZkMTA5 YjI4YTg4YTBkZGJhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy TGF5ZXJDb21wb3NpdG9yLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxh eWVyQ29tcG9zaXRvci5oCkBAIC0yNjAsNiArMjYwLDcgQEAgcHVibGljOgogICAgIHZvaWQgbGF5 ZXJUaWxlZEJhY2tpbmdVc2FnZUNoYW5nZWQoY29uc3QgR3JhcGhpY3NMYXllciosIGJvb2wgLyp1 c2luZ1RpbGVkQmFja2luZyovKTsKICAgICAKICAgICBib29sIGFjY2VsZXJhdGVkRHJhd2luZ0Vu YWJsZWQoKSBjb25zdCB7IHJldHVybiBtX2FjY2VsZXJhdGVkRHJhd2luZ0VuYWJsZWQ7IH0KKyAg ICBib29sIGRpc3BsYXlMaXN0RHJhd2luZ0VuYWJsZWQoKSBjb25zdCB7IHJldHVybiBtX2Rpc3Bs YXlMaXN0RHJhd2luZ0VuYWJsZWQ7IH0KIAogICAgIHZvaWQgZGV2aWNlT3JQYWdlU2NhbGVGYWN0 b3JDaGFuZ2VkKCk7CiAKQEAgLTQ4OSwzMyArNDkwLDM0IEBAIHByaXZhdGU6CiAgICAgc3RkOjp1 bmlxdWVfcHRyPEdyYXBoaWNzTGF5ZXI+IG1fcm9vdENvbnRlbnRMYXllcjsKICAgICBUaW1lciBt X3VwZGF0ZUNvbXBvc2l0aW5nTGF5ZXJzVGltZXI7CiAKLSAgICBib29sIG1faGFzQWNjZWxlcmF0 ZWRDb21wb3NpdGluZzsKLSAgICBDaHJvbWVDbGllbnQ6OkNvbXBvc2l0aW5nVHJpZ2dlckZsYWdz IG1fY29tcG9zaXRpbmdUcmlnZ2VyczsKKyAgICBDaHJvbWVDbGllbnQ6OkNvbXBvc2l0aW5nVHJp Z2dlckZsYWdzIG1fY29tcG9zaXRpbmdUcmlnZ2VycyB7IHN0YXRpY19jYXN0PENocm9tZUNsaWVu dDo6Q29tcG9zaXRpbmdUcmlnZ2VyRmxhZ3M+KENocm9tZUNsaWVudDo6QWxsVHJpZ2dlcnMpIH07 CisgICAgYm9vbCBtX2hhc0FjY2VsZXJhdGVkQ29tcG9zaXRpbmcgeyB0cnVlIH07CiAKLSAgICBi b29sIG1fc2hvd0RlYnVnQm9yZGVyczsKLSAgICBib29sIG1fc2hvd1JlcGFpbnRDb3VudGVyOwot ICAgIGJvb2wgbV9hY2NlbGVyYXRlZERyYXdpbmdFbmFibGVkOworICAgIGJvb2wgbV9zaG93RGVi dWdCb3JkZXJzIHsgZmFsc2UgfTsKKyAgICBib29sIG1fc2hvd1JlcGFpbnRDb3VudGVyIHsgZmFs c2UgfTsKKyAgICBib29sIG1fYWNjZWxlcmF0ZWREcmF3aW5nRW5hYmxlZCB7IGZhbHNlIH07Cisg ICAgYm9vbCBtX2Rpc3BsYXlMaXN0RHJhd2luZ0VuYWJsZWQgeyBmYWxzZSB9OwogCiAgICAgLy8g V2hlbiB0cnVlLCB3ZSBoYXZlIHRvIHdhaXQgdW50aWwgbGF5b3V0IGhhcyBoYXBwZW5lZCBiZWZv cmUgd2UgY2FuIGRlY2lkZSB3aGV0aGVyIHRvIGVudGVyIGNvbXBvc2l0aW5nIG1vZGUsCiAgICAg Ly8gYmVjYXVzZSBvbmx5IHRoZW4gZG8gd2Uga25vdyB0aGUgZmluYWwgc2l6ZSBvZiBwbHVnaW5z IGFuZCBpZnJhbWVzLgotICAgIG11dGFibGUgYm9vbCBtX3JlZXZhbHVhdGVDb21wb3NpdGluZ0Fm dGVyTGF5b3V0OworICAgIG11dGFibGUgYm9vbCBtX3JlZXZhbHVhdGVDb21wb3NpdGluZ0FmdGVy TGF5b3V0IHsgZmFsc2UgfTsKIAotICAgIGJvb2wgbV9jb21wb3NpdGluZzsKLSAgICBib29sIG1f Y29tcG9zaXRpbmdMYXllcnNOZWVkUmVidWlsZDsKLSAgICBib29sIG1fZmx1c2hpbmdMYXllcnM7 Ci0gICAgYm9vbCBtX3Nob3VsZEZsdXNoT25SZWF0dGFjaDsKLSAgICBib29sIG1fZm9yY2VDb21w b3NpdGluZ01vZGU7Ci0gICAgYm9vbCBtX2luUG9zdExheW91dFVwZGF0ZTsgLy8gdHJ1ZSB3aGVu IGl0J3MgT0sgdG8gdHJ1c3QgbGF5b3V0IGluZm9ybWF0aW9uIChlLmcuIGxheWVyIHNpemVzIGFu ZCBwb3NpdGlvbnMpCi0gICAgYm9vbCBtX3N1YmZyYW1lU2Nyb2xsTGF5ZXJzTmVlZFJlYXR0YWNo OworICAgIGJvb2wgbV9jb21wb3NpdGluZyB7IGZhbHNlIH07CisgICAgYm9vbCBtX2NvbXBvc2l0 aW5nTGF5ZXJzTmVlZFJlYnVpbGQgeyBmYWxzZSB9OworICAgIGJvb2wgbV9mbHVzaGluZ0xheWVy cyB7IGZhbHNlIH07CisgICAgYm9vbCBtX3Nob3VsZEZsdXNoT25SZWF0dGFjaCB7IGZhbHNlIH07 CisgICAgYm9vbCBtX2ZvcmNlQ29tcG9zaXRpbmdNb2RlIHsgZmFsc2UgfTsKKyAgICBib29sIG1f aW5Qb3N0TGF5b3V0VXBkYXRlIHsgZmFsc2UgfTsgLy8gdHJ1ZSB3aGVuIGl0J3MgT0sgdG8gdHJ1 c3QgbGF5b3V0IGluZm9ybWF0aW9uIChlLmcuIGxheWVyIHNpemVzIGFuZCBwb3NpdGlvbnMpCisg ICAgYm9vbCBtX3N1YmZyYW1lU2Nyb2xsTGF5ZXJzTmVlZFJlYXR0YWNoIHsgZmFsc2UgfTsKIAot ICAgIGJvb2wgbV9pc1RyYWNraW5nUmVwYWludHM7IC8vIFVzZWQgZm9yIHRlc3RpbmcuCisgICAg Ym9vbCBtX2lzVHJhY2tpbmdSZXBhaW50cyB7IGZhbHNlIH07IC8vIFVzZWQgZm9yIHRlc3Rpbmcu CiAKICAgICBpbnQgbV9jb21wb3NpdGVkTGF5ZXJDb3VudCB7IDAgfTsKICAgICB1bnNpZ25lZCBt X2xheWVyc1dpdGhUaWxlZEJhY2tpbmdDb3VudCB7IDAgfTsKICAgICB1bnNpZ25lZCBtX2xheWVy Rmx1c2hDb3VudCB7IDAgfTsKICAgICB1bnNpZ25lZCBtX2NvbXBvc2l0aW5nVXBkYXRlQ291bnQg eyAwIH07CiAKLSAgICBSb290TGF5ZXJBdHRhY2htZW50IG1fcm9vdExheWVyQXR0YWNobWVudDsK KyAgICBSb290TGF5ZXJBdHRhY2htZW50IG1fcm9vdExheWVyQXR0YWNobWVudCB7IFJvb3RMYXll clVuYXR0YWNoZWQgfTsKIAogICAgIC8vIEVuY2xvc2luZyBjbGlwcGluZyBsYXllciBmb3IgaWZy YW1lIGNvbnRlbnQKICAgICBzdGQ6OnVuaXF1ZV9wdHI8R3JhcGhpY3NMYXllcj4gbV9jbGlwTGF5 ZXI7CkBAIC01NDYsMTUgKzU0OCwxNSBAQCBwcml2YXRlOgogCiAgICAgc3RkOjp1bmlxdWVfcHRy PEdyYXBoaWNzTGF5ZXJVcGRhdGVyPiBtX2xheWVyVXBkYXRlcjsgLy8gVXBkYXRlcyB0aWxlZCBs YXllciB2aXNpYmxlIGFyZWEgcGVyaW9kaWNhbGx5IHdoaWxlIGFuaW1hdGlvbnMgYXJlIHJ1bm5p bmcuCiAKKyAgICBUaW1lciBtX3BhaW50UmVsYXRlZE1pbGVzdG9uZXNUaW1lcjsKICAgICBUaW1l ciBtX2xheWVyRmx1c2hUaW1lcjsKLSAgICBib29sIG1fbGF5ZXJGbHVzaFRocm90dGxpbmdFbmFi bGVkOwotICAgIGJvb2wgbV9sYXllckZsdXNoVGhyb3R0bGluZ1RlbXBvcmFyaWx5RGlzYWJsZWRG b3JJbnRlcmFjdGlvbjsKLSAgICBib29sIG1faGFzUGVuZGluZ0xheWVyRmx1c2g7CisKKyAgICBi b29sIG1fbGF5ZXJGbHVzaFRocm90dGxpbmdFbmFibGVkIHsgZmFsc2UgfTsKKyAgICBib29sIG1f bGF5ZXJGbHVzaFRocm90dGxpbmdUZW1wb3JhcmlseURpc2FibGVkRm9ySW50ZXJhY3Rpb24geyBm YWxzZSB9OworICAgIGJvb2wgbV9oYXNQZW5kaW5nTGF5ZXJGbHVzaCB7IGZhbHNlIH07CiAgICAg Ym9vbCBtX2xheWVyTmVlZHNDb21wb3NpdGluZ1VwZGF0ZSB7IGZhbHNlIH07CiAgICAgYm9vbCBt X3ZpZXdCYWNrZ3JvdW5kSXNUcmFuc3BhcmVudCB7IGZhbHNlIH07CiAKLSAgICBUaW1lciBtX3Bh aW50UmVsYXRlZE1pbGVzdG9uZXNUaW1lcjsKLQogI2lmICFMT0dfRElTQUJMRUQKICAgICBpbnQg bV9yb290TGF5ZXJVcGRhdGVDb3VudCB7IDAgfTsKICAgICBpbnQgbV9vYmxpZ2F0ZUNvbXBvc2l0 ZWRMYXllckNvdW50IHsgMCB9OyAvLyBjb3VudCBvZiBsYXllciB0aGF0IGhhdmUgdG8gYmUgY29t cG9zaXRlZC4K