31814 2009-11-23 15:57:06 -0800 Inconsistent use of counterName and identifier in CSS counter code and loss of information about the counter type. 2009-12-21 12:12:00 -0800 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 31723 11031 1 carol carol commit-queue darin webkit.review.bot oldest_to_newest 165956 0 carol 2009-11-23 15:57:06 -0800 Patch coming soon. 170274 1 44587 carol 2009-12-09 18:11:30 -0800 Created attachment 44587 Proposed Patch Added accessors and members to the CounterNode class to differentiate between reset type nodes and nodes that act as reset because they are not in the scope of any other counter node with the same identifier. This is useful in reevaluating the values of counters when new counters are added to the DOM that may make a root node non-root. Changed references to counterName to identifier for consistency. 170277 2 webkit.review.bot 2009-12-09 18:14:53 -0800 style-queue ran check-webkit-style on attachment 44587 without any errors. 174027 3 44587 darin 2009-12-21 12:03:42 -0800 Comment on attachment 44587 Proposed Patch > + // identifier must match the identifier of this counter. > void removeChild(CounterNode*, const AtomicString& identifier); The comment here is worded strangely. You say it must match. That makes it sound like it's a programming mistake if I pass an identifier that does not match. I don't think that's how it works. Maybe this wording: "Does nothing unless the identifier matches the identifier of the counter." Or maybe you can think of something better. r=me 174034 4 44587 commit-queue 2009-12-21 12:11:55 -0800 Comment on attachment 44587 Proposed Patch Clearing flags on attachment: 44587 Committed r52450: <http://trac.webkit.org/changeset/52450> 174035 5 commit-queue 2009-12-21 12:12:00 -0800 All reviewed patches have been landed. Closing bug. 44587 2009-12-09 18:11:30 -0800 2009-12-21 12:11:55 -0800 Proposed Patch patchFor31814-2.patch text/plain 11241 carol SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1MTkzMikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjYgQEAKKzIwMDktMTItMDkgIENhcm9sIFN6YWJvICA8Y2Fyb2wuc3phYm9Abm9r aWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IEluY29uc2lzdGVudCB1c2Ugb2YgY291bnRlck5hbWUgYW5kIGlkZW50aWZpZXIgaW4gQ1NTIGNv dW50ZXIgY29kZSBhbmQgbG9zcyBvZiBpbmZvcm1hdGlvbiBhYm91dCB0aGUgY291bnRlciB0eXBl LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzE4MTQK KworICAgICAgICBObyBuZXcgdGVzdHMgYmVjYXVzZSB0aGVyZSBhcmUgbm8gZnVuY3Rpb25hbCBj aGFuZ2VzIGluIHRoaXMgcGF0Y2guCisKKyAgICAgICAgKiByZW5kZXJpbmcvQ291bnRlck5vZGUu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6Q291bnRlck5vZGU6OkNvdW50ZXJOb2RlKToKKyAgICAg ICAgKFdlYkNvcmU6OkNvdW50ZXJOb2RlOjpjb21wdXRlQ291bnRJblBhcmVudCk6CisgICAgICAg IChXZWJDb3JlOjpzaG93VHJlZUFuZE1hcmspOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJD b3VudGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnBsYW5Db3VudGVyKToKKyAgICAgICAgKFdl YkNvcmU6OmZpbmRQbGFjZUZvckNvdW50ZXIpOgorICAgICAgICAoV2ViQ29yZTo6bWFrZUNvdW50 ZXJOb2RlKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckNvdW50ZXI6Om9yaWdpbmFsVGV4dCk6 CisgICAgICAgIENoYW5nZWQgdG8gdXNlIGlkZW50aWZpZXIgaW5zdGVhZCBvZiBjb3VudGVyTmFt ZSBhbmQgYWN0c0FzUmVzZXQgb3IgaGFzUmVzZXRUeXBlLCBhcyBhcHByb3ByaWF0ZSBpbnN0ZWFk IG9mIGlzUmVzZXQuCisgICAgICAgICogcmVuZGVyaW5nL0NvdW50ZXJOb2RlLmg6CisgICAgICAg IChXZWJDb3JlOjpDb3VudGVyTm9kZTo6YWN0c0FzUmVzZXQpOgorICAgICAgICAoV2ViQ29yZTo6 Q291bnRlck5vZGU6Omhhc1Jlc2V0VHlwZSk6CisKIDIwMDktMTItMDkgIFNhbSBXZWluaWcgIDxz YW1Ad2Via2l0Lm9yZz4KIAogICAgICAgICBSb2xsIG91dCA1MTkxOSBhbmQgNTE5MjAuIFRoZXkg d2VyZSBpbmNvcnJlY3QgYW5kIHVubmVjZXNzYXJ5IHJpZ2h0IG5vdy4KSW5kZXg6IFdlYkNvcmUv cmVuZGVyaW5nL0NvdW50ZXJOb2RlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3JlbmRlcmlu Zy9Db3VudGVyTm9kZS5jcHAJKHJldmlzaW9uIDUxOTMwKQorKysgV2ViQ29yZS9yZW5kZXJpbmcv Q291bnRlck5vZGUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zNCw4ICszNCw4IEBACiAKIG5hbWVz cGFjZSBXZWJDb3JlIHsKIAotQ291bnRlck5vZGU6OkNvdW50ZXJOb2RlKFJlbmRlck9iamVjdCog bywgYm9vbCBpc1Jlc2V0LCBpbnQgdmFsdWUpCi0gICAgOiBtX2lzUmVzZXQoaXNSZXNldCkKK0Nv dW50ZXJOb2RlOjpDb3VudGVyTm9kZShSZW5kZXJPYmplY3QqIG8sIGJvb2wgaGFzUmVzZXRUeXBl LCBpbnQgdmFsdWUpCisgICAgOiBtX2hhc1Jlc2V0VHlwZShoYXNSZXNldFR5cGUpCiAgICAgLCBt X3ZhbHVlKHZhbHVlKQogICAgICwgbV9jb3VudEluUGFyZW50KDApCiAgICAgLCBtX3JlbmRlcmVy KG8pCkBAIC0xMDAsMTQgKzEwMCwxMyBAQCBDb3VudGVyTm9kZSogQ291bnRlck5vZGU6OnByZXZp b3VzSW5QcmVPCiAKIGludCBDb3VudGVyTm9kZTo6Y29tcHV0ZUNvdW50SW5QYXJlbnQoKSBjb25z dAogewotICAgIGludCBpbmNyZW1lbnQgPSBtX2lzUmVzZXQgPyAwIDogbV92YWx1ZTsKKyAgICBp bnQgaW5jcmVtZW50ID0gYWN0c0FzUmVzZXQoKSA/IDAgOiBtX3ZhbHVlOwogICAgIGlmIChtX3By ZXZpb3VzU2libGluZykKICAgICAgICAgcmV0dXJuIG1fcHJldmlvdXNTaWJsaW5nLT5tX2NvdW50 SW5QYXJlbnQgKyBpbmNyZW1lbnQ7CiAgICAgQVNTRVJUKG1fcGFyZW50LT5tX2ZpcnN0Q2hpbGQg PT0gdGhpcyk7CiAgICAgcmV0dXJuIG1fcGFyZW50LT5tX3ZhbHVlICsgaW5jcmVtZW50OwogfQog Ci0KIHZvaWQgQ291bnRlck5vZGU6OnJlc2V0UmVuZGVyZXIoY29uc3QgQXRvbWljU3RyaW5nJiBp ZGVudGlmaWVyKSBjb25zdAogewogICAgIGlmICghbV9yZW5kZXJlciB8fCBtX3JlbmRlcmVyLT5k b2N1bWVudEJlaW5nRGVzdHJveWVkKCkpCkBAIC0yMTYsNyArMjE1LDcgQEAgc3RhdGljIHZvaWQg c2hvd1RyZWVBbmRNYXJrKGNvbnN0IENvdW50ZQogICAgICAgICBmb3IgKGNvbnN0IENvdW50ZXJO b2RlKiBwYXJlbnQgPSBjdXJyZW50OyBwYXJlbnQgJiYgcGFyZW50ICE9IHJvb3Q7IHBhcmVudCA9 IHBhcmVudC0+cGFyZW50KCkpCiAgICAgICAgICAgICBmd3JpdGUoIiAgIiwgMSwgMiwgc3RkZXJy KTsKICAgICAgICAgZnByaW50ZihzdGRlcnIsICIlcCAlczogJWQgJWQgUDolcCBQUzolcCBOUzol cCBSOiVwXG4iLAotICAgICAgICAgICAgY3VycmVudCwgY3VycmVudC0+aXNSZXNldCgpID8gInJl c2V0X19fXyIgOiAiaW5jcmVtZW50IiwgY3VycmVudC0+dmFsdWUoKSwKKyAgICAgICAgICAgIGN1 cnJlbnQsIGN1cnJlbnQtPmFjdHNBc1Jlc2V0KCkgPyAicmVzZXRfX19fIiA6ICJpbmNyZW1lbnQi LCBjdXJyZW50LT52YWx1ZSgpLAogICAgICAgICAgICAgY3VycmVudC0+Y291bnRJblBhcmVudCgp LCBjdXJyZW50LT5wYXJlbnQoKSwgY3VycmVudC0+cHJldmlvdXNTaWJsaW5nKCksCiAgICAgICAg ICAgICBjdXJyZW50LT5uZXh0U2libGluZygpLCBjdXJyZW50LT5yZW5kZXJlcigpKTsKICAgICB9 CkluZGV4OiBXZWJDb3JlL3JlbmRlcmluZy9Db3VudGVyTm9kZS5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdl YkNvcmUvcmVuZGVyaW5nL0NvdW50ZXJOb2RlLmgJKHJldmlzaW9uIDUxOTMwKQorKysgV2ViQ29y ZS9yZW5kZXJpbmcvQ291bnRlck5vZGUuaAkod29ya2luZyBjb3B5KQpAQCAtNDIsNyArNDIsOCBA QCBjbGFzcyBDb3VudGVyTm9kZSA6IHB1YmxpYyBOb25jb3B5YWJsZSB7CiBwdWJsaWM6CiAgICAg Q291bnRlck5vZGUoUmVuZGVyT2JqZWN0KiwgYm9vbCBpc1Jlc2V0LCBpbnQgdmFsdWUpOwogCi0g ICAgYm9vbCBpc1Jlc2V0KCkgY29uc3QgeyByZXR1cm4gbV9pc1Jlc2V0OyB9CisgICAgYm9vbCBh Y3RzQXNSZXNldCgpIGNvbnN0IHsgcmV0dXJuIG1faGFzUmVzZXRUeXBlIHx8ICFtX3BhcmVudDsg fQorICAgIGJvb2wgaGFzUmVzZXRUeXBlKCkgY29uc3QgeyByZXR1cm4gbV9oYXNSZXNldFR5cGU7 IH0KICAgICBpbnQgdmFsdWUoKSBjb25zdCB7IHJldHVybiBtX3ZhbHVlOyB9CiAgICAgaW50IGNv dW50SW5QYXJlbnQoKSBjb25zdCB7IHJldHVybiBtX2NvdW50SW5QYXJlbnQ7IH0KICAgICBSZW5k ZXJPYmplY3QqIHJlbmRlcmVyKCkgY29uc3QgeyByZXR1cm4gbV9yZW5kZXJlcjsgfQpAQCAtNTgs MTUgKzU5LDI0IEBAIHB1YmxpYzoKICAgICBDb3VudGVyTm9kZSogbmV4dEluUHJlT3JkZXJBZnRl ckNoaWxkcmVuKGNvbnN0IENvdW50ZXJOb2RlKiBzdGF5V2l0aGluID0gMCkgY29uc3Q7CiAKICAg ICB2b2lkIGluc2VydEFmdGVyKENvdW50ZXJOb2RlKiBuZXdDaGlsZCwgQ291bnRlck5vZGUqIGJl Zm9yZUNoaWxkLCBjb25zdCBBdG9taWNTdHJpbmcmIGlkZW50aWZpZXIpOworCisgICAgLy8gaWRl bnRpZmllciBtdXN0IG1hdGNoIHRoZSBpZGVudGlmaWVyIG9mIHRoaXMgY291bnRlci4KICAgICB2 b2lkIHJlbW92ZUNoaWxkKENvdW50ZXJOb2RlKiwgY29uc3QgQXRvbWljU3RyaW5nJiBpZGVudGlm aWVyKTsKIAogcHJpdmF0ZToKICAgICBpbnQgY29tcHV0ZUNvdW50SW5QYXJlbnQoKSBjb25zdDsK ICAgICB2b2lkIHJlY291bnQoY29uc3QgQXRvbWljU3RyaW5nJiBpZGVudGlmaWVyKTsKKworICAg IC8vIEludmFsaWRhdGVzIHRoZSB0ZXh0IGluIHRoZSByZW5kZXJlciBvZiB0aGlzIGNvdW50ZXIs IGlmIGFueS4KKyAgICAvLyBpZGVudGlmaWVyIG11c3QgbWF0Y2ggdGhlIGlkZW50aWZpZXIgb2Yg dGhpcyBjb3VudGVyLgogICAgIHZvaWQgcmVzZXRSZW5kZXJlcihjb25zdCBBdG9taWNTdHJpbmcm IGlkZW50aWZpZXIpIGNvbnN0OworCisgICAgLy8gSW52YWxpZGF0ZXMgdGhlIHRleHQgaW4gdGhl IHJlbmRlcmVyIG9mIHRoaXMgY291bnRlciwgaWYgYW55LAorICAgIC8vIGFuZCBpbiB0aGUgcmVu ZGVyZXJzIG9mIGFsbCBkZXNjZW5kYW50cyBvZiB0aGlzIGNvdW50ZXIsIGlmIGFueS4KKyAgICAv LyBpZGVudGlmaWVyIG11c3QgbWF0Y2ggdGhlIGlkZW50aWZpZXIgb2YgdGhpcyBjb3VudGVyLgog ICAgIHZvaWQgcmVzZXRSZW5kZXJlcnMoY29uc3QgQXRvbWljU3RyaW5nJiBpZGVudGlmaWVyKSBj b25zdDsKIAotICAgIGJvb2wgbV9pc1Jlc2V0OworICAgIGJvb2wgbV9oYXNSZXNldFR5cGU7CiAg ICAgaW50IG1fdmFsdWU7CiAgICAgaW50IG1fY291bnRJblBhcmVudDsKICAgICBSZW5kZXJPYmpl Y3QqIG1fcmVuZGVyZXI7CkluZGV4OiBXZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJDb3VudGVyLmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJDb3VudGVyLmNwcAkocmV2 aXNpb24gNTE5MzApCisrKyBXZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJDb3VudGVyLmNwcAkod29y a2luZyBjb3B5KQpAQCAtMzgsNyArMzgsNyBAQCB1c2luZyBuYW1lc3BhY2UgSFRNTE5hbWVzOwog dHlwZWRlZiBIYXNoTWFwPFJlZlB0cjxBdG9taWNTdHJpbmdJbXBsPiwgQ291bnRlck5vZGUqPiBD b3VudGVyTWFwOwogdHlwZWRlZiBIYXNoTWFwPGNvbnN0IFJlbmRlck9iamVjdCosIENvdW50ZXJN YXAqPiBDb3VudGVyTWFwczsKIAotc3RhdGljIENvdW50ZXJOb2RlKiBtYWtlQ291bnRlck5vZGUo UmVuZGVyT2JqZWN0KiwgY29uc3QgQXRvbWljU3RyaW5nJiBjb3VudGVyTmFtZSwgYm9vbCBhbHdh eXNDcmVhdGVDb3VudGVyKTsKK3N0YXRpYyBDb3VudGVyTm9kZSogbWFrZUNvdW50ZXJOb2RlKFJl bmRlck9iamVjdCosIGNvbnN0IEF0b21pY1N0cmluZyYgaWRlbnRpZmllciwgYm9vbCBhbHdheXND cmVhdGVDb3VudGVyKTsKIAogc3RhdGljIENvdW50ZXJNYXBzJiBjb3VudGVyTWFwcygpCiB7CkBA IC01Myw3ICs1Myw3IEBAIHN0YXRpYyBpbmxpbmUgUmVuZGVyT2JqZWN0KiBwcmV2aW91c1NpYmwK ICAgICByZXR1cm4gb2JqZWN0LT5wYXJlbnQoKTsKIH0KIAotc3RhdGljIGJvb2wgcGxhbkNvdW50 ZXIoUmVuZGVyT2JqZWN0KiBvYmplY3QsIGNvbnN0IEF0b21pY1N0cmluZyYgY291bnRlck5hbWUs IGJvb2wmIGlzUmVzZXQsIGludCYgdmFsdWUpCitzdGF0aWMgYm9vbCBwbGFuQ291bnRlcihSZW5k ZXJPYmplY3QqIG9iamVjdCwgY29uc3QgQXRvbWljU3RyaW5nJiBpZGVudGlmaWVyLCBib29sJiBp c1Jlc2V0LCBpbnQmIHZhbHVlKQogewogICAgIEFTU0VSVChvYmplY3QpOwogCkBAIC02Niw3ICs2 Niw3IEBAIHN0YXRpYyBib29sIHBsYW5Db3VudGVyKFJlbmRlck9iamVjdCogb2IKICAgICBBU1NF UlQoc3R5bGUpOwogCiAgICAgaWYgKGNvbnN0IENvdW50ZXJEaXJlY3RpdmVNYXAqIGRpcmVjdGl2 ZXNNYXAgPSBzdHlsZS0+Y291bnRlckRpcmVjdGl2ZXMoKSkgewotICAgICAgICBDb3VudGVyRGly ZWN0aXZlcyBkaXJlY3RpdmVzID0gZGlyZWN0aXZlc01hcC0+Z2V0KGNvdW50ZXJOYW1lLmltcGwo KSk7CisgICAgICAgIENvdW50ZXJEaXJlY3RpdmVzIGRpcmVjdGl2ZXMgPSBkaXJlY3RpdmVzTWFw LT5nZXQoaWRlbnRpZmllci5pbXBsKCkpOwogICAgICAgICBpZiAoZGlyZWN0aXZlcy5tX3Jlc2V0 KSB7CiAgICAgICAgICAgICB2YWx1ZSA9IGRpcmVjdGl2ZXMubV9yZXNldFZhbHVlOwogICAgICAg ICAgICAgaWYgKGRpcmVjdGl2ZXMubV9pbmNyZW1lbnQpCkBAIC04MSw3ICs4MSw3IEBAIHN0YXRp YyBib29sIHBsYW5Db3VudGVyKFJlbmRlck9iamVjdCogb2IKICAgICAgICAgfQogICAgIH0KIAot ICAgIGlmIChjb3VudGVyTmFtZSA9PSAibGlzdC1pdGVtIikgeworICAgIGlmIChpZGVudGlmaWVy ID09ICJsaXN0LWl0ZW0iKSB7CiAgICAgICAgIGlmIChvYmplY3QtPmlzTGlzdEl0ZW0oKSkgewog ICAgICAgICAgICAgaWYgKHRvUmVuZGVyTGlzdEl0ZW0ob2JqZWN0KS0+aGFzRXhwbGljaXRWYWx1 ZSgpKSB7CiAgICAgICAgICAgICAgICAgdmFsdWUgPSB0b1JlbmRlckxpc3RJdGVtKG9iamVjdCkt PmV4cGxpY2l0VmFsdWUoKTsKQEAgLTE0Miw3ICsxNDIsNyBAQCBzdGF0aWMgYm9vbCBmaW5kUGxh Y2VGb3JDb3VudGVyKFJlbmRlck9iCiAgICAgICAgICAgICBpZiAoY3VycmVudENvdW50ZXIpIHsK ICAgICAgICAgICAgICAgICAvLyBXZSBoYXZlIGEgc3VpdGFibGUgY291bnRlciBvbiB0aGUgRW5k U2VhcmNoUmVuZGVyZXIuCiAgICAgICAgICAgICAgICAgaWYgKHByZXZpb3VzU2libGluZykgeyAv LyBCdXQgd2UgYWxyZWFkeSBmb3VuZCBhbm90aGVyIGNvdW50ZXIgdGhhdCB3ZSBjb21lIGFmdGVy LgotICAgICAgICAgICAgICAgICAgICBpZiAoY3VycmVudENvdW50ZXItPmlzUmVzZXQoKSkgewor ICAgICAgICAgICAgICAgICAgICBpZiAoY3VycmVudENvdW50ZXItPmFjdHNBc1Jlc2V0KCkpIHsK ICAgICAgICAgICAgICAgICAgICAgICAgIC8vIFdlIGZvdW5kIGEgcmVzZXQgY291bnRlciB0aGF0 IGlzIG9uIGEgcmVuZGVyZXIgdGhhdCBpcyBhIHNpYmxpbmcgb2Ygb3VycyBvciBhIHBhcmVudC4K ICAgICAgICAgICAgICAgICAgICAgICAgIGlmIChpc1Jlc2V0ICYmIGN1cnJlbnRSZW5kZXJlci0+ cGFyZW50KCkgPT0gY291bnRlck93bmVyLT5wYXJlbnQoKSkgewogICAgICAgICAgICAgICAgICAg ICAgICAgICAgIC8vIFdlIGFyZSBhbHNvIGEgcmVzZXQgY291bnRlciBhbmQgdGhlIHByZXZpb3Vz IHJlc2V0IHdhcyBvbiBhIHNpYmxpbmcgcmVuZGVyZXIKQEAgLTE3MSw3ICsxNzEsNyBAQCBzdGF0 aWMgYm9vbCBmaW5kUGxhY2VGb3JDb3VudGVyKFJlbmRlck9iCiAgICAgICAgICAgICAgICAgICAg IC8vIEluIHRoaXMgY2FzZSB3ZSBmb2xsb3cgcHJldHR5IG11Y2ggdGhlIHNhbWUgbG9naWMgYXMg YWJvdmUgYnV0IG5vIEFTU0VSVHMgYWJvdXQgCiAgICAgICAgICAgICAgICAgICAgIC8vIHByZXZp b3VzU2libGluZywgYW5kIHdoZW4gd2UgYXJlIGEgc2libGluZyBvZiB0aGUgZW5kIGNvdW50ZXIg d2UgbXVzdCBzZXQgcHJldmlvdXNTaWJsaW5nCiAgICAgICAgICAgICAgICAgICAgIC8vIHRvIGN1 cnJlbnRDb3VudGVyLgotICAgICAgICAgICAgICAgICAgICBpZiAoY3VycmVudENvdW50ZXItPmlz UmVzZXQoKSkgeworICAgICAgICAgICAgICAgICAgICBpZiAoY3VycmVudENvdW50ZXItPmFjdHNB c1Jlc2V0KCkpIHsKICAgICAgICAgICAgICAgICAgICAgICAgIGlmIChpc1Jlc2V0ICYmIGN1cnJl bnRSZW5kZXJlci0+cGFyZW50KCkgPT0gY291bnRlck93bmVyLT5wYXJlbnQoKSkgewogICAgICAg ICAgICAgICAgICAgICAgICAgICAgIHBhcmVudCA9IGN1cnJlbnRDb3VudGVyLT5wYXJlbnQoKTsK ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBwcmV2aW91c1NpYmxpbmcgPSBjdXJyZW50Q291 bnRlcjsKQEAgLTIwMSw3ICsyMDEsNyBAQCBzdGF0aWMgYm9vbCBmaW5kUGxhY2VGb3JDb3VudGVy KFJlbmRlck9iCiAgICAgICAgICAgICAgICAgaWYgKHByZXZpb3VzU2libGluZykgewogICAgICAg ICAgICAgICAgICAgICAvLyBTaW5jZSB3ZSBoYWQgYSBzdWl0YWJsZSBwcmV2aW91cyBjb3VudGVy IGJlZm9yZSwgd2Ugc2hvdWxkIG9ubHkgY29uc2lkZXIgdGhpcyBvbmUgYXMgb3VyIAogICAgICAg ICAgICAgICAgICAgICAvLyBwcmV2aW91c1NpYmxpbmcgaWYgaXQgaXMgYSByZXNldCBjb3VudGVy IGFuZCBoZW5jZSB0aGUgY3VycmVudCBwcmV2aW91c1NpYmxpbmcgaXMgaXRzIGNoaWxkLgotICAg ICAgICAgICAgICAgICAgICBpZiAoY3VycmVudENvdW50ZXItPmlzUmVzZXQoKSkgeworICAgICAg ICAgICAgICAgICAgICBpZiAoY3VycmVudENvdW50ZXItPmFjdHNBc1Jlc2V0KCkpIHsKICAgICAg ICAgICAgICAgICAgICAgICAgIHByZXZpb3VzU2libGluZyA9IGN1cnJlbnRDb3VudGVyOwogICAg ICAgICAgICAgICAgICAgICAgICAgLy8gV2UgYXJlIG5vIGxvbmdlciBpbnRlcmVzdGVkIGluIHBy ZXZpb3VzIHNpYmxpbmdzIG9mIHRoZSBjdXJyZW50UmVuZGVyZXIgb3IgdGhlaXIgY2hpbGRyZW4K ICAgICAgICAgICAgICAgICAgICAgICAgIC8vIGFzIGNvdW50ZXJzIHRoZXkgbWF5IGhhdmUgYXR0 YWNoZWQgY2Fubm90IGJlIHRoZSBwcmV2aW91cyBzaWJsaW5nIG9mIHRoZSBjb3VudGVyIHdlIGFy ZSBwbGFjaW5nLgpAQCAtMjI2LDMxICsyMjYsMjUgQEAgc3RhdGljIGJvb2wgZmluZFBsYWNlRm9y Q291bnRlcihSZW5kZXJPYgogICAgIHJldHVybiBmYWxzZTsKIH0KIAotc3RhdGljIENvdW50ZXJO b2RlKiBtYWtlQ291bnRlck5vZGUoUmVuZGVyT2JqZWN0KiBvYmplY3QsIGNvbnN0IEF0b21pY1N0 cmluZyYgY291bnRlck5hbWUsIGJvb2wgYWx3YXlzQ3JlYXRlQ291bnRlcikKK3N0YXRpYyBDb3Vu dGVyTm9kZSogbWFrZUNvdW50ZXJOb2RlKFJlbmRlck9iamVjdCogb2JqZWN0LCBjb25zdCBBdG9t aWNTdHJpbmcmIGlkZW50aWZpZXIsIGJvb2wgYWx3YXlzQ3JlYXRlQ291bnRlcikKIHsKICAgICBB U1NFUlQob2JqZWN0KTsKIAogICAgIGlmIChvYmplY3QtPm1faGFzQ291bnRlck5vZGVNYXApCiAg ICAgICAgIGlmIChDb3VudGVyTWFwKiBub2RlTWFwID0gY291bnRlck1hcHMoKS5nZXQob2JqZWN0 KSkKLSAgICAgICAgICAgIGlmIChDb3VudGVyTm9kZSogbm9kZSA9IG5vZGVNYXAtPmdldChjb3Vu dGVyTmFtZS5pbXBsKCkpKQorICAgICAgICAgICAgaWYgKENvdW50ZXJOb2RlKiBub2RlID0gbm9k ZU1hcC0+Z2V0KGlkZW50aWZpZXIuaW1wbCgpKSkKICAgICAgICAgICAgICAgICByZXR1cm4gbm9k ZTsKIAogICAgIGJvb2wgaXNSZXNldCA9IGZhbHNlOwogICAgIGludCB2YWx1ZSA9IDA7Ci0gICAg aWYgKCFwbGFuQ291bnRlcihvYmplY3QsIGNvdW50ZXJOYW1lLCBpc1Jlc2V0LCB2YWx1ZSkgJiYg IWFsd2F5c0NyZWF0ZUNvdW50ZXIpCisgICAgaWYgKCFwbGFuQ291bnRlcihvYmplY3QsIGlkZW50 aWZpZXIsIGlzUmVzZXQsIHZhbHVlKSAmJiAhYWx3YXlzQ3JlYXRlQ291bnRlcikKICAgICAgICAg cmV0dXJuIDA7CiAKICAgICBDb3VudGVyTm9kZSogbmV3UGFyZW50ID0gMDsKICAgICBDb3VudGVy Tm9kZSogbmV3UHJldmlvdXNTaWJsaW5nID0gMDsKLSAgICBDb3VudGVyTm9kZSogbmV3Tm9kZTsK LSAgICBpZiAoZmluZFBsYWNlRm9yQ291bnRlcihvYmplY3QsIGNvdW50ZXJOYW1lLCBpc1Jlc2V0 LCBuZXdQYXJlbnQsIG5ld1ByZXZpb3VzU2libGluZykpIHsKLSAgICAgICAgbmV3Tm9kZSA9IG5l dyBDb3VudGVyTm9kZShvYmplY3QsIGlzUmVzZXQsIHZhbHVlKTsKLSAgICAgICAgbmV3UGFyZW50 LT5pbnNlcnRBZnRlcihuZXdOb2RlLCBuZXdQcmV2aW91c1NpYmxpbmcsIGNvdW50ZXJOYW1lKTsK LSAgICB9IGVsc2UgewotICAgICAgICAvLyBNYWtlIGEgcmVzZXQgbm9kZSBmb3IgY291bnRlcnMg dGhhdCBhcmVuJ3QgaW5zaWRlIGFuIGV4aXN0aW5nIHJlc2V0IG5vZGUuCi0gICAgICAgIG5ld05v ZGUgPSBuZXcgQ291bnRlck5vZGUob2JqZWN0LCB0cnVlLCB2YWx1ZSk7Ci0gICAgfQotCisgICAg Q291bnRlck5vZGUqIG5ld05vZGUgPSBuZXcgQ291bnRlck5vZGUob2JqZWN0LCBpc1Jlc2V0LCB2 YWx1ZSk7CisgICAgaWYgKGZpbmRQbGFjZUZvckNvdW50ZXIob2JqZWN0LCBpZGVudGlmaWVyLCBp c1Jlc2V0LCBuZXdQYXJlbnQsIG5ld1ByZXZpb3VzU2libGluZykpCisgICAgICAgIG5ld1BhcmVu dC0+aW5zZXJ0QWZ0ZXIobmV3Tm9kZSwgbmV3UHJldmlvdXNTaWJsaW5nLCBpZGVudGlmaWVyKTsK ICAgICBDb3VudGVyTWFwKiBub2RlTWFwOwogICAgIGlmIChvYmplY3QtPm1faGFzQ291bnRlck5v ZGVNYXApCiAgICAgICAgIG5vZGVNYXAgPSBjb3VudGVyTWFwcygpLmdldChvYmplY3QpOwpAQCAt MjU5LDggKzI1Myw3IEBAIHN0YXRpYyBDb3VudGVyTm9kZSogbWFrZUNvdW50ZXJOb2RlKFJlbmQK ICAgICAgICAgY291bnRlck1hcHMoKS5zZXQob2JqZWN0LCBub2RlTWFwKTsKICAgICAgICAgb2Jq ZWN0LT5tX2hhc0NvdW50ZXJOb2RlTWFwID0gdHJ1ZTsKICAgICB9Ci0gICAgbm9kZU1hcC0+c2V0 KGNvdW50ZXJOYW1lLmltcGwoKSwgbmV3Tm9kZSk7Ci0KKyAgICBub2RlTWFwLT5zZXQoaWRlbnRp Zmllci5pbXBsKCksIG5ld05vZGUpOwogICAgIHJldHVybiBuZXdOb2RlOwogfQogCkBAIC0yOTAs MTIgKzI4MywxMiBAQCBQYXNzUmVmUHRyPFN0cmluZ0ltcGw+IFJlbmRlckNvdW50ZXI6Om9yCiAg ICAgICAgIG1fY291bnRlck5vZGUgPSBtYWtlQ291bnRlck5vZGUocGFyZW50KCksIG1fY291bnRl ci5pZGVudGlmaWVyKCksIHRydWUpOwogCiAgICAgQ291bnRlck5vZGUqIGNoaWxkID0gbV9jb3Vu dGVyTm9kZTsKLSAgICBpbnQgdmFsdWUgPSBjaGlsZC0+aXNSZXNldCgpID8gY2hpbGQtPnZhbHVl KCkgOiBjaGlsZC0+Y291bnRJblBhcmVudCgpOworICAgIGludCB2YWx1ZSA9IGNoaWxkLT5hY3Rz QXNSZXNldCgpID8gY2hpbGQtPnZhbHVlKCkgOiBjaGlsZC0+Y291bnRJblBhcmVudCgpOwogCiAg ICAgU3RyaW5nIHRleHQgPSBsaXN0TWFya2VyVGV4dChtX2NvdW50ZXIubGlzdFN0eWxlKCksIHZh bHVlKTsKIAogICAgIGlmICghbV9jb3VudGVyLnNlcGFyYXRvcigpLmlzTnVsbCgpKSB7Ci0gICAg ICAgIGlmICghY2hpbGQtPmlzUmVzZXQoKSkKKyAgICAgICAgaWYgKCFjaGlsZC0+YWN0c0FzUmVz ZXQoKSkKICAgICAgICAgICAgIGNoaWxkID0gY2hpbGQtPnBhcmVudCgpOwogICAgICAgICB3aGls ZSAoQ291bnRlck5vZGUqIHBhcmVudCA9IGNoaWxkLT5wYXJlbnQoKSkgewogICAgICAgICAgICAg dGV4dCA9IGxpc3RNYXJrZXJUZXh0KG1fY291bnRlci5saXN0U3R5bGUoKSwgY2hpbGQtPmNvdW50 SW5QYXJlbnQoKSkK