56896 2011-03-22 21:09:23 -0700 Assertion and incorrect rendering of counters. 2011-03-23 19:25:28 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) PC All RESOLVED FIXED P2 Normal --- 1 carol webkit-unassigned commit-queue oldest_to_newest 371952 0 86566 carol 2011-03-22 21:09:23 -0700 Created attachment 86566 Test Case When multiple displays are assigned to the same counter i.e. like in this case: #testView:before { content: "First Counter:" counters(test, ".") " Second Counter:" counters(test, "."); } And the counter value changes, only the first display is invalidated. Which causes the second display to show the wrong value and a debug mode assertion on page tear down. The error is in CounterNode::resetCounters which iterates the list of display renderers incorrectly. 371969 1 86571 carol 2011-03-22 22:36:24 -0700 Created attachment 86571 Proposed patch. 372331 2 86571 hyatt 2011-03-23 12:18:35 -0700 Comment on attachment 86571 Proposed patch. r=me 372508 3 86713 carol 2011-03-23 15:47:12 -0700 Created attachment 86713 Proposed patch. Added comment at David Hyatt's suggestion. 372619 4 86713 commit-queue 2011-03-23 19:25:23 -0700 Comment on attachment 86713 Proposed patch. Added comment at David Hyatt's suggestion. Clearing flags on attachment: 86713 Committed r81844: <http://trac.webkit.org/changeset/81844> 372620 5 commit-queue 2011-03-23 19:25:28 -0700 All reviewed patches have been landed. Closing bug. 86566 2011-03-22 21:09:23 -0700 2011-03-22 21:09:23 -0700 Test Case 2displays.html text/html 1322 carol PCFET0NUWVBFIEhUTUwgUFVCTElDICItLy9XM0MvL0RURCBIVE1MIDQuMDEvL0VOIj4KPGh0bWw+ CiA8aGVhZD4KICA8dGl0bGU+MiByZW5kZXJlcnMgMSBjb3VudGVyIHJlc2V0IGZhaWx1cmUuPC90 aXRsZT4KICA8bWV0YSBuYW1lPSJhc3NlcnQiIGNvbnRlbnQ9IldoZW4gYSBDb3VudGVyIG5vZGUg aXMgZGVzdHJveWVkIGFsbCBpdHMKZGlzcGxheSByZW5kZXJlcnMgbXVzdCBiZSByZXNldC4iPgog IDxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyI+CiAgICN0ZXN0VmlldzpiZWZvcmUgewogICAgY29udGVu dDogIkZpcnN0IENvdW50ZXI6IiBjb3VudGVycyh0ZXN0LCAiLiIpICIgU2Vjb25kIENvdW50ZXI6 IiBjb3VudGVycyh0ZXN0LCAiLiIpOwogICB9CiAgIC5jb3VudGVyMSB7CiAgICBjb3VudGVyLXJl c2V0OiB0ZXN0IDE7CiAgIH0KICAgLmNvdW50ZXIxMDAwIHsKICAgIGNvdW50ZXItcmVzZXQ6IHRl c3QgMTAwMDsKICAgfQogIDwvc3R5bGU+CiAgPHNjcmlwdCBzcmM9Ii4uLy4uL2pzL3Jlc291cmNl cy9qcy10ZXN0LXByZS5qcyI+PC9zY3JpcHQ+CiAgPHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFzY3Jp cHQiPgoKICBpZiAod2luZG93LmxheW91dFRlc3RDb250cm9sbGVyKSB7CiAgICAgIGxheW91dFRl c3RDb250cm9sbGVyLmR1bXBBc1RleHQoKTsKICAgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIud2Fp dFVudGlsRG9uZSgpOwogIH0KCiAgZnVuY3Rpb24gcnVuKCkKICB7CiAgICAgIGRvY3VtZW50Lmdl dEVsZW1lbnRCeUlkKCJ0ZXN0VmlldyIpLnNldEF0dHJpYnV0ZSgiY2xhc3MiLCAiY291bnRlcjEw MDAiKTsKICAgICAgaWYgKCF3aW5kb3cubGF5b3V0VGVzdENvbnRyb2xsZXIpCiAgICAgICAgICBy ZXR1cm47CiAgICAgIHNob3VsZEJlKCJsYXlvdXRUZXN0Q29udHJvbGxlci5jb3VudGVyVmFsdWVG b3JFbGVtZW50QnlJZCgndGVzdFZpZXcnKSIsICInMTAwMCAxMDAwJyIpOwoKICAgICAgZGVidWco JycpOwogICAgICBkZWJ1ZygnVEVTVCBDT01QTEVURScpOwogICAgICAvLyBFbGltaW5hdGUgY29u ZnVzaW5nIG1lc3NhZ2VzIChjb3VudGVyIHZhbHVlcyB3b24ndCBiZSBkdW1wZWQgYnkgZHVtcEFz VGV4dCkuCiAgfQogIDwvc2NyaXB0PgogPC9oZWFkPgoKIDxib2R5IG9ubG9hZD0ic2V0VGltZW91 dCgncnVuKCknLCAwKTsiPgogPHA+VGhpcyB0ZXN0IHBhc3NlcyBpZiBib3RoIHRoZSBmaXJzdCBh bmQgdGhlIHNlY29uZCBjb3VudGVyIGFyZSAxMDAwLjwvcD4KIDxkaXYgaWQ9InRlc3RWaWV3IiBj bGFzcz0iY291bnRlcjEiPgogPC9kaXY+CiA8ZGl2IGlkPSJjb25zb2xlIj48L2Rpdj4KIDwvYm9k eT4KPC9odG1sPgo= 86571 2011-03-22 22:36:24 -0700 2011-03-23 15:47:12 -0700 Proposed patch. patchForW56896.patch text/plain 6360 carol ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBkYWZiNjM3Li42YjVhM2Y3IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTEtMDMt MjIgIENhcm9sIFN6YWJvICA8Y2Fyb2wuc3phYm9Abm9raWEuY29tPgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgdGVzdCB2ZXJpZmllcyB0aGUg Y29ycmVjdCB1cGRhdGUgb2YgYSBzZWNvbmQgcmVuZGVyZXIgdGhhdAorICAgICAgICBkaXNwbGF5 cyB0aGUgc2FtZSBDb3VudGVyTm9kZS4KKworICAgICAgICBBc3NlcnRpb24gYW5kIGluY29ycmVj dCByZW5kZXJpbmcgb2YgY291bnRlcnMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD01Njg5NgorCisgICAgICAgICogZmFzdC9jc3MvY291bnRlcnMvMmRp c3BsYXlzLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogZmFzdC9jc3MvY291bnRlcnMv MmRpc3BsYXlzLmh0bWw6IEFkZGVkLgorCiAyMDExLTAzLTIyICBKYW1lcyBTaW1vbnNlbiAgPHNp bW9uamFtQGNocm9taXVtLm9yZz4KIAogICAgICAgICBbQ2hyb21pdW1dIFVucmV2aWV3ZWQsIHJl YmFzZWxpbmUgY2hyb21pdW0gZ3B1IHRlc3RzIGFmdGVyIHI4MTcxNS4KZGlmZiAtLWdpdCBhL0xh eW91dFRlc3RzL2Zhc3QvY3NzL2NvdW50ZXJzLzJkaXNwbGF5cy1leHBlY3RlZC50eHQgYi9MYXlv dXRUZXN0cy9mYXN0L2Nzcy9jb3VudGVycy8yZGlzcGxheXMtZXhwZWN0ZWQudHh0Cm5ldyBmaWxl IG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjUyZDdjNWMKLS0tIC9kZXYvbnVsbAorKysgYi9M YXlvdXRUZXN0cy9mYXN0L2Nzcy9jb3VudGVycy8yZGlzcGxheXMtZXhwZWN0ZWQudHh0CkBAIC0w LDAgKzEsNiBAQAorVGhpcyB0ZXN0IHBhc3NlcyBpZiBib3RoIHRoZSBmaXJzdCBhbmQgdGhlIHNl Y29uZCBjb3VudGVyIGFyZSAxMDAwLgorCitQQVNTIGxheW91dFRlc3RDb250cm9sbGVyLmNvdW50 ZXJWYWx1ZUZvckVsZW1lbnRCeUlkKCd0ZXN0VmlldycpIGlzICcxMDAwIDEwMDAnCisKK1RFU1Qg Q09NUExFVEUKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9jc3MvY291bnRlcnMvMmRp c3BsYXlzLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2Nzcy9jb3VudGVycy8yZGlzcGxheXMuaHRt bApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4wZTQ1MDdhCi0tLSAvZGV2L251 bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9jc3MvY291bnRlcnMvMmRpc3BsYXlzLmh0bWwKQEAg LTAsMCArMSw0NyBAQAorPCFET0NUWVBFIEhUTUwgUFVCTElDICItLy9XM0MvL0RURCBIVE1MIDQu MDEvL0VOIj4KKzxodG1sPgorIDxoZWFkPgorICA8dGl0bGU+MiByZW5kZXJlcnMgMSBjb3VudGVy IHJlc2V0IGZhaWx1cmUuPC90aXRsZT4KKyAgPG1ldGEgbmFtZT0iYXNzZXJ0IiBjb250ZW50PSJX aGVuIGEgQ291bnRlciBub2RlIGlzIGRlc3Ryb3llZCBhbGwgaXRzCitkaXNwbGF5IHJlbmRlcmVy cyBtdXN0IGJlIHJlc2V0LiI+CisgIDxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyI+CisgICAjdGVzdFZp ZXc6YmVmb3JlIHsKKyAgICBjb250ZW50OiAiRmlyc3QgQ291bnRlcjoiIGNvdW50ZXJzKHRlc3Qs ICIuIikgIiBTZWNvbmQgQ291bnRlcjoiIGNvdW50ZXJzKHRlc3QsICIuIik7CisgICB9CisgICAu Y291bnRlcjEgeworICAgIGNvdW50ZXItcmVzZXQ6IHRlc3QgMTsKKyAgIH0KKyAgIC5jb3VudGVy MTAwMCB7CisgICAgY291bnRlci1yZXNldDogdGVzdCAxMDAwOworICAgfQorICA8L3N0eWxlPgor ICA8c2NyaXB0IHNyYz0iLi4vLi4vanMvcmVzb3VyY2VzL2pzLXRlc3QtcHJlLmpzIj48L3Njcmlw dD4KKyAgPHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiPgorCisgIGlmICh3aW5kb3cubGF5 b3V0VGVzdENvbnRyb2xsZXIpIHsKKyAgICAgIGxheW91dFRlc3RDb250cm9sbGVyLmR1bXBBc1Rl eHQoKTsKKyAgICAgIGxheW91dFRlc3RDb250cm9sbGVyLndhaXRVbnRpbERvbmUoKTsKKyAgfQor CisgIGZ1bmN0aW9uIHJ1bigpCisgIHsKKyAgICAgIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJ0 ZXN0VmlldyIpLnNldEF0dHJpYnV0ZSgiY2xhc3MiLCAiY291bnRlcjEwMDAiKTsKKyAgICAgIGlm ICghd2luZG93LmxheW91dFRlc3RDb250cm9sbGVyKQorICAgICAgICAgIHJldHVybjsKKyAgICAg IHNob3VsZEJlKCJsYXlvdXRUZXN0Q29udHJvbGxlci5jb3VudGVyVmFsdWVGb3JFbGVtZW50QnlJ ZCgndGVzdFZpZXcnKSIsICInMTAwMCAxMDAwJyIpOworCisgICAgICBkZWJ1ZygnJyk7CisgICAg ICBkZWJ1ZygnVEVTVCBDT01QTEVURScpOworICAgICAgaWYgKHdpbmRvdy5sYXlvdXRUZXN0Q29u dHJvbGxlcikKKyAgICAgICAgICBsYXlvdXRUZXN0Q29udHJvbGxlci5ub3RpZnlEb25lKCk7Cisg IH0KKyAgPC9zY3JpcHQ+CisgPC9oZWFkPgorCisgPGJvZHkgb25sb2FkPSJzZXRUaW1lb3V0KCdy dW4oKScsIDApOyI+CisgPHA+VGhpcyB0ZXN0IHBhc3NlcyBpZiBib3RoIHRoZSBmaXJzdCBhbmQg dGhlIHNlY29uZCBjb3VudGVyIGFyZSAxMDAwLjwvcD4KKyA8ZGl2IGlkPSJ0ZXN0VmlldyIgY2xh c3M9ImNvdW50ZXIxIj4KKyA8L2Rpdj4KKyA8ZGl2IGlkPSJjb25zb2xlIj48L2Rpdj4KKyA8L2Jv ZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzFiYTJiYi4uODM5ZDgwMiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpA QCAtMSw1ICsxLDMwIEBACiAyMDExLTAzLTIyICBDYXJvbCBTemFibyAgPGNhcm9sLnN6YWJvQG5v a2lhLmNvbT4KIAorICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBNYWRlIHN1cmUgdGhhdCByZW5kZXJlcnMgZGlzcGxheWluZyBjb3VudGVycyBhcmUgaW52YWxp ZGF0ZWQgdXBvbgorICAgICAgICBjb3VudGVyIGRlc3RydWN0aW9uLgorCisgICAgICAgIEFzc2Vy dGlvbiBhbmQgaW5jb3JyZWN0IHJlbmRlcmluZyBvZiBjb3VudGVycy4KKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU2ODk2CisKKyAgICAgICAgVGVzdDog ZmFzdC9jc3MvY291bnRlcnMvMmRpc3BsYXlzLmh0bWwKKworICAgICAgICAqIHJlbmRlcmluZy9D b3VudGVyTm9kZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDb3VudGVyTm9kZTo6fkNvdW50ZXJO b2RlKToKKyAgICAgICAgQWRkZWQgdG8gbWFrZSBzdXJlIHRoYXQgaXRzIGRpc3BsYXkgcmVuZGVy ZXJzIGFyZSBhbHdheXMgcmVzZXQgd2hlbgorICAgICAgICB0aGUgbm9kZSBpcyBkZWxldGVkLgor ICAgICAgICAoV2ViQ29yZTo6Q291bnRlck5vZGU6OnJlc2V0UmVuZGVyZXJzKToKKyAgICAgICAg Rml4ZWQgYnVnIHRoYXQgd291bGQgcHJldmVudCByZXNldCBvZiBzZWNvbmQgYW5kIHN1YnNlcXVl bnQKKyAgICAgICAgZGlzcGxheSByZW5kZXJlcnMuCisgICAgICAgICogcmVuZGVyaW5nL0NvdW50 ZXJOb2RlLmg6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckNvdW50ZXIuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6ZGVzdHJveUNvdW50ZXJOb2RlV2l0aG91dE1hcFJlbW92YWwpOgorICAgICAg ICByZW1vdmVkIHVubmVjZXNzYXJ5IGNhbGxzIHRvIHJlc2V0UmVuZGVyZXJzKCkgYXMgdGhlIENv dW50ZXJOb2RlCisgICAgICAgIGRlc3RydWN0b3IgdGFrZXMgY2FyZSBvZiB0aGF0IG5vdy4KKwor MjAxMS0wMy0yMiAgQ2Fyb2wgU3phYm8gIDxjYXJvbC5zemFib0Bub2tpYS5jb20+CisKICAgICAg ICAgUmV2aWV3ZWQgYnkgRGF2aWQgSHlhdHQuCiAKICAgICAgICAgSW50cm9kdWNlZCBkb3VibGUg bGlua2FnZSBiZXR3ZWVuIGEgQ291bnRlck5vZGUgYW5kIGl0cyBkaXNwbGF5IHJlbmRlcmVyLgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0NvdW50ZXJOb2RlLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9Db3VudGVyTm9kZS5jcHAKaW5kZXggNGU4ZTNiZi4uODg3 ZDM3NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0NvdW50ZXJOb2RlLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvQ291bnRlck5vZGUuY3BwCkBAIC00Miw2 ICs0MiwxMSBAQCBDb3VudGVyTm9kZTo6Q291bnRlck5vZGUoUmVuZGVyT2JqZWN0KiBvLCBib29s IGhhc1Jlc2V0VHlwZSwgaW50IHZhbHVlKQogewogfQogCitDb3VudGVyTm9kZTo6fkNvdW50ZXJO b2RlKCkKK3sKKyAgICByZXNldFJlbmRlcmVycygpOworfQorCiBQYXNzUmVmUHRyPENvdW50ZXJO b2RlPiBDb3VudGVyTm9kZTo6Y3JlYXRlKFJlbmRlck9iamVjdCogb3duZXIsIGJvb2wgaGFzUmVz ZXRUeXBlLCBpbnQgdmFsdWUpCiB7CiAgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBDb3VudGVyTm9k ZShvd25lciwgaGFzUmVzZXRUeXBlLCB2YWx1ZSkpOwpAQCAtMTU5LDExICsxNjQsOCBAQCB2b2lk IENvdW50ZXJOb2RlOjpyZW1vdmVSZW5kZXJlcihSZW5kZXJDb3VudGVyKiB2YWx1ZSkKIAogdm9p ZCBDb3VudGVyTm9kZTo6cmVzZXRSZW5kZXJlcnMoKQogewotICAgIGZvciAoUmVuZGVyQ291bnRl ciogaXRlcmF0b3IgPSBtX3Jvb3RSZW5kZXJlcjtpdGVyYXRvcjsgaXRlcmF0b3IgPSBpdGVyYXRv ci0+bV9uZXh0Rm9yU2FtZUNvdW50ZXIpIHsKLSAgICAgICAgaXRlcmF0b3ItPmludmFsaWRhdGUo KTsKLSAgICAgICAgQVNTRVJUKCFpdGVyYXRvci0+bV9jb3VudGVyTm9kZSk7Ci0gICAgICAgIEFT U0VSVCghaXRlcmF0b3ItPm1fbmV4dEZvclNhbWVDb3VudGVyKTsKLSAgICB9CisgICAgd2hpbGUg KG1fcm9vdFJlbmRlcmVyKQorICAgICAgICBtX3Jvb3RSZW5kZXJlci0+aW52YWxpZGF0ZSgpOwog fQogCiB2b2lkIENvdW50ZXJOb2RlOjpyZXNldFRoaXNBbmREZXNjZW5kYW50c1JlbmRlcmVycygp CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvQ291bnRlck5vZGUuaCBiL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9Db3VudGVyTm9kZS5oCmluZGV4IDZlNWQ3NzMuLjdkNmRl ZjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9Db3VudGVyTm9kZS5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9Db3VudGVyTm9kZS5oCkBAIC00Myw3ICs0Myw3 IEBAIGNsYXNzIFJlbmRlckNvdW50ZXI7CiBjbGFzcyBDb3VudGVyTm9kZSA6IHB1YmxpYyBSZWZD b3VudGVkPENvdW50ZXJOb2RlPiB7CiBwdWJsaWM6CiAgICAgc3RhdGljIFBhc3NSZWZQdHI8Q291 bnRlck5vZGU+IGNyZWF0ZShSZW5kZXJPYmplY3QqLCBib29sIGlzUmVzZXQsIGludCB2YWx1ZSk7 Ci0KKyAgICB+Q291bnRlck5vZGUoKTsKICAgICBib29sIGFjdHNBc1Jlc2V0KCkgY29uc3QgeyBy ZXR1cm4gbV9oYXNSZXNldFR5cGUgfHwgIW1fcGFyZW50OyB9CiAgICAgYm9vbCBoYXNSZXNldFR5 cGUoKSBjb25zdCB7IHJldHVybiBtX2hhc1Jlc2V0VHlwZTsgfQogICAgIGludCB2YWx1ZSgpIGNv bnN0IHsgcmV0dXJuIG1fdmFsdWU7IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJDb3VudGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJD b3VudGVyLmNwcAppbmRleCA3MjZiMGNjLi5kYjBlODE4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyQ291bnRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckNvdW50ZXIuY3BwCkBAIC01MjIsOSArNTIyLDcgQEAgc3RhdGljIHZvaWQg ZGVzdHJveUNvdW50ZXJOb2RlV2l0aG91dE1hcFJlbW92YWwoY29uc3QgQXRvbWljU3RyaW5nJiBp ZGVudGlmaWVyLAogICAgICAgICBjaGlsZC0+cGFyZW50KCktPnJlbW92ZUNoaWxkKGNoaWxkLmdl dCgpKTsKICAgICAgICAgQVNTRVJUKGNvdW50ZXJNYXBzKCkuZ2V0KGNoaWxkLT5vd25lcigpKS0+ Z2V0KGlkZW50aWZpZXIuaW1wbCgpKSA9PSBjaGlsZCk7CiAgICAgICAgIGNvdW50ZXJNYXBzKCku Z2V0KGNoaWxkLT5vd25lcigpKS0+cmVtb3ZlKGlkZW50aWZpZXIuaW1wbCgpKTsKLSAgICAgICAg Y2hpbGQtPnJlc2V0UmVuZGVyZXJzKCk7CiAgICAgfQotICAgIG5vZGUtPnJlc2V0UmVuZGVyZXJz KCk7CiAgICAgaWYgKENvdW50ZXJOb2RlKiBwYXJlbnQgPSBub2RlLT5wYXJlbnQoKSkKICAgICAg ICAgcGFyZW50LT5yZW1vdmVDaGlsZChub2RlKTsKIH0K 86713 2011-03-23 15:47:12 -0700 2011-03-23 19:25:23 -0700 Proposed patch. Added comment at David Hyatt's suggestion. patchForW56896-2.patch text/plain 6354 carol ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBkNGQ5MWE0Li44ZGRjM2U5IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTEtMDMt MjMgIENhcm9sIFN6YWJvICA8Y2Fyb2wuc3phYm9Abm9raWEuY29tPgorCisgICAgICAgIFJldmll d2VkIGJ5IERhdmlkIEh5YXR0LgorCisgICAgICAgIFRoaXMgdGVzdCB2ZXJpZmllcyB0aGUgY29y cmVjdCB1cGRhdGUgb2YgYSBzZWNvbmQgcmVuZGVyZXIgdGhhdAorICAgICAgICBkaXNwbGF5cyB0 aGUgc2FtZSBDb3VudGVyTm9kZS4KKworICAgICAgICBBc3NlcnRpb24gYW5kIGluY29ycmVjdCBy ZW5kZXJpbmcgb2YgY291bnRlcnMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD01Njg5NgorCisgICAgICAgICogZmFzdC9jc3MvY291bnRlcnMvMmRpc3Bs YXlzLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogZmFzdC9jc3MvY291bnRlcnMvMmRp c3BsYXlzLmh0bWw6IEFkZGVkLgorCiAyMDExLTAzLTIzICBMdWl6IEFnb3N0aW5pICA8bHVpei5h Z29zdGluaUBvcGVuYm9zc2Eub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhdmlkIEh5YXR0 LgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9jc3MvY291bnRlcnMvMmRpc3BsYXlzLWV4 cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2Zhc3QvY3NzL2NvdW50ZXJzLzJkaXNwbGF5cy1leHBl Y3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNTJkN2M1YwotLS0g L2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvY3NzL2NvdW50ZXJzLzJkaXNwbGF5cy1l eHBlY3RlZC50eHQKQEAgLTAsMCArMSw2IEBACitUaGlzIHRlc3QgcGFzc2VzIGlmIGJvdGggdGhl IGZpcnN0IGFuZCB0aGUgc2Vjb25kIGNvdW50ZXIgYXJlIDEwMDAuCisKK1BBU1MgbGF5b3V0VGVz dENvbnRyb2xsZXIuY291bnRlclZhbHVlRm9yRWxlbWVudEJ5SWQoJ3Rlc3RWaWV3JykgaXMgJzEw MDAgMTAwMCcKKworVEVTVCBDT01QTEVURQorCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0 L2Nzcy9jb3VudGVycy8yZGlzcGxheXMuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvY3NzL2NvdW50 ZXJzLzJkaXNwbGF5cy5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjBl NDUwN2EKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2Nzcy9jb3VudGVycy8y ZGlzcGxheXMuaHRtbApAQCAtMCwwICsxLDQ3IEBACis8IURPQ1RZUEUgSFRNTCBQVUJMSUMgIi0v L1czQy8vRFREIEhUTUwgNC4wMS8vRU4iPgorPGh0bWw+CisgPGhlYWQ+CisgIDx0aXRsZT4yIHJl bmRlcmVycyAxIGNvdW50ZXIgcmVzZXQgZmFpbHVyZS48L3RpdGxlPgorICA8bWV0YSBuYW1lPSJh c3NlcnQiIGNvbnRlbnQ9IldoZW4gYSBDb3VudGVyIG5vZGUgaXMgZGVzdHJveWVkIGFsbCBpdHMK K2Rpc3BsYXkgcmVuZGVyZXJzIG11c3QgYmUgcmVzZXQuIj4KKyAgPHN0eWxlIHR5cGU9InRleHQv Y3NzIj4KKyAgICN0ZXN0VmlldzpiZWZvcmUgeworICAgIGNvbnRlbnQ6ICJGaXJzdCBDb3VudGVy OiIgY291bnRlcnModGVzdCwgIi4iKSAiIFNlY29uZCBDb3VudGVyOiIgY291bnRlcnModGVzdCwg Ii4iKTsKKyAgIH0KKyAgIC5jb3VudGVyMSB7CisgICAgY291bnRlci1yZXNldDogdGVzdCAxOwor ICAgfQorICAgLmNvdW50ZXIxMDAwIHsKKyAgICBjb3VudGVyLXJlc2V0OiB0ZXN0IDEwMDA7Cisg ICB9CisgIDwvc3R5bGU+CisgIDxzY3JpcHQgc3JjPSIuLi8uLi9qcy9yZXNvdXJjZXMvanMtdGVz dC1wcmUuanMiPjwvc2NyaXB0PgorICA8c2NyaXB0IHR5cGU9InRleHQvamF2YXNjcmlwdCI+CisK KyAgaWYgKHdpbmRvdy5sYXlvdXRUZXN0Q29udHJvbGxlcikgeworICAgICAgbGF5b3V0VGVzdENv bnRyb2xsZXIuZHVtcEFzVGV4dCgpOworICAgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIud2FpdFVu dGlsRG9uZSgpOworICB9CisKKyAgZnVuY3Rpb24gcnVuKCkKKyAgeworICAgICAgZG9jdW1lbnQu Z2V0RWxlbWVudEJ5SWQoInRlc3RWaWV3Iikuc2V0QXR0cmlidXRlKCJjbGFzcyIsICJjb3VudGVy MTAwMCIpOworICAgICAgaWYgKCF3aW5kb3cubGF5b3V0VGVzdENvbnRyb2xsZXIpCisgICAgICAg ICAgcmV0dXJuOworICAgICAgc2hvdWxkQmUoImxheW91dFRlc3RDb250cm9sbGVyLmNvdW50ZXJW YWx1ZUZvckVsZW1lbnRCeUlkKCd0ZXN0VmlldycpIiwgIicxMDAwIDEwMDAnIik7CisKKyAgICAg IGRlYnVnKCcnKTsKKyAgICAgIGRlYnVnKCdURVNUIENPTVBMRVRFJyk7CisgICAgICBpZiAod2lu ZG93LmxheW91dFRlc3RDb250cm9sbGVyKQorICAgICAgICAgIGxheW91dFRlc3RDb250cm9sbGVy Lm5vdGlmeURvbmUoKTsKKyAgfQorICA8L3NjcmlwdD4KKyA8L2hlYWQ+CisKKyA8Ym9keSBvbmxv YWQ9InNldFRpbWVvdXQoJ3J1bigpJywgMCk7Ij4KKyA8cD5UaGlzIHRlc3QgcGFzc2VzIGlmIGJv dGggdGhlIGZpcnN0IGFuZCB0aGUgc2Vjb25kIGNvdW50ZXIgYXJlIDEwMDAuPC9wPgorIDxkaXYg aWQ9InRlc3RWaWV3IiBjbGFzcz0iY291bnRlcjEiPgorIDwvZGl2PgorIDxkaXYgaWQ9ImNvbnNv bGUiPjwvZGl2PgorIDwvYm9keT4KKzwvaHRtbD4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA3MmQ1YjY0Li41OGM0 ZjM0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl YkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjggQEAKKzIwMTEtMDMtMjMgIENhcm9sIFN6YWJv ICA8Y2Fyb2wuc3phYm9Abm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IERhdmlkIEh5 YXR0LgorCisgICAgICAgIE1hZGUgc3VyZSB0aGF0IHJlbmRlcmVycyBkaXNwbGF5aW5nIGNvdW50 ZXJzIGFyZSBpbnZhbGlkYXRlZCB1cG9uCisgICAgICAgIGNvdW50ZXIgZGVzdHJ1Y3Rpb24uCisK KyAgICAgICAgQXNzZXJ0aW9uIGFuZCBpbmNvcnJlY3QgcmVuZGVyaW5nIG9mIGNvdW50ZXJzLgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTY4OTYKKwor ICAgICAgICBUZXN0OiBmYXN0L2Nzcy9jb3VudGVycy8yZGlzcGxheXMuaHRtbAorCisgICAgICAg ICogcmVuZGVyaW5nL0NvdW50ZXJOb2RlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNvdW50ZXJO b2RlOjp+Q291bnRlck5vZGUpOgorICAgICAgICBBZGRlZCB0byBtYWtlIHN1cmUgdGhhdCBpdHMg ZGlzcGxheSByZW5kZXJlcnMgYXJlIGFsd2F5cyByZXNldCB3aGVuCisgICAgICAgIHRoZSBub2Rl IGlzIGRlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpDb3VudGVyTm9kZTo6cmVzZXRSZW5kZXJl cnMpOgorICAgICAgICBGaXhlZCBidWcgdGhhdCB3b3VsZCBwcmV2ZW50IHJlc2V0IG9mIHNlY29u ZCBhbmQgc3Vic2VxdWVudAorICAgICAgICBkaXNwbGF5IHJlbmRlcmVycy4KKyAgICAgICAgKiBy ZW5kZXJpbmcvQ291bnRlck5vZGUuaDoKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQ291bnRl ci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpkZXN0cm95Q291bnRlck5vZGVXaXRob3V0TWFwUmVt b3ZhbCk6CisgICAgICAgIHJlbW92ZWQgdW5uZWNlc3NhcnkgY2FsbHMgdG8gcmVzZXRSZW5kZXJl cnMoKSBhcyB0aGUgQ291bnRlck5vZGUKKyAgICAgICAgZGVzdHJ1Y3RvciB0YWtlcyBjYXJlIG9m IHRoYXQgbm93LgorCiAyMDExLTAzLTIzICBMdWl6IEFnb3N0aW5pICA8bHVpei5hZ29zdGluaUBv cGVuYm9zc2Eub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhdmlkIEh5YXR0LgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0NvdW50ZXJOb2RlLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9Db3VudGVyTm9kZS5jcHAKaW5kZXggNGU4ZTNiZi4uMzIzZjVkYiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0NvdW50ZXJOb2RlLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvQ291bnRlck5vZGUuY3BwCkBAIC00Miw2ICs0Miwx MSBAQCBDb3VudGVyTm9kZTo6Q291bnRlck5vZGUoUmVuZGVyT2JqZWN0KiBvLCBib29sIGhhc1Jl c2V0VHlwZSwgaW50IHZhbHVlKQogewogfQogCitDb3VudGVyTm9kZTo6fkNvdW50ZXJOb2RlKCkK K3sKKyAgICByZXNldFJlbmRlcmVycygpOworfQorCiBQYXNzUmVmUHRyPENvdW50ZXJOb2RlPiBD b3VudGVyTm9kZTo6Y3JlYXRlKFJlbmRlck9iamVjdCogb3duZXIsIGJvb2wgaGFzUmVzZXRUeXBl LCBpbnQgdmFsdWUpCiB7CiAgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBDb3VudGVyTm9kZShvd25l ciwgaGFzUmVzZXRUeXBlLCB2YWx1ZSkpOwpAQCAtMTU5LDExICsxNjQsOCBAQCB2b2lkIENvdW50 ZXJOb2RlOjpyZW1vdmVSZW5kZXJlcihSZW5kZXJDb3VudGVyKiB2YWx1ZSkKIAogdm9pZCBDb3Vu dGVyTm9kZTo6cmVzZXRSZW5kZXJlcnMoKQogewotICAgIGZvciAoUmVuZGVyQ291bnRlciogaXRl cmF0b3IgPSBtX3Jvb3RSZW5kZXJlcjtpdGVyYXRvcjsgaXRlcmF0b3IgPSBpdGVyYXRvci0+bV9u ZXh0Rm9yU2FtZUNvdW50ZXIpIHsKLSAgICAgICAgaXRlcmF0b3ItPmludmFsaWRhdGUoKTsKLSAg ICAgICAgQVNTRVJUKCFpdGVyYXRvci0+bV9jb3VudGVyTm9kZSk7Ci0gICAgICAgIEFTU0VSVCgh aXRlcmF0b3ItPm1fbmV4dEZvclNhbWVDb3VudGVyKTsKLSAgICB9CisgICAgd2hpbGUgKG1fcm9v dFJlbmRlcmVyKQorICAgICAgICBtX3Jvb3RSZW5kZXJlci0+aW52YWxpZGF0ZSgpOyAvLyBUaGlz IG1ha2VzIG1fcm9vdFJlbmRlcmVyIHBvaW50IHRvIHRoZSBuZXh0IHJlbmRlcmVyIGlmIGFueSBz aW5jZSBpdCBkaXNjb25uZWN0cyB0aGUgbV9yb290UmVuZGVyZXIgZnJvbSB0aGlzLgogfQogCiB2 b2lkIENvdW50ZXJOb2RlOjpyZXNldFRoaXNBbmREZXNjZW5kYW50c1JlbmRlcmVycygpCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvQ291bnRlck5vZGUuaCBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9Db3VudGVyTm9kZS5oCmluZGV4IDZlNWQ3NzMuLjdkNmRlZjggMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9Db3VudGVyTm9kZS5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9Db3VudGVyTm9kZS5oCkBAIC00Myw3ICs0Myw3IEBAIGNs YXNzIFJlbmRlckNvdW50ZXI7CiBjbGFzcyBDb3VudGVyTm9kZSA6IHB1YmxpYyBSZWZDb3VudGVk PENvdW50ZXJOb2RlPiB7CiBwdWJsaWM6CiAgICAgc3RhdGljIFBhc3NSZWZQdHI8Q291bnRlck5v ZGU+IGNyZWF0ZShSZW5kZXJPYmplY3QqLCBib29sIGlzUmVzZXQsIGludCB2YWx1ZSk7Ci0KKyAg ICB+Q291bnRlck5vZGUoKTsKICAgICBib29sIGFjdHNBc1Jlc2V0KCkgY29uc3QgeyByZXR1cm4g bV9oYXNSZXNldFR5cGUgfHwgIW1fcGFyZW50OyB9CiAgICAgYm9vbCBoYXNSZXNldFR5cGUoKSBj b25zdCB7IHJldHVybiBtX2hhc1Jlc2V0VHlwZTsgfQogICAgIGludCB2YWx1ZSgpIGNvbnN0IHsg cmV0dXJuIG1fdmFsdWU7IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJDb3VudGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJDb3VudGVy LmNwcAppbmRleCA2NGYwZjIyLi45YjhjNDkzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyQ291bnRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckNvdW50ZXIuY3BwCkBAIC01MzAsOSArNTMwLDcgQEAgc3RhdGljIHZvaWQgZGVzdHJv eUNvdW50ZXJOb2RlV2l0aG91dE1hcFJlbW92YWwoY29uc3QgQXRvbWljU3RyaW5nJiBpZGVudGlm aWVyLAogICAgICAgICBjaGlsZC0+cGFyZW50KCktPnJlbW92ZUNoaWxkKGNoaWxkLmdldCgpKTsK ICAgICAgICAgQVNTRVJUKGNvdW50ZXJNYXBzKCkuZ2V0KGNoaWxkLT5vd25lcigpKS0+Z2V0KGlk ZW50aWZpZXIuaW1wbCgpKSA9PSBjaGlsZCk7CiAgICAgICAgIGNvdW50ZXJNYXBzKCkuZ2V0KGNo aWxkLT5vd25lcigpKS0+cmVtb3ZlKGlkZW50aWZpZXIuaW1wbCgpKTsKLSAgICAgICAgY2hpbGQt PnJlc2V0UmVuZGVyZXJzKCk7CiAgICAgfQotICAgIG5vZGUtPnJlc2V0UmVuZGVyZXJzKCk7CiAg ICAgaWYgKENvdW50ZXJOb2RlKiBwYXJlbnQgPSBub2RlLT5wYXJlbnQoKSkKICAgICAgICAgcGFy ZW50LT5yZW1vdmVDaGlsZChub2RlKTsKIH0K