78384 2012-02-10 13:55:07 -0800 MathML internals - use createXXX() function naming, ASSERT()s 2012-02-10 20:28:46 -0800 1 1 1 Unclassified WebKit MathML 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 dbarton webkit-unassigned eric webkit.review.bot oldest_to_newest 554365 0 dbarton 2012-02-10 13:55:07 -0800 MathML internals - use createXXX() function naming, ASSERT()s 554368 1 126576 dbarton 2012-02-10 13:58:23 -0800 Created attachment 126576 Patch 554551 2 126576 eric 2012-02-10 19:19:08 -0800 Comment on attachment 126576 Patch LGTM. Thanks. 554562 3 126576 webkit.review.bot 2012-02-10 20:28:41 -0800 Comment on attachment 126576 Patch Clearing flags on attachment: 126576 Committed r107473: <http://trac.webkit.org/changeset/107473> 554563 4 webkit.review.bot 2012-02-10 20:28:46 -0800 All reviewed patches have been landed. Closing bug. 126576 2012-02-10 13:58:23 -0800 2012-02-10 20:28:41 -0800 Patch bug-78384-20120210135821.patch text/plain 9299 dbarton SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEwNzQzNykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM1IEBACisyMDEyLTAyLTEwICBEYXZpZCBC YXJ0b24gIDxkYmFydG9uQG1hdGhzY3JpYmUuY29tPgorCisgICAgICAgIE1hdGhNTCBpbnRlcm5h bHMgLSB1c2UgY3JlYXRlWFhYKCkgZnVuY3Rpb24gbmFtaW5nLCBBU1NFUlQoKXMKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc4Mzg0CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU3RhbmRhcmQgUmVmUHRyIGZ1 bmN0aW9uIG5hbWluZyB1c2VzICJjcmVhdGVYWFgiIGluc3RlYWQgb2YgIm1ha2VYWFgiLgorICAg ICAgICBJIGFsc28gYWRkZWQgYSBjb3VwbGUgb2YgQVNTRVJUKClzLgorCisgICAgICAgIE5vIG5l dyB0ZXN0cy4KKworICAgICAgICAqIHJlbmRlcmluZy9tYXRobWwvUmVuZGVyTWF0aE1MQmxvY2su Y3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTWF0aE1MQmxvY2s6OmNyZWF0ZUJsb2NrU3R5 bGUpOgorICAgICAgICAqIHJlbmRlcmluZy9tYXRobWwvUmVuZGVyTWF0aE1MQmxvY2suaDoKKyAg ICAgICAgKFJlbmRlck1hdGhNTEJsb2NrKToKKyAgICAgICAgKiByZW5kZXJpbmcvbWF0aG1sL1Jl bmRlck1hdGhNTEZlbmNlZC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJNYXRoTUxGZW5j ZWQ6OmNyZWF0ZU9wZXJhdG9yU3R5bGUpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTWF0aE1M RmVuY2VkOjptYWtlRmVuY2VzKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlck1hdGhNTEZlbmNl ZDo6YWRkQ2hpbGQpOgorICAgICAgICAqIHJlbmRlcmluZy9tYXRobWwvUmVuZGVyTWF0aE1MRmVu Y2VkLmg6CisgICAgICAgIChSZW5kZXJNYXRoTUxGZW5jZWQpOgorICAgICAgICAqIHJlbmRlcmlu Zy9tYXRobWwvUmVuZGVyTWF0aE1MRnJhY3Rpb24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVu ZGVyTWF0aE1MRnJhY3Rpb246OmFkZENoaWxkKToKKyAgICAgICAgKiByZW5kZXJpbmcvbWF0aG1s L1JlbmRlck1hdGhNTFJvb3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTWF0aE1MUm9v dDo6YWRkQ2hpbGQpOgorICAgICAgICAqIHJlbmRlcmluZy9tYXRobWwvUmVuZGVyTWF0aE1MU3Vi U3VwLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlck1hdGhNTFN1YlN1cDo6UmVuZGVyTWF0 aE1MU3ViU3VwKToKKyAgICAgICAgKiByZW5kZXJpbmcvbWF0aG1sL1JlbmRlck1hdGhNTFVuZGVy T3Zlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJNYXRoTUxVbmRlck92ZXI6OlJlbmRl ck1hdGhNTFVuZGVyT3Zlcik6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJNYXRoTUxVbmRlck92 ZXI6OmFkZENoaWxkKToKKwogMjAxMi0wMi0xMCAgS2VudGFybyBIYXJhICA8aGFyYWtlbkBjaHJv bWl1bS5vcmc+CiAKICAgICAgICAgUmVuYW1lIFtKU0N1c3RvbVByb3RvdHlwZVB1dERlbGVnYXRl XSB0byBbSlNDdXN0b21OYW1lZEdldHRlck9uUHJvdG90eXBlXQpJbmRleDogU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL21hdGhtbC9SZW5kZXJNYXRoTUxCbG9jay5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL21hdGhtbC9SZW5kZXJNYXRoTUxCbG9jay5jcHAJKHJl dmlzaW9uIDEwNzQyOCkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9tYXRobWwvUmVuZGVy TWF0aE1MQmxvY2suY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00OSw3ICs0OSw3IEBAIGJvb2wgUmVu ZGVyTWF0aE1MQmxvY2s6OmlzQ2hpbGRBbGxvd2VkKFIKICAgICByZXR1cm4gY2hpbGQtPm5vZGUo KSAmJiBjaGlsZC0+bm9kZSgpLT5ub2RlVHlwZSgpID09IE5vZGU6OkVMRU1FTlRfTk9ERTsKIH0K IAotUGFzc1JlZlB0cjxSZW5kZXJTdHlsZT4gUmVuZGVyTWF0aE1MQmxvY2s6Om1ha2VCbG9ja1N0 eWxlKCkKK1Bhc3NSZWZQdHI8UmVuZGVyU3R5bGU+IFJlbmRlck1hdGhNTEJsb2NrOjpjcmVhdGVC bG9ja1N0eWxlKCkKIHsKICAgICBSZWZQdHI8UmVuZGVyU3R5bGU+IG5ld1N0eWxlID0gUmVuZGVy U3R5bGU6OmNyZWF0ZSgpOwogICAgIG5ld1N0eWxlLT5pbmhlcml0RnJvbShzdHlsZSgpKTsKSW5k ZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9tYXRobWwvUmVuZGVyTWF0aE1MQmxvY2suaAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvbWF0aG1sL1JlbmRlck1hdGhN TEJsb2NrLmgJKHJldmlzaW9uIDEwNzQyOCkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9t YXRobWwvUmVuZGVyTWF0aE1MQmxvY2suaAkod29ya2luZyBjb3B5KQpAQCAtNzAsNyArNzAsNyBA QCBwcm90ZWN0ZWQ6CiAgICAgICAgIAogICAgICAgICByZXR1cm4gMDsKICAgICB9Ci0gICAgdmly dHVhbCBQYXNzUmVmUHRyPFJlbmRlclN0eWxlPiBtYWtlQmxvY2tTdHlsZSgpOworICAgIHZpcnR1 YWwgUGFzc1JlZlB0cjxSZW5kZXJTdHlsZT4gY3JlYXRlQmxvY2tTdHlsZSgpOwogCiBwcml2YXRl OgogICAgIHZpcnR1YWwgY29uc3QgY2hhciogcmVuZGVyTmFtZSgpIGNvbnN0IHsgcmV0dXJuIGlz QW5vbnltb3VzKCkgPyAiUmVuZGVyTWF0aE1MQmxvY2sgKGFub255bW91cykiIDogIlJlbmRlck1h dGhNTEJsb2NrIjsgfQpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL21hdGhtbC9SZW5k ZXJNYXRoTUxGZW5jZWQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9tYXRobWwvUmVuZGVyTWF0aE1MRmVuY2VkLmNwcAkocmV2aXNpb24gMTA3NDI4KQorKysgU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL21hdGhtbC9SZW5kZXJNYXRoTUxGZW5jZWQuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC04MCw3ICs4MCw3IEBAIHZvaWQgUmVuZGVyTWF0aE1MRmVuY2VkOjp1cGRh dGVGcm9tRWxlbWUKICAgICAgICAgbWFrZUZlbmNlcygpOwogfQogCi1QYXNzUmVmUHRyPFJlbmRl clN0eWxlPiBSZW5kZXJNYXRoTUxGZW5jZWQ6Om1ha2VPcGVyYXRvclN0eWxlKCkKK1Bhc3NSZWZQ dHI8UmVuZGVyU3R5bGU+IFJlbmRlck1hdGhNTEZlbmNlZDo6Y3JlYXRlT3BlcmF0b3JTdHlsZSgp CiB7CiAgICAgUmVmUHRyPFJlbmRlclN0eWxlPiBuZXdTdHlsZSA9IFJlbmRlclN0eWxlOjpjcmVh dGUoKTsKICAgICBuZXdTdHlsZS0+aW5oZXJpdEZyb20oc3R5bGUoKSk7CkBAIC05MiwxMCArOTIs MTAgQEAgUGFzc1JlZlB0cjxSZW5kZXJTdHlsZT4gUmVuZGVyTWF0aE1MRmVuYwogdm9pZCBSZW5k ZXJNYXRoTUxGZW5jZWQ6Om1ha2VGZW5jZXMoKQogewogICAgIFJlbmRlck9iamVjdCogb3BlbkZl bmNlID0gbmV3IChyZW5kZXJBcmVuYSgpKSBSZW5kZXJNYXRoTUxPcGVyYXRvcihub2RlKCksIG1f b3Blbik7Ci0gICAgb3BlbkZlbmNlLT5zZXRTdHlsZShtYWtlT3BlcmF0b3JTdHlsZSgpKTsKKyAg ICBvcGVuRmVuY2UtPnNldFN0eWxlKGNyZWF0ZU9wZXJhdG9yU3R5bGUoKSk7CiAgICAgUmVuZGVy QmxvY2s6OmFkZENoaWxkKG9wZW5GZW5jZSwgZmlyc3RDaGlsZCgpKTsKICAgICBSZW5kZXJPYmpl Y3QqIGNsb3NlRmVuY2UgPSBuZXcgKHJlbmRlckFyZW5hKCkpIFJlbmRlck1hdGhNTE9wZXJhdG9y KG5vZGUoKSwgbV9jbG9zZSk7Ci0gICAgY2xvc2VGZW5jZS0+c2V0U3R5bGUobWFrZU9wZXJhdG9y U3R5bGUoKSk7CisgICAgY2xvc2VGZW5jZS0+c2V0U3R5bGUoY3JlYXRlT3BlcmF0b3JTdHlsZSgp KTsKICAgICBSZW5kZXJCbG9jazo6YWRkQ2hpbGQoY2xvc2VGZW5jZSk7CiB9CiAKQEAgLTEyMiw3 ICsxMjIsNyBAQCB2b2lkIFJlbmRlck1hdGhNTEZlbmNlZDo6YWRkQ2hpbGQoUmVuZGVyCiAgICAg ICAgICAgICAgICAgc2VwYXJhdG9yID0gKCptX3NlcGFyYXRvcnMuZ2V0KCkpW2NvdW50IC0gMl07 CiAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICBSZW5kZXJPYmplY3QqIHNlcGFyYXRvck9i aiA9IG5ldyAocmVuZGVyQXJlbmEoKSkgUmVuZGVyTWF0aE1MT3BlcmF0b3Iobm9kZSgpLCBzZXBh cmF0b3IpOwotICAgICAgICAgICAgc2VwYXJhdG9yT2JqLT5zZXRTdHlsZShtYWtlT3BlcmF0b3JT dHlsZSgpKTsKKyAgICAgICAgICAgIHNlcGFyYXRvck9iai0+c2V0U3R5bGUoY3JlYXRlT3BlcmF0 b3JTdHlsZSgpKTsKICAgICAgICAgICAgIFJlbmRlckJsb2NrOjphZGRDaGlsZChzZXBhcmF0b3JP YmosIGxhc3RDaGlsZCgpKTsKICAgICAgICAgfQogICAgIH0KSW5kZXg6IFNvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9tYXRobWwvUmVuZGVyTWF0aE1MRmVuY2VkLmgKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL21hdGhtbC9SZW5kZXJNYXRoTUxGZW5jZWQuaAkocmV2aXNp b24gMTA3NDI4KQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL21hdGhtbC9SZW5kZXJNYXRo TUxGZW5jZWQuaAkod29ya2luZyBjb3B5KQpAQCAtNDEsNyArNDEsNyBAQCBwdWJsaWM6CiBwcml2 YXRlOgogICAgIHZpcnR1YWwgY29uc3QgY2hhciogcmVuZGVyTmFtZSgpIGNvbnN0IHsgcmV0dXJu ICJSZW5kZXJNYXRoTUxGZW5jZWQiOyB9CiAKLSAgICBQYXNzUmVmUHRyPFJlbmRlclN0eWxlPiBt YWtlT3BlcmF0b3JTdHlsZSgpOworICAgIFBhc3NSZWZQdHI8UmVuZGVyU3R5bGU+IGNyZWF0ZU9w ZXJhdG9yU3R5bGUoKTsKICAgICB2b2lkIG1ha2VGZW5jZXMoKTsKICAgICAKICAgICBVQ2hhciBt X29wZW47CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvbWF0aG1sL1JlbmRlck1hdGhN TEZyYWN0aW9uLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvbWF0 aG1sL1JlbmRlck1hdGhNTEZyYWN0aW9uLmNwcAkocmV2aXNpb24gMTA3NDI4KQorKysgU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL21hdGhtbC9SZW5kZXJNYXRoTUxGcmFjdGlvbi5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTEwMSw3ICsxMDEsNyBAQCB2b2lkIFJlbmRlck1hdGhNTEZyYWN0aW9uOjp1 cGRhdGVGcm9tRWxlCiB2b2lkIFJlbmRlck1hdGhNTEZyYWN0aW9uOjphZGRDaGlsZChSZW5kZXJP YmplY3QqIGNoaWxkLCBSZW5kZXJPYmplY3QqIGJlZm9yZUNoaWxkKQogewogICAgIFJlbmRlckJs b2NrKiByb3cgPSBuZXcgKHJlbmRlckFyZW5hKCkpIFJlbmRlck1hdGhNTEJsb2NrKG5vZGUoKSk7 Ci0gICAgUmVmUHRyPFJlbmRlclN0eWxlPiByb3dTdHlsZSA9IG1ha2VCbG9ja1N0eWxlKCk7Cisg ICAgUmVmUHRyPFJlbmRlclN0eWxlPiByb3dTdHlsZSA9IGNyZWF0ZUJsb2NrU3R5bGUoKTsKICAg ICAKICAgICByb3dTdHlsZS0+c2V0VGV4dEFsaWduKENFTlRFUik7CiAgICAgTGVuZ3RoIHBhZChz dGF0aWNfY2FzdDxpbnQ+KHJvd1N0eWxlLT5mb250U2l6ZSgpICogZ0hvcml6b250YWxQYWQpLCBG aXhlZCk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvbWF0aG1sL1JlbmRlck1hdGhN TFJvb3QuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9tYXRobWwv UmVuZGVyTWF0aE1MUm9vdC5jcHAJKHJldmlzaW9uIDEwNzQyOCkKKysrIFNvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9tYXRobWwvUmVuZGVyTWF0aE1MUm9vdC5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTc0LDcgKzc0LDcgQEAgdm9pZCBSZW5kZXJNYXRoTUxSb290OjphZGRDaGlsZChSZW5kZXJPYgog ICAgIGlmIChpc0VtcHR5KCkpIHsKICAgICAgICAgLy8gQWRkIGEgYmxvY2sgZm9yIHRoZSBpbmRl eAogICAgICAgICBSZW5kZXJCbG9jayogYmxvY2sgPSBuZXcgKHJlbmRlckFyZW5hKCkpIFJlbmRl ckJsb2NrKG5vZGUoKSk7Ci0gICAgICAgIFJlZlB0cjxSZW5kZXJTdHlsZT4gaW5kZXhTdHlsZSA9 IG1ha2VCbG9ja1N0eWxlKCk7CisgICAgICAgIFJlZlB0cjxSZW5kZXJTdHlsZT4gaW5kZXhTdHls ZSA9IGNyZWF0ZUJsb2NrU3R5bGUoKTsKICAgICAgICAgaW5kZXhTdHlsZS0+c2V0RGlzcGxheShJ TkxJTkVfQkxPQ0spOwogICAgICAgICBibG9jay0+c2V0U3R5bGUoaW5kZXhTdHlsZS5yZWxlYXNl KCkpOwogICAgICAgICBSZW5kZXJCbG9jazo6YWRkQ2hpbGQoYmxvY2spOwpAQCAtODIsNyArODIs NyBAQCB2b2lkIFJlbmRlck1hdGhNTFJvb3Q6OmFkZENoaWxkKFJlbmRlck9iCiAgICAgICAgIC8v IEZJWE1FOiB0aGUgd3JhcHBpbmcgZG9lcyBub3Qgc2VlbSB0byBiZSBuZWVkZWQgYW55bW9yZS4K ICAgICAgICAgLy8gdGhpcyBpcyB0aGUgYmFzZSwgc28gd3JhcCBpdCBzbyB3ZSBjYW4gcGFkIGl0 CiAgICAgICAgIGJsb2NrID0gbmV3IChyZW5kZXJBcmVuYSgpKSBSZW5kZXJCbG9jayhub2RlKCkp OwotICAgICAgICBSZWZQdHI8UmVuZGVyU3R5bGU+IGJhc2VTdHlsZSA9IG1ha2VCbG9ja1N0eWxl KCk7CisgICAgICAgIFJlZlB0cjxSZW5kZXJTdHlsZT4gYmFzZVN0eWxlID0gY3JlYXRlQmxvY2tT dHlsZSgpOwogICAgICAgICBiYXNlU3R5bGUtPnNldERpc3BsYXkoSU5MSU5FX0JMT0NLKTsKICAg ICAgICAgYmFzZVN0eWxlLT5zZXRQYWRkaW5nTGVmdChMZW5ndGgoNSAqIGdSYWRpY2FsV2lkdGgg LCBQZXJjZW50KSk7CiAgICAgICAgIGJsb2NrLT5zZXRTdHlsZShiYXNlU3R5bGUucmVsZWFzZSgp KTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9tYXRobWwvUmVuZGVyTWF0aE1MU3Vi U3VwLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvbWF0aG1sL1Jl bmRlck1hdGhNTFN1YlN1cC5jcHAJKHJldmlzaW9uIDEwNzQyOCkKKysrIFNvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9tYXRobWwvUmVuZGVyTWF0aE1MU3ViU3VwLmNwcAkod29ya2luZyBjb3B5KQpA QCAtNDMsMTUgKzQzLDE1IEBAIFJlbmRlck1hdGhNTFN1YlN1cDo6UmVuZGVyTWF0aE1MU3ViU3Vw KEUKICAgICA6IFJlbmRlck1hdGhNTEJsb2NrKGVsZW1lbnQpCiAgICAgLCBtX3NjcmlwdHMoMCkK IHsKLSAgICAvLyBEZXRlcm1pbmUgd2hhdCBraW5kIG9mIHVuZGVyL292ZXIgZXhwcmVzc2lvbiB3 ZSBoYXZlIGJ5IGVsZW1lbnQgbmFtZQorICAgIC8vIERldGVybWluZSB3aGF0IGtpbmQgb2Ygc3Vi L3N1cCBleHByZXNzaW9uIHdlIGhhdmUgYnkgZWxlbWVudCBuYW1lCiAgICAgaWYgKGVsZW1lbnQt Pmhhc0xvY2FsTmFtZShNYXRoTUxOYW1lczo6bXN1YlRhZykpCiAgICAgICAgIG1fa2luZCA9IFN1 YjsKICAgICBlbHNlIGlmIChlbGVtZW50LT5oYXNMb2NhbE5hbWUoTWF0aE1MTmFtZXM6Om1zdXBU YWcpKQogICAgICAgICBtX2tpbmQgPSBTdXA7Ci0gICAgZWxzZSBpZiAoZWxlbWVudC0+aGFzTG9j YWxOYW1lKE1hdGhNTE5hbWVzOjptc3Vic3VwVGFnKSkKLSAgICAgICAgbV9raW5kID0gU3ViU3Vw OwotICAgIGVsc2UgCisgICAgZWxzZSB7CisgICAgICAgIEFTU0VSVChlbGVtZW50LT5oYXNMb2Nh bE5hbWUoTWF0aE1MTmFtZXM6Om1zdWJzdXBUYWcpKTsKICAgICAgICAgbV9raW5kID0gU3ViU3Vw OworICAgIH0KIH0KIAogdm9pZCBSZW5kZXJNYXRoTUxTdWJTdXA6OmFkZENoaWxkKFJlbmRlck9i amVjdCogY2hpbGQsIFJlbmRlck9iamVjdCogYmVmb3JlQ2hpbGQpCkluZGV4OiBTb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvbWF0aG1sL1JlbmRlck1hdGhNTFVuZGVyT3Zlci5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL21hdGhtbC9SZW5kZXJNYXRoTUxVbmRlck92 ZXIuY3BwCShyZXZpc2lvbiAxMDc0MjgpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvbWF0 aG1sL1JlbmRlck1hdGhNTFVuZGVyT3Zlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQyLDIyICs0 MiwyMCBAQCBSZW5kZXJNYXRoTUxVbmRlck92ZXI6OlJlbmRlck1hdGhNTFVuZGVyCiAgICAgOiBS ZW5kZXJNYXRoTUxCbG9jayhlbGVtZW50KQogewogICAgIC8vIERldGVybWluZSB3aGF0IGtpbmQg b2YgdW5kZXIvb3ZlciBleHByZXNzaW9uIHdlIGhhdmUgYnkgZWxlbWVudCBuYW1lCi0gICAgCiAg ICAgaWYgKGVsZW1lbnQtPmhhc0xvY2FsTmFtZShNYXRoTUxOYW1lczo6bXVuZGVyVGFnKSkKICAg ICAgICAgbV9raW5kID0gVW5kZXI7CiAgICAgZWxzZSBpZiAoZWxlbWVudC0+aGFzTG9jYWxOYW1l KE1hdGhNTE5hbWVzOjptb3ZlclRhZykpCiAgICAgICAgIG1fa2luZCA9IE92ZXI7Ci0gICAgZWxz ZSBpZiAoZWxlbWVudC0+aGFzTG9jYWxOYW1lKE1hdGhNTE5hbWVzOjptdW5kZXJvdmVyVGFnKSkK KyAgICBlbHNlIHsKKyAgICAgICAgQVNTRVJUKGVsZW1lbnQtPmhhc0xvY2FsTmFtZShNYXRoTUxO YW1lczo6bXVuZGVyb3ZlclRhZykpOwogICAgICAgICBtX2tpbmQgPSBVbmRlck92ZXI7Ci0gICAg ZWxzZSAKLSAgICAgICAgbV9raW5kID0gVW5kZXI7Ci0gICAgCisgICAgfQogfQogCiB2b2lkIFJl bmRlck1hdGhNTFVuZGVyT3Zlcjo6YWRkQ2hpbGQoUmVuZGVyT2JqZWN0KiBjaGlsZCwgUmVuZGVy T2JqZWN0KiBiZWZvcmVDaGlsZCkKIHsgICAgCiAgICAgUmVuZGVyTWF0aE1MQmxvY2sqIHJvdyA9 IG5ldyAocmVuZGVyQXJlbmEoKSkgUmVuZGVyTWF0aE1MQmxvY2sobm9kZSgpKTsKLSAgICBSZWZQ dHI8UmVuZGVyU3R5bGU+IHJvd1N0eWxlID0gbWFrZUJsb2NrU3R5bGUoKTsKKyAgICBSZWZQdHI8 UmVuZGVyU3R5bGU+IHJvd1N0eWxlID0gY3JlYXRlQmxvY2tTdHlsZSgpOwogICAgIHJvdy0+c2V0 U3R5bGUocm93U3R5bGUucmVsZWFzZSgpKTsKICAgICByb3ctPnNldElzQW5vbnltb3VzKHRydWUp OwogICAgIAo=