128284 2014-02-05 16:54:33 -0800 Support encoding and decoding of Regions 2014-02-05 20:27:22 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser andersca sam simon.fraser oldest_to_newest 977145 0 simon.fraser 2014-02-05 16:54:33 -0800 Support encoding and decoding of Regions 977147 1 223281 simon.fraser 2014-02-05 16:57:08 -0800 Created attachment 223281 Patch 977174 2 223281 andersca 2014-02-05 17:58:45 -0800 Comment on attachment 223281 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=223281&action=review > Source/WebCore/platform/graphics/Region.cpp:336 > + for (Shape::SpanIterator span = spans_begin(), end = spans_end(); span != end && span + 1 != end; ++span) { auto span > Source/WebCore/platform/graphics/Region.cpp:343 > + for (Shape::SegmentIterator segment = segments_begin(span), end = segments_end(span); segment != end && segment + 1 != end; segment += 2) { auto segment > Source/WebCore/platform/graphics/Region.h:75 > + { } Should be newline: { } > Source/WebCore/platform/graphics/Region.h:79 > + { } Newline { } 977211 3 simon.fraser 2014-02-05 20:27:22 -0800 https://trac.webkit.org/r163509 223281 2014-02-05 16:57:08 -0800 2014-02-05 17:58:45 -0800 Patch bug-128284-20140205165700.patch text/plain 12320 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTYzNDU2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTE5ZGI4NTM4MjJlY2U0 NTUxN2QxYzJmZjI2YmIwYjFlMDg0Y2Y1MC4uN2FkMGIwZjcwNWUyMWEyNzUwOTE0NWVmMWExMDFj MjI0YWE0NWQ0MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDE0LTAyLTA1ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFN1cHBvcnQgZW5j b2RpbmcgYW5kIGRlY29kaW5nIG9mIFJlZ2lvbnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTEyODI4NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFJlZ2lvbiBjaGFuZ2VzIHRvIG1ha2UgaXQgZW5jb2RhYmxl OgorICAgICAgICAKKyAgICAgICAgTWFrZSBSZWdpb246OlNwYW4gcHVibGljIGFuZCBnaXZlIGl0 IGEgZGVmYXVsdCBjb25zdHJ1Y3Rvci4KKyAgICAgICAgQWxsb3cgZ2V0dGluZyBhbmQgc2V0dGlu ZyBvZiBTaGFwZSBpbnRlcm5hbHMsIGFuZCBhIHdheSB0byB1cGRhdGUKKyAgICAgICAgdGhlIFJl Z2lvbiBib3VuZHMgYWZ0ZXIgY2hhbmdpbmcgdGhlIHNoYXBlLiBBbHNvIGFkZCBhIHdheSB0byB0 ZXN0CisgICAgICAgIGZvciB2YWxpZCBzcGFucyBhbmQgc2VnbWVudHMuCisKKyAgICAgICAgKiBw bGF0Zm9ybS9ncmFwaGljcy9SZWdpb24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVnaW9uOjpT aGFwZTo6aXNWYWxpZCk6CisgICAgICAgIChXZWJDb3JlOjpSZWdpb246OnVwZGF0ZUJvdW5kc0Zy b21TaGFwZSk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvUmVnaW9uLmg6CisgICAgICAg IChXZWJDb3JlOjpSZWdpb246OmlzVmFsaWQpOgorICAgICAgICAoV2ViQ29yZTo6UmVnaW9uOjpT cGFuOjpTcGFuKToKKyAgICAgICAgKFdlYkNvcmU6OlJlZ2lvbjo6c2hhcGVTZWdtZW50cyk6Cisg ICAgICAgIChXZWJDb3JlOjpSZWdpb246OnNoYXBlU3BhbnMpOgorICAgICAgICAoV2ViQ29yZTo6 UmVnaW9uOjpzZXRTaGFwZVNlZ21lbnRzKToKKyAgICAgICAgKFdlYkNvcmU6OlJlZ2lvbjo6c2V0 U2hhcGVTcGFucyk6CisgICAgICAgIChXZWJDb3JlOjpSZWdpb246OlNoYXBlOjpzZWdtZW50cyk6 CisgICAgICAgIChXZWJDb3JlOjpSZWdpb246OlNoYXBlOjpzcGFucyk6CisgICAgICAgIChXZWJD b3JlOjpSZWdpb246OlNoYXBlOjpzZXRTZWdtZW50cyk6CisgICAgICAgIChXZWJDb3JlOjpSZWdp b246OlNoYXBlOjpzZXRTcGFucyk6CisKIDIwMTQtMDItMDUgIFNlcmdpbyBDb3JyZWlhICA8c2Vy Z2lvLmNvcnJlaWFAb3BlbmJvc3NhLm9yZz4KIAogICAgICAgICBTVkcgcHJlc2VydmVBc3BlY3RS YXRpbz1ub25lIGlzIG5vdCBob25vcmVkLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvQ2hh bmdlTG9nIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCmluZGV4IDIzYmMyN2MyNmYwNTEzNjNi YWNhOTc1Nzc1ZmJmMTY4YWQyMmYwMTEuLmE3ZWRkZTA0NDE3YTA2OGE2YTYxOGE0YzI3M2ZiYzZh NjFlYjQ0ZTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZworKysgYi9Tb3Vy Y2UvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNCBAQAorMjAxNC0wMi0wNSAgU2ltb24g RnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KKworICAgICAgICBTdXBwb3J0IGVuY29k aW5nIGFuZCBkZWNvZGluZyBvZiBSZWdpb25zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMjgyODQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKyAgICAgICAgCisgICAgICAgIFN1cHBvcnQgZW5jb2RpbmcgYW5kIGRlY29kaW5n IG9mIFJlZ2lvbiwgYW5kIGl0cyBpbnRlcm5hbAorICAgICAgICBzdHJ1Y3QgUmVnaW9uOjpTcGFu LgorICAgICAgICAKKyAgICAgICAgQXJndW1lbnRDb2RlcnMgaGFkIHRvIGJlIHRhdWdodCBhYm91 dCBob3cgdG8gZW5jb2RlCisgICAgICAgIFZlY3RvcnMgd2l0aCBpbmxpbmUgY2FwYWNpdHkuCisK KyAgICAgICAgKiBQbGF0Zm9ybS9JUEMvQXJndW1lbnRDb2RlcnMuaDoKKyAgICAgICAgKiBTaGFy ZWQvV2ViQ29yZUFyZ3VtZW50Q29kZXJzLmNwcDoKKyAgICAgICAgKElQQzo6QXJndW1lbnRDb2Rl cjxSZWdpb246OlNwYW4+OjplbmNvZGUpOgorICAgICAgICAoSVBDOjpBcmd1bWVudENvZGVyPFJl Z2lvbjo6U3Bhbj46OmRlY29kZSk6CisgICAgICAgIChJUEM6OkFyZ3VtZW50Q29kZXI8UmVnaW9u Pjo6ZW5jb2RlKToKKyAgICAgICAgKElQQzo6QXJndW1lbnRDb2RlcjxSZWdpb24+OjpkZWNvZGUp OgorICAgICAgICAqIFNoYXJlZC9XZWJDb3JlQXJndW1lbnRDb2RlcnMuaDoKKwogMjAxNC0wMi0w NSAgSmVyIE5vYmxlICA8amVyLm5vYmxlQGFwcGxlLmNvbT4KIAogICAgICAgICBbV0syXSBbaU9T XSBObyB2aWRlbyBvbiBlbWJlZGRlZCBZb3VUdWJlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9SZWdpb24uY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvUmVnaW9uLmNwcAppbmRleCA0NjVhMzdjZGUyMzQ2MTEwMzZjNDNiMjcxYmVkMWFh NDU5ODAxNmU4Li40MDQ4MjMwOTBiZGRkMmJkY2E5MDg2MTAyZWE1YTlhMThjN2VlMjZmIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9SZWdpb24uY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL1JlZ2lvbi5jcHAKQEAgLTMzMSw2ICsz MzEsMjcgQEAgdm9pZCBSZWdpb246OlNoYXBlOjpkdW1wKCkgY29uc3QKIH0KICNlbmRpZgogCiti b29sIFJlZ2lvbjo6U2hhcGU6OmlzVmFsaWQoKSBjb25zdAoreworICAgIGZvciAoU2hhcGU6OlNw YW5JdGVyYXRvciBzcGFuID0gc3BhbnNfYmVnaW4oKSwgZW5kID0gc3BhbnNfZW5kKCk7IHNwYW4g IT0gZW5kICYmIHNwYW4gKyAxICE9IGVuZDsgKytzcGFuKSB7CisgICAgICAgIGludCB5ID0gc3Bh bi0+eTsKKyAgICAgICAgaW50IGhlaWdodCA9IChzcGFuICsgMSktPnkgLSB5OworICAgICAgICAK KyAgICAgICAgaWYgKGhlaWdodCA8IDApCisgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAg ICAgICAgZm9yIChTaGFwZTo6U2VnbWVudEl0ZXJhdG9yIHNlZ21lbnQgPSBzZWdtZW50c19iZWdp bihzcGFuKSwgZW5kID0gc2VnbWVudHNfZW5kKHNwYW4pOyBzZWdtZW50ICE9IGVuZCAmJiBzZWdt ZW50ICsgMSAhPSBlbmQ7IHNlZ21lbnQgKz0gMikgeworICAgICAgICAgICAgaW50IHggPSAqc2Vn bWVudDsKKyAgICAgICAgICAgIGludCB3aWR0aCA9ICooc2VnbWVudCArIDEpIC0geDsKKyAgICAg ICAgICAgIAorICAgICAgICAgICAgaWYgKHdpZHRoIDwgMCkKKyAgICAgICAgICAgICAgICByZXR1 cm4gZmFsc2U7CisgICAgICAgIH0KKyAgICB9CisKKyAgICByZXR1cm4gdHJ1ZTsKK30KKwogSW50 UmVjdCBSZWdpb246OlNoYXBlOjpib3VuZHMoKSBjb25zdAogewogICAgIGlmIChpc0VtcHR5KCkp CkBAIC01NTAsNiArNTcxLDExIEBAIHZvaWQgUmVnaW9uOjpkdW1wKCkgY29uc3QKIH0KICNlbmRp ZgogCit2b2lkIFJlZ2lvbjo6dXBkYXRlQm91bmRzRnJvbVNoYXBlKCkKK3sKKyAgICBtX2JvdW5k cyA9IG1fc2hhcGUuYm91bmRzKCk7Cit9CisKIHZvaWQgUmVnaW9uOjppbnRlcnNlY3QoY29uc3Qg UmVnaW9uJiByZWdpb24pCiB7CiAgICAgaWYgKG1fYm91bmRzLmlzRW1wdHkoKSkKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL1JlZ2lvbi5oIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvUmVnaW9uLmgKaW5kZXggNTY1YjQ5YjA0ZjU2YzBkYmJi NGFiMmJjZDkyZjdlOWQzZDgxMjVlZi4uNDNhNzdlMDk0NDdjMjFkNDU2YjFjYzQ2ZTgyNzA0MmU0 NWMxYTM0NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvUmVn aW9uLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvUmVnaW9uLmgKQEAg LTY0LDE3ICs2NCwzNCBAQCBwdWJsaWM6CiAgICAgdm9pZCBkdW1wKCkgY29uc3Q7CiAjZW5kaWYK IAotcHJpdmF0ZToKKyAgICBib29sIGlzVmFsaWQoKSBjb25zdCB7IHJldHVybiBtX3NoYXBlLmlz VmFsaWQoKTsgfQorCisgICAgLy8gVGhpcyBpcyBpbnRlcm5hbCB0byBSZWdpb24sIGJ1dCBleHBv c2VkIGp1c3QgZm9yIGVuY29kaW5nLgorICAgIC8vIEZJWE1FOiBmaWd1cmUgb3V0IGEgYmV0dGVy IHdheSB0byBlbmNvZGUgV2ViQ29yZSBjbGFzc2VzLgogICAgIHN0cnVjdCBTcGFuIHsKKyAgICAg ICAgU3BhbigpCisgICAgICAgICAgICA6IHkoMCkKKyAgICAgICAgICAgICwgc2VnbWVudEluZGV4 KDApCisgICAgICAgIHsgfQogICAgICAgICBTcGFuKGludCB5LCBzaXplX3Qgc2VnbWVudEluZGV4 KQotICAgICAgICAgICAgOiB5KHkpLCBzZWdtZW50SW5kZXgoc2VnbWVudEluZGV4KQotICAgICAg ICB7Ci0gICAgICAgIH0KKyAgICAgICAgICAgIDogeSh5KQorICAgICAgICAgICAgLCBzZWdtZW50 SW5kZXgoc2VnbWVudEluZGV4KQorICAgICAgICB7IH0KIAogICAgICAgICBpbnQgeTsKICAgICAg ICAgc2l6ZV90IHNlZ21lbnRJbmRleDsKICAgICB9OwogCisgICAgLy8gRm9yIGVuY29kaW5nL2Rl Y29kaW5nIG9ubHkuCisgICAgY29uc3QgVmVjdG9yPGludCwgMzI+JiBzaGFwZVNlZ21lbnRzKCkg Y29uc3QgeyByZXR1cm4gbV9zaGFwZS5zZWdtZW50cygpOyB9CisgICAgY29uc3QgVmVjdG9yPFNw YW4sIDE2PiYgc2hhcGVTcGFucygpIGNvbnN0IHsgcmV0dXJuIG1fc2hhcGUuc3BhbnMoKTsgfQor CisgICAgdm9pZCBzZXRTaGFwZVNlZ21lbnRzKGNvbnN0IFZlY3RvcjxpbnQ+JiBzZWdtZW50cykg eyBtX3NoYXBlLnNldFNlZ21lbnRzKHNlZ21lbnRzKTsgfQorICAgIHZvaWQgc2V0U2hhcGVTcGFu cyhjb25zdCBWZWN0b3I8U3Bhbj4mIHNwYW5zKSB7IG1fc2hhcGUuc2V0U3BhbnMoc3BhbnMpOyB9 CisgICAgdm9pZCB1cGRhdGVCb3VuZHNGcm9tU2hhcGUoKTsKKworcHJpdmF0ZToKKwogICAgIGNs YXNzIFNoYXBlIHsKICAgICBwdWJsaWM6CiAgICAgICAgIFNoYXBlKCk7CkBAIC0xMDUsNiArMTIy LDE1IEBAIHByaXZhdGU6CiAKICAgICAgICAgdGVtcGxhdGU8dHlwZW5hbWUgQ29tcGFyZU9wZXJh dGlvbj4KICAgICAgICAgc3RhdGljIGJvb2wgY29tcGFyZVNoYXBlcyhjb25zdCBTaGFwZSYgc2hh cGUxLCBjb25zdCBTaGFwZSYgc2hhcGUyKTsKKyAgICAgICAgCisgICAgICAgIGJvb2wgaXNWYWxp ZCgpIGNvbnN0OworCisgICAgICAgIC8vIEZvciBlbmNvZGluZy9kZWNvZGluZyBvbmx5LgorICAg ICAgICBjb25zdCBWZWN0b3I8aW50LCAzMj4mIHNlZ21lbnRzKCkgY29uc3QgeyByZXR1cm4gbV9z ZWdtZW50czsgfQorICAgICAgICBjb25zdCBWZWN0b3I8U3BhbiwgMTY+JiBzcGFucygpIGNvbnN0 IHsgcmV0dXJuIG1fc3BhbnM7IH0KKworICAgICAgICB2b2lkIHNldFNlZ21lbnRzKGNvbnN0IFZl Y3RvcjxpbnQ+JiBzZWdtZW50cykgeyBtX3NlZ21lbnRzID0gc2VnbWVudHM7IH0KKyAgICAgICAg dm9pZCBzZXRTcGFucyhjb25zdCBWZWN0b3I8U3Bhbj4mIHNwYW5zKSB7IG1fc3BhbnMgPSBzcGFu czsgfQogCiAjaWZuZGVmIE5ERUJVRwogICAgICAgICB2b2lkIGR1bXAoKSBjb25zdDsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL0lQQy9Bcmd1bWVudENvZGVycy5oIGIvU291 cmNlL1dlYktpdDIvUGxhdGZvcm0vSVBDL0FyZ3VtZW50Q29kZXJzLmgKaW5kZXggYzA0YjdhOTg5 MjJhZDVhOGRlZjQyNDg1NGVjZWNkNjRkZjViMDhmNi4uMjk3NDEzZjM4YTFjYWU1NDc4YmMxNmE4 MzEwMzVhMWQzYTE5YWJlMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvUGxhdGZvcm0vSVBD L0FyZ3VtZW50Q29kZXJzLmgKKysrIGIvU291cmNlL1dlYktpdDIvUGxhdGZvcm0vSVBDL0FyZ3Vt ZW50Q29kZXJzLmgKQEAgLTkyLDIzICs5MiwyMyBAQCB0ZW1wbGF0ZTx0eXBlbmFtZSBLZXlUeXBl LCB0eXBlbmFtZSBWYWx1ZVR5cGU+IHN0cnVjdCBBcmd1bWVudENvZGVyPFdURjo6S2V5VmFsdQog ICAgIH0KIH07CiAKLXRlbXBsYXRlPGJvb2wgZml4ZWRTaXplRWxlbWVudHMsIHR5cGVuYW1lIFQ+ IHN0cnVjdCBWZWN0b3JBcmd1bWVudENvZGVyOwordGVtcGxhdGU8Ym9vbCBmaXhlZFNpemVFbGVt ZW50cywgdHlwZW5hbWUgVCwgc2l6ZV90IGlubGluZUNhcGFjaXR5PiBzdHJ1Y3QgVmVjdG9yQXJn dW1lbnRDb2RlcjsKIAotdGVtcGxhdGU8dHlwZW5hbWUgVD4gc3RydWN0IFZlY3RvckFyZ3VtZW50 Q29kZXI8ZmFsc2UsIFQ+IHsKLSAgICBzdGF0aWMgdm9pZCBlbmNvZGUoQXJndW1lbnRFbmNvZGVy JiBlbmNvZGVyLCBjb25zdCBWZWN0b3I8VD4mIHZlY3RvcikKK3RlbXBsYXRlPHR5cGVuYW1lIFQs IHNpemVfdCBpbmxpbmVDYXBhY2l0eT4gc3RydWN0IFZlY3RvckFyZ3VtZW50Q29kZXI8ZmFsc2Us IFQsIGlubGluZUNhcGFjaXR5PiB7CisgICAgc3RhdGljIHZvaWQgZW5jb2RlKEFyZ3VtZW50RW5j b2RlciYgZW5jb2RlciwgY29uc3QgVmVjdG9yPFQsIGlubGluZUNhcGFjaXR5PiYgdmVjdG9yKQog ICAgIHsKICAgICAgICAgZW5jb2RlciA8PCBzdGF0aWNfY2FzdDx1aW50NjRfdD4odmVjdG9yLnNp emUoKSk7CiAgICAgICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgdmVjdG9yLnNpemUoKTsgKytp KQogICAgICAgICAgICAgZW5jb2RlciA8PCB2ZWN0b3JbaV07CiAgICAgfQogCi0gICAgc3RhdGlj IGJvb2wgZGVjb2RlKEFyZ3VtZW50RGVjb2RlciYgZGVjb2RlciwgVmVjdG9yPFQ+JiB2ZWN0b3Ip CisgICAgc3RhdGljIGJvb2wgZGVjb2RlKEFyZ3VtZW50RGVjb2RlciYgZGVjb2RlciwgVmVjdG9y PFQsIGlubGluZUNhcGFjaXR5PiYgdmVjdG9yKQogICAgIHsKICAgICAgICAgdWludDY0X3Qgc2l6 ZTsKICAgICAgICAgaWYgKCFkZWNvZGVyLmRlY29kZShzaXplKSkKICAgICAgICAgICAgIHJldHVy biBmYWxzZTsKIAotICAgICAgICBWZWN0b3I8VD4gdG1wOworICAgICAgICBWZWN0b3I8VCwgaW5s aW5lQ2FwYWNpdHk+IHRtcDsKICAgICAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBzaXplOyAr K2kpIHsKICAgICAgICAgICAgIFQgZWxlbWVudDsKICAgICAgICAgICAgIGlmICghZGVjb2Rlci5k ZWNvZGUoZWxlbWVudCkpCkBAIC0xMjMsMTQgKzEyMywxNCBAQCB0ZW1wbGF0ZTx0eXBlbmFtZSBU PiBzdHJ1Y3QgVmVjdG9yQXJndW1lbnRDb2RlcjxmYWxzZSwgVD4gewogICAgIH0KIH07CiAKLXRl bXBsYXRlPHR5cGVuYW1lIFQ+IHN0cnVjdCBWZWN0b3JBcmd1bWVudENvZGVyPHRydWUsIFQ+IHsK LSAgICBzdGF0aWMgdm9pZCBlbmNvZGUoQXJndW1lbnRFbmNvZGVyJiBlbmNvZGVyLCBjb25zdCBW ZWN0b3I8VD4mIHZlY3RvcikKK3RlbXBsYXRlPHR5cGVuYW1lIFQsIHNpemVfdCBpbmxpbmVDYXBh Y2l0eT4gc3RydWN0IFZlY3RvckFyZ3VtZW50Q29kZXI8dHJ1ZSwgVCwgaW5saW5lQ2FwYWNpdHk+ IHsKKyAgICBzdGF0aWMgdm9pZCBlbmNvZGUoQXJndW1lbnRFbmNvZGVyJiBlbmNvZGVyLCBjb25z dCBWZWN0b3I8VCwgaW5saW5lQ2FwYWNpdHk+JiB2ZWN0b3IpCiAgICAgewogICAgICAgICBlbmNv ZGVyIDw8IHN0YXRpY19jYXN0PHVpbnQ2NF90Pih2ZWN0b3Iuc2l6ZSgpKTsKICAgICAgICAgZW5j b2Rlci5lbmNvZGVGaXhlZExlbmd0aERhdGEocmVpbnRlcnByZXRfY2FzdDxjb25zdCB1aW50OF90 Kj4odmVjdG9yLmRhdGEoKSksIHZlY3Rvci5zaXplKCkgKiBzaXplb2YoVCksIGFsaWdub2YoVCkp OwogICAgIH0KICAgICAKLSAgICBzdGF0aWMgYm9vbCBkZWNvZGUoQXJndW1lbnREZWNvZGVyJiBk ZWNvZGVyLCBWZWN0b3I8VD4mIHZlY3RvcikKKyAgICBzdGF0aWMgYm9vbCBkZWNvZGUoQXJndW1l bnREZWNvZGVyJiBkZWNvZGVyLCBWZWN0b3I8VCwgaW5saW5lQ2FwYWNpdHk+JiB2ZWN0b3IpCiAg ICAgewogICAgICAgICB1aW50NjRfdCBzaXplOwogICAgICAgICBpZiAoIWRlY29kZXIuZGVjb2Rl KHNpemUpKQpAQCAtMTQ0LDcgKzE0NCw3IEBAIHRlbXBsYXRlPHR5cGVuYW1lIFQ+IHN0cnVjdCBW ZWN0b3JBcmd1bWVudENvZGVyPHRydWUsIFQ+IHsKICAgICAgICAgICAgIHJldHVybiBmYWxzZTsK ICAgICAgICAgfQogCi0gICAgICAgIFZlY3RvcjxUPiB0ZW1wOworICAgICAgICBWZWN0b3I8VCwg aW5saW5lQ2FwYWNpdHk+IHRlbXA7CiAgICAgICAgIHRlbXAucmVzaXplKHNpemUpOwogCiAgICAg ICAgIGRlY29kZXIuZGVjb2RlRml4ZWRMZW5ndGhEYXRhKHJlaW50ZXJwcmV0X2Nhc3Q8dWludDhf dCo+KHRlbXAuZGF0YSgpKSwgc2l6ZSAqIHNpemVvZihUKSwgYWxpZ25vZihUKSk7CkBAIC0xNTQs NyArMTU0LDcgQEAgdGVtcGxhdGU8dHlwZW5hbWUgVD4gc3RydWN0IFZlY3RvckFyZ3VtZW50Q29k ZXI8dHJ1ZSwgVD4gewogICAgIH0KIH07CiAKLXRlbXBsYXRlPHR5cGVuYW1lIFQ+IHN0cnVjdCBB cmd1bWVudENvZGVyPFZlY3RvcjxUPj4gOiBWZWN0b3JBcmd1bWVudENvZGVyPHN0ZDo6aXNfYXJp dGhtZXRpYzxUPjo6dmFsdWUsIFQ+IHsgfTsKK3RlbXBsYXRlPHR5cGVuYW1lIFQsIHNpemVfdCBp bmxpbmVDYXBhY2l0eT4gc3RydWN0IEFyZ3VtZW50Q29kZXI8VmVjdG9yPFQsIGlubGluZUNhcGFj aXR5Pj4gOiBWZWN0b3JBcmd1bWVudENvZGVyPHN0ZDo6aXNfYXJpdGhtZXRpYzxUPjo6dmFsdWUs IFQsIGlubGluZUNhcGFjaXR5PiB7IH07CiAKIHRlbXBsYXRlPHR5cGVuYW1lIEtleUFyZywgdHlw ZW5hbWUgTWFwcGVkQXJnLCB0eXBlbmFtZSBIYXNoQXJnLCB0eXBlbmFtZSBLZXlUcmFpdHNBcmcs IHR5cGVuYW1lIE1hcHBlZFRyYWl0c0FyZz4gc3RydWN0IEFyZ3VtZW50Q29kZXI8SGFzaE1hcDxL ZXlBcmcsIE1hcHBlZEFyZywgSGFzaEFyZywgS2V5VHJhaXRzQXJnLCBNYXBwZWRUcmFpdHNBcmc+ PiB7CiAgICAgdHlwZWRlZiBIYXNoTWFwPEtleUFyZywgTWFwcGVkQXJnLCBIYXNoQXJnLCBLZXlU cmFpdHNBcmcsIE1hcHBlZFRyYWl0c0FyZz4gSGFzaE1hcFR5cGU7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0Mi9TaGFyZWQvV2ViQ29yZUFyZ3VtZW50Q29kZXJzLmNwcCBiL1NvdXJjZS9XZWJL aXQyL1NoYXJlZC9XZWJDb3JlQXJndW1lbnRDb2RlcnMuY3BwCmluZGV4IDU3ZTdiMDM3MGRhZDZm MjNmYmU2NDBiODg3YzkyMTg3MTk5M2UxZTkuLmY0ZDcyZGM3M2ExOGZkZmZjZDlmODY1YWY3MjAz MGU0MmY2NDhlMzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJDb3JlQXJn dW1lbnRDb2RlcnMuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJDb3JlQXJndW1l bnRDb2RlcnMuY3BwCkBAIC01MSw2ICs1MSw3IEBACiAjaW5jbHVkZSA8V2ViQ29yZS9MZW5ndGgu aD4KICNpbmNsdWRlIDxXZWJDb3JlL1BsdWdpbkRhdGEuaD4KICNpbmNsdWRlIDxXZWJDb3JlL1By b3RlY3Rpb25TcGFjZS5oPgorI2luY2x1ZGUgPFdlYkNvcmUvUmVnaW9uLmg+CiAjaW5jbHVkZSA8 V2ViQ29yZS9SZXNvdXJjZUVycm9yLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9SZXNvdXJjZVJlcXVl c3QuaD4KICNpbmNsdWRlIDxXZWJDb3JlL1Jlc291cmNlUmVzcG9uc2UuaD4KQEAgLTE5OCw2ICsx OTksNTUgQEAgYm9vbCBBcmd1bWVudENvZGVyPEludFNpemU+OjpkZWNvZGUoQXJndW1lbnREZWNv ZGVyJiBkZWNvZGVyLCBJbnRTaXplJiBpbnRTaXplKQogICAgIHJldHVybiBTaW1wbGVBcmd1bWVu dENvZGVyPEludFNpemU+OjpkZWNvZGUoZGVjb2RlciwgaW50U2l6ZSk7CiB9CiAKK3RlbXBsYXRl PD4gc3RydWN0IEFyZ3VtZW50Q29kZXI8V2ViQ29yZTo6UmVnaW9uOjpTcGFuPiB7CisgICAgc3Rh dGljIHZvaWQgZW5jb2RlKEFyZ3VtZW50RW5jb2RlciYsIGNvbnN0IFdlYkNvcmU6OlJlZ2lvbjo6 U3BhbiYpOworICAgIHN0YXRpYyBib29sIGRlY29kZShBcmd1bWVudERlY29kZXImLCBXZWJDb3Jl OjpSZWdpb246OlNwYW4mKTsKK307CisKK3ZvaWQgQXJndW1lbnRDb2RlcjxSZWdpb246OlNwYW4+ OjplbmNvZGUoQXJndW1lbnRFbmNvZGVyJiBlbmNvZGVyLCBjb25zdCBSZWdpb246OlNwYW4mIHNw YW4pCit7CisgICAgZW5jb2RlciA8PCBzcGFuLnk7CisgICAgZW5jb2RlciA8PCAodWludDY0X3Qp c3Bhbi5zZWdtZW50SW5kZXg7Cit9CisKK2Jvb2wgQXJndW1lbnRDb2RlcjxSZWdpb246OlNwYW4+ OjpkZWNvZGUoQXJndW1lbnREZWNvZGVyJiBkZWNvZGVyLCBSZWdpb246OlNwYW4mIHNwYW4pCit7 CisgICAgaWYgKCFkZWNvZGVyLmRlY29kZShzcGFuLnkpKQorICAgICAgICByZXR1cm4gZmFsc2U7 CisgICAgCisgICAgdWludDY0X3Qgc2VnbWVudEluZGV4OworICAgIGlmICghZGVjb2Rlci5kZWNv ZGUoc2VnbWVudEluZGV4KSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIAorICAgIHNwYW4u c2VnbWVudEluZGV4ID0gc2VnbWVudEluZGV4OworICAgIHJldHVybiB0cnVlOworfQorCit2b2lk IEFyZ3VtZW50Q29kZXI8UmVnaW9uPjo6ZW5jb2RlKEFyZ3VtZW50RW5jb2RlciYgZW5jb2Rlciwg Y29uc3QgUmVnaW9uJiByZWdpb24pCit7CisgICAgZW5jb2Rlci5lbmNvZGUocmVnaW9uLnNoYXBl U2VnbWVudHMoKSk7CisgICAgZW5jb2Rlci5lbmNvZGUocmVnaW9uLnNoYXBlU3BhbnMoKSk7Cit9 CisKK2Jvb2wgQXJndW1lbnRDb2RlcjxSZWdpb24+OjpkZWNvZGUoQXJndW1lbnREZWNvZGVyJiBk ZWNvZGVyLCBSZWdpb24mIHJlZ2lvbikKK3sKKyAgICBWZWN0b3I8aW50PiBzZWdtZW50czsKKyAg ICBpZiAoIWRlY29kZXIuZGVjb2RlKHNlZ21lbnRzKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOwor CisgICAgVmVjdG9yPFJlZ2lvbjo6U3Bhbj4gc3BhbnM7CisgICAgaWYgKCFkZWNvZGVyLmRlY29k ZShzcGFucykpCisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAKKyAgICByZWdpb24uc2V0U2hh cGVTZWdtZW50cyhzZWdtZW50cyk7CisgICAgcmVnaW9uLnNldFNoYXBlU3BhbnMoc3BhbnMpOwor ICAgIHJlZ2lvbi51cGRhdGVCb3VuZHNGcm9tU2hhcGUoKTsKKyAgICAKKyAgICBpZiAoIXJlZ2lv bi5pc1ZhbGlkKCkpCisgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgIHJldHVybiB0cnVlOwor fQogCiB2b2lkIEFyZ3VtZW50Q29kZXI8TGVuZ3RoPjo6ZW5jb2RlKEFyZ3VtZW50RW5jb2RlciYg ZW5jb2RlciwgY29uc3QgTGVuZ3RoJiBsZW5ndGgpCiB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9TaGFyZWQvV2ViQ29yZUFyZ3VtZW50Q29kZXJzLmggYi9Tb3VyY2UvV2ViS2l0Mi9TaGFy ZWQvV2ViQ29yZUFyZ3VtZW50Q29kZXJzLmgKaW5kZXggYTI1NmUzYjUzNzJmZTYwYTlmMGM4NDAy YzEzMWUxMTRkZjIxN2E2Yy4uNGE4MGYyOTZjZTVkNTE1ZTY2MDI3YWRlNWY1NjU5YjczMWQxYWZk NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYkNvcmVBcmd1bWVudENvZGVy cy5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJDb3JlQXJndW1lbnRDb2RlcnMuaApA QCAtNTEsNiArNTEsNyBAQCBjbGFzcyBLZXlmcmFtZVZhbHVlTGlzdDsKIGNsYXNzIFVSTDsKIGNs YXNzIE5vdGlmaWNhdGlvbjsKIGNsYXNzIFByb3RlY3Rpb25TcGFjZTsKK2NsYXNzIFJlZ2lvbjsK IGNsYXNzIFJlc291cmNlRXJyb3I7CiBjbGFzcyBSZXNvdXJjZVJlcXVlc3Q7CiBjbGFzcyBSZXNv dXJjZVJlc3BvbnNlOwpAQCAtMTYyLDYgKzE2MywxMSBAQCB0ZW1wbGF0ZTw+IHN0cnVjdCBBcmd1 bWVudENvZGVyPFdlYkNvcmU6OkludFNpemU+IHsKICAgICBzdGF0aWMgYm9vbCBkZWNvZGUoQXJn dW1lbnREZWNvZGVyJiwgV2ViQ29yZTo6SW50U2l6ZSYpOwogfTsKIAordGVtcGxhdGU8PiBzdHJ1 Y3QgQXJndW1lbnRDb2RlcjxXZWJDb3JlOjpSZWdpb24+IHsKKyAgICBzdGF0aWMgdm9pZCBlbmNv ZGUoQXJndW1lbnRFbmNvZGVyJiwgY29uc3QgV2ViQ29yZTo6UmVnaW9uJik7CisgICAgc3RhdGlj IGJvb2wgZGVjb2RlKEFyZ3VtZW50RGVjb2RlciYsIFdlYkNvcmU6OlJlZ2lvbiYpOworfTsKKwog dGVtcGxhdGU8PiBzdHJ1Y3QgQXJndW1lbnRDb2RlcjxXZWJDb3JlOjpMZW5ndGg+IHsKICAgICBz dGF0aWMgdm9pZCBlbmNvZGUoQXJndW1lbnRFbmNvZGVyJiwgY29uc3QgV2ViQ29yZTo6TGVuZ3Ro Jik7CiAgICAgc3RhdGljIGJvb2wgZGVjb2RlKEFyZ3VtZW50RGVjb2RlciYsIFdlYkNvcmU6Okxl bmd0aCYpOwo=