124176 2013-11-11 17:37:48 -0800 FrameFilter can just be an std::function instead 2013-11-11 17:49:36 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca commit-queue japhet oldest_to_newest 949505 0 andersca 2013-11-11 17:37:48 -0800 FrameFilter can just be an std::function instead 949506 1 216626 andersca 2013-11-11 17:39:15 -0800 Created attachment 216626 Patch 949507 2 commit-queue 2013-11-11 17:40:02 -0800 Attachment 216626 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCore/WebCore.exp.in', u'Source/WebCore/loader/archive/cf/LegacyWebArchive.cpp', u'Source/WebCore/loader/archive/cf/LegacyWebArchive.h', u'Source/WebKit/mac/ChangeLog', u'Source/WebKit/mac/DOM/WebDOMOperations.mm', u'Source/WebKit2/ChangeLog', u'Source/WebKit2/WebProcess/WebPage/WebFrame.cpp']" exit_code: 1 Source/WebCore/loader/archive/cf/LegacyWebArchive.cpp:425: Extra space before ( in function call [whitespace/parens] [4] Source/WebCore/loader/archive/cf/LegacyWebArchive.cpp:499: Extra space before ( in function call [whitespace/parens] [4] Source/WebCore/loader/archive/cf/LegacyWebArchive.h:47: Extra space before ( in function call [whitespace/parens] [4] Source/WebCore/loader/archive/cf/LegacyWebArchive.h:61: Extra space before ( in function call [whitespace/parens] [4] Total errors found: 4 in 8 files If any of these errors are false positives, please file a bug against check-webkit-style. 949511 3 andersca 2013-11-11 17:49:36 -0800 Committed r159089: <http://trac.webkit.org/changeset/159089> 216626 2013-11-11 17:39:15 -0800 2013-11-11 17:46:46 -0800 Patch bug-124176-20131111173914.patch text/plain 11474 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTU5MDg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGU5MGNmMjllNDcxMmI1 YzVmYWYyYjgxMDFlNmMyZjA4ZTI0ZjExNS4uZmI2YWJkZTU0MjQwZDRmNWRkYmU3OTdlNDNiZmRk ZmRiMDI2MTIwMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEzLTExLTExICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgRnJhbWVGaWx0ZXIg Y2FuIGp1c3QgYmUgYW4gc3RkOjpmdW5jdGlvbiBpbnN0ZWFkCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjQxNzYKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYkNvcmUuZXhwLmluOgorICAgICAgICAq IGxvYWRlci9hcmNoaXZlL2NmL0xlZ2FjeVdlYkFyY2hpdmUuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6TGVnYWN5V2ViQXJjaGl2ZTo6Y3JlYXRlKToKKyAgICAgICAgKiBsb2FkZXIvYXJjaGl2ZS9j Zi9MZWdhY3lXZWJBcmNoaXZlLmg6CisKIDIwMTMtMTEtMTEgIFNpbW9uIEZyYXNlciAgPHNpbW9u LmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAgICAgUkVHUkVTU0lPTiAocjE1NTY2MCk6IGJveC1z aGFkb3cgY2F1c2VzIG92ZXJsYXkgc2Nyb2xsYmFycyB0byBiZSBpbiB0aGUgd3JvbmcgcG9zaXRp b24gd2hlbiBlbGVtZW50IGlzIGNvbXBvc2l0ZWQgKDg1NjQ3KQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9tYWMvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCmluZGV4 IDBlOGViMGYyMWE1NzQ5OTViZmE0MjQwZDQzNDJiZGM3ZDMwNGVkMjMuLmI1MjhlNjNhMTZhN2My MmQ1ZmY4M2JmNTZkMDE1MTBiMjZmYmE3OTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFj L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwx MyBAQAorMjAxMy0xMS0xMSAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgor CisgICAgICAgIEZyYW1lRmlsdGVyIGNhbiBqdXN0IGJlIGFuIHN0ZDo6ZnVuY3Rpb24gaW5zdGVh ZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI0MTc2 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBET00v V2ViRE9NT3BlcmF0aW9ucy5tbToKKyAgICAgICAgKC1bRE9NTm9kZSB3ZWJBcmNoaXZlQnlGaWx0 ZXJpbmdTdWJmcmFtZXM6XSk6CisKIDIwMTMtMTEtMTEgIERhbiBCZXJuc3RlaW4gIDxtaXR6QGFw cGxlLmNvbT4KIAogICAgICAgICBbTWFjXSAuZXhwIGZpbGVzIGFyZSBub3Qgc291cmNlIGNvZGUK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCAwZWM1Mjk5YTBjYTUyMjBjMDc1NjcwZjlmNWI5NWUzMjg3MGQxZDkxLi45 N2EyZmNhMDViYTEzNzczNWM2NDVlMGU5NzBmNWJjMWJiZTc1ZWJkIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0x LDUgKzEsMTUgQEAKIDIwMTMtMTEtMTEgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxl LmNvbT4KIAorICAgICAgICBGcmFtZUZpbHRlciBjYW4ganVzdCBiZSBhbiBzdGQ6OmZ1bmN0aW9u IGluc3RlYWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTEyNDE3NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg ICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYkZyYW1lLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2Vi RnJhbWU6OndlYkFyY2hpdmVEYXRhKToKKworMjAxMy0xMS0xMSAgQW5kZXJzIENhcmxzc29uICA8 YW5kZXJzY2FAYXBwbGUuY29tPgorCiAgICAgICAgIFJlbW92ZSB1bnVzZWQgUXQgY3J1ZnQKICAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNDE3NAogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbiBiL1NvdXJjZS9XZWJDb3Jl L1dlYkNvcmUuZXhwLmluCmluZGV4IDc0NDljZWRmZDljNDdlNTU1OGQ0ZDAzMGNhN2NkNTE3M2Vm MWYzYWUuLmFiZjk2OTg3M2YwNDg5ZDM3MzkwODA3ODQzMWI4MWM4NDcwYTc2OTUgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluCisrKyBiL1NvdXJjZS9XZWJDb3JlL1dl YkNvcmUuZXhwLmluCkBAIC02MjQsNyArNjI0LDcgQEAgX19aTjdXZWJDb3JlMTZMZWdhY3lXZWJB cmNoaXZlMTljcmVhdGVGcm9tU2VsZWN0aW9uRVBOU181RnJhbWVFCiBfX1pON1dlYkNvcmUxNkxl Z2FjeVdlYkFyY2hpdmUyMXJhd0RhdGFSZXByZXNlbnRhdGlvbkV2CiBfX1pON1dlYkNvcmUxNkxl Z2FjeVdlYkFyY2hpdmU2Y3JlYXRlRU4zV1RGMTBQYXNzUmVmUHRySU5TXzE1QXJjaGl2ZVJlc291 cmNlRUVFUk5TMV82VmVjdG9ySVM0X0xtMEVOUzFfMTVDcmFzaE9uT3ZlcmZsb3dFRUVSTlM1X0lO UzJfSVMwX0VFTG0wRVM2X0VFCiBfX1pON1dlYkNvcmUxNkxlZ2FjeVdlYkFyY2hpdmU2Y3JlYXRl RVBOU18xMlNoYXJlZEJ1ZmZlckUKLV9fWk43V2ViQ29yZTE2TGVnYWN5V2ViQXJjaGl2ZTZjcmVh dGVFUE5TXzROb2RlRVBOU18xMUZyYW1lRmlsdGVyRQorX19aTjdXZWJDb3JlMTZMZWdhY3lXZWJB cmNoaXZlNmNyZWF0ZUVQTlNfNE5vZGVFTlN0M19fMThmdW5jdGlvbklGYlJOU181RnJhbWVFRUVF CiBfX1pON1dlYkNvcmUxNkxlZ2FjeVdlYkFyY2hpdmU2Y3JlYXRlRVBOU181RnJhbWVFCiBfX1pO N1dlYkNvcmUxNkxlZ2FjeVdlYkFyY2hpdmU2Y3JlYXRlRVBOU181UmFuZ2VFCiBfX1pON1dlYkNv cmUxNkxlZ2FjeVdlYkFyY2hpdmU2Y3JlYXRlRXYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2xvYWRlci9hcmNoaXZlL2NmL0xlZ2FjeVdlYkFyY2hpdmUuY3BwIGIvU291cmNlL1dlYkNvcmUv bG9hZGVyL2FyY2hpdmUvY2YvTGVnYWN5V2ViQXJjaGl2ZS5jcHAKaW5kZXggY2M1Y2ZiMmE0NzMw YjUwZTAxNzJkZGQ2NmU2MmNlMWMzMGViMTIxMS4uYjIxMjg4MTE0ZGQzY2ExYTdjNjc4NDBlNDFi OWU4MTgzMjljN2YwOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2FyY2hpdmUv Y2YvTGVnYWN5V2ViQXJjaGl2ZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2FyY2hp dmUvY2YvTGVnYWN5V2ViQXJjaGl2ZS5jcHAKQEAgLTQyMiw3ICs0MjIsNyBAQCBSZXRhaW5QdHI8 Q0ZEYXRhUmVmPiBMZWdhY3lXZWJBcmNoaXZlOjpjcmVhdGVQcm9wZXJ0eUxpc3RSZXByZXNlbnRh dGlvbihjb25zdCBSZQogCiAjZW5kaWYKIAotUGFzc1JlZlB0cjxMZWdhY3lXZWJBcmNoaXZlPiBM ZWdhY3lXZWJBcmNoaXZlOjpjcmVhdGUoTm9kZSogbm9kZSwgRnJhbWVGaWx0ZXIqIGZpbHRlcikK K1Bhc3NSZWZQdHI8TGVnYWN5V2ViQXJjaGl2ZT4gTGVnYWN5V2ViQXJjaGl2ZTo6Y3JlYXRlKE5v ZGUqIG5vZGUsIHN0ZDo6ZnVuY3Rpb248Ym9vbCAoRnJhbWUmKT4gZnJhbWVGaWx0ZXIpCiB7CiAg ICAgQVNTRVJUKG5vZGUpOwogICAgIGlmICghbm9kZSkKQEAgLTQ0Nyw3ICs0NDcsNyBAQCBQYXNz UmVmUHRyPExlZ2FjeVdlYkFyY2hpdmU+IExlZ2FjeVdlYkFyY2hpdmU6OmNyZWF0ZShOb2RlKiBu b2RlLCBGcmFtZUZpbHRlciogZgogICAgIGlmIChub2RlVHlwZSAhPSBOb2RlOjpET0NVTUVOVF9O T0RFICYmIG5vZGVUeXBlICE9IE5vZGU6OkRPQ1VNRU5UX1RZUEVfTk9ERSkKICAgICAgICAgbWFy a3VwU3RyaW5nID0gZG9jdW1lbnRUeXBlU3RyaW5nKG5vZGUtPmRvY3VtZW50KCkpICsgbWFya3Vw U3RyaW5nOwogCi0gICAgcmV0dXJuIGNyZWF0ZShtYXJrdXBTdHJpbmcsIGZyYW1lLCBub2RlTGlz dCwgZmlsdGVyKTsKKyAgICByZXR1cm4gY3JlYXRlKG1hcmt1cFN0cmluZywgZnJhbWUsIG5vZGVM aXN0LCBzdGQ6Om1vdmUoZnJhbWVGaWx0ZXIpKTsKIH0KIAogUGFzc1JlZlB0cjxMZWdhY3lXZWJB cmNoaXZlPiBMZWdhY3lXZWJBcmNoaXZlOjpjcmVhdGUoRnJhbWUqIGZyYW1lKQpAQCAtNDk2LDcg KzQ5Niw3IEBAIFBhc3NSZWZQdHI8TGVnYWN5V2ViQXJjaGl2ZT4gTGVnYWN5V2ViQXJjaGl2ZTo6 Y3JlYXRlKFJhbmdlKiByYW5nZSkKICAgICByZXR1cm4gY3JlYXRlKG1hcmt1cFN0cmluZywgZnJh bWUsIG5vZGVMaXN0LCAwKTsKIH0KIAotUGFzc1JlZlB0cjxMZWdhY3lXZWJBcmNoaXZlPiBMZWdh Y3lXZWJBcmNoaXZlOjpjcmVhdGUoY29uc3QgU3RyaW5nJiBtYXJrdXBTdHJpbmcsIEZyYW1lKiBm cmFtZSwgY29uc3QgVmVjdG9yPE5vZGUqPiYgbm9kZXMsIEZyYW1lRmlsdGVyKiBmcmFtZUZpbHRl cikKK1Bhc3NSZWZQdHI8TGVnYWN5V2ViQXJjaGl2ZT4gTGVnYWN5V2ViQXJjaGl2ZTo6Y3JlYXRl KGNvbnN0IFN0cmluZyYgbWFya3VwU3RyaW5nLCBGcmFtZSogZnJhbWUsIGNvbnN0IFZlY3RvcjxO b2RlKj4mIG5vZGVzLCBzdGQ6OmZ1bmN0aW9uPGJvb2wgKEZyYW1lJik+IGZyYW1lRmlsdGVyKQog ewogICAgIEFTU0VSVChmcmFtZSk7CiAgICAgCkBAIC01MjAsNyArNTIwLDcgQEAgUGFzc1JlZlB0 cjxMZWdhY3lXZWJBcmNoaXZlPiBMZWdhY3lXZWJBcmNoaXZlOjpjcmVhdGUoY29uc3QgU3RyaW5n JiBtYXJrdXBTdHJpbmcKICAgICAgICAgRnJhbWUqIGNoaWxkRnJhbWU7CiAgICAgICAgIGlmICgo aXNIVE1MRnJhbWVFbGVtZW50KG5vZGUpIHx8IGlzSFRNTElGcmFtZUVsZW1lbnQobm9kZSkgfHwg aXNIVE1MT2JqZWN0RWxlbWVudChub2RlKSkKICAgICAgICAgICAgICYmIChjaGlsZEZyYW1lID0g dG9IVE1MRnJhbWVPd25lckVsZW1lbnQobm9kZSkuY29udGVudEZyYW1lKCkpKSB7Ci0gICAgICAg ICAgICBpZiAoZnJhbWVGaWx0ZXIgJiYgIWZyYW1lRmlsdGVyLT5zaG91bGRJbmNsdWRlU3ViZnJh bWUoY2hpbGRGcmFtZSkpCisgICAgICAgICAgICBpZiAoZnJhbWVGaWx0ZXIgJiYgIWZyYW1lRmls dGVyKCpjaGlsZEZyYW1lKSkKICAgICAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgICAg ICAgICAKICAgICAgICAgICAgIFJlZlB0cjxMZWdhY3lXZWJBcmNoaXZlPiBzdWJmcmFtZUFyY2hp dmUgPSBjcmVhdGUoY2hpbGRGcmFtZS0+ZG9jdW1lbnQoKSwgZnJhbWVGaWx0ZXIpOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2FyY2hpdmUvY2YvTGVnYWN5V2ViQXJjaGl2ZS5o IGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2FyY2hpdmUvY2YvTGVnYWN5V2ViQXJjaGl2ZS5oCmlu ZGV4IDgwZTQzYjlmYWQzOGY4YWM4Y2E4ODQ3YzU5OGFiOWRkNTBiMzNhZGQuLmY2NzBjNjZlOTg0 ZGYxZjdiNzdmYmYwZjBmYTg0OWE5ZDYxZjBiMDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2xvYWRlci9hcmNoaXZlL2NmL0xlZ2FjeVdlYkFyY2hpdmUuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9sb2FkZXIvYXJjaGl2ZS9jZi9MZWdhY3lXZWJBcmNoaXZlLmgKQEAgLTMwLDYgKzMwLDcgQEAK ICNkZWZpbmUgTGVnYWN5V2ViQXJjaGl2ZV9oCiAKICNpbmNsdWRlICJBcmNoaXZlLmgiCisjaW5j bHVkZSA8ZnVuY3Rpb25hbD4KIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCkBAIC0zNywxOSArMzgs MTMgQEAgY2xhc3MgRnJhbWU7CiBjbGFzcyBOb2RlOwogY2xhc3MgUmFuZ2U7CiAKLWNsYXNzIEZy YW1lRmlsdGVyIHsKLXB1YmxpYzoKLSAgICB2aXJ0dWFsIH5GcmFtZUZpbHRlcigpIHsgfQotICAg IHZpcnR1YWwgYm9vbCBzaG91bGRJbmNsdWRlU3ViZnJhbWUoRnJhbWUqKSBjb25zdCA9IDA7Ci19 OwotCiBjbGFzcyBMZWdhY3lXZWJBcmNoaXZlIDogcHVibGljIEFyY2hpdmUgewogcHVibGljOgog ICAgIHN0YXRpYyBQYXNzUmVmUHRyPExlZ2FjeVdlYkFyY2hpdmU+IGNyZWF0ZSgpOwogICAgIHN0 YXRpYyBQYXNzUmVmUHRyPExlZ2FjeVdlYkFyY2hpdmU+IGNyZWF0ZShTaGFyZWRCdWZmZXIqKTsK ICAgICBzdGF0aWMgUGFzc1JlZlB0cjxMZWdhY3lXZWJBcmNoaXZlPiBjcmVhdGUoY29uc3QgVVJM JiwgU2hhcmVkQnVmZmVyKik7CiAgICAgc3RhdGljIFBhc3NSZWZQdHI8TGVnYWN5V2ViQXJjaGl2 ZT4gY3JlYXRlKFBhc3NSZWZQdHI8QXJjaGl2ZVJlc291cmNlPiBtYWluUmVzb3VyY2UsIFZlY3Rv cjxQYXNzUmVmUHRyPEFyY2hpdmVSZXNvdXJjZT4+JiBzdWJyZXNvdXJjZXMsIFZlY3RvcjxQYXNz UmVmUHRyPExlZ2FjeVdlYkFyY2hpdmU+PiYgc3ViZnJhbWVBcmNoaXZlcyk7Ci0gICAgc3RhdGlj IFBhc3NSZWZQdHI8TGVnYWN5V2ViQXJjaGl2ZT4gY3JlYXRlKE5vZGUqLCBGcmFtZUZpbHRlciog PSAwKTsKKyAgICBzdGF0aWMgUGFzc1JlZlB0cjxMZWdhY3lXZWJBcmNoaXZlPiBjcmVhdGUoTm9k ZSosIHN0ZDo6ZnVuY3Rpb248Ym9vbCAoRnJhbWUmKT4gZnJhbWVGaWx0ZXIgPSBudWxscHRyKTsK ICAgICBzdGF0aWMgUGFzc1JlZlB0cjxMZWdhY3lXZWJBcmNoaXZlPiBjcmVhdGUoRnJhbWUqKTsK ICAgICBzdGF0aWMgUGFzc1JlZlB0cjxMZWdhY3lXZWJBcmNoaXZlPiBjcmVhdGVGcm9tU2VsZWN0 aW9uKEZyYW1lKik7CiAgICAgc3RhdGljIFBhc3NSZWZQdHI8TGVnYWN5V2ViQXJjaGl2ZT4gY3Jl YXRlKFJhbmdlKik7CkBAIC02Myw3ICs1OCw3IEBAIHByaXZhdGU6CiAKICAgICBlbnVtIE1haW5S ZXNvdXJjZVN0YXR1cyB7IFN1YnJlc291cmNlLCBNYWluUmVzb3VyY2UgfTsKIAotICAgIHN0YXRp YyBQYXNzUmVmUHRyPExlZ2FjeVdlYkFyY2hpdmU+IGNyZWF0ZShjb25zdCBTdHJpbmcmIG1hcmt1 cFN0cmluZywgRnJhbWUqLCBjb25zdCBWZWN0b3I8Tm9kZSo+JiBub2RlcywgRnJhbWVGaWx0ZXIq KTsKKyAgICBzdGF0aWMgUGFzc1JlZlB0cjxMZWdhY3lXZWJBcmNoaXZlPiBjcmVhdGUoY29uc3Qg U3RyaW5nJiBtYXJrdXBTdHJpbmcsIEZyYW1lKiwgY29uc3QgVmVjdG9yPE5vZGUqPiYgbm9kZXMs IHN0ZDo6ZnVuY3Rpb248Ym9vbCAoRnJhbWUmKT4gZnJhbWVGaWx0ZXIpOwogICAgIHN0YXRpYyBQ YXNzUmVmUHRyPEFyY2hpdmVSZXNvdXJjZT4gY3JlYXRlUmVzb3VyY2UoQ0ZEaWN0aW9uYXJ5UmVm KTsKICAgICBzdGF0aWMgUmVzb3VyY2VSZXNwb25zZSBjcmVhdGVSZXNvdXJjZVJlc3BvbnNlRnJv bU1hY0FyY2hpdmVkRGF0YShDRkRhdGFSZWYpOwogICAgIHN0YXRpYyBSZXNvdXJjZVJlc3BvbnNl IGNyZWF0ZVJlc291cmNlUmVzcG9uc2VGcm9tUHJvcGVydHlMaXN0RGF0YShDRkRhdGFSZWYsIENG U3RyaW5nUmVmIHJlc3BvbnNlRGF0YVR5cGUpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9t YWMvRE9NL1dlYkRPTU9wZXJhdGlvbnMubW0gYi9Tb3VyY2UvV2ViS2l0L21hYy9ET00vV2ViRE9N T3BlcmF0aW9ucy5tbQppbmRleCA3NGM4ZDk5OGVhYmQwOTQ5MjkzNDc5Y2JjMGViMWY0YThjMzJm OTJlLi45ZTNlY2U3Nzk4ZjAzYmYzODJkNWZlZjU0NDdlNjRhODJhOGQwMTBjIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L21hYy9ET00vV2ViRE9NT3BlcmF0aW9ucy5tbQorKysgYi9Tb3VyY2Uv V2ViS2l0L21hYy9ET00vV2ViRE9NT3BlcmF0aW9ucy5tbQpAQCAtNzUsMzQgKzc1LDYgQEAgdXNp bmcgbmFtZXNwYWNlIEpTQzsKIAogQGVuZAogCi1jbGFzcyBXZWJGcmFtZUZpbHRlciA6IHB1Ymxp YyBXZWJDb3JlOjpGcmFtZUZpbHRlciB7Ci1wdWJsaWM6Ci0gICAgV2ViRnJhbWVGaWx0ZXIoV2Vi QXJjaGl2ZVN1YmZyYW1lRmlsdGVyIGZpbHRlckJsb2NrKTsKLSAgICB+V2ViRnJhbWVGaWx0ZXIo KTsKLXByaXZhdGU6Ci0gICAgdmlydHVhbCBib29sIHNob3VsZEluY2x1ZGVTdWJmcmFtZShGcmFt ZSopIGNvbnN0IE9WRVJSSURFOwotCi0gICAgV2ViQXJjaGl2ZVN1YmZyYW1lRmlsdGVyIG1fZmls dGVyQmxvY2s7Ci19OwotCi1XZWJGcmFtZUZpbHRlcjo6V2ViRnJhbWVGaWx0ZXIoV2ViQXJjaGl2 ZVN1YmZyYW1lRmlsdGVyIGZpbHRlckJsb2NrKQotICAgIDogbV9maWx0ZXJCbG9jayhCbG9ja19j b3B5KGZpbHRlckJsb2NrKSkKLXsKLX0KLQotV2ViRnJhbWVGaWx0ZXI6On5XZWJGcmFtZUZpbHRl cigpCi17Ci0gICAgQmxvY2tfcmVsZWFzZShtX2ZpbHRlckJsb2NrKTsKLX0KLQotYm9vbCBXZWJG cmFtZUZpbHRlcjo6c2hvdWxkSW5jbHVkZVN1YmZyYW1lKEZyYW1lKiBmcmFtZSkgY29uc3QKLXsK LSAgICBpZiAoIW1fZmlsdGVyQmxvY2spCi0gICAgICAgIHJldHVybiB0cnVlOwotCi0gICAgcmV0 dXJuIG1fZmlsdGVyQmxvY2soa2l0KGZyYW1lKSk7Ci19Ci0KIEBpbXBsZW1lbnRhdGlvbiBET01O b2RlIChXZWJET01Ob2RlT3BlcmF0aW9ucykKIAogLSAoV2ViQXJjaGl2ZSAqKXdlYkFyY2hpdmUK QEAgLTExMiw4ICs4NCwxMSBAQCBib29sIFdlYkZyYW1lRmlsdGVyOjpzaG91bGRJbmNsdWRlU3Vi ZnJhbWUoRnJhbWUqIGZyYW1lKSBjb25zdAogCiAtIChXZWJBcmNoaXZlICopd2ViQXJjaGl2ZUJ5 RmlsdGVyaW5nU3ViZnJhbWVzOihXZWJBcmNoaXZlU3ViZnJhbWVGaWx0ZXIpd2ViQXJjaGl2ZVN1 YmZyYW1lRmlsdGVyCiB7Ci0gICAgV2ViRnJhbWVGaWx0ZXIgZmlsdGVyKHdlYkFyY2hpdmVTdWJm cmFtZUZpbHRlcik7Ci0gICAgcmV0dXJuIFtbW1dlYkFyY2hpdmUgYWxsb2NdIF9pbml0V2l0aENv cmVMZWdhY3lXZWJBcmNoaXZlOkxlZ2FjeVdlYkFyY2hpdmU6OmNyZWF0ZShjb3JlKHNlbGYpLCAm ZmlsdGVyKV0gYXV0b3JlbGVhc2VdOworICAgIFdlYkFyY2hpdmUgKndlYkFyY2hpdmUgPSBbW1dl YkFyY2hpdmUgYWxsb2NdIF9pbml0V2l0aENvcmVMZWdhY3lXZWJBcmNoaXZlOkxlZ2FjeVdlYkFy Y2hpdmU6OmNyZWF0ZShjb3JlKHNlbGYpLCBbd2ViQXJjaGl2ZVN1YmZyYW1lRmlsdGVyXShGcmFt ZSYgc3ViZnJhbWUpIC0+IGJvb2wgeworICAgICAgICByZXR1cm4gd2ViQXJjaGl2ZVN1YmZyYW1l RmlsdGVyKGtpdCgmc3ViZnJhbWUpKTsKKyAgICB9KV07CisKKyAgICByZXR1cm4gW3dlYkFyY2hp dmUgYXV0b3JlbGVhc2VdOwogfQogCiBAZW5kCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1dlYlBhZ2UvV2ViRnJhbWUuY3BwIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vz cy9XZWJQYWdlL1dlYkZyYW1lLmNwcAppbmRleCA1MGZlMGU4YmUxN2UzYTY2YjRjMjg0ODU4ZTY3 ZTk3MjY3Yzk3YWVjLi5lM2M3N2FlOTFmNzMxODkwNmUyMDhjMjczODQzYjA2MGJiOTYwZDMyIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViRnJhbWUuY3Bw CisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJGcmFtZS5jcHAKQEAg LTczNCw0NiArNzM0LDIzIEBAIHZvaWQgV2ViRnJhbWU6OnNldFRleHREaXJlY3Rpb24oY29uc3Qg U3RyaW5nJiBkaXJlY3Rpb24pCiB9CiAKICNpZiBQTEFURk9STShNQUMpCi0KLWNsYXNzIFdlYkZy YW1lRmlsdGVyIDogcHVibGljIEZyYW1lRmlsdGVyIHsKLXB1YmxpYzoKLSAgICBXZWJGcmFtZUZp bHRlcihXZWJGcmFtZSosIFdlYkZyYW1lOjpGcmFtZUZpbHRlckZ1bmN0aW9uLCB2b2lkKiBjb250 ZXh0KTsKLSAgICAgICAgCi1wcml2YXRlOgotICAgIHZpcnR1YWwgYm9vbCBzaG91bGRJbmNsdWRl U3ViZnJhbWUoRnJhbWUqKSBjb25zdCBPVkVSUklERTsKLQotICAgIFdlYkZyYW1lKiBtX3RvcExl dmVsV2ViRnJhbWU7Ci0gICAgV2ViRnJhbWU6OkZyYW1lRmlsdGVyRnVuY3Rpb24gbV9jYWxsYmFj azsKLSAgICB2b2lkKiBtX2NvbnRleHQ7Ci19OwotCi1XZWJGcmFtZUZpbHRlcjo6V2ViRnJhbWVG aWx0ZXIoV2ViRnJhbWUqIHRvcExldmVsV2ViRnJhbWUsIFdlYkZyYW1lOjpGcmFtZUZpbHRlckZ1 bmN0aW9uIGNhbGxiYWNrLCB2b2lkKiBjb250ZXh0KQotICAgIDogbV90b3BMZXZlbFdlYkZyYW1l KHRvcExldmVsV2ViRnJhbWUpCi0gICAgLCBtX2NhbGxiYWNrKGNhbGxiYWNrKQotICAgICwgbV9j b250ZXh0KGNvbnRleHQpCi17Ci19Ci0KLWJvb2wgV2ViRnJhbWVGaWx0ZXI6OnNob3VsZEluY2x1 ZGVTdWJmcmFtZShGcmFtZSogZnJhbWUpIGNvbnN0CitSZXRhaW5QdHI8Q0ZEYXRhUmVmPiBXZWJG cmFtZTo6d2ViQXJjaGl2ZURhdGEoRnJhbWVGaWx0ZXJGdW5jdGlvbiBjYWxsYmFjaywgdm9pZCog Y29udGV4dCkKIHsKLSAgICBpZiAoIW1fY2FsbGJhY2spCi0gICAgICAgIHJldHVybiB0cnVlOwor ICAgIFJlZlB0cjxMZWdhY3lXZWJBcmNoaXZlPiBhcmNoaXZlID0gTGVnYWN5V2ViQXJjaGl2ZTo6 Y3JlYXRlKGNvcmVGcmFtZSgpLT5kb2N1bWVudCgpLCBbdGhpcywgY2FsbGJhY2ssIGNvbnRleHRd KEZyYW1lJiBmcmFtZSkgLT4gYm9vbCB7CisgICAgICAgIGlmICghY2FsbGJhY2spCisgICAgICAg ICAgICByZXR1cm4gdHJ1ZTsKIAotICAgIFdlYkZyYW1lTG9hZGVyQ2xpZW50KiB3ZWJGcmFtZUxv YWRlckNsaWVudCA9IHRvV2ViRnJhbWVMb2FkZXJDbGllbnQoZnJhbWUtPmxvYWRlcigpLmNsaWVu dCgpKTsKLSAgICBXZWJGcmFtZSogd2ViRnJhbWUgPSB3ZWJGcmFtZUxvYWRlckNsaWVudCA/IHdl YkZyYW1lTG9hZGVyQ2xpZW50LT53ZWJGcmFtZSgpIDogMDsKLSAgICBBU1NFUlQod2ViRnJhbWUp OworICAgICAgICBXZWJGcmFtZUxvYWRlckNsaWVudCogd2ViRnJhbWVMb2FkZXJDbGllbnQgPSB0 b1dlYkZyYW1lTG9hZGVyQ2xpZW50KGZyYW1lLmxvYWRlcigpLmNsaWVudCgpKTsKKyAgICAgICAg V2ViRnJhbWUqIHdlYkZyYW1lID0gd2ViRnJhbWVMb2FkZXJDbGllbnQgPyB3ZWJGcmFtZUxvYWRl ckNsaWVudC0+d2ViRnJhbWUoKSA6IDA7CisgICAgICAgIEFTU0VSVCh3ZWJGcmFtZSk7CiAKLSAg ICByZXR1cm4gbV9jYWxsYmFjayh0b0FQSShtX3RvcExldmVsV2ViRnJhbWUpLCB0b0FQSSh3ZWJG cmFtZSksIG1fY29udGV4dCk7Ci19CisgICAgICAgIHJldHVybiBjYWxsYmFjayh0b0FQSSh0aGlz KSwgdG9BUEkod2ViRnJhbWUpLCBjb250ZXh0KTsKKyAgICB9KTsKIAotUmV0YWluUHRyPENGRGF0 YVJlZj4gV2ViRnJhbWU6OndlYkFyY2hpdmVEYXRhKEZyYW1lRmlsdGVyRnVuY3Rpb24gY2FsbGJh Y2ssIHZvaWQqIGNvbnRleHQpCi17Ci0gICAgV2ViRnJhbWVGaWx0ZXIgZmlsdGVyKHRoaXMsIGNh bGxiYWNrLCBjb250ZXh0KTsKKyAgICBpZiAoIWFyY2hpdmUpCisgICAgICAgIHJldHVybiBudWxs cHRyOwogCi0gICAgaWYgKFJlZlB0cjxMZWdhY3lXZWJBcmNoaXZlPiBhcmNoaXZlID0gTGVnYWN5 V2ViQXJjaGl2ZTo6Y3JlYXRlKGNvcmVGcmFtZSgpLT5kb2N1bWVudCgpLCAmZmlsdGVyKSkKLSAg ICAgICAgcmV0dXJuIGFyY2hpdmUtPnJhd0RhdGFSZXByZXNlbnRhdGlvbigpOwotICAgIAotICAg IHJldHVybiAwOworICAgIHJldHVybiBhcmNoaXZlLT5yYXdEYXRhUmVwcmVzZW50YXRpb24oKTsK IH0KICNlbmRpZgogICAgIAo=