134259 2014-06-24 11:54:40 -0700 Add PageState to HistoryItem conversion code 2014-06-24 12:19:14 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca benjamin bunhere cdumez cmarcelo commit-queue gyuyoung.kim sergio oldest_to_newest 1018030 0 andersca 2014-06-24 11:54:40 -0700 Add PageState to HistoryItem conversion code 1018033 1 233725 andersca 2014-06-24 11:58:00 -0700 Created attachment 233725 Patch 1018045 2 233725 kling 2014-06-24 12:16:07 -0700 Comment on attachment 233725 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=233725&action=review r=me > Source/WTF/wtf/Optional.h:165 > + T valueOr(U&& value) const Nice! 1018048 3 andersca 2014-06-24 12:19:14 -0700 Committed r170378: <http://trac.webkit.org/changeset/170378> 233725 2014-06-24 11:58:00 -0700 2014-06-24 12:16:07 -0700 Patch bug-134259-20140624115739.patch text/plain 14669 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTcwMzY2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDIwYzBiMDc4MTUwZTZmNmVhYjUyMmY4 NmNhYzQ2YzE0M2VkOTdmZWYuLjIzOTY2OGY2MjFiMzQ4ODVlOGMzM2E5ZTcwMTdjODBmNjkxYTFm M2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTQtMDYtMjQgIEFuZGVycyBDYXJsc3NvbiAgPGFu ZGVyc2NhQGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgUGFnZVN0YXRlIHRvIEhpc3RvcnlJdGVt IGNvbnZlcnNpb24gY29kZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTM0MjU5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgKiB3dGYvT3B0aW9uYWwuaDoKKyAgICAgICAgKFdURjo6T3B0aW9uYWw6OnZhbHVl T3IpOgorCiAyMDE0LTA2LTI0ICBMw6FzemzDsyBMYW5nw7MgIDxsbGFuZ28udS1zemVnZWRAcGFy dG5lci5zYW1zdW5nLmNvbT4KIAogICAgICAgICBbSmF2YVNjcmlwdENvcmVdIEVuYWJsZSBjb25j dXJyZW50IEpJVCBvbiBFRkwuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cg Yi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZTI4Mzc2MWVjY2U4YTRkNTE2MmRkZjQ0 YjFiYmI0ODRmODljNzZjYy4uYTc2ZGYxZDBjODkxMzg5YTliYmQwZmQ1ZTZmNGY4M2U2YzNmZThh MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJL aXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE0LTA2LTI0ICBBbmRlcnMgQ2FybHNz b24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIFBhZ2VTdGF0ZSB0byBIaXN0 b3J5SXRlbSBjb252ZXJzaW9uIGNvZGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTEzNDI1OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogU2hhcmVkL1Nlc3Npb25TdGF0ZS5oOgorICAgICAgICAqIFVJUHJv Y2Vzcy9tYWMvTGVnYWN5U2Vzc2lvblN0YXRlQ29kaW5nLmNwcDoKKyAgICAgICAgKFdlYktpdDo6 ZGVjb2RlQmFja0ZvcndhcmRUcmVlTm9kZSk6CisgICAgICAgICogV2ViS2l0Mi54Y29kZXByb2ov cHJvamVjdC5wYnhwcm9qOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvU2Vz c2lvblN0YXRlQ29udmVyc2lvbi5jcHA6IEFkZGVkLgorICAgICAgICAoV2ViS2l0Ojp0b0Zvcm1E YXRhKToKKyAgICAgICAgKFdlYktpdDo6YXBwbHlGcmFtZVN0YXRlKToKKyAgICAgICAgKFdlYktp dDo6dG9IaXN0b3J5SXRlbSk6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9T ZXNzaW9uU3RhdGVDb252ZXJzaW9uLmg6IEFkZGVkLgorCiAyMDE0LTA2LTI0ICBFdmEgQmFsYXpz ZmFsdmkgIDxldmFiLnUtc3plZ2VkQHBhcnRuZXIuc2Ftc3VuZy5jb20+CiAKICAgICAgICAgRml4 IHVudXNlZCBwYXJhbWV0ZXIgd2FybmluZ3MgaWYgaW5zcGVjdG9yIGlzIGRpc2FibGVkCmRpZmYg LS1naXQgYS9Tb3VyY2UvV1RGL3d0Zi9PcHRpb25hbC5oIGIvU291cmNlL1dURi93dGYvT3B0aW9u YWwuaAppbmRleCAyYjU4ODgxNDQ4ZmNjYjU0Yzk2ZDgyZDEyNjZhMDc2NjU0YzFlODk4Li42NGE2 ODExMmEyMzRiM2FmMjhhNDlmOTI0ZDkzYWI1ZmE5NjkzMzEwIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V1RGL3d0Zi9PcHRpb25hbC5oCisrKyBiL1NvdXJjZS9XVEYvd3RmL09wdGlvbmFsLmgKQEAgLTE2 MSw2ICsxNjEsMTUgQEAgcHVibGljOgogICAgICAgICByZXR1cm4gbV92YWx1ZTsKICAgICB9CiAK KyAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBVPgorICAgIFQgdmFsdWVPcihVJiYgdmFsdWUpIGNvbnN0 CisgICAgeworICAgICAgICBpZiAobV9pc0VuZ2FnZWQpCisgICAgICAgICAgICByZXR1cm4gbV92 YWx1ZTsKKworICAgICAgICByZXR1cm4gc3RkOjpmb3J3YXJkPFU+KHZhbHVlKTsKKyAgICB9CisK IHByaXZhdGU6CiAgICAgYm9vbCBtX2lzRW5nYWdlZDsKICAgICB1bmlvbiB7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvU2Vzc2lvblN0YXRlLmggYi9Tb3VyY2UvV2ViS2l0Mi9T aGFyZWQvU2Vzc2lvblN0YXRlLmgKaW5kZXggNTkxZDE5NDkyYjYzN2ViMzc2MWYzODllZjg4M2I0 ODQwM2YwY2Q5Mi4uZDQ0YzFjZDc0MTRlNGVjMDBmODViYTcxN2VlN2YyMjI3NzJjY2Q5NyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdDIvU2hhcmVkL1Nlc3Npb25TdGF0ZS5oCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1NoYXJlZC9TZXNzaW9uU3RhdGUuaApAQCAtODIsNyArODIsNyBAQCBzdHJ1Y3Qg RnJhbWVTdGF0ZSB7CiAgICAgU3RyaW5nIHRhcmdldDsKIAogICAgIFZlY3RvcjxTdHJpbmc+IGRv Y3VtZW50U3RhdGU7Ci0gICAgVmVjdG9yPHVpbnQ4X3Q+IHN0YXRlT2JqZWN0RGF0YTsKKyAgICBP cHRpb25hbDxWZWN0b3I8dWludDhfdD4+IHN0YXRlT2JqZWN0RGF0YTsKIAogICAgIGludDY0X3Qg ZG9jdW1lbnRTZXF1ZW5jZU51bWJlcjsKICAgICBpbnQ2NF90IGl0ZW1TZXF1ZW5jZU51bWJlcjsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvTGVnYWN5U2Vzc2lvblN0 YXRlQ29kaW5nLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvTGVnYWN5U2Vzc2lv blN0YXRlQ29kaW5nLmNwcAppbmRleCBlMWExNGE0MzEzMWI1MTFiYTJhMzI0NDIxMDNiYWU5OTc3 MWNkZDU3Li5lZDZkOTZkMzAxMTliZjgxZjc4YWQ1MzA4NGQ1ZjFjNmFhZmUwYTYyIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL0xlZ2FjeVNlc3Npb25TdGF0ZUNvZGlu Zy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9MZWdhY3lTZXNzaW9uU3Rh dGVDb2RpbmcuY3BwCkBAIC01NTIsOCArNTUyLDEyIEBAIHN0YXRpYyB2b2lkIGRlY29kZUJhY2tG b3J3YXJkVHJlZU5vZGUoSGlzdG9yeUVudHJ5RGF0YURlY29kZXImIGRlY29kZXIsIEZyYW1lU3Rh CiAgICAgYm9vbCBoYXNTdGF0ZU9iamVjdDsKICAgICBkZWNvZGVyID4+IGhhc1N0YXRlT2JqZWN0 OwogCi0gICAgaWYgKGhhc1N0YXRlT2JqZWN0KQotICAgICAgICBkZWNvZGVyID4+IGZyYW1lU3Rh dGUuc3RhdGVPYmplY3REYXRhOworICAgIGlmIChoYXNTdGF0ZU9iamVjdCkgeworICAgICAgICBW ZWN0b3I8dWludDhfdD4gc3RhdGVPYmplY3REYXRhOworICAgICAgICBkZWNvZGVyID4+IHN0YXRl T2JqZWN0RGF0YTsKKworICAgICAgICBmcmFtZVN0YXRlLnN0YXRlT2JqZWN0RGF0YSA9IHN0ZDo6 bW92ZShzdGF0ZU9iamVjdERhdGEpOworICAgIH0KIAogICAgIGRlY29kZXIgPj4gZnJhbWVTdGF0 ZS50YXJnZXQ7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJLaXQyLnhjb2RlcHJv ai9wcm9qZWN0LnBieHByb2ogYi9Tb3VyY2UvV2ViS2l0Mi9XZWJLaXQyLnhjb2RlcHJvai9wcm9q ZWN0LnBieHByb2oKaW5kZXggNWY2YmU2NzkwODM0MDM3YmNkZGEyOTgyMjczZmQyMjRhYTZjMzJl ZS4uNDdhNjZkMzBjMzI4NzJmMmE1OTBmN2I5YmVjODY2Yzc4MGUxZGNlOSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdDIvV2ViS2l0Mi54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCisrKyBiL1Nv dXJjZS9XZWJLaXQyL1dlYktpdDIueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagpAQCAtMjYzLDYg KzI2Myw4IEBACiAJCTFBNkZCQTJCMTFFNjg2MjcwMERCMTM3MSAvKiBOZXRzY2FwZUJyb3dzZXJG dW5jcy5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAx QTZGQkEyOTExRTY4NjI3MDBEQjEzNzEgLyogTmV0c2NhcGVCcm93c2VyRnVuY3MuY3BwICovOyB9 OwogCQkxQTZGQkQyODExRTY5QkMyMDBEQjEzNzEgLyogTmV0c2NhcGVQbHVnaW4uaCBpbiBIZWFk ZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFBNkZCRDI2MTFFNjlCQzIw MERCMTM3MSAvKiBOZXRzY2FwZVBsdWdpbi5oICovOyB9OwogCQkxQTZGQkQyOTExRTY5QkMyMDBE QjEzNzEgLyogTmV0c2NhcGVQbHVnaW4uY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVp bGRGaWxlOyBmaWxlUmVmID0gMUE2RkJEMjcxMUU2OUJDMjAwREIxMzcxIC8qIE5ldHNjYXBlUGx1 Z2luLmNwcCAqLzsgfTsKKwkJMUE3Mjg0NDcxOTU5RUQxMDAwMDdCQ0U1IC8qIFNlc3Npb25TdGF0 ZUNvbnZlcnNpb24uaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJl ZiA9IDFBNzI4NDQ1MTk1OUVEMTAwMDA3QkNFNSAvKiBTZXNzaW9uU3RhdGVDb252ZXJzaW9uLmgg Ki87IH07CisJCTFBNzI4NDQ4MTk1OUY4MDQwMDA3QkNFNSAvKiBTZXNzaW9uU3RhdGVDb252ZXJz aW9uLmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFB NzI4NDQ0MTk1OUVEMTAwMDA3QkNFNSAvKiBTZXNzaW9uU3RhdGVDb252ZXJzaW9uLmNwcCAqLzsg fTsKIAkJMUE3ODY1QjkxNkNBQzcxNTAwQUNFODNBIC8qIFBsdWdpblByb2Nlc3NDb25uZWN0aW9u TWFuYWdlck1lc3NhZ2VSZWNlaXZlci5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWls ZEZpbGU7IGZpbGVSZWYgPSAxQTc4NjVCNzE2Q0FDNzE1MDBBQ0U4M0EgLyogUGx1Z2luUHJvY2Vz c0Nvbm5lY3Rpb25NYW5hZ2VyTWVzc2FnZVJlY2VpdmVyLmNwcCAqLzsgfTsKIAkJMUE3ODY1QkEx NkNBQzcxNTAwQUNFODNBIC8qIFBsdWdpblByb2Nlc3NDb25uZWN0aW9uTWFuYWdlck1lc3NhZ2Vz LmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxQTc4NjVC ODE2Q0FDNzE1MDBBQ0U4M0EgLyogUGx1Z2luUHJvY2Vzc0Nvbm5lY3Rpb25NYW5hZ2VyTWVzc2Fn ZXMuaCAqLzsgfTsKIAkJMUE3QzZDREExMzc4OTUwODAwQjlDMDREIC8qIEVudmlyb25tZW50VmFy aWFibGVzLmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9 IDFBN0M2Q0Q4MTM3ODk1MDgwMEI5QzA0RCAvKiBFbnZpcm9ubWVudFZhcmlhYmxlcy5jcHAgKi87 IH07CkBAIC0yMjEyLDYgKzIyMTQsOCBAQAogCQkxQTZGQkEyOTExRTY4NjI3MDBEQjEzNzEgLyog TmV0c2NhcGVCcm93c2VyRnVuY3MuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZp bGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBw YXRoID0gTmV0c2NhcGVCcm93c2VyRnVuY3MuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9 OwogCQkxQTZGQkQyNjExRTY5QkMyMDBEQjEzNzEgLyogTmV0c2NhcGVQbHVnaW4uaCAqLyA9IHtp c2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlw ZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gTmV0c2NhcGVQbHVnaW4uaDsgc291cmNlVHJlZSA9 ICI8Z3JvdXA+IjsgfTsKIAkJMUE2RkJEMjcxMUU2OUJDMjAwREIxMzcxIC8qIE5ldHNjYXBlUGx1 Z2luLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBs YXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IE5ldHNjYXBlUGx1 Z2luLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKKwkJMUE3Mjg0NDQxOTU5RUQxMDAw MDdCQ0U1IC8qIFNlc3Npb25TdGF0ZUNvbnZlcnNpb24uY3BwICovID0ge2lzYSA9IFBCWEZpbGVS ZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29k ZS5jcHAuY3BwOyBwYXRoID0gU2Vzc2lvblN0YXRlQ29udmVyc2lvbi5jcHA7IHNvdXJjZVRyZWUg PSAiPGdyb3VwPiI7IH07CisJCTFBNzI4NDQ1MTk1OUVEMTAwMDA3QkNFNSAvKiBTZXNzaW9uU3Rh dGVDb252ZXJzaW9uLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5n ID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IFNlc3Npb25T dGF0ZUNvbnZlcnNpb24uaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMUE3ODY1QjYx NkNBQzZGRDAwQUNFODNBIC8qIFBsdWdpblByb2Nlc3NDb25uZWN0aW9uTWFuYWdlci5tZXNzYWdl cy5pbiAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBsYXN0S25vd25GaWxlVHlwZSA9IHRl eHQ7IHBhdGggPSBQbHVnaW5Qcm9jZXNzQ29ubmVjdGlvbk1hbmFnZXIubWVzc2FnZXMuaW47IHNv dXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTFBNzg2NUI3MTZDQUM3MTUwMEFDRTgzQSAvKiBQ bHVnaW5Qcm9jZXNzQ29ubmVjdGlvbk1hbmFnZXJNZXNzYWdlUmVjZWl2ZXIuY3BwICovID0ge2lz YSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBl ID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gUGx1Z2luUHJvY2Vzc0Nvbm5lY3Rpb25NYW5h Z2VyTWVzc2FnZVJlY2VpdmVyLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMUE3 ODY1QjgxNkNBQzcxNTAwQUNFODNBIC8qIFBsdWdpblByb2Nlc3NDb25uZWN0aW9uTWFuYWdlck1l c3NhZ2VzLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsg bGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IFBsdWdpblByb2Nlc3ND b25uZWN0aW9uTWFuYWdlck1lc3NhZ2VzLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CkBA IC01NjMxLDYgKzU2MzUsOCBAQAogCQkJY2hpbGRyZW4gPSAoCiAJCQkJMkQyOEYzREYxODg1Q0NC NDAwNEI5RUFFIC8qIGlvcyAqLywKIAkJCQlCQzExMUFERTExMkY1QjlBMDAzMzdCQUIgLyogbWFj ICovLAorCQkJCTFBNzI4NDQ0MTk1OUVEMTAwMDA3QkNFNSAvKiBTZXNzaW9uU3RhdGVDb252ZXJz aW9uLmNwcCAqLywKKwkJCQkxQTcyODQ0NTE5NTlFRDEwMDAwN0JDRTUgLyogU2Vzc2lvblN0YXRl Q29udmVyc2lvbi5oICovLAogCQkJCUNFREExMkRFMTUyQ0NBRTgwMEQ5RTA4RCAvKiBXZWJBbHRl cm5hdGl2ZVRleHRDbGllbnQuaCAqLywKIAkJCQlCQzExMUE1MzExMkY0RkJCMDAzMzdCQUIgLyog V2ViQ2hyb21lQ2xpZW50LmNwcCAqLywKIAkJCQlCQzAzMkQ2MDEwRjQzNzhEMDA1OEMxNUEgLyog V2ViQ2hyb21lQ2xpZW50LmggKi8sCkBAIC02OTk1LDYgKzcwMDEsNyBAQAogCQkJCTFBRjQ1OTMy MTk0NjU1OTUwMEY5RDRBMiAvKiBXS0Vycm9yLmggaW4gSGVhZGVycyAqLywKIAkJCQlFMTlCREE4 QTE5MzY4NkE0MDBCOTdGNTcgLyogU2FuZGJveFV0aWxpdGllcy5oIGluIEhlYWRlcnMgKi8sCiAJ CQkJMUE5RjI4MTExOTU4RjQ3ODAwOENBQzcyIC8qIFdLQmFja0ZvcndhcmRMaXN0UHJpdmF0ZS5o IGluIEhlYWRlcnMgKi8sCisJCQkJMUE3Mjg0NDcxOTU5RUQxMDAwMDdCQ0U1IC8qIFNlc3Npb25T dGF0ZUNvbnZlcnNpb24uaCBpbiBIZWFkZXJzICovLAogCQkJKTsKIAkJCXJ1bk9ubHlGb3JEZXBs b3ltZW50UG9zdHByb2Nlc3NpbmcgPSAwOwogCQl9OwpAQCAtOTA5Niw2ICs5MTAzLDcgQEAKIAkJ CQlDNTIzN0Y2MDEyNDQxQ0EzMDA3ODA0NzIgLyogV2ViRWRpdG9yQ2xpZW50TWFjLm1tIGluIFNv dXJjZXMgKi8sCiAJCQkJQkM1NzU2MTMxMjZFMDEzODAwNkYwRjEyIC8qIEFQSUVycm9yLmNwcCBp biBTb3VyY2VzICovLAogCQkJCUJDMTExQUUwMTEyRjVCQzIwMDMzN0JBQiAvKiBXZWJFcnJvcnNN YWMubW0gaW4gU291cmNlcyAqLywKKwkJCQkxQTcyODQ0ODE5NTlGODA0MDAwN0JDRTUgLyogU2Vz c2lvblN0YXRlQ29udmVyc2lvbi5jcHAgaW4gU291cmNlcyAqLywKIAkJCQkxQUZBM0FDODE4RTYx QzYxMDAzQ0NCQUUgLyogV0tVc2VyQ29udGVudENvbnRyb2xsZXIubW0gaW4gU291cmNlcyAqLywK IAkJCQlDMDMzN0RBRTEyN0EyNEZFMDA4RkY0RjQgLyogV2ViRXZlbnQuY3BwIGluIFNvdXJjZXMg Ki8sCiAJCQkJQkMwMzJEQkExMEY0MzgwRjAwNThDMTVBIC8qIFdlYkV2ZW50Q29udmVyc2lvbi5j cHAgaW4gU291cmNlcyAqLywKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv V2ViQ29yZVN1cHBvcnQvU2Vzc2lvblN0YXRlQ29udmVyc2lvbi5jcHAgYi9Tb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1Nlc3Npb25TdGF0ZUNvbnZlcnNpb24uY3BwCm5l dyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAuLjRlZTk5YzdhMWJhM2ZlZjAxNDA3YWJjMTM5Y2RmODU5MGVlNTE2N2EKLS0tIC9k ZXYvbnVsbAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1Nl c3Npb25TdGF0ZUNvbnZlcnNpb24uY3BwCkBAIC0wLDAgKzEsMTAzIEBACisvKgorICogQ29weXJp Z2h0IChDKSAyMDE0IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqCisgKiBSZWRp c3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdp dGhvdXQKKyAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBm b2xsb3dpbmcgY29uZGl0aW9ucworICogYXJlIG1ldDoKKyAqIDEuIFJlZGlzdHJpYnV0aW9ucyBv ZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3Rp Y2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIu CisgKiAyLiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhl IGFib3ZlIGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBh bmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyIGluIHRoZQorICogICAgZG9jdW1lbnRhdGlvbiBh bmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KKyAq CisgKiBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEFQUExFIElOQy4gQU5EIElUUyBDT05U UklCVVRPUlMgYGBBUyBJUycnCisgKiBBTkQgQU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5U SUVTLCBJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywKKyAqIFRIRSBJTVBMSUVEIFdBUlJB TlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIKKyAq IFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIEFQUExFIElOQy4gT1Ig SVRTIENPTlRSSUJVVE9SUworICogQkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwg SU5DSURFTlRBTCwgU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUgorICogQ09OU0VRVUVOVElBTCBEQU1B R0VTIChJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YKKyAqIFNV QlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0YgVVNFLCBEQVRBLCBPUiBQUk9GSVRT OyBPUiBCVVNJTkVTUworICogSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5Z IFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4KKyAqIENPTlRSQUNULCBTVFJJQ1QgTElB QklMSVRZLCBPUiBUT1JUIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpCisgKiBB UklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJ RiBBRFZJU0VEIE9GCisgKiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCisgKi8KKwor I2luY2x1ZGUgImNvbmZpZy5oIgorI2luY2x1ZGUgIlNlc3Npb25TdGF0ZUNvbnZlcnNpb24uaCIK KworI2luY2x1ZGUgIlNlc3Npb25TdGF0ZS5oIgorI2luY2x1ZGUgPFdlYkNvcmUvQmxvYkRhdGEu aD4KKyNpbmNsdWRlIDxXZWJDb3JlL0Zvcm1EYXRhLmg+CisjaW5jbHVkZSA8V2ViQ29yZS9IaXN0 b3J5SXRlbS5oPgorCit1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKKworbmFtZXNwYWNlIFdlYktp dCB7CisKK3N0YXRpYyBQYXNzUmVmUHRyPEZvcm1EYXRhPiB0b0Zvcm1EYXRhKGNvbnN0IEhUVFBC b2R5JiBodHRwQm9keSkKK3sKKyAgICBSZWZQdHI8Rm9ybURhdGE+IGZvcm1EYXRhID0gRm9ybURh dGE6OmNyZWF0ZSgpOworCisgICAgZm9yIChjb25zdCBhdXRvJiBlbGVtZW50IDogaHR0cEJvZHku ZWxlbWVudHMpIHsKKyAgICAgICAgc3dpdGNoIChlbGVtZW50LnR5cGUpIHsKKyAgICAgICAgY2Fz ZSBIVFRQQm9keTo6RWxlbWVudDo6VHlwZTo6RGF0YToKKyAgICAgICAgICAgIGZvcm1EYXRhLT5h cHBlbmREYXRhKGVsZW1lbnQuZGF0YS5kYXRhKCksIGVsZW1lbnQuZGF0YS5zaXplKCkpOworICAg ICAgICAgICAgYnJlYWs7CisKKyAgICAgICAgY2FzZSBIVFRQQm9keTo6RWxlbWVudDo6VHlwZTo6 RmlsZToKKyAgICAgICAgICAgIGZvcm1EYXRhLT5hcHBlbmRGaWxlUmFuZ2UoZWxlbWVudC5maWxl UGF0aCwgZWxlbWVudC5maWxlU3RhcnQsIGVsZW1lbnQuZmlsZUxlbmd0aC52YWx1ZU9yKEJsb2JE YXRhSXRlbTo6dG9FbmRPZkZpbGUpLCBlbGVtZW50LmV4cGVjdGVkRmlsZU1vZGlmaWNhdGlvblRp bWUudmFsdWVPcihpbnZhbGlkRmlsZVRpbWUoKSkpOworICAgICAgICAgICAgYnJlYWs7CisKKyAg ICAgICAgY2FzZSBIVFRQQm9keTo6RWxlbWVudDo6VHlwZTo6QmxvYjoKKyAgICAgICAgICAgIGZv cm1EYXRhLT5hcHBlbmRCbG9iKFVSTChVUkwoKSwgZWxlbWVudC5ibG9iVVJMU3RyaW5nKSk7Cisg ICAgICAgICAgICBicmVhazsKKyAgICAgICAgfQorICAgIH0KKworICAgIHJldHVybiBmb3JtRGF0 YS5yZWxlYXNlKCk7Cit9CisKK3N0YXRpYyB2b2lkIGFwcGx5RnJhbWVTdGF0ZShIaXN0b3J5SXRl bSYgaGlzdG9yeUl0ZW0sIGNvbnN0IEZyYW1lU3RhdGUmIGZyYW1lU3RhdGUpCit7CisgICAgaGlz dG9yeUl0ZW0uc2V0T3JpZ2luYWxVUkxTdHJpbmcoZnJhbWVTdGF0ZS5vcmlnaW5hbFVSTFN0cmlu Zyk7CisgICAgaGlzdG9yeUl0ZW0uc2V0UmVmZXJyZXIoZnJhbWVTdGF0ZS5yZWZlcnJlcik7Cisg ICAgaGlzdG9yeUl0ZW0uc2V0VGFyZ2V0KGZyYW1lU3RhdGUudGFyZ2V0KTsKKworICAgIGhpc3Rv cnlJdGVtLnNldERvY3VtZW50U3RhdGUoZnJhbWVTdGF0ZS5kb2N1bWVudFN0YXRlKTsKKworICAg IGlmIChmcmFtZVN0YXRlLnN0YXRlT2JqZWN0RGF0YSkgeworICAgICAgICBWZWN0b3I8dWludDhf dD4gc3RhdGVPYmplY3REYXRhID0gZnJhbWVTdGF0ZS5zdGF0ZU9iamVjdERhdGEudmFsdWUoKTsK KyAgICAgICAgaGlzdG9yeUl0ZW0uc2V0U3RhdGVPYmplY3QoU2VyaWFsaXplZFNjcmlwdFZhbHVl OjphZG9wdChzdGF0ZU9iamVjdERhdGEpKTsKKyAgICB9CisKKyAgICBoaXN0b3J5SXRlbS5zZXRE b2N1bWVudFNlcXVlbmNlTnVtYmVyKGZyYW1lU3RhdGUuZG9jdW1lbnRTZXF1ZW5jZU51bWJlcik7 CisgICAgaGlzdG9yeUl0ZW0uc2V0SXRlbVNlcXVlbmNlTnVtYmVyKGZyYW1lU3RhdGUuaXRlbVNl cXVlbmNlTnVtYmVyKTsKKworICAgIGhpc3RvcnlJdGVtLnNldFNjcm9sbFBvaW50KGZyYW1lU3Rh dGUuc2Nyb2xsUG9pbnQpOworICAgIGhpc3RvcnlJdGVtLnNldFBhZ2VTY2FsZUZhY3RvcihmcmFt ZVN0YXRlLnBhZ2VTY2FsZUZhY3Rvcik7CisKKyAgICBpZiAoZnJhbWVTdGF0ZS5odHRwQm9keSkg eworICAgICAgICBjb25zdCBhdXRvJiBodHRwQm9keSA9IGZyYW1lU3RhdGUuaHR0cEJvZHkudmFs dWUoKTsKKyAgICAgICAgaGlzdG9yeUl0ZW0uc2V0Rm9ybUNvbnRlbnRUeXBlKGh0dHBCb2R5LmNv bnRlbnRUeXBlKTsKKworICAgICAgICBoaXN0b3J5SXRlbS5zZXRGb3JtRGF0YSh0b0Zvcm1EYXRh KGh0dHBCb2R5KSk7CisgICAgfQorCisgICAgZm9yIChjb25zdCBhdXRvJiBjaGlsZEZyYW1lU3Rh dGUgOiBmcmFtZVN0YXRlLmNoaWxkcmVuKSB7CisgICAgICAgIFJlZlB0cjxIaXN0b3J5SXRlbT4g Y2hpbGRIaXN0b3J5SXRlbSA9IEhpc3RvcnlJdGVtOjpjcmVhdGUoY2hpbGRGcmFtZVN0YXRlLnVy bFN0cmluZywgU3RyaW5nKCkpOworICAgICAgICBhcHBseUZyYW1lU3RhdGUoKmNoaWxkSGlzdG9y eUl0ZW0sIGNoaWxkRnJhbWVTdGF0ZSk7CisKKyAgICAgICAgaGlzdG9yeUl0ZW0uYWRkQ2hpbGRJ dGVtKGNoaWxkSGlzdG9yeUl0ZW0ucmVsZWFzZSgpKTsKKyAgICB9Cit9CisKK1Bhc3NSZWZQdHI8 SGlzdG9yeUl0ZW0+IHRvSGlzdG9yeUl0ZW0oY29uc3QgUGFnZVN0YXRlJiBwYWdlU3RhdGUpCit7 CisgICAgUmVmUHRyPEhpc3RvcnlJdGVtPiBoaXN0b3J5SXRlbSA9IEhpc3RvcnlJdGVtOjpjcmVh dGUocGFnZVN0YXRlLm1haW5GcmFtZVN0YXRlLnVybFN0cmluZywgcGFnZVN0YXRlLnRpdGxlKTsK KyAgICBhcHBseUZyYW1lU3RhdGUoKmhpc3RvcnlJdGVtLCBwYWdlU3RhdGUubWFpbkZyYW1lU3Rh dGUpOworCisgICAgcmV0dXJuIGhpc3RvcnlJdGVtLnJlbGVhc2UoKTsKK30KKworfSAvLyBuYW1l c3BhY2UgV2ViS2l0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNv cmVTdXBwb3J0L1Nlc3Npb25TdGF0ZUNvbnZlcnNpb24uaCBiL1NvdXJjZS9XZWJLaXQyL1dlYlBy b2Nlc3MvV2ViQ29yZVN1cHBvcnQvU2Vzc2lvblN0YXRlQ29udmVyc2lvbi5oCm5ldyBmaWxlIG1v ZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAu LjMwYzQ1NDI1ZTVjOTQ5YjFiZGQ0MWQzYjQ5M2E4OTEzNzFiZjY2ZDAKLS0tIC9kZXYvbnVsbAor KysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1Nlc3Npb25TdGF0 ZUNvbnZlcnNpb24uaApAQCAtMCwwICsxLDQzIEBACisvKgorICogQ29weXJpZ2h0IChDKSAyMDE0 IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqCisgKiBSZWRpc3RyaWJ1dGlvbiBh bmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKKyAqIG1v ZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29u ZGl0aW9ucworICogYXJlIG1ldDoKKyAqIDEuIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29k ZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlz dCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisgKiAyLiBSZWRp c3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHly aWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxv d2luZyBkaXNjbGFpbWVyIGluIHRoZQorICogICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIg bWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KKyAqCisgKiBUSElTIFNP RlRXQVJFIElTIFBST1ZJREVEIEJZIEFQUExFIElOQy4gQU5EIElUUyBDT05UUklCVVRPUlMgYGBB UyBJUycnCisgKiBBTkQgQU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJ TkcsIEJVVCBOT1QgTElNSVRFRCBUTywKKyAqIFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVS Q0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIKKyAqIFBVUlBPU0UgQVJF IERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIEFQUExFIElOQy4gT1IgSVRTIENPTlRSSUJV VE9SUworICogQkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwg U1BFQ0lBTCwgRVhFTVBMQVJZLCBPUgorICogQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJ TkcsIEJVVCBOT1QgTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YKKyAqIFNVQlNUSVRVVEUgR09P RFMgT1IgU0VSVklDRVM7IExPU1MgT0YgVVNFLCBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVT UworICogSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZIFRIRU9SWSBPRiBM SUFCSUxJVFksIFdIRVRIRVIgSU4KKyAqIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBU T1JUIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpCisgKiBBUklTSU5HIElOIEFO WSBXQVkgT1VUIE9GIFRIRSBVU0UgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9G CisgKiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCisgKi8KKworI2lmbmRlZiBTZXNz aW9uU3RhdGVDb252ZXJzaW9uX2gKKyNkZWZpbmUgU2Vzc2lvblN0YXRlQ29udmVyc2lvbl9oCisK KyNpbmNsdWRlIDx3dGYvRm9yd2FyZC5oPgorCituYW1lc3BhY2UgV2ViQ29yZSB7CitjbGFzcyBI aXN0b3J5SXRlbTsKK307CisKK25hbWVzcGFjZSBXZWJLaXQgeworCitzdHJ1Y3QgUGFnZVN0YXRl OworCitQYXNzUmVmUHRyPFdlYkNvcmU6Okhpc3RvcnlJdGVtPiB0b0hpc3RvcnlJdGVtKGNvbnN0 IFBhZ2VTdGF0ZSYpOworCit9IC8vIG5hbWVzcGFjZSBXZWJLaXQKKworI2VuZGlmIC8vIFNlc3Np b25TdGF0ZUNvbnZlcnNpb25faAo=