87799 2012-05-29 17:49:10 -0700 Implement CSSParser::determineNameInNamespace() as a helper function for CSSGrammar.y 2012-05-30 23:25:19 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 87625 1 haraken haraken cmarcelo darin koivisto macpherson menard webkit.review.bot oldest_to_newest 636644 0 haraken 2012-05-29 17:49:10 -0700 As pointed out by darin@ in https://bugs.webkit.org/show_bug.cgi?id=87627#c12, we should avoid repeating the following code in CSSGrammar.y: > if (p->m_styleSheet) > $$->setTag(QualifiedName(namespacePrefix, $2, p->m_styleSheet->determineNamespace(namespacePrefix))); > else > $$->setTag(QualifiedName(namespacePrefix, $2, p->m_defaultNamespace)); We can implement CSSParser::determineNameInNamespace() as a helper function and replace the above code. 636650 1 144663 haraken 2012-05-29 17:53:52 -0700 Created attachment 144663 Patch 637313 2 144663 darin 2012-05-30 09:39:50 -0700 Comment on attachment 144663 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=144663&action=review > Source/WebCore/css/CSSGrammar.y:960 > + $$->setTag(p->determineNameInNamespace(namespacePrefix, $2)); We should get rid of the namespacePrefix local variable and just use $1 here. > Source/WebCore/css/CSSGrammar.y:1089 > + $$->setAttribute(p->determineNameInNamespace(namespacePrefix, $4)); Same with $3 here. > Source/WebCore/css/CSSGrammar.y:1096 > + $$->setAttribute(p->determineNameInNamespace(namespacePrefix, $4)); Same with $3 here. 637833 3 144951 haraken 2012-05-30 17:03:15 -0700 Created attachment 144951 patch for landing 638023 4 144951 webkit.review.bot 2012-05-30 23:24:10 -0700 Comment on attachment 144951 patch for landing Clearing flags on attachment: 144951 Committed r119060: <http://trac.webkit.org/changeset/119060> 144663 2012-05-29 17:53:52 -0700 2012-05-30 23:25:12 -0700 Patch bug-87799-20120530095351.patch text/plain 5253 haraken U3VidmVyc2lvbiBSZXZpc2lvbjogMTE4ODYyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODRmYzNiY2MyMGRlNGRm YzZiNTFmMGY2YTE4NjY1NTgzYTczMmJkYS4uNjNlYWM2MDUyZmU4MjUxOTMxODAwMTBhMzcxMGU5 ODVjYjI4NTc5YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMxIEBACiAyMDEyLTA1LTI5ICBLZW50 YXJvIEhhcmEgIDxoYXJha2VuQGNocm9taXVtLm9yZz4KIAorICAgICAgICBJbXBsZW1lbnQgQ1NT UGFyc2VyOjpkZXRlcm1pbmVOYW1lSW5OYW1lc3BhY2UoKSBhcyBhIGhlbHBlciBmdW5jdGlvbiBm b3IgQ1NTR3JhbW1hci55CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD04Nzc5OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIEFzIHBvaW50ZWQgb3V0IGJ5IGRhcmluQCBpbiBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9ODc2MjcjYzEyLAorICAgICAgICB3ZSBzaG91bGQgYXZvaWQgcmVw ZWF0aW5nIHRoZSBmb2xsb3dpbmcgY29kZSBpbiBDU1NHcmFtbWFyLnk6CisKKyAgICAgICAgICAg IGlmIChwLT5tX3N0eWxlU2hlZXQpCisgICAgICAgICAgICAgICAgJCQtPnNldFRhZyhRdWFsaWZp ZWROYW1lKG5hbWVzcGFjZVByZWZpeCwgJDIsIHAtPm1fc3R5bGVTaGVldC0+ZGV0ZXJtaW5lTmFt ZXNwYWNlKG5hbWVzcGFjZVByZWZpeCkpKTsKKyAgICAgICAgICAgIGVsc2UKKyAgICAgICAgICAg ICAgICAkJC0+c2V0VGFnKFF1YWxpZmllZE5hbWUobmFtZXNwYWNlUHJlZml4LCAkMiwgcC0+bV9k ZWZhdWx0TmFtZXNwYWNlKSk7CisKKyAgICAgICAgVGhpcyBwYXRjaCBpbXBsZW1lbnRzIENTU1Bh cnNlcjo6ZGV0ZXJtaW5lTmFtZUluTmFtZXNwYWNlKCkgYXMgYSBoZWxwZXIgZnVuY3Rpb24KKyAg ICAgICAgYW5kIHJlcGxhY2VzIHRoZSBhYm92ZSBjb2RlLgorCisgICAgICAgIFRlc3RzOiBmYXN0 L2RvbS9TZWxlY3RvckFQSS8qLiBObyBjaGFuZ2UgaW4gdGVzdCByZXN1bHRzLgorCisgICAgICAg ICogY3NzL0NTU0dyYW1tYXIueToKKyAgICAgICAgKiBjc3MvQ1NTUGFyc2VyLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OkNTU1BhcnNlcjo6ZGV0ZXJtaW5lTmFtZUluTmFtZXNwYWNlKToKKyAgICAg ICAgKFdlYkNvcmUpOgorICAgICAgICAqIGNzcy9DU1NQYXJzZXIuaDoKKworMjAxMi0wNS0yOSAg S2VudGFybyBIYXJhICA8aGFyYWtlbkBjaHJvbWl1bS5vcmc+CisKICAgICAgICAgW1Y4XSBSZW5h bWUgdjhOdWxsKCkgdG8gdjhOdWxsV2l0aENoZWNrKCkKICAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg3NzEzCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2Nzcy9DU1NHcmFtbWFyLnkgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTR3JhbW1hci55Cmlu ZGV4IDY3MzYzODMyOWE4MmJkOTJhYzJjYTAwNmQ3ZDdmNDRmZjQ2NTBlNTYuLmY0YjA5MGE5MjI0 NjllZmU4MDVmZTEyZjgwOGEyNzM4ZjgxMjJiNzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2Nzcy9DU1NHcmFtbWFyLnkKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU0dyYW1tYXIueQpA QCAtOTU3LDEwICs5NTcsNyBAQCBzaW1wbGVfc2VsZWN0b3I6CiAgICAgICAgIEF0b21pY1N0cmlu ZyBuYW1lc3BhY2VQcmVmaXggPSAkMTsKICAgICAgICAgQ1NTUGFyc2VyKiBwID0gc3RhdGljX2Nh c3Q8Q1NTUGFyc2VyKj4ocGFyc2VyKTsKICAgICAgICAgJCQgPSBwLT5jcmVhdGVGbG9hdGluZ1Nl bGVjdG9yKCk7Ci0gICAgICAgIGlmIChwLT5tX3N0eWxlU2hlZXQpCi0gICAgICAgICAgICAkJC0+ c2V0VGFnKFF1YWxpZmllZE5hbWUobmFtZXNwYWNlUHJlZml4LCAkMiwgcC0+bV9zdHlsZVNoZWV0 LT5kZXRlcm1pbmVOYW1lc3BhY2UobmFtZXNwYWNlUHJlZml4KSkpOwotICAgICAgICBlbHNlCi0g ICAgICAgICAgICAkJC0+c2V0VGFnKFF1YWxpZmllZE5hbWUobmFtZXNwYWNlUHJlZml4LCAkMiwg cC0+bV9kZWZhdWx0TmFtZXNwYWNlKSk7CisgICAgICAgICQkLT5zZXRUYWcocC0+ZGV0ZXJtaW5l TmFtZUluTmFtZXNwYWNlKG5hbWVzcGFjZVByZWZpeCwgJDIpKTsKICAgICB9CiAgICAgfCBuYW1l c3BhY2Vfc2VsZWN0b3IgZWxlbWVudF9uYW1lIHNwZWNpZmllcl9saXN0IHsKICAgICAgICAgJCQg PSAkMzsKQEAgLTEwODksMjAgKzEwODYsMTQgQEAgYXR0cmliOgogICAgICAgICBBdG9taWNTdHJp bmcgbmFtZXNwYWNlUHJlZml4ID0gJDM7CiAgICAgICAgIENTU1BhcnNlciogcCA9IHN0YXRpY19j YXN0PENTU1BhcnNlcio+KHBhcnNlcik7CiAgICAgICAgICQkID0gcC0+Y3JlYXRlRmxvYXRpbmdT ZWxlY3RvcigpOwotICAgICAgICBpZiAocC0+bV9zdHlsZVNoZWV0KQotICAgICAgICAgICAgJCQt PnNldEF0dHJpYnV0ZShRdWFsaWZpZWROYW1lKG5hbWVzcGFjZVByZWZpeCwgJDQsIHAtPm1fc3R5 bGVTaGVldC0+ZGV0ZXJtaW5lTmFtZXNwYWNlKG5hbWVzcGFjZVByZWZpeCkpKTsKLSAgICAgICAg ZWxzZQotICAgICAgICAgICAgJCQtPnNldEF0dHJpYnV0ZShRdWFsaWZpZWROYW1lKG5hbWVzcGFj ZVByZWZpeCwgJDQsIHAtPm1fZGVmYXVsdE5hbWVzcGFjZSkpOworICAgICAgICAkJC0+c2V0QXR0 cmlidXRlKHAtPmRldGVybWluZU5hbWVJbk5hbWVzcGFjZShuYW1lc3BhY2VQcmVmaXgsICQ0KSk7 CiAgICAgICAgICQkLT5zZXRNYXRjaChDU1NTZWxlY3Rvcjo6U2V0KTsKICAgICB9CiAgICAgfCAn WycgbWF5YmVfc3BhY2UgbmFtZXNwYWNlX3NlbGVjdG9yIGF0dHJfbmFtZSBtYXRjaCBtYXliZV9z cGFjZSBpZGVudF9vcl9zdHJpbmcgbWF5YmVfc3BhY2UgJ10nIHsKICAgICAgICAgQXRvbWljU3Ry aW5nIG5hbWVzcGFjZVByZWZpeCA9ICQzOwogICAgICAgICBDU1NQYXJzZXIqIHAgPSBzdGF0aWNf Y2FzdDxDU1NQYXJzZXIqPihwYXJzZXIpOwogICAgICAgICAkJCA9IHAtPmNyZWF0ZUZsb2F0aW5n U2VsZWN0b3IoKTsKLSAgICAgICAgaWYgKHAtPm1fc3R5bGVTaGVldCkKLSAgICAgICAgICAgICQk LT5zZXRBdHRyaWJ1dGUoUXVhbGlmaWVkTmFtZShuYW1lc3BhY2VQcmVmaXgsICQ0LCBwLT5tX3N0 eWxlU2hlZXQtPmRldGVybWluZU5hbWVzcGFjZShuYW1lc3BhY2VQcmVmaXgpKSk7Ci0gICAgICAg IGVsc2UKLSAgICAgICAgICAgICQkLT5zZXRBdHRyaWJ1dGUoUXVhbGlmaWVkTmFtZShuYW1lc3Bh Y2VQcmVmaXgsICQ0LCBwLT5tX2RlZmF1bHROYW1lc3BhY2UpKTsKKyAgICAgICAgJCQtPnNldEF0 dHJpYnV0ZShwLT5kZXRlcm1pbmVOYW1lSW5OYW1lc3BhY2UobmFtZXNwYWNlUHJlZml4LCAkNCkp OwogICAgICAgICAkJC0+c2V0TWF0Y2goKENTU1NlbGVjdG9yOjpNYXRjaCkkNSk7CiAgICAgICAg ICQkLT5zZXRWYWx1ZSgkNyk7CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3Nz L0NTU1BhcnNlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUGFyc2VyLmNwcAppbmRleCA0 Mzk3OTllNmUyNGVkMWQ2Y2QzNTAzMDYyMDQ2NzEwZmUzM2QwMWY3Li4yNzgzOTEwZWZiNGZlMjYw YmZkYjIxMjBkZTBjNTViODczZGYyNjkzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3Mv Q1NTUGFyc2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUGFyc2VyLmNwcApAQCAt OTE5NSw2ICs5MTk1LDEzIEBAIHZvaWQgQ1NTUGFyc2VyOjphZGROYW1lc3BhY2UoY29uc3QgQXRv bWljU3RyaW5nJiBwcmVmaXgsIGNvbnN0IEF0b21pY1N0cmluZyYgdXJpCiAgICAgICAgIG1fZGVm YXVsdE5hbWVzcGFjZSA9IHVyaTsKIH0KIAorUXVhbGlmaWVkTmFtZSBDU1NQYXJzZXI6OmRldGVy bWluZU5hbWVJbk5hbWVzcGFjZShjb25zdCBBdG9taWNTdHJpbmcmIHByZWZpeCwgY29uc3QgQXRv bWljU3RyaW5nJiBsb2NhbE5hbWUpCit7CisgICAgaWYgKCFtX3N0eWxlU2hlZXQpCisgICAgICAg IHJldHVybiBRdWFsaWZpZWROYW1lKHByZWZpeCwgbG9jYWxOYW1lLCBtX2RlZmF1bHROYW1lc3Bh Y2UpOworICAgIHJldHVybiBRdWFsaWZpZWROYW1lKHByZWZpeCwgbG9jYWxOYW1lLCBtX3N0eWxl U2hlZXQtPmRldGVybWluZU5hbWVzcGFjZShwcmVmaXgpKTsKK30KKwogdm9pZCBDU1NQYXJzZXI6 OnVwZGF0ZVNwZWNpZmllcnNXaXRoRWxlbWVudE5hbWUoY29uc3QgQXRvbWljU3RyaW5nJiBuYW1l c3BhY2VQcmVmaXgsIGNvbnN0IEF0b21pY1N0cmluZyYgZWxlbWVudE5hbWUsIENTU1BhcnNlclNl bGVjdG9yKiBzcGVjaWZpZXJzKQogewogICAgIEF0b21pY1N0cmluZyBkZXRlcm1pbmVkTmFtZXNw YWNlID0gbmFtZXNwYWNlUHJlZml4ICE9IG51bGxBdG9tICYmIG1fc3R5bGVTaGVldCA/IG1fc3R5 bGVTaGVldC0+ZGV0ZXJtaW5lTmFtZXNwYWNlKG5hbWVzcGFjZVByZWZpeCkgOiBtX2RlZmF1bHRO YW1lc3BhY2U7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUGFyc2VyLmggYi9T b3VyY2UvV2ViQ29yZS9jc3MvQ1NTUGFyc2VyLmgKaW5kZXggMDcwM2QzMzRjNDgxMzE0NzY2MDcy YTU1YWQ4YmM0OGM3NDI1N2FkYy4uN2M1YTYyMzc3NDhmZjI3Yzk1NWY3M2E1YjM0MDA1YjBjOGUy NzM2MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU1BhcnNlci5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2Nzcy9DU1NQYXJzZXIuaApAQCAtMjY3LDYgKzI2Nyw3IEBAIHB1YmxpYzoK ICAgICBQYXNzT3duUHRyPE1lZGlhUXVlcnk+IHNpbmtGbG9hdGluZ01lZGlhUXVlcnkoTWVkaWFR dWVyeSopOwogCiAgICAgdm9pZCBhZGROYW1lc3BhY2UoY29uc3QgQXRvbWljU3RyaW5nJiBwcmVm aXgsIGNvbnN0IEF0b21pY1N0cmluZyYgdXJpKTsKKyAgICBRdWFsaWZpZWROYW1lIGRldGVybWlu ZU5hbWVJbk5hbWVzcGFjZShjb25zdCBBdG9taWNTdHJpbmcmIHByZWZpeCwgY29uc3QgQXRvbWlj U3RyaW5nJiBsb2NhbE5hbWUpOwogICAgIHZvaWQgdXBkYXRlU3BlY2lmaWVyc1dpdGhFbGVtZW50 TmFtZShjb25zdCBBdG9taWNTdHJpbmcmIG5hbWVzcGFjZVByZWZpeCwgY29uc3QgQXRvbWljU3Ry aW5nJiBlbGVtZW50TmFtZSwgQ1NTUGFyc2VyU2VsZWN0b3IqKTsKICAgICBDU1NQYXJzZXJTZWxl Y3RvciogdXBkYXRlU3BlY2lmaWVycyhDU1NQYXJzZXJTZWxlY3RvciosIENTU1BhcnNlclNlbGVj dG9yKik7CiAK 144951 2012-05-30 17:03:15 -0700 2012-05-30 23:24:10 -0700 patch for landing bug-87799-20120531090314.patch text/plain 5454 haraken U3VidmVyc2lvbiBSZXZpc2lvbjogMTE4ODYyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODRmYzNiY2MyMGRlNGRm YzZiNTFmMGY2YTE4NjY1NTgzYTczMmJkYS4uMjZlMWJlZmM4MTUwMTJmMDQ0YTJjNDIyYWM5NjJk NmM5MDFhZGZhNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMxIEBACiAyMDEyLTA1LTI5ICBLZW50 YXJvIEhhcmEgIDxoYXJha2VuQGNocm9taXVtLm9yZz4KIAorICAgICAgICBJbXBsZW1lbnQgQ1NT UGFyc2VyOjpkZXRlcm1pbmVOYW1lSW5OYW1lc3BhY2UoKSBhcyBhIGhlbHBlciBmdW5jdGlvbiBm b3IgQ1NTR3JhbW1hci55CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD04Nzc5OQorCisgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgorCisgICAg ICAgIEFzIHBvaW50ZWQgb3V0IGJ5IGRhcmluQCBpbiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9ODc2MjcjYzEyLAorICAgICAgICB3ZSBzaG91bGQgYXZvaWQgcmVwZWF0 aW5nIHRoZSBmb2xsb3dpbmcgY29kZSBpbiBDU1NHcmFtbWFyLnk6CisKKyAgICAgICAgICAgIGlm IChwLT5tX3N0eWxlU2hlZXQpCisgICAgICAgICAgICAgICAgJCQtPnNldFRhZyhRdWFsaWZpZWRO YW1lKG5hbWVzcGFjZVByZWZpeCwgJDIsIHAtPm1fc3R5bGVTaGVldC0+ZGV0ZXJtaW5lTmFtZXNw YWNlKG5hbWVzcGFjZVByZWZpeCkpKTsKKyAgICAgICAgICAgIGVsc2UKKyAgICAgICAgICAgICAg ICAkJC0+c2V0VGFnKFF1YWxpZmllZE5hbWUobmFtZXNwYWNlUHJlZml4LCAkMiwgcC0+bV9kZWZh dWx0TmFtZXNwYWNlKSk7CisKKyAgICAgICAgVGhpcyBwYXRjaCBpbXBsZW1lbnRzIENTU1BhcnNl cjo6ZGV0ZXJtaW5lTmFtZUluTmFtZXNwYWNlKCkgYXMgYSBoZWxwZXIgZnVuY3Rpb24KKyAgICAg ICAgYW5kIHJlcGxhY2VzIHRoZSBhYm92ZSBjb2RlLgorCisgICAgICAgIFRlc3RzOiBmYXN0L2Rv bS9TZWxlY3RvckFQSS8qLiBObyBjaGFuZ2UgaW4gdGVzdCByZXN1bHRzLgorCisgICAgICAgICog Y3NzL0NTU0dyYW1tYXIueToKKyAgICAgICAgKiBjc3MvQ1NTUGFyc2VyLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OkNTU1BhcnNlcjo6ZGV0ZXJtaW5lTmFtZUluTmFtZXNwYWNlKToKKyAgICAgICAg KFdlYkNvcmUpOgorICAgICAgICAqIGNzcy9DU1NQYXJzZXIuaDoKKworMjAxMi0wNS0yOSAgS2Vu dGFybyBIYXJhICA8aGFyYWtlbkBjaHJvbWl1bS5vcmc+CisKICAgICAgICAgW1Y4XSBSZW5hbWUg djhOdWxsKCkgdG8gdjhOdWxsV2l0aENoZWNrKCkKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTg3NzEzCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2Nzcy9DU1NHcmFtbWFyLnkgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTR3JhbW1hci55CmluZGV4 IDY3MzYzODMyOWE4MmJkOTJhYzJjYTAwNmQ3ZDdmNDRmZjQ2NTBlNTYuLjllZGRjMTdhMTA5YTQ1 YTVhMGI5M2QwZWJmMDhkNWQ5NTA2YTM1YjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nz cy9DU1NHcmFtbWFyLnkKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU0dyYW1tYXIueQpAQCAt OTU0LDEzICs5NTQsOSBAQCBzaW1wbGVfc2VsZWN0b3I6CiAgICAgICAgICAgICBzdGF0aWNfY2Fz dDxDU1NQYXJzZXIqPihwYXJzZXIpLT51cGRhdGVTcGVjaWZpZXJzV2l0aEVsZW1lbnROYW1lKG51 bGxBdG9tLCBzdGFyQXRvbSwgJCQpOwogICAgIH0KICAgICB8IG5hbWVzcGFjZV9zZWxlY3RvciBl bGVtZW50X25hbWUgewotICAgICAgICBBdG9taWNTdHJpbmcgbmFtZXNwYWNlUHJlZml4ID0gJDE7 CiAgICAgICAgIENTU1BhcnNlciogcCA9IHN0YXRpY19jYXN0PENTU1BhcnNlcio+KHBhcnNlcik7 CiAgICAgICAgICQkID0gcC0+Y3JlYXRlRmxvYXRpbmdTZWxlY3RvcigpOwotICAgICAgICBpZiAo cC0+bV9zdHlsZVNoZWV0KQotICAgICAgICAgICAgJCQtPnNldFRhZyhRdWFsaWZpZWROYW1lKG5h bWVzcGFjZVByZWZpeCwgJDIsIHAtPm1fc3R5bGVTaGVldC0+ZGV0ZXJtaW5lTmFtZXNwYWNlKG5h bWVzcGFjZVByZWZpeCkpKTsKLSAgICAgICAgZWxzZQotICAgICAgICAgICAgJCQtPnNldFRhZyhR dWFsaWZpZWROYW1lKG5hbWVzcGFjZVByZWZpeCwgJDIsIHAtPm1fZGVmYXVsdE5hbWVzcGFjZSkp OworICAgICAgICAkJC0+c2V0VGFnKHAtPmRldGVybWluZU5hbWVJbk5hbWVzcGFjZSgkMSwgJDIp KTsKICAgICB9CiAgICAgfCBuYW1lc3BhY2Vfc2VsZWN0b3IgZWxlbWVudF9uYW1lIHNwZWNpZmll cl9saXN0IHsKICAgICAgICAgJCQgPSAkMzsKQEAgLTEwODYsMjMgKzEwODIsMTUgQEAgYXR0cmli OgogICAgICAgICAkJC0+c2V0VmFsdWUoJDYpOwogICAgIH0KICAgICB8ICdbJyBtYXliZV9zcGFj ZSBuYW1lc3BhY2Vfc2VsZWN0b3IgYXR0cl9uYW1lICddJyB7Ci0gICAgICAgIEF0b21pY1N0cmlu ZyBuYW1lc3BhY2VQcmVmaXggPSAkMzsKICAgICAgICAgQ1NTUGFyc2VyKiBwID0gc3RhdGljX2Nh c3Q8Q1NTUGFyc2VyKj4ocGFyc2VyKTsKICAgICAgICAgJCQgPSBwLT5jcmVhdGVGbG9hdGluZ1Nl bGVjdG9yKCk7Ci0gICAgICAgIGlmIChwLT5tX3N0eWxlU2hlZXQpCi0gICAgICAgICAgICAkJC0+ c2V0QXR0cmlidXRlKFF1YWxpZmllZE5hbWUobmFtZXNwYWNlUHJlZml4LCAkNCwgcC0+bV9zdHls ZVNoZWV0LT5kZXRlcm1pbmVOYW1lc3BhY2UobmFtZXNwYWNlUHJlZml4KSkpOwotICAgICAgICBl bHNlCi0gICAgICAgICAgICAkJC0+c2V0QXR0cmlidXRlKFF1YWxpZmllZE5hbWUobmFtZXNwYWNl UHJlZml4LCAkNCwgcC0+bV9kZWZhdWx0TmFtZXNwYWNlKSk7CisgICAgICAgICQkLT5zZXRBdHRy aWJ1dGUocC0+ZGV0ZXJtaW5lTmFtZUluTmFtZXNwYWNlKCQzLCAkNCkpOwogICAgICAgICAkJC0+ c2V0TWF0Y2goQ1NTU2VsZWN0b3I6OlNldCk7CiAgICAgfQogICAgIHwgJ1snIG1heWJlX3NwYWNl IG5hbWVzcGFjZV9zZWxlY3RvciBhdHRyX25hbWUgbWF0Y2ggbWF5YmVfc3BhY2UgaWRlbnRfb3Jf c3RyaW5nIG1heWJlX3NwYWNlICddJyB7Ci0gICAgICAgIEF0b21pY1N0cmluZyBuYW1lc3BhY2VQ cmVmaXggPSAkMzsKICAgICAgICAgQ1NTUGFyc2VyKiBwID0gc3RhdGljX2Nhc3Q8Q1NTUGFyc2Vy Kj4ocGFyc2VyKTsKICAgICAgICAgJCQgPSBwLT5jcmVhdGVGbG9hdGluZ1NlbGVjdG9yKCk7Ci0g ICAgICAgIGlmIChwLT5tX3N0eWxlU2hlZXQpCi0gICAgICAgICAgICAkJC0+c2V0QXR0cmlidXRl KFF1YWxpZmllZE5hbWUobmFtZXNwYWNlUHJlZml4LCAkNCwgcC0+bV9zdHlsZVNoZWV0LT5kZXRl cm1pbmVOYW1lc3BhY2UobmFtZXNwYWNlUHJlZml4KSkpOwotICAgICAgICBlbHNlCi0gICAgICAg ICAgICAkJC0+c2V0QXR0cmlidXRlKFF1YWxpZmllZE5hbWUobmFtZXNwYWNlUHJlZml4LCAkNCwg cC0+bV9kZWZhdWx0TmFtZXNwYWNlKSk7CisgICAgICAgICQkLT5zZXRBdHRyaWJ1dGUocC0+ZGV0 ZXJtaW5lTmFtZUluTmFtZXNwYWNlKCQzLCAkNCkpOwogICAgICAgICAkJC0+c2V0TWF0Y2goKENT U1NlbGVjdG9yOjpNYXRjaCkkNSk7CiAgICAgICAgICQkLT5zZXRWYWx1ZSgkNyk7CiAgICAgfQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU1BhcnNlci5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9jc3MvQ1NTUGFyc2VyLmNwcAppbmRleCA0Mzk3OTllNmUyNGVkMWQ2Y2QzNTAzMDYyMDQ2 NzEwZmUzM2QwMWY3Li4yNzgzOTEwZWZiNGZlMjYwYmZkYjIxMjBkZTBjNTViODczZGYyNjkzIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUGFyc2VyLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9jc3MvQ1NTUGFyc2VyLmNwcApAQCAtOTE5NSw2ICs5MTk1LDEzIEBAIHZvaWQgQ1NT UGFyc2VyOjphZGROYW1lc3BhY2UoY29uc3QgQXRvbWljU3RyaW5nJiBwcmVmaXgsIGNvbnN0IEF0 b21pY1N0cmluZyYgdXJpCiAgICAgICAgIG1fZGVmYXVsdE5hbWVzcGFjZSA9IHVyaTsKIH0KIAor UXVhbGlmaWVkTmFtZSBDU1NQYXJzZXI6OmRldGVybWluZU5hbWVJbk5hbWVzcGFjZShjb25zdCBB dG9taWNTdHJpbmcmIHByZWZpeCwgY29uc3QgQXRvbWljU3RyaW5nJiBsb2NhbE5hbWUpCit7Cisg ICAgaWYgKCFtX3N0eWxlU2hlZXQpCisgICAgICAgIHJldHVybiBRdWFsaWZpZWROYW1lKHByZWZp eCwgbG9jYWxOYW1lLCBtX2RlZmF1bHROYW1lc3BhY2UpOworICAgIHJldHVybiBRdWFsaWZpZWRO YW1lKHByZWZpeCwgbG9jYWxOYW1lLCBtX3N0eWxlU2hlZXQtPmRldGVybWluZU5hbWVzcGFjZShw cmVmaXgpKTsKK30KKwogdm9pZCBDU1NQYXJzZXI6OnVwZGF0ZVNwZWNpZmllcnNXaXRoRWxlbWVu dE5hbWUoY29uc3QgQXRvbWljU3RyaW5nJiBuYW1lc3BhY2VQcmVmaXgsIGNvbnN0IEF0b21pY1N0 cmluZyYgZWxlbWVudE5hbWUsIENTU1BhcnNlclNlbGVjdG9yKiBzcGVjaWZpZXJzKQogewogICAg IEF0b21pY1N0cmluZyBkZXRlcm1pbmVkTmFtZXNwYWNlID0gbmFtZXNwYWNlUHJlZml4ICE9IG51 bGxBdG9tICYmIG1fc3R5bGVTaGVldCA/IG1fc3R5bGVTaGVldC0+ZGV0ZXJtaW5lTmFtZXNwYWNl KG5hbWVzcGFjZVByZWZpeCkgOiBtX2RlZmF1bHROYW1lc3BhY2U7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9jc3MvQ1NTUGFyc2VyLmggYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUGFyc2Vy LmgKaW5kZXggMDcwM2QzMzRjNDgxMzE0NzY2MDcyYTU1YWQ4YmM0OGM3NDI1N2FkYy4uN2M1YTYy Mzc3NDhmZjI3Yzk1NWY3M2E1YjM0MDA1YjBjOGUyNzM2MSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvY3NzL0NTU1BhcnNlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQYXJzZXIu aApAQCAtMjY3LDYgKzI2Nyw3IEBAIHB1YmxpYzoKICAgICBQYXNzT3duUHRyPE1lZGlhUXVlcnk+ IHNpbmtGbG9hdGluZ01lZGlhUXVlcnkoTWVkaWFRdWVyeSopOwogCiAgICAgdm9pZCBhZGROYW1l c3BhY2UoY29uc3QgQXRvbWljU3RyaW5nJiBwcmVmaXgsIGNvbnN0IEF0b21pY1N0cmluZyYgdXJp KTsKKyAgICBRdWFsaWZpZWROYW1lIGRldGVybWluZU5hbWVJbk5hbWVzcGFjZShjb25zdCBBdG9t aWNTdHJpbmcmIHByZWZpeCwgY29uc3QgQXRvbWljU3RyaW5nJiBsb2NhbE5hbWUpOwogICAgIHZv aWQgdXBkYXRlU3BlY2lmaWVyc1dpdGhFbGVtZW50TmFtZShjb25zdCBBdG9taWNTdHJpbmcmIG5h bWVzcGFjZVByZWZpeCwgY29uc3QgQXRvbWljU3RyaW5nJiBlbGVtZW50TmFtZSwgQ1NTUGFyc2Vy U2VsZWN0b3IqKTsKICAgICBDU1NQYXJzZXJTZWxlY3RvciogdXBkYXRlU3BlY2lmaWVycyhDU1NQ YXJzZXJTZWxlY3RvciosIENTU1BhcnNlclNlbGVjdG9yKik7CiAK