138796 2014-11-17 10:15:55 -0800 Simple line layout: Drop 16bit support temporarily. 2014-11-17 13:14:54 -0800 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 koivisto kondapallykalyan mmaxfield oldest_to_newest 1049230 0 zalan 2014-11-17 10:15:55 -0800 This is in preparation to multiple renderers support. It requires code refactoring on top of the multiple renderers baseline. 1049239 1 241723 zalan 2014-11-17 10:32:51 -0800 Created attachment 241723 Patch 1049292 2 241723 commit-queue 2014-11-17 13:14:51 -0800 Comment on attachment 241723 Patch Clearing flags on attachment: 241723 Committed r176223: <http://trac.webkit.org/changeset/176223> 1049293 3 commit-queue 2014-11-17 13:14:54 -0800 All reviewed patches have been landed. Closing bug. 241723 2014-11-17 10:32:51 -0800 2014-11-17 13:14:51 -0800 Patch bug-138796-20141117103302.patch text/plain 8605 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMTc2MjA0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzQzMzU5Y2Q5NjI1ZTc0 Y2ViYjc4MDJkZTM4NDc1NTdlMWMzNWE1NC4uNjhlMWY2OGVmMDVkZWNkODY1OTNjMjhiNTg1OGQ5 ZDI3MTI2NTQwMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDE0LTExLTE3ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgU2ltcGxlIGxpbmUgbGF5b3V0 OiBEcm9wIDE2Yml0IHN1cHBvcnQgdGVtcG9yYXJpbHkuCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzg3OTYKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIGlzIGluIHByZXBhcmF0aW9uIHRvIG11bHRp cGxlIHJlbmRlcmVycyBzdXBwb3J0LgorICAgICAgICBJdCByZXF1aXJlcyBjb2RlIHJlZmFjdG9y aW5nIG9uIHRvcCBvZiB0aGUgY29taW5nIG11bHRpcGxlIHJlbmRlcmVycyBjb2RlYmFzZS4KKyAg ICAgICAgKE5vdCBleHBlY3RpbmcgYW55IHNpZ25pZmljYW50IGNvdmVyYWdlIHNocmlua2luZy4p CisKKyAgICAgICAgKiByZW5kZXJpbmcvU2ltcGxlTGluZUxheW91dC5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpTaW1wbGVMaW5lTGF5b3V0OjpjYW5Vc2VGb3IpOgorICAgICAgICAoV2ViQ29yZTo6 U2ltcGxlTGluZUxheW91dDo6Rmxvd0NvbnRlbnRJdGVyYXRvcjo6ZmluZE5leHRCcmVha2FibGVQ b3NpdGlvbik6CisgICAgICAgIChXZWJDb3JlOjpTaW1wbGVMaW5lTGF5b3V0OjpGbG93Q29udGVu dEl0ZXJhdG9yOjpmaW5kTmV4dE5vbldoaXRlc3BhY2VQb3NpdGlvbik6CisgICAgICAgIChXZWJD b3JlOjpTaW1wbGVMaW5lTGF5b3V0OjpGbG93Q29udGVudEl0ZXJhdG9yOjp0ZXh0V2lkdGgpOgor ICAgICAgICAoV2ViQ29yZTo6U2ltcGxlTGluZUxheW91dDo6cmVtb3ZlVHJhaWxpbmdXaGl0ZXNw YWNlKToKKyAgICAgICAgKFdlYkNvcmU6OlNpbXBsZUxpbmVMYXlvdXQ6OmluaXRpYWxpemVOZXdM aW5lKToKKyAgICAgICAgKFdlYkNvcmU6OlNpbXBsZUxpbmVMYXlvdXQ6OnNwbGl0RnJhZ21lbnRU b0ZpdExpbmUpOgorICAgICAgICAoV2ViQ29yZTo6U2ltcGxlTGluZUxheW91dDo6bmV4dEZyYWdt ZW50KToKKyAgICAgICAgKFdlYkNvcmU6OlNpbXBsZUxpbmVMYXlvdXQ6OmNyZWF0ZUxpbmVSdW5z KToKKyAgICAgICAgKFdlYkNvcmU6OlNpbXBsZUxpbmVMYXlvdXQ6OmNsb3NlTGluZUVuZGluZ0Fu ZEFkanVzdFJ1bnMpOgorICAgICAgICAoV2ViQ29yZTo6U2ltcGxlTGluZUxheW91dDo6Y3JlYXRl VGV4dFJ1bnMpOgorICAgICAgICAoV2ViQ29yZTo6U2ltcGxlTGluZUxheW91dDo6Y3JlYXRlKToK KwogMjAxNC0xMS0xNyAgRGFuaWVsIEJhdGVzICA8ZGFiYXRlc0BhcHBsZS5jb20+CiAKICAgICAg ICAgW2lPU10gUXVhcnR6Q29yZSBTUEkgbm90IGF2YWlsYWJsZSBpbiBwdWJsaWMgU0RLCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvU2ltcGxlTGluZUxheW91dC5jcHAgYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvU2ltcGxlTGluZUxheW91dC5jcHAKaW5kZXggMzRiNDMz Y2YyZmJiMjYxZjQyZTVhMzU0M2Q3Mzg1ZjNmMzI3Yzg4NC4uYWIxMGYyOTMzYzc3MTJmYzJkMzVi YmE2MGY0MmQxODNkOGZlZmJlNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1NpbXBsZUxpbmVMYXlvdXQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9TaW1w bGVMaW5lTGF5b3V0LmNwcApAQCAtOTksNiArOTksOCBAQCBib29sIGNhblVzZUZvcihjb25zdCBS ZW5kZXJCbG9ja0Zsb3cmIGZsb3cpCiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICBpZiAoIWlz PFJlbmRlclRleHQ+KGZsb3cuZmlyc3RDaGlsZCgpKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwor ICAgIGlmICghZG93bmNhc3Q8UmVuZGVyVGV4dD4oKmZsb3cuZmlyc3RDaGlsZCgpKS50ZXh0KCkt PmlzOEJpdCgpKQorICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgaWYgKCFmbG93LmlzSG9yaXpv bnRhbFdyaXRpbmdNb2RlKCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICBpZiAoZmxvdy5m bG93VGhyZWFkU3RhdGUoKSAhPSBSZW5kZXJPYmplY3Q6Ok5vdEluc2lkZUZsb3dUaHJlYWQpCkBA IC0yMTEsNyArMjEzLDYgQEAgc3RydWN0IFN0eWxlIHsKICAgICB1bnNpZ25lZCB0YWJXaWR0aDsK IH07CiAKLXRlbXBsYXRlIDx0eXBlbmFtZSBDaGFyYWN0ZXJUeXBlPgogY2xhc3MgRmxvd0NvbnRl bnRJdGVyYXRvciB7CiBwdWJsaWM6CiAgICAgRmxvd0NvbnRlbnRJdGVyYXRvcihjb25zdCBSZW5k ZXJCbG9ja0Zsb3cmIGZsb3cpCkBAIC0yMjQsMTQgKzIyNSwxNCBAQCBwdWJsaWM6CiAgICAgdW5z aWduZWQgZmluZE5leHRCcmVha2FibGVQb3NpdGlvbih1bnNpZ25lZCBwb3NpdGlvbikKICAgICB7 CiAgICAgICAgIFN0cmluZyBzdHJpbmcgPSBtX2xpbmVCcmVha0l0ZXJhdG9yLnN0cmluZygpOwot ICAgICAgICByZXR1cm4gbmV4dEJyZWFrYWJsZVBvc2l0aW9uPENoYXJhY3RlclR5cGUsIGZhbHNl PihtX2xpbmVCcmVha0l0ZXJhdG9yLCBzdHJpbmcuY2hhcmFjdGVyczxDaGFyYWN0ZXJUeXBlPigp LCBzdHJpbmcubGVuZ3RoKCksIHBvc2l0aW9uKTsKKyAgICAgICAgcmV0dXJuIG5leHRCcmVha2Fi bGVQb3NpdGlvbjxMQ2hhciwgZmFsc2U+KG1fbGluZUJyZWFrSXRlcmF0b3IsIHN0cmluZy5jaGFy YWN0ZXJzOCgpLCBzdHJpbmcubGVuZ3RoKCksIHBvc2l0aW9uKTsKICAgICB9CiAKICAgICB1bnNp Z25lZCBmaW5kTmV4dE5vbldoaXRlc3BhY2VQb3NpdGlvbih1bnNpZ25lZCBwb3NpdGlvbiwgdW5z aWduZWQmIHNwYWNlQ291bnQpIGNvbnN0CiAgICAgewogICAgICAgICBTdHJpbmcgc3RyaW5nID0g bV9saW5lQnJlYWtJdGVyYXRvci5zdHJpbmcoKTsKICAgICAgICAgdW5zaWduZWQgbGVuZ3RoID0g c3RyaW5nLmxlbmd0aCgpOwotICAgICAgICBjb25zdCBDaGFyYWN0ZXJUeXBlKiB0ZXh0ID0gc3Ry aW5nLmNoYXJhY3RlcnM8Q2hhcmFjdGVyVHlwZT4oKTsKKyAgICAgICAgY29uc3QgTENoYXIqIHRl eHQgPSBzdHJpbmcuY2hhcmFjdGVyczgoKTsKICAgICAgICAgc3BhY2VDb3VudCA9IDA7CiAgICAg ICAgIGZvciAoOyBwb3NpdGlvbiA8IGxlbmd0aDsgKytwb3NpdGlvbikgewogICAgICAgICAgICAg Ym9vbCBpc1NwYWNlID0gdGV4dFtwb3NpdGlvbl0gPT0gJyAnOwpAQCAtMjUyLDcgKzI1Myw3IEBA IHB1YmxpYzoKICAgICAgICAgICAgIHJldHVybiByZW5kZXJlci53aWR0aChmcm9tLCB0byAtIGZy b20sIG1fc3R5bGUuZm9udCwgeFBvc2l0aW9uLCBudWxscHRyLCBudWxscHRyKTsKICAgICAgICAg fQogCi0gICAgICAgIFRleHRSdW4gcnVuKHN0cmluZy5jaGFyYWN0ZXJzPENoYXJhY3RlclR5cGU+ KCkgKyBmcm9tLCB0byAtIGZyb20pOworICAgICAgICBUZXh0UnVuIHJ1bihzdHJpbmcuY2hhcmFj dGVyczgoKSArIGZyb20sIHRvIC0gZnJvbSk7CiAgICAgICAgIHJ1bi5zZXRYUG9zKHhQb3NpdGlv bik7CiAgICAgICAgIHJ1bi5zZXRDaGFyYWN0ZXJzTGVuZ3RoKGxlbmd0aCAtIGZyb20pOwogICAg ICAgICBydW4uc2V0VGFiU2l6ZSghIW1fc3R5bGUudGFiV2lkdGgsIG1fc3R5bGUudGFiV2lkdGgp OwpAQCAtNDM2LDggKzQzNyw3IEBAIHN0cnVjdCBMaW5lU3RhdGUgewogICAgIFRleHRGcmFnbWVu dCBvdmVmbG93ZWRGcmFnbWVudDsKIH07CiAKLXRlbXBsYXRlIDx0eXBlbmFtZSBDaGFyYWN0ZXJU eXBlPgotdm9pZCByZW1vdmVUcmFpbGluZ1doaXRlc3BhY2UoTGluZVN0YXRlJiBsaW5lU3RhdGUs IExheW91dDo6UnVuVmVjdG9yJiBsaW5lUnVucywgY29uc3QgRmxvd0NvbnRlbnRJdGVyYXRvcjxD aGFyYWN0ZXJUeXBlPiYgY29udGVudEl0ZXJhdG9yKQorc3RhdGljIHZvaWQgcmVtb3ZlVHJhaWxp bmdXaGl0ZXNwYWNlKExpbmVTdGF0ZSYgbGluZVN0YXRlLCBMYXlvdXQ6OlJ1blZlY3RvciYgbGlu ZVJ1bnMsIGNvbnN0IEZsb3dDb250ZW50SXRlcmF0b3ImIGNvbnRlbnRJdGVyYXRvcikKIHsKICAg ICBjb25zdCBhdXRvJiBzdHlsZSA9IGNvbnRlbnRJdGVyYXRvci5zdHlsZSgpOwogICAgIGJvb2wg cHJlV3JhcCA9IHN0eWxlLndyYXBMaW5lcyAmJiAhc3R5bGUuY29sbGFwc2VXaGl0ZXNwYWNlOwpA QCAtNDgxLDggKzQ4MSw3IEBAIHZvaWQgcmVtb3ZlVHJhaWxpbmdXaGl0ZXNwYWNlKExpbmVTdGF0 ZSYgbGluZVN0YXRlLCBMYXlvdXQ6OlJ1blZlY3RvciYgbGluZVJ1bnMsCiAgICAgICAgICsrbGlu ZVN0YXRlLnBvc2l0aW9uOwogfQogCi10ZW1wbGF0ZSA8dHlwZW5hbWUgQ2hhcmFjdGVyVHlwZT4K LXZvaWQgaW5pdGlhbGl6ZU5ld0xpbmUoTGluZVN0YXRlJiBsaW5lU3RhdGUsIGNvbnN0IEZsb3dD b250ZW50SXRlcmF0b3I8Q2hhcmFjdGVyVHlwZT4mIGNvbnRlbnRJdGVyYXRvciwgdW5zaWduZWQg bGluZVN0YXJ0UnVuSW5kZXgpCitzdGF0aWMgdm9pZCBpbml0aWFsaXplTmV3TGluZShMaW5lU3Rh dGUmIGxpbmVTdGF0ZSwgY29uc3QgRmxvd0NvbnRlbnRJdGVyYXRvciYgY29udGVudEl0ZXJhdG9y LCB1bnNpZ25lZCBsaW5lU3RhcnRSdW5JbmRleCkKIHsKICAgICBsaW5lU3RhdGUubGluZVN0YXJ0 UnVuSW5kZXggPSBsaW5lU3RhcnRSdW5JbmRleDsKICAgICAvLyBTa2lwIGxlYWRpbmcgd2hpdGVz cGFjZSBpZiBjb2xsYXBzaW5nIHdoaXRlc3BhY2UsIHVubGVzcyB0aGVyZSdzIGFuIHVuY29tbWl0 dGVkIGZyYWdtZW50IHB1c2hlZCBmcm9tIHRoZSBwcmV2aW91cyBsaW5lLgpAQCAtNDk5LDggKzQ5 OCw3IEBAIHZvaWQgaW5pdGlhbGl6ZU5ld0xpbmUoTGluZVN0YXRlJiBsaW5lU3RhdGUsIGNvbnN0 IEZsb3dDb250ZW50SXRlcmF0b3I8Q2hhcmFjdGVyCiAgICAgbGluZVN0YXRlLm92ZWZsb3dlZEZy YWdtZW50ID0gVGV4dEZyYWdtZW50KCk7CiB9CiAKLXRlbXBsYXRlIDx0eXBlbmFtZSBDaGFyYWN0 ZXJUeXBlPgotVGV4dEZyYWdtZW50IHNwbGl0RnJhZ21lbnRUb0ZpdExpbmUoVGV4dEZyYWdtZW50 JiBmcmFnbWVudFRvU3BsaXQsIGZsb2F0IGF2YWlsYWJsZVdpZHRoLCBib29sIGtlZXBBdExlYXN0 T25lQ2hhcmFjdGVyLCBjb25zdCBGbG93Q29udGVudEl0ZXJhdG9yPENoYXJhY3RlclR5cGU+JiBj b250ZW50SXRlcmF0b3IpCitzdGF0aWMgVGV4dEZyYWdtZW50IHNwbGl0RnJhZ21lbnRUb0ZpdExp bmUoVGV4dEZyYWdtZW50JiBmcmFnbWVudFRvU3BsaXQsIGZsb2F0IGF2YWlsYWJsZVdpZHRoLCBi b29sIGtlZXBBdExlYXN0T25lQ2hhcmFjdGVyLCBjb25zdCBGbG93Q29udGVudEl0ZXJhdG9yJiBj b250ZW50SXRlcmF0b3IpCiB7CiAgICAgLy8gRmFzdCBwYXRoIGZvciBzaW5nbGUgY2hhciBmcmFn bWVudHMuCiAgICAgaWYgKGZyYWdtZW50VG9TcGxpdC5zdGFydCArIDEgPT0gZnJhZ21lbnRUb1Nw bGl0LmVuZCkgewpAQCAtNTQxLDggKzUzOSw3IEBAIFRleHRGcmFnbWVudCBzcGxpdEZyYWdtZW50 VG9GaXRMaW5lKFRleHRGcmFnbWVudCYgZnJhZ21lbnRUb1NwbGl0LCBmbG9hdCBhdmFpbGFiCiAg ICAgcmV0dXJuIGZyYWdtZW50Rm9yTmV4dExpbmU7CiB9CiAKLXRlbXBsYXRlIDx0eXBlbmFtZSBD aGFyYWN0ZXJUeXBlPgotVGV4dEZyYWdtZW50IG5leHRGcmFnbWVudCh1bnNpZ25lZCBwcmV2aW91 c0ZyYWdtZW50RW5kLCBGbG93Q29udGVudEl0ZXJhdG9yPENoYXJhY3RlclR5cGU+JiBjb250ZW50 SXRlcmF0b3IsIGZsb2F0IHhQb3NpdGlvbikKK3N0YXRpYyBUZXh0RnJhZ21lbnQgbmV4dEZyYWdt ZW50KHVuc2lnbmVkIHByZXZpb3VzRnJhZ21lbnRFbmQsIEZsb3dDb250ZW50SXRlcmF0b3ImIGNv bnRlbnRJdGVyYXRvciwgZmxvYXQgeFBvc2l0aW9uKQogewogICAgIC8vIEEgZnJhZ21lbnQgY2Fu IGhhdmUKICAgICAvLyAxLiBuZXcgbGluZSBjaGFyYWN0ZXIgd2hlbiBwcmVzZXJ2ZU5ld2xpbmUg aXMgb24gKG5vdCBjb25zaWRlcmVkIGFzIHdoaXRlc3BhY2UpIG9yCkBAIC01ODEsOCArNTc4LDcg QEAgVGV4dEZyYWdtZW50IG5leHRGcmFnbWVudCh1bnNpZ25lZCBwcmV2aW91c0ZyYWdtZW50RW5k LCBGbG93Q29udGVudEl0ZXJhdG9yPENoYXIKICAgICByZXR1cm4gZnJhZ21lbnQ7CiB9CiAKLXRl bXBsYXRlIDx0eXBlbmFtZSBDaGFyYWN0ZXJUeXBlPgotYm9vbCBjcmVhdGVMaW5lUnVucyhMaW5l U3RhdGUmIGxpbmVTdGF0ZSwgTGF5b3V0OjpSdW5WZWN0b3ImIGxpbmVSdW5zLCBGbG93Q29udGVu dEl0ZXJhdG9yPENoYXJhY3RlclR5cGU+JiBjb250ZW50SXRlcmF0b3IpCitzdGF0aWMgYm9vbCBj cmVhdGVMaW5lUnVucyhMaW5lU3RhdGUmIGxpbmVTdGF0ZSwgTGF5b3V0OjpSdW5WZWN0b3ImIGxp bmVSdW5zLCBGbG93Q29udGVudEl0ZXJhdG9yJiBjb250ZW50SXRlcmF0b3IpCiB7CiAgICAgY29u c3QgYXV0byYgc3R5bGUgPSBjb250ZW50SXRlcmF0b3Iuc3R5bGUoKTsKICAgICBib29sIGxpbmVD YW5CZVdyYXBwZWQgPSBzdHlsZS53cmFwTGluZXMgfHwgc3R5bGUuYnJlYWtXb3JkT25PdmVyZmxv dzsKQEAgLTYzOCw4ICs2MzQsNyBAQCBib29sIGNyZWF0ZUxpbmVSdW5zKExpbmVTdGF0ZSYgbGlu ZVN0YXRlLCBMYXlvdXQ6OlJ1blZlY3RvciYgbGluZVJ1bnMsIEZsb3dDb250ZQogICAgIHJldHVy biBjb250ZW50SXRlcmF0b3IuaXNFbmRPZkNvbnRlbnQobGluZVN0YXRlLnBvc2l0aW9uKSAmJiBs aW5lU3RhdGUub3ZlZmxvd2VkRnJhZ21lbnQuaXNFbXB0eSgpOwogfQogCi10ZW1wbGF0ZSA8dHlw ZW5hbWUgQ2hhcmFjdGVyVHlwZT4KLXZvaWQgY2xvc2VMaW5lRW5kaW5nQW5kQWRqdXN0UnVucyhM aW5lU3RhdGUmIGxpbmVTdGF0ZSwgTGF5b3V0OjpSdW5WZWN0b3ImIGxpbmVSdW5zLCB1bnNpZ25l ZCYgbGluZUNvdW50LCBjb25zdCBGbG93Q29udGVudEl0ZXJhdG9yPENoYXJhY3RlclR5cGU+JiBj b250ZW50SXRlcmF0b3IpCitzdGF0aWMgdm9pZCBjbG9zZUxpbmVFbmRpbmdBbmRBZGp1c3RSdW5z KExpbmVTdGF0ZSYgbGluZVN0YXRlLCBMYXlvdXQ6OlJ1blZlY3RvciYgbGluZVJ1bnMsIHVuc2ln bmVkJiBsaW5lQ291bnQsIGNvbnN0IEZsb3dDb250ZW50SXRlcmF0b3ImIGNvbnRlbnRJdGVyYXRv cikKIHsKICAgICBpZiAobGluZVN0YXRlLmxpbmVTdGFydFJ1bkluZGV4ID09IGxpbmVSdW5zLnNp emUoKSkKICAgICAgICAgcmV0dXJuOwpAQCAtNjY4LDE0ICs2NjMsMTMgQEAgc3RhdGljIHZvaWQg dXBkYXRlTGluZUNvbnN0cmFpbnMoY29uc3QgUmVuZGVyQmxvY2tGbG93JiBmbG93LCBmbG9hdCYg YXZhaWxhYmxlV2kKICAgICBhdmFpbGFibGVXaWR0aCA9IHN0ZDo6bWF4PGZsb2F0PigwLCBsb2dp Y2FsUmlnaHRPZmZzZXQgLSBsb2dpY2FsTGVmdE9mZnNldCk7CiB9CiAKLXRlbXBsYXRlIDx0eXBl bmFtZSBDaGFyYWN0ZXJUeXBlPgotdm9pZCBjcmVhdGVUZXh0UnVucyhMYXlvdXQ6OlJ1blZlY3Rv ciYgcnVucywgUmVuZGVyQmxvY2tGbG93JiBmbG93LCB1bnNpZ25lZCYgbGluZUNvdW50KQorc3Rh dGljIHZvaWQgY3JlYXRlVGV4dFJ1bnMoTGF5b3V0OjpSdW5WZWN0b3ImIHJ1bnMsIFJlbmRlckJs b2NrRmxvdyYgZmxvdywgdW5zaWduZWQmIGxpbmVDb3VudCkKIHsKICAgICBMYXlvdXRVbml0IGJv cmRlckFuZFBhZGRpbmdCZWZvcmUgPSBmbG93LmJvcmRlckFuZFBhZGRpbmdCZWZvcmUoKTsKICAg ICBMYXlvdXRVbml0IGxpbmVIZWlnaHQgPSBsaW5lSGVpZ2h0RnJvbUZsb3coZmxvdyk7CiAgICAg TGluZVN0YXRlIGxpbmVTdGF0ZTsKICAgICBib29sIGlzRW5kT2ZDb250ZW50ID0gZmFsc2U7Ci0g ICAgRmxvd0NvbnRlbnRJdGVyYXRvcjxDaGFyYWN0ZXJUeXBlPiBjb250ZW50SXRlcmF0b3IgPSBG bG93Q29udGVudEl0ZXJhdG9yPENoYXJhY3RlclR5cGU+KGZsb3cpOworICAgIEZsb3dDb250ZW50 SXRlcmF0b3IgY29udGVudEl0ZXJhdG9yID0gRmxvd0NvbnRlbnRJdGVyYXRvcihmbG93KTsKIAog ICAgIGRvIHsKICAgICAgICAgZmxvdy5zZXRMb2dpY2FsSGVpZ2h0KGxpbmVIZWlnaHQgKiBsaW5l Q291bnQgKyBib3JkZXJBbmRQYWRkaW5nQmVmb3JlKTsKQEAgLTY5NCwxMSArNjg4LDcgQEAgc3Rk Ojp1bmlxdWVfcHRyPExheW91dD4gY3JlYXRlKFJlbmRlckJsb2NrRmxvdyYgZmxvdykKICAgICBS ZW5kZXJUZXh0JiB0ZXh0UmVuZGVyZXIgPSBkb3duY2FzdDxSZW5kZXJUZXh0PigqZmxvdy5maXJz dENoaWxkKCkpOwogICAgIEFTU0VSVCghdGV4dFJlbmRlcmVyLmZpcnN0VGV4dEJveCgpKTsKIAot ICAgIGlmICh0ZXh0UmVuZGVyZXIuaXM4Qml0KCkpCi0gICAgICAgIGNyZWF0ZVRleHRSdW5zPExD aGFyPihydW5zLCBmbG93LCBsaW5lQ291bnQpOwotICAgIGVsc2UKLSAgICAgICAgY3JlYXRlVGV4 dFJ1bnM8VUNoYXI+KHJ1bnMsIGZsb3csIGxpbmVDb3VudCk7Ci0KKyAgICBjcmVhdGVUZXh0UnVu cyhydW5zLCBmbG93LCBsaW5lQ291bnQpOwogICAgIHRleHRSZW5kZXJlci5jbGVhck5lZWRzTGF5 b3V0KCk7CiAgICAgcmV0dXJuIExheW91dDo6Y3JlYXRlKHJ1bnMsIGxpbmVDb3VudCk7CiB9Cg==