134714 2014-07-07 19:29:32 -0700 Pass RenderLayer reference instead of pointer to RenderLayer::paintingExtent(). 2014-07-07 20:22:31 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 zalan zalan commit-queue esprehn+autocc glenn kondapallykalyan simon.fraser oldest_to_newest 1021010 0 zalan 2014-07-07 19:29:32 -0700 and use that reference in paintingExtent()'s dependencies. 1021012 1 234537 zalan 2014-07-07 19:36:11 -0700 Created attachment 234537 Patch 1021018 2 234537 commit-queue 2014-07-07 20:22:28 -0700 Comment on attachment 234537 Patch Clearing flags on attachment: 234537 Committed r170873: <http://trac.webkit.org/changeset/170873> 1021019 3 commit-queue 2014-07-07 20:22:31 -0700 All reviewed patches have been landed. Closing bug. 234537 2014-07-07 19:36:11 -0700 2014-07-07 20:22:28 -0700 Patch bug-134714-20140707193553.patch text/plain 13828 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMTcwODQ2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjExMmFmMjU0YjM5ZGVj NjViMThhNTZiNjQwNmU2MTM4YzhiMmI5MS4uMmMzZGFmZTI1ZTFlOGVkOGY5ZTBlMDY1YjNhODU1 MTRmZTQ1Yzk4ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE0LTA3LTA3ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgUGFzcyBSZW5kZXJMYXllciBy ZWZlcmVuY2UgaW5zdGVhZCBvZiBwb2ludGVyIHRvIFJlbmRlckxheWVyOjpwYWludGluZ0V4dGVu dCgpLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM0 NzE0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgU2ltb24gRnJhc2VyLgorCisgICAgICAgIE5vIGNo YW5nZSBpbiBmdW5jdGlvbmFsaXR5LiAKKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXll ci5jcHA6ICogLT4gJgorICAgICAgICAoV2ViQ29yZTo6ZXhwYW5kQ2xpcFJlY3RGb3JSZWdpb25B bmRSZWZsZWN0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OmV4cGFuZENsaXBSZWN0Rm9yRGVzY2Vu ZGFudHNBbmRSZWZsZWN0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OnRyYW5zcGFyZW5jeUNsaXBC b3gpOgorICAgICAgICAoV2ViQ29yZTo6cGFpbnRpbmdFeHRlbnQpOgorICAgICAgICAoV2ViQ29y ZTo6UmVuZGVyTGF5ZXI6OmJlZ2luVHJhbnNwYXJlbmN5TGF5ZXJzKToKKyAgICAgICAgKFdlYkNv cmU6OlJlbmRlckxheWVyOjpwYWludFRyYW5zZm9ybWVkTGF5ZXJJbnRvRnJhZ21lbnRzKToKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjpoaXRUZXN0VHJhbnNmb3JtZWRMYXllckluRnJh Z21lbnRzKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjpwYWludGluZ0V4dGVudCk6 IERlbGV0ZWQuCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyLmg6CisKIDIwMTQtMDct MDcgIElvbiBSb3NjYSAgPHJvc2NhQGFkb2JlLmNvbT4KIAogICAgICAgICBbQ1NTIEJsZW5kaW5n XVRoZSBiYWNrZ3JvdW5kIGltYWdlcyBzZXQgb24gdGhlIHJvb3QgZWxlbWVudCB3aWxsIGJsZW5k IG9uIGFuIGluaXRpYWwgd2hpdGUgYmFja2Ryb3AuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckxheWVyLmNwcAppbmRleCA5YjA4OTdlOGMxMzg3ODQ1YWM1ZTVjNWQwNTYzMjVhMGJkZGJk MWJlLi5iMWZmZjI2MjE1ZGY1YjliOTQyZGEyNDk2Y2FkYTJkNzFiNmRiYWM0IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKQEAgLTE1NDgsMTkgKzE1NDgsMTkgQEAg ZW51bSBUcmFuc3BhcmVuY3lDbGlwQm94TW9kZSB7CiAgICAgUm9vdE9mVHJhbnNwYXJlbmN5Q2xp cEJveAogfTsKIAotc3RhdGljIExheW91dFJlY3QgdHJhbnNwYXJlbmN5Q2xpcEJveChjb25zdCBS ZW5kZXJMYXllciosIGNvbnN0IFJlbmRlckxheWVyKiByb290TGF5ZXIsIFRyYW5zcGFyZW5jeUNs aXBCb3hCZWhhdmlvciwgVHJhbnNwYXJlbmN5Q2xpcEJveE1vZGUsIFBhaW50QmVoYXZpb3IgPSAw KTsKK3N0YXRpYyBMYXlvdXRSZWN0IHRyYW5zcGFyZW5jeUNsaXBCb3goY29uc3QgUmVuZGVyTGF5 ZXImLCBjb25zdCBSZW5kZXJMYXllciogcm9vdExheWVyLCBUcmFuc3BhcmVuY3lDbGlwQm94QmVo YXZpb3IsIFRyYW5zcGFyZW5jeUNsaXBCb3hNb2RlLCBQYWludEJlaGF2aW9yID0gMCk7CiAKLXN0 YXRpYyB2b2lkIGV4cGFuZENsaXBSZWN0Rm9yUmVnaW9uQW5kUmVmbGVjdGlvbihMYXlvdXRSZWN0 JiBjbGlwUmVjdCwgY29uc3QgUmVuZGVyTGF5ZXIqIGxheWVyLCBjb25zdCBSZW5kZXJMYXllciog cm9vdExheWVyLAorc3RhdGljIHZvaWQgZXhwYW5kQ2xpcFJlY3RGb3JSZWdpb25BbmRSZWZsZWN0 aW9uKExheW91dFJlY3QmIGNsaXBSZWN0LCBjb25zdCBSZW5kZXJMYXllciYgbGF5ZXIsIGNvbnN0 IFJlbmRlckxheWVyKiByb290TGF5ZXIsCiAgICAgVHJhbnNwYXJlbmN5Q2xpcEJveEJlaGF2aW9y IHRyYW5zcGFyZW5jeUJlaGF2aW9yLCBQYWludEJlaGF2aW9yIHBhaW50QmVoYXZpb3IpCiB7CiAg ICAgLy8gSWYgdGhpcyBpcyBhIHJlZ2lvbiwgdGhlbiB0aGUgcGFpbnRpbmcgaXMgYWN0dWFsbHkg ZG9uZSBieSBpdHMgZmxvdyB0aHJlYWQncyBsYXllci4KLSAgICBpZiAobGF5ZXItPnJlbmRlcmVy KCkuaXNSZW5kZXJOYW1lZEZsb3dGcmFnbWVudENvbnRhaW5lcigpKSB7Ci0gICAgICAgIFJlbmRl ckJsb2NrRmxvdyogcmVnaW9uQ29udGFpbmVyID0gdG9SZW5kZXJCbG9ja0Zsb3coJmxheWVyLT5y ZW5kZXJlcigpKTsKKyAgICBpZiAobGF5ZXIucmVuZGVyZXIoKS5pc1JlbmRlck5hbWVkRmxvd0Zy YWdtZW50Q29udGFpbmVyKCkpIHsKKyAgICAgICAgUmVuZGVyQmxvY2tGbG93KiByZWdpb25Db250 YWluZXIgPSB0b1JlbmRlckJsb2NrRmxvdygmbGF5ZXIucmVuZGVyZXIoKSk7CiAgICAgICAgIFJl bmRlck5hbWVkRmxvd0ZyYWdtZW50KiByZWdpb24gPSByZWdpb25Db250YWluZXItPnJlbmRlck5h bWVkRmxvd0ZyYWdtZW50KCk7CiAgICAgICAgIFJlbmRlckxheWVyKiBmbG93VGhyZWFkTGF5ZXIg PSByZWdpb24tPmZsb3dUaHJlYWQoKS0+bGF5ZXIoKTsKLSAgICAgICAgaWYgKCFsYXllci0+cmVm bGVjdGlvbigpIHx8IGxheWVyLT5yZWZsZWN0aW9uTGF5ZXIoKSAhPSBmbG93VGhyZWFkTGF5ZXIp IHsKLSAgICAgICAgICAgIExheW91dFJlY3QgZmxvd1RocmVhZENsaXBSZWN0ID0gdHJhbnNwYXJl bmN5Q2xpcEJveChmbG93VGhyZWFkTGF5ZXIsIHJvb3RMYXllciwgdHJhbnNwYXJlbmN5QmVoYXZp b3IsIERlc2NlbmRhbnRzT2ZUcmFuc3BhcmVuY3lDbGlwQm94LCBwYWludEJlaGF2aW9yKTsKLSAg ICAgICAgICAgIExheW91dFNpemUgbW92ZU9mZnNldCA9IChyZWdpb25Db250YWluZXItPmNvbnRl bnRCb3hSZWN0KCkubG9jYXRpb24oKSArIGxheWVyLT5vZmZzZXRGcm9tQW5jZXN0b3IoZmxvd1Ro cmVhZExheWVyKSkgLSByZWdpb24tPmZsb3dUaHJlYWRQb3J0aW9uUmVjdCgpLmxvY2F0aW9uKCk7 CisgICAgICAgIGlmIChmbG93VGhyZWFkTGF5ZXIgJiYgKCFsYXllci5yZWZsZWN0aW9uKCkgfHwg bGF5ZXIucmVmbGVjdGlvbkxheWVyKCkgIT0gZmxvd1RocmVhZExheWVyKSkgeworICAgICAgICAg ICAgTGF5b3V0UmVjdCBmbG93VGhyZWFkQ2xpcFJlY3QgPSB0cmFuc3BhcmVuY3lDbGlwQm94KCpm bG93VGhyZWFkTGF5ZXIsIHJvb3RMYXllciwgdHJhbnNwYXJlbmN5QmVoYXZpb3IsIERlc2NlbmRh bnRzT2ZUcmFuc3BhcmVuY3lDbGlwQm94LCBwYWludEJlaGF2aW9yKTsKKyAgICAgICAgICAgIExh eW91dFNpemUgbW92ZU9mZnNldCA9IChyZWdpb25Db250YWluZXItPmNvbnRlbnRCb3hSZWN0KCku bG9jYXRpb24oKSArIGxheWVyLm9mZnNldEZyb21BbmNlc3RvcihmbG93VGhyZWFkTGF5ZXIpKSAt IHJlZ2lvbi0+Zmxvd1RocmVhZFBvcnRpb25SZWN0KCkubG9jYXRpb24oKTsKICAgICAgICAgICAg IGZsb3dUaHJlYWRDbGlwUmVjdC5tb3ZlKG1vdmVPZmZzZXQpOwogICAgICAgICAgICAgCiAgICAg ICAgICAgICBjbGlwUmVjdC51bml0ZShmbG93VGhyZWFkQ2xpcFJlY3QpOwpAQCAtMTU2OCwxNyAr MTU2OCwxNyBAQCBzdGF0aWMgdm9pZCBleHBhbmRDbGlwUmVjdEZvclJlZ2lvbkFuZFJlZmxlY3Rp b24oTGF5b3V0UmVjdCYgY2xpcFJlY3QsIGNvbnN0IFJlbgogICAgIH0KIH0KIAotc3RhdGljIHZv aWQgZXhwYW5kQ2xpcFJlY3RGb3JEZXNjZW5kYW50c0FuZFJlZmxlY3Rpb24oTGF5b3V0UmVjdCYg Y2xpcFJlY3QsIGNvbnN0IFJlbmRlckxheWVyKiBsYXllciwgY29uc3QgUmVuZGVyTGF5ZXIqIHJv b3RMYXllciwKK3N0YXRpYyB2b2lkIGV4cGFuZENsaXBSZWN0Rm9yRGVzY2VuZGFudHNBbmRSZWZs ZWN0aW9uKExheW91dFJlY3QmIGNsaXBSZWN0LCBjb25zdCBSZW5kZXJMYXllciYgbGF5ZXIsIGNv bnN0IFJlbmRlckxheWVyKiByb290TGF5ZXIsCiAgICAgVHJhbnNwYXJlbmN5Q2xpcEJveEJlaGF2 aW9yIHRyYW5zcGFyZW5jeUJlaGF2aW9yLCBQYWludEJlaGF2aW9yIHBhaW50QmVoYXZpb3IpCiB7 CiAgICAgLy8gSWYgd2UgaGF2ZSBhIG1hc2ssIHRoZW4gdGhlIGNsaXAgaXMgbGltaXRlZCB0byB0 aGUgYm9yZGVyIGJveCBhcmVhIChhbmQgdGhlcmUgaXMKICAgICAvLyBubyBuZWVkIHRvIGV4YW1p bmUgY2hpbGQgbGF5ZXJzKS4KLSAgICBpZiAoIWxheWVyLT5yZW5kZXJlcigpLmhhc01hc2soKSkg eworICAgIGlmICghbGF5ZXIucmVuZGVyZXIoKS5oYXNNYXNrKCkpIHsKICAgICAgICAgLy8gTm90 ZTogd2UgZG9uJ3QgaGF2ZSB0byB3YWxrIHotb3JkZXIgbGlzdHMgc2luY2UgdHJhbnNwYXJlbnQg ZWxlbWVudHMgYWx3YXlzIGVzdGFibGlzaAogICAgICAgICAvLyBhIHN0YWNraW5nIGNvbnRhaW5l ci4gVGhpcyBtZWFucyB3ZSBjYW4ganVzdCB3YWxrIHRoZSBsYXllciB0cmVlIGRpcmVjdGx5Lgot ICAgICAgICBmb3IgKFJlbmRlckxheWVyKiBjdXJyID0gbGF5ZXItPmZpcnN0Q2hpbGQoKTsgY3Vy cjsgY3VyciA9IGN1cnItPm5leHRTaWJsaW5nKCkpIHsKLSAgICAgICAgICAgIGlmICghbGF5ZXIt PnJlZmxlY3Rpb24oKSB8fCBsYXllci0+cmVmbGVjdGlvbkxheWVyKCkgIT0gY3VycikKLSAgICAg ICAgICAgICAgICBjbGlwUmVjdC51bml0ZSh0cmFuc3BhcmVuY3lDbGlwQm94KGN1cnIsIHJvb3RM YXllciwgdHJhbnNwYXJlbmN5QmVoYXZpb3IsIERlc2NlbmRhbnRzT2ZUcmFuc3BhcmVuY3lDbGlw Qm94LCBwYWludEJlaGF2aW9yKSk7CisgICAgICAgIGZvciAoUmVuZGVyTGF5ZXIqIGN1cnIgPSBs YXllci5maXJzdENoaWxkKCk7IGN1cnI7IGN1cnIgPSBjdXJyLT5uZXh0U2libGluZygpKSB7Cisg ICAgICAgICAgICBpZiAoIWxheWVyLnJlZmxlY3Rpb24oKSB8fCBsYXllci5yZWZsZWN0aW9uTGF5 ZXIoKSAhPSBjdXJyKQorICAgICAgICAgICAgICAgIGNsaXBSZWN0LnVuaXRlKHRyYW5zcGFyZW5j eUNsaXBCb3goKmN1cnIsIHJvb3RMYXllciwgdHJhbnNwYXJlbmN5QmVoYXZpb3IsIERlc2NlbmRh bnRzT2ZUcmFuc3BhcmVuY3lDbGlwQm94LCBwYWludEJlaGF2aW9yKSk7CiAgICAgICAgIH0KICAg ICB9CiAKQEAgLTE1ODgsNDAgKzE1ODgsNDAgQEAgc3RhdGljIHZvaWQgZXhwYW5kQ2xpcFJlY3RG b3JEZXNjZW5kYW50c0FuZFJlZmxlY3Rpb24oTGF5b3V0UmVjdCYgY2xpcFJlY3QsIGNvbnMKICAg ICAvLyBjdXJyZW50IHRyYW5zcGFyZW5jeUNsaXBCb3ggdG8gY2F0Y2ggYWxsIGNoaWxkIGxheWVy cy4KICAgICAvLyBGSVhNRTogQWNjZWxlcmF0ZWQgY29tcG9zaXRpbmcgd2lsbCBldmVudHVhbGx5 IHdhbnQgdG8gZG8gc29tZXRoaW5nIHNtYXJ0IGhlcmUgdG8gYXZvaWQgaW5jb3Jwb3JhdGluZyB0 aGlzCiAgICAgLy8gc2l6ZSBpbnRvIHRoZSBwYXJlbnQgbGF5ZXIuCi0gICAgaWYgKGxheWVyLT5y ZW5kZXJlcigpLmhhc1JlZmxlY3Rpb24oKSkgewotICAgICAgICBMYXlvdXRTaXplIGRlbHRhID0g bGF5ZXItPm9mZnNldEZyb21BbmNlc3Rvcihyb290TGF5ZXIpOworICAgIGlmIChsYXllci5yZW5k ZXJlcigpLmhhc1JlZmxlY3Rpb24oKSkgeworICAgICAgICBMYXlvdXRTaXplIGRlbHRhID0gbGF5 ZXIub2Zmc2V0RnJvbUFuY2VzdG9yKHJvb3RMYXllcik7CiAgICAgICAgIGNsaXBSZWN0Lm1vdmUo LWRlbHRhKTsKLSAgICAgICAgY2xpcFJlY3QudW5pdGUobGF5ZXItPnJlbmRlckJveCgpLT5yZWZs ZWN0ZWRSZWN0KGNsaXBSZWN0KSk7CisgICAgICAgIGNsaXBSZWN0LnVuaXRlKGxheWVyLnJlbmRl ckJveCgpLT5yZWZsZWN0ZWRSZWN0KGNsaXBSZWN0KSk7CiAgICAgICAgIGNsaXBSZWN0Lm1vdmUo ZGVsdGEpOwogICAgIH0KIH0KIAotc3RhdGljIExheW91dFJlY3QgdHJhbnNwYXJlbmN5Q2xpcEJv eChjb25zdCBSZW5kZXJMYXllciogbGF5ZXIsIGNvbnN0IFJlbmRlckxheWVyKiByb290TGF5ZXIs IFRyYW5zcGFyZW5jeUNsaXBCb3hCZWhhdmlvciB0cmFuc3BhcmVuY3lCZWhhdmlvciwKK3N0YXRp YyBMYXlvdXRSZWN0IHRyYW5zcGFyZW5jeUNsaXBCb3goY29uc3QgUmVuZGVyTGF5ZXImIGxheWVy LCBjb25zdCBSZW5kZXJMYXllciogcm9vdExheWVyLCBUcmFuc3BhcmVuY3lDbGlwQm94QmVoYXZp b3IgdHJhbnNwYXJlbmN5QmVoYXZpb3IsCiAgICAgVHJhbnNwYXJlbmN5Q2xpcEJveE1vZGUgdHJh bnNwYXJlbmN5TW9kZSwgUGFpbnRCZWhhdmlvciBwYWludEJlaGF2aW9yKQogewogICAgIC8vIEZJ WE1FOiBBbHRob3VnaCB0aGlzIGZ1bmN0aW9uIGNvbXBsZXRlbHkgaWdub3JlcyBDU1MtaW1wb3Nl ZCBjbGlwcGluZywgd2UgZGlkIGFscmVhZHkgaW50ZXJzZWN0IHdpdGggdGhlCiAgICAgLy8gcGFp bnREaXJ0eVJlY3QsIGFuZCB0aGF0IHNob3VsZCBjdXQgZG93biBvbiB0aGUgYW1vdW50IHdlIGhh dmUgdG8gcGFpbnQuICBTdGlsbCBpdAogICAgIC8vIHdvdWxkIGJlIGJldHRlciB0byByZXNwZWN0 IGNsaXBzLgogICAgIAotICAgIGlmIChyb290TGF5ZXIgIT0gbGF5ZXIgJiYgKCh0cmFuc3BhcmVu Y3lCZWhhdmlvciA9PSBQYWludGluZ1RyYW5zcGFyZW5jeUNsaXBCb3ggJiYgbGF5ZXItPnBhaW50 c1dpdGhUcmFuc2Zvcm0ocGFpbnRCZWhhdmlvcikpCi0gICAgICAgIHx8ICh0cmFuc3BhcmVuY3lC ZWhhdmlvciA9PSBIaXRUZXN0aW5nVHJhbnNwYXJlbmN5Q2xpcEJveCAmJiBsYXllci0+aGFzVHJh bnNmb3JtKCkpKSkgeworICAgIGlmIChyb290TGF5ZXIgIT0gJmxheWVyICYmICgodHJhbnNwYXJl bmN5QmVoYXZpb3IgPT0gUGFpbnRpbmdUcmFuc3BhcmVuY3lDbGlwQm94ICYmIGxheWVyLnBhaW50 c1dpdGhUcmFuc2Zvcm0ocGFpbnRCZWhhdmlvcikpCisgICAgICAgIHx8ICh0cmFuc3BhcmVuY3lC ZWhhdmlvciA9PSBIaXRUZXN0aW5nVHJhbnNwYXJlbmN5Q2xpcEJveCAmJiBsYXllci5oYXNUcmFu c2Zvcm0oKSkpKSB7CiAgICAgICAgIC8vIFRoZSBiZXN0IHdlIGNhbiBkbyBoZXJlIGlzIHRvIHVz ZSBlbmNsb3NlZCBib3VuZGluZyBib3hlcyB0byBlc3RhYmxpc2ggYSAiZnV6enkiIGVub3VnaCBj bGlwIHRvIGVuY29tcGFzcwogICAgICAgICAvLyB0aGUgdHJhbnNmb3JtZWQgbGF5ZXIgYW5kIGFs bCBvZiBpdHMgY2hpbGRyZW4uCiAgICAgICAgIFJlbmRlckxheWVyOjpQYWdpbmF0aW9uSW5jbHVz aW9uTW9kZSBtb2RlID0gdHJhbnNwYXJlbmN5QmVoYXZpb3IgPT0gSGl0VGVzdGluZ1RyYW5zcGFy ZW5jeUNsaXBCb3ggPyBSZW5kZXJMYXllcjo6SW5jbHVkZUNvbXBvc2l0ZWRQYWdpbmF0ZWRMYXll cnMgOiBSZW5kZXJMYXllcjo6RXhjbHVkZUNvbXBvc2l0ZWRQYWdpbmF0ZWRMYXllcnM7Ci0gICAg ICAgIGNvbnN0IFJlbmRlckxheWVyKiBwYWdpbmF0aW9uTGF5ZXIgPSB0cmFuc3BhcmVuY3lNb2Rl ID09IERlc2NlbmRhbnRzT2ZUcmFuc3BhcmVuY3lDbGlwQm94ID8gbGF5ZXItPmVuY2xvc2luZ1Bh Z2luYXRpb25MYXllcihtb2RlKSA6IDA7CisgICAgICAgIGNvbnN0IFJlbmRlckxheWVyKiBwYWdp bmF0aW9uTGF5ZXIgPSB0cmFuc3BhcmVuY3lNb2RlID09IERlc2NlbmRhbnRzT2ZUcmFuc3BhcmVu Y3lDbGlwQm94ID8gbGF5ZXIuZW5jbG9zaW5nUGFnaW5hdGlvbkxheWVyKG1vZGUpIDogMDsKICAg ICAgICAgY29uc3QgUmVuZGVyTGF5ZXIqIHJvb3RMYXllckZvclRyYW5zZm9ybSA9IHBhZ2luYXRp b25MYXllciA/IHBhZ2luYXRpb25MYXllciA6IHJvb3RMYXllcjsKLSAgICAgICAgTGF5b3V0U2l6 ZSBkZWx0YSA9IGxheWVyLT5vZmZzZXRGcm9tQW5jZXN0b3Iocm9vdExheWVyRm9yVHJhbnNmb3Jt KTsKKyAgICAgICAgTGF5b3V0U2l6ZSBkZWx0YSA9IGxheWVyLm9mZnNldEZyb21BbmNlc3Rvcihy b290TGF5ZXJGb3JUcmFuc2Zvcm0pOwogCiAgICAgICAgIFRyYW5zZm9ybWF0aW9uTWF0cml4IHRy YW5zZm9ybTsKICAgICAgICAgdHJhbnNmb3JtLnRyYW5zbGF0ZShkZWx0YS53aWR0aCgpLCBkZWx0 YS5oZWlnaHQoKSk7Ci0gICAgICAgIHRyYW5zZm9ybSA9IHRyYW5zZm9ybSAqICpsYXllci0+dHJh bnNmb3JtKCk7CisgICAgICAgIHRyYW5zZm9ybSA9IHRyYW5zZm9ybSAqICpsYXllci50cmFuc2Zv cm0oKTsKIAogICAgICAgICAvLyBXZSBkb24ndCB1c2UgZnJhZ21lbnQgYm94ZXMgd2hlbiBjb2xs ZWN0aW5nIGEgdHJhbnNmb3JtZWQgbGF5ZXIncyBib3VuZGluZyBib3gsIHNpbmNlIGl0IGFsd2F5 cwogICAgICAgICAvLyBwYWludHMgdW5mcmFnbWVudGVkLgotICAgICAgICBMYXlvdXRSZWN0IGNs aXBSZWN0ID0gbGF5ZXItPmJvdW5kaW5nQm94KGxheWVyKTsKLSAgICAgICAgZXhwYW5kQ2xpcFJl Y3RGb3JEZXNjZW5kYW50c0FuZFJlZmxlY3Rpb24oY2xpcFJlY3QsIGxheWVyLCBsYXllciwgdHJh bnNwYXJlbmN5QmVoYXZpb3IsIHBhaW50QmVoYXZpb3IpOworICAgICAgICBMYXlvdXRSZWN0IGNs aXBSZWN0ID0gbGF5ZXIuYm91bmRpbmdCb3goJmxheWVyKTsKKyAgICAgICAgZXhwYW5kQ2xpcFJl Y3RGb3JEZXNjZW5kYW50c0FuZFJlZmxlY3Rpb24oY2xpcFJlY3QsIGxheWVyLCAmbGF5ZXIsIHRy YW5zcGFyZW5jeUJlaGF2aW9yLCBwYWludEJlaGF2aW9yKTsKICNpZiBFTkFCTEUoQ1NTX0ZJTFRF UlMpCi0gICAgICAgIGxheWVyLT5yZW5kZXJlcigpLnN0eWxlKCkuZmlsdGVyT3V0c2V0cygpLmV4 cGFuZFJlY3QoY2xpcFJlY3QpOworICAgICAgICBsYXllci5yZW5kZXJlcigpLnN0eWxlKCkuZmls dGVyT3V0c2V0cygpLmV4cGFuZFJlY3QoY2xpcFJlY3QpOwogI2VuZGlmCiAgICAgICAgIExheW91 dFJlY3QgcmVzdWx0ID0gdHJhbnNmb3JtLm1hcFJlY3QoY2xpcFJlY3QpOwogICAgICAgICBpZiAo IXBhZ2luYXRpb25MYXllcikKQEAgLTE2MzYsMTcgKzE2MzYsMTcgQEAgc3RhdGljIExheW91dFJl Y3QgdHJhbnNwYXJlbmN5Q2xpcEJveChjb25zdCBSZW5kZXJMYXllciogbGF5ZXIsIGNvbnN0IFJl bmRlckxheWUKICAgICAgICAgcmV0dXJuIHJlc3VsdDsKICAgICB9CiAgICAgCi0gICAgTGF5b3V0 UmVjdCBjbGlwUmVjdCA9IGxheWVyLT5ib3VuZGluZ0JveChyb290TGF5ZXIsIGxheWVyLT5vZmZz ZXRGcm9tQW5jZXN0b3Iocm9vdExheWVyKSwgdHJhbnNwYXJlbmN5QmVoYXZpb3IgPT0gSGl0VGVz dGluZ1RyYW5zcGFyZW5jeUNsaXBCb3ggPyBSZW5kZXJMYXllcjo6VXNlRnJhZ21lbnRCb3hlc0lu Y2x1ZGluZ0NvbXBvc2l0aW5nIDogUmVuZGVyTGF5ZXI6OlVzZUZyYWdtZW50Qm94ZXNFeGNsdWRp bmdDb21wb3NpdGluZyk7CisgICAgTGF5b3V0UmVjdCBjbGlwUmVjdCA9IGxheWVyLmJvdW5kaW5n Qm94KHJvb3RMYXllciwgbGF5ZXIub2Zmc2V0RnJvbUFuY2VzdG9yKHJvb3RMYXllciksIHRyYW5z cGFyZW5jeUJlaGF2aW9yID09IEhpdFRlc3RpbmdUcmFuc3BhcmVuY3lDbGlwQm94ID8gUmVuZGVy TGF5ZXI6OlVzZUZyYWdtZW50Qm94ZXNJbmNsdWRpbmdDb21wb3NpdGluZyA6IFJlbmRlckxheWVy OjpVc2VGcmFnbWVudEJveGVzRXhjbHVkaW5nQ29tcG9zaXRpbmcpOwogICAgIGV4cGFuZENsaXBS ZWN0Rm9yRGVzY2VuZGFudHNBbmRSZWZsZWN0aW9uKGNsaXBSZWN0LCBsYXllciwgcm9vdExheWVy LCB0cmFuc3BhcmVuY3lCZWhhdmlvciwgcGFpbnRCZWhhdmlvcik7CiAjaWYgRU5BQkxFKENTU19G SUxURVJTKQotICAgIGxheWVyLT5yZW5kZXJlcigpLnN0eWxlKCkuZmlsdGVyT3V0c2V0cygpLmV4 cGFuZFJlY3QoY2xpcFJlY3QpOworICAgIGxheWVyLnJlbmRlcmVyKCkuc3R5bGUoKS5maWx0ZXJP dXRzZXRzKCkuZXhwYW5kUmVjdChjbGlwUmVjdCk7CiAjZW5kaWYKICAgICByZXR1cm4gY2xpcFJl Y3Q7CiB9CiAKLUxheW91dFJlY3QgUmVuZGVyTGF5ZXI6OnBhaW50aW5nRXh0ZW50KGNvbnN0IFJl bmRlckxheWVyKiByb290TGF5ZXIsIGNvbnN0IExheW91dFJlY3QmIHBhaW50RGlydHlSZWN0LCBQ YWludEJlaGF2aW9yIHBhaW50QmVoYXZpb3IpCitzdGF0aWMgTGF5b3V0UmVjdCBwYWludGluZ0V4 dGVudChjb25zdCBSZW5kZXJMYXllciYgY3VycmVudExheWVyLCBjb25zdCBSZW5kZXJMYXllciog cm9vdExheWVyLCBjb25zdCBMYXlvdXRSZWN0JiBwYWludERpcnR5UmVjdCwgUGFpbnRCZWhhdmlv ciBwYWludEJlaGF2aW9yKQogewotICAgIHJldHVybiBpbnRlcnNlY3Rpb24odHJhbnNwYXJlbmN5 Q2xpcEJveCh0aGlzLCByb290TGF5ZXIsIFBhaW50aW5nVHJhbnNwYXJlbmN5Q2xpcEJveCwgUm9v dE9mVHJhbnNwYXJlbmN5Q2xpcEJveCwgcGFpbnRCZWhhdmlvciksIHBhaW50RGlydHlSZWN0KTsK KyAgICByZXR1cm4gaW50ZXJzZWN0aW9uKHRyYW5zcGFyZW5jeUNsaXBCb3goY3VycmVudExheWVy LCByb290TGF5ZXIsIFBhaW50aW5nVHJhbnNwYXJlbmN5Q2xpcEJveCwgUm9vdE9mVHJhbnNwYXJl bmN5Q2xpcEJveCwgcGFpbnRCZWhhdmlvciksIHBhaW50RGlydHlSZWN0KTsKIH0KIAogdm9pZCBS ZW5kZXJMYXllcjo6YmVnaW5UcmFuc3BhcmVuY3lMYXllcnMoR3JhcGhpY3NDb250ZXh0KiBjb250 ZXh0LCBjb25zdCBSZW5kZXJMYXllciogcm9vdExheWVyLCBjb25zdCBMYXlvdXRSZWN0JiBwYWlu dERpcnR5UmVjdCwgUGFpbnRCZWhhdmlvciBwYWludEJlaGF2aW9yKQpAQCAtMTY2MSw3ICsxNjYx LDcgQEAgdm9pZCBSZW5kZXJMYXllcjo6YmVnaW5UcmFuc3BhcmVuY3lMYXllcnMoR3JhcGhpY3ND b250ZXh0KiBjb250ZXh0LCBjb25zdCBSZW5kZXIKICAgICBpZiAocGFpbnRzV2l0aFRyYW5zcGFy ZW5jeShwYWludEJlaGF2aW9yKSkgewogICAgICAgICBtX3VzZWRUcmFuc3BhcmVuY3kgPSB0cnVl OwogICAgICAgICBjb250ZXh0LT5zYXZlKCk7Ci0gICAgICAgIExheW91dFJlY3QgY2xpcFJlY3Qg PSBwYWludGluZ0V4dGVudChyb290TGF5ZXIsIHBhaW50RGlydHlSZWN0LCBwYWludEJlaGF2aW9y KTsKKyAgICAgICAgTGF5b3V0UmVjdCBjbGlwUmVjdCA9IHBhaW50aW5nRXh0ZW50KCp0aGlzLCBy b290TGF5ZXIsIHBhaW50RGlydHlSZWN0LCBwYWludEJlaGF2aW9yKTsKICAgICAgICAgY29udGV4 dC0+Y2xpcChjbGlwUmVjdCk7CiAKICNpZiBFTkFCTEUoQ1NTX0NPTVBPU0lUSU5HKQpAQCAtNDMz MSw3ICs0MzMxLDcgQEAgdm9pZCBSZW5kZXJMYXllcjo6cGFpbnRUcmFuc2Zvcm1lZExheWVySW50 b0ZyYWdtZW50cyhHcmFwaGljc0NvbnRleHQqIGNvbnRleHQsIGMKICAgICBMYXllckZyYWdtZW50 cyBlbmNsb3NpbmdQYWdpbmF0aW9uRnJhZ21lbnRzOwogICAgIExheW91dFNpemUgb2Zmc2V0T2ZQ YWdpbmF0aW9uTGF5ZXJGcm9tUm9vdDsKICAgICBSZW5kZXJMYXllciogcGFnaW5hdGVkTGF5ZXIg PSBlbmNsb3NpbmdQYWdpbmF0aW9uTGF5ZXIoRXhjbHVkZUNvbXBvc2l0ZWRQYWdpbmF0ZWRMYXll cnMpOwotICAgIExheW91dFJlY3QgdHJhbnNmb3JtZWRFeHRlbnQgPSB0cmFuc3BhcmVuY3lDbGlw Qm94KHRoaXMsIHBhZ2luYXRlZExheWVyLCBQYWludGluZ1RyYW5zcGFyZW5jeUNsaXBCb3gsIFJv b3RPZlRyYW5zcGFyZW5jeUNsaXBCb3gsIHBhaW50aW5nSW5mby5wYWludEJlaGF2aW9yKTsKKyAg ICBMYXlvdXRSZWN0IHRyYW5zZm9ybWVkRXh0ZW50ID0gdHJhbnNwYXJlbmN5Q2xpcEJveCgqdGhp cywgcGFnaW5hdGVkTGF5ZXIsIFBhaW50aW5nVHJhbnNwYXJlbmN5Q2xpcEJveCwgUm9vdE9mVHJh bnNwYXJlbmN5Q2xpcEJveCwgcGFpbnRpbmdJbmZvLnBhaW50QmVoYXZpb3IpOwogICAgIHBhZ2lu YXRlZExheWVyLT5jb2xsZWN0RnJhZ21lbnRzKGVuY2xvc2luZ1BhZ2luYXRpb25GcmFnbWVudHMs IHBhaW50aW5nSW5mby5yb290TGF5ZXIsIHBhaW50aW5nSW5mby5wYWludERpcnR5UmVjdCwgRXhj bHVkZUNvbXBvc2l0ZWRQYWdpbmF0ZWRMYXllcnMsCiAgICAgICAgIChwYWludEZsYWdzICYgUGFp bnRMYXllclRlbXBvcmFyeUNsaXBSZWN0cykgPyBUZW1wb3JhcnlDbGlwUmVjdHMgOiBQYWludGlu Z0NsaXBSZWN0cywgSWdub3JlT3ZlcmxheVNjcm9sbGJhclNpemUsCiAgICAgICAgIChwYWludEZs YWdzICYgUGFpbnRMYXllclBhaW50aW5nT3ZlcmZsb3dDb250ZW50cykgPyBJZ25vcmVPdmVyZmxv d0NsaXAgOiBSZXNwZWN0T3ZlcmZsb3dDbGlwLCBvZmZzZXRPZlBhZ2luYXRpb25MYXllckZyb21S b290LCAmdHJhbnNmb3JtZWRFeHRlbnQpOwpAQCAtNDkzMiw3ICs0OTMyLDcgQEAgUmVuZGVyTGF5 ZXIqIFJlbmRlckxheWVyOjpoaXRUZXN0VHJhbnNmb3JtZWRMYXllckluRnJhZ21lbnRzKFJlbmRl ckxheWVyKiByb290TGEKICAgICBMYXllckZyYWdtZW50cyBlbmNsb3NpbmdQYWdpbmF0aW9uRnJh Z21lbnRzOwogICAgIExheW91dFNpemUgb2Zmc2V0T2ZQYWdpbmF0aW9uTGF5ZXJGcm9tUm9vdDsK ICAgICBSZW5kZXJMYXllciogcGFnaW5hdGVkTGF5ZXIgPSBlbmNsb3NpbmdQYWdpbmF0aW9uTGF5 ZXIoSW5jbHVkZUNvbXBvc2l0ZWRQYWdpbmF0ZWRMYXllcnMpOwotICAgIExheW91dFJlY3QgdHJh bnNmb3JtZWRFeHRlbnQgPSB0cmFuc3BhcmVuY3lDbGlwQm94KHRoaXMsIHBhZ2luYXRlZExheWVy LCBIaXRUZXN0aW5nVHJhbnNwYXJlbmN5Q2xpcEJveCwgUm9vdE9mVHJhbnNwYXJlbmN5Q2xpcEJv eCk7CisgICAgTGF5b3V0UmVjdCB0cmFuc2Zvcm1lZEV4dGVudCA9IHRyYW5zcGFyZW5jeUNsaXBC b3goKnRoaXMsIHBhZ2luYXRlZExheWVyLCBIaXRUZXN0aW5nVHJhbnNwYXJlbmN5Q2xpcEJveCwg Um9vdE9mVHJhbnNwYXJlbmN5Q2xpcEJveCk7CiAgICAgcGFnaW5hdGVkTGF5ZXItPmNvbGxlY3RG cmFnbWVudHMoZW5jbG9zaW5nUGFnaW5hdGlvbkZyYWdtZW50cywgcm9vdExheWVyLCBoaXRUZXN0 UmVjdCwgSW5jbHVkZUNvbXBvc2l0ZWRQYWdpbmF0ZWRMYXllcnMsCiAgICAgICAgIFJvb3RSZWxh dGl2ZUNsaXBSZWN0cywgSW5jbHVkZU92ZXJsYXlTY3JvbGxiYXJTaXplLCBSZXNwZWN0T3ZlcmZs b3dDbGlwLCBvZmZzZXRPZlBhZ2luYXRpb25MYXllckZyb21Sb290LCAmdHJhbnNmb3JtZWRFeHRl bnQpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIu aCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5oCmluZGV4IDUyYWM3NGEw ZDEzOGE3MGI5OWZhNzNjOWI3ZmU4NWNlMjgxNTU0N2MuLjFkMzM4NDM1NmQ4MDlhN2NlMGEzY2E1 ZWVkYzQ0YTIwOGY3OWE2MTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJMYXllci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5o CkBAIC0xMTM0LDggKzExMzQsNiBAQCBwcml2YXRlOgogICAgIHZvaWQgcGFyZW50Q2xpcFJlY3Rz KGNvbnN0IENsaXBSZWN0c0NvbnRleHQmLCBDbGlwUmVjdHMmKSBjb25zdDsKICAgICBDbGlwUmVj dCBiYWNrZ3JvdW5kQ2xpcFJlY3QoY29uc3QgQ2xpcFJlY3RzQ29udGV4dCYpIGNvbnN0OwogCi0g ICAgTGF5b3V0UmVjdCBwYWludGluZ0V4dGVudChjb25zdCBSZW5kZXJMYXllciogcm9vdExheWVy LCBjb25zdCBMYXlvdXRSZWN0JiBwYWludERpcnR5UmVjdCwgUGFpbnRCZWhhdmlvcik7Ci0KICAg ICBSZW5kZXJMYXllciogZW5jbG9zaW5nVHJhbnNmb3JtZWRBbmNlc3RvcigpIGNvbnN0OwogCiAg ICAgLy8gQ29udmVydCBhIHBvaW50IGluIGFic29sdXRlIGNvb3JkcyBpbnRvIGxheWVyIGNvb3Jk cywgdGFraW5nIHRyYW5zZm9ybXMgaW50byBhY2NvdW50Cg==