47580 2010-10-13 01:54:31 -0700 [Chromium] Clean up SerializeDomParam 2010-10-13 09:40:43 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 abarth abarth eric fishd rniwa oldest_to_newest 293317 0 abarth 2010-10-13 01:54:31 -0700 [Chromium] Clean up SerializeDomParam 293319 1 70590 abarth 2010-10-13 01:56:40 -0700 Created attachment 70590 Patch 293460 2 70590 abarth 2010-10-13 09:40:37 -0700 Comment on attachment 70590 Patch Clearing flags on attachment: 70590 Committed r69668: <http://trac.webkit.org/changeset/69668> 293461 3 abarth 2010-10-13 09:40:43 -0700 All reviewed patches have been landed. Closing bug. 70590 2010-10-13 01:56:40 -0700 2010-10-13 09:40:37 -0700 Patch bug-47580-20101013015639.patch text/plain 12834 abarth ZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9XZWJLaXQvY2hyb21pdW0v Q2hhbmdlTG9nCmluZGV4IDIzNzE3ZjI3NTRhNzViNGI3ZjFlMDJlNGFiZmJkNWE3NzRjNTc2M2Uu Ljk5NGNjNzQxY2E3MTVkNjEzNGMwMmQwNTYxYWMxNGFmZTM2Zjk4NzUgMTAwNjQ0Ci0tLSBhL1dl YktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpA QCAtMiw2ICsyLDMwIEBACiAKICAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCiAK KyAgICAgICAgW0Nocm9taXVtXSBDbGVhbiB1cCBTZXJpYWxpemVEb21QYXJhbQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDc1ODAKKworICAgICAgICBU aGlzIHBhdGNoIGp1c3QgcmVuYW1lcyBhIGJ1bmNoIG9mIHRoZSBtZW1iZXJzIG9mIHRoaXMgc3Ry dWN0IHRvIGJlCisgICAgICAgIG1vcmUgc2Vuc2libGUuICBObyBiZWhhdmlvciBjaGFuZ2UsIHdl bGwsIGV4Y2VwdCBmb3Igb25lIHN0cnVjdCBtZW1iZXIKKyAgICAgICAgdGhhdCB3YXNuJ3QgaW5p dGlhbGl6ZWQuICBJIGRpZG4ndCB0cmFjZSB0aHJvdWdoIHRoaXMgY29kZSB0byBzZWUgaWYKKyAg ICAgICAgdGhlIHVuaW5pdGlhbGl6ZWQgdmFsdWUgd2FzIHVzZWQgYW55d2hlcmUsIGJ1dCBpbml0 aWFsaXppbmcgYWxsIHRoZQorICAgICAgICB2YWx1ZXMgc2VlbXMgbGlrZSBhIGdvb2QgaWRlYS4K KworICAgICAgICAqIHNyYy9XZWJQYWdlU2VyaWFsaXplckltcGwuY3BwOgorICAgICAgICAoV2Vi S2l0OjpXZWJQYWdlU2VyaWFsaXplckltcGw6OlNlcmlhbGl6ZURvbVBhcmFtOjpTZXJpYWxpemVE b21QYXJhbSk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VTZXJpYWxpemVySW1wbDo6cHJlQWN0 aW9uQmVmb3JlU2VyaWFsaXplT3BlblRhZyk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VTZXJp YWxpemVySW1wbDo6cG9zdEFjdGlvbkFmdGVyU2VyaWFsaXplT3BlblRhZyk6CisgICAgICAgIChX ZWJLaXQ6OldlYlBhZ2VTZXJpYWxpemVySW1wbDo6cG9zdEFjdGlvbkFmdGVyU2VyaWFsaXplRW5k VGFnKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVNlcmlhbGl6ZXJJbXBsOjplbmNvZGVBbmRG bHVzaEJ1ZmZlcik6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VTZXJpYWxpemVySW1wbDo6b3Bl blRhZ1RvU3RyaW5nKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVNlcmlhbGl6ZXJJbXBsOjpl bmRUYWdUb1N0cmluZyk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VTZXJpYWxpemVySW1wbDo6 YnVpbGRDb250ZW50Rm9yTm9kZSk6CisgICAgICAgICogc3JjL1dlYlBhZ2VTZXJpYWxpemVySW1w bC5oOgorCisyMDEwLTEwLTEzICBBZGFtIEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKICAgICAgICAgW0Nocm9taXVtXSBD bGVhbiB1cCBXZWJQYWdlU2VyaWFsaXplckltcGw6OnNlcmlhbGl6ZQogICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDc1NzcKIApkaWZmIC0tZ2l0IGEvV2Vi S2l0L2Nocm9taXVtL3NyYy9XZWJQYWdlU2VyaWFsaXplckltcGwuY3BwIGIvV2ViS2l0L2Nocm9t aXVtL3NyYy9XZWJQYWdlU2VyaWFsaXplckltcGwuY3BwCmluZGV4IGQwOTllY2JiZDRhZWI2MzA0 MzY5M2JlYmE0YzA4NDQ1MmJmMzk1NGEuLjdlN2YyN2M1MzFkMmJhY2VkMTNhOTk2ODU0YzUxYzcz ZWM0ZGU1NjEgMTAwNjQ0Ci0tLSBhL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViUGFnZVNlcmlhbGl6 ZXJJbXBsLmNwcAorKysgYi9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlBhZ2VTZXJpYWxpemVySW1w bC5jcHAKQEAgLTEwNSwyMiArMTA1LDIyIEBAIG5hbWVzcGFjZSBXZWJLaXQgewogLy8gY29udGVn aW91cyBzdHJpbmcgaXMgZm91bmQgaW4gdGhlIHBhZ2UuCiBzdGF0aWMgY29uc3QgdW5zaWduZWQg ZGF0YUJ1ZmZlckNhcGFjaXR5ID0gNjU1MzY7CiAKLVdlYlBhZ2VTZXJpYWxpemVySW1wbDo6U2Vy aWFsaXplRG9tUGFyYW06OlNlcmlhbGl6ZURvbVBhcmFtKGNvbnN0IEtVUkwmIGN1cnJlbnRGcmFt ZVVSTCwKK1dlYlBhZ2VTZXJpYWxpemVySW1wbDo6U2VyaWFsaXplRG9tUGFyYW06OlNlcmlhbGl6 ZURvbVBhcmFtKGNvbnN0IEtVUkwmIHVybCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IFRleHRFbmNvZGluZyYgdGV4dEVu Y29kaW5nLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgRG9jdW1lbnQqIGRvYywKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIERvY3VtZW50KiBkb2N1bWVudCwKICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNv bnN0IFN0cmluZyYgZGlyZWN0b3J5TmFtZSkKLSAgICA6IGN1cnJlbnRGcmFtZVVSTChjdXJyZW50 RnJhbWVVUkwpCisgICAgOiB1cmwodXJsKQogICAgICwgdGV4dEVuY29kaW5nKHRleHRFbmNvZGlu ZykKLSAgICAsIGRvYyhkb2MpCisgICAgLCBkb2N1bWVudChkb2N1bWVudCkKICAgICAsIGRpcmVj dG9yeU5hbWUoZGlyZWN0b3J5TmFtZSkKLSAgICAsIGhhc0RvY3R5cGUoZmFsc2UpCi0gICAgLCBo YXNDaGVja2VkTWV0YShmYWxzZSkKKyAgICAsIGlzSFRNTERvY3VtZW50KGRvY3VtZW50LT5pc0hU TUxEb2N1bWVudCgpKQorICAgICwgaGF2ZVNlZW5Eb2NUeXBlKGZhbHNlKQorICAgICwgaGF2ZUFk ZGVkQ2hhcnNldERlY2xhcmF0aW9uKGZhbHNlKQogICAgICwgc2tpcE1ldGFFbGVtZW50KDApCiAg ICAgLCBpc0luU2NyaXB0T3JTdHlsZVRhZyhmYWxzZSkKLSAgICAsIGhhc0RvY0RlY2xhcmF0aW9u KGZhbHNlKQorICAgICwgaGF2ZUFkZGVkWE1MUHJvY2Vzc2luZ0RpcmVjdGl2ZShmYWxzZSkKKyAg ICAsIGhhdmVBZGRlZENvbnRlbnRzQmVmb3JlRW5kKGZhbHNlKQogewotICAgIC8vIENhY2hlIHRo ZSB2YWx1ZSBzaW5jZSB3ZSBjaGVjayBpdCBsb3RzIG9mIHRpbWVzLgotICAgIGlzSFRNTERvY3Vt ZW50ID0gZG9jLT5pc0hUTUxEb2N1bWVudCgpOwogfQogCiBTdHJpbmcgV2ViUGFnZVNlcmlhbGl6 ZXJJbXBsOjpwcmVBY3Rpb25CZWZvcmVTZXJpYWxpemVPcGVuVGFnKApAQCAtMTQ4LDQxICsxNDgs NDEgQEAgU3RyaW5nIFdlYlBhZ2VTZXJpYWxpemVySW1wbDo6cHJlQWN0aW9uQmVmb3JlU2VyaWFs aXplT3BlblRhZygKICAgICAgICAgICAgIH0KICAgICAgICAgfSBlbHNlIGlmIChlbGVtZW50LT5o YXNUYWdOYW1lKEhUTUxOYW1lczo6aHRtbFRhZykpIHsKICAgICAgICAgICAgIC8vIENoZWNrIHNv bWV0aGluZyBiZWZvcmUgcHJvY2Vzc2luZyB0aGUgb3BlbiB0YWcgb2YgSEVBRCBlbGVtZW50Lgot ICAgICAgICAgICAgLy8gRmlyc3Qgd2UgYWRkIGRvYyB0eXBlIGRlY2xhcmF0aW9uIGlmIG9yaWdp bmFsIGRvYyBoYXMgaXQuCi0gICAgICAgICAgICBpZiAoIXBhcmFtLT5oYXNEb2N0eXBlKSB7Ci0g ICAgICAgICAgICAgICAgcGFyYW0tPmhhc0RvY3R5cGUgPSB0cnVlOwotICAgICAgICAgICAgICAg IHJlc3VsdC5hcHBlbmQoY3JlYXRlTWFya3VwKHBhcmFtLT5kb2MtPmRvY3R5cGUoKSkpOworICAg ICAgICAgICAgLy8gRmlyc3Qgd2UgYWRkIGRvYyB0eXBlIGRlY2xhcmF0aW9uIGlmIG9yaWdpbmFs IGRvY3VtZW50IGhhcyBpdC4KKyAgICAgICAgICAgIGlmICghcGFyYW0tPmhhdmVTZWVuRG9jVHlw ZSkgeworICAgICAgICAgICAgICAgIHBhcmFtLT5oYXZlU2VlbkRvY1R5cGUgPSB0cnVlOworICAg ICAgICAgICAgICAgIHJlc3VsdC5hcHBlbmQoY3JlYXRlTWFya3VwKHBhcmFtLT5kb2N1bWVudC0+ ZG9jdHlwZSgpKSk7CiAgICAgICAgICAgICB9CiAKICAgICAgICAgICAgIC8vIEFkZCBNT1RXIGRl Y2xhcmF0aW9uIGJlZm9yZSBodG1sIHRhZy4KICAgICAgICAgICAgIC8vIFNlZSBodHRwOi8vbXNk bjIubWljcm9zb2Z0LmNvbS9lbi11cy9saWJyYXJ5L21zNTM3NjI4KFZTLjg1KS5hc3B4LgotICAg ICAgICAgICAgcmVzdWx0LmFwcGVuZChXZWJQYWdlU2VyaWFsaXplcjo6Z2VuZXJhdGVNYXJrT2ZU aGVXZWJEZWNsYXJhdGlvbihwYXJhbS0+Y3VycmVudEZyYW1lVVJMKSk7CisgICAgICAgICAgICBy ZXN1bHQuYXBwZW5kKFdlYlBhZ2VTZXJpYWxpemVyOjpnZW5lcmF0ZU1hcmtPZlRoZVdlYkRlY2xh cmF0aW9uKHBhcmFtLT51cmwpKTsKICAgICAgICAgfSBlbHNlIGlmIChlbGVtZW50LT5oYXNUYWdO YW1lKEhUTUxOYW1lczo6YmFzZVRhZykpIHsKICAgICAgICAgICAgIC8vIENvbW1lbnQgdGhlIEJB U0UgdGFnIHdoZW4gc2VyaWFsaXppbmcgZG9tLgogICAgICAgICAgICAgcmVzdWx0LmFwcGVuZCgi PCEtLSIpOwogICAgICAgICB9CiAgICAgfSBlbHNlIHsKICAgICAgICAgLy8gV3JpdGUgWE1MIGRl Y2xhcmF0aW9uLgotICAgICAgICBpZiAoIXBhcmFtLT5oYXNEb2NEZWNsYXJhdGlvbikgewotICAg ICAgICAgICAgcGFyYW0tPmhhc0RvY0RlY2xhcmF0aW9uID0gdHJ1ZTsKKyAgICAgICAgaWYgKCFw YXJhbS0+aGF2ZUFkZGVkWE1MUHJvY2Vzc2luZ0RpcmVjdGl2ZSkgeworICAgICAgICAgICAgcGFy YW0tPmhhdmVBZGRlZFhNTFByb2Nlc3NpbmdEaXJlY3RpdmUgPSB0cnVlOwogICAgICAgICAgICAg Ly8gR2V0IGVuY29kaW5nIGluZm8uCi0gICAgICAgICAgICBTdHJpbmcgeG1sRW5jb2RpbmcgPSBw YXJhbS0+ZG9jLT54bWxFbmNvZGluZygpOworICAgICAgICAgICAgU3RyaW5nIHhtbEVuY29kaW5n ID0gcGFyYW0tPmRvY3VtZW50LT54bWxFbmNvZGluZygpOwogICAgICAgICAgICAgaWYgKHhtbEVu Y29kaW5nLmlzRW1wdHkoKSkKLSAgICAgICAgICAgICAgICB4bWxFbmNvZGluZyA9IHBhcmFtLT5k b2MtPmZyYW1lKCktPmxvYWRlcigpLT53cml0ZXIoKS0+ZW5jb2RpbmcoKTsKKyAgICAgICAgICAg ICAgICB4bWxFbmNvZGluZyA9IHBhcmFtLT5kb2N1bWVudC0+ZnJhbWUoKS0+bG9hZGVyKCktPndy aXRlcigpLT5lbmNvZGluZygpOwogICAgICAgICAgICAgaWYgKHhtbEVuY29kaW5nLmlzRW1wdHko KSkKICAgICAgICAgICAgICAgICB4bWxFbmNvZGluZyA9IFVURjhFbmNvZGluZygpLm5hbWUoKTsK ICAgICAgICAgICAgIHJlc3VsdC5hcHBlbmQoIjw/eG1sIHZlcnNpb249XCIiKTsKLSAgICAgICAg ICAgIHJlc3VsdC5hcHBlbmQocGFyYW0tPmRvYy0+eG1sVmVyc2lvbigpKTsKKyAgICAgICAgICAg IHJlc3VsdC5hcHBlbmQocGFyYW0tPmRvY3VtZW50LT54bWxWZXJzaW9uKCkpOwogICAgICAgICAg ICAgcmVzdWx0LmFwcGVuZCgiXCIgZW5jb2Rpbmc9XCIiKTsKICAgICAgICAgICAgIHJlc3VsdC5h cHBlbmQoeG1sRW5jb2RpbmcpOwotICAgICAgICAgICAgaWYgKHBhcmFtLT5kb2MtPnhtbFN0YW5k YWxvbmUoKSkKKyAgICAgICAgICAgIGlmIChwYXJhbS0+ZG9jdW1lbnQtPnhtbFN0YW5kYWxvbmUo KSkKICAgICAgICAgICAgICAgICByZXN1bHQuYXBwZW5kKCJcIiBzdGFuZGFsb25lPVwieWVzIik7 CiAgICAgICAgICAgICByZXN1bHQuYXBwZW5kKCJcIj8+XG4iKTsKICAgICAgICAgfQotICAgICAg ICAvLyBBZGQgZG9jIHR5cGUgZGVjbGFyYXRpb24gaWYgb3JpZ2luYWwgZG9jIGhhcyBpdC4KLSAg ICAgICAgaWYgKCFwYXJhbS0+aGFzRG9jdHlwZSkgewotICAgICAgICAgICAgcGFyYW0tPmhhc0Rv Y3R5cGUgPSB0cnVlOwotICAgICAgICAgICAgcmVzdWx0LmFwcGVuZChjcmVhdGVNYXJrdXAocGFy YW0tPmRvYy0+ZG9jdHlwZSgpKSk7CisgICAgICAgIC8vIEFkZCBkb2MgdHlwZSBkZWNsYXJhdGlv biBpZiBvcmlnaW5hbCBkb2N1bWVudCBoYXMgaXQuCisgICAgICAgIGlmICghcGFyYW0tPmhhdmVT ZWVuRG9jVHlwZSkgeworICAgICAgICAgICAgcGFyYW0tPmhhdmVTZWVuRG9jVHlwZSA9IHRydWU7 CisgICAgICAgICAgICByZXN1bHQuYXBwZW5kKGNyZWF0ZU1hcmt1cChwYXJhbS0+ZG9jdW1lbnQt PmRvY3R5cGUoKSkpOwogICAgICAgICB9CiAgICAgfQogICAgIHJldHVybiByZXN1bHQudG9TdHJp bmcoKTsKQEAgLTE5MywxMyArMTkzLDEzIEBAIFN0cmluZyBXZWJQYWdlU2VyaWFsaXplckltcGw6 OnBvc3RBY3Rpb25BZnRlclNlcmlhbGl6ZU9wZW5UYWcoCiB7CiAgICAgU3RyaW5nQnVpbGRlciBy ZXN1bHQ7CiAKLSAgICBwYXJhbS0+aGFzQWRkZWRDb250ZW50c0JlZm9yZUVuZCA9IGZhbHNlOwor ICAgIHBhcmFtLT5oYXZlQWRkZWRDb250ZW50c0JlZm9yZUVuZCA9IGZhbHNlOwogICAgIGlmICgh cGFyYW0tPmlzSFRNTERvY3VtZW50KQogICAgICAgICByZXR1cm4gcmVzdWx0LnRvU3RyaW5nKCk7 CiAgICAgLy8gQ2hlY2sgYWZ0ZXIgcHJvY2Vzc2luZyB0aGUgb3BlbiB0YWcgb2YgSEVBRCBlbGVt ZW50Ci0gICAgaWYgKCFwYXJhbS0+aGFzQ2hlY2tlZE1ldGEKKyAgICBpZiAoIXBhcmFtLT5oYXZl QWRkZWRDaGFyc2V0RGVjbGFyYXRpb24KICAgICAgICAgJiYgZWxlbWVudC0+aGFzVGFnTmFtZShI VE1MTmFtZXM6OmhlYWRUYWcpKSB7Ci0gICAgICAgIHBhcmFtLT5oYXNDaGVja2VkTWV0YSA9IHRy dWU7CisgICAgICAgIHBhcmFtLT5oYXZlQWRkZWRDaGFyc2V0RGVjbGFyYXRpb24gPSB0cnVlOwog ICAgICAgICAvLyBDaGVjayBtZXRhIGVsZW1lbnQuIFdlYktpdCBvbmx5IHByZS1wYXJzZSB0aGUg Zmlyc3QgNTEyIGJ5dGVzCiAgICAgICAgIC8vIG9mIHRoZSBkb2N1bWVudC4gSWYgdGhlIHdob2xl IDxIRUFEPiBpcyBsYXJnZXIgYW5kIG1ldGEgaXMgdGhlCiAgICAgICAgIC8vIGVuZCBvZiBoZWFk IHBhcnQsIHRoZW4gdGhpcyBraW5kIG9mIHBhZ2VzIGFyZW4ndCBkZWNvZGVkIGNvcnJlY3RseQpA QCAtMjEwLDcgKzIxMCw3IEBAIFN0cmluZyBXZWJQYWdlU2VyaWFsaXplckltcGw6OnBvc3RBY3Rp b25BZnRlclNlcmlhbGl6ZU9wZW5UYWcoCiAgICAgICAgIHJlc3VsdC5hcHBlbmQoV2ViUGFnZVNl cmlhbGl6ZXI6OmdlbmVyYXRlTWV0YUNoYXJzZXREZWNsYXJhdGlvbigKICAgICAgICAgICAgIFN0 cmluZyhwYXJhbS0+dGV4dEVuY29kaW5nLm5hbWUoKSkpKTsKIAotICAgICAgICBwYXJhbS0+aGFz QWRkZWRDb250ZW50c0JlZm9yZUVuZCA9IHRydWU7CisgICAgICAgIHBhcmFtLT5oYXZlQWRkZWRD b250ZW50c0JlZm9yZUVuZCA9IHRydWU7CiAgICAgICAgIC8vIFdpbGwgc2VhcmNoIGVhY2ggTUVU QSB3aGljaCBoYXMgY2hhcnNldCBkZWNsYXJhdGlvbiwgYW5kIHNraXAgdGhlbSBhbGwKICAgICAg ICAgLy8gaW4gUHJlQWN0aW9uQmVmb3JlU2VyaWFsaXplT3BlblRhZy4KICAgICB9IGVsc2UgaWYg KGVsZW1lbnQtPmhhc1RhZ05hbWUoSFRNTE5hbWVzOjpzY3JpcHRUYWcpCkBAIC0yNTcsNyArMjU3 LDcgQEAgU3RyaW5nIFdlYlBhZ2VTZXJpYWxpemVySW1wbDo6cG9zdEFjdGlvbkFmdGVyU2VyaWFs aXplRW5kVGFnKAogICAgICAgICByZXN1bHQuYXBwZW5kKCItLT4iKTsKICAgICAgICAgLy8gQXBw ZW5kIGEgbmV3IGJhc2UgdGFnIGRlY2xhcmF0aW9uLgogICAgICAgICByZXN1bHQuYXBwZW5kKFdl YlBhZ2VTZXJpYWxpemVyOjpnZW5lcmF0ZUJhc2VUYWdEZWNsYXJhdGlvbigKLSAgICAgICAgICAg IHBhcmFtLT5kb2MtPmJhc2VUYXJnZXQoKSkpOworICAgICAgICAgICAgcGFyYW0tPmRvY3VtZW50 LT5iYXNlVGFyZ2V0KCkpKTsKICAgICB9CiAKICAgICByZXR1cm4gcmVzdWx0LnRvU3RyaW5nKCk7 CkBAIC0yODksNyArMjg5LDcgQEAgdm9pZCBXZWJQYWdlU2VyaWFsaXplckltcGw6OmVuY29kZUFu ZEZsdXNoQnVmZmVyKAogICAgICAgICBjb250ZW50LmNoYXJhY3RlcnMoKSwgY29udGVudC5sZW5n dGgoKSwgRW50aXRpZXNGb3JVbmVuY29kYWJsZXMpOwogCiAgICAgLy8gU2VuZCByZXN1bHQgdG8g dGhlIGNsaWVudC4KLSAgICBtX2NsaWVudC0+ZGlkU2VyaWFsaXplRGF0YUZvckZyYW1lKHBhcmFt LT5jdXJyZW50RnJhbWVVUkwsCisgICAgbV9jbGllbnQtPmRpZFNlcmlhbGl6ZURhdGFGb3JGcmFt ZShwYXJhbS0+dXJsLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgV2Vi Q1N0cmluZyhlbmNvZGVkQ29udGVudC5kYXRhKCksIGVuY29kZWRDb250ZW50Lmxlbmd0aCgpKSwK ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHN0YXR1cyk7CiB9CkBAIC0z MjcsNyArMzI3LDcgQEAgdm9pZCBXZWJQYWdlU2VyaWFsaXplckltcGw6Om9wZW5UYWdUb1N0cmlu Zyhjb25zdCBFbGVtZW50KiBlbGVtZW50LAogICAgICAgICAgICAgICAgICAgICAgICAgcmVzdWx0 ICs9IGF0dHJWYWx1ZTsKICAgICAgICAgICAgICAgICAgICAgZWxzZSB7CiAgICAgICAgICAgICAg ICAgICAgICAgICAvLyBHZXQgdGhlIGFic29sdXRlIGxpbmsKLSAgICAgICAgICAgICAgICAgICAg ICAgIFN0cmluZyBjb21wbGV0ZVVSTCA9IHBhcmFtLT5kb2MtPmNvbXBsZXRlVVJMKGF0dHJWYWx1 ZSk7CisgICAgICAgICAgICAgICAgICAgICAgICBTdHJpbmcgY29tcGxldGVVUkwgPSBwYXJhbS0+ ZG9jdW1lbnQtPmNvbXBsZXRlVVJMKGF0dHJWYWx1ZSk7CiAgICAgICAgICAgICAgICAgICAgICAg ICAvLyBDaGVjayB3aGV0aGVyIHdlIGhhdmUgbG9jYWwgZmlsZXMgZm9yIHRob3NlIGxpbmsuCiAg ICAgICAgICAgICAgICAgICAgICAgICBpZiAobV9sb2NhbExpbmtzLmNvbnRhaW5zKGNvbXBsZXRl VVJMKSkgewogICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlmICghbV9sb2NhbERpcmVjdG9y eU5hbWUuaXNFbXB0eSgpKQpAQCAtMzUwLDcgKzM1MCw3IEBAIHZvaWQgV2ViUGFnZVNlcmlhbGl6 ZXJJbXBsOjpvcGVuVGFnVG9TdHJpbmcoY29uc3QgRWxlbWVudCogZWxlbWVudCwKICAgICAvLyBE byBwb3N0IGFjdGlvbiBmb3Igb3BlbiB0YWcuCiAgICAgU3RyaW5nIGFkZGVkQ29udGVudHMgPSBw b3N0QWN0aW9uQWZ0ZXJTZXJpYWxpemVPcGVuVGFnKGVsZW1lbnQsIHBhcmFtKTsKICAgICAvLyBD b21wbGV0ZSB0aGUgb3BlbiB0YWcgZm9yIGVsZW1lbnQgd2hlbiBpdCBoYXMgY2hpbGQvY2hpbGRy ZW4uCi0gICAgaWYgKGVsZW1lbnQtPmhhc0NoaWxkTm9kZXMoKSB8fCBwYXJhbS0+aGFzQWRkZWRD b250ZW50c0JlZm9yZUVuZCkKKyAgICBpZiAoZWxlbWVudC0+aGFzQ2hpbGROb2RlcygpIHx8IHBh cmFtLT5oYXZlQWRkZWRDb250ZW50c0JlZm9yZUVuZCkKICAgICAgICAgcmVzdWx0ICs9ICI+IjsK ICAgICAvLyBBcHBlbmQgdGhlIGFkZGVkIGNvbnRlbnRzIGdlbmVyYXRlIGluICBwb3N0IGFjdGlv biBvZiBvcGVuIHRhZy4KICAgICByZXN1bHQgKz0gYWRkZWRDb250ZW50czsKQEAgLTM3MCw3ICsz NzAsNyBAQCB2b2lkIFdlYlBhZ2VTZXJpYWxpemVySW1wbDo6ZW5kVGFnVG9TdHJpbmcoY29uc3Qg RWxlbWVudCogZWxlbWVudCwKICAgICBpZiAobmVlZFNraXApCiAgICAgICAgIHJldHVybjsKICAg ICAvLyBXcml0ZSBlbmQgdGFnIHdoZW4gZWxlbWVudCBoYXMgY2hpbGQvY2hpbGRyZW4uCi0gICAg aWYgKGVsZW1lbnQtPmhhc0NoaWxkTm9kZXMoKSB8fCBwYXJhbS0+aGFzQWRkZWRDb250ZW50c0Jl Zm9yZUVuZCkgeworICAgIGlmIChlbGVtZW50LT5oYXNDaGlsZE5vZGVzKCkgfHwgcGFyYW0tPmhh dmVBZGRlZENvbnRlbnRzQmVmb3JlRW5kKSB7CiAgICAgICAgIHJlc3VsdCArPSAiPC8iOwogICAg ICAgICByZXN1bHQgKz0gZWxlbWVudC0+bm9kZU5hbWUoKS5sb3dlcigpOwogICAgICAgICByZXN1 bHQgKz0gIj4iOwpAQCAtNDIwLDcgKzQyMCw3IEBAIHZvaWQgV2ViUGFnZVNlcmlhbGl6ZXJJbXBs OjpidWlsZENvbnRlbnRGb3JOb2RlKGNvbnN0IE5vZGUqIG5vZGUsCiAgICAgICAgIGJyZWFrOwog ICAgIC8vIERvY3VtZW50IHR5cGUgbm9kZSBjYW4gYmUgaW4gRE9NPwogICAgIGNhc2UgTm9kZTo6 RE9DVU1FTlRfVFlQRV9OT0RFOgotICAgICAgICBwYXJhbS0+aGFzRG9jdHlwZSA9IHRydWU7Cisg ICAgICAgIHBhcmFtLT5oYXZlU2VlbkRvY1R5cGUgPSB0cnVlOwogICAgIGRlZmF1bHQ6CiAgICAg ICAgIC8vIEZvciBvdGhlciB0eXBlIG5vZGUsIGNhbGwgZGVmYXVsdCBhY3Rpb24uCiAgICAgICAg IHNhdmVIVE1MQ29udGVudFRvQnVmZmVyKGNyZWF0ZU1hcmt1cChub2RlKSwgcGFyYW0pOwpkaWZm IC0tZ2l0IGEvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJQYWdlU2VyaWFsaXplckltcGwuaCBiL1dl YktpdC9jaHJvbWl1bS9zcmMvV2ViUGFnZVNlcmlhbGl6ZXJJbXBsLmgKaW5kZXggNDViNzI3YTE1 NGFiOTQ1N2M1MGY5OWVlYzJhYzgyZDU1MDVkYmEwNi4uNWVlODgwNTM2Mjk4YjExMzFjNmRhN2Qy Mjc5YjUxZGUxZTVhNjA2NCAxMDA2NDQKLS0tIGEvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJQYWdl U2VyaWFsaXplckltcGwuaAorKysgYi9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlBhZ2VTZXJpYWxp emVySW1wbC5oCkBAIC0xMTYsNDIgKzExNiwyNiBAQCBwcml2YXRlOgogICAgIFdlYkVudGl0aWVz IG1feG1sRW50aXRpZXM7CiAKICAgICBzdHJ1Y3QgU2VyaWFsaXplRG9tUGFyYW0gewotICAgICAg ICAvLyBGcmFtZSBVUkwgb2YgY3VycmVudCBwcm9jZXNzaW5nIGRvY3VtZW50IHByZXNlbnRlZCBi eSBHVVJMCi0gICAgICAgIGNvbnN0IFdlYkNvcmU6OktVUkwmIGN1cnJlbnRGcmFtZVVSTDsKLSAg ICAgICAgLy8gQ3VycmVudCB1c2luZyB0ZXh0IGVuY29kaW5nIG9iamVjdC4KKyAgICAgICAgY29u c3QgV2ViQ29yZTo6S1VSTCYgdXJsOwogICAgICAgICBjb25zdCBXZWJDb3JlOjpUZXh0RW5jb2Rp bmcmIHRleHRFbmNvZGluZzsKLQotICAgICAgICAvLyBEb2N1bWVudCBvYmplY3Qgb2YgY3VycmVu dCBmcmFtZS4KLSAgICAgICAgV2ViQ29yZTo6RG9jdW1lbnQqIGRvYzsKLSAgICAgICAgLy8gTG9j YWwgZGlyZWN0b3J5IG5hbWUgb2YgYWxsIGxvY2FsIHJlc291cmNlIGZpbGVzLgorICAgICAgICBX ZWJDb3JlOjpEb2N1bWVudCogZG9jdW1lbnQ7CiAgICAgICAgIGNvbnN0IFdURjo6U3RyaW5nJiBk aXJlY3RvcnlOYW1lOwotCi0gICAgICAgIC8vIEZsYWcgaW5kaWNhdGVzIGN1cnJlbnQgZG9jIGlz IGh0bWwgZG9jdW1lbnQgb3Igbm90LiBJdCdzIGEgY2FjaGUgdmFsdWUKLSAgICAgICAgLy8gb2Yg RG9jdW1lbnQuaXNIVE1MRG9jdW1lbnQoKS4KLSAgICAgICAgYm9vbCBpc0hUTUxEb2N1bWVudDsK LSAgICAgICAgLy8gRmxhZyB3aGljaCBpbmRpY2F0ZSB3aGV0aGVyIHdlIGhhdmUgbWV0IGRvY3Vt ZW50IHR5cGUgZGVjbGFyYXRpb24uCi0gICAgICAgIGJvb2wgaGFzRG9jdHlwZTsKLSAgICAgICAg Ly8gRmxhZyB3aGljaCBpbmRpY2F0ZSB3aGV0aGVyIHdpbGwgcHJvY2VzcyBtZXRhIGlzc3VlLgot ICAgICAgICBib29sIGhhc0NoZWNrZWRNZXRhOworICAgICAgICBib29sIGlzSFRNTERvY3VtZW50 OyAvLyBkb2N1bWVudC5pc0hUTUxEb2N1bWVudCgpCisgICAgICAgIGJvb2wgaGF2ZVNlZW5Eb2NU eXBlOworICAgICAgICBib29sIGhhdmVBZGRlZENoYXJzZXREZWNsYXJhdGlvbjsKICAgICAgICAg Ly8gVGhpcyBtZXRhIGVsZW1lbnQgbmVlZCB0byBiZSBza2lwcGVkIHdoZW4gc2VyaWFsaXppbmcg RE9NLgogICAgICAgICBjb25zdCBXZWJDb3JlOjpFbGVtZW50KiBza2lwTWV0YUVsZW1lbnQ7CiAg ICAgICAgIC8vIEZsYWcgaW5kaWNhdGVzIHdlIGFyZSBpbiBzY3JpcHQgb3Igc3R5bGUgdGFnLgog ICAgICAgICBib29sIGlzSW5TY3JpcHRPclN0eWxlVGFnOwotICAgICAgICAvLyBGbGFnIGluZGlj YXRlcyB3aGV0aGVyIHdlIGhhdmUgd3JpdHRlbiB4bWwgZG9jdW1lbnQgZGVjbGFyYXRpb24uCi0g ICAgICAgIC8vIEl0IGlzIG9ubHkgdXNlZCBpbiB4bWwgZG9jdW1lbnQKLSAgICAgICAgYm9vbCBo YXNEb2NEZWNsYXJhdGlvbjsKKyAgICAgICAgYm9vbCBoYXZlQWRkZWRYTUxQcm9jZXNzaW5nRGly ZWN0aXZlOwogICAgICAgICAvLyBGbGFnIGluZGljYXRlcyB3aGV0aGVyIHdlIGhhdmUgYWRkZWQg YWRkaXRpb25hbCBjb250ZW50cyBiZWZvcmUgZW5kIHRhZy4KICAgICAgICAgLy8gVGhpcyBmbGFn IHdpbGwgYmUgcmUtYXNzaWduZWQgaW4gZWFjaCBjYWxsIG9mIGZ1bmN0aW9uCiAgICAgICAgIC8v IFBvc3RBY3Rpb25BZnRlclNlcmlhbGl6ZU9wZW5UYWcgYW5kIGl0IGNvdWxkIGJlIGNoYW5nZWQg aW4gZnVuY3Rpb24KICAgICAgICAgLy8gUHJlQWN0aW9uQmVmb3JlU2VyaWFsaXplRW5kVGFnIGlm IHRoZSBmdW5jdGlvbiBhZGRzIG5ldyBjb250ZW50cyBpbnRvCiAgICAgICAgIC8vIHNlcmlhbGl6 YXRpb24gc3RyZWFtLgotICAgICAgICBib29sIGhhc0FkZGVkQ29udGVudHNCZWZvcmVFbmQ7Cisg ICAgICAgIGJvb2wgaGF2ZUFkZGVkQ29udGVudHNCZWZvcmVFbmQ7CiAKLSAgICAgICAgLy8gQ29u c3RydWN0b3IuCi0gICAgICAgIFNlcmlhbGl6ZURvbVBhcmFtKGNvbnN0IFdlYkNvcmU6OktVUkwm IGN1cnJlbnRGcmFtZVVSTCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgV2ViQ29y ZTo6VGV4dEVuY29kaW5nJiB0ZXh0RW5jb2RpbmcsCi0gICAgICAgICAgICAgICAgICAgICAgICAg IFdlYkNvcmU6OkRvY3VtZW50KiBkb2MsCi0gICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0 IFdURjo6U3RyaW5nJiBkaXJlY3RvcnlOYW1lKTsKKyAgICAgICAgU2VyaWFsaXplRG9tUGFyYW0o Y29uc3QgV2ViQ29yZTo6S1VSTCYsIGNvbnN0IFdlYkNvcmU6OlRleHRFbmNvZGluZyYsIFdlYkNv cmU6OkRvY3VtZW50KiwgY29uc3QgV1RGOjpTdHJpbmcmIGRpcmVjdG9yeU5hbWUpOwogICAgIH07 CiAKICAgICAvLyBDb2xsZWN0IGFsbCB0YXJnZXQgZnJhbWVzIHdoaWNoIG5lZWQgdG8gYmUgc2Vy aWFsaXplZC4K