76283 2012-01-13 10:02:55 -0800 Rename GraphicsContext* argument in various RenderLayer methods 2012-01-13 11:45:38 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser simon.fraser oldest_to_newest 535750 0 simon.fraser 2012-01-13 10:02:55 -0800 Rename GraphicsContext* argument to various RenderLayer methods 535752 1 122446 simon.fraser 2012-01-13 10:04:09 -0800 Created attachment 122446 Patch 535761 2 122446 jamesr 2012-01-13 10:14:53 -0800 Comment on attachment 122446 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=122446&action=review R=me > Source/WebCore/ChangeLog:3 > + Rename GraphicsContext* argument to various RenderLayer methods i think you meant to say "to context in various" > Source/WebCore/rendering/RenderLayer.cpp:2586 > +void RenderLayer::paint(GraphicsContext* context, const LayoutRect& damageRect, PaintBehavior paintBehavior, RenderObject *paintingRoot, mind moving the * next to RenderObject instead of paintingRoot while you're in here? 535862 3 simon.fraser 2012-01-13 11:45:38 -0800 http://trac.webkit.org/changeset/104966 122446 2012-01-13 10:04:09 -0800 2012-01-13 10:14:53 -0800 Patch bug-76283-20120113100407.patch text/plain 19772 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTA0OTM5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGMwOGU3NDBmODQ4OGI2 NmM4NDVkODRjZTM4NzA4ZTg2MmM2MjBkYy4uMjhjNGY0NWQ0YjY2MTk1ZDVkYzFlZjQzN2VlNGY1 OGY4NjU3YzJkZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDEyLTAxLTEzICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFJlbmFtZSBHcmFw aGljc0NvbnRleHQqIGFyZ3VtZW50IHRvIHZhcmlvdXMgUmVuZGVyTGF5ZXIgbWV0aG9kcworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzYyODMKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW5hbWUgdGhlIEdy YXBoaWNzQ29udGV4dCogcGFyYW1ldGVyICJwIiBpbiB2YXJpb3VzIFJlbmRlckxheWVyCisgICAg ICAgIG1ldGhvZHMgdG8gImNvbnRleHQiLiAicCIgd2FzIGEgaGlzdG9yaWNhbCBuYW1lIGZyb20g d2hlbiBpdCB3YXMKKyAgICAgICAgY2FsbGVkIFBhaW50ZXIuCisKKyAgICAgICAgKiByZW5kZXJp bmcvUmVuZGVyTGF5ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6OmJlZ2lu VHJhbnNwYXJlbmN5TGF5ZXJzKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjpwYWlu dCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6cGFpbnRPdmVybGF5U2Nyb2xsYmFy cyk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6cmVzdG9yZUNsaXApOgorICAgICAg ICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6OnBhaW50TGF5ZXIpOgorICAgICAgICAoV2ViQ29yZTo6 UmVuZGVyTGF5ZXI6OnBhaW50TGF5ZXJDb250ZW50c0FuZFJlZmxlY3Rpb24pOgorICAgICAgICAo V2ViQ29yZTo6UmVuZGVyTGF5ZXI6OnBhaW50TGF5ZXJDb250ZW50cyk6CisgICAgICAgIChXZWJD b3JlOjpSZW5kZXJMYXllcjo6cGFpbnRMaXN0KToKKwogMjAxMi0wMS0xMyAgU2hlcmlmZiBCb3Qg IDx3ZWJraXQucmV2aWV3LmJvdEBnbWFpbC5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9s bGluZyBvdXQgcjEwNDkzNS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJMYXllci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3Bw CmluZGV4IDI2Y2IwODBkMzJjZjBlMjcyZGEzZGY5YTBiN2NiZmQ1NTdjZDJjZGMuLjAwNmNiODRh ZmQ0NjcyY2Y2ODVjMWMxNWIxMWRjNTM1YTFiZGZmNTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckxheWVyLmNwcApAQCAtMTA0NSwyNCArMTA0NSwyNCBAQCBzdGF0aWMgTGF5b3V0 UmVjdCB0cmFuc3BhcmVuY3lDbGlwQm94KGNvbnN0IFJlbmRlckxheWVyKiBsYXllciwgY29uc3Qg UmVuZGVyTGF5ZQogICAgIHJldHVybiBjbGlwUmVjdDsKIH0KIAotdm9pZCBSZW5kZXJMYXllcjo6 YmVnaW5UcmFuc3BhcmVuY3lMYXllcnMoR3JhcGhpY3NDb250ZXh0KiBwLCBjb25zdCBSZW5kZXJM YXllciogcm9vdExheWVyLCBQYWludEJlaGF2aW9yIHBhaW50QmVoYXZpb3IpCit2b2lkIFJlbmRl ckxheWVyOjpiZWdpblRyYW5zcGFyZW5jeUxheWVycyhHcmFwaGljc0NvbnRleHQqIGNvbnRleHQs IGNvbnN0IFJlbmRlckxheWVyKiByb290TGF5ZXIsIFBhaW50QmVoYXZpb3IgcGFpbnRCZWhhdmlv cikKIHsKLSAgICBpZiAocC0+cGFpbnRpbmdEaXNhYmxlZCgpIHx8IChwYWludHNXaXRoVHJhbnNw YXJlbmN5KHBhaW50QmVoYXZpb3IpICYmIG1fdXNlZFRyYW5zcGFyZW5jeSkpCisgICAgaWYgKGNv bnRleHQtPnBhaW50aW5nRGlzYWJsZWQoKSB8fCAocGFpbnRzV2l0aFRyYW5zcGFyZW5jeShwYWlu dEJlaGF2aW9yKSAmJiBtX3VzZWRUcmFuc3BhcmVuY3kpKQogICAgICAgICByZXR1cm47CiAgICAg CiAgICAgUmVuZGVyTGF5ZXIqIGFuY2VzdG9yID0gdHJhbnNwYXJlbnRQYWludGluZ0FuY2VzdG9y KCk7CiAgICAgaWYgKGFuY2VzdG9yKQotICAgICAgICBhbmNlc3Rvci0+YmVnaW5UcmFuc3BhcmVu Y3lMYXllcnMocCwgcm9vdExheWVyLCBwYWludEJlaGF2aW9yKTsKKyAgICAgICAgYW5jZXN0b3It PmJlZ2luVHJhbnNwYXJlbmN5TGF5ZXJzKGNvbnRleHQsIHJvb3RMYXllciwgcGFpbnRCZWhhdmlv cik7CiAgICAgCiAgICAgaWYgKHBhaW50c1dpdGhUcmFuc3BhcmVuY3kocGFpbnRCZWhhdmlvcikp IHsKICAgICAgICAgbV91c2VkVHJhbnNwYXJlbmN5ID0gdHJ1ZTsKLSAgICAgICAgcC0+c2F2ZSgp OworICAgICAgICBjb250ZXh0LT5zYXZlKCk7CiAgICAgICAgIExheW91dFJlY3QgY2xpcFJlY3Qg PSB0cmFuc3BhcmVuY3lDbGlwQm94KHRoaXMsIHJvb3RMYXllciwgcGFpbnRCZWhhdmlvcik7Ci0g ICAgICAgIHAtPmNsaXAoY2xpcFJlY3QpOwotICAgICAgICBwLT5iZWdpblRyYW5zcGFyZW5jeUxh eWVyKHJlbmRlcmVyKCktPm9wYWNpdHkoKSk7CisgICAgICAgIGNvbnRleHQtPmNsaXAoY2xpcFJl Y3QpOworICAgICAgICBjb250ZXh0LT5iZWdpblRyYW5zcGFyZW5jeUxheWVyKHJlbmRlcmVyKCkt Pm9wYWNpdHkoKSk7CiAjaWZkZWYgUkVWRUFMX1RSQU5TUEFSRU5DWV9MQVlFUlMKLSAgICAgICAg cC0+c2V0RmlsbENvbG9yKENvbG9yKDAuMGYsIDAuMGYsIDAuNWYsIDAuMmYpLCBDb2xvclNwYWNl RGV2aWNlUkdCKTsKLSAgICAgICAgcC0+ZmlsbFJlY3QoY2xpcFJlY3QpOworICAgICAgICBjb250 ZXh0LT5zZXRGaWxsQ29sb3IoQ29sb3IoMCwgMCwgMC41ZiwgMC4yZiksIENvbG9yU3BhY2VEZXZp Y2VSR0IpOworICAgICAgICBjb250ZXh0LT5maWxsUmVjdChjbGlwUmVjdCk7CiAjZW5kaWYKICAg ICB9CiB9CkBAIC0yNTgzLDIxICsyNTgzLDIxIEBAIGJvb2wgUmVuZGVyTGF5ZXI6OnNjcm9sbChT Y3JvbGxEaXJlY3Rpb24gZGlyZWN0aW9uLCBTY3JvbGxHcmFudWxhcml0eSBncmFudWxhcml0CiAg ICAgcmV0dXJuIFNjcm9sbGFibGVBcmVhOjpzY3JvbGwoZGlyZWN0aW9uLCBncmFudWxhcml0eSwg bXVsdGlwbGllcik7CiB9CiAKLXZvaWQgUmVuZGVyTGF5ZXI6OnBhaW50KEdyYXBoaWNzQ29udGV4 dCogcCwgY29uc3QgTGF5b3V0UmVjdCYgZGFtYWdlUmVjdCwgUGFpbnRCZWhhdmlvciBwYWludEJl aGF2aW9yLCBSZW5kZXJPYmplY3QgKnBhaW50aW5nUm9vdCwKK3ZvaWQgUmVuZGVyTGF5ZXI6OnBh aW50KEdyYXBoaWNzQ29udGV4dCogY29udGV4dCwgY29uc3QgTGF5b3V0UmVjdCYgZGFtYWdlUmVj dCwgUGFpbnRCZWhhdmlvciBwYWludEJlaGF2aW9yLCBSZW5kZXJPYmplY3QgKnBhaW50aW5nUm9v dCwKICAgICBSZW5kZXJSZWdpb24qIHJlZ2lvbiwgUGFpbnRMYXllckZsYWdzIHBhaW50RmxhZ3Mp CiB7CiAgICAgT3ZlcmxhcFRlc3RSZXF1ZXN0TWFwIG92ZXJsYXBUZXN0UmVxdWVzdHM7Ci0gICAg cGFpbnRMYXllcih0aGlzLCBwLCBkYW1hZ2VSZWN0LCBwYWludEJlaGF2aW9yLCBwYWludGluZ1Jv b3QsIHJlZ2lvbiwgJm92ZXJsYXBUZXN0UmVxdWVzdHMsIHBhaW50RmxhZ3MpOworICAgIHBhaW50 TGF5ZXIodGhpcywgY29udGV4dCwgZGFtYWdlUmVjdCwgcGFpbnRCZWhhdmlvciwgcGFpbnRpbmdS b290LCByZWdpb24sICZvdmVybGFwVGVzdFJlcXVlc3RzLCBwYWludEZsYWdzKTsKICAgICBPdmVy bGFwVGVzdFJlcXVlc3RNYXA6Oml0ZXJhdG9yIGVuZCA9IG92ZXJsYXBUZXN0UmVxdWVzdHMuZW5k KCk7CiAgICAgZm9yIChPdmVybGFwVGVzdFJlcXVlc3RNYXA6Oml0ZXJhdG9yIGl0ID0gb3Zlcmxh cFRlc3RSZXF1ZXN0cy5iZWdpbigpOyBpdCAhPSBlbmQ7ICsraXQpCiAgICAgICAgIGl0LT5maXJz dC0+c2V0T3ZlcmxhcFRlc3RSZXN1bHQoZmFsc2UpOwogfQogCi12b2lkIFJlbmRlckxheWVyOjpw YWludE92ZXJsYXlTY3JvbGxiYXJzKEdyYXBoaWNzQ29udGV4dCogcCwgY29uc3QgTGF5b3V0UmVj dCYgZGFtYWdlUmVjdCwgUGFpbnRCZWhhdmlvciBwYWludEJlaGF2aW9yLCBSZW5kZXJPYmplY3Qg KnBhaW50aW5nUm9vdCkKK3ZvaWQgUmVuZGVyTGF5ZXI6OnBhaW50T3ZlcmxheVNjcm9sbGJhcnMo R3JhcGhpY3NDb250ZXh0KiBjb250ZXh0LCBjb25zdCBMYXlvdXRSZWN0JiBkYW1hZ2VSZWN0LCBQ YWludEJlaGF2aW9yIHBhaW50QmVoYXZpb3IsIFJlbmRlck9iamVjdCAqcGFpbnRpbmdSb290KQog ewogICAgIGlmICghbV9jb250YWluc0RpcnR5T3ZlcmxheVNjcm9sbGJhcnMpCiAgICAgICAgIHJl dHVybjsKLSAgICBwYWludExheWVyKHRoaXMsIHAsIGRhbWFnZVJlY3QsIHBhaW50QmVoYXZpb3Is IHBhaW50aW5nUm9vdCwgMCwgMCwgUGFpbnRMYXllckhhdmVUcmFuc3BhcmVuY3kgfCBQYWludExh eWVyVGVtcG9yYXJ5Q2xpcFJlY3RzIAorICAgIHBhaW50TGF5ZXIodGhpcywgY29udGV4dCwgZGFt YWdlUmVjdCwgcGFpbnRCZWhhdmlvciwgcGFpbnRpbmdSb290LCAwLCAwLCBQYWludExheWVySGF2 ZVRyYW5zcGFyZW5jeSB8IFBhaW50TGF5ZXJUZW1wb3JhcnlDbGlwUmVjdHMgCiAgICAgICAgICAg ICAgICB8IFBhaW50TGF5ZXJQYWludGluZ092ZXJsYXlTY3JvbGxiYXJzKTsKICAgICBtX2NvbnRh aW5zRGlydHlPdmVybGF5U2Nyb2xsYmFycyA9IGZhbHNlOwogfQpAQCAtMjY0NiwxMSArMjY0Niwx MSBAQCB2b2lkIFJlbmRlckxheWVyOjpjbGlwVG9SZWN0KFJlbmRlckxheWVyKiByb290TGF5ZXIs IEdyYXBoaWNzQ29udGV4dCogY29udGV4dCwgYwogI2VuZGlmCiB9CiAKLXZvaWQgUmVuZGVyTGF5 ZXI6OnJlc3RvcmVDbGlwKEdyYXBoaWNzQ29udGV4dCogcCwgY29uc3QgTGF5b3V0UmVjdCYgcGFp bnREaXJ0eVJlY3QsIGNvbnN0IENsaXBSZWN0JiBjbGlwUmVjdCkKK3ZvaWQgUmVuZGVyTGF5ZXI6 OnJlc3RvcmVDbGlwKEdyYXBoaWNzQ29udGV4dCogY29udGV4dCwgY29uc3QgTGF5b3V0UmVjdCYg cGFpbnREaXJ0eVJlY3QsIGNvbnN0IENsaXBSZWN0JiBjbGlwUmVjdCkKIHsKICAgICBpZiAoY2xp cFJlY3QucmVjdCgpID09IHBhaW50RGlydHlSZWN0KQogICAgICAgICByZXR1cm47Ci0gICAgcC0+ cmVzdG9yZSgpOworICAgIGNvbnRleHQtPnJlc3RvcmUoKTsKIH0KIAogc3RhdGljIHZvaWQgcGVy Zm9ybU92ZXJsYXBUZXN0cyhPdmVybGFwVGVzdFJlcXVlc3RNYXAmIG92ZXJsYXBUZXN0UmVxdWVz dHMsIGNvbnN0IFJlbmRlckxheWVyKiByb290TGF5ZXIsIGNvbnN0IFJlbmRlckxheWVyKiBsYXll cikKQEAgLTI2OTMsNyArMjY5Myw3IEBAIHN0YXRpYyBpbmxpbmUgYm9vbCBzaG91bGRTdXBwcmVz c1BhaW50aW5nTGF5ZXIoUmVuZGVyTGF5ZXIqIGxheWVyKQogfQogCiAKLXZvaWQgUmVuZGVyTGF5 ZXI6OnBhaW50TGF5ZXIoUmVuZGVyTGF5ZXIqIHJvb3RMYXllciwgR3JhcGhpY3NDb250ZXh0KiBw LAordm9pZCBSZW5kZXJMYXllcjo6cGFpbnRMYXllcihSZW5kZXJMYXllciogcm9vdExheWVyLCBH cmFwaGljc0NvbnRleHQqIGNvbnRleHQsCiAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBM YXlvdXRSZWN0JiBwYWludERpcnR5UmVjdCwgUGFpbnRCZWhhdmlvciBwYWludEJlaGF2aW9yLAog ICAgICAgICAgICAgICAgICAgICAgICAgUmVuZGVyT2JqZWN0KiBwYWludGluZ1Jvb3QsIFJlbmRl clJlZ2lvbiogcmVnaW9uLCBPdmVybGFwVGVzdFJlcXVlc3RNYXAqIG92ZXJsYXBUZXN0UmVxdWVz dHMsCiAgICAgICAgICAgICAgICAgICAgICAgICBQYWludExheWVyRmxhZ3MgcGFpbnRGbGFncykK QEAgLTI3MDIsNyArMjcwMiw3IEBAIHZvaWQgUmVuZGVyTGF5ZXI6OnBhaW50TGF5ZXIoUmVuZGVy TGF5ZXIqIHJvb3RMYXllciwgR3JhcGhpY3NDb250ZXh0KiBwLAogICAgIGlmIChpc0NvbXBvc2l0 ZWQoKSkgewogICAgICAgICAvLyBUaGUgdXBkYXRpbmdDb250cm9sVGludHMoKSBwYWludGluZyBw YXNzIGdvZXMgdGhyb3VnaCBjb21wb3NpdGluZyBsYXllcnMsCiAgICAgICAgIC8vIGJ1dCB3ZSBu ZWVkIHRvIGVuc3VyZSB0aGF0IHdlIGRvbid0IGNhY2hlIGNsaXAgcmVjdHMgY29tcHV0ZWQgd2l0 aCB0aGUgd3Jvbmcgcm9vdCBpbiB0aGlzIGNhc2UuCi0gICAgICAgIGlmIChwLT51cGRhdGluZ0Nv bnRyb2xUaW50cygpIHx8IChwYWludEJlaGF2aW9yICYgUGFpbnRCZWhhdmlvckZsYXR0ZW5Db21w b3NpdGluZ0xheWVycykpCisgICAgICAgIGlmIChjb250ZXh0LT51cGRhdGluZ0NvbnRyb2xUaW50 cygpIHx8IChwYWludEJlaGF2aW9yICYgUGFpbnRCZWhhdmlvckZsYXR0ZW5Db21wb3NpdGluZ0xh eWVycykpCiAgICAgICAgICAgICBwYWludEZsYWdzIHw9IFBhaW50TGF5ZXJUZW1wb3JhcnlDbGlw UmVjdHM7CiAgICAgICAgIGVsc2UgaWYgKCFiYWNraW5nKCktPnBhaW50aW5nR29lc1RvV2luZG93 KCkgJiYgIXNob3VsZERvU29mdHdhcmVQYWludCh0aGlzLCBwYWludEZsYWdzICYgUGFpbnRMYXll clBhaW50aW5nUmVmbGVjdGlvbikpIHsKICAgICAgICAgICAgIC8vIElmIHRoaXMgUmVuZGVyTGF5 ZXIgc2hvdWxkIHBhaW50IGludG8gaXRzIGJhY2tpbmcsIHRoYXQgd2lsbCBiZSBkb25lIHZpYSBS ZW5kZXJMYXllckJhY2tpbmc6OnBhaW50SW50b0xheWVyKCkuCkBAIC0yNzMyLDkgKzI3MzIsOSBA QCB2b2lkIFJlbmRlckxheWVyOjpwYWludExheWVyKFJlbmRlckxheWVyKiByb290TGF5ZXIsIEdy YXBoaWNzQ29udGV4dCogcCwKICAgICAgICAgLy8gbGF5ZXIgZnJvbSB0aGUgcGFyZW50IG5vdywg YXNzdW1pbmcgdGhlcmUgaXMgYSBwYXJlbnQKICAgICAgICAgaWYgKHBhaW50RmxhZ3MgJiBQYWlu dExheWVySGF2ZVRyYW5zcGFyZW5jeSkgewogICAgICAgICAgICAgaWYgKHBhcmVudCgpKQotICAg ICAgICAgICAgICAgIHBhcmVudCgpLT5iZWdpblRyYW5zcGFyZW5jeUxheWVycyhwLCByb290TGF5 ZXIsIHBhaW50QmVoYXZpb3IpOworICAgICAgICAgICAgICAgIHBhcmVudCgpLT5iZWdpblRyYW5z cGFyZW5jeUxheWVycyhjb250ZXh0LCByb290TGF5ZXIsIHBhaW50QmVoYXZpb3IpOwogICAgICAg ICAgICAgZWxzZQotICAgICAgICAgICAgICAgIGJlZ2luVHJhbnNwYXJlbmN5TGF5ZXJzKHAsIHJv b3RMYXllciwgcGFpbnRCZWhhdmlvcik7CisgICAgICAgICAgICAgICAgYmVnaW5UcmFuc3BhcmVu Y3lMYXllcnMoY29udGV4dCwgcm9vdExheWVyLCBwYWludEJlaGF2aW9yKTsKICAgICAgICAgfQog CiAgICAgICAgIC8vIE1ha2Ugc3VyZSB0aGUgcGFyZW50J3MgY2xpcCByZWN0cyBoYXZlIGJlZW4g Y2FsY3VsYXRlZC4KQEAgLTI3NDQsNyArMjc0NCw3IEBAIHZvaWQgUmVuZGVyTGF5ZXI6OnBhaW50 TGF5ZXIoUmVuZGVyTGF5ZXIqIHJvb3RMYXllciwgR3JhcGhpY3NDb250ZXh0KiBwLAogICAgICAg ICAgICAgY2xpcFJlY3QuaW50ZXJzZWN0KHBhaW50RGlydHlSZWN0KTsKICAgICAgICAgCiAgICAg ICAgICAgICAvLyBQdXNoIHRoZSBwYXJlbnQgY29vcmRpbmF0ZSBzcGFjZSdzIGNsaXAuCi0gICAg ICAgICAgICBwYXJlbnQoKS0+Y2xpcFRvUmVjdChyb290TGF5ZXIsIHAsIHBhaW50RGlydHlSZWN0 LCBjbGlwUmVjdCk7CisgICAgICAgICAgICBwYXJlbnQoKS0+Y2xpcFRvUmVjdChyb290TGF5ZXIs IGNvbnRleHQsIHBhaW50RGlydHlSZWN0LCBjbGlwUmVjdCk7CiAgICAgICAgIH0KIAogICAgICAg ICAvLyBBZGp1c3QgdGhlIHRyYW5zZm9ybSBzdWNoIHRoYXQgdGhlIHJlbmRlcmVyJ3MgdXBwZXIg bGVmdCBjb3JuZXIgd2lsbCBwYWludCBhdCAoMCwwKSBpbiB1c2VyIHNwYWNlLgpAQCAtMjc1Niwy NCArMjc1NiwyNCBAQCB2b2lkIFJlbmRlckxheWVyOjpwYWludExheWVyKFJlbmRlckxheWVyKiBy b290TGF5ZXIsIEdyYXBoaWNzQ29udGV4dCogcCwKICAgICAgICAgCiAgICAgICAgIC8vIEFwcGx5 IHRoZSB0cmFuc2Zvcm0uCiAgICAgICAgIHsKLSAgICAgICAgICAgIEdyYXBoaWNzQ29udGV4dFN0 YXRlU2F2ZXIgc3RhdGVTYXZlcigqcCk7Ci0gICAgICAgICAgICBwLT5jb25jYXRDVE0odHJhbnNm b3JtLnRvQWZmaW5lVHJhbnNmb3JtKCkpOworICAgICAgICAgICAgR3JhcGhpY3NDb250ZXh0U3Rh dGVTYXZlciBzdGF0ZVNhdmVyKCpjb250ZXh0KTsKKyAgICAgICAgICAgIGNvbnRleHQtPmNvbmNh dENUTSh0cmFuc2Zvcm0udG9BZmZpbmVUcmFuc2Zvcm0oKSk7CiAKICAgICAgICAgICAgIC8vIE5v dyBkbyBhIHBhaW50IHdpdGggdGhlIHJvb3QgbGF5ZXIgc2hpZnRlZCB0byBiZSB1cy4KLSAgICAg ICAgICAgIHBhaW50TGF5ZXJDb250ZW50c0FuZFJlZmxlY3Rpb24odGhpcywgcCwgdHJhbnNmb3Jt LmludmVyc2UoKS5tYXBSZWN0KHBhaW50RGlydHlSZWN0KSwgcGFpbnRCZWhhdmlvciwgcGFpbnRp bmdSb290LCByZWdpb24sIG92ZXJsYXBUZXN0UmVxdWVzdHMsIHBhaW50RmxhZ3MpOworICAgICAg ICAgICAgcGFpbnRMYXllckNvbnRlbnRzQW5kUmVmbGVjdGlvbih0aGlzLCBjb250ZXh0LCB0cmFu c2Zvcm0uaW52ZXJzZSgpLm1hcFJlY3QocGFpbnREaXJ0eVJlY3QpLCBwYWludEJlaGF2aW9yLCBw YWludGluZ1Jvb3QsIHJlZ2lvbiwgb3ZlcmxhcFRlc3RSZXF1ZXN0cywgcGFpbnRGbGFncyk7CiAg ICAgICAgIH0gICAgICAgIAogCiAgICAgICAgIC8vIFJlc3RvcmUgdGhlIGNsaXAuCiAgICAgICAg IGlmIChwYXJlbnQoKSkKLSAgICAgICAgICAgIHBhcmVudCgpLT5yZXN0b3JlQ2xpcChwLCBwYWlu dERpcnR5UmVjdCwgY2xpcFJlY3QpOworICAgICAgICAgICAgcGFyZW50KCktPnJlc3RvcmVDbGlw KGNvbnRleHQsIHBhaW50RGlydHlSZWN0LCBjbGlwUmVjdCk7CiAKICAgICAgICAgcmV0dXJuOwog ICAgIH0KICAgICAKLSAgICBwYWludExheWVyQ29udGVudHNBbmRSZWZsZWN0aW9uKHJvb3RMYXll ciwgcCwgcGFpbnREaXJ0eVJlY3QsIHBhaW50QmVoYXZpb3IsIHBhaW50aW5nUm9vdCwgcmVnaW9u LCBvdmVybGFwVGVzdFJlcXVlc3RzLCBwYWludEZsYWdzKTsKKyAgICBwYWludExheWVyQ29udGVu dHNBbmRSZWZsZWN0aW9uKHJvb3RMYXllciwgY29udGV4dCwgcGFpbnREaXJ0eVJlY3QsIHBhaW50 QmVoYXZpb3IsIHBhaW50aW5nUm9vdCwgcmVnaW9uLCBvdmVybGFwVGVzdFJlcXVlc3RzLCBwYWlu dEZsYWdzKTsKIH0KIAotdm9pZCBSZW5kZXJMYXllcjo6cGFpbnRMYXllckNvbnRlbnRzQW5kUmVm bGVjdGlvbihSZW5kZXJMYXllciogcm9vdExheWVyLCBHcmFwaGljc0NvbnRleHQqIHAsCit2b2lk IFJlbmRlckxheWVyOjpwYWludExheWVyQ29udGVudHNBbmRSZWZsZWN0aW9uKFJlbmRlckxheWVy KiByb290TGF5ZXIsIEdyYXBoaWNzQ29udGV4dCogY29udGV4dCwKICAgICAgICAgICAgICAgICAg ICAgICAgIGNvbnN0IExheW91dFJlY3QmIHBhaW50RGlydHlSZWN0LCBQYWludEJlaGF2aW9yIHBh aW50QmVoYXZpb3IsCiAgICAgICAgICAgICAgICAgICAgICAgICBSZW5kZXJPYmplY3QqIHBhaW50 aW5nUm9vdCwgUmVuZGVyUmVnaW9uKiByZWdpb24sIE92ZXJsYXBUZXN0UmVxdWVzdE1hcCogb3Zl cmxhcFRlc3RSZXF1ZXN0cywKICAgICAgICAgICAgICAgICAgICAgICAgIFBhaW50TGF5ZXJGbGFn cyBwYWludEZsYWdzKQpAQCAtMjc4NCwxNSArMjc4NCwxNSBAQCB2b2lkIFJlbmRlckxheWVyOjpw YWludExheWVyQ29udGVudHNBbmRSZWZsZWN0aW9uKFJlbmRlckxheWVyKiByb290TGF5ZXIsIEdy YXBoaQogICAgIGlmIChtX3JlZmxlY3Rpb24gJiYgIW1fcGFpbnRpbmdJbnNpZGVSZWZsZWN0aW9u KSB7CiAgICAgICAgIC8vIE1hcmsgdGhhdCB3ZSBhcmUgbm93IGluc2lkZSByZXBsaWNhIHBhaW50 aW5nLgogICAgICAgICBtX3BhaW50aW5nSW5zaWRlUmVmbGVjdGlvbiA9IHRydWU7Ci0gICAgICAg IHJlZmxlY3Rpb25MYXllcigpLT5wYWludExheWVyKHJvb3RMYXllciwgcCwgcGFpbnREaXJ0eVJl Y3QsIHBhaW50QmVoYXZpb3IsIHBhaW50aW5nUm9vdCwgcmVnaW9uLCBvdmVybGFwVGVzdFJlcXVl c3RzLCBsb2NhbFBhaW50RmxhZ3MgfCBQYWludExheWVyUGFpbnRpbmdSZWZsZWN0aW9uKTsKKyAg ICAgICAgcmVmbGVjdGlvbkxheWVyKCktPnBhaW50TGF5ZXIocm9vdExheWVyLCBjb250ZXh0LCBw YWludERpcnR5UmVjdCwgcGFpbnRCZWhhdmlvciwgcGFpbnRpbmdSb290LCByZWdpb24sIG92ZXJs YXBUZXN0UmVxdWVzdHMsIGxvY2FsUGFpbnRGbGFncyB8IFBhaW50TGF5ZXJQYWludGluZ1JlZmxl Y3Rpb24pOwogICAgICAgICBtX3BhaW50aW5nSW5zaWRlUmVmbGVjdGlvbiA9IGZhbHNlOwogICAg IH0KIAogICAgIGxvY2FsUGFpbnRGbGFncyB8PSBQYWludExheWVyUGFpbnRpbmdDb21wb3NpdGlu Z0FsbFBoYXNlczsKLSAgICBwYWludExheWVyQ29udGVudHMocm9vdExheWVyLCBwLCBwYWludERp cnR5UmVjdCwgcGFpbnRCZWhhdmlvciwgcGFpbnRpbmdSb290LCByZWdpb24sIG92ZXJsYXBUZXN0 UmVxdWVzdHMsIGxvY2FsUGFpbnRGbGFncyk7CisgICAgcGFpbnRMYXllckNvbnRlbnRzKHJvb3RM YXllciwgY29udGV4dCwgcGFpbnREaXJ0eVJlY3QsIHBhaW50QmVoYXZpb3IsIHBhaW50aW5nUm9v dCwgcmVnaW9uLCBvdmVybGFwVGVzdFJlcXVlc3RzLCBsb2NhbFBhaW50RmxhZ3MpOwogfQogCi12 b2lkIFJlbmRlckxheWVyOjpwYWludExheWVyQ29udGVudHMoUmVuZGVyTGF5ZXIqIHJvb3RMYXll ciwgR3JhcGhpY3NDb250ZXh0KiBwLCAKK3ZvaWQgUmVuZGVyTGF5ZXI6OnBhaW50TGF5ZXJDb250 ZW50cyhSZW5kZXJMYXllciogcm9vdExheWVyLCBHcmFwaGljc0NvbnRleHQqIGNvbnRleHQsIAog ICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgTGF5b3V0UmVjdCYgcGFpbnREaXJ0eVJlY3Qs IFBhaW50QmVoYXZpb3IgcGFpbnRCZWhhdmlvciwKICAgICAgICAgICAgICAgICAgICAgICAgIFJl bmRlck9iamVjdCogcGFpbnRpbmdSb290LCBSZW5kZXJSZWdpb24qIHJlZ2lvbiwgT3ZlcmxhcFRl c3RSZXF1ZXN0TWFwKiBvdmVybGFwVGVzdFJlcXVlc3RzLAogICAgICAgICAgICAgICAgICAgICAg ICAgUGFpbnRMYXllckZsYWdzIHBhaW50RmxhZ3MpCkBAIC0yODQyLDI3ICsyODQyLDI3IEBAIHZv aWQgUmVuZGVyTGF5ZXI6OnBhaW50TGF5ZXJDb250ZW50cyhSZW5kZXJMYXllciogcm9vdExheWVy LCBHcmFwaGljc0NvbnRleHQqIHAsCiAgICAgICAgIGlmIChzaG91bGRQYWludENvbnRlbnQgJiYg IXNlbGVjdGlvbk9ubHkpIHsKICAgICAgICAgICAgIC8vIEJlZ2luIHRyYW5zcGFyZW5jeSBsYXll cnMgbGF6aWx5IG5vdyB0aGF0IHdlIGtub3cgd2UgaGF2ZSB0byBwYWludCBzb21ldGhpbmcuCiAg ICAgICAgICAgICBpZiAoaGF2ZVRyYW5zcGFyZW5jeSkKLSAgICAgICAgICAgICAgICBiZWdpblRy YW5zcGFyZW5jeUxheWVycyhwLCByb290TGF5ZXIsIHBhaW50QmVoYXZpb3IpOworICAgICAgICAg ICAgICAgIGJlZ2luVHJhbnNwYXJlbmN5TGF5ZXJzKGNvbnRleHQsIHJvb3RMYXllciwgcGFpbnRC ZWhhdmlvcik7CiAgICAgICAgIAogI2lmIEVOQUJMRShDU1NfRklMVEVSUykKICAgICAgICAgICAg IGlmIChmaWx0ZXJQYWludGVyLmhhdmVGaWx0ZXJFZmZlY3QoKSkKLSAgICAgICAgICAgICAgICBw ID0gZmlsdGVyUGFpbnRlci5iZWdpbkZpbHRlckVmZmVjdCh0aGlzLCBwLCB0cmFuc3BhcmVuY3lD bGlwQm94KHRoaXMsIHJvb3RMYXllciwgcGFpbnRCZWhhdmlvcikpOworICAgICAgICAgICAgICAg IGNvbnRleHQgPSBmaWx0ZXJQYWludGVyLmJlZ2luRmlsdGVyRWZmZWN0KHRoaXMsIGNvbnRleHQs IHRyYW5zcGFyZW5jeUNsaXBCb3godGhpcywgcm9vdExheWVyLCBwYWludEJlaGF2aW9yKSk7CiAj ZW5kaWYKICAgICAgICAgCiAgICAgICAgICAgICAvLyBQYWludCBvdXIgYmFja2dyb3VuZCBmaXJz dCwgYmVmb3JlIHBhaW50aW5nIGFueSBjaGlsZCBsYXllcnMuCiAgICAgICAgICAgICAvLyBFc3Rh Ymxpc2ggdGhlIGNsaXAgdXNlZCB0byBwYWludCBvdXIgYmFja2dyb3VuZC4KLSAgICAgICAgICAg IGNsaXBUb1JlY3Qocm9vdExheWVyLCBwLCBwYWludERpcnR5UmVjdCwgZGFtYWdlUmVjdCwgRG9O b3RJbmNsdWRlU2VsZkZvckJvcmRlclJhZGl1cyk7IC8vIEJhY2tncm91bmQgcGFpbnRpbmcgd2ls bCBoYW5kbGUgY2xpcHBpbmcgdG8gc2VsZi4KKyAgICAgICAgICAgIGNsaXBUb1JlY3Qocm9vdExh eWVyLCBjb250ZXh0LCBwYWludERpcnR5UmVjdCwgZGFtYWdlUmVjdCwgRG9Ob3RJbmNsdWRlU2Vs ZkZvckJvcmRlclJhZGl1cyk7IC8vIEJhY2tncm91bmQgcGFpbnRpbmcgd2lsbCBoYW5kbGUgY2xp cHBpbmcgdG8gc2VsZi4KIAogICAgICAgICAgICAgLy8gUGFpbnQgdGhlIGJhY2tncm91bmQuCi0g ICAgICAgICAgICBQYWludEluZm8gcGFpbnRJbmZvKHAsIGRhbWFnZVJlY3QucmVjdCgpLCBQYWlu dFBoYXNlQmxvY2tCYWNrZ3JvdW5kLCBmYWxzZSwgcGFpbnRpbmdSb290Rm9yUmVuZGVyZXIsIHJl Z2lvbiwgMCk7CisgICAgICAgICAgICBQYWludEluZm8gcGFpbnRJbmZvKGNvbnRleHQsIGRhbWFn ZVJlY3QucmVjdCgpLCBQYWludFBoYXNlQmxvY2tCYWNrZ3JvdW5kLCBmYWxzZSwgcGFpbnRpbmdS b290Rm9yUmVuZGVyZXIsIHJlZ2lvbiwgMCk7CiAgICAgICAgICAgICByZW5kZXJlcigpLT5wYWlu dChwYWludEluZm8sIHBhaW50T2Zmc2V0KTsKIAogICAgICAgICAgICAgLy8gUmVzdG9yZSB0aGUg Y2xpcC4KLSAgICAgICAgICAgIHJlc3RvcmVDbGlwKHAsIHBhaW50RGlydHlSZWN0LCBkYW1hZ2VS ZWN0KTsKKyAgICAgICAgICAgIHJlc3RvcmVDbGlwKGNvbnRleHQsIHBhaW50RGlydHlSZWN0LCBk YW1hZ2VSZWN0KTsKICAgICAgICAgfQogCiAgICAgICAgIC8vIE5vdyB3YWxrIHRoZSBzb3J0ZWQg bGlzdCBvZiBjaGlsZHJlbiB3aXRoIG5lZ2F0aXZlIHotaW5kaWNlcy4KLSAgICAgICAgcGFpbnRM aXN0KG1fbmVnWk9yZGVyTGlzdCwgcm9vdExheWVyLCBwLCBwYWludERpcnR5UmVjdCwgcGFpbnRC ZWhhdmlvciwgcGFpbnRpbmdSb290LCByZWdpb24sIG92ZXJsYXBUZXN0UmVxdWVzdHMsIGxvY2Fs UGFpbnRGbGFncyk7CisgICAgICAgIHBhaW50TGlzdChtX25lZ1pPcmRlckxpc3QsIHJvb3RMYXll ciwgY29udGV4dCwgcGFpbnREaXJ0eVJlY3QsIHBhaW50QmVoYXZpb3IsIHBhaW50aW5nUm9vdCwg cmVnaW9uLCBvdmVybGFwVGVzdFJlcXVlc3RzLCBsb2NhbFBhaW50RmxhZ3MpOwogICAgIH0KICAg ICAKICAgICBpZiAobG9jYWxQYWludEZsYWdzICYgUGFpbnRMYXllclBhaW50aW5nQ29tcG9zaXRp bmdGb3JlZ3JvdW5kUGhhc2UpIHsKQEAgLTI4NzAsMTYgKzI4NzAsMTYgQEAgdm9pZCBSZW5kZXJM YXllcjo6cGFpbnRMYXllckNvbnRlbnRzKFJlbmRlckxheWVyKiByb290TGF5ZXIsIEdyYXBoaWNz Q29udGV4dCogcCwKICAgICAgICAgaWYgKHNob3VsZFBhaW50Q29udGVudCAmJiAhY2xpcFJlY3RU b0FwcGx5LmlzRW1wdHkoKSkgewogICAgICAgICAgICAgLy8gQmVnaW4gdHJhbnNwYXJlbmN5IGxh eWVycyBsYXppbHkgbm93IHRoYXQgd2Uga25vdyB3ZSBoYXZlIHRvIHBhaW50IHNvbWV0aGluZy4K ICAgICAgICAgICAgIGlmIChoYXZlVHJhbnNwYXJlbmN5KQotICAgICAgICAgICAgICAgIGJlZ2lu VHJhbnNwYXJlbmN5TGF5ZXJzKHAsIHJvb3RMYXllciwgcGFpbnRCZWhhdmlvcik7CisgICAgICAg ICAgICAgICAgYmVnaW5UcmFuc3BhcmVuY3lMYXllcnMoY29udGV4dCwgcm9vdExheWVyLCBwYWlu dEJlaGF2aW9yKTsKIAogI2lmIEVOQUJMRShDU1NfRklMVEVSUykKICAgICAgICAgICAgIC8vIElm IHRoZSBmaWx0ZXIgd2FzIG5vdCBzdGFydGVkIHlldCwgc3RhcnQgaXQgbm93LCBhZnRlciB0aGUg dHJhbnNwYXJlbmN5IGxheWVyIHdhcyBsYXppbHkgY3JlYXRlZC4KICAgICAgICAgICAgIGlmIChm aWx0ZXJQYWludGVyLmhhdmVGaWx0ZXJFZmZlY3QoKSAmJiAhZmlsdGVyUGFpbnRlci5oYXNTdGFy dGVkRmlsdGVyRWZmZWN0KCkpCi0gICAgICAgICAgICAgICAgcCA9IGZpbHRlclBhaW50ZXIuYmVn aW5GaWx0ZXJFZmZlY3QodGhpcywgcCwgdHJhbnNwYXJlbmN5Q2xpcEJveCh0aGlzLCByb290TGF5 ZXIsIHBhaW50QmVoYXZpb3IpKTsKKyAgICAgICAgICAgICAgICBjb250ZXh0ID0gZmlsdGVyUGFp bnRlci5iZWdpbkZpbHRlckVmZmVjdCh0aGlzLCBjb250ZXh0LCB0cmFuc3BhcmVuY3lDbGlwQm94 KHRoaXMsIHJvb3RMYXllciwgcGFpbnRCZWhhdmlvcikpOwogI2VuZGlmCiAgICAgICAgICAgICAv LyBTZXQgdXAgdGhlIGNsaXAgdXNlZCB3aGVuIHBhaW50aW5nIG91ciBjaGlsZHJlbi4KLSAgICAg ICAgICAgIGNsaXBUb1JlY3Qocm9vdExheWVyLCBwLCBwYWludERpcnR5UmVjdCwgY2xpcFJlY3RU b0FwcGx5KTsKLSAgICAgICAgICAgIFBhaW50SW5mbyBwYWludEluZm8ocCwgY2xpcFJlY3RUb0Fw cGx5LnJlY3QoKSwgCisgICAgICAgICAgICBjbGlwVG9SZWN0KHJvb3RMYXllciwgY29udGV4dCwg cGFpbnREaXJ0eVJlY3QsIGNsaXBSZWN0VG9BcHBseSk7CisgICAgICAgICAgICBQYWludEluZm8g cGFpbnRJbmZvKGNvbnRleHQsIGNsaXBSZWN0VG9BcHBseS5yZWN0KCksIAogICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBzZWxlY3Rpb25Pbmx5ID8gUGFpbnRQaGFzZVNlbGVjdGlvbiA6 IFBhaW50UGhhc2VDaGlsZEJsb2NrQmFja2dyb3VuZHMsCiAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIGZvcmNlQmxhY2tUZXh0LCBwYWludGluZ1Jvb3RGb3JSZW5kZXJlciwgcmVnaW9u LCAwKTsKICAgICAgICAgICAgIHJlbmRlcmVyKCktPnBhaW50KHBhaW50SW5mbywgcGFpbnRPZmZz ZXQpOwpAQCAtMjg5NCw1NSArMjg5NCw1NSBAQCB2b2lkIFJlbmRlckxheWVyOjpwYWludExheWVy Q29udGVudHMoUmVuZGVyTGF5ZXIqIHJvb3RMYXllciwgR3JhcGhpY3NDb250ZXh0KiBwLAogICAg ICAgICAgICAgfQogCiAgICAgICAgICAgICAvLyBOb3cgcmVzdG9yZSBvdXIgY2xpcC4KLSAgICAg ICAgICAgIHJlc3RvcmVDbGlwKHAsIHBhaW50RGlydHlSZWN0LCBjbGlwUmVjdFRvQXBwbHkpOwor ICAgICAgICAgICAgcmVzdG9yZUNsaXAoY29udGV4dCwgcGFpbnREaXJ0eVJlY3QsIGNsaXBSZWN0 VG9BcHBseSk7CiAgICAgICAgIH0KIAogICAgICAgICBpZiAoc2hvdWxkUGFpbnRPdXRsaW5lICYm ICFvdXRsaW5lUmVjdC5pc0VtcHR5KCkpIHsKICAgICAgICAgICAgIC8vIFBhaW50IG91ciBvd24g b3V0bGluZQotICAgICAgICAgICAgUGFpbnRJbmZvIHBhaW50SW5mbyhwLCBvdXRsaW5lUmVjdC5y ZWN0KCksIFBhaW50UGhhc2VTZWxmT3V0bGluZSwgZmFsc2UsIHBhaW50aW5nUm9vdEZvclJlbmRl cmVyLCByZWdpb24sIDApOwotICAgICAgICAgICAgY2xpcFRvUmVjdChyb290TGF5ZXIsIHAsIHBh aW50RGlydHlSZWN0LCBvdXRsaW5lUmVjdCwgRG9Ob3RJbmNsdWRlU2VsZkZvckJvcmRlclJhZGl1 cyk7CisgICAgICAgICAgICBQYWludEluZm8gcGFpbnRJbmZvKGNvbnRleHQsIG91dGxpbmVSZWN0 LnJlY3QoKSwgUGFpbnRQaGFzZVNlbGZPdXRsaW5lLCBmYWxzZSwgcGFpbnRpbmdSb290Rm9yUmVu ZGVyZXIsIHJlZ2lvbiwgMCk7CisgICAgICAgICAgICBjbGlwVG9SZWN0KHJvb3RMYXllciwgY29u dGV4dCwgcGFpbnREaXJ0eVJlY3QsIG91dGxpbmVSZWN0LCBEb05vdEluY2x1ZGVTZWxmRm9yQm9y ZGVyUmFkaXVzKTsKICAgICAgICAgICAgIHJlbmRlcmVyKCktPnBhaW50KHBhaW50SW5mbywgcGFp bnRPZmZzZXQpOwotICAgICAgICAgICAgcmVzdG9yZUNsaXAocCwgcGFpbnREaXJ0eVJlY3QsIG91 dGxpbmVSZWN0KTsKKyAgICAgICAgICAgIHJlc3RvcmVDbGlwKGNvbnRleHQsIHBhaW50RGlydHlS ZWN0LCBvdXRsaW5lUmVjdCk7CiAgICAgICAgIH0KICAgICAKICAgICAgICAgLy8gUGFpbnQgYW55 IGNoaWxkIGxheWVycyB0aGF0IGhhdmUgb3ZlcmZsb3cuCi0gICAgICAgIHBhaW50TGlzdChtX25v cm1hbEZsb3dMaXN0LCByb290TGF5ZXIsIHAsIHBhaW50RGlydHlSZWN0LCBwYWludEJlaGF2aW9y LCBwYWludGluZ1Jvb3QsIHJlZ2lvbiwgb3ZlcmxhcFRlc3RSZXF1ZXN0cywgbG9jYWxQYWludEZs YWdzKTsKKyAgICAgICAgcGFpbnRMaXN0KG1fbm9ybWFsRmxvd0xpc3QsIHJvb3RMYXllciwgY29u dGV4dCwgcGFpbnREaXJ0eVJlY3QsIHBhaW50QmVoYXZpb3IsIHBhaW50aW5nUm9vdCwgcmVnaW9u LCBvdmVybGFwVGVzdFJlcXVlc3RzLCBsb2NhbFBhaW50RmxhZ3MpOwogICAgIAogICAgICAgICAv LyBOb3cgd2FsayB0aGUgc29ydGVkIGxpc3Qgb2YgY2hpbGRyZW4gd2l0aCBwb3NpdGl2ZSB6LWlu ZGljZXMuCi0gICAgICAgIHBhaW50TGlzdChtX3Bvc1pPcmRlckxpc3QsIHJvb3RMYXllciwgcCwg cGFpbnREaXJ0eVJlY3QsIHBhaW50QmVoYXZpb3IsIHBhaW50aW5nUm9vdCwgcmVnaW9uLCBvdmVy bGFwVGVzdFJlcXVlc3RzLCBsb2NhbFBhaW50RmxhZ3MpOworICAgICAgICBwYWludExpc3QobV9w b3NaT3JkZXJMaXN0LCByb290TGF5ZXIsIGNvbnRleHQsIHBhaW50RGlydHlSZWN0LCBwYWludEJl aGF2aW9yLCBwYWludGluZ1Jvb3QsIHJlZ2lvbiwgb3ZlcmxhcFRlc3RSZXF1ZXN0cywgbG9jYWxQ YWludEZsYWdzKTsKICAgICB9CiAgICAgCiAgICAgaWYgKChsb2NhbFBhaW50RmxhZ3MgJiBQYWlu dExheWVyUGFpbnRpbmdDb21wb3NpdGluZ01hc2tQaGFzZSkgJiYgc2hvdWxkUGFpbnRDb250ZW50 ICYmIHJlbmRlcmVyKCktPmhhc01hc2soKSAmJiAhc2VsZWN0aW9uT25seSkgewotICAgICAgICBj bGlwVG9SZWN0KHJvb3RMYXllciwgcCwgcGFpbnREaXJ0eVJlY3QsIGRhbWFnZVJlY3QsIERvTm90 SW5jbHVkZVNlbGZGb3JCb3JkZXJSYWRpdXMpOyAvLyBNYXNrIHBhaW50aW5nIHdpbGwgaGFuZGxl IGNsaXBwaW5nIHRvIHNlbGYuCisgICAgICAgIGNsaXBUb1JlY3Qocm9vdExheWVyLCBjb250ZXh0 LCBwYWludERpcnR5UmVjdCwgZGFtYWdlUmVjdCwgRG9Ob3RJbmNsdWRlU2VsZkZvckJvcmRlclJh ZGl1cyk7IC8vIE1hc2sgcGFpbnRpbmcgd2lsbCBoYW5kbGUgY2xpcHBpbmcgdG8gc2VsZi4KIAog ICAgICAgICAvLyBQYWludCB0aGUgbWFzay4KLSAgICAgICAgUGFpbnRJbmZvIHBhaW50SW5mbyhw LCBkYW1hZ2VSZWN0LnJlY3QoKSwgUGFpbnRQaGFzZU1hc2ssIGZhbHNlLCBwYWludGluZ1Jvb3RG b3JSZW5kZXJlciwgcmVnaW9uLCAwKTsKKyAgICAgICAgUGFpbnRJbmZvIHBhaW50SW5mbyhjb250 ZXh0LCBkYW1hZ2VSZWN0LnJlY3QoKSwgUGFpbnRQaGFzZU1hc2ssIGZhbHNlLCBwYWludGluZ1Jv b3RGb3JSZW5kZXJlciwgcmVnaW9uLCAwKTsKICAgICAgICAgcmVuZGVyZXIoKS0+cGFpbnQocGFp bnRJbmZvLCBwYWludE9mZnNldCk7CiAgICAgICAgIAogICAgICAgICAvLyBSZXN0b3JlIHRoZSBj bGlwLgotICAgICAgICByZXN0b3JlQ2xpcChwLCBwYWludERpcnR5UmVjdCwgZGFtYWdlUmVjdCk7 CisgICAgICAgIHJlc3RvcmVDbGlwKGNvbnRleHQsIHBhaW50RGlydHlSZWN0LCBkYW1hZ2VSZWN0 KTsKICAgICB9CiAKICAgICBpZiAoaXNQYWludGluZ092ZXJsYXlTY3JvbGxiYXJzKSB7Ci0gICAg ICAgIGNsaXBUb1JlY3Qocm9vdExheWVyLCBwLCBwYWludERpcnR5UmVjdCwgZGFtYWdlUmVjdCk7 Ci0gICAgICAgIHBhaW50T3ZlcmZsb3dDb250cm9scyhwLCBwYWludE9mZnNldCwgZGFtYWdlUmVj dC5yZWN0KCksIHRydWUpOwotICAgICAgICByZXN0b3JlQ2xpcChwLCBwYWludERpcnR5UmVjdCwg ZGFtYWdlUmVjdCk7CisgICAgICAgIGNsaXBUb1JlY3Qocm9vdExheWVyLCBjb250ZXh0LCBwYWlu dERpcnR5UmVjdCwgZGFtYWdlUmVjdCk7CisgICAgICAgIHBhaW50T3ZlcmZsb3dDb250cm9scyhj b250ZXh0LCBwYWludE9mZnNldCwgZGFtYWdlUmVjdC5yZWN0KCksIHRydWUpOworICAgICAgICBy ZXN0b3JlQ2xpcChjb250ZXh0LCBwYWludERpcnR5UmVjdCwgZGFtYWdlUmVjdCk7CiAgICAgfQog CiAjaWYgRU5BQkxFKENTU19GSUxURVJTKQogICAgIGlmIChmaWx0ZXJQYWludGVyLmhhc1N0YXJ0 ZWRGaWx0ZXJFZmZlY3QoKSkKLSAgICAgICAgcCA9IGZpbHRlclBhaW50ZXIuYXBwbHlGaWx0ZXJF ZmZlY3QoKTsKKyAgICAgICAgY29udGV4dCA9IGZpbHRlclBhaW50ZXIuYXBwbHlGaWx0ZXJFZmZl Y3QoKTsKICNlbmRpZgogCiAgICAgLy8gRW5kIG91ciB0cmFuc3BhcmVuY3kgbGF5ZXIKICAgICBp ZiAoaGF2ZVRyYW5zcGFyZW5jeSAmJiBtX3VzZWRUcmFuc3BhcmVuY3kgJiYgIW1fcGFpbnRpbmdJ bnNpZGVSZWZsZWN0aW9uKSB7Ci0gICAgICAgIHAtPmVuZFRyYW5zcGFyZW5jeUxheWVyKCk7Ci0g ICAgICAgIHAtPnJlc3RvcmUoKTsKKyAgICAgICAgY29udGV4dC0+ZW5kVHJhbnNwYXJlbmN5TGF5 ZXIoKTsKKyAgICAgICAgY29udGV4dC0+cmVzdG9yZSgpOwogICAgICAgICBtX3VzZWRUcmFuc3Bh cmVuY3kgPSBmYWxzZTsKICAgICB9CiB9CiAKLXZvaWQgUmVuZGVyTGF5ZXI6OnBhaW50TGlzdChW ZWN0b3I8UmVuZGVyTGF5ZXIqPiogbGlzdCwgUmVuZGVyTGF5ZXIqIHJvb3RMYXllciwgR3JhcGhp Y3NDb250ZXh0KiBwLAordm9pZCBSZW5kZXJMYXllcjo6cGFpbnRMaXN0KFZlY3RvcjxSZW5kZXJM YXllcio+KiBsaXN0LCBSZW5kZXJMYXllciogcm9vdExheWVyLCBHcmFwaGljc0NvbnRleHQqIGNv bnRleHQsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgTGF5b3V0UmVjdCYgcGFp bnREaXJ0eVJlY3QsIFBhaW50QmVoYXZpb3IgcGFpbnRCZWhhdmlvciwKICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBSZW5kZXJPYmplY3QqIHBhaW50aW5nUm9vdCwgUmVuZGVyUmVnaW9uKiBy ZWdpb24sIE92ZXJsYXBUZXN0UmVxdWVzdE1hcCogb3ZlcmxhcFRlc3RSZXF1ZXN0cywKICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBQYWludExheWVyRmxhZ3MgcGFpbnRGbGFncykKQEAgLTI5 NTMsOSArMjk1Myw5IEBAIHZvaWQgUmVuZGVyTGF5ZXI6OnBhaW50TGlzdChWZWN0b3I8UmVuZGVy TGF5ZXIqPiogbGlzdCwgUmVuZGVyTGF5ZXIqIHJvb3RMYXllciwKICAgICBmb3IgKHNpemVfdCBp ID0gMDsgaSA8IGxpc3QtPnNpemUoKTsgKytpKSB7CiAgICAgICAgIFJlbmRlckxheWVyKiBjaGls ZExheWVyID0gbGlzdC0+YXQoaSk7CiAgICAgICAgIGlmICghY2hpbGRMYXllci0+aXNQYWdpbmF0 ZWQoKSkKLSAgICAgICAgICAgIGNoaWxkTGF5ZXItPnBhaW50TGF5ZXIocm9vdExheWVyLCBwLCBw YWludERpcnR5UmVjdCwgcGFpbnRCZWhhdmlvciwgcGFpbnRpbmdSb290LCByZWdpb24sIG92ZXJs YXBUZXN0UmVxdWVzdHMsIHBhaW50RmxhZ3MpOworICAgICAgICAgICAgY2hpbGRMYXllci0+cGFp bnRMYXllcihyb290TGF5ZXIsIGNvbnRleHQsIHBhaW50RGlydHlSZWN0LCBwYWludEJlaGF2aW9y LCBwYWludGluZ1Jvb3QsIHJlZ2lvbiwgb3ZlcmxhcFRlc3RSZXF1ZXN0cywgcGFpbnRGbGFncyk7 CiAgICAgICAgIGVsc2UKLSAgICAgICAgICAgIHBhaW50UGFnaW5hdGVkQ2hpbGRMYXllcihjaGls ZExheWVyLCByb290TGF5ZXIsIHAsIHBhaW50RGlydHlSZWN0LCBwYWludEJlaGF2aW9yLCBwYWlu dGluZ1Jvb3QsIHJlZ2lvbiwgb3ZlcmxhcFRlc3RSZXF1ZXN0cywgcGFpbnRGbGFncyk7CisgICAg ICAgICAgICBwYWludFBhZ2luYXRlZENoaWxkTGF5ZXIoY2hpbGRMYXllciwgcm9vdExheWVyLCBj b250ZXh0LCBwYWludERpcnR5UmVjdCwgcGFpbnRCZWhhdmlvciwgcGFpbnRpbmdSb290LCByZWdp b24sIG92ZXJsYXBUZXN0UmVxdWVzdHMsIHBhaW50RmxhZ3MpOwogICAgIH0KIH0KIAo=