51856 2011-01-03 17:41:25 -0800 Pass encoded back/forward tree data from the WebProcess to the UIProcess 2011-01-04 09:06:28 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 beidson webkit-unassigned webkit-ews oldest_to_newest 328851 0 beidson 2011-01-03 17:41:25 -0800 Pass encoded back/forward tree data from the Web->UI process. Followup from https://bugs.webkit.org/show_bug.cgi?id=51853 328864 1 77858 beidson 2011-01-03 18:08:39 -0800 Created attachment 77858 Patch v1 328871 2 webkit-ews 2011-01-03 18:21:20 -0800 Attachment 77858 did not build on qt: Build output: http://queues.webkit.org/results/7249375 328891 3 77858 darin 2011-01-03 21:26:42 -0800 Comment on attachment 77858 Patch v1 To avoid breaking the Qt build you should also remove QWKHistoryItem::originalUrl(). 329008 4 beidson 2011-01-04 09:06:28 -0800 r74970 77858 2011-01-03 18:08:39 -0800 2011-01-03 21:26:42 -0800 Patch v1 opatch.txt text/plain 10926 beidson SW5kZXg6IFdlYktpdDIvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvQ2hhbmdlTG9n CShyZXZpc2lvbiA3NDk1MSkKKysrIFdlYktpdDIvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMzAgQEAKKzIwMTEtMDEtMDMgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUu Y29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01MTg1NgorICAgICAgICBQYXNz IGVuY29kZWQgYmFjay9mb3J3YXJkIHRyZWUgZGF0YSBmcm9tIHRoZSBXZWJQcm9jZXNzIHRvIHRo ZSBVSVByb2Nlc3MKKworICAgICAgICBSZW1vdmUgdGhlIFdLQmFja0ZvcndhcmRMaXN0SXRlbUNv cHlPcmlnaW5hbFVSTCBBUEkgYXMgaXQncyBub3QgbmVlZGVkOgorICAgICAgICAqIFVJUHJvY2Vz cy9BUEkvQy9XS0JhY2tGb3J3YXJkTGlzdEl0ZW0uY3BwOgorICAgICAgICAqIFVJUHJvY2Vzcy9B UEkvQy9XS0JhY2tGb3J3YXJkTGlzdEl0ZW0uaDoKKyAgICAgICAgCisgICAgICAgICogVUlQcm9j ZXNzL1dlYkJhY2tGb3J3YXJkTGlzdEl0ZW0uY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJCYWNr Rm9yd2FyZExpc3RJdGVtOjpXZWJCYWNrRm9yd2FyZExpc3RJdGVtKToKKyAgICAgICAgKiBVSVBy b2Nlc3MvV2ViQmFja0ZvcndhcmRMaXN0SXRlbS5oOgorICAgICAgICAoV2ViS2l0OjpXZWJCYWNr Rm9yd2FyZExpc3RJdGVtOjpjcmVhdGUpOgorICAgICAgICAoV2ViS2l0OjpXZWJCYWNrRm9yd2Fy ZExpc3RJdGVtOjpzZXRCYWNrRm9yd2FyZERhdGEpOgorICAgICAgICAoV2ViS2l0OjpXZWJCYWNr Rm9yd2FyZExpc3RJdGVtOjpiYWNrRm9yd2FyZERhdGEpOgorICAgICAgICAKKyAgICAgICAgKiBV SVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vz c1Byb3h5OjphZGRCYWNrRm9yd2FyZEl0ZW0pOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQcm9j ZXNzUHJveHkuaDoKKyAgICAgICAgCisgICAgICAgICogVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94 eS5tZXNzYWdlcy5pbjoKKyAgICAgICAgCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dl YkJhY2tGb3J3YXJkTGlzdFByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6dXBkYXRlQmFja0Zv cndhcmRJdGVtKToKKwogMjAxMS0wMS0wMyAgWWkgU2hlbiAgPHlpLjQuc2hlbkBub2tpYS5jb20+ CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQWRhbSBCYXJ0aC4KSW5kZXg6IFdlYktpdDIvVUlQcm9j ZXNzL1dlYkJhY2tGb3J3YXJkTGlzdEl0ZW0uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvVUlQ cm9jZXNzL1dlYkJhY2tGb3J3YXJkTGlzdEl0ZW0uY3BwCShyZXZpc2lvbiA3NDk1MSkKKysrIFdl YktpdDIvVUlQcm9jZXNzL1dlYkJhY2tGb3J3YXJkTGlzdEl0ZW0uY3BwCSh3b3JraW5nIGNvcHkp CkBAIC0xLDUgKzEsNSBAQAogLyoKLSAqIENvcHlyaWdodCAoQykgMjAxMCBBcHBsZSBJbmMuIEFs bCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmlnaHQgKEMpIDIwMTAsIDIwMTEgQXBwbGUgSW5j LiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4g c291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogICogbW9kaWZpY2F0aW9u LCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBA IC0yNywxMSArMjcsMTIgQEAKIAogbmFtZXNwYWNlIFdlYktpdCB7CiAKLVdlYkJhY2tGb3J3YXJk TGlzdEl0ZW06OldlYkJhY2tGb3J3YXJkTGlzdEl0ZW0oY29uc3QgU3RyaW5nJiBvcmlnaW5hbFVS TCwgY29uc3QgU3RyaW5nJiB1cmwsIGNvbnN0IFN0cmluZyYgdGl0bGUsIHVpbnQ2NF90IGl0ZW1J RCkKK1dlYkJhY2tGb3J3YXJkTGlzdEl0ZW06OldlYkJhY2tGb3J3YXJkTGlzdEl0ZW0oY29uc3Qg U3RyaW5nJiBvcmlnaW5hbFVSTCwgY29uc3QgU3RyaW5nJiB1cmwsIGNvbnN0IFN0cmluZyYgdGl0 bGUsIGNvbnN0IFZlY3Rvcjx1aW50OF90PiYgYmFja0ZvcndhcmREYXRhLCB1aW50NjRfdCBpdGVt SUQpCiAgICAgOiBtX29yaWdpbmFsVVJMKG9yaWdpbmFsVVJMKQogICAgICwgbV91cmwodXJsKQog ICAgICwgbV90aXRsZSh0aXRsZSkKICAgICAsIG1faXRlbUlEKGl0ZW1JRCkKKyAgICAsIG1fYmFj a0ZvcndhcmREYXRhKGJhY2tGb3J3YXJkRGF0YSkKIHsKIH0KIApJbmRleDogV2ViS2l0Mi9VSVBy b2Nlc3MvV2ViQmFja0ZvcndhcmRMaXN0SXRlbS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvVUlQ cm9jZXNzL1dlYkJhY2tGb3J3YXJkTGlzdEl0ZW0uaAkocmV2aXNpb24gNzQ5NTEpCisrKyBXZWJL aXQyL1VJUHJvY2Vzcy9XZWJCYWNrRm9yd2FyZExpc3RJdGVtLmgJKHdvcmtpbmcgY29weSkKQEAg LTEsNSArMSw1IEBACiAvKgotICogQ29weXJpZ2h0IChDKSAyMDEwIEFwcGxlIEluYy4gQWxsIHJp Z2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAxMCwgMjAxMSBBcHBsZSBJbmMuIEFs bCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3Vy Y2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CiAgKiBtb2RpZmljYXRpb24sIGFy ZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTM4 LDkgKzM4LDkgQEAgY2xhc3MgV2ViQmFja0ZvcndhcmRMaXN0SXRlbSA6IHB1YmxpYyBBUAogcHVi bGljOgogICAgIHN0YXRpYyBjb25zdCBUeXBlIEFQSVR5cGUgPSBUeXBlQmFja0ZvcndhcmRMaXN0 SXRlbTsKIAotICAgIHN0YXRpYyBQYXNzUmVmUHRyPFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW0+IGNy ZWF0ZShjb25zdCBTdHJpbmcmIG9yaWdpbmFsVVJMLCBjb25zdCBTdHJpbmcmIHVybCwgY29uc3Qg U3RyaW5nJiB0aXRsZSwgdWludDY0X3QgaXRlbUlEKQorICAgIHN0YXRpYyBQYXNzUmVmUHRyPFdl YkJhY2tGb3J3YXJkTGlzdEl0ZW0+IGNyZWF0ZShjb25zdCBTdHJpbmcmIG9yaWdpbmFsVVJMLCBj b25zdCBTdHJpbmcmIHVybCwgY29uc3QgU3RyaW5nJiB0aXRsZSwgY29uc3QgVmVjdG9yPHVpbnQ4 X3Q+JiBiYWNrRm9yd2FyZERhdGEsIHVpbnQ2NF90IGl0ZW1JRCkKICAgICB7Ci0gICAgICAgIHJl dHVybiBhZG9wdFJlZihuZXcgV2ViQmFja0ZvcndhcmRMaXN0SXRlbShvcmlnaW5hbFVSTCwgdXJs LCB0aXRsZSwgaXRlbUlEKSk7CisgICAgICAgIHJldHVybiBhZG9wdFJlZihuZXcgV2ViQmFja0Zv cndhcmRMaXN0SXRlbShvcmlnaW5hbFVSTCwgdXJsLCB0aXRsZSwgYmFja0ZvcndhcmREYXRhLCBp dGVtSUQpKTsKICAgICB9CiAKICAgICB2aXJ0dWFsIH5XZWJCYWNrRm9yd2FyZExpc3RJdGVtKCk7 CkBAIC01NSw5ICs1NSwxMiBAQCBwdWJsaWM6CiAKICAgICB2b2lkIHNldFRpdGxlKGNvbnN0IFN0 cmluZyYgdGl0bGUpIHsgbV90aXRsZSA9IHRpdGxlOyB9CiAgICAgY29uc3QgU3RyaW5nJiB0aXRs ZSgpIGNvbnN0IHsgcmV0dXJuIG1fdGl0bGU7IH0KKyAgICAKKyAgICB2b2lkIHNldEJhY2tGb3J3 YXJkRGF0YShjb25zdCBWZWN0b3I8dWludDhfdD4mIGJhY2tGb3J3YXJkRGF0YSkgeyBtX2JhY2tG b3J3YXJkRGF0YSA9IGJhY2tGb3J3YXJkRGF0YTsgfQorICAgIGNvbnN0IFZlY3Rvcjx1aW50OF90 PiYgYmFja0ZvcndhcmREYXRhKCkgY29uc3QgeyByZXR1cm4gbV9iYWNrRm9yd2FyZERhdGE7IH0K IAogcHJpdmF0ZToKLSAgICBXZWJCYWNrRm9yd2FyZExpc3RJdGVtKGNvbnN0IFN0cmluZyYgb3Jp Z2luYWxVUkwsIGNvbnN0IFN0cmluZyYgdXJsLCBjb25zdCBTdHJpbmcmIHRpdGxlLCB1aW50NjRf dCBpdGVtSUQpOworICAgIFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW0oY29uc3QgU3RyaW5nJiBvcmln aW5hbFVSTCwgY29uc3QgU3RyaW5nJiB1cmwsIGNvbnN0IFN0cmluZyYgdGl0bGUsIGNvbnN0IFZl Y3Rvcjx1aW50OF90PiYgYmFja0ZvcndhcmREYXRhLCB1aW50NjRfdCBpdGVtSUQpOwogCiAgICAg dmlydHVhbCBUeXBlIHR5cGUoKSBjb25zdCB7IHJldHVybiBBUElUeXBlOyB9CiAKQEAgLTY1LDYg KzY4LDcgQEAgcHJpdmF0ZToKICAgICBTdHJpbmcgbV91cmw7CiAgICAgU3RyaW5nIG1fdGl0bGU7 CiAgICAgdWludDY0X3QgbV9pdGVtSUQ7CisgICAgVmVjdG9yPHVpbnQ4X3Q+IG1fYmFja0Zvcndh cmREYXRhOwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CkluZGV4OiBXZWJLaXQyL1VJUHJv Y2Vzcy9XZWJQcm9jZXNzUHJveHkuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvVUlQcm9jZXNz L1dlYlByb2Nlc3NQcm94eS5jcHAJKHJldmlzaW9uIDc0OTUxKQorKysgV2ViS2l0Mi9VSVByb2Nl c3MvV2ViUHJvY2Vzc1Byb3h5LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMSw1ICsxLDUgQEAKIC8q Ci0gKiBDb3B5cmlnaHQgKEMpIDIwMTAgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgor ICogQ29weXJpZ2h0IChDKSAyMDEwLCAyMDExIEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZl ZC4KICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZv cm1zLCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92 aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtMTgxLDEyICsxODEsMTIgQEAg V2ViQmFja0ZvcndhcmRMaXN0SXRlbSogV2ViUHJvY2Vzc1Byb3h5OgogICAgIHJldHVybiBtX2Jh Y2tGb3J3YXJkTGlzdEl0ZW1NYXAuZ2V0KGl0ZW1JRCkuZ2V0KCk7CiB9CiAKLXZvaWQgV2ViUHJv Y2Vzc1Byb3h5OjphZGRCYWNrRm9yd2FyZEl0ZW0odWludDY0X3QgaXRlbUlELCBjb25zdCBTdHJp bmcmIG9yaWdpbmFsVVJMLCBjb25zdCBTdHJpbmcmIHVybCwgY29uc3QgU3RyaW5nJiB0aXRsZSkK K3ZvaWQgV2ViUHJvY2Vzc1Byb3h5OjphZGRCYWNrRm9yd2FyZEl0ZW0odWludDY0X3QgaXRlbUlE LCBjb25zdCBTdHJpbmcmIG9yaWdpbmFsVVJMLCBjb25zdCBTdHJpbmcmIHVybCwgY29uc3QgU3Ry aW5nJiB0aXRsZSwgY29uc3QgVmVjdG9yPHVpbnQ4X3Q+JiBiYWNrRm9yd2FyZERhdGEpCiB7CiAg ICAgc3RkOjpwYWlyPFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW1NYXA6Oml0ZXJhdG9yLCBib29sPiBy ZXN1bHQgPSBtX2JhY2tGb3J3YXJkTGlzdEl0ZW1NYXAuYWRkKGl0ZW1JRCwgMCk7CiAgICAgaWYg KHJlc3VsdC5zZWNvbmQpIHsKICAgICAgICAgLy8gTmV3IGl0ZW0uCi0gICAgICAgIHJlc3VsdC5m aXJzdC0+c2Vjb25kID0gV2ViQmFja0ZvcndhcmRMaXN0SXRlbTo6Y3JlYXRlKG9yaWdpbmFsVVJM LCB1cmwsIHRpdGxlLCBpdGVtSUQpOworICAgICAgICByZXN1bHQuZmlyc3QtPnNlY29uZCA9IFdl YkJhY2tGb3J3YXJkTGlzdEl0ZW06OmNyZWF0ZShvcmlnaW5hbFVSTCwgdXJsLCB0aXRsZSwgYmFj a0ZvcndhcmREYXRhLCBpdGVtSUQpOwogICAgICAgICByZXR1cm47CiAgICAgfQogCkBAIC0xOTQs NiArMTk0LDcgQEAgdm9pZCBXZWJQcm9jZXNzUHJveHk6OmFkZEJhY2tGb3J3YXJkSXRlbQogICAg IHJlc3VsdC5maXJzdC0+c2Vjb25kLT5zZXRPcmlnaW5hbFVSTChvcmlnaW5hbFVSTCk7CiAgICAg cmVzdWx0LmZpcnN0LT5zZWNvbmQtPnNldFVSTCh1cmwpOwogICAgIHJlc3VsdC5maXJzdC0+c2Vj b25kLT5zZXRUaXRsZSh0aXRsZSk7CisgICAgcmVzdWx0LmZpcnN0LT5zZWNvbmQtPnNldEJhY2tG b3J3YXJkRGF0YShiYWNrRm9yd2FyZERhdGEpOwogfQogCiAjaWYgRU5BQkxFKFBMVUdJTl9QUk9D RVNTKQpJbmRleDogV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmgJKHJldmlzaW9uIDc0OTUx KQorKysgV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmgJKHdvcmtpbmcgY29weSkK QEAgLTEsNSArMSw1IEBACiAvKgotICogQ29weXJpZ2h0IChDKSAyMDEwIEFwcGxlIEluYy4gQWxs IHJpZ2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAxMCwgMjAxMSBBcHBsZSBJbmMu IEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBz b3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CiAgKiBtb2RpZmljYXRpb24s IGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKQEAg LTEwOSw3ICsxMDksNyBAQCBwcml2YXRlOgogCiAgICAgYm9vbCBzZW5kTWVzc2FnZShDb3JlSVBD OjpNZXNzYWdlSUQsIFBhc3NPd25QdHI8Q29yZUlQQzo6QXJndW1lbnRFbmNvZGVyPik7CiAKLSAg ICB2b2lkIGFkZEJhY2tGb3J3YXJkSXRlbSh1aW50NjRfdCBpdGVtSUQsIGNvbnN0IFN0cmluZyYg b3JpZ2luYWxVUkxTdHJpbmcsIGNvbnN0IFN0cmluZyYgdXJsU3RyaW5nLCBjb25zdCBTdHJpbmcm IHRpdGxlKTsKKyAgICB2b2lkIGFkZEJhY2tGb3J3YXJkSXRlbSh1aW50NjRfdCBpdGVtSUQsIGNv bnN0IFN0cmluZyYgb3JpZ2luYWxVUkxTdHJpbmcsIGNvbnN0IFN0cmluZyYgdXJsU3RyaW5nLCBj b25zdCBTdHJpbmcmIHRpdGxlLCBjb25zdCBWZWN0b3I8dWludDhfdD4mIGVuY29kZWREYXRhKTsK IAogI2lmIEVOQUJMRShQTFVHSU5fUFJPQ0VTUykKICAgICB2b2lkIGdldFBsdWdpblByb2Nlc3ND b25uZWN0aW9uKGNvbnN0IFN0cmluZyYgcGx1Z2luUGF0aCwgQ29yZUlQQzo6QXJndW1lbnRFbmNv ZGVyKiByZXBseSk7CkluZGV4OiBXZWJLaXQyL1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkubWVz c2FnZXMuaW4KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5 Lm1lc3NhZ2VzLmluCShyZXZpc2lvbiA3NDk1MSkKKysrIFdlYktpdDIvVUlQcm9jZXNzL1dlYlBy b2Nlc3NQcm94eS5tZXNzYWdlcy5pbgkod29ya2luZyBjb3B5KQpAQCAtMSw0ICsxLDQgQEAKLSMg Q29weXJpZ2h0IChDKSAyMDEwIEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyMgQ29w eXJpZ2h0IChDKSAyMDEwLCAyMDExIEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICMK ICMgUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0 aCBvciB3aXRob3V0CiAjIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0 IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtMjIsNyArMjIsNyBAQAogCiBtZXNzYWdlcyAt PiBXZWJQcm9jZXNzUHJveHkgewogCi0gICAgQWRkQmFja0ZvcndhcmRJdGVtKHVpbnQ2NF90IGl0 ZW1JRCwgV1RGOjpTdHJpbmcgb3JpZ2luYWxVUkwsIFdURjo6U3RyaW5nIHVybCwgV1RGOjpTdHJp bmcgdGl0bGUpCisgICAgQWRkQmFja0ZvcndhcmRJdGVtKHVpbnQ2NF90IGl0ZW1JRCwgV1RGOjpT dHJpbmcgb3JpZ2luYWxVUkwsIFdURjo6U3RyaW5nIHVybCwgV1RGOjpTdHJpbmcgdGl0bGUsIFdU Rjo6VmVjdG9yPHVpbnQ4X3Q+IGJhY2tGb3J3YXJkRGF0YSkKICAgICBEaWREZXN0cm95RnJhbWUo dWludDY0X3QgZnJhbWVJRCkgCiAKIH0KSW5kZXg6IFdlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dL QmFja0ZvcndhcmRMaXN0SXRlbS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL0MvV0tCYWNrRm9yd2FyZExpc3RJdGVtLmNwcAkocmV2aXNpb24gNzQ5NTEpCisrKyBXZWJL aXQyL1VJUHJvY2Vzcy9BUEkvQy9XS0JhY2tGb3J3YXJkTGlzdEl0ZW0uY3BwCSh3b3JraW5nIGNv cHkpCkBAIC0xLDUgKzEsNSBAQAogLyoKLSAqIENvcHlyaWdodCAoQykgMjAxMCBBcHBsZSBJbmMu IEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmlnaHQgKEMpIDIwMTAsIDIwMTEgQXBwbGUg SW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2Ug aW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogICogbW9kaWZpY2F0 aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25z CkBAIC0zNSwxMSArMzUsNiBAQCBXS1R5cGVJRCBXS0JhY2tGb3J3YXJkTGlzdEl0ZW1HZXRUeXBl SUQoCiAgICAgcmV0dXJuIHRvQVBJKFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW06OkFQSVR5cGUpOwog fQogCi1XS1VSTFJlZiBXS0JhY2tGb3J3YXJkTGlzdEl0ZW1Db3B5T3JpZ2luYWxVUkwoV0tCYWNr Rm9yd2FyZExpc3RJdGVtUmVmIGl0ZW1SZWYpCi17Ci0gICAgcmV0dXJuIHRvQ29waWVkVVJMQVBJ KHRvSW1wbChpdGVtUmVmKS0+b3JpZ2luYWxVUkwoKSk7Ci19Ci0KIFdLVVJMUmVmIFdLQmFja0Zv cndhcmRMaXN0SXRlbUNvcHlVUkwoV0tCYWNrRm9yd2FyZExpc3RJdGVtUmVmIGl0ZW1SZWYpCiB7 CiAgICAgcmV0dXJuIHRvQ29waWVkVVJMQVBJKHRvSW1wbChpdGVtUmVmKS0+dXJsKCkpOwpJbmRl eDogV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tCYWNrRm9yd2FyZExpc3RJdGVtLmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tCYWNrRm9yd2FyZExpc3RJdGVtLmgJ KHJldmlzaW9uIDc0OTUxKQorKysgV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tCYWNrRm9yd2Fy ZExpc3RJdGVtLmgJKHdvcmtpbmcgY29weSkKQEAgLTEsNSArMSw1IEBACiAvKgotICogQ29weXJp Z2h0IChDKSAyMDEwIEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdo dCAoQykgMjAxMCwgMjAxMSBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICog UmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBv ciB3aXRob3V0CiAgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0 aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTM0LDcgKzM0LDYgQEAgZXh0ZXJuICJDIiB7CiAK IFdLX0VYUE9SVCBXS1R5cGVJRCBXS0JhY2tGb3J3YXJkTGlzdEl0ZW1HZXRUeXBlSUQoKTsKIAot V0tfRVhQT1JUIFdLVVJMUmVmIFdLQmFja0ZvcndhcmRMaXN0SXRlbUNvcHlPcmlnaW5hbFVSTChX S0JhY2tGb3J3YXJkTGlzdEl0ZW1SZWYgaXRlbSk7CiBXS19FWFBPUlQgV0tVUkxSZWYgV0tCYWNr Rm9yd2FyZExpc3RJdGVtQ29weVVSTChXS0JhY2tGb3J3YXJkTGlzdEl0ZW1SZWYgaXRlbSk7CiBX S19FWFBPUlQgV0tTdHJpbmdSZWYgV0tCYWNrRm9yd2FyZExpc3RJdGVtQ29weVRpdGxlKFdLQmFj a0ZvcndhcmRMaXN0SXRlbVJlZiBpdGVtKTsKIApJbmRleDogV2ViS2l0Mi9XZWJQcm9jZXNzL1dl YlBhZ2UvV2ViQmFja0ZvcndhcmRMaXN0UHJveHkuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIv V2ViUHJvY2Vzcy9XZWJQYWdlL1dlYkJhY2tGb3J3YXJkTGlzdFByb3h5LmNwcAkocmV2aXNpb24g NzQ5NTEpCisrKyBXZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJCYWNrRm9yd2FyZExpc3RQ cm94eS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEsNSArMSw1IEBACiAvKgotICogQ29weXJpZ2h0 IChDKSAyMDEwIEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdodCAo QykgMjAxMCwgMjAxMSBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICogUmVk aXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3 aXRob3V0CiAgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUg Zm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTg3LDcgKzg3LDggQEAgc3RhdGljIHZvaWQgdXBkYXRl QmFja0ZvcndhcmRJdGVtKEhpc3RvcgogICAgIGNvbnN0IFN0cmluZyYgdXJsU3RyaW5nID0gaXRl bS0+dXJsU3RyaW5nKCk7CiAgICAgY29uc3QgU3RyaW5nJiB0aXRsZSA9IGl0ZW0tPnRpdGxlKCk7 CiAKLSAgICBXZWJQcm9jZXNzOjpzaGFyZWQoKS5jb25uZWN0aW9uKCktPnNlbmQoTWVzc2FnZXM6 OldlYlByb2Nlc3NQcm94eTo6QWRkQmFja0ZvcndhcmRJdGVtKGl0ZW1JRCwgb3JpZ2luYWxVUkxT dHJpbmcsIHVybFN0cmluZywgdGl0bGUpLCAwKTsKKyAgICAvLyBGSVhNRTogUGFzcyB0aGUgZW5j b2RlZCBiYWNrRm9yd2FyZERhdGEgdG8gdGhlIG1lc3NhZ2UgaGVyZS4KKyAgICBXZWJQcm9jZXNz OjpzaGFyZWQoKS5jb25uZWN0aW9uKCktPnNlbmQoTWVzc2FnZXM6OldlYlByb2Nlc3NQcm94eTo6 QWRkQmFja0ZvcndhcmRJdGVtKGl0ZW1JRCwgb3JpZ2luYWxVUkxTdHJpbmcsIHVybFN0cmluZywg dGl0bGUsIFZlY3Rvcjx1aW50OF90PigpKSwgMCk7CiB9CiAKIHN0YXRpYyB2b2lkIFdLMk5vdGlm eUhpc3RvcnlJdGVtQ2hhbmdlZChIaXN0b3J5SXRlbSogaXRlbSkK