148444 2015-08-25 13:24:39 -0700 Simple line layout: Use float types wherever possible to match line tree. 2015-08-27 10:23:48 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 zalan zalan commit-queue esprehn+autocc glenn koivisto kondapallykalyan oldest_to_newest 1120698 0 zalan 2015-08-25 13:24:39 -0700 Layout* -> Float* 1120813 1 259914 zalan 2015-08-25 19:34:51 -0700 Created attachment 259914 Patch 1121324 2 259914 koivisto 2015-08-27 09:46:47 -0700 Comment on attachment 259914 Patch r=me, nice 1121340 3 259914 commit-queue 2015-08-27 10:23:44 -0700 Comment on attachment 259914 Patch Clearing flags on attachment: 259914 Committed r189030: <http://trac.webkit.org/changeset/189030> 1121341 4 commit-queue 2015-08-27 10:23:48 -0700 All reviewed patches have been landed. Closing bug. 259914 2015-08-25 19:34:51 -0700 2015-08-27 10:23:44 -0700 Patch bug-148444-20150825193441.patch text/plain 12340 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMTg4ODU5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjI0NWM5YmJlMDc4Yzcx MjY1NmQzZWE5MTFmY2E4NjE5MTE5NTIyZi4uNWU5ZTBhYmVlZDkyMDE4OGU0ZTA2MTQ3Njc5YzI3 YmY0YzFlY2I1MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM3IEBACisyMDE1LTA4LTI1ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgU2ltcGxlIGxpbmUgbGF5b3V0 OiBVc2UgZmxvYXQgdHlwZXMgd2hlcmV2ZXIgcG9zc2libGUgdG8gbWF0Y2ggbGluZSB0cmVlLgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ4NDQ0CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVG8gbWF0Y2gg aW5saW5lIHRyZWUgb3V0cHV0LCB3ZSBzaG91bGQgdHJ5IHRvIG1hdGNoIHRoZSBkYXRhIHR5cGVz IGFzIGZhciBhcyBwcmVjaXNpb24gZ29lcy4KKworICAgICAgICBUaGlzIHBhdGNoIGFsc28gZml4 ZXMgdGhlIGNvbmZ1c2luZyBtaXNtYXRjaCBiZXR3ZWVuIFJ1bjo6YmFzZWxpbmUoKS54KCkgYW5k IFJ1bjo6cmVjdCgpLngoKS4gCisgICAgICAgIFRoZXkgYXJlIGJvdGggc3VwcG9zZWQgdG8gcmV0 dXJuIHRoZSBsZWZ0IGVkZ2Ugb2YgdGhlIHJ1bi4gSG93ZXZlciBSdW46OnJlY3QoKS54KCkgcmV0 dXJucyBhIHJvdW5kZWQKKyAgICAgICAgTGF5b3V0VW5pdCBvZiB0aGUgbG9naWNhbCBsZWZ0LCB3 aGlsZSBSdW46OmJhc2VsaW5lKCkueCgpIHJldHVybnMgdGhlIGNvcnJlY3QgbG9naWNhbCBsZWZ0 LiAgICAgICAgICAKKyAgICAgICAgV2l0aCB0aGlzIHBhdGNoIAorICAgICAgICAgIDEuIGJhc2Vs aW5lIHBvc2l0aW9uIGRvZXMgbm90IGluY2x1ZGUgbG9naWNhbCBsZWZ0IGFueW1vcmUuCisgICAg ICAgICAgMi4gUnVuOjpyZWN0KCkueCgpIGRvZXMgbm90IHJvdW5kIHRoZSBsb2dpY2FsIGxlZnQg Y29vcmRpbmF0ZSBhbnltb3JlLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRyZWVBc1Rl eHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6d3JpdGVTaW1wbGVMaW5lKToKKyAgICAgICAgKiBy ZW5kZXJpbmcvU2ltcGxlTGluZUxheW91dEZ1bmN0aW9ucy5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpTaW1wbGVMaW5lTGF5b3V0OjpwYWludEZsb3cpOgorICAgICAgICAoV2ViQ29yZTo6U2ltcGxl TGluZUxheW91dDo6Y29sbGVjdEZsb3dPdmVyZmxvdyk6CisgICAgICAgIChXZWJDb3JlOjpTaW1w bGVMaW5lTGF5b3V0Ojpjb2xsZWN0QWJzb2x1dGVSZWN0cyk6CisgICAgICAgIChXZWJDb3JlOjpT aW1wbGVMaW5lTGF5b3V0OjpzaG93TGluZUxheW91dEZvckZsb3cpOgorICAgICAgICAqIHJlbmRl cmluZy9TaW1wbGVMaW5lTGF5b3V0UmVzb2x2ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2lt cGxlTGluZUxheW91dDo6bGluZVBvc2l0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OlNpbXBsZUxp bmVMYXlvdXQ6OmxpbmVTaXplKToKKyAgICAgICAgKFdlYkNvcmU6OlNpbXBsZUxpbmVMYXlvdXQ6 OlJ1blJlc29sdmVyOjpSdW46OnJlY3QpOgorICAgICAgICAoV2ViQ29yZTo6U2ltcGxlTGluZUxh eW91dDo6TGluZVJlc29sdmVyOjpJdGVyYXRvcjo6b3BlcmF0b3IqKToKKyAgICAgICAgKFdlYkNv cmU6OlNpbXBsZUxpbmVMYXlvdXQ6OmJhc2VsaW5lUG9zaXRpb24pOiBEZWxldGVkLgorICAgICAg ICAoV2ViQ29yZTo6U2ltcGxlTGluZUxheW91dDo6UnVuUmVzb2x2ZXI6OlJ1bjo6YmFzZWxpbmUp OiBEZWxldGVkLgorICAgICAgICAqIHJlbmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0UmVzb2x2ZXIu aDoKKyAgICAgICAgKFdlYkNvcmU6OlNpbXBsZUxpbmVMYXlvdXQ6OlJ1blJlc29sdmVyOjpSdW46 OmJhc2VsaW5lUG9zaXRpb24pOgorICAgICAgICAoV2ViQ29yZTo6U2ltcGxlTGluZUxheW91dDo6 UnVuUmVzb2x2ZXI6OlJ1bjo6Y29tcHV0ZUJhc2VsaW5lUG9zaXRpb24pOgorCiAyMDE1LTA4LTI0 ICBNaWNoYWVsIENhdGFuemFybyAgPG1jYXRhbnphcm9AaWdhbGlhLmNvbT4KIAogICAgICAgICBV bnJldmlld2VkLCBmaXggdHlwbyBpbiBhIGNvbW1lbnQgKCJ1bnN1c2VkIiAtPiAidW51c2VkIikK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUcmVlQXNUZXh0LmNw cCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUcmVlQXNUZXh0LmNwcAppbmRleCBj NmM0MjBhOGM1ZDk5ZjRjMDNjMDk1YTE4ZDU3NmE3MTJlOWNjNmQyLi45NTI4OTAzZWUyMzI0ZGIz MWEzMzEzN2MxMjFiZDc0Yzc2MGE1NjIyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyVHJlZUFzVGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlclRyZWVBc1RleHQuY3BwCkBAIC00ODQsNyArNDg0LDcgQEAgc3RhdGljIHZvaWQgd3Jp dGVUZXh0UnVuKFRleHRTdHJlYW0mIHRzLCBjb25zdCBSZW5kZXJUZXh0JiBvLCBjb25zdCBJbmxp bmVUZXh0Qm8KICAgICB0cyA8PCAiXG4iOwogfQogCi1zdGF0aWMgdm9pZCB3cml0ZVNpbXBsZUxp bmUoVGV4dFN0cmVhbSYgdHMsIGNvbnN0IFJlbmRlclRleHQmIG8sIGNvbnN0IExheW91dFJlY3Qm IHJlY3QsIFN0cmluZ1ZpZXcgdGV4dCkKK3N0YXRpYyB2b2lkIHdyaXRlU2ltcGxlTGluZShUZXh0 U3RyZWFtJiB0cywgY29uc3QgUmVuZGVyVGV4dCYgbywgY29uc3QgRmxvYXRSZWN0JiByZWN0LCBT dHJpbmdWaWV3IHRleHQpCiB7CiAgICAgaW50IHggPSByZWN0LngoKTsKICAgICBpbnQgeSA9IHJl Y3QueSgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1NpbXBsZUxpbmVM YXlvdXRGdW5jdGlvbnMuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1NpbXBsZUxpbmVM YXlvdXRGdW5jdGlvbnMuY3BwCmluZGV4IDllZjVlYjA4MDFiMmU5OWY3Njg5Zjc2MGJlYzJjZDc4 NTUwY2JkY2MuLmRkYjBhZGJhMGQ5ZGRiZDQ5NjA0YzllYzhlMzFlMTEzNDY2ZDU2MDUgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0RnVuY3Rpb25z LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvU2ltcGxlTGluZUxheW91dEZ1bmN0 aW9ucy5jcHAKQEAgLTgwLDYgKzgwLDcgQEAgdm9pZCBwYWludEZsb3coY29uc3QgUmVuZGVyQmxv Y2tGbG93JiBmbG93LCBjb25zdCBMYXlvdXQmIGxheW91dCwgUGFpbnRJbmZvJiBwYWkKIAogICAg IGF1dG8gcmVzb2x2ZXIgPSBydW5SZXNvbHZlcihmbG93LCBsYXlvdXQpOwogICAgIGZsb2F0IHN0 cm9rZU92ZXJmbG93ID0gY2VpbGYoZmxvdy5zdHlsZSgpLnRleHRTdHJva2VXaWR0aCgpKTsKKyAg ICBmbG9hdCBkZXZpY2VTY2FsZUZhY3RvciA9IGZsb3cuZG9jdW1lbnQoKS5kZXZpY2VTY2FsZUZh Y3RvcigpOwogICAgIGZvciAoY29uc3QgYXV0byYgcnVuIDogcmVzb2x2ZXIucmFuZ2VGb3JSZWN0 KHBhaW50UmVjdCkpIHsKICAgICAgICAgRmxvYXRSZWN0IHJlY3QgPSBydW4ucmVjdCgpOwogICAg ICAgICByZWN0LmluZmxhdGUoc3Ryb2tlT3ZlcmZsb3cpOwpAQCAtODgsMTEgKzg5LDEwIEBAIHZv aWQgcGFpbnRGbG93KGNvbnN0IFJlbmRlckJsb2NrRmxvdyYgZmxvdywgY29uc3QgTGF5b3V0JiBs YXlvdXQsIFBhaW50SW5mbyYgcGFpCiAgICAgICAgIFRleHRSdW4gdGV4dFJ1bihydW4udGV4dCgp KTsKICAgICAgICAgdGV4dFJ1bi5zZXRUYWJTaXplKCFzdHlsZS5jb2xsYXBzZVdoaXRlU3BhY2Uo KSwgc3R5bGUudGFiU2l6ZSgpKTsKICAgICAgICAgdGV4dFJ1bi5zZXRYUG9zKHJ1bi5yZWN0KCku eCgpKTsKLSAgICAgICAgRmxvYXRQb2ludCB0ZXh0T3JpZ2luID0gcnVuLmJhc2VsaW5lKCkgKyBw YWludE9mZnNldDsKLSAgICAgICAgdGV4dE9yaWdpbi5zZXRZKHJvdW5kVG9EZXZpY2VQaXhlbChM YXlvdXRVbml0KHRleHRPcmlnaW4ueSgpKSwgZmxvdy5kb2N1bWVudCgpLmRldmljZVNjYWxlRmFj dG9yKCkpKTsKKyAgICAgICAgRmxvYXRQb2ludCB0ZXh0T3JpZ2luID0gRmxvYXRQb2ludChyZWN0 LngoKSArIHBhaW50T2Zmc2V0LngoKSwgcm91bmRUb0RldmljZVBpeGVsKHJ1bi5iYXNlbGluZVBv c2l0aW9uKCkgKyBwYWludE9mZnNldC55KCksIGRldmljZVNjYWxlRmFjdG9yKSk7CiAgICAgICAg IGNvbnRleHQuZHJhd1RleHQoZm9udCwgdGV4dFJ1biwgdGV4dE9yaWdpbik7CiAgICAgICAgIGlm IChkZWJ1Z0JvcmRlcnNFbmFibGVkKQotICAgICAgICAgICAgcGFpbnREZWJ1Z0JvcmRlcnMoY29u dGV4dCwgcnVuLnJlY3QoKSwgcGFpbnRPZmZzZXQpOworICAgICAgICAgICAgcGFpbnREZWJ1Z0Jv cmRlcnMoY29udGV4dCwgTGF5b3V0UmVjdChydW4ucmVjdCgpKSwgcGFpbnRPZmZzZXQpOwogICAg IH0KIH0KIApAQCAtMTMyLDcgKzEzMiw3IEBAIHZvaWQgY29sbGVjdEZsb3dPdmVyZmxvdyhSZW5k ZXJCbG9ja0Zsb3cmIGZsb3csIGNvbnN0IExheW91dCYgbGF5b3V0KQogICAgIGF1dG8gcmVzb2x2 ZXIgPSBsaW5lUmVzb2x2ZXIoZmxvdywgbGF5b3V0KTsKICAgICBmbG9hdCBzdHJva2VPdmVyZmxv dyA9IGNlaWxmKGZsb3cuc3R5bGUoKS50ZXh0U3Ryb2tlV2lkdGgoKSk7CiAgICAgZm9yIChhdXRv IGl0ID0gcmVzb2x2ZXIuYmVnaW4oKSwgZW5kID0gcmVzb2x2ZXIuZW5kKCk7IGl0ICE9IGVuZDsg KytpdCkgewotICAgICAgICBhdXRvIHJlY3QgPSAqaXQ7CisgICAgICAgIGF1dG8gcmVjdCA9IExh eW91dFJlY3QoKml0KTsKICAgICAgICAgcmVjdC5pbmZsYXRlKHN0cm9rZU92ZXJmbG93KTsKICAg ICAgICAgZmxvdy5hZGRMYXlvdXRPdmVyZmxvdyhyZWN0KTsKICAgICAgICAgZmxvdy5hZGRWaXN1 YWxPdmVyZmxvdyhyZWN0KTsKQEAgLTE2OSw3ICsxNjksNyBAQCBWZWN0b3I8SW50UmVjdD4gY29s bGVjdEFic29sdXRlUmVjdHMoY29uc3QgUmVuZGVyT2JqZWN0JiByZW5kZXJlciwgY29uc3QgTGF5 b3V0JgogICAgIFZlY3RvcjxJbnRSZWN0PiByZWN0czsKICAgICBhdXRvIHJlc29sdmVyID0gcnVu UmVzb2x2ZXIoZG93bmNhc3Q8UmVuZGVyQmxvY2tGbG93PigqcmVuZGVyZXIucGFyZW50KCkpLCBs YXlvdXQpOwogICAgIGZvciAoY29uc3QgYXV0byYgcnVuIDogcmVzb2x2ZXIucmFuZ2VGb3JSZW5k ZXJlcihyZW5kZXJlcikpIHsKLSAgICAgICAgTGF5b3V0UmVjdCByZWN0ID0gcnVuLnJlY3QoKTsK KyAgICAgICAgRmxvYXRSZWN0IHJlY3QgPSBydW4ucmVjdCgpOwogICAgICAgICByZWN0cy5hcHBl bmQoZW5jbG9zaW5nSW50UmVjdChGbG9hdFJlY3QoYWNjdW11bGF0ZWRPZmZzZXQgKyByZWN0Lmxv Y2F0aW9uKCksIHJlY3Quc2l6ZSgpKSkpOwogICAgIH0KICAgICByZXR1cm4gcmVjdHM7CkBAIC0y MDQsMTUgKzIwNCwxNCBAQCB2b2lkIHNob3dMaW5lTGF5b3V0Rm9yRmxvdyhjb25zdCBSZW5kZXJC bG9ja0Zsb3cmIGZsb3csIGNvbnN0IExheW91dCYgbGF5b3V0LCBpbgogICAgIGF1dG8gcmVzb2x2 ZXIgPSBydW5SZXNvbHZlcihmbG93LCBsYXlvdXQpOwogICAgIGZvciAoYXV0byBpdCA9IHJlc29s dmVyLmJlZ2luKCksIGVuZCA9IHJlc29sdmVyLmVuZCgpOyBpdCAhPSBlbmQ7ICsraXQpIHsKICAg ICAgICAgY29uc3QgYXV0byYgcnVuID0gKml0OwotICAgICAgICBMYXlvdXRSZWN0IHIgPSBydW4u cmVjdCgpOworICAgICAgICBGbG9hdFJlY3QgcmVjdCA9IHJ1bi5yZWN0KCk7CiAgICAgICAgIHBy aW50UHJlZml4KHByaW50ZWRDaGFyYWN0ZXJzLCBkZXB0aCk7CiAgICAgICAgIGlmIChydW4uc3Rh cnQoKSA8IHJ1bi5lbmQoKSkgewogICAgICAgICAgICAgZnByaW50ZihzdGRlcnIsICJsaW5lICV1 IHJ1bigldSwgJXUpICglLjJmLCAlLjJmKSAoJS4yZiwgJS4yZikgXCIlc1wiXG4iLCBydW4ubGlu ZUluZGV4KCksIHJ1bi5zdGFydCgpLCBydW4uZW5kKCksCi0gICAgICAgICAgICAgICAgci54KCku dG9GbG9hdCgpLCByLnkoKS50b0Zsb2F0KCksIHIud2lkdGgoKS50b0Zsb2F0KCksIHIuaGVpZ2h0 KCkudG9GbG9hdCgpLCBydW4udGV4dCgpLnRvU3RyaW5nV2l0aG91dENvcHlpbmcoKS51dGY4KCku ZGF0YSgpKTsKKyAgICAgICAgICAgICAgICByZWN0LngoKSwgcmVjdC55KCksIHJlY3Qud2lkdGgo KSwgcmVjdC5oZWlnaHQoKSwgcnVuLnRleHQoKS50b1N0cmluZ1dpdGhvdXRDb3B5aW5nKCkudXRm OCgpLmRhdGEoKSk7CiAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICBBU1NFUlQocnVuLnN0 YXJ0KCkgPT0gcnVuLmVuZCgpKTsKLSAgICAgICAgICAgIGZwcmludGYoc3RkZXJyLCAibGluZSBi cmVhayAldSBydW4oJXUsICV1KSAoJS4yZiwgJS4yZikgKCUuMmYsICUuMmYpXG4iLCBydW4ubGlu ZUluZGV4KCksIHJ1bi5zdGFydCgpLCBydW4uZW5kKCksCi0gICAgICAgICAgICAgICAgci54KCku dG9GbG9hdCgpLCByLnkoKS50b0Zsb2F0KCksIHIud2lkdGgoKS50b0Zsb2F0KCksIHIuaGVpZ2h0 KCkudG9GbG9hdCgpKTsKKyAgICAgICAgICAgIGZwcmludGYoc3RkZXJyLCAibGluZSBicmVhayAl dSBydW4oJXUsICV1KSAoJS4yZiwgJS4yZikgKCUuMmYsICUuMmYpXG4iLCBydW4ubGluZUluZGV4 KCksIHJ1bi5zdGFydCgpLCBydW4uZW5kKCksIHJlY3QueCgpLCByZWN0LnkoKSwgcmVjdC53aWR0 aCgpLCByZWN0LmhlaWdodCgpKTsKICAgICAgICAgfQogICAgIH0KIH0KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0UmVzb2x2ZXIuY3BwIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1NpbXBsZUxpbmVMYXlvdXRSZXNvbHZlci5jcHAKaW5kZXgg ZGUzNjM5ODNjMGY4NWRiN2FiNzlkMjQzNDZjNTI5YjRjYmNhNjU5MS4uNDM1OWZiOGRmOTY4MWM2 ZTU1YmIzMmY4ZDRiZDQ1ZTkzNDk4YzYwZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1NpbXBsZUxpbmVMYXlvdXRSZXNvbHZlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1NpbXBsZUxpbmVMYXlvdXRSZXNvbHZlci5jcHAKQEAgLTMzLDE5ICszMywxNCBA QAogbmFtZXNwYWNlIFdlYkNvcmUgewogbmFtZXNwYWNlIFNpbXBsZUxpbmVMYXlvdXQgewogCi1z dGF0aWMgZmxvYXQgYmFzZWxpbmVQb3NpdGlvbihmbG9hdCBsaW5lSGVpZ2h0LCBmbG9hdCBiYXNl bGluZSwgaW50IGxpbmVJbmRleCkKK3N0YXRpYyBGbG9hdFBvaW50IGxpbmVQb3NpdGlvbihmbG9h dCBsb2dpY2FsTGVmdCwgZmxvYXQgbG9naWNhbFRvcCkKIHsKLSAgICByZXR1cm4gbGluZUhlaWdo dCAqIGxpbmVJbmRleCArIGJhc2VsaW5lOworICAgIHJldHVybiBGbG9hdFBvaW50KGxvZ2ljYWxM ZWZ0LCByb3VuZGYobG9naWNhbFRvcCkpOwogfQogCi1zdGF0aWMgTGF5b3V0UG9pbnQgbGluZVBv c2l0aW9uKGZsb2F0IGxvZ2ljYWxMZWZ0LCBmbG9hdCBsb2dpY2FsVG9wKQorc3RhdGljIEZsb2F0 U2l6ZSBsaW5lU2l6ZShmbG9hdCBsb2dpY2FsTGVmdCwgZmxvYXQgbG9naWNhbFJpZ2h0LCBmbG9h dCBoZWlnaHQpCiB7Ci0gICAgcmV0dXJuIExheW91dFBvaW50KExheW91dFVuaXQ6OmZyb21GbG9h dEZsb29yKGxvZ2ljYWxMZWZ0KSwgcm91bmRUb0ludChsb2dpY2FsVG9wKSk7Ci19Ci0KLXN0YXRp YyBMYXlvdXRTaXplIGxpbmVTaXplKGZsb2F0IGxvZ2ljYWxMZWZ0LCBmbG9hdCBsb2dpY2FsUmln aHQsIGZsb2F0IGhlaWdodCkKLXsKLSAgICByZXR1cm4gTGF5b3V0U2l6ZShMYXlvdXRVbml0Ojpm cm9tRmxvYXRDZWlsKGxvZ2ljYWxSaWdodCkgLSBMYXlvdXRVbml0Ojpmcm9tRmxvYXRGbG9vcihs b2dpY2FsTGVmdCksIGhlaWdodCk7CisgICAgcmV0dXJuIEZsb2F0U2l6ZShsb2dpY2FsUmlnaHQg LSBsb2dpY2FsTGVmdCwgaGVpZ2h0KTsKIH0KIAogUnVuUmVzb2x2ZXI6OlJ1bjo6UnVuKGNvbnN0 IEl0ZXJhdG9yJiBpdGVyYXRvcikKQEAgLTUzLDEzICs0OCwxMyBAQCBSdW5SZXNvbHZlcjo6UnVu OjpSdW4oY29uc3QgSXRlcmF0b3ImIGl0ZXJhdG9yKQogewogfQogCi1MYXlvdXRSZWN0IFJ1blJl c29sdmVyOjpSdW46OnJlY3QoKSBjb25zdAorRmxvYXRSZWN0IFJ1blJlc29sdmVyOjpSdW46OnJl Y3QoKSBjb25zdAogewogICAgIGF1dG8mIHJ1biA9IG1faXRlcmF0b3Iuc2ltcGxlUnVuKCk7CiAg ICAgYXV0byYgcmVzb2x2ZXIgPSBtX2l0ZXJhdG9yLnJlc29sdmVyKCk7Ci0gICAgZmxvYXQgYmFz ZWxpbmUgPSBiYXNlbGluZVBvc2l0aW9uKHJlc29sdmVyLm1fbGluZUhlaWdodCwgcmVzb2x2ZXIu bV9iYXNlbGluZSwgbV9pdGVyYXRvci5saW5lSW5kZXgoKSk7Ci0gICAgTGF5b3V0UG9pbnQgcG9z aXRpb24gPSBsaW5lUG9zaXRpb24ocnVuLmxvZ2ljYWxMZWZ0LCBiYXNlbGluZSAtIHJlc29sdmVy Lm1fYXNjZW50ICsgcmVzb2x2ZXIubV9ib3JkZXJBbmRQYWRkaW5nQmVmb3JlKTsKLSAgICBMYXlv dXRTaXplIHNpemUgPSBsaW5lU2l6ZShydW4ubG9naWNhbExlZnQsIHJ1bi5sb2dpY2FsUmlnaHQs IHJlc29sdmVyLm1fYXNjZW50ICsgcmVzb2x2ZXIubV9kZXNjZW50KTsKKyAgICBmbG9hdCBiYXNl bGluZSA9IGNvbXB1dGVCYXNlbGluZVBvc2l0aW9uKCk7CisgICAgRmxvYXRQb2ludCBwb3NpdGlv biA9IGxpbmVQb3NpdGlvbihydW4ubG9naWNhbExlZnQsIGJhc2VsaW5lIC0gcmVzb2x2ZXIubV9h c2NlbnQpOworICAgIEZsb2F0U2l6ZSBzaXplID0gbGluZVNpemUocnVuLmxvZ2ljYWxMZWZ0LCBy dW4ubG9naWNhbFJpZ2h0LCByZXNvbHZlci5tX2FzY2VudCArIHJlc29sdmVyLm1fZGVzY2VudCk7 CiAgICAgYm9vbCBtb3ZlTGluZUJyZWFrVG9CYXNlbGluZSA9IGZhbHNlOwogICAgIGlmIChydW4u c3RhcnQgPT0gcnVuLmVuZCAmJiBtX2l0ZXJhdG9yICE9IHJlc29sdmVyLmJlZ2luKCkgJiYgbV9p dGVyYXRvci5pblF1aXJrc01vZGUoKSkgewogICAgICAgICBhdXRvIHByZXZpb3VzUnVuID0gbV9p dGVyYXRvcjsKQEAgLTY3LDE3ICs2Miw4IEBAIExheW91dFJlY3QgUnVuUmVzb2x2ZXI6OlJ1bjo6 cmVjdCgpIGNvbnN0CiAgICAgICAgIG1vdmVMaW5lQnJlYWtUb0Jhc2VsaW5lID0gIXByZXZpb3Vz UnVuLnNpbXBsZVJ1bigpLmlzRW5kT2ZMaW5lOwogICAgIH0KICAgICBpZiAobW92ZUxpbmVCcmVh a1RvQmFzZWxpbmUpCi0gICAgICAgIHJldHVybiBMYXlvdXRSZWN0KExheW91dFBvaW50KHBvc2l0 aW9uLngoKSwgYmFzZWxpbmUgKyByZXNvbHZlci5tX2JvcmRlckFuZFBhZGRpbmdCZWZvcmUpLCBM YXlvdXRTaXplKHNpemUud2lkdGgoKSwgc3RkOjptYXg8ZmxvYXQ+KDAsIHJlc29sdmVyLm1fYXNj ZW50IC0gcmVzb2x2ZXIubV9iYXNlbGluZS50b0Zsb2F0KCkpKSk7Ci0gICAgcmV0dXJuIExheW91 dFJlY3QocG9zaXRpb24sIHNpemUpOwotfQotCi1GbG9hdFBvaW50IFJ1blJlc29sdmVyOjpSdW46 OmJhc2VsaW5lKCkgY29uc3QKLXsKLSAgICBhdXRvJiByZXNvbHZlciA9IG1faXRlcmF0b3IucmVz b2x2ZXIoKTsKLSAgICBhdXRvJiBydW4gPSBtX2l0ZXJhdG9yLnNpbXBsZVJ1bigpOwotCi0gICAg ZmxvYXQgYmFzZWxpbmUgPSBiYXNlbGluZVBvc2l0aW9uKHJlc29sdmVyLm1fbGluZUhlaWdodCwg cmVzb2x2ZXIubV9iYXNlbGluZSwgbV9pdGVyYXRvci5saW5lSW5kZXgoKSk7Ci0gICAgcmV0dXJu IEZsb2F0UG9pbnQocnVuLmxvZ2ljYWxMZWZ0LCByb3VuZFRvSW50KGJhc2VsaW5lICsgcmVzb2x2 ZXIubV9ib3JkZXJBbmRQYWRkaW5nQmVmb3JlKSk7CisgICAgICAgIHJldHVybiBGbG9hdFJlY3Qo RmxvYXRQb2ludChwb3NpdGlvbi54KCksIGJhc2VsaW5lKSwgRmxvYXRTaXplKHNpemUud2lkdGgo KSwgc3RkOjptYXg8ZmxvYXQ+KDAsIHJlc29sdmVyLm1fYXNjZW50IC0gcmVzb2x2ZXIubV9iYXNl bGluZS50b0Zsb2F0KCkpKSk7CisgICAgcmV0dXJuIEZsb2F0UmVjdChwb3NpdGlvbiwgc2l6ZSk7 CiB9CiAKIFN0cmluZ1ZpZXcgUnVuUmVzb2x2ZXI6OlJ1bjo6dGV4dCgpIGNvbnN0CkBAIC0yMDQs MTQgKzE5MCwxMyBAQCBMaW5lUmVzb2x2ZXI6Okl0ZXJhdG9yOjpJdGVyYXRvcihSdW5SZXNvbHZl cjo6SXRlcmF0b3IgcnVuSXRlcmF0b3IpCiB7CiB9CiAKLWNvbnN0IExheW91dFJlY3QgTGluZVJl c29sdmVyOjpJdGVyYXRvcjo6b3BlcmF0b3IqKCkgY29uc3QKK2NvbnN0IEZsb2F0UmVjdCBMaW5l UmVzb2x2ZXI6Okl0ZXJhdG9yOjpvcGVyYXRvciooKSBjb25zdAogewogICAgIHVuc2lnbmVkIGN1 cnJlbnRMaW5lID0gbV9ydW5JdGVyYXRvci5saW5lSW5kZXgoKTsKICAgICBhdXRvIGl0ID0gbV9y dW5JdGVyYXRvcjsKLSAgICBMYXlvdXRSZWN0IHJlY3QgPSAoKml0KS5yZWN0KCk7CisgICAgRmxv YXRSZWN0IHJlY3QgPSAoKml0KS5yZWN0KCk7CiAgICAgd2hpbGUgKGl0LmFkdmFuY2UoKS5saW5l SW5kZXgoKSA9PSBjdXJyZW50TGluZSkKICAgICAgICAgcmVjdC51bml0ZSgoKml0KS5yZWN0KCkp OwotCiAgICAgcmV0dXJuIHJlY3Q7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0UmVzb2x2ZXIuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9TaW1wbGVMaW5lTGF5b3V0UmVzb2x2ZXIuaAppbmRleCA0NjcyMTdmMzQxODEwZjgwOGE4 MDFiMmI4MWE4ZWIzODNkNWM1ODcwLi4xZGE0NTk5Y2Q0YzVjYzJhNWZmMjAzZGEwZGNhNjMwNGY0 YjFiZTgxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvU2ltcGxlTGluZUxh eW91dFJlc29sdmVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1NpbXBsZUxpbmVM YXlvdXRSZXNvbHZlci5oCkBAIC02MSwxNCArNjEsMTYgQEAgcHVibGljOgogICAgICAgICB1bnNp Z25lZCBzdGFydCgpIGNvbnN0OwogICAgICAgICB1bnNpZ25lZCBlbmQoKSBjb25zdDsKIAotICAg ICAgICBMYXlvdXRSZWN0IHJlY3QoKSBjb25zdDsKLSAgICAgICAgRmxvYXRQb2ludCBiYXNlbGlu ZSgpIGNvbnN0OworICAgICAgICBGbG9hdFJlY3QgcmVjdCgpIGNvbnN0OworICAgICAgICBpbnQg YmFzZWxpbmVQb3NpdGlvbigpIGNvbnN0OwogICAgICAgICBTdHJpbmdWaWV3IHRleHQoKSBjb25z dDsKICAgICAgICAgYm9vbCBpc0VuZE9mTGluZSgpIGNvbnN0OwogCiAgICAgICAgIHVuc2lnbmVk IGxpbmVJbmRleCgpIGNvbnN0OwogCiAgICAgcHJpdmF0ZToKKyAgICAgICAgZmxvYXQgY29tcHV0 ZUJhc2VsaW5lUG9zaXRpb24oKSBjb25zdDsKKwogICAgICAgICBjb25zdCBJdGVyYXRvciYgbV9p dGVyYXRvcjsKICAgICB9OwogCkBAIC0xMzYsNyArMTM4LDcgQEAgcHVibGljOgogICAgICAgICBi b29sIG9wZXJhdG9yPT0oY29uc3QgSXRlcmF0b3ImKSBjb25zdDsKICAgICAgICAgYm9vbCBvcGVy YXRvciE9KGNvbnN0IEl0ZXJhdG9yJikgY29uc3Q7CiAKLSAgICAgICAgY29uc3QgTGF5b3V0UmVj dCBvcGVyYXRvciooKSBjb25zdDsKKyAgICAgICAgY29uc3QgRmxvYXRSZWN0IG9wZXJhdG9yKigp IGNvbnN0OwogCiAgICAgcHJpdmF0ZToKICAgICAgICAgUnVuUmVzb2x2ZXI6Okl0ZXJhdG9yIG1f cnVuSXRlcmF0b3I7CkBAIC0xNjcsNiArMTY5LDExIEBAIGlubGluZSB1bnNpZ25lZCBSdW5SZXNv bHZlcjo6UnVuOjplbmQoKSBjb25zdAogICAgIHJldHVybiBtX2l0ZXJhdG9yLnNpbXBsZVJ1bigp LmVuZDsKIH0KIAoraW5saW5lIGludCBSdW5SZXNvbHZlcjo6UnVuOjpiYXNlbGluZVBvc2l0aW9u KCkgY29uc3QKK3sKKyAgICByZXR1cm4gcm91bmRUb0ludChjb21wdXRlQmFzZWxpbmVQb3NpdGlv bigpKTsKK30KKwogaW5saW5lIGJvb2wgUnVuUmVzb2x2ZXI6OlJ1bjo6aXNFbmRPZkxpbmUoKSBj b25zdAogewogICAgIHJldHVybiBtX2l0ZXJhdG9yLnNpbXBsZVJ1bigpLmlzRW5kT2ZMaW5lOwpA QCAtMTgyLDYgKzE4OSwxMiBAQCBpbmxpbmUgUnVuUmVzb2x2ZXI6Okl0ZXJhdG9yJiBSdW5SZXNv bHZlcjo6SXRlcmF0b3I6Om9wZXJhdG9yKysoKQogICAgIHJldHVybiBhZHZhbmNlKCk7CiB9CiAK K2lubGluZSBmbG9hdCBSdW5SZXNvbHZlcjo6UnVuOjpjb21wdXRlQmFzZWxpbmVQb3NpdGlvbigp IGNvbnN0Cit7CisgICAgYXV0byYgcmVzb2x2ZXIgPSBtX2l0ZXJhdG9yLnJlc29sdmVyKCk7Cisg ICAgcmV0dXJuIHJlc29sdmVyLm1fbGluZUhlaWdodCAqIGxpbmVJbmRleCgpICsgcmVzb2x2ZXIu bV9iYXNlbGluZSArIHJlc29sdmVyLm1fYm9yZGVyQW5kUGFkZGluZ0JlZm9yZTsKK30KKwogaW5s aW5lIFJ1blJlc29sdmVyOjpJdGVyYXRvciYgUnVuUmVzb2x2ZXI6Okl0ZXJhdG9yOjpvcGVyYXRv ci0tKCkKIHsKICAgICAtLW1fcnVuSW5kZXg7Cg==