78523 2012-02-13 13:37:20 -0800 The scrolling tree needs to know about the back forward state of the page 2012-02-13 13:46:09 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca sam oldest_to_newest 555524 0 andersca 2012-02-13 13:37:20 -0800 The scrolling tree needs to know about the back forward state of the page 555529 1 126820 andersca 2012-02-13 13:40:18 -0800 Created attachment 126820 Patch 555536 2 sam 2012-02-13 13:43:31 -0800 Gross-ish. 555540 3 andersca 2012-02-13 13:46:09 -0800 Committed r107601: <http://trac.webkit.org/changeset/107601> 126820 2012-02-13 13:40:18 -0800 2012-02-13 13:43:16 -0800 Patch bug-78523-20120213134059.patch text/plain 19401 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTA3NTg3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2NhOGZkMzI3MjYwYmJi OTgxNDRlOTY2MTkzNTQ0NzliYTNiZDk4Mi4uMDQ5NmMwNzM0MDlmZDliYmM4OTQwMmJkOGRkZDc2 ZTNmMmQ0ZWQ1MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDEyLTAyLTEzICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgVGhlIHNjcm9sbGlu ZyB0cmVlIG5lZWRzIHRvIGtub3cgYWJvdXQgdGhlIGJhY2sgZm9yd2FyZCBzdGF0ZSBvZiB0aGUg cGFnZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Nzg1 MjMKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzEwNzU2NTQ4PgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEluIG9yZGVyIHRvIGtub3cgaWYgYSBwYWdl IHNob3VsZCBydWJiZXItYmFuZCBpbiB0aGUgaG9yaXpvbnRhbCBkaXJlY3Rpb24sIHRoZSBzY3Jv bGxpbmcgdHJlZQorICAgICAgICBuZWVkcyB0byBrbm93IGFib3V0IHRoZSBiYWNrL2ZvcndhcmQg c3RhdGUgb2YgdGhlIHBhZ2UuCisKKyAgICAgICAgKiBXZWJDb3JlLmV4cC5pbjoKKyAgICAgICAg RXhwb3J0IG5ldyBzeW1ib2xzLgorCisgICAgICAgICogV2ViQ29yZS54Y29kZXByb2ovcHJvamVj dC5wYnhwcm9qOgorICAgICAgICAqIHBhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWUuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsaW5nVHJlZTo6U2Nyb2xsaW5nVHJlZSk6CisgICAgICAg IEluaXRpYWxpemUgbV9jYW5Hb0JhY2sgYW5kIG1fY2FuR29Gb3J3YXJkLgorCisgICAgICAgIChX ZWJDb3JlOjpTY3JvbGxpbmdUcmVlOjp1cGRhdGVCYWNrRm9yd2FyZFN0YXRlKToKKyAgICAgICAg VXBkYXRlIG1fY2FuR29CYWNrIGFuZCBtX2NhbkdvRm9yd2FyZC4KKworICAgICAgICAqIHBhZ2Uv c2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWUuaDoKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGluZ1Ry ZWU6OmNhbkdvQmFjayk6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxpbmdUcmVlOjpjYW5Hb0Zv cndhcmQpOgorICAgICAgICBBZGQgZ2V0dGVycy4KKworICAgICAgICAqIHBhZ2Uvc2Nyb2xsaW5n L21hYy9TY3JvbGxpbmdUcmVlTm9kZU1hYy5tbToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGlu Z1RyZWVOb2RlTWFjOjpzaG91bGRSdWJiZXJCYW5kSW5EaXJlY3Rpb24pOgorICAgICAgICBJbXBs ZW1lbnQgdGhpcywgdXNpbmcgY2FuR29CYWNrIGFuZCBjYW5Hb0ZvcndhcmQuCisKIDIwMTItMDIt MTMgIFBhdHJpY2sgR2Fuc3RlcmVyICA8cGFyb2dhQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUG9y dCBSdW5Mb29wIHRvIFdpbkNFCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cg Yi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNzJkNDZiZWRjZTMwM2EyMmJjMzM1YTE2 MjZhODYzYjI3NGY0NDIwMC4uNmExM2JkY2I4YjI1NWU2NzIzYTYzYTQyNzU1NTNiNmU5ZGYxOTZh MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJL aXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDEyLTAyLTEzICBBbmRlcnMgQ2FybHNz b24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgVGhlIHNjcm9sbGluZyB0cmVlIG5l ZWRzIHRvIGtub3cgYWJvdXQgdGhlIGJhY2sgZm9yd2FyZCBzdGF0ZSBvZiB0aGUgcGFnZQorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Nzg1MjMKKyAgICAg ICAgPHJkYXI6Ly9wcm9ibGVtLzEwNzU2NTQ4PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFBhc3MgdGhlIGJhY2svZm9yd2FyZCBzdGF0ZSBpbiB0aGUg V2hlZWxFdmVudCBtZXNzYWdlLiBUaGlzIGlzIHByZXR0eSBoYWNreSBidXQgd29ya3Mgd2VsbC4K KworICAgICAgICAqIFBsYXRmb3JtL0NvcmVJUEMvSGFuZGxlTWVzc2FnZS5oOgorICAgICAgICAo Q29yZUlQQyk6CisgICAgICAgIChDb3JlSVBDOjpjYWxsTWVtYmVyRnVuY3Rpb24pOgorICAgICAg ICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdl UHJveHk6OmhhbmRsZVdoZWVsRXZlbnQpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6 OmRpZFJlY2VpdmVFdmVudCk6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL0V2ZW50RGlz cGF0Y2hlci5jcHA6CisgICAgICAgIChXZWJLaXQ6OkV2ZW50RGlzcGF0Y2hlcjo6d2hlZWxFdmVu dCk6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL0V2ZW50RGlzcGF0Y2hlci5oOgorICAg ICAgICAoRXZlbnREaXNwYXRjaGVyKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvRXZl bnREaXNwYXRjaGVyLm1lc3NhZ2VzLmluOgorCiAyMDEyLTAyLTEzICBTYW0gV2VpbmlnICA8c2Ft QHdlYmtpdC5vcmc+CiAKICAgICAgICAgV2luZG93cyBidWlsZCBmaXguCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbiBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhw LmluCmluZGV4IDM0OThkZmRlY2E0OGJmMDJmNmVhZGY0Nzc0NzM3NWY2MmQxZDY2MDIuLjdlY2Vm NmIzZTk1NDA5MmYyMDQ0ZjIwNzVhOGQ2OTZjYzBhY2RkZDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL1dlYkNvcmUuZXhwLmluCisrKyBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmlu CkBAIC0yMDcwLDcgKzIwNzAsOSBAQCBfX1pON1dlYkNvcmUxMk5vdGlmaWNhdGlvbjE4ZGlzcGF0 Y2hDbG9zZUV2ZW50RXYKIAogI2lmIEVOQUJMRShUSFJFQURFRF9TQ1JPTExJTkcpCiBfX1pON1dl YkNvcmUxM1Njcm9sbGluZ1RyZWUyMXRyeVRvSGFuZGxlV2hlZWxFdmVudEVSS05TXzE4UGxhdGZv cm1XaGVlbEV2ZW50RQorX19aTjdXZWJDb3JlMTNTY3JvbGxpbmdUcmVlMjJ1cGRhdGVCYWNrRm9y d2FyZFN0YXRlRWJiCiBfX1pON1dlYkNvcmUxM1Njcm9sbGluZ1RyZWVEMUV2CitfX1pON1dlYkNv cmUxNVNjcm9sbGluZ1RocmVhZDhkaXNwYXRjaEVSS04zV1RGOEZ1bmN0aW9uSUZ2dkVFRQogX19a TjdXZWJDb3JlNFBhZ2UyMHNjcm9sbGluZ0Nvb3JkaW5hdG9yRXYKIF9fWk5LN1dlYkNvcmUyMFNj cm9sbGluZ0Nvb3JkaW5hdG9yMTNzY3JvbGxpbmdUcmVlRXYKICNlbmRpZgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qIGIvU291cmNl L1dlYkNvcmUvV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCmluZGV4IDg0MzM1NGVi NzM4YzQ4YmNmY2U5MDM5MDZiNzk0OTRlNWE4MDI5OTYuLmZkYWM4OGNlYTgyOTM2NDQxNmIwNGRm ODBiYjBmZWE4OWExOTdjYTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUueGNv ZGVwcm9qL3Byb2plY3QucGJ4cHJvagorKysgYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnhjb2Rl cHJvai9wcm9qZWN0LnBieHByb2oKQEAgLTU5OSw3ICs1OTksNyBAQAogCQkxQUY2MkVFODE0REEy MkE3MDA0MTU1NkMgLyogU2Nyb2xsaW5nQ29vcmRpbmF0b3IuaCBpbiBIZWFkZXJzICovID0ge2lz YSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFBRjYyRUU1MTREQTIyQTcwMDQxNTU2QyAvKiBT Y3JvbGxpbmdDb29yZGluYXRvci5oICovOyBzZXR0aW5ncyA9IHtBVFRSSUJVVEVTID0gKFByaXZh dGUsICk7IH07IH07CiAJCTFBRjYyRjI0MTREQUZFOTEwMDQxNTU2QyAvKiBTY3JvbGxpbmdUaHJl YWRNYWMubW0gaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAx QUY2MkYyMzE0REFGRTkxMDA0MTU1NkMgLyogU2Nyb2xsaW5nVGhyZWFkTWFjLm1tICovOyB9Owog CQkxQUY2MkYyNTE0REFGRTlFMDA0MTU1NkMgLyogU2Nyb2xsaW5nVGhyZWFkLmNwcCBpbiBTb3Vy Y2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFBRjYyRjIwMTREQUZFNzkw MDQxNTU2QyAvKiBTY3JvbGxpbmdUaHJlYWQuY3BwICovOyB9OwotCQkxQUY2MkYyNjE0REFGRUEx MDA0MTU1NkMgLyogU2Nyb2xsaW5nVGhyZWFkLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhC dWlsZEZpbGU7IGZpbGVSZWYgPSAxQUY2MkYyMTE0REFGRTc5MDA0MTU1NkMgLyogU2Nyb2xsaW5n VGhyZWFkLmggKi87IH07CisJCTFBRjYyRjI2MTREQUZFQTEwMDQxNTU2QyAvKiBTY3JvbGxpbmdU aHJlYWQuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFB RjYyRjIxMTREQUZFNzkwMDQxNTU2QyAvKiBTY3JvbGxpbmdUaHJlYWQuaCAqLzsgc2V0dGluZ3Mg PSB7QVRUUklCVVRFUyA9IChQcml2YXRlLCApOyB9OyB9OwogCQkxQUY4RTExQTEyNTY1OTI2MDAy MzBGRjcgLyogUHJveHlTZXJ2ZXIuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmls ZTsgZmlsZVJlZiA9IDFBRjhFMTE5MTI1NjU5MjYwMDIzMEZGNyAvKiBQcm94eVNlcnZlci5oICov OyBzZXR0aW5ncyA9IHtBVFRSSUJVVEVTID0gKFByaXZhdGUsICk7IH07IH07CiAJCTFBRjhFMTMz MTI1NjVBNDQwMDIzMEZGNyAvKiBQcm94eVNlcnZlci5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2Eg PSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxQUY4RTEzMjEyNTY1QTQ0MDAyMzBGRjcgLyogUHJv eHlTZXJ2ZXIuY3BwICovOyB9OwogCQkxQUY4RTFDMzEyNTY3M0UwMDAyMzBGRjcgLyogUHJveHlT ZXJ2ZXJDRk5ldC5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVS ZWYgPSAxQUY4RTFDMTEyNTY3M0UwMDAyMzBGRjcgLyogUHJveHlTZXJ2ZXJDRk5ldC5jcHAgKi87 IH07CkBAIC0xNjA1LDEyICsxNjA1LDEyIEBACiAJCTU3MkU5MkZCMTRFNTQwNTgwMDg3RkZCQSAv KiBTaGFkb3dSb290TGlzdC5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7 IGZpbGVSZWYgPSA1NzJFOTJGOTE0RTU0MDU4MDA4N0ZGQkEgLyogU2hhZG93Um9vdExpc3QuY3Bw ICovOyB9OwogCQk1NzJFOTJGQzE0RTU0MDU4MDA4N0ZGQkEgLyogU2hhZG93Um9vdExpc3QuaCBp biBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDU3MkU5MkZBMTRF NTQwNTgwMDg3RkZCQSAvKiBTaGFkb3dSb290TGlzdC5oICovOyB9OwogCQk1NzNEMTM0NzE0Q0Uz OUZGMDA1N0FCQ0EgLyogSW5zcGVjdG9yVHlwZUJ1aWxkZXIuY3BwIGluIFNvdXJjZXMgKi8gPSB7 aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gNTczRDEzNDUxNENFMzlGRjAwNTdBQkNBIC8q IEluc3BlY3RvclR5cGVCdWlsZGVyLmNwcCAqLzsgfTsKKwkJNTdCNzkxQTMxNEM2QTYyOTAwRjIw MkQxIC8qIEhUTUxDb250ZW50U2VsZWN0b3IuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJY QnVpbGRGaWxlOyBmaWxlUmVmID0gNTdCNzkxOUYxNEM2QTYyOTAwRjIwMkQxIC8qIEhUTUxDb250 ZW50U2VsZWN0b3IuY3BwICovOyB9OworCQk1N0I3OTFBNDE0QzZBNjI5MDBGMjAyRDEgLyogSFRN TENvbnRlbnRTZWxlY3Rvci5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBm aWxlUmVmID0gNTdCNzkxQTAxNEM2QTYyOTAwRjIwMkQxIC8qIEhUTUxDb250ZW50U2VsZWN0b3Iu aCAqLzsgfTsKIAkJNTdCNzkxQTUxNEM2QTYyOTAwRjIwMkQxIC8qIENvbnRlbnRTZWxlY3RvclF1 ZXJ5LmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDU3 Qjc5MUExMTRDNkE2MjkwMEYyMDJEMSAvKiBDb250ZW50U2VsZWN0b3JRdWVyeS5jcHAgKi87IH07 CiAJCTU3Qjc5MUE2MTRDNkE2MjkwMEYyMDJEMSAvKiBDb250ZW50U2VsZWN0b3JRdWVyeS5oIGlu IEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gNTdCNzkxQTIxNEM2 QTYyOTAwRjIwMkQxIC8qIENvbnRlbnRTZWxlY3RvclF1ZXJ5LmggKi87IH07CiAJCTU3Qjc5MUE5 MTRDNkE2MzMwMEYyMDJEMSAvKiBIVE1MQ29udGVudEVsZW1lbnQuY3BwIGluIFNvdXJjZXMgKi8g PSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gNTdCNzkxQTcxNEM2QTYzMzAwRjIwMkQx IC8qIEhUTUxDb250ZW50RWxlbWVudC5jcHAgKi87IH07CiAJCTU3Qjc5MUFBMTRDNkE2MzMwMEYy MDJEMSAvKiBIVE1MQ29udGVudEVsZW1lbnQuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1 aWxkRmlsZTsgZmlsZVJlZiA9IDU3Qjc5MUE4MTRDNkE2MzMwMEYyMDJEMSAvKiBIVE1MQ29udGVu dEVsZW1lbnQuaCAqLzsgfTsKLQkJNTdCNzkxQTMxNEM2QTYyOTAwRjIwMkQxIC8qIEhUTUxDb250 ZW50U2VsZWN0b3IuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxl UmVmID0gNTdCNzkxOUYxNEM2QTYyOTAwRjIwMkQxIC8qIEhUTUxDb250ZW50U2VsZWN0b3IuY3Bw ICovOyB9OwotCQk1N0I3OTFBNDE0QzZBNjI5MDBGMjAyRDEgLyogSFRNTENvbnRlbnRTZWxlY3Rv ci5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gNTdCNzkx QTAxNEM2QTYyOTAwRjIwMkQxIC8qIEhUTUxDb250ZW50U2VsZWN0b3IuaCAqLzsgfTsKIAkJNTkw NUFEQkYxMzAyRjNDRTAwRjExNkRGIC8qIFhNTFRyZWVWaWV3ZXIuY3BwIGluIFNvdXJjZXMgKi8g PSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gNTkwNUFEQkQxMzAyRjNDRTAwRjExNkRG IC8qIFhNTFRyZWVWaWV3ZXIuY3BwICovOyB9OwogCQk1OTA1QURDMDEzMDJGM0NFMDBGMTE2REYg LyogWE1MVHJlZVZpZXdlci5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBm aWxlUmVmID0gNTkwNUFEQkUxMzAyRjNDRTAwRjExNkRGIC8qIFhNTFRyZWVWaWV3ZXIuaCAqLzsg fTsKIAkJNTkwRTFCNDkxMUU0RUY0QjAwNjlGNzg0IC8qIERldmljZU9yaWVudGF0aW9uLmggaW4g SGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA1OTBFMUI0ODExRTRF RjRCMDA2OUY3ODQgLyogRGV2aWNlT3JpZW50YXRpb24uaCAqLzsgc2V0dGluZ3MgPSB7QVRUUklC VVRFUyA9IChQcml2YXRlLCApOyB9OyB9OwpAQCAtODQ3MiwxMiArODQ3MiwxMiBAQAogCQk1NzJF OTJGQTE0RTU0MDU4MDA4N0ZGQkEgLyogU2hhZG93Um9vdExpc3QuaCAqLyA9IHtpc2EgPSBQQlhG aWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJj ZWNvZGUuYy5oOyBuYW1lID0gU2hhZG93Um9vdExpc3QuaDsgcGF0aCA9IGRvbS9TaGFkb3dSb290 TGlzdC5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk1NzNEMTM0NTE0Q0UzOUZGMDA1 N0FCQ0EgLyogSW5zcGVjdG9yVHlwZUJ1aWxkZXIuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZl cmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5j cHAuY3BwOyBwYXRoID0gSW5zcGVjdG9yVHlwZUJ1aWxkZXIuY3BwOyBzb3VyY2VUcmVlID0gIjxn cm91cD4iOyB9OwogCQk1NzNEMTM0NjE0Q0UzOUZGMDA1N0FCQ0EgLyogSW5zcGVjdG9yVHlwZUJ1 aWxkZXIuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBs YXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gSW5zcGVjdG9yVHlwZUJ1 aWxkZXIuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKKwkJNTdCNzkxOUYxNEM2QTYyOTAw RjIwMkQxIC8qIEhUTUxDb250ZW50U2VsZWN0b3IuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZl cmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5j cHAuY3BwOyBwYXRoID0gSFRNTENvbnRlbnRTZWxlY3Rvci5jcHA7IHNvdXJjZVRyZWUgPSAiPGdy b3VwPiI7IH07CisJCTU3Qjc5MUEwMTRDNkE2MjkwMEYyMDJEMSAvKiBIVE1MQ29udGVudFNlbGVj dG9yLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFz dEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IEhUTUxDb250ZW50U2VsZWN0 b3IuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJNTdCNzkxQTExNEM2QTYyOTAwRjIw MkQxIC8qIENvbnRlbnRTZWxlY3RvclF1ZXJ5LmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJl bmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3Bw LmNwcDsgcGF0aCA9IENvbnRlbnRTZWxlY3RvclF1ZXJ5LmNwcDsgc291cmNlVHJlZSA9ICI8Z3Jv dXA+IjsgfTsKIAkJNTdCNzkxQTIxNEM2QTYyOTAwRjIwMkQxIC8qIENvbnRlbnRTZWxlY3RvclF1 ZXJ5LmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFz dEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IENvbnRlbnRTZWxlY3RvclF1 ZXJ5Lmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTU3Qjc5MUE3MTRDNkE2MzMwMEYy MDJEMSAvKiBIVE1MQ29udGVudEVsZW1lbnQuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVu Y2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAu Y3BwOyBwYXRoID0gSFRNTENvbnRlbnRFbGVtZW50LmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+ IjsgfTsKIAkJNTdCNzkxQTgxNEM2QTYzMzAwRjIwMkQxIC8qIEhUTUxDb250ZW50RWxlbWVudC5o ICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93 bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBIVE1MQ29udGVudEVsZW1lbnQuaDsg c291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKLQkJNTdCNzkxOUYxNEM2QTYyOTAwRjIwMkQxIC8q IEhUTUxDb250ZW50U2VsZWN0b3IuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZp bGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBw YXRoID0gSFRNTENvbnRlbnRTZWxlY3Rvci5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07 Ci0JCTU3Qjc5MUEwMTRDNkE2MjkwMEYyMDJEMSAvKiBIVE1MQ29udGVudFNlbGVjdG9yLmggKi8g PSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmls ZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IEhUTUxDb250ZW50U2VsZWN0b3IuaDsgc291 cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJNTkwNUFEQkQxMzAyRjNDRTAwRjExNkRGIC8qIFhN TFRyZWVWaWV3ZXIuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGlu ZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gWE1M VHJlZVZpZXdlci5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTU5MDVBREJFMTMw MkYzQ0UwMEYxMTZERiAvKiBYTUxUcmVlVmlld2VyLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVy ZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMu aDsgcGF0aCA9IFhNTFRyZWVWaWV3ZXIuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJ NTkwRTFCNDgxMUU0RUY0QjAwNjlGNzg0IC8qIERldmljZU9yaWVudGF0aW9uLmggKi8gPSB7aXNh ID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUg PSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IERldmljZU9yaWVudGF0aW9uLmg7IHNvdXJjZVRyZWUg PSAiPGdyb3VwPiI7IH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGlu Zy9TY3JvbGxpbmdUcmVlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9s bGluZ1RyZWUuY3BwCmluZGV4IDAyMDNiYjY1NWQwYjhhMzFkMTM3YWVjNjY4ZDcxMmNkZjJhNjI4 OTIuLmU5ZGFhZjk0YTg5MjBkYWI5MTM2ZjczYjYxNjMwMzk0ZmY3MDFlYTQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWUuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWUuY3BwCkBAIC00NSw2ICs0 NSw4IEBAIFBhc3NSZWZQdHI8U2Nyb2xsaW5nVHJlZT4gU2Nyb2xsaW5nVHJlZTo6Y3JlYXRlKFNj cm9sbGluZ0Nvb3JkaW5hdG9yKiBzY3JvbGxpbmdDCiBTY3JvbGxpbmdUcmVlOjpTY3JvbGxpbmdU cmVlKFNjcm9sbGluZ0Nvb3JkaW5hdG9yKiBzY3JvbGxpbmdDb29yZGluYXRvcikKICAgICA6IG1f c2Nyb2xsaW5nQ29vcmRpbmF0b3Ioc2Nyb2xsaW5nQ29vcmRpbmF0b3IpCiAgICAgLCBtX3Jvb3RO b2RlKFNjcm9sbGluZ1RyZWVOb2RlOjpjcmVhdGUodGhpcykpCisgICAgLCBtX2NhbkdvQmFjayhm YWxzZSkKKyAgICAsIG1fY2FuR29Gb3J3YXJkKGZhbHNlKQogICAgICwgbV9oYXNXaGVlbEV2ZW50 SGFuZGxlcnMoZmFsc2UpCiB7CiB9CkBAIC03NSw2ICs3NywxNCBAQCBib29sIFNjcm9sbGluZ1Ry ZWU6OnRyeVRvSGFuZGxlV2hlZWxFdmVudChjb25zdCBQbGF0Zm9ybVdoZWVsRXZlbnQmIHdoZWVs RXZlbnQpCiAgICAgcmV0dXJuIHRydWU7CiB9CiAKK3ZvaWQgU2Nyb2xsaW5nVHJlZTo6dXBkYXRl QmFja0ZvcndhcmRTdGF0ZShib29sIGNhbkdvQmFjaywgYm9vbCBjYW5Hb0ZvcndhcmQpCit7Cisg ICAgQVNTRVJUKFNjcm9sbGluZ1RocmVhZDo6aXNDdXJyZW50VGhyZWFkKCkpOworCisgICAgbV9j YW5Hb0JhY2sgPSBjYW5Hb0JhY2s7CisgICAgbV9jYW5Hb0ZvcndhcmQgPSBjYW5Hb0ZvcndhcmQ7 Cit9CisKIHZvaWQgU2Nyb2xsaW5nVHJlZTo6aGFuZGxlV2hlZWxFdmVudChjb25zdCBQbGF0Zm9y bVdoZWVsRXZlbnQmIHdoZWVsRXZlbnQpCiB7CiAgICAgQVNTRVJUKFNjcm9sbGluZ1RocmVhZDo6 aXNDdXJyZW50VGhyZWFkKCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3Jv bGxpbmcvU2Nyb2xsaW5nVHJlZS5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Ny b2xsaW5nVHJlZS5oCmluZGV4IDJmZmE1Zjc4YmUzMjJlNGU5ZDYzOWE2Y2VhYjg5ZDJjN2VmN2Yy YjYuLjlmNjUxMmJiYTY4MmVmMmI5ZWQzYTIxYWE0ZDJjYjUzNzA5MzUxMDEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWUuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdUcmVlLmgKQEAgLTU3LDYgKzU3LDkg QEAgcHVibGljOgogICAgIC8vIGV2ZW50IG11c3QgYmUgc2VudCBhZ2FpbiB0byB0aGUgV2ViQ29y ZSBldmVudCBoYW5kbGVyLgogICAgIGJvb2wgdHJ5VG9IYW5kbGVXaGVlbEV2ZW50KGNvbnN0IFBs YXRmb3JtV2hlZWxFdmVudCYpOwogCisgICAgLy8gTXVzdCBiZSBjYWxsZWQgZnJvbSB0aGUgc2Ny b2xsaW5nIHRocmVhZC4gV2lsbCB1cGRhdGUgdGhlIGJhY2sgZm9yd2FyZCBzdGF0ZSBvZiB0aGUg cGFnZSwgdXNlZCBmb3IgcnViYmVyLWJhbmRpbmcuCisgICAgdm9pZCB1cGRhdGVCYWNrRm9yd2Fy ZFN0YXRlKGJvb2wgY2FuR29CYWNrLCBib29sIGNhbkdvRm9yd2FyZCk7CisKICAgICAvLyBNdXN0 IGJlIGNhbGxlZCBmcm9tIHRoZSBzY3JvbGxpbmcgdGhyZWFkLiBIYW5kbGVzIHRoZSB3aGVlbCBl dmVudC4KICAgICB2b2lkIGhhbmRsZVdoZWVsRXZlbnQoY29uc3QgUGxhdGZvcm1XaGVlbEV2ZW50 Jik7CiAKQEAgLTY4LDEyICs3MSwxOCBAQCBwdWJsaWM6CiAgICAgdm9pZCB1cGRhdGVNYWluRnJh bWVTY3JvbGxQb3NpdGlvbihjb25zdCBJbnRQb2ludCYgc2Nyb2xsUG9zaXRpb24pOwogICAgIHZv aWQgdXBkYXRlTWFpbkZyYW1lU2Nyb2xsUG9zaXRpb25BbmRTY3JvbGxMYXllclBvc2l0aW9uKGNv bnN0IEludFBvaW50JiBzY3JvbGxQb3NpdGlvbik7CiAKKyAgICBib29sIGNhbkdvQmFjaygpIGNv bnN0IHsgcmV0dXJuIG1fY2FuR29CYWNrOyB9CisgICAgYm9vbCBjYW5Hb0ZvcndhcmQoKSBjb25z dCB7IHJldHVybiBtX2NhbkdvRm9yd2FyZDsgfQorCiBwcml2YXRlOgogICAgIGV4cGxpY2l0IFNj cm9sbGluZ1RyZWUoU2Nyb2xsaW5nQ29vcmRpbmF0b3IqKTsKIAogICAgIFJlZlB0cjxTY3JvbGxp bmdDb29yZGluYXRvcj4gbV9zY3JvbGxpbmdDb29yZGluYXRvcjsKICAgICBPd25QdHI8U2Nyb2xs aW5nVHJlZU5vZGU+IG1fcm9vdE5vZGU7CiAKKyAgICBib29sIG1fY2FuR29CYWNrOworICAgIGJv b2wgbV9jYW5Hb0ZvcndhcmQ7CisKICAgICBNdXRleCBtX211dGV4OwogICAgIFJlZ2lvbiBtX25v bkZhc3RTY3JvbGxhYmxlUmVnaW9uOwogICAgIEludFBvaW50IG1fbWFpbkZyYW1lU2Nyb2xsUG9z aXRpb247CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9tYWMvU2Ny b2xsaW5nVHJlZU5vZGVNYWMubW0gYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9tYWMv U2Nyb2xsaW5nVHJlZU5vZGVNYWMubW0KaW5kZXggNjQ3ZDRlM2UyZWQ4NDhkNmI4YmUyODU0ZDE5 M2Q0YmY3OWQ3ZDA2Ni4uYjRmYmE0ZmRlZGViNTE3NmE5MGFhMjdhMGRiZjIzMmJiYzkwZGNmMyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvbWFjL1Njcm9sbGluZ1Ry ZWVOb2RlTWFjLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL21hYy9TY3Jv bGxpbmdUcmVlTm9kZU1hYy5tbQpAQCAtMTU0LDkgKzE1NCwxNCBAQCBib29sIFNjcm9sbGluZ1Ry ZWVOb2RlTWFjOjpjYW5TY3JvbGxWZXJ0aWNhbGx5KCkKICAgICByZXR1cm4gaGFzRW5hYmxlZFZl cnRpY2FsU2Nyb2xsYmFyKCk7CiB9CiAKLWJvb2wgU2Nyb2xsaW5nVHJlZU5vZGVNYWM6OnNob3Vs ZFJ1YmJlckJhbmRJbkRpcmVjdGlvbihTY3JvbGxEaXJlY3Rpb24pCitib29sIFNjcm9sbGluZ1Ry ZWVOb2RlTWFjOjpzaG91bGRSdWJiZXJCYW5kSW5EaXJlY3Rpb24oU2Nyb2xsRGlyZWN0aW9uIGRp cmVjdGlvbikKIHsKLSAgICAvLyBGSVhNRTogSW1wbGVtZW50LgorICAgIGlmIChkaXJlY3Rpb24g PT0gU2Nyb2xsTGVmdCkKKyAgICAgICAgcmV0dXJuICFzY3JvbGxpbmdUcmVlKCktPmNhbkdvQmFj aygpOworICAgIGlmIChkaXJlY3Rpb24gPT0gU2Nyb2xsUmlnaHQpCisgICAgICAgIHJldHVybiAh c2Nyb2xsaW5nVHJlZSgpLT5jYW5Hb0ZvcndhcmQoKTsKKworICAgIEFTU0VSVF9OT1RfUkVBQ0hF RCgpOwogICAgIHJldHVybiBmYWxzZTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv UGxhdGZvcm0vQ29yZUlQQy9IYW5kbGVNZXNzYWdlLmggYi9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9y bS9Db3JlSVBDL0hhbmRsZU1lc3NhZ2UuaAppbmRleCA1NjM0YTZiMWU0YzBhZGJhOTU1ZDUzOWVh ZmY4ZTQwMmUxZDFiNDQ0Li45YTA4YmU0NmUxOGNhNDUzMzg4NzUzODhmMjQxMjE3N2QzMjE0OTQz IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9Db3JlSVBDL0hhbmRsZU1lc3Nh Z2UuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9Db3JlSVBDL0hhbmRsZU1lc3NhZ2Uu aApAQCAtMjA5LDYgKzIwOSwxMiBAQCB2b2lkIGNhbGxNZW1iZXJGdW5jdGlvbihDb25uZWN0aW9u KiBjb25uZWN0aW9uLCBjb25zdCBBcmd1bWVudHMyPFAxLCBQMj4mIGFyZ3MsCiAgICAgKG9iamVj dC0+KmZ1bmN0aW9uKShjb25uZWN0aW9uLCBhcmdzLmFyZ3VtZW50MSwgYXJncy5hcmd1bWVudDIp OwogfQogCit0ZW1wbGF0ZTx0eXBlbmFtZSBDLCB0eXBlbmFtZSBNRiwgdHlwZW5hbWUgUDEsIHR5 cGVuYW1lIFAyLCB0eXBlbmFtZSBQMywgdHlwZW5hbWUgUDQ+Cit2b2lkIGNhbGxNZW1iZXJGdW5j dGlvbihDb25uZWN0aW9uKiBjb25uZWN0aW9uLCBjb25zdCBBcmd1bWVudHM0PFAxLCBQMiwgUDMs IFA0PiYgYXJncywgQyogb2JqZWN0LCBNRiBmdW5jdGlvbikKK3sKKyAgICAob2JqZWN0LT4qZnVu Y3Rpb24pKGNvbm5lY3Rpb24sIGFyZ3MuYXJndW1lbnQxLCBhcmdzLmFyZ3VtZW50MiwgYXJncy5h cmd1bWVudDMsIGFyZ3MuYXJndW1lbnQ0KTsKK30KKwogLy8gVmFyaWFkaWMgZGlzcGF0Y2ggZnVu Y3Rpb25zLgogCiB0ZW1wbGF0ZTx0eXBlbmFtZSBDLCB0eXBlbmFtZSBNRj4KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKaW5kZXggNjNiNTg5ZjQ5NTA4YWIxYTc3YjRm Zjk4NDEwYmE4YTNlNzM0ZTllOS4uMjM2MmM5ZDU1MDAzNjU0NDkxMzBkMWExOTdhOWNmNWRkMWEy YTM5ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5j cHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKQEAgLTk0 MSw3ICs5NDEsNyBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6aGFuZGxlV2hlZWxFdmVudChjb25zdCBO YXRpdmVXZWJXaGVlbEV2ZW50JiBldmVudCkKICAgICAgICAgcHJvY2VzcygpLT5zZW5kU3luYyhN ZXNzYWdlczo6V2ViUGFnZTo6V2hlZWxFdmVudFN5bmNGb3JUZXN0aW5nKGV2ZW50KSwgTWVzc2Fn ZXM6OldlYlBhZ2U6OldoZWVsRXZlbnRTeW5jRm9yVGVzdGluZzo6UmVwbHkoaGFuZGxlZCksIG1f cGFnZUlEKTsKICAgICAgICAgZGlkUmVjZWl2ZUV2ZW50KGV2ZW50LnR5cGUoKSwgaGFuZGxlZCk7 CiAgICAgfSBlbHNlCi0gICAgICAgIHByb2Nlc3MoKS0+c2VuZChNZXNzYWdlczo6RXZlbnREaXNw YXRjaGVyOjpXaGVlbEV2ZW50KG1fcGFnZUlELCBldmVudCksIDApOworICAgICAgICBwcm9jZXNz KCktPnNlbmQoTWVzc2FnZXM6OkV2ZW50RGlzcGF0Y2hlcjo6V2hlZWxFdmVudChtX3BhZ2VJRCwg ZXZlbnQsIGNhbkdvQmFjaygpLCBjYW5Hb0ZvcndhcmQoKSksIDApOwogfQogCiB2b2lkIFdlYlBh Z2VQcm94eTo6aGFuZGxlS2V5Ym9hcmRFdmVudChjb25zdCBOYXRpdmVXZWJLZXlib2FyZEV2ZW50 JiBldmVudCkKQEAgLTI5OTYsNyArMjk5Niw3IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpkaWRSZWNl aXZlRXZlbnQodWludDMyX3Qgb3BhcXVlVHlwZSwgYm9vbCBoYW5kbGVkKQogICAgICAgICAgICAg V2ViV2hlZWxFdmVudCBuZXdXaGVlbEV2ZW50ID0gY29hbGVzY2VkV2hlZWxFdmVudChtX3doZWVs RXZlbnRRdWV1ZSwgbV9jdXJyZW50bHlQcm9jZXNzZWRXaGVlbEV2ZW50cyk7CiAKICAgICAgICAg ICAgIHByb2Nlc3MoKS0+cmVzcG9uc2l2ZW5lc3NUaW1lcigpLT5zdGFydCgpOwotICAgICAgICAg ICAgcHJvY2VzcygpLT5zZW5kKE1lc3NhZ2VzOjpFdmVudERpc3BhdGNoZXI6OldoZWVsRXZlbnQo bV9wYWdlSUQsIG5ld1doZWVsRXZlbnQpLCAwKTsKKyAgICAgICAgICAgIHByb2Nlc3MoKS0+c2Vu ZChNZXNzYWdlczo6RXZlbnREaXNwYXRjaGVyOjpXaGVlbEV2ZW50KG1fcGFnZUlELCBuZXdXaGVl bEV2ZW50LCBjYW5Hb0JhY2soKSwgY2FuR29Gb3J3YXJkKCkpLCAwKTsKICAgICAgICAgfQogCiAg ICAgICAgIGJyZWFrOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQ YWdlL0V2ZW50RGlzcGF0Y2hlci5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBh Z2UvRXZlbnREaXNwYXRjaGVyLmNwcAppbmRleCA3ZjNjMDgxOTg0YTI3YWI1MjA0MWVkMmQ3Njgw NzUwMDUzMWZkNWEyLi43YWM3M2U0YmNmMjRkYWFlNTQwZDFhYmIyNTliZTdlNDI5ZjU0ODcxIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvRXZlbnREaXNwYXRj aGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvRXZlbnREaXNw YXRjaGVyLmNwcApAQCAtMzcsNiArMzcsNyBAQAogCiAjaWYgRU5BQkxFKFRIUkVBREVEX1NDUk9M TElORykKICNpbmNsdWRlIDxXZWJDb3JlL1Njcm9sbGluZ0Nvb3JkaW5hdG9yLmg+CisjaW5jbHVk ZSA8V2ViQ29yZS9TY3JvbGxpbmdUaHJlYWQuaD4KICNpbmNsdWRlIDxXZWJDb3JlL1Njcm9sbGlu Z1RyZWUuaD4KICNlbmRpZgogCkBAIC03OSwxOCArODAsMjggQEAgdm9pZCBFdmVudERpc3BhdGNo ZXI6OmRpZFJlY2VpdmVNZXNzYWdlT25Db25uZWN0aW9uV29ya1F1ZXVlKENvcmVJUEM6OkNvbm5l Y3Rpb24KICAgICB9CiB9CiAKLXZvaWQgRXZlbnREaXNwYXRjaGVyOjp3aGVlbEV2ZW50KENvcmVJ UEM6OkNvbm5lY3Rpb24qLCB1aW50NjRfdCBwYWdlSUQsIGNvbnN0IFdlYldoZWVsRXZlbnQmIHdo ZWVsRXZlbnQpCit2b2lkIEV2ZW50RGlzcGF0Y2hlcjo6d2hlZWxFdmVudChDb3JlSVBDOjpDb25u ZWN0aW9uKiwgdWludDY0X3QgcGFnZUlELCBjb25zdCBXZWJXaGVlbEV2ZW50JiB3aGVlbEV2ZW50 LCBib29sIGNhbkdvQmFjaywgYm9vbCBjYW5Hb0ZvcndhcmQpCiB7CiAjaWYgRU5BQkxFKFRIUkVB REVEX1NDUk9MTElORykKICAgICBNdXRleExvY2tlciBsb2NrZXIobV9zY3JvbGxpbmdUcmVlc011 dGV4KTsKICAgICBpZiAoU2Nyb2xsaW5nVHJlZSogc2Nyb2xsaW5nVHJlZSA9IG1fc2Nyb2xsaW5n VHJlZXMuZ2V0KHBhZ2VJRCkuZ2V0KCkpIHsKICAgICAgICAgUGxhdGZvcm1XaGVlbEV2ZW50IHBs YXRmb3JtV2hlZWxFdmVudCA9IHBsYXRmb3JtKHdoZWVsRXZlbnQpOwogCisgICAgICAgIC8vIEZJ WE1FOiBJdCdzIHByZXR0eSBob3JyaWJsZSB0aGF0IHdlJ3JlIHVwZGF0aW5nIHRoZSBiYWNrL2Zv cndhcmQgc3RhdGUgaGVyZS4KKyAgICAgICAgLy8gV2ViQ29yZSBzaG91bGQgYWx3YXlzIGtub3cg dGhlIGN1cnJlbnQgc3RhdGUgYW5kIGtub3cgd2hlbiBpdCBjaGFuZ2VzIHNvIHRoZQorICAgICAg ICAvLyBzY3JvbGxpbmcgdHJlZSBjYW4gYmUgbm90aWZpZWQuCisgICAgICAgIC8vIFdlIG9ubHkg bmVlZCB0byBkbyB0aGlzIGF0IHRoZSBiZWdpbm5pbmcgb2YgdGhlIGdlc3R1cmUuCisgICAgICAg IGlmIChwbGF0Zm9ybVdoZWVsRXZlbnQucGhhc2UoKSA9PSBQbGF0Zm9ybVdoZWVsRXZlbnRQaGFz ZUJlZ2FuKQorICAgICAgICAgICAgU2Nyb2xsaW5nVGhyZWFkOjpkaXNwYXRjaChiaW5kKCZTY3Jv bGxpbmdUcmVlOjp1cGRhdGVCYWNrRm9yd2FyZFN0YXRlLCBzY3JvbGxpbmdUcmVlLCBjYW5Hb0Jh Y2ssIGNhbkdvRm9yd2FyZCkpOworCiAgICAgICAgIGlmIChzY3JvbGxpbmdUcmVlLT50cnlUb0hh bmRsZVdoZWVsRXZlbnQocGxhdGZvcm1XaGVlbEV2ZW50KSkgewogICAgICAgICAgICAgc2VuZERp ZEhhbmRsZUV2ZW50KHBhZ2VJRCwgd2hlZWxFdmVudCk7CiAgICAgICAgICAgICByZXR1cm47CiAg ICAgICAgIH0KICAgICB9CisjZWxzZQorICAgIFVOVVNFRF9QQVJBTShjYW5Hb0JhY2spOworICAg IFVOVVNFRF9QQVJBTShjYW5Hb0ZvcndhcmQpOwogI2VuZGlmCiAKICAgICBSdW5Mb29wOjptYWlu KCktPmRpc3BhdGNoKGJpbmQoJkV2ZW50RGlzcGF0Y2hlcjo6ZGlzcGF0Y2hXaGVlbEV2ZW50LCB0 aGlzLCBwYWdlSUQsIHdoZWVsRXZlbnQpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3MvV2ViUGFnZS9FdmVudERpc3BhdGNoZXIuaCBiL1NvdXJjZS9XZWJLaXQyL1dlYlBy b2Nlc3MvV2ViUGFnZS9FdmVudERpc3BhdGNoZXIuaAppbmRleCAxNWIyNTM4MGQ3ZDEwZWE4ZmEy YmM3MjkwM2NjNGRiNTdjNzdkN2E2Li44YmRmNTY3NWE0Mzc5ZTQ5MWEyNGM2MDBkMGJjM2I3MDdh MzVmMTM3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvRXZl bnREaXNwYXRjaGVyLmgKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0V2 ZW50RGlzcGF0Y2hlci5oCkBAIC02Niw3ICs2Niw3IEBAIHByaXZhdGU6CiAgICAgdm9pZCBkaWRS ZWNlaXZlRXZlbnREaXNwYXRjaGVyTWVzc2FnZU9uQ29ubmVjdGlvbldvcmtRdWV1ZShDb3JlSVBD OjpDb25uZWN0aW9uKiwgQ29yZUlQQzo6TWVzc2FnZUlELCBDb3JlSVBDOjpBcmd1bWVudERlY29k ZXIqIGFyZ3VtZW50cywgYm9vbCYgZGlkSGFuZGxlTWVzc2FnZSk7CiAKICAgICAvLyBNZXNzYWdl IGhhbmRsZXJzCi0gICAgdm9pZCB3aGVlbEV2ZW50KENvcmVJUEM6OkNvbm5lY3Rpb24qLCB1aW50 NjRfdCBwYWdlSUQsIGNvbnN0IFdlYldoZWVsRXZlbnQmKTsKKyAgICB2b2lkIHdoZWVsRXZlbnQo Q29yZUlQQzo6Q29ubmVjdGlvbiosIHVpbnQ2NF90IHBhZ2VJRCwgY29uc3QgV2ViV2hlZWxFdmVu dCYsIGJvb2wgY2FuR29CYWNrLCBib29sIGNhbkdvRm9yd2FyZCk7CiAjaWYgRU5BQkxFKEdFU1RV UkVfRVZFTlRTKQogICAgIHZvaWQgZ2VzdHVyZUV2ZW50KENvcmVJUEM6OkNvbm5lY3Rpb24qLCB1 aW50NjRfdCBwYWdlSUQsIGNvbnN0IFdlYkdlc3R1cmVFdmVudCYpOwogI2VuZGlmCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvRXZlbnREaXNwYXRjaGVyLm1l c3NhZ2VzLmluIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0V2ZW50RGlzcGF0 Y2hlci5tZXNzYWdlcy5pbgppbmRleCBhMTU1NzFiZTU4NmQwMzhjNjVjN2RjZWNhMjg2Y2ExZDFh MDhhNzQxLi45NGNkNWU1MDFlNWIxNTEwYmQyMzk1ZmE5ODc0ZThiMjZhM2UwODMzIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvRXZlbnREaXNwYXRjaGVyLm1l c3NhZ2VzLmluCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9FdmVudERp c3BhdGNoZXIubWVzc2FnZXMuaW4KQEAgLTIxLDcgKzIxLDcgQEAKICMgT0YgVEhJUyBTT0ZUV0FS RSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KIAog bWVzc2FnZXMgLT4gRXZlbnREaXNwYXRjaGVyIHsKLSAgICBXaGVlbEV2ZW50KHVpbnQ2NF90IHBh Z2VJRCwgV2ViS2l0OjpXZWJXaGVlbEV2ZW50IGV2ZW50KSBEaXNwYXRjaE9uQ29ubmVjdGlvblF1 ZXVlCisgICAgV2hlZWxFdmVudCh1aW50NjRfdCBwYWdlSUQsIFdlYktpdDo6V2ViV2hlZWxFdmVu dCBldmVudCwgYm9vbCBjYW5Hb0JhY2ssIGJvb2wgY2FuR29Gb3J3YXJkKSBEaXNwYXRjaE9uQ29u bmVjdGlvblF1ZXVlCiAKICNpZiBFTkFCTEUoR0VTVFVSRV9FVkVOVFMpCiAgICAgR2VzdHVyZUV2 ZW50KHVpbnQ2NF90IHBhZ2VJRCwgV2ViS2l0OjpXZWJHZXN0dXJlRXZlbnQgZXZlbnQpIERpc3Bh dGNoT25Db25uZWN0aW9uUXVldWUK