126795 2014-01-10 17:12:00 -0800 CTTE FrameTree 2014-01-10 17:15:10 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca commit-queue oldest_to_newest 966695 0 andersca 2014-01-10 17:12:00 -0800 CTTE FrameTree 966696 1 220908 andersca 2014-01-10 17:12:58 -0800 Created attachment 220908 Patch 966699 2 commit-queue 2014-01-10 17:14:58 -0800 Attachment 220908 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCore/page/Frame.cpp', u'Source/WebCore/page/FrameTree.cpp', u'Source/WebCore/page/FrameTree.h', '--commit-queue']" exit_code: 1 ERROR: Source/WebCore/page/Frame.cpp:165: Wrong number of spaces before statement. (expected: 8) [whitespace/indent] [4] Total errors found: 1 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 966700 3 andersca 2014-01-10 17:15:10 -0800 Committed r161703: <http://trac.webkit.org/changeset/161703> 220908 2014-01-10 17:12:58 -0800 2014-01-10 17:13:38 -0800 Patch bug-126795-20140110171257.patch text/plain 11688 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTYxNjk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzUwMDQ5ODgxZjE5N2E3 Mzk0OWE3MTczM2IzMjQxY2Q4MGU5ZGZlOS4uZTk1ZTRmNGJjYzY5YzExNTU0YjI1ZjJkMWIyZmE2 NDIyMzk2YmEyMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMyIEBACiAyMDE0LTAxLTEwICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgQ1RURSBGcmFtZVRy ZWUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNjc5 NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogcGFn ZS9GcmFtZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZTo6RnJhbWUpOgorICAgICAgICAq IHBhZ2UvRnJhbWVUcmVlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVHJlZTo6dHJhbnNm ZXJDaGlsZCk6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZVRyZWU6OmFwcGVuZENoaWxkKToKKyAg ICAgICAgKFdlYkNvcmU6OkZyYW1lVHJlZTo6YWN0dWFsbHlBcHBlbmRDaGlsZCk6CisgICAgICAg IChXZWJDb3JlOjpGcmFtZVRyZWU6OnVuaXF1ZUNoaWxkTmFtZSk6CisgICAgICAgIChXZWJDb3Jl OjpGcmFtZVRyZWU6OnNjb3BlZENoaWxkKToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVHJlZTo6 c2NvcGVkQ2hpbGRDb3VudCk6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZVRyZWU6OmNoaWxkKToK KyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVHJlZTo6ZmluZCk6CisgICAgICAgIChXZWJDb3JlOjpG cmFtZVRyZWU6OmlzRGVzY2VuZGFudE9mKToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVHJlZTo6 dHJhdmVyc2VOZXh0KToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVHJlZTo6dHJhdmVyc2VOZXh0 V2l0aFdyYXApOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVUcmVlOjp0cmF2ZXJzZVByZXZpb3Vz V2l0aFdyYXApOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVUcmVlOjpkZWVwTGFzdENoaWxkKToK KyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVHJlZTo6dG9wKToKKyAgICAgICAgKiBwYWdlL0ZyYW1l VHJlZS5oOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVUcmVlOjpGcmFtZVRyZWUpOgorCisyMDE0 LTAxLTEwICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKICAgICAgICAg Q1RURSBpbiBOYXZpZ2F0aW9uU2NoZWR1bGVyCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMjY3ODgKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGFnZS9GcmFtZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lLmNwcAppbmRleCA5OWI0 ZmJjMzE3YzBhN2YzZDJkYjgwZDExMWZjNGM4YjUzMGM5NGUxLi40ZmJkMzdmMTg3YmFlNWFhYWYw NTg2NDk5ZTYzOWM5MDNjNTFkYzE3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0Zy YW1lLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lLmNwcApAQCAtMTYyLDcgKzE2 Miw3IEBAIEZyYW1lOjpGcmFtZShQYWdlJiBwYWdlLCBIVE1MRnJhbWVPd25lckVsZW1lbnQqIG93 bmVyRWxlbWVudCwgRnJhbWVMb2FkZXJDbGllbnQmCiAgICAgOiBtX21haW5GcmFtZShvd25lckVs ZW1lbnQgPyBwYWdlLm1haW5GcmFtZSgpIDogc3RhdGljX2Nhc3Q8TWFpbkZyYW1lJj4oKnRoaXMp KQogICAgICwgbV9wYWdlKCZwYWdlKQogICAgICwgbV9zZXR0aW5ncygmcGFnZS5zZXR0aW5ncygp KQotICAgICwgbV90cmVlTm9kZSh0aGlzLCBwYXJlbnRGcm9tT3duZXJFbGVtZW50KG93bmVyRWxl bWVudCkpCisgICAgLCBtX3RyZWVOb2RlKCp0aGlzLCBwYXJlbnRGcm9tT3duZXJFbGVtZW50KG93 bmVyRWxlbWVudCkpCiAgICAgLCBtX2xvYWRlcigqdGhpcywgZnJhbWVMb2FkZXJDbGllbnQpCiAg ICAgLCBtX25hdmlnYXRpb25TY2hlZHVsZXIoKnRoaXMpCiAgICAgLCBtX293bmVyRWxlbWVudChv d25lckVsZW1lbnQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVHJlZS5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVHJlZS5jcHAKaW5kZXggY2VlMTI2ZGJhYWI2 MmM1ZjE0ZWZhOTdhZDg4YTRiODliZThjMTIwOS4uMmVmMjNiMzM1OGE5ZDIyZTIwYmJlYWU0NjA4 ZjdjMGJjNzNiYTdmYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVRyZWUu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVUcmVlLmNwcApAQCAtNjYsMTQgKzY2 LDE0IEBAIEZyYW1lKiBGcmFtZVRyZWU6OnBhcmVudCgpIGNvbnN0CiBib29sIEZyYW1lVHJlZTo6 dHJhbnNmZXJDaGlsZChQYXNzUmVmUHRyPEZyYW1lPiBjaGlsZCkKIHsKICAgICBGcmFtZSogb2xk UGFyZW50ID0gY2hpbGQtPnRyZWUoKS5wYXJlbnQoKTsKLSAgICBpZiAob2xkUGFyZW50ID09IG1f dGhpc0ZyYW1lKQorICAgIGlmIChvbGRQYXJlbnQgPT0gJm1fdGhpc0ZyYW1lKQogICAgICAgICBy ZXR1cm4gZmFsc2U7IC8vIHxjaGlsZHwgaXMgYWxyZWFkeSBhIGNoaWxkIG9mIG1fdGhpc0ZyYW1l LgogCiAgICAgaWYgKG9sZFBhcmVudCkKICAgICAgICAgb2xkUGFyZW50LT50cmVlKCkucmVtb3Zl Q2hpbGQoY2hpbGQuZ2V0KCkpOwogCi0gICAgQVNTRVJUKGNoaWxkLT5wYWdlKCkgPT0gbV90aGlz RnJhbWUtPnBhZ2UoKSk7Ci0gICAgY2hpbGQtPnRyZWUoKS5tX3BhcmVudCA9IG1fdGhpc0ZyYW1l OworICAgIEFTU0VSVChjaGlsZC0+cGFnZSgpID09IG1fdGhpc0ZyYW1lLnBhZ2UoKSk7CisgICAg Y2hpbGQtPnRyZWUoKS5tX3BhcmVudCA9ICZtX3RoaXNGcmFtZTsKIAogICAgIC8vIFdlIG5lZWQg dG8gZW5zdXJlIHRoYXQgdGhlIGNoaWxkIHN0aWxsIGhhcyBhIHVuaXF1ZSBmcmFtZSBuYW1lIHdp dGggcmVzcGVjdCB0byBpdHMgbmV3IHBhcmVudC4KICAgICBjaGlsZC0+dHJlZSgpLnNldE5hbWUo Y2hpbGQtPnRyZWUoKS5tX25hbWUpOwpAQCAtODQsMTQgKzg0LDE0IEBAIGJvb2wgRnJhbWVUcmVl Ojp0cmFuc2ZlckNoaWxkKFBhc3NSZWZQdHI8RnJhbWU+IGNoaWxkKQogCiB2b2lkIEZyYW1lVHJl ZTo6YXBwZW5kQ2hpbGQoUGFzc1JlZlB0cjxGcmFtZT4gY2hpbGQpCiB7Ci0gICAgQVNTRVJUKGNo aWxkLT5wYWdlKCkgPT0gbV90aGlzRnJhbWUtPnBhZ2UoKSk7Ci0gICAgY2hpbGQtPnRyZWUoKS5t X3BhcmVudCA9IG1fdGhpc0ZyYW1lOworICAgIEFTU0VSVChjaGlsZC0+cGFnZSgpID09IG1fdGhp c0ZyYW1lLnBhZ2UoKSk7CisgICAgY2hpbGQtPnRyZWUoKS5tX3BhcmVudCA9ICZtX3RoaXNGcmFt ZTsKICAgICBhY3R1YWxseUFwcGVuZENoaWxkKGNoaWxkKTsgLy8gTm90ZSwgb24gcmV0dXJuIHxj aGlsZHwgaXMgbnVsbC4KIH0KIAogdm9pZCBGcmFtZVRyZWU6OmFjdHVhbGx5QXBwZW5kQ2hpbGQo UGFzc1JlZlB0cjxGcmFtZT4gY2hpbGQpCiB7Ci0gICAgQVNTRVJUKGNoaWxkLT50cmVlKCkubV9w YXJlbnQgPT0gbV90aGlzRnJhbWUpOworICAgIEFTU0VSVChjaGlsZC0+dHJlZSgpLm1fcGFyZW50 ID09ICZtX3RoaXNGcmFtZSk7CiAgICAgRnJhbWUqIG9sZExhc3QgPSBtX2xhc3RDaGlsZDsKICAg ICBtX2xhc3RDaGlsZCA9IGNoaWxkLmdldCgpOwogCkBAIC0xNDUsNyArMTQ1LDcgQEAgQXRvbWlj U3RyaW5nIEZyYW1lVHJlZTo6dW5pcXVlQ2hpbGROYW1lKGNvbnN0IEF0b21pY1N0cmluZyYgcmVx dWVzdGVkTmFtZSkgY29uc3QKICAgICAvLyBGaW5kIHRoZSBuZWFyZXN0IHBhcmVudCB0aGF0IGhh cyBhIGZyYW1lIHdpdGggYSBwYXRoIGluIGl0LgogICAgIFZlY3RvcjxGcmFtZSosIDE2PiBjaGFp bjsKICAgICBGcmFtZSogZnJhbWU7Ci0gICAgZm9yIChmcmFtZSA9IG1fdGhpc0ZyYW1lOyBmcmFt ZTsgZnJhbWUgPSBmcmFtZS0+dHJlZSgpLnBhcmVudCgpKSB7CisgICAgZm9yIChmcmFtZSA9ICZt X3RoaXNGcmFtZTsgZnJhbWU7IGZyYW1lID0gZnJhbWUtPnRyZWUoKS5wYXJlbnQoKSkgewogICAg ICAgICBpZiAoZnJhbWUtPnRyZWUoKS51bmlxdWVOYW1lKCkuc3RhcnRzV2l0aChmcmFtZVBhdGhQ cmVmaXgpKQogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIGNoYWluLmFwcGVuZChmcmFtZSk7 CkBAIC0xODMsNyArMTgzLDcgQEAgc3RhdGljIGJvb2wgaW5TY29wZShGcmFtZSYgZnJhbWUsIFRy ZWVTY29wZSYgc2NvcGUpCiBpbmxpbmUgRnJhbWUqIEZyYW1lVHJlZTo6c2NvcGVkQ2hpbGQodW5z aWduZWQgaW5kZXgsIFRyZWVTY29wZSogc2NvcGUpIGNvbnN0CiB7CiAgICAgaWYgKCFzY29wZSkK LSAgICAgICAgcmV0dXJuIDA7CisgICAgICAgIHJldHVybiBudWxscHRyOwogCiAgICAgdW5zaWdu ZWQgc2NvcGVkSW5kZXggPSAwOwogICAgIGZvciAoRnJhbWUqIHJlc3VsdCA9IGZpcnN0Q2hpbGQo KTsgcmVzdWx0OyByZXN1bHQgPSByZXN1bHQtPnRyZWUoKS5uZXh0U2libGluZygpKSB7CkBAIC0x OTQsMTkgKzE5NCwxOSBAQCBpbmxpbmUgRnJhbWUqIEZyYW1lVHJlZTo6c2NvcGVkQ2hpbGQodW5z aWduZWQgaW5kZXgsIFRyZWVTY29wZSogc2NvcGUpIGNvbnN0CiAgICAgICAgIH0KICAgICB9CiAK LSAgICByZXR1cm4gMDsKKyAgICByZXR1cm4gbnVsbHB0cjsKIH0KIAogaW5saW5lIEZyYW1lKiBG cmFtZVRyZWU6OnNjb3BlZENoaWxkKGNvbnN0IEF0b21pY1N0cmluZyYgbmFtZSwgVHJlZVNjb3Bl KiBzY29wZSkgY29uc3QKIHsKICAgICBpZiAoIXNjb3BlKQotICAgICAgICByZXR1cm4gMDsKKyAg ICAgICAgcmV0dXJuIG51bGxwdHI7CiAKICAgICBmb3IgKEZyYW1lKiBjaGlsZCA9IGZpcnN0Q2hp bGQoKTsgY2hpbGQ7IGNoaWxkID0gY2hpbGQtPnRyZWUoKS5uZXh0U2libGluZygpKSB7CiAgICAg ICAgIGlmIChjaGlsZC0+dHJlZSgpLnVuaXF1ZU5hbWUoKSA9PSBuYW1lICYmIGluU2NvcGUoKmNo aWxkLCAqc2NvcGUpKQogICAgICAgICAgICAgcmV0dXJuIGNoaWxkOwogICAgIH0KLSAgICByZXR1 cm4gMDsKKyAgICByZXR1cm4gbnVsbHB0cjsKIH0KIAogaW5saW5lIHVuc2lnbmVkIEZyYW1lVHJl ZTo6c2NvcGVkQ2hpbGRDb3VudChUcmVlU2NvcGUqIHNjb3BlKSBjb25zdApAQCAtMjI1LDE4ICsy MjUsMTggQEAgaW5saW5lIHVuc2lnbmVkIEZyYW1lVHJlZTo6c2NvcGVkQ2hpbGRDb3VudChUcmVl U2NvcGUqIHNjb3BlKSBjb25zdAogCiBGcmFtZSogRnJhbWVUcmVlOjpzY29wZWRDaGlsZCh1bnNp Z25lZCBpbmRleCkgY29uc3QKIHsKLSAgICByZXR1cm4gc2NvcGVkQ2hpbGQoaW5kZXgsIG1fdGhp c0ZyYW1lLT5kb2N1bWVudCgpKTsKKyAgICByZXR1cm4gc2NvcGVkQ2hpbGQoaW5kZXgsIG1fdGhp c0ZyYW1lLmRvY3VtZW50KCkpOwogfQogCiBGcmFtZSogRnJhbWVUcmVlOjpzY29wZWRDaGlsZChj b25zdCBBdG9taWNTdHJpbmcmIG5hbWUpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIHNjb3BlZENoaWxk KG5hbWUsIG1fdGhpc0ZyYW1lLT5kb2N1bWVudCgpKTsKKyAgICByZXR1cm4gc2NvcGVkQ2hpbGQo bmFtZSwgbV90aGlzRnJhbWUuZG9jdW1lbnQoKSk7CiB9CiAKIHVuc2lnbmVkIEZyYW1lVHJlZTo6 c2NvcGVkQ2hpbGRDb3VudCgpIGNvbnN0CiB7CiAgICAgaWYgKG1fc2NvcGVkQ2hpbGRDb3VudCA9 PSBpbnZhbGlkQ291bnQpCi0gICAgICAgIG1fc2NvcGVkQ2hpbGRDb3VudCA9IHNjb3BlZENoaWxk Q291bnQobV90aGlzRnJhbWUtPmRvY3VtZW50KCkpOworICAgICAgICBtX3Njb3BlZENoaWxkQ291 bnQgPSBzY29wZWRDaGlsZENvdW50KG1fdGhpc0ZyYW1lLmRvY3VtZW50KCkpOwogICAgIHJldHVy biBtX3Njb3BlZENoaWxkQ291bnQ7CiB9CiAKQEAgLTI2MSw0NCArMjYxLDQzIEBAIEZyYW1lKiBG cmFtZVRyZWU6OmNoaWxkKGNvbnN0IEF0b21pY1N0cmluZyYgbmFtZSkgY29uc3QKICAgICBmb3Ig KEZyYW1lKiBjaGlsZCA9IGZpcnN0Q2hpbGQoKTsgY2hpbGQ7IGNoaWxkID0gY2hpbGQtPnRyZWUo KS5uZXh0U2libGluZygpKQogICAgICAgICBpZiAoY2hpbGQtPnRyZWUoKS51bmlxdWVOYW1lKCkg PT0gbmFtZSkKICAgICAgICAgICAgIHJldHVybiBjaGlsZDsKLSAgICByZXR1cm4gMDsKKyAgICBy ZXR1cm4gbnVsbHB0cjsKIH0KIAogRnJhbWUqIEZyYW1lVHJlZTo6ZmluZChjb25zdCBBdG9taWNT dHJpbmcmIG5hbWUpIGNvbnN0CiB7CiAgICAgaWYgKG5hbWUgPT0gIl9zZWxmIiB8fCBuYW1lID09 ICJfY3VycmVudCIgfHwgbmFtZS5pc0VtcHR5KCkpCi0gICAgICAgIHJldHVybiBtX3RoaXNGcmFt ZTsKKyAgICAgICAgcmV0dXJuICZtX3RoaXNGcmFtZTsKICAgICAKICAgICBpZiAobmFtZSA9PSAi X3RvcCIpCiAgICAgICAgIHJldHVybiAmdG9wKCk7CiAgICAgCiAgICAgaWYgKG5hbWUgPT0gIl9w YXJlbnQiKQotICAgICAgICByZXR1cm4gcGFyZW50KCkgPyBwYXJlbnQoKSA6IG1fdGhpc0ZyYW1l OworICAgICAgICByZXR1cm4gcGFyZW50KCkgPyBwYXJlbnQoKSA6ICZtX3RoaXNGcmFtZTsKIAog ICAgIC8vIFNpbmNlICJfYmxhbmsiIHNob3VsZCBuZXZlciBiZSBhbnkgZnJhbWUncyBuYW1lLCB0 aGUgZm9sbG93aW5nIGlzIG9ubHkgYW4gb3B0aW1pemF0aW9uLgogICAgIGlmIChuYW1lID09ICJf YmxhbmsiKQotICAgICAgICByZXR1cm4gMDsKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAKICAg ICAvLyBTZWFyY2ggc3VidHJlZSBzdGFydGluZyB3aXRoIHRoaXMgZnJhbWUgZmlyc3QuCi0gICAg Zm9yIChGcmFtZSogZnJhbWUgPSBtX3RoaXNGcmFtZTsgZnJhbWU7IGZyYW1lID0gZnJhbWUtPnRy ZWUoKS50cmF2ZXJzZU5leHQobV90aGlzRnJhbWUpKSB7CisgICAgZm9yIChGcmFtZSogZnJhbWUg PSAmbV90aGlzRnJhbWU7IGZyYW1lOyBmcmFtZSA9IGZyYW1lLT50cmVlKCkudHJhdmVyc2VOZXh0 KCZtX3RoaXNGcmFtZSkpIHsKICAgICAgICAgaWYgKGZyYW1lLT50cmVlKCkudW5pcXVlTmFtZSgp ID09IG5hbWUpCiAgICAgICAgICAgICByZXR1cm4gZnJhbWU7CiAgICAgfQogCiAgICAgLy8gVGhl biB0aGUgcmVzdCBvZiB0aGUgdHJlZS4KLSAgICBmb3IgKEZyYW1lKiBmcmFtZSA9ICZtX3RoaXNG cmFtZS0+bWFpbkZyYW1lKCk7IGZyYW1lOyBmcmFtZSA9IGZyYW1lLT50cmVlKCkudHJhdmVyc2VO ZXh0KCkpIHsKKyAgICBmb3IgKEZyYW1lKiBmcmFtZSA9ICZtX3RoaXNGcmFtZS5tYWluRnJhbWUo KTsgZnJhbWU7IGZyYW1lID0gZnJhbWUtPnRyZWUoKS50cmF2ZXJzZU5leHQoKSkgewogICAgICAg ICBpZiAoZnJhbWUtPnRyZWUoKS51bmlxdWVOYW1lKCkgPT0gbmFtZSkKICAgICAgICAgICAgIHJl dHVybiBmcmFtZTsKICAgICB9CiAKICAgICAvLyBTZWFyY2ggdGhlIGVudGlyZSB0cmVlIG9mIGVh Y2ggb2YgdGhlIG90aGVyIHBhZ2VzIGluIHRoaXMgbmFtZXNwYWNlLgogICAgIC8vIEZJWE1FOiBJ cyByYW5kb20gb3JkZXIgT0s/Ci0gICAgUGFnZSogcGFnZSA9IG1fdGhpc0ZyYW1lLT5wYWdlKCk7 CisgICAgUGFnZSogcGFnZSA9IG1fdGhpc0ZyYW1lLnBhZ2UoKTsKICAgICBpZiAoIXBhZ2UpCi0g ICAgICAgIHJldHVybiAwOwotICAgIGNvbnN0IEhhc2hTZXQ8UGFnZSo+JiBwYWdlcyA9IHBhZ2Ut Pmdyb3VwKCkucGFnZXMoKTsKLSAgICBmb3IgKGF1dG8gaXQgPSBwYWdlcy5iZWdpbigpLCBlbmQg PSBwYWdlcy5lbmQoKTsgaXQgIT0gZW5kOyArK2l0KSB7Ci0gICAgICAgIFBhZ2UqIG90aGVyUGFn ZSA9ICppdDsKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CisgICAgCisgICAgZm9yIChhdXRvKiBv dGhlclBhZ2UgOiBwYWdlLT5ncm91cCgpLnBhZ2VzKCkpIHsKICAgICAgICAgaWYgKG90aGVyUGFn ZSA9PSBwYWdlKQogICAgICAgICAgICAgY29udGludWU7CiAgICAgICAgIGZvciAoRnJhbWUqIGZy YW1lID0gJm90aGVyUGFnZS0+bWFpbkZyYW1lKCk7IGZyYW1lOyBmcmFtZSA9IGZyYW1lLT50cmVl KCkudHJhdmVyc2VOZXh0KCkpIHsKQEAgLTMwNyw3ICszMDYsNyBAQCBGcmFtZSogRnJhbWVUcmVl OjpmaW5kKGNvbnN0IEF0b21pY1N0cmluZyYgbmFtZSkgY29uc3QKICAgICAgICAgfQogICAgIH0K IAotICAgIHJldHVybiAwOworICAgIHJldHVybiBudWxscHRyOwogfQogCiBib29sIEZyYW1lVHJl ZTo6aXNEZXNjZW5kYW50T2YoY29uc3QgRnJhbWUqIGFuY2VzdG9yKSBjb25zdApAQCAtMzE1LDEw ICszMTQsMTAgQEAgYm9vbCBGcmFtZVRyZWU6OmlzRGVzY2VuZGFudE9mKGNvbnN0IEZyYW1lKiBh bmNlc3RvcikgY29uc3QKICAgICBpZiAoIWFuY2VzdG9yKQogICAgICAgICByZXR1cm4gZmFsc2U7 CiAKLSAgICBpZiAobV90aGlzRnJhbWUtPnBhZ2UoKSAhPSBhbmNlc3Rvci0+cGFnZSgpKQorICAg IGlmIChtX3RoaXNGcmFtZS5wYWdlKCkgIT0gYW5jZXN0b3ItPnBhZ2UoKSkKICAgICAgICAgcmV0 dXJuIGZhbHNlOwogCi0gICAgZm9yIChGcmFtZSogZnJhbWUgPSBtX3RoaXNGcmFtZTsgZnJhbWU7 IGZyYW1lID0gZnJhbWUtPnRyZWUoKS5wYXJlbnQoKSkKKyAgICBmb3IgKEZyYW1lKiBmcmFtZSA9 ICZtX3RoaXNGcmFtZTsgZnJhbWU7IGZyYW1lID0gZnJhbWUtPnRyZWUoKS5wYXJlbnQoKSkKICAg ICAgICAgaWYgKGZyYW1lID09IGFuY2VzdG9yKQogICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAg ICAgcmV0dXJuIGZhbHNlOwpAQCAtMzMyLDggKzMzMSw4IEBAIEZyYW1lKiBGcmFtZVRyZWU6OnRy YXZlcnNlTmV4dChjb25zdCBGcmFtZSogc3RheVdpdGhpbikgY29uc3QKICAgICAgICAgcmV0dXJu IGNoaWxkOwogICAgIH0KIAotICAgIGlmIChtX3RoaXNGcmFtZSA9PSBzdGF5V2l0aGluKQotICAg ICAgICByZXR1cm4gMDsKKyAgICBpZiAoJm1fdGhpc0ZyYW1lID09IHN0YXlXaXRoaW4pCisgICAg ICAgIHJldHVybiBudWxscHRyOwogCiAgICAgRnJhbWUqIHNpYmxpbmcgPSBuZXh0U2libGluZygp OwogICAgIGlmIChzaWJsaW5nKSB7CkBAIC0zNDEsMTEgKzM0MCwxMSBAQCBGcmFtZSogRnJhbWVU cmVlOjp0cmF2ZXJzZU5leHQoY29uc3QgRnJhbWUqIHN0YXlXaXRoaW4pIGNvbnN0CiAgICAgICAg IHJldHVybiBzaWJsaW5nOwogICAgIH0KIAotICAgIEZyYW1lKiBmcmFtZSA9IG1fdGhpc0ZyYW1l OworICAgIEZyYW1lKiBmcmFtZSA9ICZtX3RoaXNGcmFtZTsKICAgICB3aGlsZSAoIXNpYmxpbmcg JiYgKCFzdGF5V2l0aGluIHx8IGZyYW1lLT50cmVlKCkucGFyZW50KCkgIT0gc3RheVdpdGhpbikp IHsKICAgICAgICAgZnJhbWUgPSBmcmFtZS0+dHJlZSgpLnBhcmVudCgpOwogICAgICAgICBpZiAo IWZyYW1lKQotICAgICAgICAgICAgcmV0dXJuIDA7CisgICAgICAgICAgICByZXR1cm4gbnVsbHB0 cjsKICAgICAgICAgc2libGluZyA9IGZyYW1lLT50cmVlKCkubmV4dFNpYmxpbmcoKTsKICAgICB9 CiAKQEAgLTM1NCw3ICszNTMsNyBAQCBGcmFtZSogRnJhbWVUcmVlOjp0cmF2ZXJzZU5leHQoY29u c3QgRnJhbWUqIHN0YXlXaXRoaW4pIGNvbnN0CiAgICAgICAgIHJldHVybiBzaWJsaW5nOwogICAg IH0KIAotICAgIHJldHVybiAwOworICAgIHJldHVybiBudWxscHRyOwogfQogCiBGcmFtZSogRnJh bWVUcmVlOjp0cmF2ZXJzZU5leHRXaXRoV3JhcChib29sIHdyYXApIGNvbnN0CkBAIC0zNjMsOSAr MzYyLDkgQEAgRnJhbWUqIEZyYW1lVHJlZTo6dHJhdmVyc2VOZXh0V2l0aFdyYXAoYm9vbCB3cmFw KSBjb25zdAogICAgICAgICByZXR1cm4gcmVzdWx0OwogCiAgICAgaWYgKHdyYXApCi0gICAgICAg IHJldHVybiAmbV90aGlzRnJhbWUtPm1haW5GcmFtZSgpOworICAgICAgICByZXR1cm4gJm1fdGhp c0ZyYW1lLm1haW5GcmFtZSgpOwogCi0gICAgcmV0dXJuIDA7CisgICAgcmV0dXJuIG51bGxwdHI7 CiB9CiAKIEZyYW1lKiBGcmFtZVRyZWU6OnRyYXZlcnNlUHJldmlvdXNXaXRoV3JhcChib29sIHdy YXApIGNvbnN0CkBAIC0zODIsMTIgKzM4MSwxMiBAQCBGcmFtZSogRnJhbWVUcmVlOjp0cmF2ZXJz ZVByZXZpb3VzV2l0aFdyYXAoYm9vbCB3cmFwKSBjb25zdAogICAgICAgICByZXR1cm4gZGVlcExh c3RDaGlsZCgpOwogCiAgICAgLy8gdG9wIHZpZXcgaXMgYWx3YXlzIHRoZSBsYXN0IG9uZSBpbiB0 aGlzIG9yZGVyaW5nLCBzbyBwcmV2IGlzIG5pbCB3aXRob3V0IHdyYXAKLSAgICByZXR1cm4gMDsK KyAgICByZXR1cm4gbnVsbHB0cjsKIH0KIAogRnJhbWUqIEZyYW1lVHJlZTo6ZGVlcExhc3RDaGls ZCgpIGNvbnN0CiB7Ci0gICAgRnJhbWUqIHJlc3VsdCA9IG1fdGhpc0ZyYW1lOworICAgIEZyYW1l KiByZXN1bHQgPSAmbV90aGlzRnJhbWU7CiAgICAgZm9yIChGcmFtZSogbGFzdCA9IGxhc3RDaGls ZCgpOyBsYXN0OyBsYXN0ID0gbGFzdC0+dHJlZSgpLmxhc3RDaGlsZCgpKQogICAgICAgICByZXN1 bHQgPSBsYXN0OwogCkBAIC0zOTYsOCArMzk1LDggQEAgRnJhbWUqIEZyYW1lVHJlZTo6ZGVlcExh c3RDaGlsZCgpIGNvbnN0CiAKIEZyYW1lJiBGcmFtZVRyZWU6OnRvcCgpIGNvbnN0CiB7Ci0gICAg RnJhbWUqIGZyYW1lID0gbV90aGlzRnJhbWU7Ci0gICAgZm9yIChGcmFtZSogcGFyZW50ID0gbV90 aGlzRnJhbWU7IHBhcmVudDsgcGFyZW50ID0gcGFyZW50LT50cmVlKCkucGFyZW50KCkpCisgICAg RnJhbWUqIGZyYW1lID0gJm1fdGhpc0ZyYW1lOworICAgIGZvciAoRnJhbWUqIHBhcmVudCA9ICZt X3RoaXNGcmFtZTsgcGFyZW50OyBwYXJlbnQgPSBwYXJlbnQtPnRyZWUoKS5wYXJlbnQoKSkKICAg ICAgICAgZnJhbWUgPSBwYXJlbnQ7CiAgICAgcmV0dXJuICpmcmFtZTsKIH0KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVUcmVlLmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0Zy YW1lVHJlZS5oCmluZGV4IDgwYzQyMjhhODIzYmUxOWI5MTk4ZGY4YmVlZDBjZDJjZjJmNDIyMmEu LmM2YjVjMDE5MTUzNTI2MTIwZWQ4NDA2ZTI0MWZlNDZjN2Q4YmYxN2MgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVUcmVlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9G cmFtZVRyZWUuaApAQCAtMzIsNyArMzIsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgcHVi bGljOgogICAgICAgICBjb25zdCBzdGF0aWMgdW5zaWduZWQgaW52YWxpZENvdW50ID0gc3RhdGlj X2Nhc3Q8dW5zaWduZWQ+KC0xKTsKIAotICAgICAgICBGcmFtZVRyZWUoRnJhbWUqIHRoaXNGcmFt ZSwgRnJhbWUqIHBhcmVudEZyYW1lKSAKKyAgICAgICAgRnJhbWVUcmVlKEZyYW1lJiB0aGlzRnJh bWUsIEZyYW1lKiBwYXJlbnRGcmFtZSkKICAgICAgICAgICAgIDogbV90aGlzRnJhbWUodGhpc0Zy YW1lKQogICAgICAgICAgICAgLCBtX3BhcmVudChwYXJlbnRGcmFtZSkKICAgICAgICAgICAgICwg bV9wcmV2aW91c1NpYmxpbmcoMCkKQEAgLTg3LDcgKzg3LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUg ewogICAgICAgICBGcmFtZSogc2NvcGVkQ2hpbGQoY29uc3QgQXRvbWljU3RyaW5nJiBuYW1lLCBU cmVlU2NvcGUqKSBjb25zdDsKICAgICAgICAgdW5zaWduZWQgc2NvcGVkQ2hpbGRDb3VudChUcmVl U2NvcGUqKSBjb25zdDsKIAotICAgICAgICBGcmFtZSogbV90aGlzRnJhbWU7CisgICAgICAgIEZy YW1lJiBtX3RoaXNGcmFtZTsKIAogICAgICAgICBGcmFtZSogbV9wYXJlbnQ7CiAgICAgICAgIEF0 b21pY1N0cmluZyBtX25hbWU7IC8vIFRoZSBhY3R1YWwgZnJhbWUgbmFtZSAobWF5IGJlIGVtcHR5 KS4K