155726 2016-03-21 11:42:12 -0700 [CoordinatedGraphics] Polish std::function<> usage in ThreadedCompositor, CoordinatedGraphicsScene 2016-03-22 02:44:57 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 zan zan cgarcia magomez yoon oldest_to_newest 1176798 0 zan 2016-03-21 11:42:12 -0700 [CoordinatedGraphics] Polish std::function<> usage in ThreadedCompositor, CoordinatedGraphicsScene 1176799 1 274613 zan 2016-03-21 11:46:43 -0700 Created attachment 274613 Patch 1176940 2 274644 zan 2016-03-22 00:36:29 -0700 Created attachment 274644 Patch for landing 1176945 3 274644 zan 2016-03-22 02:44:49 -0700 Comment on attachment 274644 Patch for landing Clearing flags on attachment: 274644 Committed r198525: <http://trac.webkit.org/changeset/198525> 1176946 4 zan 2016-03-22 02:44:57 -0700 All reviewed patches have been landed. Closing bug. 274613 2016-03-21 11:46:43 -0700 2016-03-22 00:36:22 -0700 Patch bug-155726-20160321114643.patch text/plain 13747 zan U3VidmVyc2lvbiBSZXZpc2lvbjogMTk4NDg2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYjk3NWE3YzQ3OTc5YjJk NTM2NjRmMmUxODc4ODZhMjEwMDk5YmYxYi4uZmYzNDcxODNmNGMyNDBkMGExMzNiMDQ3NDBmOWUz ODI4NzVmOWEzOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ2IEBACisyMDE2LTAzLTIxICBaYW4g RG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KKworICAgICAgICBbQ29vcmRpbmF0ZWRH cmFwaGljc10gUG9saXNoIHN0ZDo6ZnVuY3Rpb248PiB1c2FnZSBpbiBUaHJlYWRlZENvbXBvc2l0 b3IsIENvb3JkaW5hdGVkR3JhcGhpY3NTY2VuZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU1NzI2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgQWRqdXN0IHRoZSBtZXRob2RzIGluIFRocmVhZGVkQ29tcG9z aXRvciBhbmQgQ29vcmRpbmF0ZWRHcmFwaGljc1NjZW5lCisgICAgICAgIGNsYXNzZXMgdG8gYWNj ZXB0IHN0ZDo6ZnVuY3Rpb248PiBhcmd1bWVudHMgdmlhIHJ2YWx1ZSByZWZlcmVuY2VzLiBUaGlz CisgICAgICAgIHNob3VsZCBwcmV2ZW50IGJvdGggdW5uZWNlc3NhcnkgY29waWVzIGFuZCBtb3Zl cy4KKworICAgICAgICBGaXggbGFtYmRhIGV4cHJlc3Npb25zIHRoYXQgYXJlIG1vc3QgY29tbW9u bHkgdXNlZCB0byBjb25zdHJ1Y3QgdGhlCisgICAgICAgIHN0ZDo6ZnVuY3Rpb248PiBvYmplY3Rz IHNvIHRoYXQgdGhleSBkb24ndCBjYXB0dXJlLWJ5LXZhbHVlIGJ5IGRlZmF1bHQsCisgICAgICAg IGJ1dCBpbnN0ZWFkIGxpc3QgdGhlIGNhcHR1cmVkIHZhbHVlcyB2ZXJib3NlbHkuIFRoaXMgcGFy dCBhbG9uZSBleHBvc2VkCisgICAgICAgIGFuIGlzc3VlIGluIFRocmVhZGVkQ29tcG9zaXRvcjo6 ZGlkQ2hhbmdlVmlzaWJsZVJlY3QoKSB3aGVyZSB3ZSB3ZXJlCisgICAgICAgIGNhcHR1cmluZyB0 aGUgYHRoaXMnIHZhbHVlIGJ5IGRlZmF1bHQsIGluc3RlYWQgb2YgYSBwcm90ZWN0b3IgUmVmUHRy LgorCisgICAgICAgICogU2hhcmVkL0Nvb3JkaW5hdGVkR3JhcGhpY3MvQ29vcmRpbmF0ZWRHcmFw aGljc1NjZW5lLmNwcDoKKyAgICAgICAgKFdlYktpdDo6Q29vcmRpbmF0ZWRHcmFwaGljc1NjZW5l OjpkaXNwYXRjaE9uTWFpblRocmVhZCk6CisgICAgICAgIChXZWJLaXQ6OkNvb3JkaW5hdGVkR3Jh cGhpY3NTY2VuZTo6ZGlzcGF0Y2hPbkNsaWVudFJ1bkxvb3ApOgorICAgICAgICAoV2ViS2l0OjpD b29yZGluYXRlZEdyYXBoaWNzU2NlbmU6OnBhaW50VG9DdXJyZW50R0xDb250ZXh0KToKKyAgICAg ICAgKFdlYktpdDo6Q29vcmRpbmF0ZWRHcmFwaGljc1NjZW5lOjpvbk5ld0J1ZmZlckF2YWlsYWJs ZSk6CisgICAgICAgIChXZWJLaXQ6OkNvb3JkaW5hdGVkR3JhcGhpY3NTY2VuZTo6Y29tbWl0U2Nl bmVTdGF0ZSk6CisgICAgICAgIChXZWJLaXQ6OkNvb3JkaW5hdGVkR3JhcGhpY3NTY2VuZTo6cHVy Z2VHTFJlc291cmNlcyk6CisgICAgICAgIChXZWJLaXQ6OkNvb3JkaW5hdGVkR3JhcGhpY3NTY2Vu ZTo6Y29tbWl0U2Nyb2xsT2Zmc2V0KToKKyAgICAgICAgKFdlYktpdDo6Q29vcmRpbmF0ZWRHcmFw aGljc1NjZW5lOjphcHBlbmRVcGRhdGUpOgorICAgICAgICAoV2ViS2l0OjpDb29yZGluYXRlZEdy YXBoaWNzU2NlbmU6OnNldEFjdGl2ZSk6CisgICAgICAgICogU2hhcmVkL0Nvb3JkaW5hdGVkR3Jh cGhpY3MvQ29vcmRpbmF0ZWRHcmFwaGljc1NjZW5lLmg6CisgICAgICAgICogU2hhcmVkL0Nvb3Jk aW5hdGVkR3JhcGhpY3MvdGhyZWFkZWRjb21wb3NpdG9yL1RocmVhZGVkQ29tcG9zaXRvci5jcHA6 CisgICAgICAgIChXZWJLaXQ6OkNvbXBvc2l0aW5nUnVuTG9vcDo6Q29tcG9zaXRpbmdSdW5Mb29w KToKKyAgICAgICAgKFdlYktpdDo6Q29tcG9zaXRpbmdSdW5Mb29wOjpjYWxsT25Db21wb3NpdGlu Z1J1bkxvb3ApOgorICAgICAgICAoV2ViS2l0OjpUaHJlYWRlZENvbXBvc2l0b3I6OnNldE5lZWRz RGlzcGxheSk6CisgICAgICAgIChXZWJLaXQ6OlRocmVhZGVkQ29tcG9zaXRvcjo6c2V0TmF0aXZl U3VyZmFjZUhhbmRsZUZvckNvbXBvc2l0aW5nKToKKyAgICAgICAgKFdlYktpdDo6VGhyZWFkZWRD b21wb3NpdG9yOjpzZXREZXZpY2VTY2FsZUZhY3Rvcik6CisgICAgICAgIChXZWJLaXQ6OlRocmVh ZGVkQ29tcG9zaXRvcjo6ZGlkQ2hhbmdlVmlld3BvcnRTaXplKToKKyAgICAgICAgKFdlYktpdDo6 VGhyZWFkZWRDb21wb3NpdG9yOjpkaWRDaGFuZ2VWaWV3cG9ydEF0dHJpYnV0ZSk6CisgICAgICAg IChXZWJLaXQ6OlRocmVhZGVkQ29tcG9zaXRvcjo6ZGlkQ2hhbmdlQ29udGVudHNTaXplKToKKyAg ICAgICAgKFdlYktpdDo6VGhyZWFkZWRDb21wb3NpdG9yOjpzY3JvbGxUbyk6CisgICAgICAgIChX ZWJLaXQ6OlRocmVhZGVkQ29tcG9zaXRvcjo6c2Nyb2xsQnkpOgorICAgICAgICAoV2ViS2l0OjpU aHJlYWRlZENvbXBvc2l0b3I6OmRpZENoYW5nZVZpc2libGVSZWN0KToKKyAgICAgICAgKFdlYktp dDo6VGhyZWFkZWRDb21wb3NpdG9yOjpjYWxsT25Db21wb3NpdGluZ1RocmVhZCk6CisgICAgICAg ICogU2hhcmVkL0Nvb3JkaW5hdGVkR3JhcGhpY3MvdGhyZWFkZWRjb21wb3NpdG9yL1RocmVhZGVk Q29tcG9zaXRvci5oOgorCiAyMDE2LTAzLTIwICBEYW4gQmVybnN0ZWluICA8bWl0ekBhcHBsZS5j b20+CiAKICAgICAgICAgW01hY10gRGV0ZXJtaW5lIFRBUkdFVF9NQUNfT1NfWF9WRVJTSU9OX01B Sk9SIGZyb20gTUFDT1NYX0RFUExPWU1FTlRfVEFSR0VUIHJhdGhlciB0aGFuIGZyb20gTUFDX09T X1hfVkVSU0lPTl9NQUpPUgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvU2hhcmVkL0Nvb3Jk aW5hdGVkR3JhcGhpY3MvQ29vcmRpbmF0ZWRHcmFwaGljc1NjZW5lLmNwcCBiL1NvdXJjZS9XZWJL aXQyL1NoYXJlZC9Db29yZGluYXRlZEdyYXBoaWNzL0Nvb3JkaW5hdGVkR3JhcGhpY3NTY2VuZS5j cHAKaW5kZXggMWI3OGZkOGVmYTIwNzhmNGM4ODFkOWNhMzliZDM5Y2RlNDBmOTNhOS4uOTIwMDUw NWJlNWUxNDQ4MjFiYjk3MWQwMmRiZDQzMzA1NDU5MTA4YSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdDIvU2hhcmVkL0Nvb3JkaW5hdGVkR3JhcGhpY3MvQ29vcmRpbmF0ZWRHcmFwaGljc1NjZW5l LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvQ29vcmRpbmF0ZWRHcmFwaGljcy9Db29y ZGluYXRlZEdyYXBoaWNzU2NlbmUuY3BwCkBAIC0zNSw3ICszNSw3IEBAIHVzaW5nIG5hbWVzcGFj ZSBXZWJDb3JlOwogCiBuYW1lc3BhY2UgV2ViS2l0IHsKIAotdm9pZCBDb29yZGluYXRlZEdyYXBo aWNzU2NlbmU6OmRpc3BhdGNoT25NYWluVGhyZWFkKHN0ZDo6ZnVuY3Rpb248dm9pZCgpPiBmdW5j dGlvbikKK3ZvaWQgQ29vcmRpbmF0ZWRHcmFwaGljc1NjZW5lOjpkaXNwYXRjaE9uTWFpblRocmVh ZChzdGQ6OmZ1bmN0aW9uPHZvaWQoKT4mJiBmdW5jdGlvbikKIHsKICAgICBpZiAoaXNNYWluVGhy ZWFkKCkpCiAgICAgICAgIGZ1bmN0aW9uKCk7CkBAIC00Myw3ICs0Myw3IEBAIHZvaWQgQ29vcmRp bmF0ZWRHcmFwaGljc1NjZW5lOjpkaXNwYXRjaE9uTWFpblRocmVhZChzdGQ6OmZ1bmN0aW9uPHZv aWQoKT4gZnVuY3RpCiAgICAgICAgIGNhbGxPbk1haW5UaHJlYWQoV1RGTW92ZShmdW5jdGlvbikp OwogfQogCi12b2lkIENvb3JkaW5hdGVkR3JhcGhpY3NTY2VuZTo6ZGlzcGF0Y2hPbkNsaWVudFJ1 bkxvb3Aoc3RkOjpmdW5jdGlvbjx2b2lkKCk+IGZ1bmN0aW9uKQordm9pZCBDb29yZGluYXRlZEdy YXBoaWNzU2NlbmU6OmRpc3BhdGNoT25DbGllbnRSdW5Mb29wKHN0ZDo6ZnVuY3Rpb248dm9pZCgp PiYmIGZ1bmN0aW9uKQogewogICAgIGlmICgmbV9jbGllbnRSdW5Mb29wID09ICZSdW5Mb29wOjpj dXJyZW50KCkpCiAgICAgICAgIGZ1bmN0aW9uKCk7CkBAIC0xMTYsNyArMTE2LDcgQEAgdm9pZCBD b29yZGluYXRlZEdyYXBoaWNzU2NlbmU6OnBhaW50VG9DdXJyZW50R0xDb250ZXh0KGNvbnN0IFRy YW5zZm9ybWF0aW9uTWF0cmkKIAogICAgIGlmIChjdXJyZW50Um9vdExheWVyLT5kZXNjZW5kYW50 c09yU2VsZkhhdmVSdW5uaW5nQW5pbWF0aW9ucygpKSB7CiAgICAgICAgIFJlZlB0cjxDb29yZGlu YXRlZEdyYXBoaWNzU2NlbmU+IHByb3RlY3Rvcih0aGlzKTsKLSAgICAgICAgZGlzcGF0Y2hPbkNs aWVudFJ1bkxvb3AoWz1dIHsKKyAgICAgICAgZGlzcGF0Y2hPbkNsaWVudFJ1bkxvb3AoW3Byb3Rl Y3Rvcl0gewogICAgICAgICAgICAgcHJvdGVjdG9yLT51cGRhdGVWaWV3cG9ydCgpOwogICAgICAg ICB9KTsKICAgICB9CkBAIC0yMDQsNyArMjA0LDcgQEAgdm9pZCBDb29yZGluYXRlZEdyYXBoaWNz U2NlbmU6OnN5bmNQbGF0Zm9ybUxheWVySWZOZWVkZWQoVGV4dHVyZU1hcHBlckxheWVyKiBsYXkK IHZvaWQgQ29vcmRpbmF0ZWRHcmFwaGljc1NjZW5lOjpvbk5ld0J1ZmZlckF2YWlsYWJsZSgpCiB7 CiAgICAgUmVmUHRyPENvb3JkaW5hdGVkR3JhcGhpY3NTY2VuZT4gcHJvdGVjdG9yKHRoaXMpOwot ICAgIGRpc3BhdGNoT25DbGllbnRSdW5Mb29wKFs9XSB7CisgICAgZGlzcGF0Y2hPbkNsaWVudFJ1 bkxvb3AoW3Byb3RlY3Rvcl0gewogICAgICAgICBwcm90ZWN0b3ItPnVwZGF0ZVZpZXdwb3J0KCk7 CiAgICAgfSk7CiB9CkBAIC02MTAsNyArNjEwLDcgQEAgdm9pZCBDb29yZGluYXRlZEdyYXBoaWNz U2NlbmU6OmNvbW1pdFNjZW5lU3RhdGUoY29uc3QgQ29vcmRpbmF0ZWRHcmFwaGljc1N0YXRlJgog CiAgICAgLy8gVGhlIHBlbmRpbmcgdGlsZXMgc3RhdGUgaXMgb24gaXRzIHdheSBmb3IgdGhlIHNj cmVlbiwgdGVsbCB0aGUgd2ViIHByb2Nlc3MgdG8gcmVuZGVyIHRoZSBuZXh0IG9uZS4KICAgICBS ZWZQdHI8Q29vcmRpbmF0ZWRHcmFwaGljc1NjZW5lPiBwcm90ZWN0b3IodGhpcyk7Ci0gICAgZGlz cGF0Y2hPbk1haW5UaHJlYWQoWz1dIHsKKyAgICBkaXNwYXRjaE9uTWFpblRocmVhZChbcHJvdGVj dG9yXSB7CiAgICAgICAgIHByb3RlY3Rvci0+cmVuZGVyTmV4dEZyYW1lKCk7CiAgICAgfSk7CiB9 CkBAIC02NzgsNyArNjc4LDcgQEAgdm9pZCBDb29yZGluYXRlZEdyYXBoaWNzU2NlbmU6OnB1cmdl R0xSZXNvdXJjZXMoKQogICAgIHNldEFjdGl2ZShmYWxzZSk7CiAKICAgICBSZWZQdHI8Q29vcmRp bmF0ZWRHcmFwaGljc1NjZW5lPiBwcm90ZWN0b3IodGhpcyk7Ci0gICAgZGlzcGF0Y2hPbk1haW5U aHJlYWQoWz1dIHsKKyAgICBkaXNwYXRjaE9uTWFpblRocmVhZChbcHJvdGVjdG9yXSB7CiAgICAg ICAgIHByb3RlY3Rvci0+cHVyZ2VCYWNraW5nU3RvcmVzKCk7CiAgICAgfSk7CiB9CkBAIC02OTEs NyArNjkxLDcgQEAgdm9pZCBDb29yZGluYXRlZEdyYXBoaWNzU2NlbmU6OmRpc3BhdGNoQ29tbWl0 U2Nyb2xsT2Zmc2V0KHVpbnQzMl90IGxheWVySUQsIGNvbnMKIHZvaWQgQ29vcmRpbmF0ZWRHcmFw aGljc1NjZW5lOjpjb21taXRTY3JvbGxPZmZzZXQodWludDMyX3QgbGF5ZXJJRCwgY29uc3QgSW50 U2l6ZSYgb2Zmc2V0KQogewogICAgIFJlZlB0cjxDb29yZGluYXRlZEdyYXBoaWNzU2NlbmU+IHBy b3RlY3Rvcih0aGlzKTsKLSAgICBkaXNwYXRjaE9uTWFpblRocmVhZChbPV0geworICAgIGRpc3Bh dGNoT25NYWluVGhyZWFkKFtwcm90ZWN0b3IsIGxheWVySUQsIG9mZnNldF0gewogICAgICAgICBw cm90ZWN0b3ItPmRpc3BhdGNoQ29tbWl0U2Nyb2xsT2Zmc2V0KGxheWVySUQsIG9mZnNldCk7CiAg ICAgfSk7CiB9CkBAIC03MTcsNyArNzE3LDcgQEAgdm9pZCBDb29yZGluYXRlZEdyYXBoaWNzU2Nl bmU6OmRldGFjaCgpCiAgICAgbV9jbGllbnQgPSAwOwogfQogCi12b2lkIENvb3JkaW5hdGVkR3Jh cGhpY3NTY2VuZTo6YXBwZW5kVXBkYXRlKHN0ZDo6ZnVuY3Rpb248dm9pZCgpPiBmdW5jdGlvbikK K3ZvaWQgQ29vcmRpbmF0ZWRHcmFwaGljc1NjZW5lOjphcHBlbmRVcGRhdGUoc3RkOjpmdW5jdGlv bjx2b2lkKCk+JiYgZnVuY3Rpb24pCiB7CiAgICAgaWYgKCFtX2lzQWN0aXZlKQogICAgICAgICBy ZXR1cm47CkBAIC03MzksNyArNzM5LDcgQEAgdm9pZCBDb29yZGluYXRlZEdyYXBoaWNzU2NlbmU6 OnNldEFjdGl2ZShib29sIGFjdGl2ZSkKICAgICBtX2lzQWN0aXZlID0gYWN0aXZlOwogICAgIGlm IChtX2lzQWN0aXZlKSB7CiAgICAgICAgIFJlZlB0cjxDb29yZGluYXRlZEdyYXBoaWNzU2NlbmU+ IHByb3RlY3Rvcih0aGlzKTsKLSAgICAgICAgZGlzcGF0Y2hPbk1haW5UaHJlYWQoWz1dIHsKKyAg ICAgICAgZGlzcGF0Y2hPbk1haW5UaHJlYWQoW3Byb3RlY3Rvcl0gewogICAgICAgICAgICAgcHJv dGVjdG9yLT5yZW5kZXJOZXh0RnJhbWUoKTsKICAgICAgICAgfSk7CiAgICAgfQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvU2hhcmVkL0Nvb3JkaW5hdGVkR3JhcGhpY3MvQ29vcmRpbmF0ZWRH cmFwaGljc1NjZW5lLmggYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvQ29vcmRpbmF0ZWRHcmFwaGlj cy9Db29yZGluYXRlZEdyYXBoaWNzU2NlbmUuaAppbmRleCBkYTdlOTM5OGRhZThhZTRlMmUzYmY4 MWNkYTI3MjI3ZDI5NzVmNmM4Li44YjViZTVlNTQ4NjgwZDE3ZTcyNmU2ZTNlOThjMTg0OGQzNzNm MWIxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvQ29vcmRpbmF0ZWRHcmFwaGlj cy9Db29yZGluYXRlZEdyYXBoaWNzU2NlbmUuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQv Q29vcmRpbmF0ZWRHcmFwaGljcy9Db29yZGluYXRlZEdyYXBoaWNzU2NlbmUuaApAQCAtNzMsNyAr NzMsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBwYWludFRvQ3VycmVudEdMQ29udGV4dChjb25zdCBX ZWJDb3JlOjpUcmFuc2Zvcm1hdGlvbk1hdHJpeCYsIGZsb2F0LCBjb25zdCBXZWJDb3JlOjpGbG9h dFJlY3QmLCBjb25zdCBXZWJDb3JlOjpDb2xvciYgYmFja2dyb3VuZENvbG9yLCBib29sIGRyYXdz QmFja2dyb3VuZCwgY29uc3QgV2ViQ29yZTo6RmxvYXRQb2ludCYsIFdlYkNvcmU6OlRleHR1cmVN YXBwZXI6OlBhaW50RmxhZ3MgPSAwKTsKICAgICB2b2lkIHBhaW50VG9HcmFwaGljc0NvbnRleHQo UGxhdGZvcm1HcmFwaGljc0NvbnRleHQqLCBjb25zdCBXZWJDb3JlOjpDb2xvciYgYmFja2dyb3Vu ZENvbG9yLCBib29sIGRyYXdzQmFja2dyb3VuZCk7CiAgICAgdm9pZCBkZXRhY2goKTsKLSAgICB2 b2lkIGFwcGVuZFVwZGF0ZShzdGQ6OmZ1bmN0aW9uPHZvaWQoKT4pOworICAgIHZvaWQgYXBwZW5k VXBkYXRlKHN0ZDo6ZnVuY3Rpb248dm9pZCgpPiYmKTsKIAogICAgIFdlYkNvcmU6OlRleHR1cmVN YXBwZXJMYXllciogZmluZFNjcm9sbGFibGVDb250ZW50c0xheWVyQXQoY29uc3QgV2ViQ29yZTo6 RmxvYXRQb2ludCYpOwogCkBAIC0xMzEsOCArMTMxLDggQEAgcHJpdmF0ZToKICAgICB2b2lkIHN5 bmNSZW1vdGVDb250ZW50KCk7CiAgICAgdm9pZCBhZGp1c3RQb3NpdGlvbkZvckZpeGVkTGF5ZXJz KGNvbnN0IFdlYkNvcmU6OkZsb2F0UG9pbnQmIGNvbnRlbnRQb3NpdGlvbik7CiAKLSAgICB2b2lk IGRpc3BhdGNoT25NYWluVGhyZWFkKHN0ZDo6ZnVuY3Rpb248dm9pZCgpPik7Ci0gICAgdm9pZCBk aXNwYXRjaE9uQ2xpZW50UnVuTG9vcChzdGQ6OmZ1bmN0aW9uPHZvaWQoKT4pOworICAgIHZvaWQg ZGlzcGF0Y2hPbk1haW5UaHJlYWQoc3RkOjpmdW5jdGlvbjx2b2lkKCk+JiYpOworICAgIHZvaWQg ZGlzcGF0Y2hPbkNsaWVudFJ1bkxvb3Aoc3RkOjpmdW5jdGlvbjx2b2lkKCk+JiYpOwogICAgIHZv aWQgdXBkYXRlVmlld3BvcnQoKTsKICAgICB2b2lkIHJlbmRlck5leHRGcmFtZSgpOwogICAgIHZv aWQgcHVyZ2VCYWNraW5nU3RvcmVzKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9TaGFy ZWQvQ29vcmRpbmF0ZWRHcmFwaGljcy90aHJlYWRlZGNvbXBvc2l0b3IvVGhyZWFkZWRDb21wb3Np dG9yLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9Db29yZGluYXRlZEdyYXBoaWNzL3RocmVh ZGVkY29tcG9zaXRvci9UaHJlYWRlZENvbXBvc2l0b3IuY3BwCmluZGV4IGJiN2U4NmRiNTk3MDU1 MWQ1NWQ1YjE1YzM3ZDM3YjRlZTAxYTAwNDcuLmMzMDEzN2M0NjgxNDk5MGQyZmYyOWRmODdkMzRk MzhmZmI5YTRjZGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9Db29yZGluYXRl ZEdyYXBoaWNzL3RocmVhZGVkY29tcG9zaXRvci9UaHJlYWRlZENvbXBvc2l0b3IuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9Db29yZGluYXRlZEdyYXBoaWNzL3RocmVhZGVkY29tcG9z aXRvci9UaHJlYWRlZENvbXBvc2l0b3IuY3BwCkBAIC01Miw3ICs1Miw3IEBAIHB1YmxpYzoKICAg ICAgICAgV2FpdFVudGlsTmV4dEZyYW1lLAogICAgIH07CiAKLSAgICBDb21wb3NpdGluZ1J1bkxv b3Aoc3RkOjpmdW5jdGlvbjx2b2lkKCk+IHVwZGF0ZUZ1bmN0aW9uKQorICAgIENvbXBvc2l0aW5n UnVuTG9vcChzdGQ6OmZ1bmN0aW9uPHZvaWQoKT4mJiB1cGRhdGVGdW5jdGlvbikKICAgICAgICAg OiBtX3J1bkxvb3AoUnVuTG9vcDo6Y3VycmVudCgpKQogICAgICAgICAsIG1fdXBkYXRlVGltZXIo bV9ydW5Mb29wLCB0aGlzLCAmQ29tcG9zaXRpbmdSdW5Mb29wOjp1cGRhdGVUaW1lckZpcmVkKQog ICAgICAgICAsIG1fdXBkYXRlRnVuY3Rpb24oV1RGTW92ZSh1cGRhdGVGdW5jdGlvbikpCkBAIC02 MCw3ICs2MCw3IEBAIHB1YmxpYzoKICAgICB7CiAgICAgfQogCi0gICAgdm9pZCBjYWxsT25Db21w b3NpdGluZ1J1bkxvb3Aoc3RkOjpmdW5jdGlvbjx2b2lkKCk+IGZ1bmN0aW9uKQorICAgIHZvaWQg Y2FsbE9uQ29tcG9zaXRpbmdSdW5Mb29wKHN0ZDo6ZnVuY3Rpb248dm9pZCgpPiYmIGZ1bmN0aW9u KQogICAgIHsKICAgICAgICAgaWYgKCZtX3J1bkxvb3AgPT0gJlJ1bkxvb3A6OmN1cnJlbnQoKSkg ewogICAgICAgICAgICAgZnVuY3Rpb24oKTsKQEAgLTEzMCw3ICsxMzAsNyBAQCBUaHJlYWRlZENv bXBvc2l0b3I6On5UaHJlYWRlZENvbXBvc2l0b3IoKQogdm9pZCBUaHJlYWRlZENvbXBvc2l0b3I6 OnNldE5lZWRzRGlzcGxheSgpCiB7CiAgICAgUmVmUHRyPFRocmVhZGVkQ29tcG9zaXRvcj4gcHJv dGVjdG9yKHRoaXMpOwotICAgIGNhbGxPbkNvbXBvc2l0aW5nVGhyZWFkKFs9XSB7CisgICAgY2Fs bE9uQ29tcG9zaXRpbmdUaHJlYWQoW3Byb3RlY3Rvcl0gewogICAgICAgICBwcm90ZWN0b3ItPnNj aGVkdWxlRGlzcGxheUltbWVkaWF0ZWx5KCk7CiAgICAgfSk7CiB9CkBAIC0xMzgsNyArMTM4LDcg QEAgdm9pZCBUaHJlYWRlZENvbXBvc2l0b3I6OnNldE5lZWRzRGlzcGxheSgpCiB2b2lkIFRocmVh ZGVkQ29tcG9zaXRvcjo6c2V0TmF0aXZlU3VyZmFjZUhhbmRsZUZvckNvbXBvc2l0aW5nKHVpbnQ2 NF90IGhhbmRsZSkKIHsKICAgICBSZWZQdHI8VGhyZWFkZWRDb21wb3NpdG9yPiBwcm90ZWN0b3Io dGhpcyk7Ci0gICAgY2FsbE9uQ29tcG9zaXRpbmdUaHJlYWQoWz1dIHsKKyAgICBjYWxsT25Db21w b3NpdGluZ1RocmVhZChbcHJvdGVjdG9yLCBoYW5kbGVdIHsKICAgICAgICAgcHJvdGVjdG9yLT5t X25hdGl2ZVN1cmZhY2VIYW5kbGUgPSBoYW5kbGU7CiAgICAgICAgIHByb3RlY3Rvci0+bV9zY2Vu ZS0+c2V0QWN0aXZlKHRydWUpOwogICAgIH0pOwpAQCAtMTQ3LDI0ICsxNDcsMjQgQEAgdm9pZCBU aHJlYWRlZENvbXBvc2l0b3I6OnNldE5hdGl2ZVN1cmZhY2VIYW5kbGVGb3JDb21wb3NpdGluZyh1 aW50NjRfdCBoYW5kbGUpCiB2b2lkIFRocmVhZGVkQ29tcG9zaXRvcjo6c2V0RGV2aWNlU2NhbGVG YWN0b3IoZmxvYXQgc2NhbGUpCiB7CiAgICAgUmVmUHRyPFRocmVhZGVkQ29tcG9zaXRvcj4gcHJv dGVjdG9yKHRoaXMpOwotICAgIGNhbGxPbkNvbXBvc2l0aW5nVGhyZWFkKFs9XSB7CisgICAgY2Fs bE9uQ29tcG9zaXRpbmdUaHJlYWQoW3Byb3RlY3Rvciwgc2NhbGVdIHsKICAgICAgICAgcHJvdGVj dG9yLT5tX2RldmljZVNjYWxlRmFjdG9yID0gc2NhbGU7CiAgICAgICAgIHByb3RlY3Rvci0+c2No ZWR1bGVEaXNwbGF5SW1tZWRpYXRlbHkoKTsKICAgICB9KTsKIH0KIAotdm9pZCBUaHJlYWRlZENv bXBvc2l0b3I6OmRpZENoYW5nZVZpZXdwb3J0U2l6ZShjb25zdCBJbnRTaXplJiBuZXdTaXplKQor dm9pZCBUaHJlYWRlZENvbXBvc2l0b3I6OmRpZENoYW5nZVZpZXdwb3J0U2l6ZShjb25zdCBJbnRT aXplJiBzaXplKQogewogICAgIFJlZlB0cjxUaHJlYWRlZENvbXBvc2l0b3I+IHByb3RlY3Rvcih0 aGlzKTsKLSAgICBjYWxsT25Db21wb3NpdGluZ1RocmVhZChbPV0gewotICAgICAgICBwcm90ZWN0 b3ItPnZpZXdwb3J0Q29udHJvbGxlcigpLT5kaWRDaGFuZ2VWaWV3cG9ydFNpemUobmV3U2l6ZSk7 CisgICAgY2FsbE9uQ29tcG9zaXRpbmdUaHJlYWQoW3Byb3RlY3Rvciwgc2l6ZV0geworICAgICAg ICBwcm90ZWN0b3ItPnZpZXdwb3J0Q29udHJvbGxlcigpLT5kaWRDaGFuZ2VWaWV3cG9ydFNpemUo c2l6ZSk7CiAgICAgfSk7CiB9CiAKIHZvaWQgVGhyZWFkZWRDb21wb3NpdG9yOjpkaWRDaGFuZ2VW aWV3cG9ydEF0dHJpYnV0ZShjb25zdCBWaWV3cG9ydEF0dHJpYnV0ZXMmIGF0dHIpCiB7CiAgICAg UmVmUHRyPFRocmVhZGVkQ29tcG9zaXRvcj4gcHJvdGVjdG9yKHRoaXMpOwotICAgIGNhbGxPbkNv bXBvc2l0aW5nVGhyZWFkKFs9XSB7CisgICAgY2FsbE9uQ29tcG9zaXRpbmdUaHJlYWQoW3Byb3Rl Y3RvciwgYXR0cl0gewogICAgICAgICBwcm90ZWN0b3ItPnZpZXdwb3J0Q29udHJvbGxlcigpLT5k aWRDaGFuZ2VWaWV3cG9ydEF0dHJpYnV0ZShhdHRyKTsKICAgICB9KTsKIH0KQEAgLTE3Miw3ICsx NzIsNyBAQCB2b2lkIFRocmVhZGVkQ29tcG9zaXRvcjo6ZGlkQ2hhbmdlVmlld3BvcnRBdHRyaWJ1 dGUoY29uc3QgVmlld3BvcnRBdHRyaWJ1dGVzJiBhdAogdm9pZCBUaHJlYWRlZENvbXBvc2l0b3I6 OmRpZENoYW5nZUNvbnRlbnRzU2l6ZShjb25zdCBJbnRTaXplJiBzaXplKQogewogICAgIFJlZlB0 cjxUaHJlYWRlZENvbXBvc2l0b3I+IHByb3RlY3Rvcih0aGlzKTsKLSAgICBjYWxsT25Db21wb3Np dGluZ1RocmVhZChbPV0geworICAgIGNhbGxPbkNvbXBvc2l0aW5nVGhyZWFkKFtwcm90ZWN0b3Is IHNpemVdIHsKICAgICAgICAgcHJvdGVjdG9yLT52aWV3cG9ydENvbnRyb2xsZXIoKS0+ZGlkQ2hh bmdlQ29udGVudHNTaXplKHNpemUpOwogICAgIH0pOwogfQpAQCAtMTgwLDcgKzE4MCw3IEBAIHZv aWQgVGhyZWFkZWRDb21wb3NpdG9yOjpkaWRDaGFuZ2VDb250ZW50c1NpemUoY29uc3QgSW50U2l6 ZSYgc2l6ZSkKIHZvaWQgVGhyZWFkZWRDb21wb3NpdG9yOjpzY3JvbGxUbyhjb25zdCBJbnRQb2lu dCYgcG9zaXRpb24pCiB7CiAgICAgUmVmUHRyPFRocmVhZGVkQ29tcG9zaXRvcj4gcHJvdGVjdG9y KHRoaXMpOwotICAgIGNhbGxPbkNvbXBvc2l0aW5nVGhyZWFkKFs9XSB7CisgICAgY2FsbE9uQ29t cG9zaXRpbmdUaHJlYWQoW3Byb3RlY3RvciwgcG9zaXRpb25dIHsKICAgICAgICAgcHJvdGVjdG9y LT52aWV3cG9ydENvbnRyb2xsZXIoKS0+c2Nyb2xsVG8ocG9zaXRpb24pOwogICAgIH0pOwogfQpA QCAtMTg4LDcgKzE4OCw3IEBAIHZvaWQgVGhyZWFkZWRDb21wb3NpdG9yOjpzY3JvbGxUbyhjb25z dCBJbnRQb2ludCYgcG9zaXRpb24pCiB2b2lkIFRocmVhZGVkQ29tcG9zaXRvcjo6c2Nyb2xsQnko Y29uc3QgSW50U2l6ZSYgZGVsdGEpCiB7CiAgICAgUmVmUHRyPFRocmVhZGVkQ29tcG9zaXRvcj4g cHJvdGVjdG9yKHRoaXMpOwotICAgIGNhbGxPbkNvbXBvc2l0aW5nVGhyZWFkKFs9XSB7CisgICAg Y2FsbE9uQ29tcG9zaXRpbmdUaHJlYWQoW3Byb3RlY3RvciwgZGVsdGFdIHsKICAgICAgICAgcHJv dGVjdG9yLT52aWV3cG9ydENvbnRyb2xsZXIoKS0+c2Nyb2xsQnkoZGVsdGEpOwogICAgIH0pOwog fQpAQCAtMjUwLDEwICsyNTAsMTEgQEAgdm9pZCBUaHJlYWRlZENvbXBvc2l0b3I6OnNjaGVkdWxl RGlzcGxheUltbWVkaWF0ZWx5KCkKIAogdm9pZCBUaHJlYWRlZENvbXBvc2l0b3I6OmRpZENoYW5n ZVZpc2libGVSZWN0KCkKIHsKKyAgICBSZWZQdHI8VGhyZWFkZWRDb21wb3NpdG9yPiBwcm90ZWN0 b3IodGhpcyk7CiAgICAgRmxvYXRSZWN0IHZpc2libGVSZWN0ID0gdmlld3BvcnRDb250cm9sbGVy KCktPnZpc2libGVDb250ZW50c1JlY3QoKTsKICAgICBmbG9hdCBzY2FsZSA9IHZpZXdwb3J0Q29u dHJvbGxlcigpLT5wYWdlU2NhbGVGYWN0b3IoKTsKLSAgICBjYWxsT25NYWluVGhyZWFkKFs9XSB7 Ci0gICAgICAgIG1fY2xpZW50LT5zZXRWaXNpYmxlQ29udGVudHNSZWN0KHZpc2libGVSZWN0LCBG bG9hdFBvaW50Ojp6ZXJvKCksIHNjYWxlKTsKKyAgICBjYWxsT25NYWluVGhyZWFkKFtwcm90ZWN0 b3IsIHZpc2libGVSZWN0LCBzY2FsZV0geworICAgICAgICBwcm90ZWN0b3ItPm1fY2xpZW50LT5z ZXRWaXNpYmxlQ29udGVudHNSZWN0KHZpc2libGVSZWN0LCBGbG9hdFBvaW50Ojp6ZXJvKCksIHNj YWxlKTsKICAgICB9KTsKIAogICAgIHNjaGVkdWxlRGlzcGxheUltbWVkaWF0ZWx5KCk7CkBAIC0y ODksNyArMjkwLDcgQEAgdm9pZCBUaHJlYWRlZENvbXBvc2l0b3I6OnVwZGF0ZVNjZW5lU3RhdGUo Y29uc3QgQ29vcmRpbmF0ZWRHcmFwaGljc1N0YXRlJiBzdGF0ZSkKICAgICBzZXROZWVkc0Rpc3Bs YXkoKTsKIH0KIAotdm9pZCBUaHJlYWRlZENvbXBvc2l0b3I6OmNhbGxPbkNvbXBvc2l0aW5nVGhy ZWFkKHN0ZDo6ZnVuY3Rpb248dm9pZCgpPiBmdW5jdGlvbikKK3ZvaWQgVGhyZWFkZWRDb21wb3Np dG9yOjpjYWxsT25Db21wb3NpdGluZ1RocmVhZChzdGQ6OmZ1bmN0aW9uPHZvaWQoKT4mJiBmdW5j dGlvbikKIHsKICAgICBtX2NvbXBvc2l0aW5nUnVuTG9vcC0+Y2FsbE9uQ29tcG9zaXRpbmdSdW5M b29wKFdURk1vdmUoZnVuY3Rpb24pKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1No YXJlZC9Db29yZGluYXRlZEdyYXBoaWNzL3RocmVhZGVkY29tcG9zaXRvci9UaHJlYWRlZENvbXBv c2l0b3IuaCBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9Db29yZGluYXRlZEdyYXBoaWNzL3RocmVh ZGVkY29tcG9zaXRvci9UaHJlYWRlZENvbXBvc2l0b3IuaAppbmRleCAxMTExYmZmZWEzMWFiZDE0 OGFlNTljNTE0MmM5N2I4NGRhM2U4NzE4Li5hOTk5NTFiZDRhY2ViMjJmYjEzNDRkODk0ZjMzNTJl MjBhZmM5NjIwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvQ29vcmRpbmF0ZWRH cmFwaGljcy90aHJlYWRlZGNvbXBvc2l0b3IvVGhyZWFkZWRDb21wb3NpdG9yLmgKKysrIGIvU291 cmNlL1dlYktpdDIvU2hhcmVkL0Nvb3JkaW5hdGVkR3JhcGhpY3MvdGhyZWFkZWRjb21wb3NpdG9y L1RocmVhZGVkQ29tcG9zaXRvci5oCkBAIC05NCw3ICs5NCw3IEBAIHByaXZhdGU6CiAgICAgV2Vi Q29yZTo6R0xDb250ZXh0KiBnbENvbnRleHQoKTsKICAgICBTaW1wbGVWaWV3cG9ydENvbnRyb2xs ZXIqIHZpZXdwb3J0Q29udHJvbGxlcigpIHsgcmV0dXJuIG1fdmlld3BvcnRDb250cm9sbGVyLmdl dCgpOyB9CiAKLSAgICB2b2lkIGNhbGxPbkNvbXBvc2l0aW5nVGhyZWFkKHN0ZDo6ZnVuY3Rpb248 dm9pZCgpPik7CisgICAgdm9pZCBjYWxsT25Db21wb3NpdGluZ1RocmVhZChzdGQ6OmZ1bmN0aW9u PHZvaWQoKT4mJik7CiAgICAgdm9pZCBjcmVhdGVDb21wb3NpdGluZ1RocmVhZCgpOwogICAgIHZv aWQgcnVuQ29tcG9zaXRpbmdUaHJlYWQoKTsKICAgICB2b2lkIHRlcm1pbmF0ZUNvbXBvc2l0aW5n VGhyZWFkKCk7Cg== 274644 2016-03-22 00:36:29 -0700 2016-03-22 00:36:29 -0700 Patch for landing bug-155726-20160322003628.patch text/plain 13795 zan U3VidmVyc2lvbiBSZXZpc2lvbjogMTk4NTIyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNzU1Njg4MGE4NjU1NDAw OTdiYzMxOWFkYjQ1Mzk0NjM0M2Q5OTlkMy4uNjhkMjcyNGQ4NmE0ZGRhMTJkOWJkMzE2YzExNTg4 NjRmNjBmOTBmMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDQ4IEBACiAyMDE2LTAzLTIyICBaYW4g RG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KIAorICAgICAgICBbQ29vcmRpbmF0ZWRH cmFwaGljc10gUG9saXNoIHN0ZDo6ZnVuY3Rpb248PiB1c2FnZSBpbiBUaHJlYWRlZENvbXBvc2l0 b3IsIENvb3JkaW5hdGVkR3JhcGhpY3NTY2VuZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU1NzI2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4g QWRsZXIuCisKKyAgICAgICAgQWRqdXN0IHRoZSBtZXRob2RzIGluIFRocmVhZGVkQ29tcG9zaXRv ciBhbmQgQ29vcmRpbmF0ZWRHcmFwaGljc1NjZW5lCisgICAgICAgIGNsYXNzZXMgdG8gYWNjZXB0 IHN0ZDo6ZnVuY3Rpb248PiBhcmd1bWVudHMgdmlhIHJ2YWx1ZSByZWZlcmVuY2VzLiBUaGlzCisg ICAgICAgIHNob3VsZCBwcmV2ZW50IGJvdGggdW5uZWNlc3NhcnkgY29waWVzIGFuZCBtb3Zlcy4K KworICAgICAgICBGaXggbGFtYmRhIGV4cHJlc3Npb25zIHRoYXQgYXJlIG1vc3QgY29tbW9ubHkg dXNlZCB0byBjb25zdHJ1Y3QgdGhlCisgICAgICAgIHN0ZDo6ZnVuY3Rpb248PiBvYmplY3RzIHNv IHRoYXQgdGhleSBkb24ndCBjYXB0dXJlLWJ5LXZhbHVlIGJ5IGRlZmF1bHQsCisgICAgICAgIGJ1 dCBpbnN0ZWFkIGxpc3QgdGhlIGNhcHR1cmVkIHZhbHVlcyB2ZXJib3NlbHkuIFRoaXMgcGFydCBh bG9uZSBleHBvc2VkCisgICAgICAgIGFuIGlzc3VlIGluIFRocmVhZGVkQ29tcG9zaXRvcjo6ZGlk Q2hhbmdlVmlzaWJsZVJlY3QoKSB3aGVyZSB3ZSB3ZXJlCisgICAgICAgIGNhcHR1cmluZyB0aGUg YHRoaXMnIHZhbHVlIGJ5IGRlZmF1bHQsIGluc3RlYWQgb2YgYSBwcm90ZWN0b3IgUmVmUHRyLgor CisgICAgICAgICogU2hhcmVkL0Nvb3JkaW5hdGVkR3JhcGhpY3MvQ29vcmRpbmF0ZWRHcmFwaGlj c1NjZW5lLmNwcDoKKyAgICAgICAgKFdlYktpdDo6Q29vcmRpbmF0ZWRHcmFwaGljc1NjZW5lOjpk aXNwYXRjaE9uTWFpblRocmVhZCk6CisgICAgICAgIChXZWJLaXQ6OkNvb3JkaW5hdGVkR3JhcGhp Y3NTY2VuZTo6ZGlzcGF0Y2hPbkNsaWVudFJ1bkxvb3ApOgorICAgICAgICAoV2ViS2l0OjpDb29y ZGluYXRlZEdyYXBoaWNzU2NlbmU6OnBhaW50VG9DdXJyZW50R0xDb250ZXh0KToKKyAgICAgICAg KFdlYktpdDo6Q29vcmRpbmF0ZWRHcmFwaGljc1NjZW5lOjpvbk5ld0J1ZmZlckF2YWlsYWJsZSk6 CisgICAgICAgIChXZWJLaXQ6OkNvb3JkaW5hdGVkR3JhcGhpY3NTY2VuZTo6Y29tbWl0U2NlbmVT dGF0ZSk6CisgICAgICAgIChXZWJLaXQ6OkNvb3JkaW5hdGVkR3JhcGhpY3NTY2VuZTo6cHVyZ2VH TFJlc291cmNlcyk6CisgICAgICAgIChXZWJLaXQ6OkNvb3JkaW5hdGVkR3JhcGhpY3NTY2VuZTo6 Y29tbWl0U2Nyb2xsT2Zmc2V0KToKKyAgICAgICAgKFdlYktpdDo6Q29vcmRpbmF0ZWRHcmFwaGlj c1NjZW5lOjphcHBlbmRVcGRhdGUpOgorICAgICAgICAoV2ViS2l0OjpDb29yZGluYXRlZEdyYXBo aWNzU2NlbmU6OnNldEFjdGl2ZSk6CisgICAgICAgICogU2hhcmVkL0Nvb3JkaW5hdGVkR3JhcGhp Y3MvQ29vcmRpbmF0ZWRHcmFwaGljc1NjZW5lLmg6CisgICAgICAgICogU2hhcmVkL0Nvb3JkaW5h dGVkR3JhcGhpY3MvdGhyZWFkZWRjb21wb3NpdG9yL1RocmVhZGVkQ29tcG9zaXRvci5jcHA6Cisg ICAgICAgIChXZWJLaXQ6OkNvbXBvc2l0aW5nUnVuTG9vcDo6Q29tcG9zaXRpbmdSdW5Mb29wKToK KyAgICAgICAgKFdlYktpdDo6Q29tcG9zaXRpbmdSdW5Mb29wOjpjYWxsT25Db21wb3NpdGluZ1J1 bkxvb3ApOgorICAgICAgICAoV2ViS2l0OjpUaHJlYWRlZENvbXBvc2l0b3I6OnNldE5lZWRzRGlz cGxheSk6CisgICAgICAgIChXZWJLaXQ6OlRocmVhZGVkQ29tcG9zaXRvcjo6c2V0TmF0aXZlU3Vy ZmFjZUhhbmRsZUZvckNvbXBvc2l0aW5nKToKKyAgICAgICAgKFdlYktpdDo6VGhyZWFkZWRDb21w b3NpdG9yOjpzZXREZXZpY2VTY2FsZUZhY3Rvcik6CisgICAgICAgIChXZWJLaXQ6OlRocmVhZGVk Q29tcG9zaXRvcjo6ZGlkQ2hhbmdlVmlld3BvcnRTaXplKToKKyAgICAgICAgKFdlYktpdDo6VGhy ZWFkZWRDb21wb3NpdG9yOjpkaWRDaGFuZ2VWaWV3cG9ydEF0dHJpYnV0ZSk6CisgICAgICAgIChX ZWJLaXQ6OlRocmVhZGVkQ29tcG9zaXRvcjo6ZGlkQ2hhbmdlQ29udGVudHNTaXplKToKKyAgICAg ICAgKFdlYktpdDo6VGhyZWFkZWRDb21wb3NpdG9yOjpzY3JvbGxUbyk6CisgICAgICAgIChXZWJL aXQ6OlRocmVhZGVkQ29tcG9zaXRvcjo6c2Nyb2xsQnkpOgorICAgICAgICAoV2ViS2l0OjpUaHJl YWRlZENvbXBvc2l0b3I6OmRpZENoYW5nZVZpc2libGVSZWN0KToKKyAgICAgICAgKFdlYktpdDo6 VGhyZWFkZWRDb21wb3NpdG9yOjpjYWxsT25Db21wb3NpdGluZ1RocmVhZCk6CisgICAgICAgICog U2hhcmVkL0Nvb3JkaW5hdGVkR3JhcGhpY3MvdGhyZWFkZWRjb21wb3NpdG9yL1RocmVhZGVkQ29t cG9zaXRvci5oOgorCisyMDE2LTAzLTIyICBaYW4gRG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlh LmNvbT4KKwogICAgICAgICBbQ29vcmRpbmF0ZWRHcmFwaGljc10gUHJlZmVyIFJ1bkxvb3A6Om1h aW4oKS5kaXNwYXRjaCgpIG92ZXIgY2FsbE9uTWFpblRocmVhZCgpCiAgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTU3MjUKIApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvU2hhcmVkL0Nvb3JkaW5hdGVkR3JhcGhpY3MvQ29vcmRpbmF0ZWRHcmFwaGlj c1NjZW5lLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9Db29yZGluYXRlZEdyYXBoaWNzL0Nv b3JkaW5hdGVkR3JhcGhpY3NTY2VuZS5jcHAKaW5kZXggYTQ0ZTllNDUwZjUyYjZjZTg4OWRkNDQw NGIzMTlhNDRkZjdiZTJmZS4uZGY1MDJhNTQxNDEwZmFhN2NkM2Y1ZTQwN2VhNzNhNjg3NzM2NzQ1 NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvU2hhcmVkL0Nvb3JkaW5hdGVkR3JhcGhpY3Mv Q29vcmRpbmF0ZWRHcmFwaGljc1NjZW5lLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQv Q29vcmRpbmF0ZWRHcmFwaGljcy9Db29yZGluYXRlZEdyYXBoaWNzU2NlbmUuY3BwCkBAIC0zNCw3 ICszNCw3IEBAIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogCiBuYW1lc3BhY2UgV2ViS2l0IHsK IAotdm9pZCBDb29yZGluYXRlZEdyYXBoaWNzU2NlbmU6OmRpc3BhdGNoT25NYWluVGhyZWFkKHN0 ZDo6ZnVuY3Rpb248dm9pZCgpPiBmdW5jdGlvbikKK3ZvaWQgQ29vcmRpbmF0ZWRHcmFwaGljc1Nj ZW5lOjpkaXNwYXRjaE9uTWFpblRocmVhZChzdGQ6OmZ1bmN0aW9uPHZvaWQoKT4mJiBmdW5jdGlv bikKIHsKICAgICBpZiAoaXNNYWluVGhyZWFkKCkpCiAgICAgICAgIGZ1bmN0aW9uKCk7CkBAIC00 Miw3ICs0Miw3IEBAIHZvaWQgQ29vcmRpbmF0ZWRHcmFwaGljc1NjZW5lOjpkaXNwYXRjaE9uTWFp blRocmVhZChzdGQ6OmZ1bmN0aW9uPHZvaWQoKT4gZnVuY3RpCiAgICAgICAgIFJ1bkxvb3A6Om1h aW4oKS5kaXNwYXRjaChXVEZNb3ZlKGZ1bmN0aW9uKSk7CiB9CiAKLXZvaWQgQ29vcmRpbmF0ZWRH cmFwaGljc1NjZW5lOjpkaXNwYXRjaE9uQ2xpZW50UnVuTG9vcChzdGQ6OmZ1bmN0aW9uPHZvaWQo KT4gZnVuY3Rpb24pCit2b2lkIENvb3JkaW5hdGVkR3JhcGhpY3NTY2VuZTo6ZGlzcGF0Y2hPbkNs aWVudFJ1bkxvb3Aoc3RkOjpmdW5jdGlvbjx2b2lkKCk+JiYgZnVuY3Rpb24pCiB7CiAgICAgaWYg KCZtX2NsaWVudFJ1bkxvb3AgPT0gJlJ1bkxvb3A6OmN1cnJlbnQoKSkKICAgICAgICAgZnVuY3Rp b24oKTsKQEAgLTExNSw3ICsxMTUsNyBAQCB2b2lkIENvb3JkaW5hdGVkR3JhcGhpY3NTY2VuZTo6 cGFpbnRUb0N1cnJlbnRHTENvbnRleHQoY29uc3QgVHJhbnNmb3JtYXRpb25NYXRyaQogCiAgICAg aWYgKGN1cnJlbnRSb290TGF5ZXItPmRlc2NlbmRhbnRzT3JTZWxmSGF2ZVJ1bm5pbmdBbmltYXRp b25zKCkpIHsKICAgICAgICAgUmVmUHRyPENvb3JkaW5hdGVkR3JhcGhpY3NTY2VuZT4gcHJvdGVj dG9yKHRoaXMpOwotICAgICAgICBkaXNwYXRjaE9uQ2xpZW50UnVuTG9vcChbPV0geworICAgICAg ICBkaXNwYXRjaE9uQ2xpZW50UnVuTG9vcChbcHJvdGVjdG9yXSB7CiAgICAgICAgICAgICBwcm90 ZWN0b3ItPnVwZGF0ZVZpZXdwb3J0KCk7CiAgICAgICAgIH0pOwogICAgIH0KQEAgLTIwMyw3ICsy MDMsNyBAQCB2b2lkIENvb3JkaW5hdGVkR3JhcGhpY3NTY2VuZTo6c3luY1BsYXRmb3JtTGF5ZXJJ Zk5lZWRlZChUZXh0dXJlTWFwcGVyTGF5ZXIqIGxheQogdm9pZCBDb29yZGluYXRlZEdyYXBoaWNz U2NlbmU6Om9uTmV3QnVmZmVyQXZhaWxhYmxlKCkKIHsKICAgICBSZWZQdHI8Q29vcmRpbmF0ZWRH cmFwaGljc1NjZW5lPiBwcm90ZWN0b3IodGhpcyk7Ci0gICAgZGlzcGF0Y2hPbkNsaWVudFJ1bkxv b3AoWz1dIHsKKyAgICBkaXNwYXRjaE9uQ2xpZW50UnVuTG9vcChbcHJvdGVjdG9yXSB7CiAgICAg ICAgIHByb3RlY3Rvci0+dXBkYXRlVmlld3BvcnQoKTsKICAgICB9KTsKIH0KQEAgLTYwOSw3ICs2 MDksNyBAQCB2b2lkIENvb3JkaW5hdGVkR3JhcGhpY3NTY2VuZTo6Y29tbWl0U2NlbmVTdGF0ZShj b25zdCBDb29yZGluYXRlZEdyYXBoaWNzU3RhdGUmCiAKICAgICAvLyBUaGUgcGVuZGluZyB0aWxl cyBzdGF0ZSBpcyBvbiBpdHMgd2F5IGZvciB0aGUgc2NyZWVuLCB0ZWxsIHRoZSB3ZWIgcHJvY2Vz cyB0byByZW5kZXIgdGhlIG5leHQgb25lLgogICAgIFJlZlB0cjxDb29yZGluYXRlZEdyYXBoaWNz U2NlbmU+IHByb3RlY3Rvcih0aGlzKTsKLSAgICBkaXNwYXRjaE9uTWFpblRocmVhZChbPV0gewor ICAgIGRpc3BhdGNoT25NYWluVGhyZWFkKFtwcm90ZWN0b3JdIHsKICAgICAgICAgcHJvdGVjdG9y LT5yZW5kZXJOZXh0RnJhbWUoKTsKICAgICB9KTsKIH0KQEAgLTY3Nyw3ICs2NzcsNyBAQCB2b2lk IENvb3JkaW5hdGVkR3JhcGhpY3NTY2VuZTo6cHVyZ2VHTFJlc291cmNlcygpCiAgICAgc2V0QWN0 aXZlKGZhbHNlKTsKIAogICAgIFJlZlB0cjxDb29yZGluYXRlZEdyYXBoaWNzU2NlbmU+IHByb3Rl Y3Rvcih0aGlzKTsKLSAgICBkaXNwYXRjaE9uTWFpblRocmVhZChbPV0geworICAgIGRpc3BhdGNo T25NYWluVGhyZWFkKFtwcm90ZWN0b3JdIHsKICAgICAgICAgcHJvdGVjdG9yLT5wdXJnZUJhY2tp bmdTdG9yZXMoKTsKICAgICB9KTsKIH0KQEAgLTY5MCw3ICs2OTAsNyBAQCB2b2lkIENvb3JkaW5h dGVkR3JhcGhpY3NTY2VuZTo6ZGlzcGF0Y2hDb21taXRTY3JvbGxPZmZzZXQodWludDMyX3QgbGF5 ZXJJRCwgY29ucwogdm9pZCBDb29yZGluYXRlZEdyYXBoaWNzU2NlbmU6OmNvbW1pdFNjcm9sbE9m ZnNldCh1aW50MzJfdCBsYXllcklELCBjb25zdCBJbnRTaXplJiBvZmZzZXQpCiB7CiAgICAgUmVm UHRyPENvb3JkaW5hdGVkR3JhcGhpY3NTY2VuZT4gcHJvdGVjdG9yKHRoaXMpOwotICAgIGRpc3Bh dGNoT25NYWluVGhyZWFkKFs9XSB7CisgICAgZGlzcGF0Y2hPbk1haW5UaHJlYWQoW3Byb3RlY3Rv ciwgbGF5ZXJJRCwgb2Zmc2V0XSB7CiAgICAgICAgIHByb3RlY3Rvci0+ZGlzcGF0Y2hDb21taXRT Y3JvbGxPZmZzZXQobGF5ZXJJRCwgb2Zmc2V0KTsKICAgICB9KTsKIH0KQEAgLTcxNiw3ICs3MTYs NyBAQCB2b2lkIENvb3JkaW5hdGVkR3JhcGhpY3NTY2VuZTo6ZGV0YWNoKCkKICAgICBtX2NsaWVu dCA9IDA7CiB9CiAKLXZvaWQgQ29vcmRpbmF0ZWRHcmFwaGljc1NjZW5lOjphcHBlbmRVcGRhdGUo c3RkOjpmdW5jdGlvbjx2b2lkKCk+IGZ1bmN0aW9uKQordm9pZCBDb29yZGluYXRlZEdyYXBoaWNz U2NlbmU6OmFwcGVuZFVwZGF0ZShzdGQ6OmZ1bmN0aW9uPHZvaWQoKT4mJiBmdW5jdGlvbikKIHsK ICAgICBpZiAoIW1faXNBY3RpdmUpCiAgICAgICAgIHJldHVybjsKQEAgLTczOCw3ICs3MzgsNyBA QCB2b2lkIENvb3JkaW5hdGVkR3JhcGhpY3NTY2VuZTo6c2V0QWN0aXZlKGJvb2wgYWN0aXZlKQog ICAgIG1faXNBY3RpdmUgPSBhY3RpdmU7CiAgICAgaWYgKG1faXNBY3RpdmUpIHsKICAgICAgICAg UmVmUHRyPENvb3JkaW5hdGVkR3JhcGhpY3NTY2VuZT4gcHJvdGVjdG9yKHRoaXMpOwotICAgICAg ICBkaXNwYXRjaE9uTWFpblRocmVhZChbPV0geworICAgICAgICBkaXNwYXRjaE9uTWFpblRocmVh ZChbcHJvdGVjdG9yXSB7CiAgICAgICAgICAgICBwcm90ZWN0b3ItPnJlbmRlck5leHRGcmFtZSgp OwogICAgICAgICB9KTsKICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQv Q29vcmRpbmF0ZWRHcmFwaGljcy9Db29yZGluYXRlZEdyYXBoaWNzU2NlbmUuaCBiL1NvdXJjZS9X ZWJLaXQyL1NoYXJlZC9Db29yZGluYXRlZEdyYXBoaWNzL0Nvb3JkaW5hdGVkR3JhcGhpY3NTY2Vu ZS5oCmluZGV4IGRhN2U5Mzk4ZGFlOGFlNGUyZTNiZjgxY2RhMjcyMjdkMjk3NWY2YzguLjhiNWJl NWU1NDg2ODBkMTdlNzI2ZTZlM2U5OGMxODQ4ZDM3M2YxYjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQyL1NoYXJlZC9Db29yZGluYXRlZEdyYXBoaWNzL0Nvb3JkaW5hdGVkR3JhcGhpY3NTY2Vu ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9Db29yZGluYXRlZEdyYXBoaWNzL0Nvb3Jk aW5hdGVkR3JhcGhpY3NTY2VuZS5oCkBAIC03Myw3ICs3Myw3IEBAIHB1YmxpYzoKICAgICB2b2lk IHBhaW50VG9DdXJyZW50R0xDb250ZXh0KGNvbnN0IFdlYkNvcmU6OlRyYW5zZm9ybWF0aW9uTWF0 cml4JiwgZmxvYXQsIGNvbnN0IFdlYkNvcmU6OkZsb2F0UmVjdCYsIGNvbnN0IFdlYkNvcmU6OkNv bG9yJiBiYWNrZ3JvdW5kQ29sb3IsIGJvb2wgZHJhd3NCYWNrZ3JvdW5kLCBjb25zdCBXZWJDb3Jl OjpGbG9hdFBvaW50JiwgV2ViQ29yZTo6VGV4dHVyZU1hcHBlcjo6UGFpbnRGbGFncyA9IDApOwog ICAgIHZvaWQgcGFpbnRUb0dyYXBoaWNzQ29udGV4dChQbGF0Zm9ybUdyYXBoaWNzQ29udGV4dCos IGNvbnN0IFdlYkNvcmU6OkNvbG9yJiBiYWNrZ3JvdW5kQ29sb3IsIGJvb2wgZHJhd3NCYWNrZ3Jv dW5kKTsKICAgICB2b2lkIGRldGFjaCgpOwotICAgIHZvaWQgYXBwZW5kVXBkYXRlKHN0ZDo6ZnVu Y3Rpb248dm9pZCgpPik7CisgICAgdm9pZCBhcHBlbmRVcGRhdGUoc3RkOjpmdW5jdGlvbjx2b2lk KCk+JiYpOwogCiAgICAgV2ViQ29yZTo6VGV4dHVyZU1hcHBlckxheWVyKiBmaW5kU2Nyb2xsYWJs ZUNvbnRlbnRzTGF5ZXJBdChjb25zdCBXZWJDb3JlOjpGbG9hdFBvaW50Jik7CiAKQEAgLTEzMSw4 ICsxMzEsOCBAQCBwcml2YXRlOgogICAgIHZvaWQgc3luY1JlbW90ZUNvbnRlbnQoKTsKICAgICB2 b2lkIGFkanVzdFBvc2l0aW9uRm9yRml4ZWRMYXllcnMoY29uc3QgV2ViQ29yZTo6RmxvYXRQb2lu dCYgY29udGVudFBvc2l0aW9uKTsKIAotICAgIHZvaWQgZGlzcGF0Y2hPbk1haW5UaHJlYWQoc3Rk OjpmdW5jdGlvbjx2b2lkKCk+KTsKLSAgICB2b2lkIGRpc3BhdGNoT25DbGllbnRSdW5Mb29wKHN0 ZDo6ZnVuY3Rpb248dm9pZCgpPik7CisgICAgdm9pZCBkaXNwYXRjaE9uTWFpblRocmVhZChzdGQ6 OmZ1bmN0aW9uPHZvaWQoKT4mJik7CisgICAgdm9pZCBkaXNwYXRjaE9uQ2xpZW50UnVuTG9vcChz dGQ6OmZ1bmN0aW9uPHZvaWQoKT4mJik7CiAgICAgdm9pZCB1cGRhdGVWaWV3cG9ydCgpOwogICAg IHZvaWQgcmVuZGVyTmV4dEZyYW1lKCk7CiAgICAgdm9pZCBwdXJnZUJhY2tpbmdTdG9yZXMoKTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9Db29yZGluYXRlZEdyYXBoaWNzL3Ro cmVhZGVkY29tcG9zaXRvci9UaHJlYWRlZENvbXBvc2l0b3IuY3BwIGIvU291cmNlL1dlYktpdDIv U2hhcmVkL0Nvb3JkaW5hdGVkR3JhcGhpY3MvdGhyZWFkZWRjb21wb3NpdG9yL1RocmVhZGVkQ29t cG9zaXRvci5jcHAKaW5kZXggNDkxODBkYzM3MWQ0NDg0NGJiMmNjNzJiZWFhYWVkMzNmOTc2MDE5 Ni4uYTQ2ODg4NjM2NTlmYjIzOTNmYzk4MjA5MDA5YWVjMDVlYzM2NjNiZiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdDIvU2hhcmVkL0Nvb3JkaW5hdGVkR3JhcGhpY3MvdGhyZWFkZWRjb21wb3Np dG9yL1RocmVhZGVkQ29tcG9zaXRvci5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL0Nv b3JkaW5hdGVkR3JhcGhpY3MvdGhyZWFkZWRjb21wb3NpdG9yL1RocmVhZGVkQ29tcG9zaXRvci5j cHAKQEAgLTUyLDcgKzUyLDcgQEAgcHVibGljOgogICAgICAgICBXYWl0VW50aWxOZXh0RnJhbWUs CiAgICAgfTsKIAotICAgIENvbXBvc2l0aW5nUnVuTG9vcChzdGQ6OmZ1bmN0aW9uPHZvaWQoKT4g dXBkYXRlRnVuY3Rpb24pCisgICAgQ29tcG9zaXRpbmdSdW5Mb29wKHN0ZDo6ZnVuY3Rpb248dm9p ZCgpPiYmIHVwZGF0ZUZ1bmN0aW9uKQogICAgICAgICA6IG1fcnVuTG9vcChSdW5Mb29wOjpjdXJy ZW50KCkpCiAgICAgICAgICwgbV91cGRhdGVUaW1lcihtX3J1bkxvb3AsIHRoaXMsICZDb21wb3Np dGluZ1J1bkxvb3A6OnVwZGF0ZVRpbWVyRmlyZWQpCiAgICAgICAgICwgbV91cGRhdGVGdW5jdGlv bihXVEZNb3ZlKHVwZGF0ZUZ1bmN0aW9uKSkKQEAgLTYwLDcgKzYwLDcgQEAgcHVibGljOgogICAg IHsKICAgICB9CiAKLSAgICB2b2lkIGNhbGxPbkNvbXBvc2l0aW5nUnVuTG9vcChzdGQ6OmZ1bmN0 aW9uPHZvaWQoKT4gZnVuY3Rpb24pCisgICAgdm9pZCBjYWxsT25Db21wb3NpdGluZ1J1bkxvb3Ao c3RkOjpmdW5jdGlvbjx2b2lkKCk+JiYgZnVuY3Rpb24pCiAgICAgewogICAgICAgICBpZiAoJm1f cnVuTG9vcCA9PSAmUnVuTG9vcDo6Y3VycmVudCgpKSB7CiAgICAgICAgICAgICBmdW5jdGlvbigp OwpAQCAtMTMwLDcgKzEzMCw3IEBAIFRocmVhZGVkQ29tcG9zaXRvcjo6flRocmVhZGVkQ29tcG9z aXRvcigpCiB2b2lkIFRocmVhZGVkQ29tcG9zaXRvcjo6c2V0TmVlZHNEaXNwbGF5KCkKIHsKICAg ICBSZWZQdHI8VGhyZWFkZWRDb21wb3NpdG9yPiBwcm90ZWN0b3IodGhpcyk7Ci0gICAgY2FsbE9u Q29tcG9zaXRpbmdUaHJlYWQoWz1dIHsKKyAgICBjYWxsT25Db21wb3NpdGluZ1RocmVhZChbcHJv dGVjdG9yXSB7CiAgICAgICAgIHByb3RlY3Rvci0+c2NoZWR1bGVEaXNwbGF5SW1tZWRpYXRlbHko KTsKICAgICB9KTsKIH0KQEAgLTEzOCw3ICsxMzgsNyBAQCB2b2lkIFRocmVhZGVkQ29tcG9zaXRv cjo6c2V0TmVlZHNEaXNwbGF5KCkKIHZvaWQgVGhyZWFkZWRDb21wb3NpdG9yOjpzZXROYXRpdmVT dXJmYWNlSGFuZGxlRm9yQ29tcG9zaXRpbmcodWludDY0X3QgaGFuZGxlKQogewogICAgIFJlZlB0 cjxUaHJlYWRlZENvbXBvc2l0b3I+IHByb3RlY3Rvcih0aGlzKTsKLSAgICBjYWxsT25Db21wb3Np dGluZ1RocmVhZChbPV0geworICAgIGNhbGxPbkNvbXBvc2l0aW5nVGhyZWFkKFtwcm90ZWN0b3Is IGhhbmRsZV0gewogICAgICAgICBwcm90ZWN0b3ItPm1fbmF0aXZlU3VyZmFjZUhhbmRsZSA9IGhh bmRsZTsKICAgICAgICAgcHJvdGVjdG9yLT5tX3NjZW5lLT5zZXRBY3RpdmUodHJ1ZSk7CiAgICAg fSk7CkBAIC0xNDcsMjQgKzE0NywyNCBAQCB2b2lkIFRocmVhZGVkQ29tcG9zaXRvcjo6c2V0TmF0 aXZlU3VyZmFjZUhhbmRsZUZvckNvbXBvc2l0aW5nKHVpbnQ2NF90IGhhbmRsZSkKIHZvaWQgVGhy ZWFkZWRDb21wb3NpdG9yOjpzZXREZXZpY2VTY2FsZUZhY3RvcihmbG9hdCBzY2FsZSkKIHsKICAg ICBSZWZQdHI8VGhyZWFkZWRDb21wb3NpdG9yPiBwcm90ZWN0b3IodGhpcyk7Ci0gICAgY2FsbE9u Q29tcG9zaXRpbmdUaHJlYWQoWz1dIHsKKyAgICBjYWxsT25Db21wb3NpdGluZ1RocmVhZChbcHJv dGVjdG9yLCBzY2FsZV0gewogICAgICAgICBwcm90ZWN0b3ItPm1fZGV2aWNlU2NhbGVGYWN0b3Ig PSBzY2FsZTsKICAgICAgICAgcHJvdGVjdG9yLT5zY2hlZHVsZURpc3BsYXlJbW1lZGlhdGVseSgp OwogICAgIH0pOwogfQogCi12b2lkIFRocmVhZGVkQ29tcG9zaXRvcjo6ZGlkQ2hhbmdlVmlld3Bv cnRTaXplKGNvbnN0IEludFNpemUmIG5ld1NpemUpCit2b2lkIFRocmVhZGVkQ29tcG9zaXRvcjo6 ZGlkQ2hhbmdlVmlld3BvcnRTaXplKGNvbnN0IEludFNpemUmIHNpemUpCiB7CiAgICAgUmVmUHRy PFRocmVhZGVkQ29tcG9zaXRvcj4gcHJvdGVjdG9yKHRoaXMpOwotICAgIGNhbGxPbkNvbXBvc2l0 aW5nVGhyZWFkKFs9XSB7Ci0gICAgICAgIHByb3RlY3Rvci0+dmlld3BvcnRDb250cm9sbGVyKCkt PmRpZENoYW5nZVZpZXdwb3J0U2l6ZShuZXdTaXplKTsKKyAgICBjYWxsT25Db21wb3NpdGluZ1Ro cmVhZChbcHJvdGVjdG9yLCBzaXplXSB7CisgICAgICAgIHByb3RlY3Rvci0+dmlld3BvcnRDb250 cm9sbGVyKCktPmRpZENoYW5nZVZpZXdwb3J0U2l6ZShzaXplKTsKICAgICB9KTsKIH0KIAogdm9p ZCBUaHJlYWRlZENvbXBvc2l0b3I6OmRpZENoYW5nZVZpZXdwb3J0QXR0cmlidXRlKGNvbnN0IFZp ZXdwb3J0QXR0cmlidXRlcyYgYXR0cikKIHsKICAgICBSZWZQdHI8VGhyZWFkZWRDb21wb3NpdG9y PiBwcm90ZWN0b3IodGhpcyk7Ci0gICAgY2FsbE9uQ29tcG9zaXRpbmdUaHJlYWQoWz1dIHsKKyAg ICBjYWxsT25Db21wb3NpdGluZ1RocmVhZChbcHJvdGVjdG9yLCBhdHRyXSB7CiAgICAgICAgIHBy b3RlY3Rvci0+dmlld3BvcnRDb250cm9sbGVyKCktPmRpZENoYW5nZVZpZXdwb3J0QXR0cmlidXRl KGF0dHIpOwogICAgIH0pOwogfQpAQCAtMTcyLDcgKzE3Miw3IEBAIHZvaWQgVGhyZWFkZWRDb21w b3NpdG9yOjpkaWRDaGFuZ2VWaWV3cG9ydEF0dHJpYnV0ZShjb25zdCBWaWV3cG9ydEF0dHJpYnV0 ZXMmIGF0CiB2b2lkIFRocmVhZGVkQ29tcG9zaXRvcjo6ZGlkQ2hhbmdlQ29udGVudHNTaXplKGNv bnN0IEludFNpemUmIHNpemUpCiB7CiAgICAgUmVmUHRyPFRocmVhZGVkQ29tcG9zaXRvcj4gcHJv dGVjdG9yKHRoaXMpOwotICAgIGNhbGxPbkNvbXBvc2l0aW5nVGhyZWFkKFs9XSB7CisgICAgY2Fs bE9uQ29tcG9zaXRpbmdUaHJlYWQoW3Byb3RlY3Rvciwgc2l6ZV0gewogICAgICAgICBwcm90ZWN0 b3ItPnZpZXdwb3J0Q29udHJvbGxlcigpLT5kaWRDaGFuZ2VDb250ZW50c1NpemUoc2l6ZSk7CiAg ICAgfSk7CiB9CkBAIC0xODAsNyArMTgwLDcgQEAgdm9pZCBUaHJlYWRlZENvbXBvc2l0b3I6OmRp ZENoYW5nZUNvbnRlbnRzU2l6ZShjb25zdCBJbnRTaXplJiBzaXplKQogdm9pZCBUaHJlYWRlZENv bXBvc2l0b3I6OnNjcm9sbFRvKGNvbnN0IEludFBvaW50JiBwb3NpdGlvbikKIHsKICAgICBSZWZQ dHI8VGhyZWFkZWRDb21wb3NpdG9yPiBwcm90ZWN0b3IodGhpcyk7Ci0gICAgY2FsbE9uQ29tcG9z aXRpbmdUaHJlYWQoWz1dIHsKKyAgICBjYWxsT25Db21wb3NpdGluZ1RocmVhZChbcHJvdGVjdG9y LCBwb3NpdGlvbl0gewogICAgICAgICBwcm90ZWN0b3ItPnZpZXdwb3J0Q29udHJvbGxlcigpLT5z Y3JvbGxUbyhwb3NpdGlvbik7CiAgICAgfSk7CiB9CkBAIC0xODgsNyArMTg4LDcgQEAgdm9pZCBU aHJlYWRlZENvbXBvc2l0b3I6OnNjcm9sbFRvKGNvbnN0IEludFBvaW50JiBwb3NpdGlvbikKIHZv aWQgVGhyZWFkZWRDb21wb3NpdG9yOjpzY3JvbGxCeShjb25zdCBJbnRTaXplJiBkZWx0YSkKIHsK ICAgICBSZWZQdHI8VGhyZWFkZWRDb21wb3NpdG9yPiBwcm90ZWN0b3IodGhpcyk7Ci0gICAgY2Fs bE9uQ29tcG9zaXRpbmdUaHJlYWQoWz1dIHsKKyAgICBjYWxsT25Db21wb3NpdGluZ1RocmVhZChb cHJvdGVjdG9yLCBkZWx0YV0gewogICAgICAgICBwcm90ZWN0b3ItPnZpZXdwb3J0Q29udHJvbGxl cigpLT5zY3JvbGxCeShkZWx0YSk7CiAgICAgfSk7CiB9CkBAIC0yNTAsMTAgKzI1MCwxMSBAQCB2 b2lkIFRocmVhZGVkQ29tcG9zaXRvcjo6c2NoZWR1bGVEaXNwbGF5SW1tZWRpYXRlbHkoKQogCiB2 b2lkIFRocmVhZGVkQ29tcG9zaXRvcjo6ZGlkQ2hhbmdlVmlzaWJsZVJlY3QoKQogeworICAgIFJl ZlB0cjxUaHJlYWRlZENvbXBvc2l0b3I+IHByb3RlY3Rvcih0aGlzKTsKICAgICBGbG9hdFJlY3Qg dmlzaWJsZVJlY3QgPSB2aWV3cG9ydENvbnRyb2xsZXIoKS0+dmlzaWJsZUNvbnRlbnRzUmVjdCgp OwogICAgIGZsb2F0IHNjYWxlID0gdmlld3BvcnRDb250cm9sbGVyKCktPnBhZ2VTY2FsZUZhY3Rv cigpOwotICAgIFJ1bkxvb3A6Om1haW4oKS5kaXNwYXRjaChbPV0gewotICAgICAgICBtX2NsaWVu dC0+c2V0VmlzaWJsZUNvbnRlbnRzUmVjdCh2aXNpYmxlUmVjdCwgRmxvYXRQb2ludDo6emVybygp LCBzY2FsZSk7CisgICAgUnVuTG9vcDo6bWFpbigpLmRpc3BhdGNoKFtwcm90ZWN0b3IsIHZpc2li bGVSZWN0LCBzY2FsZV0geworICAgICAgICBwcm90ZWN0b3ItPm1fY2xpZW50LT5zZXRWaXNpYmxl Q29udGVudHNSZWN0KHZpc2libGVSZWN0LCBGbG9hdFBvaW50Ojp6ZXJvKCksIHNjYWxlKTsKICAg ICB9KTsKIAogICAgIHNjaGVkdWxlRGlzcGxheUltbWVkaWF0ZWx5KCk7CkBAIC0yODksNyArMjkw LDcgQEAgdm9pZCBUaHJlYWRlZENvbXBvc2l0b3I6OnVwZGF0ZVNjZW5lU3RhdGUoY29uc3QgQ29v cmRpbmF0ZWRHcmFwaGljc1N0YXRlJiBzdGF0ZSkKICAgICBzZXROZWVkc0Rpc3BsYXkoKTsKIH0K IAotdm9pZCBUaHJlYWRlZENvbXBvc2l0b3I6OmNhbGxPbkNvbXBvc2l0aW5nVGhyZWFkKHN0ZDo6 ZnVuY3Rpb248dm9pZCgpPiBmdW5jdGlvbikKK3ZvaWQgVGhyZWFkZWRDb21wb3NpdG9yOjpjYWxs T25Db21wb3NpdGluZ1RocmVhZChzdGQ6OmZ1bmN0aW9uPHZvaWQoKT4mJiBmdW5jdGlvbikKIHsK ICAgICBtX2NvbXBvc2l0aW5nUnVuTG9vcC0+Y2FsbE9uQ29tcG9zaXRpbmdSdW5Mb29wKFdURk1v dmUoZnVuY3Rpb24pKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9Db29y ZGluYXRlZEdyYXBoaWNzL3RocmVhZGVkY29tcG9zaXRvci9UaHJlYWRlZENvbXBvc2l0b3IuaCBi L1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9Db29yZGluYXRlZEdyYXBoaWNzL3RocmVhZGVkY29tcG9z aXRvci9UaHJlYWRlZENvbXBvc2l0b3IuaAppbmRleCAxMTExYmZmZWEzMWFiZDE0OGFlNTljNTE0 MmM5N2I4NGRhM2U4NzE4Li5hOTk5NTFiZDRhY2ViMjJmYjEzNDRkODk0ZjMzNTJlMjBhZmM5NjIw IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvQ29vcmRpbmF0ZWRHcmFwaGljcy90 aHJlYWRlZGNvbXBvc2l0b3IvVGhyZWFkZWRDb21wb3NpdG9yLmgKKysrIGIvU291cmNlL1dlYktp dDIvU2hhcmVkL0Nvb3JkaW5hdGVkR3JhcGhpY3MvdGhyZWFkZWRjb21wb3NpdG9yL1RocmVhZGVk Q29tcG9zaXRvci5oCkBAIC05NCw3ICs5NCw3IEBAIHByaXZhdGU6CiAgICAgV2ViQ29yZTo6R0xD b250ZXh0KiBnbENvbnRleHQoKTsKICAgICBTaW1wbGVWaWV3cG9ydENvbnRyb2xsZXIqIHZpZXdw b3J0Q29udHJvbGxlcigpIHsgcmV0dXJuIG1fdmlld3BvcnRDb250cm9sbGVyLmdldCgpOyB9CiAK LSAgICB2b2lkIGNhbGxPbkNvbXBvc2l0aW5nVGhyZWFkKHN0ZDo6ZnVuY3Rpb248dm9pZCgpPik7 CisgICAgdm9pZCBjYWxsT25Db21wb3NpdGluZ1RocmVhZChzdGQ6OmZ1bmN0aW9uPHZvaWQoKT4m Jik7CiAgICAgdm9pZCBjcmVhdGVDb21wb3NpdGluZ1RocmVhZCgpOwogICAgIHZvaWQgcnVuQ29t cG9zaXRpbmdUaHJlYWQoKTsKICAgICB2b2lkIHRlcm1pbmF0ZUNvbXBvc2l0aW5nVGhyZWFkKCk7 Cg==