137668 2014-10-13 13:33:29 -0700 Drop unnecessary overlapMap null checks in computeCompositingRequirements() 2014-10-13 14:33:28 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 cdumez cdumez commit-queue esprehn+autocc glenn kling kondapallykalyan simon.fraser oldest_to_newest 1041337 0 cdumez 2014-10-13 13:33:29 -0700 Drop unnecessary overlapMap null checks in computeCompositingRequirements(). The overlapMap argument can never be null so we should make it a reference and get rid of all the null checks. 1041339 1 239741 cdumez 2014-10-13 13:44:19 -0700 Created attachment 239741 Patch 1041364 2 239741 commit-queue 2014-10-13 14:33:24 -0700 Comment on attachment 239741 Patch Clearing flags on attachment: 239741 Committed r174658: <http://trac.webkit.org/changeset/174658> 1041365 3 commit-queue 2014-10-13 14:33:28 -0700 All reviewed patches have been landed. Closing bug. 239741 2014-10-13 13:44:19 -0700 2014-10-13 14:33:24 -0700 Patch bug-137668-20141013134424.patch text/plain 12928 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMTc0NjUyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjBiNDM3ZmYzN2Q1ODM1 ODQ3OWIyNjAwOWYwMmFiMzNkMjJlMjQ5Yi4uYmFlYjJjNGQzMzU5ZWRhMDdkODc4OTM1Nzk2NTM0 MGM3YjQ5NjFkZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE0LTEwLTEzICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgRHJvcCB1bm5lY2Vzc2FyeSBv dmVybGFwTWFwIG51bGwgY2hlY2tzIGluIGNvbXB1dGVDb21wb3NpdGluZ1JlcXVpcmVtZW50cygp CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzc2NjgK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBEcm9wIHVu bmVjZXNzYXJ5IG92ZXJsYXBNYXAgbnVsbCBjaGVja3MgaW4gY29tcHV0ZUNvbXBvc2l0aW5nUmVx dWlyZW1lbnRzKCkuCisgICAgICAgIFRoZSBmdW5jdGlvbiBpcyBuZXZlciBjYWxsZWQgd2l0aCBh IG51bGwgb3ZlcmxhcE1hcCBzbyB3ZSBjYW4gbWFrZSB0aGUKKyAgICAgICAgYXJndW1lbnQgYSBy ZWZlcmVuY2UgYW5kIGRyb3AgYWxsIHRoZSBudWxsIGNoZWNrcy4KKworICAgICAgICBObyBuZXcg dGVzdHMsIG5vIGJlaGF2aW9yIGNoYW5nZS4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJM YXllckNvbXBvc2l0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJDb21wb3Np dG9yOjp1cGRhdGVDb21wb3NpdGluZ0xheWVycyk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJM YXllckNvbXBvc2l0b3I6OmNvbXB1dGVDb21wb3NpdGluZ1JlcXVpcmVtZW50c0Zvck5hbWVkRmxv d0ZpeGVkKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQ29tcG9zaXRvcjo6Y29tcHV0 ZUNvbXBvc2l0aW5nUmVxdWlyZW1lbnRzKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVy Q29tcG9zaXRvcjo6Y29tcHV0ZVJlZ2lvbkNvbXBvc2l0aW5nUmVxdWlyZW1lbnRzKToKKyAgICAg ICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmg6CisKIDIwMTQtMTAtMDggIEpl ciBOb2JsZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CiAKICAgICAgICAgTWVkaWFQbGF5ZXI6OmNo YXJhY3RlcmlzdGljQ2hhbmdlZCgpIGlzIG5vdCBjYWxsZWQgd2hlbiBuZXcgdHJhY2tzIGFyZSBm b3VuZCBpbiBTb3VyY2VCdWZmZXJQcml2YXRlQVZGT2JqQwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcAppbmRleCBmYTkwMjc2NmVjOTdj M2I1MTgyMjI0ZGE5ZDNjYjU2ZTBmZTUyMzgxLi5kNjJkMGU0Y2U2MDQxNWZiYjBkZmIwODQzYzQ5 NmNkNjVmYjQ1M2YyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy TGF5ZXJDb21wb3NpdG9yLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy TGF5ZXJDb21wb3NpdG9yLmNwcApAQCAtNzI2LDcgKzcyNiw3IEBAIHZvaWQgUmVuZGVyTGF5ZXJD b21wb3NpdG9yOjp1cGRhdGVDb21wb3NpdGluZ0xheWVycyhDb21wb3NpdGluZ1VwZGF0ZVR5cGUg dXBkYXRlCiAgICAgICAgIGJvb2wgbGF5ZXJzQ2hhbmdlZCA9IGZhbHNlOwogICAgICAgICBib29s IHNhdzNEVHJhbnNmb3JtID0gZmFsc2U7CiAgICAgICAgIE92ZXJsYXBNYXAgb3ZlcmxhcFRlc3RS ZXF1ZXN0TWFwOwotICAgICAgICBjb21wdXRlQ29tcG9zaXRpbmdSZXF1aXJlbWVudHMobnVsbHB0 ciwgKnVwZGF0ZVJvb3QsICZvdmVybGFwVGVzdFJlcXVlc3RNYXAsIGNvbXBTdGF0ZSwgbGF5ZXJz Q2hhbmdlZCwgc2F3M0RUcmFuc2Zvcm0pOworICAgICAgICBjb21wdXRlQ29tcG9zaXRpbmdSZXF1 aXJlbWVudHMobnVsbHB0ciwgKnVwZGF0ZVJvb3QsIG92ZXJsYXBUZXN0UmVxdWVzdE1hcCwgY29t cFN0YXRlLCBsYXllcnNDaGFuZ2VkLCBzYXczRFRyYW5zZm9ybSk7CiAgICAgICAgIG5lZWRIaWVy YXJjaHlVcGRhdGUgfD0gbGF5ZXJzQ2hhbmdlZDsKICAgICB9CiAKQEAgLTExNDUsNyArMTE0NSw3 IEBAIHZvaWQgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjphZGRUb092ZXJsYXBNYXBSZWN1cnNpdmUo T3ZlcmxhcE1hcCYgb3ZlcmxhcE1hcCwgUmVuCiAgICAgICAgIG92ZXJsYXBNYXAuZ2VvbWV0cnlN YXAoKS5wb3BNYXBwaW5nc1RvQW5jZXN0b3IoYW5jZXN0b3JMYXllcik7CiB9CiAKLXZvaWQgUmVu ZGVyTGF5ZXJDb21wb3NpdG9yOjpjb21wdXRlQ29tcG9zaXRpbmdSZXF1aXJlbWVudHNGb3JOYW1l ZEZsb3dGaXhlZChSZW5kZXJMYXllciYgbGF5ZXIsIE92ZXJsYXBNYXAqIG92ZXJsYXBNYXAsIENv bXBvc2l0aW5nU3RhdGUmIGNoaWxkU3RhdGUsIGJvb2wmIGxheWVyc0NoYW5nZWQsIGJvb2wmIGFu eURlc2NlbmRhbnRIYXMzRFRyYW5zZm9ybSkKK3ZvaWQgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpj b21wdXRlQ29tcG9zaXRpbmdSZXF1aXJlbWVudHNGb3JOYW1lZEZsb3dGaXhlZChSZW5kZXJMYXll ciYgbGF5ZXIsIE92ZXJsYXBNYXAmIG92ZXJsYXBNYXAsIENvbXBvc2l0aW5nU3RhdGUmIGNoaWxk U3RhdGUsIGJvb2wmIGxheWVyc0NoYW5nZWQsIGJvb2wmIGFueURlc2NlbmRhbnRIYXMzRFRyYW5z Zm9ybSkKIHsKICAgICBpZiAoIWxheWVyLmlzUm9vdExheWVyKCkpCiAgICAgICAgIHJldHVybjsK QEAgLTExNzEsNyArMTE3MSw3IEBAIHZvaWQgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpjb21wdXRl Q29tcG9zaXRpbmdSZXF1aXJlbWVudHNGb3JOYW1lZEZsb3dGaXhlZChSZW5kCiAvLyAgICAgIG11 c3QgYmUgY29tcG9zaXRpbmcgc28gdGhhdCBpdHMgY29udGVudHMgcmVuZGVyIG92ZXIgdGhhdCBj aGlsZC4KIC8vICAgICAgVGhpcyBpbXBsaWVzIHRoYXQgaXRzIHBvc2l0aXZlIHotaW5kZXggY2hp bGRyZW4gbXVzdCBhbHNvIGJlIGNvbXBvc2l0aW5nLgogLy8KLXZvaWQgUmVuZGVyTGF5ZXJDb21w b3NpdG9yOjpjb21wdXRlQ29tcG9zaXRpbmdSZXF1aXJlbWVudHMoUmVuZGVyTGF5ZXIqIGFuY2Vz dG9yTGF5ZXIsIFJlbmRlckxheWVyJiBsYXllciwgT3ZlcmxhcE1hcCogb3ZlcmxhcE1hcCwgQ29t cG9zaXRpbmdTdGF0ZSYgY29tcG9zaXRpbmdTdGF0ZSwgYm9vbCYgbGF5ZXJzQ2hhbmdlZCwgYm9v bCYgZGVzY2VuZGFudEhhczNEVHJhbnNmb3JtKQordm9pZCBSZW5kZXJMYXllckNvbXBvc2l0b3I6 OmNvbXB1dGVDb21wb3NpdGluZ1JlcXVpcmVtZW50cyhSZW5kZXJMYXllciogYW5jZXN0b3JMYXll ciwgUmVuZGVyTGF5ZXImIGxheWVyLCBPdmVybGFwTWFwJiBvdmVybGFwTWFwLCBDb21wb3NpdGlu Z1N0YXRlJiBjb21wb3NpdGluZ1N0YXRlLCBib29sJiBsYXllcnNDaGFuZ2VkLCBib29sJiBkZXNj ZW5kYW50SGFzM0RUcmFuc2Zvcm0pCiB7CiAgICAgbGF5ZXIudXBkYXRlRGVzY2VuZGFudERlcGVu ZGVudEZsYWdzKCk7CiAgICAgbGF5ZXIudXBkYXRlTGF5ZXJMaXN0c0lmTmVlZGVkKCk7CkBAIC0x MTg4LDggKzExODgsNyBAQCB2b2lkIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6Y29tcHV0ZUNvbXBv c2l0aW5nUmVxdWlyZW1lbnRzKFJlbmRlckxheWVyKiBhbmNlc3RvcgogICAgICAgICByZXR1cm47 CiAgICAgfQogCi0gICAgaWYgKG92ZXJsYXBNYXApCi0gICAgICAgIG92ZXJsYXBNYXAtPmdlb21l dHJ5TWFwKCkucHVzaE1hcHBpbmdzVG9BbmNlc3RvcigmbGF5ZXIsIGFuY2VzdG9yTGF5ZXIpOwor ICAgIG92ZXJsYXBNYXAuZ2VvbWV0cnlNYXAoKS5wdXNoTWFwcGluZ3NUb0FuY2VzdG9yKCZsYXll ciwgYW5jZXN0b3JMYXllcik7CiAgICAgCiAgICAgLy8gQ2xlYXIgdGhlIGZsYWcKICAgICBsYXll ci5zZXRIYXNDb21wb3NpdGluZ0Rlc2NlbmRhbnQoZmFsc2UpOwpAQCAtMTIwNSwxNSArMTIwNCwx NSBAQCB2b2lkIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6Y29tcHV0ZUNvbXBvc2l0aW5nUmVxdWly ZW1lbnRzKFJlbmRlckxheWVyKiBhbmNlc3RvcgogICAgIEludFJlY3QgYWJzQm91bmRzOwogCiAg ICAgLy8gSWYgd2Uga25vdyBmb3Igc3VyZSB0aGUgbGF5ZXIgaXMgZ29pbmcgdG8gYmUgY29tcG9z aXRlZCwgZG9uJ3QgYm90aGVyIGxvb2tpbmcgaXQgdXAgaW4gdGhlIG92ZXJsYXAgbWFwCi0gICAg aWYgKCF3aWxsQmVDb21wb3NpdGVkICYmIG92ZXJsYXBNYXAgJiYgIW92ZXJsYXBNYXAtPmlzRW1w dHkoKSAmJiBjb21wb3NpdGluZ1N0YXRlLm1fdGVzdGluZ092ZXJsYXApIHsKKyAgICBpZiAoIXdp bGxCZUNvbXBvc2l0ZWQgJiYgIW92ZXJsYXBNYXAuaXNFbXB0eSgpICYmIGNvbXBvc2l0aW5nU3Rh dGUubV90ZXN0aW5nT3ZlcmxhcCkgewogICAgICAgICAvLyBJZiB3ZSdyZSB0ZXN0aW5nIGZvciBv dmVybGFwLCB3ZSBvbmx5IG5lZWQgdG8gY29tcG9zaXRlIGlmIHdlIG92ZXJsYXAgc29tZXRoaW5n IHRoYXQgaXMgYWxyZWFkeSBjb21wb3NpdGVkLgotICAgICAgICBhYnNCb3VuZHMgPSBlbmNsb3Np bmdJbnRSZWN0KG92ZXJsYXBNYXAtPmdlb21ldHJ5TWFwKCkuYWJzb2x1dGVSZWN0KGxheWVyLm92 ZXJsYXBCb3VuZHMoKSkpOworICAgICAgICBhYnNCb3VuZHMgPSBlbmNsb3NpbmdJbnRSZWN0KG92 ZXJsYXBNYXAuZ2VvbWV0cnlNYXAoKS5hYnNvbHV0ZVJlY3QobGF5ZXIub3ZlcmxhcEJvdW5kcygp KSk7CiAKICAgICAgICAgLy8gRW1wdHkgcmVjdHMgbmV2ZXIgaW50ZXJzZWN0LCBidXQgd2UgbmVl ZCB0aGVtIHRvIGZvciB0aGUgcHVycG9zZXMgb2Ygb3ZlcmxhcCB0ZXN0aW5nLgogICAgICAgICBp ZiAoYWJzQm91bmRzLmlzRW1wdHkoKSkKICAgICAgICAgICAgIGFic0JvdW5kcy5zZXRTaXplKElu dFNpemUoMSwgMSkpOwogICAgICAgICBoYXZlQ29tcHV0ZWRCb3VuZHMgPSB0cnVlOwotICAgICAg ICBjb21wb3NpdGluZ1JlYXNvbiA9IG92ZXJsYXBNYXAtPm92ZXJsYXBzTGF5ZXJzKGFic0JvdW5k cykgPyBSZW5kZXJMYXllcjo6SW5kaXJlY3RDb21wb3NpdGluZ1JlYXNvbjo6T3ZlcmxhcCA6IFJl bmRlckxheWVyOjpJbmRpcmVjdENvbXBvc2l0aW5nUmVhc29uOjpOb25lOworICAgICAgICBjb21w b3NpdGluZ1JlYXNvbiA9IG92ZXJsYXBNYXAub3ZlcmxhcHNMYXllcnMoYWJzQm91bmRzKSA/IFJl bmRlckxheWVyOjpJbmRpcmVjdENvbXBvc2l0aW5nUmVhc29uOjpPdmVybGFwIDogUmVuZGVyTGF5 ZXI6OkluZGlyZWN0Q29tcG9zaXRpbmdSZWFzb246Ok5vbmU7CiAgICAgfQogCiAjaWYgRU5BQkxF KFZJREVPKQpAQCAtMTI0Nyw4ICsxMjQ2LDcgQEAgdm9pZCBSZW5kZXJMYXllckNvbXBvc2l0b3I6 OmNvbXB1dGVDb21wb3NpdGluZ1JlcXVpcmVtZW50cyhSZW5kZXJMYXllciogYW5jZXN0b3IKICAg ICAgICAgLy8gVGhpcyBsYXllciBub3cgYWN0cyBhcyB0aGUgYW5jZXN0b3IgZm9yIGtpZHMuCiAg ICAgICAgIGNoaWxkU3RhdGUubV9jb21wb3NpdGluZ0FuY2VzdG9yID0gJmxheWVyOwogCi0gICAg ICAgIGlmIChvdmVybGFwTWFwKQotICAgICAgICAgICAgb3ZlcmxhcE1hcC0+cHVzaENvbXBvc2l0 aW5nQ29udGFpbmVyKCk7CisgICAgICAgIG92ZXJsYXBNYXAucHVzaENvbXBvc2l0aW5nQ29udGFp bmVyKCk7CiAgICAgICAgIC8vIFRoaXMgbGF5ZXIgaXMgZ29pbmcgdG8gYmUgY29tcG9zaXRlZCwg c28gY2hpbGRyZW4gY2FuIHNhZmVseSBpZ25vcmUgdGhlIGZhY3QgdGhhdCB0aGVyZSdzIGFuIAog ICAgICAgICAvLyBhbmltYXRpb24gcnVubmluZyBiZWhpbmQgdGhpcyBsYXllciwgbWVhbmluZyB0 aGV5IGNhbiByZWx5IG9uIHRoZSBvdmVybGFwIG1hcCB0ZXN0aW5nIGFnYWluLgogICAgICAgICBj aGlsZFN0YXRlLm1fdGVzdGluZ092ZXJsYXAgPSB0cnVlOwpAQCAtMTI3MSw4ICsxMjY5LDcgQEAg dm9pZCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OmNvbXB1dGVDb21wb3NpdGluZ1JlcXVpcmVtZW50 cyhSZW5kZXJMYXllciogYW5jZXN0b3IKICAgICAgICAgICAgICAgICAgICAgLy8gbWFrZSBsYXll ciBjb21wb3NpdGluZwogICAgICAgICAgICAgICAgICAgICBsYXllci5zZXRJbmRpcmVjdENvbXBv c2l0aW5nUmVhc29uKFJlbmRlckxheWVyOjpJbmRpcmVjdENvbXBvc2l0aW5nUmVhc29uOjpCYWNr Z3JvdW5kTGF5ZXIpOwogICAgICAgICAgICAgICAgICAgICBjaGlsZFN0YXRlLm1fY29tcG9zaXRp bmdBbmNlc3RvciA9ICZsYXllcjsKLSAgICAgICAgICAgICAgICAgICAgaWYgKG92ZXJsYXBNYXAp Ci0gICAgICAgICAgICAgICAgICAgICAgICBvdmVybGFwTWFwLT5wdXNoQ29tcG9zaXRpbmdDb250 YWluZXIoKTsKKyAgICAgICAgICAgICAgICAgICAgb3ZlcmxhcE1hcC5wdXNoQ29tcG9zaXRpbmdD b250YWluZXIoKTsKICAgICAgICAgICAgICAgICAgICAgLy8gVGhpcyBsYXllciBpcyBnb2luZyB0 byBiZSBjb21wb3NpdGVkLCBzbyBjaGlsZHJlbiBjYW4gc2FmZWx5IGlnbm9yZSB0aGUgZmFjdCB0 aGF0IHRoZXJlJ3MgYW4gCiAgICAgICAgICAgICAgICAgICAgIC8vIGFuaW1hdGlvbiBydW5uaW5n IGJlaGluZCB0aGlzIGxheWVyLCBtZWFuaW5nIHRoZXkgY2FuIHJlbHkgb24gdGhlIG92ZXJsYXAg bWFwIHRlc3RpbmcgYWdhaW4KICAgICAgICAgICAgICAgICAgICAgY2hpbGRTdGF0ZS5tX3Rlc3Rp bmdPdmVybGFwID0gdHJ1ZTsKQEAgLTEzMTcsOCArMTMxNCw4IEBAIHZvaWQgUmVuZGVyTGF5ZXJD b21wb3NpdG9yOjpjb21wdXRlQ29tcG9zaXRpbmdSZXF1aXJlbWVudHMoUmVuZGVyTGF5ZXIqIGFu Y2VzdG9yCiAgICAgLy8gQWxsIGxheWVycyAoZXZlbiBvbmVzIHRoYXQgYXJlbid0IGJlaW5nIGNv bXBvc2l0ZWQpIG5lZWQgdG8gZ2V0IGFkZGVkIHRvCiAgICAgLy8gdGhlIG92ZXJsYXAgbWFwLiBM YXllcnMgdGhhdCBkbyBub3QgY29tcG9zaXRlIHdpbGwgZHJhdyBpbnRvIHRoZWlyCiAgICAgLy8g Y29tcG9zaXRpbmcgYW5jZXN0b3IncyBiYWNraW5nLCBhbmQgc28gYXJlIHN0aWxsIGNvbnNpZGVy ZWQgZm9yIG92ZXJsYXAuCi0gICAgaWYgKG92ZXJsYXBNYXAgJiYgY2hpbGRTdGF0ZS5tX2NvbXBv c2l0aW5nQW5jZXN0b3IgJiYgIWNoaWxkU3RhdGUubV9jb21wb3NpdGluZ0FuY2VzdG9yLT5pc1Jv b3RMYXllcigpKQotICAgICAgICBhZGRUb092ZXJsYXBNYXAoKm92ZXJsYXBNYXAsIGxheWVyLCBh YnNCb3VuZHMsIGhhdmVDb21wdXRlZEJvdW5kcyk7CisgICAgaWYgKGNoaWxkU3RhdGUubV9jb21w b3NpdGluZ0FuY2VzdG9yICYmICFjaGlsZFN0YXRlLm1fY29tcG9zaXRpbmdBbmNlc3Rvci0+aXNS b290TGF5ZXIoKSkKKyAgICAgICAgYWRkVG9PdmVybGFwTWFwKG92ZXJsYXBNYXAsIGxheWVyLCBh YnNCb3VuZHMsIGhhdmVDb21wdXRlZEJvdW5kcyk7CiAKICNpZiBFTkFCTEUoQ1NTX0NPTVBPU0lU SU5HKQogICAgIGxheWVyLnNldEhhc05vdElzb2xhdGVkQ29tcG9zaXRlZEJsZW5kaW5nRGVzY2Vu ZGFudHMoY2hpbGRTdGF0ZS5tX2hhc05vdElzb2xhdGVkQ29tcG9zaXRlZEJsZW5kaW5nRGVzY2Vu ZGFudHMpOwpAQCAtMTMzMCwxMCArMTMyNyw4IEBAIHZvaWQgUmVuZGVyTGF5ZXJDb21wb3NpdG9y Ojpjb21wdXRlQ29tcG9zaXRpbmdSZXF1aXJlbWVudHMoUmVuZGVyTGF5ZXIqIGFuY2VzdG9yCiAg ICAgICAgICYmIHJlcXVpcmVzQ29tcG9zaXRpbmdGb3JJbmRpcmVjdFJlYXNvbihsYXllci5yZW5k ZXJlcigpLCBjaGlsZFN0YXRlLm1fc3VidHJlZUlzQ29tcG9zaXRpbmcsIGFueURlc2NlbmRhbnRI YXMzRFRyYW5zZm9ybSwgaW5kaXJlY3RDb21wb3NpdGluZ1JlYXNvbikpIHsKICAgICAgICAgbGF5 ZXIuc2V0SW5kaXJlY3RDb21wb3NpdGluZ1JlYXNvbihpbmRpcmVjdENvbXBvc2l0aW5nUmVhc29u KTsKICAgICAgICAgY2hpbGRTdGF0ZS5tX2NvbXBvc2l0aW5nQW5jZXN0b3IgPSAmbGF5ZXI7Ci0g ICAgICAgIGlmIChvdmVybGFwTWFwKSB7Ci0gICAgICAgICAgICBvdmVybGFwTWFwLT5wdXNoQ29t cG9zaXRpbmdDb250YWluZXIoKTsKLSAgICAgICAgICAgIGFkZFRvT3ZlcmxhcE1hcFJlY3Vyc2l2 ZSgqb3ZlcmxhcE1hcCwgbGF5ZXIpOwotICAgICAgICB9CisgICAgICAgIG92ZXJsYXBNYXAucHVz aENvbXBvc2l0aW5nQ29udGFpbmVyKCk7CisgICAgICAgIGFkZFRvT3ZlcmxhcE1hcFJlY3Vyc2l2 ZShvdmVybGFwTWFwLCBsYXllcik7CiAgICAgICAgIHdpbGxCZUNvbXBvc2l0ZWQgPSB0cnVlOwog ICAgIH0KICAgICAKQEAgLTEzNjMsMTAgKzEzNTgsOCBAQCB2b2lkIFJlbmRlckxheWVyQ29tcG9z aXRvcjo6Y29tcHV0ZUNvbXBvc2l0aW5nUmVxdWlyZW1lbnRzKFJlbmRlckxheWVyKiBhbmNlc3Rv cgogICAgIGlmIChpc0NvbXBvc2l0ZWRDbGlwcGluZ0xheWVyKSB7CiAgICAgICAgIGlmICghd2ls bEJlQ29tcG9zaXRlZCkgewogICAgICAgICAgICAgY2hpbGRTdGF0ZS5tX2NvbXBvc2l0aW5nQW5j ZXN0b3IgPSAmbGF5ZXI7Ci0gICAgICAgICAgICBpZiAob3ZlcmxhcE1hcCkgewotICAgICAgICAg ICAgICAgIG92ZXJsYXBNYXAtPnB1c2hDb21wb3NpdGluZ0NvbnRhaW5lcigpOwotICAgICAgICAg ICAgICAgIGFkZFRvT3ZlcmxhcE1hcFJlY3Vyc2l2ZSgqb3ZlcmxhcE1hcCwgbGF5ZXIpOwotICAg ICAgICAgICAgfQorICAgICAgICAgICAgb3ZlcmxhcE1hcC5wdXNoQ29tcG9zaXRpbmdDb250YWlu ZXIoKTsKKyAgICAgICAgICAgIGFkZFRvT3ZlcmxhcE1hcFJlY3Vyc2l2ZShvdmVybGFwTWFwLCBs YXllcik7CiAgICAgICAgICAgICB3aWxsQmVDb21wb3NpdGVkID0gdHJ1ZTsKICAgICAgICAgIH0K ICAgICB9CkBAIC0xMzc3LDggKzEzNzAsOCBAQCB2b2lkIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6 Y29tcHV0ZUNvbXBvc2l0aW5nUmVxdWlyZW1lbnRzKFJlbmRlckxheWVyKiBhbmNlc3RvcgogICAg ICAgICBjb21wb3NpdGluZ1N0YXRlLm1faGFzTm90SXNvbGF0ZWRDb21wb3NpdGVkQmxlbmRpbmdE ZXNjZW5kYW50cyA9IHRydWU7CiAjZW5kaWYKIAotICAgIGlmIChvdmVybGFwTWFwICYmIGNoaWxk U3RhdGUubV9jb21wb3NpdGluZ0FuY2VzdG9yID09ICZsYXllciAmJiAhbGF5ZXIuaXNSb290TGF5 ZXIoKSkKLSAgICAgICAgb3ZlcmxhcE1hcC0+cG9wQ29tcG9zaXRpbmdDb250YWluZXIoKTsKKyAg ICBpZiAoY2hpbGRTdGF0ZS5tX2NvbXBvc2l0aW5nQW5jZXN0b3IgPT0gJmxheWVyICYmICFsYXll ci5pc1Jvb3RMYXllcigpKQorICAgICAgICBvdmVybGFwTWFwLnBvcENvbXBvc2l0aW5nQ29udGFp bmVyKCk7CiAKICAgICAvLyBJZiB3ZSdyZSBiYWNrIGF0IHRoZSByb290LCBhbmQgbm8gb3RoZXIg bGF5ZXJzIG5lZWQgdG8gYmUgY29tcG9zaXRlZCwgYW5kIHRoZSByb290IGxheWVyIGl0c2VsZiBk b2Vzbid0IG5lZWQKICAgICAvLyB0byBiZSBjb21wb3NpdGVkLCB0aGVuIHdlIGNhbiBkcm9wIG91 dCBvZiBjb21wb3NpdGluZyBtb2RlIGFsdG9nZXRoZXIuIEhvd2V2ZXIsIGRvbid0IGRyb3Agb3V0 IG9mIGNvbXBvc2l0aW5nIG1vZGUKQEAgLTE0MDUsMTkgKzEzOTgsMTcgQEAgdm9pZCBSZW5kZXJM YXllckNvbXBvc2l0b3I6OmNvbXB1dGVDb21wb3NpdGluZ1JlcXVpcmVtZW50cyhSZW5kZXJMYXll ciogYW5jZXN0b3IKIAogICAgIGRlc2NlbmRhbnRIYXMzRFRyYW5zZm9ybSB8PSBhbnlEZXNjZW5k YW50SGFzM0RUcmFuc2Zvcm0gfHwgbGF5ZXIuaGFzM0RUcmFuc2Zvcm0oKTsKIAotICAgIGlmIChv dmVybGFwTWFwKQotICAgICAgICBvdmVybGFwTWFwLT5nZW9tZXRyeU1hcCgpLnBvcE1hcHBpbmdz VG9BbmNlc3RvcihhbmNlc3RvckxheWVyKTsKKyAgICBvdmVybGFwTWFwLmdlb21ldHJ5TWFwKCku cG9wTWFwcGluZ3NUb0FuY2VzdG9yKGFuY2VzdG9yTGF5ZXIpOwogfQogCi12b2lkIFJlbmRlckxh eWVyQ29tcG9zaXRvcjo6Y29tcHV0ZVJlZ2lvbkNvbXBvc2l0aW5nUmVxdWlyZW1lbnRzKFJlbmRl ck5hbWVkRmxvd0ZyYWdtZW50KiByZWdpb24sIE92ZXJsYXBNYXAqIG92ZXJsYXBNYXAsIENvbXBv c2l0aW5nU3RhdGUmIGNoaWxkU3RhdGUsIGJvb2wmIGxheWVyc0NoYW5nZWQsIGJvb2wmIGFueURl c2NlbmRhbnRIYXMzRFRyYW5zZm9ybSkKK3ZvaWQgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpjb21w dXRlUmVnaW9uQ29tcG9zaXRpbmdSZXF1aXJlbWVudHMoUmVuZGVyTmFtZWRGbG93RnJhZ21lbnQq IHJlZ2lvbiwgT3ZlcmxhcE1hcCYgb3ZlcmxhcE1hcCwgQ29tcG9zaXRpbmdTdGF0ZSYgY2hpbGRT dGF0ZSwgYm9vbCYgbGF5ZXJzQ2hhbmdlZCwgYm9vbCYgYW55RGVzY2VuZGFudEhhczNEVHJhbnNm b3JtKQogewogICAgIGlmICghcmVnaW9uLT5pc1ZhbGlkKCkpCiAgICAgICAgIHJldHVybjsKIAog ICAgIFJlbmRlckZsb3dUaHJlYWQqIGZsb3dUaHJlYWQgPSByZWdpb24tPmZsb3dUaHJlYWQoKTsK ICAgICAKLSAgICBpZiAob3ZlcmxhcE1hcCkKLSAgICAgICAgb3ZlcmxhcE1hcC0+Z2VvbWV0cnlN YXAoKS5wdXNoUmVuZGVyRmxvd1RocmVhZChmbG93VGhyZWFkKTsKKyAgICBvdmVybGFwTWFwLmdl b21ldHJ5TWFwKCkucHVzaFJlbmRlckZsb3dUaHJlYWQoZmxvd1RocmVhZCk7CiAKICAgICBpZiAo Y29uc3QgUmVuZGVyTGF5ZXJMaXN0KiBsYXllckxpc3QgPSBmbG93VGhyZWFkLT5nZXRMYXllckxp c3RGb3JSZWdpb24ocmVnaW9uKSkgewogICAgICAgICBmb3IgKHNpemVfdCBpID0gMCwgbGlzdFNp emUgPSBsYXllckxpc3QtPnNpemUoKTsgaSA8IGxpc3RTaXplOyArK2kpIHsKQEAgLTE0MjcsOCAr MTQxOCw3IEBAIHZvaWQgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpjb21wdXRlUmVnaW9uQ29tcG9z aXRpbmdSZXF1aXJlbWVudHMoUmVuZGVyTmFtZWRGbG93CiAgICAgICAgIH0KICAgICB9CiAKLSAg ICBpZiAob3ZlcmxhcE1hcCkKLSAgICAgICAgb3ZlcmxhcE1hcC0+Z2VvbWV0cnlNYXAoKS5wb3BN YXBwaW5nc1RvQW5jZXN0b3IoJnJlZ2lvbi0+bGF5ZXJPd25lcigpKTsKKyAgICBvdmVybGFwTWFw Lmdlb21ldHJ5TWFwKCkucG9wTWFwcGluZ3NUb0FuY2VzdG9yKCZyZWdpb24tPmxheWVyT3duZXIo KSk7CiB9CiAKIHZvaWQgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpzZXRDb21wb3NpdGluZ1BhcmVu dChSZW5kZXJMYXllciYgY2hpbGRMYXllciwgUmVuZGVyTGF5ZXIqIHBhcmVudExheWVyKQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5o IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5oCmluZGV4 IGNmYjIzMDIxZTBhNGYzOWFiMTQwODIyOGQwMGZjYTY4NDQ4YmQ5NTMuLjJkNTE5MDFiYjZkODRj MmM2OTkxOTllZjFiZTFiY2NlMGQ0ZTdmNjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmgKQEAgLTMzOSwxMSArMzM5LDExIEBAIHByaXZh dGU6CiAgICAgdm9pZCB1cGRhdGVDb21wb3NpdGluZ0xheWVyc1RpbWVyRmlyZWQoVGltZXI8UmVu ZGVyTGF5ZXJDb21wb3NpdG9yPiYpOwogCiAgICAgLy8gUmV0dXJucyB0cnVlIGlmIGFueSBsYXll cidzIGNvbXBvc2l0aW5nIGNoYW5nZWQKLSAgICB2b2lkIGNvbXB1dGVDb21wb3NpdGluZ1JlcXVp cmVtZW50cyhSZW5kZXJMYXllciogYW5jZXN0b3JMYXllciwgUmVuZGVyTGF5ZXImLCBPdmVybGFw TWFwKiwgc3RydWN0IENvbXBvc2l0aW5nU3RhdGUmLCBib29sJiBsYXllcnNDaGFuZ2VkLCBib29s JiBkZXNjZW5kYW50SGFzM0RUcmFuc2Zvcm0pOworICAgIHZvaWQgY29tcHV0ZUNvbXBvc2l0aW5n UmVxdWlyZW1lbnRzKFJlbmRlckxheWVyKiBhbmNlc3RvckxheWVyLCBSZW5kZXJMYXllciYsIE92 ZXJsYXBNYXAmLCBzdHJ1Y3QgQ29tcG9zaXRpbmdTdGF0ZSYsIGJvb2wmIGxheWVyc0NoYW5nZWQs IGJvb2wmIGRlc2NlbmRhbnRIYXMzRFRyYW5zZm9ybSk7CiAKLSAgICB2b2lkIGNvbXB1dGVSZWdp b25Db21wb3NpdGluZ1JlcXVpcmVtZW50cyhSZW5kZXJOYW1lZEZsb3dGcmFnbWVudCosIE92ZXJs YXBNYXAqLCBDb21wb3NpdGluZ1N0YXRlJiwgYm9vbCYgbGF5ZXJzQ2hhbmdlZCwgYm9vbCYgYW55 RGVzY2VuZGFudEhhczNEVHJhbnNmb3JtKTsKKyAgICB2b2lkIGNvbXB1dGVSZWdpb25Db21wb3Np dGluZ1JlcXVpcmVtZW50cyhSZW5kZXJOYW1lZEZsb3dGcmFnbWVudCosIE92ZXJsYXBNYXAmLCBD b21wb3NpdGluZ1N0YXRlJiwgYm9vbCYgbGF5ZXJzQ2hhbmdlZCwgYm9vbCYgYW55RGVzY2VuZGFu dEhhczNEVHJhbnNmb3JtKTsKIAotICAgIHZvaWQgY29tcHV0ZUNvbXBvc2l0aW5nUmVxdWlyZW1l bnRzRm9yTmFtZWRGbG93Rml4ZWQoUmVuZGVyTGF5ZXImLCBPdmVybGFwTWFwKiwgQ29tcG9zaXRp bmdTdGF0ZSYsIGJvb2wmIGxheWVyc0NoYW5nZWQsIGJvb2wmIGFueURlc2NlbmRhbnRIYXMzRFRy YW5zZm9ybSk7CisgICAgdm9pZCBjb21wdXRlQ29tcG9zaXRpbmdSZXF1aXJlbWVudHNGb3JOYW1l ZEZsb3dGaXhlZChSZW5kZXJMYXllciYsIE92ZXJsYXBNYXAmLCBDb21wb3NpdGluZ1N0YXRlJiwg Ym9vbCYgbGF5ZXJzQ2hhbmdlZCwgYm9vbCYgYW55RGVzY2VuZGFudEhhczNEVHJhbnNmb3JtKTsK IAogICAgIC8vIFJlY3Vyc2VzIGRvd24gdGhlIHRyZWUsIHBhcmVudGluZyBkZXNjZW5kYW50IGNv bXBvc2l0aW5nIGxheWVycyBhbmQgY29sbGVjdGluZyBhbiBhcnJheSBvZiBjaGlsZCBsYXllcnMg Zm9yIHRoZSBjdXJyZW50IGNvbXBvc2l0aW5nIGxheWVyLgogICAgIHZvaWQgcmVidWlsZENvbXBv c2l0aW5nTGF5ZXJUcmVlKFJlbmRlckxheWVyJiwgVmVjdG9yPEdyYXBoaWNzTGF5ZXIqPiYgY2hp bGRHcmFwaGljc0xheWVyc09mRW5jbG9zaW5nTGF5ZXIsIGludCBkZXB0aCk7Cg==