43282 2010-07-30 16:14:32 -0700 The currentItem fixup done by BackForwardList::pushStateItem should be moved into HistoryController::pushState 2010-08-10 22:51:50 -0700 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 fishd fishd abarth beidson eric mihaip webkit.review.bot oldest_to_newest 258451 0 fishd 2010-07-30 16:14:32 -0700 The currentItem fixup done by BackForwardList::pushStateItem should be moved into HistoryController::pushState The BackForwardList operates on the top-most HistoryItem node. The HistoryController operates on the HistoryItem corresponding to a particular frame. 258472 1 63124 fishd 2010-07-30 16:49:04 -0700 Created attachment 63124 v1 patch 258475 2 fishd 2010-07-30 16:52:00 -0700 Note: the dereference of m_previousItem in HistoryController::pushState is protected by the null check of m_currentItem at the top of the function. This is because createItemTree has the side-effect of assigning m_previousItem. 258507 3 63124 darin 2010-07-30 18:16:10 -0700 Comment on attachment 63124 v1 patch > - HistoryItem* targetItem = m_frame->loader()->history()->currentItem(); LOL, m_frame->loader()->history() is a roundabout way of writing "this"! 258525 4 fishd 2010-07-30 20:07:59 -0700 (In reply to comment #3) > (From update of attachment 63124 [details]) > > - HistoryItem* targetItem = m_frame->loader()->history()->currentItem(); > > LOL, m_frame->loader()->history() is a roundabout way of writing "this"! Yup, and I was so proud of myself for avoiding HistoryItem::targetItem() too ;-) 258529 5 webkit.review.bot 2010-07-30 21:03:32 -0700 http://trac.webkit.org/changeset/64402 might have broken SnowLeopard Intel Release (Tests) 258531 6 fishd 2010-07-30 21:10:46 -0700 (In reply to comment #5) > http://trac.webkit.org/changeset/64402 might have broken SnowLeopard Intel Release (Tests) ^^^ fixed 263038 7 abarth 2010-08-10 22:51:50 -0700 This patch appears to have been landed. 63124 2010-07-30 16:49:04 -0700 2010-07-30 18:16:10 -0700 v1 patch hist_fix_1.txt text/plain 9826 fishd SW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZw0KPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KLS0tIExheW91dFRlc3Rz L0NoYW5nZUxvZwkocmV2aXNpb24gNjQzODYpCisrKyBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHdv cmtpbmcgY29weSkKQEAgLTEsMyArMSwxMyBAQAorMjAxMC0wNy0zMCAgRGFyaW4gRmlzaGVyICA8 ZGFyaW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIEVsaW1pbmF0ZSBCYWNrRm9yd2FyZExpc3Q6OnB1c2hTdGF0ZUl0ZW0KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQzMjgyCisKKyAg ICAgICAgKiBmYXN0L2xvYWRlci9zdGF0ZW9iamVjdHMvcHVzaHN0YXRlLWluLWlmcmFtZS5odG1s OiBDb3BpZWQgZnJvbSBMYXlvdXRUZXN0cy9mYXN0L2xvYWRlci9zdGF0ZW9iamVjdHMvcHVzaHN0 YXRlLWluLWlmcmFtZS5odG1sLWRpc2FibGVkLgorICAgICAgICAqIGZhc3QvbG9hZGVyL3N0YXRl b2JqZWN0cy9wdXNoc3RhdGUtaW4taWZyYW1lLmh0bWwtZGlzYWJsZWQ6IFJlbW92ZWQuCisKIDIw MTAtMDctMzAgIER1bWl0cnUgRGFuaWxpdWMgIDxkdW1pQGNocm9taXVtLm9yZz4KIAogICAgICAg ICBSZXZpZXdlZCBieSBEYXZpbiBMZXZpbi4KSW5kZXg6IExheW91dFRlc3RzXGZhc3RcbG9hZGVy XHN0YXRlb2JqZWN0c1xwdXNoc3RhdGUtaW4taWZyYW1lLmh0bWwKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5 b3V0VGVzdHNcZmFzdFxsb2FkZXJcc3RhdGVvYmplY3RzXHB1c2hzdGF0ZS1pbi1pZnJhbWUuaHRt bAkocmV2aXNpb24gNjQzNzIpCShmcm9tIExheW91dFRlc3RzL2Zhc3QvbG9hZGVyL3N0YXRlb2Jq ZWN0cy9wdXNoc3RhdGUtaW4taWZyYW1lLmh0bWwtZGlzYWJsZWQ6NjQzNzIpCisrKyBMYXlvdXRU ZXN0c1xmYXN0XGxvYWRlclxzdGF0ZW9iamVjdHNccHVzaHN0YXRlLWluLWlmcmFtZS5odG1sCSh3 b3JraW5nIGNvcHkpCkBAIC0wLDAgKzEsNyBAQAorPHNjcmlwdD4KK2lmICh3aW5kb3cubGF5b3V0 VGVzdENvbnRyb2xsZXIpIHsKKyAgbGF5b3V0VGVzdENvbnRyb2xsZXIuZHVtcEFzVGV4dCgpOwor ICBsYXlvdXRUZXN0Q29udHJvbGxlci53YWl0VW50aWxEb25lKCk7Cit9Cis8L3NjcmlwdD4KKzxp ZnJhbWUgc3JjPSJyZXNvdXJjZXMvcHVzaHN0YXRlLWluLWlmcmFtZS1jaGlsZC5odG1sIj4KSW5k ZXg6IExheW91dFRlc3RzL2Zhc3QvbG9hZGVyL3N0YXRlb2JqZWN0cy9wdXNoc3RhdGUtaW4taWZy YW1lLmh0bWwtZGlzYWJsZWQNCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NCi0tLSBMYXlvdXRUZXN0cy9mYXN0L2xvYWRl ci9zdGF0ZW9iamVjdHMvcHVzaHN0YXRlLWluLWlmcmFtZS5odG1sLWRpc2FibGVkCShyZXZpc2lv biA2NDM3MikKKysrIExheW91dFRlc3RzL2Zhc3QvbG9hZGVyL3N0YXRlb2JqZWN0cy9wdXNoc3Rh dGUtaW4taWZyYW1lLmh0bWwtZGlzYWJsZWQJKHdvcmtpbmcgY29weSkKQEAgLTEsNyArMCwwIEBA Ci08c2NyaXB0PgotaWYgKHdpbmRvdy5sYXlvdXRUZXN0Q29udHJvbGxlcikgewotICBsYXlvdXRU ZXN0Q29udHJvbGxlci5kdW1wQXNUZXh0KCk7Ci0gIGxheW91dFRlc3RDb250cm9sbGVyLndhaXRV bnRpbERvbmUoKTsKLX0KLTwvc2NyaXB0PgotPGlmcmFtZSBzcmM9InJlc291cmNlcy9wdXNoc3Rh dGUtaW4taWZyYW1lLWNoaWxkLmh0bWwiPgpJbmRleDogV2ViQ29yZS9DaGFuZ2VMb2cNCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0NCi0tLSBXZWJDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gNjQzODYpCisrKyBXZWJDb3Jl L0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMxIEBACisyMDEwLTA3LTMwICBE YXJpbiBGaXNoZXIgIDxkYXJpbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRWxpbWluYXRlIEJhY2tGb3J3YXJkTGlzdDo6cHVz aFN0YXRlSXRlbQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9NDMyODIKKworICAgICAgICBUaGUgbGF5b3V0IHRlc3Qgd2FzIHByZXZpb3VzbHkgZGlzYWJs ZWQgYmVjYXVzZSBvZiB0aGUgYXNzZXJ0aW9uIGJlaW5nCisgICAgICAgIGhpdCBpbiBCYWNrRm9y d2FyZExpc3Q6OnB1c2hTdGF0ZUl0ZW0uICBUaGF0IGFzc2VydGlvbiByZXZlYWxlZCB0aGUgbmVl ZAorICAgICAgICBmb3IgdGhpcyBwYXRjaC4KKworICAgICAgICBUZXN0OiBmYXN0L2xvYWRlci9z dGF0ZW9iamVjdHMvcHVzaHN0YXRlLWluLWlmcmFtZS5odG1sCisKKyAgICAgICAgKiBoaXN0b3J5 L0JhY2tGb3J3YXJkTGlzdC5oOgorICAgICAgICAqIGhpc3RvcnkvQmFja0ZvcndhcmRMaXN0Q2hy b21pdW0uY3BwOgorICAgICAgICAqIGhpc3RvcnkvQmFja0ZvcndhcmRMaXN0SW1wbC5jcHA6Cisg ICAgICAgICogaGlzdG9yeS9CYWNrRm9yd2FyZExpc3RJbXBsLmg6CisKKyAgICAgICAgKiBsb2Fk ZXIvSGlzdG9yeUNvbnRyb2xsZXIuY3BwOiBNb3ZlIHRoZSBsb2dpYywgb2YgYWRkaW5nIGEgbnVs bCBzdGF0ZQorICAgICAgICBvYmplY3QgdG8gdGhlIEhpc3RvcnlJdGVtIHRoYXQgd2FzIHByZXZp b3VzbHkgdGhlIGN1cnJlbnQgSGlzdG9yeUl0ZW0sIHRvCisgICAgICAgIEhpc3RvcnlDb250cm9s bGVyOjpwdXNoU3RhdGUgZnJvbSBCYWNrRm9yd2FyZExpc3Q6OnB1c2hTdGF0ZUl0ZW0uICBUaGUK KyAgICAgICAgQmFja0ZvcndhcmRMaXN0IHdhcyB0aGUgd3JvbmcgcGxhY2UgZm9yIHRoYXQgbG9n aWMgc2luY2UgaXQgbGFja2VkIGNvbnZlbmllbnQKKyAgICAgICAgYWNjZXNzIHRvIHRoZSB0YXJn ZXQgSGlzdG9yeUl0ZW0uICBJdCBpcyBqdXN0IGdpdmVuIHRoZSB0b3AtbW9zdCBIaXN0b3J5SXRl bQorICAgICAgICBjb3JyZXNwb25kaW5nIHRvIHRoZSBuZXcgbmF2aWdhdGlvbi4KKworICAgICAg ICAoV2ViQ29yZTo6SGlzdG9yeUNvbnRyb2xsZXI6OnVwZGF0ZUJhY2tGb3J3YXJkTGlzdENsaXBw ZWRBdFRhcmdldCk6CisgICAgICAgIChXZWJDb3JlOjpIaXN0b3J5Q29udHJvbGxlcjo6cHVzaFN0 YXRlKToKKwogMjAxMC0wNy0zMCAgSmFtZXMgUm9iaW5zb24gIDxqYW1lc3JAY2hyb21pdW0ub3Jn PgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEZpc2hlci4KSW5kZXg6IFdlYkNvcmUvaGlz dG9yeS9CYWNrRm9yd2FyZExpc3QuaA0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KLS0tIFdlYkNvcmUvaGlzdG9yeS9C YWNrRm9yd2FyZExpc3QuaAkocmV2aXNpb24gNjQzNjgpCisrKyBXZWJDb3JlL2hpc3RvcnkvQmFj a0ZvcndhcmRMaXN0LmgJKHdvcmtpbmcgY29weSkKQEAgLTk0LDggKzk0LDYgQEAgcHVibGljOiAK ICAgICB2aXJ0dWFsIHZvaWQgcmVtb3ZlSXRlbShIaXN0b3J5SXRlbSopICA9IDA7CiAgICAgdmly dHVhbCBIaXN0b3J5SXRlbVZlY3RvciYgZW50cmllcygpICA9IDA7CiAgICAgCi0gICAgdmlydHVh bCB2b2lkIHB1c2hTdGF0ZUl0ZW0oUGFzc1JlZlB0cjxIaXN0b3J5SXRlbT4pID0gMDsKLQogI2lm IEVOQUJMRShXTUwpCiAgICAgdmlydHVhbCB2b2lkIGNsZWFyV01MUGFnZUhpc3RvcnkoKSAgPSAw OwogI2VuZGlmCkluZGV4OiBXZWJDb3JlL2hpc3RvcnkvQmFja0ZvcndhcmRMaXN0Q2hyb21pdW0u Y3BwDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09DQotLS0gV2ViQ29yZS9oaXN0b3J5L0JhY2tGb3J3YXJkTGlzdENocm9t aXVtLmNwcAkocmV2aXNpb24gNjQzNjgpCisrKyBXZWJDb3JlL2hpc3RvcnkvQmFja0ZvcndhcmRM aXN0Q2hyb21pdW0uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMjEsMTYgKzEyMSw2IEBAIEhpc3Rv cnlJdGVtKiBCYWNrRm9yd2FyZExpc3RJbXBsOjppdGVtQXQKICAgICByZXR1cm4gbV9jbGllbnQt Pml0ZW1BdEluZGV4KGluZGV4KTsKIH0KIAotdm9pZCBCYWNrRm9yd2FyZExpc3RJbXBsOjpwdXNo U3RhdGVJdGVtKFBhc3NSZWZQdHI8SGlzdG9yeUl0ZW0+IG5ld0l0ZW0pCi17Ci0gICAgUmVmUHRy PEhpc3RvcnlJdGVtPiBjdXJyZW50ID0gbV9jbGllbnQtPmN1cnJlbnRJdGVtKCk7Ci0KLSAgICBh ZGRJdGVtKG5ld0l0ZW0pOwotCi0gICAgaWYgKCFjdXJyZW50LT5zdGF0ZU9iamVjdCgpKQotICAg ICAgICBjdXJyZW50LT5zZXRTdGF0ZU9iamVjdChTZXJpYWxpemVkU2NyaXB0VmFsdWU6OmNyZWF0 ZSgpKTsKLX0KLQogSGlzdG9yeUl0ZW1WZWN0b3ImIEJhY2tGb3J3YXJkTGlzdEltcGw6OmVudHJp ZXMoKQogewogICAgIHN0YXRpYyBIaXN0b3J5SXRlbVZlY3RvciBub0VudHJpZXM7CkluZGV4OiBX ZWJDb3JlL2hpc3RvcnkvQmFja0ZvcndhcmRMaXN0SW1wbC5jcHANCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NCi0tLSBX ZWJDb3JlL2hpc3RvcnkvQmFja0ZvcndhcmRMaXN0SW1wbC5jcHAJKHJldmlzaW9uIDY0MzY4KQor KysgV2ViQ29yZS9oaXN0b3J5L0JhY2tGb3J3YXJkTGlzdEltcGwuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC0yNDIsMjAgKzI0Miw2IEBAIEhpc3RvcnlJdGVtVmVjdG9yJiBCYWNrRm9yd2FyZExpc3RJ bXBsOjoKICAgICByZXR1cm4gbV9lbnRyaWVzOwogfQogCi12b2lkIEJhY2tGb3J3YXJkTGlzdElt cGw6OnB1c2hTdGF0ZUl0ZW0oUGFzc1JlZlB0cjxIaXN0b3J5SXRlbT4gbmV3SXRlbSkKLXsKLSAg ICBBU1NFUlQobmV3SXRlbSk7Ci0gICAgQVNTRVJUKG5ld0l0ZW0tPnN0YXRlT2JqZWN0KCkpOwot ICAgIAotICAgIFJlZlB0cjxIaXN0b3J5SXRlbT4gY3VycmVudCA9IGN1cnJlbnRJdGVtKCk7Ci0g ICAgQVNTRVJUKGN1cnJlbnQpOwotCi0gICAgYWRkSXRlbShuZXdJdGVtKTsKLSAgICAKLSAgICBp ZiAoIWN1cnJlbnQtPnN0YXRlT2JqZWN0KCkpCi0gICAgICAgIGN1cnJlbnQtPnNldFN0YXRlT2Jq ZWN0KFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZTo6Y3JlYXRlKCkpOwotfQotCiB2b2lkIEJhY2tGb3J3 YXJkTGlzdEltcGw6OmNsb3NlKCkKIHsKICAgICBpbnQgc2l6ZSA9IG1fZW50cmllcy5zaXplKCk7 CkluZGV4OiBXZWJDb3JlL2hpc3RvcnkvQmFja0ZvcndhcmRMaXN0SW1wbC5oDQo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 DQotLS0gV2ViQ29yZS9oaXN0b3J5L0JhY2tGb3J3YXJkTGlzdEltcGwuaAkocmV2aXNpb24gNjQz NjgpCisrKyBXZWJDb3JlL2hpc3RvcnkvQmFja0ZvcndhcmRMaXN0SW1wbC5oCSh3b3JraW5nIGNv cHkpCkBAIC04MCw4ICs4MCw2IEBAIHB1YmxpYzogCiAgICAgdm9pZCByZW1vdmVJdGVtKEhpc3Rv cnlJdGVtKik7CiAgICAgSGlzdG9yeUl0ZW1WZWN0b3ImIGVudHJpZXMoKTsKICAgICAKLSAgICB2 b2lkIHB1c2hTdGF0ZUl0ZW0oUGFzc1JlZlB0cjxIaXN0b3J5SXRlbT4pOwotCiAjaWYgRU5BQkxF KFdNTCkKICAgICB2b2lkIGNsZWFyV01MUGFnZUhpc3RvcnkoKTsKICNlbmRpZgpJbmRleDogV2Vi Q29yZS9sb2FkZXIvSGlzdG9yeUNvbnRyb2xsZXIuY3BwDQo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0gV2ViQ29y ZS9sb2FkZXIvSGlzdG9yeUNvbnRyb2xsZXIuY3BwCShyZXZpc2lvbiA2NDM2OSkKKysrIFdlYkNv cmUvbG9hZGVyL0hpc3RvcnlDb250cm9sbGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjE5LDkg KzYxOSw5IEBAIHZvaWQgSGlzdG9yeUNvbnRyb2xsZXI6OnVwZGF0ZUJhY2tGb3J3YXIKIAogICAg IGZyYW1lTG9hZGVyLT5jaGVja0RpZFBlcmZvcm1GaXJzdE5hdmlnYXRpb24oKTsKIAotICAgIFJl ZlB0cjxIaXN0b3J5SXRlbT4gaXRlbSA9IGZyYW1lTG9hZGVyLT5oaXN0b3J5KCktPmNyZWF0ZUl0 ZW1UcmVlKG1fZnJhbWUsIGRvQ2xpcCk7Ci0gICAgTE9HKEJhY2tGb3J3YXJkLCAiV2ViQ29yZUJh Y2tGb3J3YXJkIC0gQWRkaW5nIGJhY2tmb3J3YXJkIGl0ZW0gJXAgZm9yIGZyYW1lICVzIiwgaXRl bS5nZXQoKSwgbV9mcmFtZS0+bG9hZGVyKCktPmRvY3VtZW50TG9hZGVyKCktPnVybCgpLnN0cmlu ZygpLmFzY2lpKCkuZGF0YSgpKTsKLSAgICBwYWdlLT5iYWNrRm9yd2FyZExpc3QoKS0+YWRkSXRl bShpdGVtKTsKKyAgICBSZWZQdHI8SGlzdG9yeUl0ZW0+IHRvcEl0ZW0gPSBmcmFtZUxvYWRlci0+ aGlzdG9yeSgpLT5jcmVhdGVJdGVtVHJlZShtX2ZyYW1lLCBkb0NsaXApOworICAgIExPRyhCYWNr Rm9yd2FyZCwgIldlYkNvcmVCYWNrRm9yd2FyZCAtIEFkZGluZyBiYWNrZm9yd2FyZCBpdGVtICVw IGZvciBmcmFtZSAlcyIsIHRvcEl0ZW0uZ2V0KCksIG1fZnJhbWUtPmxvYWRlcigpLT5kb2N1bWVu dExvYWRlcigpLT51cmwoKS5zdHJpbmcoKS5hc2NpaSgpLmRhdGEoKSk7CisgICAgcGFnZS0+YmFj a0ZvcndhcmRMaXN0KCktPmFkZEl0ZW0odG9wSXRlbS5yZWxlYXNlKCkpOwogfQogCiB2b2lkIEhp c3RvcnlDb250cm9sbGVyOjpwdXNoU3RhdGUoUGFzc1JlZlB0cjxTZXJpYWxpemVkU2NyaXB0VmFs dWU+IHN0YXRlT2JqZWN0LCBjb25zdCBTdHJpbmcmIHRpdGxlLCBjb25zdCBTdHJpbmcmIHVybFN0 cmluZykKQEAgLTYzNSwxMyArNjM1LDE5IEBAIHZvaWQgSGlzdG9yeUNvbnRyb2xsZXI6OnB1c2hT dGF0ZShQYXNzUmUKICAgICAvLyBHZXQgYSBIaXN0b3J5SXRlbSB0cmVlIGZvciB0aGUgY3VycmVu dCBmcmFtZSB0cmVlLgogICAgIFJlZlB0cjxIaXN0b3J5SXRlbT4gdG9wSXRlbSA9IHBhZ2UtPm1h aW5GcmFtZSgpLT5sb2FkZXIoKS0+aGlzdG9yeSgpLT5jcmVhdGVJdGVtVHJlZShtX2ZyYW1lLCBm YWxzZSk7CiAgICAgCi0gICAgLy8gT3ZlcnJpZGUgZGF0YSBpbiB0aGUgdGFyZ2V0IGl0ZW0gdG8g cmVmbGVjdCB0aGUgcHVzaFN0YXRlKCkgYXJndW1lbnRzLgotICAgIEhpc3RvcnlJdGVtKiB0YXJn ZXRJdGVtID0gbV9mcmFtZS0+bG9hZGVyKCktPmhpc3RvcnkoKS0+Y3VycmVudEl0ZW0oKTsKLSAg ICB0YXJnZXRJdGVtLT5zZXRUaXRsZSh0aXRsZSk7Ci0gICAgdGFyZ2V0SXRlbS0+c2V0U3RhdGVP YmplY3Qoc3RhdGVPYmplY3QpOwotICAgIHRhcmdldEl0ZW0tPnNldFVSTFN0cmluZyh1cmxTdHJp bmcpOworICAgIC8vIE92ZXJyaWRlIGRhdGEgaW4gdGhlIGN1cnJlbnQgaXRlbSAoY3JlYXRlZCBi eSBjcmVhdGVJdGVtVHJlZSkgdG8gcmVmbGVjdAorICAgIC8vIHRoZSBwdXNoU3RhdGUoKSBhcmd1 bWVudHMuCisgICAgbV9jdXJyZW50SXRlbS0+c2V0VGl0bGUodGl0bGUpOworICAgIG1fY3VycmVu dEl0ZW0tPnNldFN0YXRlT2JqZWN0KHN0YXRlT2JqZWN0KTsKKyAgICBtX2N1cnJlbnRJdGVtLT5z ZXRVUkxTdHJpbmcodXJsU3RyaW5nKTsKKworICAgIC8vIENyZWF0ZSBhIG51bGwgc3RhdGUgb2Jq ZWN0IGZvciB0aGUgcHJldmlvdXMgSGlzdG9yeUl0ZW0gc28gdGhhdCB3ZSB3aWxsCisgICAgLy8g Z2VuZXJhdGUgYSBwb3BzdGF0ZSBldmVudCB3aGVuIG5hdmlnYXRpbmcgYmFjayB0byBpdC4KKyAg ICAvLyBGSVhNRTogaHR0cDovL3dlYmtpdC5vcmcvYi80MTM3MiBpbXBsaWVzIHRoYXQgd2Ugc2hv dWxkbid0IG5lZWQgdGhpcy4KKyAgICBpZiAoIW1fcHJldmlvdXNJdGVtLT5zdGF0ZU9iamVjdCgp KQorICAgICAgICBtX3ByZXZpb3VzSXRlbS0+c2V0U3RhdGVPYmplY3QoU2VyaWFsaXplZFNjcmlw dFZhbHVlOjpjcmVhdGUoKSk7CiAKLSAgICBwYWdlLT5iYWNrRm9yd2FyZExpc3QoKS0+cHVzaFN0 YXRlSXRlbSh0b3BJdGVtLnJlbGVhc2UoKSk7CisgICAgcGFnZS0+YmFja0ZvcndhcmRMaXN0KCkt PmFkZEl0ZW0odG9wSXRlbS5yZWxlYXNlKCkpOwogfQogCiB2b2lkIEhpc3RvcnlDb250cm9sbGVy OjpyZXBsYWNlU3RhdGUoUGFzc1JlZlB0cjxTZXJpYWxpemVkU2NyaXB0VmFsdWU+IHN0YXRlT2Jq ZWN0LCBjb25zdCBTdHJpbmcmIHRpdGxlLCBjb25zdCBTdHJpbmcmIHVybFN0cmluZykKSW5kZXg6 IFdlYktpdDIvQ2hhbmdlTG9nDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0gV2ViS2l0Mi9DaGFuZ2VMb2cJKHJl dmlzaW9uIDY0Mzg2KQorKysgV2ViS2l0Mi9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEs MyArMSwxMyBAQAorMjAxMC0wNy0zMCAgRGFyaW4gRmlzaGVyICA8ZGFyaW5AY2hyb21pdW0ub3Jn PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEVsaW1p bmF0ZSBCYWNrRm9yd2FyZExpc3Q6OnB1c2hTdGF0ZUl0ZW0KKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQzMjgyCisKKyAgICAgICAgKiBXZWJQcm9jZXNz L1dlYlBhZ2UvV2ViQmFja0ZvcndhcmRMaXN0UHJveHkuY3BwOgorICAgICAgICAqIFdlYlByb2Nl c3MvV2ViUGFnZS9XZWJCYWNrRm9yd2FyZExpc3RQcm94eS5oOgorCiAyMDEwLTA3LTMwICBTYW0g V2VpbmlnICA8c2FtQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQW5kZXJzIENh cmxzc29uLgpJbmRleDogV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViQmFja0ZvcndhcmRM aXN0UHJveHkuY3BwDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0gV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2Uv V2ViQmFja0ZvcndhcmRMaXN0UHJveHkuY3BwCShyZXZpc2lvbiA2NDM2OCkKKysrIFdlYktpdDIv V2ViUHJvY2Vzcy9XZWJQYWdlL1dlYkJhY2tGb3J3YXJkTGlzdFByb3h5LmNwcAkod29ya2luZyBj b3B5KQpAQCAtMjY0LDEwICsyNjQsNiBAQCBIaXN0b3J5SXRlbVZlY3RvciYgV2ViQmFja0Zvcndh cmRMaXN0UHJvCiAgICAgcmV0dXJuIG5vRW50cmllczsKIH0KIAotdm9pZCBXZWJCYWNrRm9yd2Fy ZExpc3RQcm94eTo6cHVzaFN0YXRlSXRlbShQYXNzUmVmUHRyPEhpc3RvcnlJdGVtPikKLXsKLX0K LQogI2lmIEVOQUJMRShXTUwpCiB2b2lkIFdlYkJhY2tGb3J3YXJkTGlzdFByb3h5OjpjbGVhcldN TFBhZ2VIaXN0b3J5KCkKIHsKSW5kZXg6IFdlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYkJh Y2tGb3J3YXJkTGlzdFByb3h5LmgNCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NCi0tLSBXZWJLaXQyL1dlYlByb2Nlc3Mv V2ViUGFnZS9XZWJCYWNrRm9yd2FyZExpc3RQcm94eS5oCShyZXZpc2lvbiA2NDM2OCkKKysrIFdl YktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYkJhY2tGb3J3YXJkTGlzdFByb3h5LmgJKHdvcmtp bmcgY29weSkKQEAgLTY2LDggKzY2LDYgQEAgcHVibGljOiAKICAgICB2b2lkIHJlbW92ZUl0ZW0o V2ViQ29yZTo6SGlzdG9yeUl0ZW0qKTsKICAgICBXZWJDb3JlOjpIaXN0b3J5SXRlbVZlY3RvciYg ZW50cmllcygpOwogICAgIAotICAgIHZvaWQgcHVzaFN0YXRlSXRlbShQYXNzUmVmUHRyPFdlYkNv cmU6Okhpc3RvcnlJdGVtPik7Ci0KICNpZiBFTkFCTEUoV01MKQogICAgIHZvaWQgY2xlYXJXTUxQ YWdlSGlzdG9yeSgpOwogI2VuZGlmCg==