115046 2013-04-23 10:41:47 -0700 Pick up color and mat values in custom shaders 2013-04-23 14:17:30 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 113695 1 krit webkit-unassigned achicu commit-queue dino mvujovic oldest_to_newest 879969 0 krit 2013-04-23 10:41:47 -0700 Pick up color and mat values in custom shaders. So far just CSS parsing works. 879978 1 199279 krit 2013-04-23 10:59:05 -0700 Created attachment 199279 Patch. 880103 2 199279 dino 2013-04-23 13:36:07 -0700 Comment on attachment 199279 Patch. View in context: https://bugs.webkit.org/attachment.cgi?id=199279&action=review > Source/WebCore/ChangeLog:18 > + (WebCore): I really should fix the prepare-ChangeLog script to stop producing these lines. 880121 3 199279 commit-queue 2013-04-23 14:17:28 -0700 Comment on attachment 199279 Patch. Clearing flags on attachment: 199279 Committed r148992: <http://trac.webkit.org/changeset/148992> 880122 4 commit-queue 2013-04-23 14:17:30 -0700 All reviewed patches have been landed. Closing bug. 199279 2013-04-23 10:59:05 -0700 2013-04-23 14:17:28 -0700 Patch. custom-shader.patch text/plain 12618 krit ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA3ZjZjNWU5Li5kZjIyNDJiIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTMtMDQt MjMgIERpcmsgU2NodWx6ZSAgPGtyaXRAd2Via2l0Lm9yZz4KKworICAgICAgICBQaWNrIHVwIGNv bG9yIGFuZCBtYXQgdmFsdWVzIGluIGN1c3RvbSBzaGFkZXJzCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTUwNDYKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUZXN0IHRoYXQgdGhlIENTUyBkZWZpbmVkIGNv bG9yIHZhbHVlcyBhbmQgbWF0Mi00IGZ1bmN0aW9ucyBnZXQgCisgICAgICAgIHNldCBhcyB1bmlm b3JtcyBpbiBzaGFkZXIgcHJvZ3JhbXMuCisKKyAgICAgICAgKiBjc3MzL2ZpbHRlcnMvY3VzdG9t L2N1c3RvbS1maWx0ZXItY29sb3ItZXhwZWN0ZWQuaHRtbDogQWRkZWQuCisgICAgICAgICogY3Nz My9maWx0ZXJzL2N1c3RvbS9jdXN0b20tZmlsdGVyLWNvbG9yLmh0bWw6IEFkZGVkLgorICAgICAg ICAqIGNzczMvZmlsdGVycy9jdXN0b20vY3VzdG9tLWZpbHRlci1tYXROLWV4cGVjdGVkLmh0bWw6 IEFkZGVkLgorICAgICAgICAqIGNzczMvZmlsdGVycy9jdXN0b20vY3VzdG9tLWZpbHRlci1tYXRO Lmh0bWw6IEFkZGVkLgorCiAyMDEzLTA0LTIyICBBbmR5IEVzdGVzICA8YWVzdGVzQGFwcGxlLmNv bT4KIAogICAgICAgICBSYW5nZS5nZXRDbGllbnRSZWN0cygpIHNob3VsZCBub3QgaW5jbHVkZSBy ZWN0cyBmb3IgcGFydGlhbGx5IHNlbGVjdGVkIGVsZW1lbnRzCmRpZmYgLS1naXQgYS9MYXlvdXRU ZXN0cy9jc3MzL2ZpbHRlcnMvY3VzdG9tL2N1c3RvbS1maWx0ZXItY29sb3ItZXhwZWN0ZWQuaHRt bCBiL0xheW91dFRlc3RzL2NzczMvZmlsdGVycy9jdXN0b20vY3VzdG9tLWZpbHRlci1jb2xvci1l eHBlY3RlZC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjhlOThlYTQK LS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9jc3MzL2ZpbHRlcnMvY3VzdG9tL2N1c3Rv bS1maWx0ZXItY29sb3ItZXhwZWN0ZWQuaHRtbApAQCAtMCwwICsxLDE2IEBACis8IWRvY3R5cGUg aHRtbD4KKzxodG1sPgorICAgIDxoZWFkPgorICAgICAgICA8dGl0bGU+VGVzdHMgY29sb3IgdmFs dWVzIGluIGN1c3RvbSBmaWx0ZXJzPC90aXRsZT4KKyAgICAgICAgPHN0eWxlPgorICAgICAgICAg ICAgI2ZpbHRlcnRlc3Rib3ggeworICAgICAgICAgICAgICAgIGhlaWdodDogMTAwcHg7CisgICAg ICAgICAgICAgICAgd2lkdGg6IDEwMHB4OworICAgICAgICAgICAgICAgIGJhY2tncm91bmQtY29s b3I6IHJnYigwLCAyNTUsIDApOworICAgICAgICAgICAgfQorICAgICAgICA8L3N0eWxlPgorICAg IDwvaGVhZD4KKyAgICA8Ym9keSBvbmxvYWQ9InJ1blRlc3QoKSI+CisgICAgICAgIDxkaXYgaWQ9 ImZpbHRlcnRlc3Rib3giPjwvZGl2PgorICAgIDwvYm9keT4KKzwvaHRtbD4KZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL2NzczMvZmlsdGVycy9jdXN0b20vY3VzdG9tLWZpbHRlci1jb2xvci5odG1s IGIvTGF5b3V0VGVzdHMvY3NzMy9maWx0ZXJzL2N1c3RvbS9jdXN0b20tZmlsdGVyLWNvbG9yLmh0 bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMjBlOWQ1ZgotLS0gL2Rldi9u dWxsCisrKyBiL0xheW91dFRlc3RzL2NzczMvZmlsdGVycy9jdXN0b20vY3VzdG9tLWZpbHRlci1j b2xvci5odG1sCkBAIC0wLDAgKzEsNDIgQEAKKzwhZG9jdHlwZSBodG1sPgorPGh0bWw+CisgICAg PGhlYWQ+CisgICAgICAgIDx0aXRsZT5UZXN0cyBjb2xvciB2YWx1ZXMgaW4gY3VzdG9tIGZpbHRl cnM8L3RpdGxlPgorICAgICAgICA8c2NyaXB0PgorICAgICAgICAgICAgaWYgKHdpbmRvdy50ZXN0 UnVubmVyKSB7CisgICAgICAgICAgICAgICAgd2luZG93LnRlc3RSdW5uZXIub3ZlcnJpZGVQcmVm ZXJlbmNlKCJXZWJLaXRDU1NDdXN0b21GaWx0ZXJFbmFibGVkIiwgIjEiKTsKKyAgICAgICAgICAg ICAgICB3aW5kb3cudGVzdFJ1bm5lci5vdmVycmlkZVByZWZlcmVuY2UoIldlYktpdFdlYkdMRW5h YmxlZCIsICIxIik7CisgICAgICAgICAgICAgICAgd2luZG93LnRlc3RSdW5uZXIud2FpdFVudGls RG9uZSgpOworICAgICAgICAgICAgfQorCisgICAgICAgICAgICBmdW5jdGlvbiBydW5UZXN0KCkK KyAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICAvLyBXZSBuZWVkIHRvIHJ1biB0aGUgdGVz dHMgYWZ0ZXIgdGhlIGRvd25sb2FkaW5nIHN1Y2NlZWRlZC4KKyAgICAgICAgICAgICAgICBpZiAo d2luZG93LnRlc3RSdW5uZXIpCisgICAgICAgICAgICAgICAgICAgIHdpbmRvdy50ZXN0UnVubmVy Lm5vdGlmeURvbmUoKTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgPC9zY3JpcHQ+CisgICAgICAg IDxzdHlsZT4KKyAgICAgICAgICAgICNmaWx0ZXJ0ZXN0Ym94IHsKKyAgICAgICAgICAgICAgICBo ZWlnaHQ6IDEwMHB4OworICAgICAgICAgICAgICAgIHdpZHRoOiAxMDBweDsKKyAgICAgICAgICAg ICAgICBiYWNrZ3JvdW5kLWNvbG9yOiByZWQ7CisgICAgICAgICAgICAgICAgLXdlYmtpdC1maWx0 ZXI6IGN1c3RvbShub25lIHVybCgnLi4vcmVzb3VyY2VzL2ZyYWdtZW50LWNvbG9ycy5mcycpLAor ICAgICAgICAgICAgICAgICAgICBjMSByZ2IoMCwgMjU1LCAwKSwKKyAgICAgICAgICAgICAgICAg ICAgYzIgcmdiYSgwLCAyNTUsIDAsIDEuMCksCisgICAgICAgICAgICAgICAgICAgIGMzIGxpbWUs CisgICAgICAgICAgICAgICAgICAgIGM0IGhzbCgxMjAsIDEwMCUsIDUwJSksCisgICAgICAgICAg ICAgICAgICAgIGM1IGhzbGEoMTIwLCAxMDAlLCA1MCUsIDEuMCksCisgICAgICAgICAgICAgICAg ICAgIGM2ICMwMEZGMDAKKyAgICAgICAgICAgICAgICApOworICAgICAgICAgICAgfQorICAgICAg ICA8L3N0eWxlPgorICAgIDwvaGVhZD4KKyAgICA8Ym9keSBvbmxvYWQ9InJ1blRlc3QoKSI+Cisg ICAgICAgIDwhLS0KKyAgICAgICAgICAgIEEgMTAweDEwMHB4IHJlZCBkaXYgaXMgY29sb3VyZWQg bGltZSBieSBmcmFnbWVudC1jb2xvcnMuZnMsIGEgZnJhZ21lbnQgc2hhZGVyLgorICAgICAgICAg ICAgRmFpbHMgaWYgdGhlIGRpdiBzdGF5cyByZWQuCisgICAgICAgIC0tPgorICAgICAgICA8ZGl2 IGlkPSJmaWx0ZXJ0ZXN0Ym94Ij48L2Rpdj4KKyAgICA8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1n aXQgYS9MYXlvdXRUZXN0cy9jc3MzL2ZpbHRlcnMvY3VzdG9tL2N1c3RvbS1maWx0ZXItbWF0Ti1l eHBlY3RlZC5odG1sIGIvTGF5b3V0VGVzdHMvY3NzMy9maWx0ZXJzL2N1c3RvbS9jdXN0b20tZmls dGVyLW1hdE4tZXhwZWN0ZWQuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAw Li45ODcwZDRlCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvY3NzMy9maWx0ZXJzL2N1 c3RvbS9jdXN0b20tZmlsdGVyLW1hdE4tZXhwZWN0ZWQuaHRtbApAQCAtMCwwICsxLDE2IEBACis8 IWRvY3R5cGUgaHRtbD4KKzxodG1sPgorICAgIDxoZWFkPgorICAgICAgICA8dGl0bGU+VGVzdHMg bWF0TigpIGZ1bmN0aW9ucyBpbiBjdXN0b20gZmlsdGVyczwvdGl0bGU+CisgICAgICAgIDxzdHls ZT4KKyAgICAgICAgICAgICNmaWx0ZXJ0ZXN0Ym94IHsKKyAgICAgICAgICAgICAgICBoZWlnaHQ6 IDEwMHB4OworICAgICAgICAgICAgICAgIHdpZHRoOiAxMDBweDsKKyAgICAgICAgICAgICAgICBi YWNrZ3JvdW5kLWNvbG9yOiByZ2IoMCwgMjU1LCAwKTsKKyAgICAgICAgICAgIH0KKyAgICAgICAg PC9zdHlsZT4KKyAgICA8L2hlYWQ+CisgICAgPGJvZHkgb25sb2FkPSJydW5UZXN0KCkiPgorICAg ICAgICA8ZGl2IGlkPSJmaWx0ZXJ0ZXN0Ym94Ij48L2Rpdj4KKyAgICA8L2JvZHk+Cis8L2h0bWw+ CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9jc3MzL2ZpbHRlcnMvY3VzdG9tL2N1c3RvbS1maWx0 ZXItbWF0Ti5odG1sIGIvTGF5b3V0VGVzdHMvY3NzMy9maWx0ZXJzL2N1c3RvbS9jdXN0b20tZmls dGVyLW1hdE4uaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi45YjUxOTFm Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvY3NzMy9maWx0ZXJzL2N1c3RvbS9jdXN0 b20tZmlsdGVyLW1hdE4uaHRtbApAQCAtMCwwICsxLDM5IEBACis8IWRvY3R5cGUgaHRtbD4KKzxo dG1sPgorICAgIDxoZWFkPgorICAgICAgICA8dGl0bGU+VGVzdHMgbWF0TigpIGZ1bmN0aW9ucyBp biBjdXN0b20gZmlsdGVyczwvdGl0bGU+CisgICAgICAgIDxzY3JpcHQ+CisgICAgICAgICAgICBp ZiAod2luZG93LnRlc3RSdW5uZXIpIHsKKyAgICAgICAgICAgICAgICB3aW5kb3cudGVzdFJ1bm5l ci5vdmVycmlkZVByZWZlcmVuY2UoIldlYktpdENTU0N1c3RvbUZpbHRlckVuYWJsZWQiLCAiMSIp OworICAgICAgICAgICAgICAgIHdpbmRvdy50ZXN0UnVubmVyLm92ZXJyaWRlUHJlZmVyZW5jZSgi V2ViS2l0V2ViR0xFbmFibGVkIiwgIjEiKTsKKyAgICAgICAgICAgICAgICB3aW5kb3cudGVzdFJ1 bm5lci53YWl0VW50aWxEb25lKCk7CisgICAgICAgICAgICB9CisKKyAgICAgICAgICAgIGZ1bmN0 aW9uIHJ1blRlc3QoKQorICAgICAgICAgICAgeworICAgICAgICAgICAgICAgIC8vIFdlIG5lZWQg dG8gcnVuIHRoZSB0ZXN0cyBhZnRlciB0aGUgZG93bmxvYWRpbmcgc3VjY2VlZGVkLgorICAgICAg ICAgICAgICAgIGlmICh3aW5kb3cudGVzdFJ1bm5lcikKKyAgICAgICAgICAgICAgICAgICAgd2lu ZG93LnRlc3RSdW5uZXIubm90aWZ5RG9uZSgpOworICAgICAgICAgICAgfQorICAgICAgICA8L3Nj cmlwdD4KKyAgICAgICAgPHN0eWxlPgorICAgICAgICAgICAgI2ZpbHRlcnRlc3Rib3ggeworICAg ICAgICAgICAgICAgIGhlaWdodDogMTAwcHg7CisgICAgICAgICAgICAgICAgd2lkdGg6IDEwMHB4 OworICAgICAgICAgICAgICAgIGJhY2tncm91bmQtY29sb3I6IHJlZDsKKyAgICAgICAgICAgICAg ICAtd2Via2l0LWZpbHRlcjogY3VzdG9tKG5vbmUgdXJsKCcuLi9yZXNvdXJjZXMvZnJhZ21lbnQt bWF0Ti5mcycpLAorICAgICAgICAgICAgICAgICAgICBtMSBtYXQyKDEsIDEsIDAsIDApLAorICAg ICAgICAgICAgICAgICAgICBtMiBtYXQzKDEsIDAsIDEsIDAsIDEsIDEsIDAsIDEsIDApLAorICAg ICAgICAgICAgICAgICAgICBtMyBtYXQ0KDEsIDEsIDAsIDAsIDAsIDEsIDEsIDAsIDEsIDAsIDAs IDEsIDEsIDEsIDEsIDEpCisgICAgICAgICAgICAgICAgKTsKKyAgICAgICAgICAgIH0KKyAgICAg ICAgPC9zdHlsZT4KKyAgICA8L2hlYWQ+CisgICAgPGJvZHkgb25sb2FkPSJydW5UZXN0KCkiPgor ICAgICAgICA8IS0tCisgICAgICAgICAgICBBIDEwMHgxMDBweCByZWQgZGl2IGlzIGNvbG91cmVk IGxpbWUgYnkgZnJhZ21lbnQtbWF0Ti5mcywgYSBmcmFnbWVudCBzaGFkZXIuCisgICAgICAgICAg ICBGYWlscyBpZiB0aGUgZGl2IHN0YXlzIHJlZC4KKyAgICAgICAgLS0+CisgICAgICAgIDxkaXYg aWQ9ImZpbHRlcnRlc3Rib3giPjwvZGl2PgorICAgIDwvYm9keT4KKzwvaHRtbD4KZGlmZiAtLWdp dCBhL0xheW91dFRlc3RzL2NzczMvZmlsdGVycy9yZXNvdXJjZXMvZnJhZ21lbnQtY29sb3JzLmZz IGIvTGF5b3V0VGVzdHMvY3NzMy9maWx0ZXJzL3Jlc291cmNlcy9mcmFnbWVudC1jb2xvcnMuZnMK bmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uYWNjMGUzYQotLS0gL2Rldi9udWxs CisrKyBiL0xheW91dFRlc3RzL2NzczMvZmlsdGVycy9yZXNvdXJjZXMvZnJhZ21lbnQtY29sb3Jz LmZzCkBAIC0wLDAgKzEsMTUgQEAKK3ByZWNpc2lvbiBtZWRpdW1wIGZsb2F0OwordW5pZm9ybSB2 ZWM0IGMxOwordW5pZm9ybSB2ZWM0IGMyOwordW5pZm9ybSB2ZWM0IGMzOwordW5pZm9ybSB2ZWM0 IGM0OwordW5pZm9ybSB2ZWM0IGM1OwordW5pZm9ybSB2ZWM0IGM2OworCit2b2lkIG1haW4oKQor eworCWlmIChjMSA9PSBjMiAmJiBjMSA9PSBjMyAmJiBjMSA9PSBjNCAmJiBjMSA9PSBjNSAmJiBj MSA9PSBjNikKKyAgICAJZ2xfRnJhZ0NvbG9yID0gYzE7CisgICAgZWxzZSAKKyAgICAJZ2xfRnJh Z0NvbG9yID0gdmVjNCgxLjAsIDAuMCwgMC4wLCAxLjApOworfQpkaWZmIC0tZ2l0IGEvTGF5b3V0 VGVzdHMvY3NzMy9maWx0ZXJzL3Jlc291cmNlcy9mcmFnbWVudC1tYXROLmZzIGIvTGF5b3V0VGVz dHMvY3NzMy9maWx0ZXJzL3Jlc291cmNlcy9mcmFnbWVudC1tYXROLmZzCm5ldyBmaWxlIG1vZGUg MTAwNjQ0CmluZGV4IDAwMDAwMDAuLmVmZDMxMTYKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRU ZXN0cy9jc3MzL2ZpbHRlcnMvcmVzb3VyY2VzL2ZyYWdtZW50LW1hdE4uZnMKQEAgLTAsMCArMSwy MyBAQAorcHJlY2lzaW9uIG1lZGl1bXAgZmxvYXQ7Cit1bmlmb3JtIG1hdDIgbTE7Cit1bmlmb3Jt IG1hdDMgbTI7Cit1bmlmb3JtIG1hdDQgbTM7CisKK3ZvaWQgbWFpbigpCit7CisgICAgLy8gVGVz dGluZyBpbmRpdmlkdWFsIGVudHJpZXMgdG8gY2hlY2sgY29ycmVjdCBvcmRlci4KKyAgICBpZiAo bTFbMF1bMF0gPT0gMS4gJiYgbTFbMF1bMV0gPT0gMS4KKyAgICAgICAgJiYgbTFbMV1bMF0gPT0g MC4gJiYgbTFbMV1bMV0gPT0gMC4KKyAgICAgICAgJiYKKyAgICAgICAgbTJbMF1bMF0gPT0gMS4g JiYgbTJbMF1bMV0gPT0gMC4gJiYgbTJbMF1bMl0gPT0gMS4KKyAgICAgICAgJiYgbTJbMV1bMF0g PT0gMC4gJiYgbTJbMV1bMV0gPT0gMS4gJiYgbTJbMV1bMl0gPT0gMS4KKyAgICAgICAgJiYgbTJb Ml1bMF0gPT0gMC4gJiYgbTJbMl1bMV0gPT0gMS4gJiYgbTJbMl1bMl0gPT0gMC4KKyAgICAgICAg JiYKKyAgICAgICAgbTNbMF1bMF0gPT0gMS4gJiYgbTNbMF1bMV0gPT0gMS4gJiYgbTNbMF1bMl0g PT0gMC4gJiYgbTNbMF1bM10gPT0gMC4KKyAgICAgICAgJiYgbTNbMV1bMF0gPT0gMC4gJiYgbTNb MV1bMV0gPT0gMS4gJiYgbTNbMV1bMl0gPT0gMS4gJiYgbTNbMV1bM10gPT0gMC4KKyAgICAgICAg JiYgbTNbMl1bMF0gPT0gMS4gJiYgbTNbMl1bMV0gPT0gMC4gJiYgbTNbMl1bMl0gPT0gMC4gJiYg bTNbMl1bM10gPT0gMS4KKyAgICAgICAgJiYgbTNbM11bMF0gPT0gMS4gJiYgbTNbM11bMV0gPT0g MS4gJiYgbTNbM11bMl0gPT0gMS4gJiYgbTNbM11bM10gPT0gMS4pCisgICAgICAgIGdsX0ZyYWdD b2xvciA9IHZlYzQoMC4wLCAxLjAsIDAuMCwgMS4wKTsKKyAgICBlbHNlIAorICAgICAgICBnbF9G cmFnQ29sb3IgPSB2ZWM0KDEuMCwgMC4wLCAwLjAsIDEuMCk7Cit9CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDk1 ZjM5Yi4uNmIxZGI4OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDEzLTA0LTIzICBE aXJrIFNjaHVsemUgIDxrcml0QHdlYmtpdC5vcmc+CisKKyAgICAgICAgUGljayB1cCBjb2xvciBh bmQgbWF0IHZhbHVlcyBpbiBjdXN0b20gc2hhZGVycworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE1MDQ2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIGN1c3RvbSBmaWx0ZXIgZnVuY3Rpb25zIGFjY2Vw dCBjb2xvciB2YWx1ZXMgYW5kIG1hdDItNCBmdW5jdGlvbnMKKyAgICAgICAgYXMgcGFyYW1ldGVy IHR5cGVzLiBUaGVzZSB3ZXJlIGltcGxlbWVudGVkIGluIENTUyBhbHJlYWR5LgorICAgICAgICBU aGlzIHBhdGNoIHBpY2tzIHVwIHRoZSB2YWx1ZXMgYW5kIGFwcGxpZXMgdGhlbSBhcyB1bmlmb3Jt cyB0byB0aGUKKyAgICAgICAgY3VzdG9tIHNoYWRlciBwcm9ncmFtLiAKKworICAgICAgICBUZXN0 czogY3NzMy9maWx0ZXJzL2N1c3RvbS9jdXN0b20tZmlsdGVyLWNvbG9yLmh0bWwKKyAgICAgICAg ICAgICAgIGNzczMvZmlsdGVycy9jdXN0b20vY3VzdG9tLWZpbHRlci1tYXROLmh0bWwKKworICAg ICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2ZpbHRlcnMvQ3VzdG9tRmlsdGVyUmVuZGVyZXIuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6Q3VzdG9tRmlsdGVyUmVuZGVyZXI6OmJpbmRQcm9ncmFtQ29s b3JQYXJhbWV0ZXJzKTogU2V0IHVuaWZvcm0gZm9yIGNvbG9yIHZhbHVlcy4KKyAgICAgICAgKFdl YkNvcmUpOgorICAgICAgICAoV2ViQ29yZTo6Q3VzdG9tRmlsdGVyUmVuZGVyZXI6OmJpbmRQcm9n cmFtTWF0cml4UGFyYW1ldGVycyk6IFNldCB1bmlmb3JtIGZvciBtYXQyLTQgdmFsdWVzLgorICAg ICAgICAoV2ViQ29yZTo6Q3VzdG9tRmlsdGVyUmVuZGVyZXI6OmJpbmRQcm9ncmFtUGFyYW1ldGVy cyk6IENhbGwgY29sb3IgYW5kIG1hdHJpeCBmdW5jdGlvbnMuCisgICAgICAgICogcGxhdGZvcm0v Z3JhcGhpY3MvZmlsdGVycy9DdXN0b21GaWx0ZXJSZW5kZXJlci5oOgorICAgICAgICAoV2ViQ29y ZSk6CisgICAgICAgIChDdXN0b21GaWx0ZXJSZW5kZXJlcik6CisKIDIwMTMtMDQtMjIgIEFuZHkg RXN0ZXMgIDxhZXN0ZXNAYXBwbGUuY29tPgogCiAgICAgICAgIFJhbmdlLmdldENsaWVudFJlY3Rz KCkgc2hvdWxkIG5vdCBpbmNsdWRlIHJlY3RzIGZvciBwYXJ0aWFsbHkgc2VsZWN0ZWQgZWxlbWVu dHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2ZpbHRlcnMv Q3VzdG9tRmlsdGVyUmVuZGVyZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvZmlsdGVycy9DdXN0b21GaWx0ZXJSZW5kZXJlci5jcHAKaW5kZXggYjdjNzhiNS4uNjJlZDM5 MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZmlsdGVycy9D dXN0b21GaWx0ZXJSZW5kZXJlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvZmlsdGVycy9DdXN0b21GaWx0ZXJSZW5kZXJlci5jcHAKQEAgLTM1LDYgKzM1LDcgQEAK ICNpbmNsdWRlICJDdXN0b21GaWx0ZXJSZW5kZXJlci5oIgogCiAjaW5jbHVkZSAiQ3VzdG9tRmls dGVyQXJyYXlQYXJhbWV0ZXIuaCIKKyNpbmNsdWRlICJDdXN0b21GaWx0ZXJDb2xvclBhcmFtZXRl ci5oIgogI2luY2x1ZGUgIkN1c3RvbUZpbHRlckNvbXBpbGVkUHJvZ3JhbS5oIgogI2luY2x1ZGUg IkN1c3RvbUZpbHRlckNvbnN0YW50cy5oIgogI2luY2x1ZGUgIkN1c3RvbUZpbHRlck1lc2guaCIK QEAgLTE2MSw2ICsxNjIsMzcgQEAgdm9pZCBDdXN0b21GaWx0ZXJSZW5kZXJlcjo6YmluZFByb2dy YW1BcnJheVBhcmFtZXRlcnMoaW50IHVuaWZvcm1Mb2NhdGlvbiwgQ3VzdG8KICAgICBtX2NvbnRl eHQtPnVuaWZvcm0xZnYodW5pZm9ybUxvY2F0aW9uLCBwYXJhbWV0ZXJTaXplLCBmbG9hdFZlY3Rv ci5kYXRhKCkpOwogfQogCit2b2lkIEN1c3RvbUZpbHRlclJlbmRlcmVyOjpiaW5kUHJvZ3JhbUNv bG9yUGFyYW1ldGVycyhpbnQgdW5pZm9ybUxvY2F0aW9uLCBDdXN0b21GaWx0ZXJDb2xvclBhcmFt ZXRlciogY29sb3JQYXJhbWV0ZXIpCit7CisgICAgZmxvYXQgciwgZywgYiwgYTsKKyAgICBjb2xv clBhcmFtZXRlci0+Y29sb3IoKS5nZXRSR0JBKHIsIGcsIGIsIGEpOworCisgICAgbV9jb250ZXh0 LT51bmlmb3JtNGYodW5pZm9ybUxvY2F0aW9uLCByLCBnLCBiLCBhKTsKK30KKwordm9pZCBDdXN0 b21GaWx0ZXJSZW5kZXJlcjo6YmluZFByb2dyYW1NYXRyaXhQYXJhbWV0ZXJzKGludCB1bmlmb3Jt TG9jYXRpb24sIEN1c3RvbUZpbHRlckFycmF5UGFyYW1ldGVyKiBtYXRyaXhQYXJhbWV0ZXIpCit7 CisgICAgdW5zaWduZWQgcGFyYW1ldGVyU2l6ZSA9IG1hdHJpeFBhcmFtZXRlci0+c2l6ZSgpOwor ICAgIFZlY3RvcjxHQzNEZmxvYXQsIDE2PiBmbG9hdFZlY3RvcjsKKworICAgIGZvciAodW5zaWdu ZWQgaSA9IDA7IGkgPCBwYXJhbWV0ZXJTaXplOyArK2kpCisgICAgICAgIGZsb2F0VmVjdG9yLmFw cGVuZChtYXRyaXhQYXJhbWV0ZXItPnZhbHVlQXQoaSkpOworCisgICAgc3dpdGNoIChwYXJhbWV0 ZXJTaXplKSB7CisgICAgY2FzZSA0OgorICAgICAgICBtX2NvbnRleHQtPnVuaWZvcm1NYXRyaXgy ZnYodW5pZm9ybUxvY2F0aW9uLCAxLCBmYWxzZSwgZmxvYXRWZWN0b3IuZGF0YSgpKTsKKyAgICAg ICAgYnJlYWs7CisgICAgY2FzZSA5OgorICAgICAgICBtX2NvbnRleHQtPnVuaWZvcm1NYXRyaXgz ZnYodW5pZm9ybUxvY2F0aW9uLCAxLCBmYWxzZSwgZmxvYXRWZWN0b3IuZGF0YSgpKTsKKyAgICAg ICAgYnJlYWs7CisgICAgY2FzZSAxNjoKKyAgICAgICAgbV9jb250ZXh0LT51bmlmb3JtTWF0cml4 NGZ2KHVuaWZvcm1Mb2NhdGlvbiwgMSwgZmFsc2UsIGZsb2F0VmVjdG9yLmRhdGEoKSk7CisgICAg ICAgIGJyZWFrOworICAgIGRlZmF1bHQ6CisgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwor ICAgIH0KK30KKwogdm9pZCBDdXN0b21GaWx0ZXJSZW5kZXJlcjo6YmluZFByb2dyYW1OdW1iZXJQ YXJhbWV0ZXJzKGludCB1bmlmb3JtTG9jYXRpb24sIEN1c3RvbUZpbHRlck51bWJlclBhcmFtZXRl ciogbnVtYmVyUGFyYW1ldGVyKQogewogICAgIHN3aXRjaCAobnVtYmVyUGFyYW1ldGVyLT5zaXpl KCkpIHsKQEAgLTIxNiw4ICsyNDgsMTAgQEAgdm9pZCBDdXN0b21GaWx0ZXJSZW5kZXJlcjo6Ymlu ZFByb2dyYW1QYXJhbWV0ZXJzKCkKICAgICAgICAgICAgIGJpbmRQcm9ncmFtQXJyYXlQYXJhbWV0 ZXJzKHVuaWZvcm1Mb2NhdGlvbiwgc3RhdGljX2Nhc3Q8Q3VzdG9tRmlsdGVyQXJyYXlQYXJhbWV0 ZXIqPihwYXJhbWV0ZXIpKTsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICBjYXNlIEN1c3Rv bUZpbHRlclBhcmFtZXRlcjo6Q09MT1I6ICAgICAgICAKKyAgICAgICAgICAgIGJpbmRQcm9ncmFt Q29sb3JQYXJhbWV0ZXJzKHVuaWZvcm1Mb2NhdGlvbiwgc3RhdGljX2Nhc3Q8Q3VzdG9tRmlsdGVy Q29sb3JQYXJhbWV0ZXIqPihwYXJhbWV0ZXIpKTsKKyAgICAgICAgICAgIGJyZWFrOwogICAgICAg ICBjYXNlIEN1c3RvbUZpbHRlclBhcmFtZXRlcjo6TUFUUklYOgotICAgICAgICAgICAgLy8gRklY TUU6IEJpbmQgY29sb3IgYW5kIG1hdHJpeCB0byBjb250ZXh0LgorICAgICAgICAgICAgYmluZFBy b2dyYW1NYXRyaXhQYXJhbWV0ZXJzKHVuaWZvcm1Mb2NhdGlvbiwgc3RhdGljX2Nhc3Q8Q3VzdG9t RmlsdGVyQXJyYXlQYXJhbWV0ZXIqPihwYXJhbWV0ZXIpKTsKICAgICAgICAgICAgIGJyZWFrOwog ICAgICAgICBjYXNlIEN1c3RvbUZpbHRlclBhcmFtZXRlcjo6TlVNQkVSOgogICAgICAgICAgICAg YmluZFByb2dyYW1OdW1iZXJQYXJhbWV0ZXJzKHVuaWZvcm1Mb2NhdGlvbiwgc3RhdGljX2Nhc3Q8 Q3VzdG9tRmlsdGVyTnVtYmVyUGFyYW1ldGVyKj4ocGFyYW1ldGVyKSk7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9maWx0ZXJzL0N1c3RvbUZpbHRlclJlbmRl cmVyLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9maWx0ZXJzL0N1c3RvbUZp bHRlclJlbmRlcmVyLmgKaW5kZXggZmZiZmFlZS4uY2NkYzI5ZiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZmlsdGVycy9DdXN0b21GaWx0ZXJSZW5kZXJlci5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2ZpbHRlcnMvQ3VzdG9tRmls dGVyUmVuZGVyZXIuaApAQCAtNDQsNiArNDQsNyBAQAogbmFtZXNwYWNlIFdlYkNvcmUgewogCiBj bGFzcyBDdXN0b21GaWx0ZXJBcnJheVBhcmFtZXRlcjsKK2NsYXNzIEN1c3RvbUZpbHRlckNvbG9y UGFyYW1ldGVyOwogY2xhc3MgQ3VzdG9tRmlsdGVyQ29tcGlsZWRQcm9ncmFtOwogY2xhc3MgQ3Vz dG9tRmlsdGVyTWVzaDsKIGNsYXNzIEN1c3RvbUZpbHRlck51bWJlclBhcmFtZXRlcjsKQEAgLTc2 LDYgKzc3LDggQEAgcHJpdmF0ZToKICAgICB2b2lkIGJpbmRWZXJ0ZXhBdHRyaWJ1dGUoaW50IGF0 dHJpYnV0ZUxvY2F0aW9uLCB1bnNpZ25lZCBzaXplLCB1bnNpZ25lZCBvZmZzZXQpOwogICAgIHZv aWQgdW5iaW5kVmVydGV4QXR0cmlidXRlKGludCBhdHRyaWJ1dGVMb2NhdGlvbik7CiAgICAgdm9p ZCBiaW5kUHJvZ3JhbUFycmF5UGFyYW1ldGVycyhpbnQgdW5pZm9ybUxvY2F0aW9uLCBDdXN0b21G aWx0ZXJBcnJheVBhcmFtZXRlciopOworICAgIHZvaWQgYmluZFByb2dyYW1Db2xvclBhcmFtZXRl cnMoaW50IHVuaWZvcm1Mb2NhdGlvbiwgQ3VzdG9tRmlsdGVyQ29sb3JQYXJhbWV0ZXIqKTsKKyAg ICB2b2lkIGJpbmRQcm9ncmFtTWF0cml4UGFyYW1ldGVycyhpbnQgdW5pZm9ybUxvY2F0aW9uLCBD dXN0b21GaWx0ZXJBcnJheVBhcmFtZXRlciopOwogICAgIHZvaWQgYmluZFByb2dyYW1OdW1iZXJQ YXJhbWV0ZXJzKGludCB1bmlmb3JtTG9jYXRpb24sIEN1c3RvbUZpbHRlck51bWJlclBhcmFtZXRl ciopOwogICAgIHZvaWQgYmluZFByb2dyYW1UcmFuc2Zvcm1QYXJhbWV0ZXIoaW50IHVuaWZvcm1M b2NhdGlvbiwgQ3VzdG9tRmlsdGVyVHJhbnNmb3JtUGFyYW1ldGVyKik7CiAgICAgdm9pZCBiaW5k UHJvZ3JhbVBhcmFtZXRlcnMoKTsK