45405 2010-09-08 11:44:25 -0700 [chromium] Force canvas 2d draw calls to happen in software if a gradient, pattern, shadow, or clip are active 2010-09-08 15:12:59 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 jamesr jamesr abarth eric kbr scheib senorblanco vangelis webkit.review.bot oldest_to_newest 275965 0 jamesr 2010-09-08 11:44:25 -0700 [chromium] Force canvas 2d draw calls to happen in software if a gradient, pattern, shadow, or clip are active 275967 1 66921 jamesr 2010-09-08 11:52:36 -0700 Created attachment 66921 Patch 275969 2 jamesr 2010-09-08 11:53:05 -0700 This patch lets us correctly render the 'Amazon Shelf' IE testdrive demo. 275984 3 66921 kbr 2010-09-08 12:19:43 -0700 Comment on attachment 66921 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=66921&action=prettypatch Looks fine for the time being, though I am sure we are going to want to make this determination differently in the future. 275999 4 jamesr 2010-09-08 12:39:12 -0700 Committed r67003: <http://trac.webkit.org/changeset/67003> 276103 5 webkit.review.bot 2010-09-08 15:12:59 -0700 http://trac.webkit.org/changeset/67003 might have broken Leopard Intel Debug (Tests) The following changes are on the blame list: http://trac.webkit.org/changeset/67002 http://trac.webkit.org/changeset/67003 66921 2010-09-08 11:52:36 -0700 2010-09-08 12:19:43 -0700 Patch bug-45405-20100908115235.patch text/plain 10222 jamesr ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MWY3NGE5MTVkYTgxZGI0NjJiYjllNTE2MTFmZTY0OGU2MTMzMmZmNy4uMjE4OWMxZDRjYmJmMWQw Y2MxYzNlMWVjMmE5Y2Y4MDE5MWQ4ZWQ2NiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzNCBAQAorMjAxMC0wOS0wOCAgSmFt ZXMgUm9iaW5zb24gIDxqYW1lc3JAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtjaHJvbWl1bV0gRm9yY2UgY2FudmFzIDJkIGRy YXcgY2FsbHMgdG8gaGFwcGVuIGluIHNvZnR3YXJlIGlmIGEgZ3JhZGllbnQsIHBhdHRlcm4sIHNo YWRvdywgb3IgY2xpcCBhcmUgYWN0aXZlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD00NTQwNQorCisgICAgICAgIFRoaXMgZm9yY2VzIGFsbCBkcmF3IGNh bGxzIHRvIGhhcHBlbiBpbiBzb2Z0d2FyZSBpbnN0ZWFkIG9mIGhhcmR3YXJlIGlmIHRoZXJlIGlz IGEgZmlsbCBwYXR0ZXJuLCBncmFkaWVudCwKKyAgICAgICAgc2hhZG93LCBvciBjbGlwIGFwcGxp ZWQ7IGF0IGxlYXN0IHVudGlsIHdlIGNhbiBoYW5kbGUgdGhlc2UgaW4gaGFyZHdhcmUuICBPdGhl cndpc2UgdGhlIHBhdHRlcm4vZ3JhZGllbnQvZXRjCisgICAgICAgIGlzIGNvbXBsZXRlbHkgaWdu b3JlZCBieSB0aGUgaGFyZHdhcmUgZHJhd2luZyByb3V0aW5lIGFuZCB3ZSByZW5kZXIgaW5jb3Jy ZWN0bHkuCisKKyAgICAgICAgVGhlIHRlc3QgaXMgc2xpZ2h0bHkgY29udmVydmF0aXZlIC0gZm9y IGV4YW1wbGUgaXQgd2lsbCBmb3JjZSBkcmF3SW1hZ2UoKSBjYWxscyB0byBoYXBwZW4gaW4gc29m dHdhcmUgaWYgYQorICAgICAgICBmaWxsIGdyYWRpZW50IGlzIHNldCBldmVuIHRob3VnaCBpdCdz IGlycmVsZXZhbnQuICBUaGlzIGRvZXNuJ3Qgc2VlbSB0byBiZSBhbiBpc3N1ZSBpbiBwcmFjdGlj ZSBhbmQgd2UKKyAgICAgICAgY2FuIHRpZ2h0ZW4gdGhlIGNoZWNrcyBsYXRlciBpZiBuZWVkZWQu CisKKyAgICAgICAgVGVzdGVkIGJ5IGZhc3QvY2FudmFzL2NhbnZhcy1pbmNyZW1lbnRhbC1yZXBh aW50Lmh0bWwuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9za2lhL0dyYXBoaWNzQ29u dGV4dFNraWEuY3BwOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0OjpjYW52YXND bGlwKToKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dDo6ZmlsbFJlY3QpOgorICAg ICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3NraWEvSW1hZ2VCdWZmZXJTa2lhLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OkltYWdlQnVmZmVyOjpkcmF3KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFw aGljcy9za2lhL0ltYWdlU2tpYS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpCaXRtYXBJbWFnZTo6 ZHJhdyk6CisgICAgICAgIChXZWJDb3JlOjpCaXRtYXBJbWFnZVNpbmdsZUZyYW1lU2tpYTo6ZHJh dyk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9QbGF0Zm9ybUNvbnRleHRTa2lh LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlBsYXRmb3JtQ29udGV4dFNraWE6OlN0YXRlOjpTdGF0 ZSk6CisgICAgICAgIChXZWJDb3JlOjpQbGF0Zm9ybUNvbnRleHRTa2lhOjpjYW52YXNDbGlwUGF0 aCk6CisgICAgICAgIChXZWJDb3JlOjpQbGF0Zm9ybUNvbnRleHRTa2lhOjpjYW5BY2NlbGVyYXRl KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9za2lhL1BsYXRmb3JtQ29udGV4dFNraWEu aDoKKwogMjAxMC0wOS0wNyAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4K IAogICAgICAgICBSZXZpZXdlZCBieSBDaHJpcyBNYXJyaW4uCmRpZmYgLS1naXQgYS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvR3JhcGhpY3NDb250ZXh0U2tpYS5jcHAgYi9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvR3JhcGhpY3NDb250ZXh0U2tpYS5jcHAKaW5kZXggYTc0 MDJiOTJiYjQ4OGE3NTY1NzFmNGVlNGQ5YzAzZTlmODkxMThhOS4uMWY5MzgxZGUwZWJjMTJlOGFl ODYzZjU3ZmZhMjM3ZDQyNmE5YWRmYyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9za2lhL0dyYXBoaWNzQ29udGV4dFNraWEuY3BwCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3Mvc2tpYS9HcmFwaGljc0NvbnRleHRTa2lhLmNwcApAQCAtMzM4LDcgKzMzOCw3IEBA IHZvaWQgR3JhcGhpY3NDb250ZXh0OjpjbGVhclJlY3QoY29uc3QgRmxvYXRSZWN0JiByZWN0KQog ICAgIGlmIChwYWludGluZ0Rpc2FibGVkKCkpCiAgICAgICAgIHJldHVybjsKIAotICAgIGlmIChw bGF0Zm9ybUNvbnRleHQoKS0+dXNlR1BVKCkpIHsKKyAgICBpZiAocGxhdGZvcm1Db250ZXh0KCkt PnVzZUdQVSgpICYmIHBsYXRmb3JtQ29udGV4dCgpLT5jYW5BY2NlbGVyYXRlKCkpIHsKICAgICAg ICAgcGxhdGZvcm1Db250ZXh0KCktPnByZXBhcmVGb3JIYXJkd2FyZURyYXcoKTsKICAgICAgICAg cGxhdGZvcm1Db250ZXh0KCktPmdwdUNhbnZhcygpLT5jbGVhclJlY3QocmVjdCk7CiAgICAgICAg IHJldHVybjsKQEAgLTM5MSw3ICszOTEsNyBAQCB2b2lkIEdyYXBoaWNzQ29udGV4dDo6Y2FudmFz Q2xpcChjb25zdCBQYXRoJiBwYXRoKQogICAgIGlmICghaXNQYXRoU2tpYVNhZmUoZ2V0Q1RNKCks IHApKQogICAgICAgICByZXR1cm47CiAKLSAgICBwbGF0Zm9ybUNvbnRleHQoKS0+Y2FudmFzKCkt PmNsaXBQYXRoKHApOworICAgIHBsYXRmb3JtQ29udGV4dCgpLT5jYW52YXNDbGlwUGF0aChwKTsK IH0KIAogdm9pZCBHcmFwaGljc0NvbnRleHQ6OmNsaXBPdXQoY29uc3QgSW50UmVjdCYgcmVjdCkK QEAgLTc2Nyw3ICs3NjcsNyBAQCB2b2lkIEdyYXBoaWNzQ29udGV4dDo6ZmlsbFJlY3QoY29uc3Qg RmxvYXRSZWN0JiByZWN0KQogICAgICAgICBDbGlwUmVjdFRvQ2FudmFzKCpwbGF0Zm9ybUNvbnRl eHQoKS0+Y2FudmFzKCksIHIsICZyKTsKICAgICB9CiAKLSAgICBpZiAocGxhdGZvcm1Db250ZXh0 KCktPnVzZUdQVSgpICYmICFtX2NvbW1vbi0+c3RhdGUuZmlsbFBhdHRlcm4gJiYgIW1fY29tbW9u LT5zdGF0ZS5maWxsR3JhZGllbnQgJiYgIXBsYXRmb3JtQ29udGV4dCgpLT5nZXREcmF3TG9vcGVy KCkpIHsKKyAgICBpZiAocGxhdGZvcm1Db250ZXh0KCktPnVzZUdQVSgpICYmIHBsYXRmb3JtQ29u dGV4dCgpLT5jYW5BY2NlbGVyYXRlKCkpIHsKICAgICAgICAgcGxhdGZvcm1Db250ZXh0KCktPnBy ZXBhcmVGb3JIYXJkd2FyZURyYXcoKTsKICAgICAgICAgcGxhdGZvcm1Db250ZXh0KCktPmdwdUNh bnZhcygpLT5maWxsUmVjdChyZWN0KTsKICAgICAgICAgcmV0dXJuOwpAQCAtNzg5LDcgKzc4OSw3 IEBAIHZvaWQgR3JhcGhpY3NDb250ZXh0OjpmaWxsUmVjdChjb25zdCBGbG9hdFJlY3QmIHJlY3Qs IGNvbnN0IENvbG9yJiBjb2xvciwgQ29sb3JTCiAgICAgaWYgKHBhaW50aW5nRGlzYWJsZWQoKSkK ICAgICAgICAgcmV0dXJuOwogCi0gICAgaWYgKHBsYXRmb3JtQ29udGV4dCgpLT51c2VHUFUoKSAm JiAhbV9jb21tb24tPnN0YXRlLmZpbGxQYXR0ZXJuICYmICFtX2NvbW1vbi0+c3RhdGUuZmlsbEdy YWRpZW50KSB7CisgICAgaWYgKHBsYXRmb3JtQ29udGV4dCgpLT51c2VHUFUoKSAmJiBwbGF0Zm9y bUNvbnRleHQoKS0+Y2FuQWNjZWxlcmF0ZSgpKSB7CiAgICAgICAgIHBsYXRmb3JtQ29udGV4dCgp LT5wcmVwYXJlRm9ySGFyZHdhcmVEcmF3KCk7CiAgICAgICAgIHBsYXRmb3JtQ29udGV4dCgpLT5n cHVDYW52YXMoKS0+ZmlsbFJlY3QocmVjdCwgY29sb3IsIGNvbG9yU3BhY2UpOwogICAgICAgICBy ZXR1cm47CmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvSW1hZ2VC dWZmZXJTa2lhLmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9JbWFnZUJ1ZmZl clNraWEuY3BwCmluZGV4IGUwYmRhMDNmYmUzYjNkNDcyZmQwNjNlYmUyMmEzMjBkZWVjZmI5NmIu LmJiODlhYzU1NmI5ZmNkZWE4ZTExMTUxZmQ2YmUxNmYzMzBjNzViOTEgMTAwNjQ0Ci0tLSBhL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9JbWFnZUJ1ZmZlclNraWEuY3BwCisrKyBiL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9JbWFnZUJ1ZmZlclNraWEuY3BwCkBAIC0xMTEs MTMgKzExMSwxNiBAQCB2b2lkIEltYWdlQnVmZmVyOjpkcmF3KEdyYXBoaWNzQ29udGV4dCogY29u dGV4dCwgQ29sb3JTcGFjZSBzdHlsZUNvbG9yU3BhY2UsIGNvbgogICAgICAgICAgICAgICAgICAg ICAgICBDb21wb3NpdGVPcGVyYXRvciBvcCwgYm9vbCB1c2VMb3dRdWFsaXR5U2NhbGUpCiB7CiAg ICAgaWYgKG1fZGF0YS5tX3BsYXRmb3JtQ29udGV4dC51c2VHUFUoKSAmJiBjb250ZXh0LT5wbGF0 Zm9ybUNvbnRleHQoKS0+dXNlR1BVKCkpIHsKLSAgICAgICAgRHJhd2luZ0J1ZmZlciogc291cmNl RHJhd2luZ0J1ZmZlciA9IG1fZGF0YS5tX3BsYXRmb3JtQ29udGV4dC5ncHVDYW52YXMoKS0+ZHJh d2luZ0J1ZmZlcigpOwotICAgICAgICB1bnNpZ25lZCBzb3VyY2VUZXh0dXJlID0gc291cmNlRHJh d2luZ0J1ZmZlci0+Z2V0UmVuZGVyaW5nUmVzdWx0c0FzVGV4dHVyZSgpOwotICAgICAgICBGbG9h dFJlY3QgZGVzdFJlY3RGbGlwcGVkKGRlc3RSZWN0KTsKLSAgICAgICAgZGVzdFJlY3RGbGlwcGVk LnNldFkoZGVzdFJlY3QueSgpICsgZGVzdFJlY3QuaGVpZ2h0KCkpOwotICAgICAgICBkZXN0UmVj dEZsaXBwZWQuc2V0SGVpZ2h0KC1kZXN0UmVjdC5oZWlnaHQoKSk7Ci0gICAgICAgIGNvbnRleHQt PnBsYXRmb3JtQ29udGV4dCgpLT5ncHVDYW52YXMoKS0+ZHJhd1RleHR1cmVkUmVjdChzb3VyY2VU ZXh0dXJlLCBtX3NpemUsIHNyY1JlY3QsIGRlc3RSZWN0RmxpcHBlZCwgc3R5bGVDb2xvclNwYWNl LCBvcCk7Ci0gICAgICAgIHJldHVybjsKKyAgICAgICAgaWYgKGNvbnRleHQtPnBsYXRmb3JtQ29u dGV4dCgpLT5jYW5BY2NlbGVyYXRlKCkpIHsKKyAgICAgICAgICAgIERyYXdpbmdCdWZmZXIqIHNv dXJjZURyYXdpbmdCdWZmZXIgPSBtX2RhdGEubV9wbGF0Zm9ybUNvbnRleHQuZ3B1Q2FudmFzKCkt PmRyYXdpbmdCdWZmZXIoKTsKKyAgICAgICAgICAgIHVuc2lnbmVkIHNvdXJjZVRleHR1cmUgPSBz b3VyY2VEcmF3aW5nQnVmZmVyLT5nZXRSZW5kZXJpbmdSZXN1bHRzQXNUZXh0dXJlKCk7CisgICAg ICAgICAgICBGbG9hdFJlY3QgZGVzdFJlY3RGbGlwcGVkKGRlc3RSZWN0KTsKKyAgICAgICAgICAg IGRlc3RSZWN0RmxpcHBlZC5zZXRZKGRlc3RSZWN0LnkoKSArIGRlc3RSZWN0LmhlaWdodCgpKTsK KyAgICAgICAgICAgIGRlc3RSZWN0RmxpcHBlZC5zZXRIZWlnaHQoLWRlc3RSZWN0LmhlaWdodCgp KTsKKyAgICAgICAgICAgIGNvbnRleHQtPnBsYXRmb3JtQ29udGV4dCgpLT5ncHVDYW52YXMoKS0+ ZHJhd1RleHR1cmVkUmVjdChzb3VyY2VUZXh0dXJlLCBtX3NpemUsIHNyY1JlY3QsIGRlc3RSZWN0 RmxpcHBlZCwgc3R5bGVDb2xvclNwYWNlLCBvcCk7CisgICAgICAgICAgICByZXR1cm47CisgICAg ICAgIH0KKyAgICAgICAgbV9kYXRhLm1fcGxhdGZvcm1Db250ZXh0LnN5bmNTb2Z0d2FyZUNhbnZh cygpOwogICAgIH0KIAogICAgIFJlZlB0cjxJbWFnZT4gaW1hZ2UgPSBCaXRtYXBJbWFnZVNpbmds ZUZyYW1lU2tpYTo6Y3JlYXRlKCptX2RhdGEubV9wbGF0Zm9ybUNvbnRleHQuYml0bWFwKCksIGNv bnRleHQgPT0gbV9jb250ZXh0KTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3Mvc2tpYS9JbWFnZVNraWEuY3BwIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lhL0lt YWdlU2tpYS5jcHAKaW5kZXggNWI1OTYyYTI1YTAyYTUwODBlNjA1MzIzNDc4MGI4MmY0YmFjNGQ0 NC4uOTYyNWIzNGY4MmNmZGNmMjgxM2NiYTI3YzU4YTZmZGIzYjk5MGU5OSAxMDA2NDQKLS0tIGEv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lhL0ltYWdlU2tpYS5jcHAKKysrIGIvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lhL0ltYWdlU2tpYS5jcHAKQEAgLTQ2OSw3ICs0NjksNyBA QCB2b2lkIEJpdG1hcEltYWdlOjpkcmF3KEdyYXBoaWNzQ29udGV4dCogY3R4dCwgY29uc3QgRmxv YXRSZWN0JiBkc3RSZWN0LAogICAgIGlmIChub3JtU3JjUmVjdC5pc0VtcHR5KCkgfHwgbm9ybURz dFJlY3QuaXNFbXB0eSgpKQogICAgICAgICByZXR1cm47ICAvLyBOb3RoaW5nIHRvIGRyYXcuCiAK LSAgICBpZiAoY3R4dC0+cGxhdGZvcm1Db250ZXh0KCktPnVzZUdQVSgpKSB7CisgICAgaWYgKGN0 eHQtPnBsYXRmb3JtQ29udGV4dCgpLT51c2VHUFUoKSAmJiBjdHh0LT5wbGF0Zm9ybUNvbnRleHQo KS0+Y2FuQWNjZWxlcmF0ZSgpKSB7CiAgICAgICAgIGRyYXdCaXRtYXBHTEVTMihjdHh0LCBibSwg bm9ybVNyY1JlY3QsIG5vcm1Ec3RSZWN0LCBjb2xvclNwYWNlLCBjb21wb3NpdGVPcCk7CiAgICAg ICAgIHJldHVybjsKICAgICB9CkBAIC00OTcsNyArNDk3LDcgQEAgdm9pZCBCaXRtYXBJbWFnZVNp bmdsZUZyYW1lU2tpYTo6ZHJhdyhHcmFwaGljc0NvbnRleHQqIGN0eHQsCiAgICAgaWYgKG5vcm1T cmNSZWN0LmlzRW1wdHkoKSB8fCBub3JtRHN0UmVjdC5pc0VtcHR5KCkpCiAgICAgICAgIHJldHVy bjsgIC8vIE5vdGhpbmcgdG8gZHJhdy4KIAotICAgIGlmIChjdHh0LT5wbGF0Zm9ybUNvbnRleHQo KS0+dXNlR1BVKCkpIHsKKyAgICBpZiAoY3R4dC0+cGxhdGZvcm1Db250ZXh0KCktPnVzZUdQVSgp ICYmIGN0eHQtPnBsYXRmb3JtQ29udGV4dCgpLT5jYW5BY2NlbGVyYXRlKCkpIHsKICAgICAgICAg ZHJhd0JpdG1hcEdMRVMyKGN0eHQsICZtX25hdGl2ZUltYWdlLCBzcmNSZWN0LCBkc3RSZWN0LCBz dHlsZUNvbG9yU3BhY2UsIGNvbXBvc2l0ZU9wKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KZGlm ZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9QbGF0Zm9ybUNvbnRleHRT a2lhLmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9QbGF0Zm9ybUNvbnRleHRT a2lhLmNwcAppbmRleCA0YTIxNTNlODc0MGMwMWY4MjdkNTUzZTU2MmU5ZGQ5OWJlMDQzY2ZiLi43 YzU4NTE4MjJjZjMxYjJhNmJjMmVmNzA4ZWUxMzA4MmU2ZGRiY2UwIDEwMDY0NAotLS0gYS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvUGxhdGZvcm1Db250ZXh0U2tpYS5jcHAKKysrIGIv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lhL1BsYXRmb3JtQ29udGV4dFNraWEuY3BwCkBA IC0xMDksNiArMTA5LDkgQEAgc3RydWN0IFBsYXRmb3JtQ29udGV4dFNraWE6OlN0YXRlIHsKICAg ICBXVEY6OlZlY3RvcjxTa1BhdGg+IG1fYW50aUFsaWFzQ2xpcFBhdGhzOwogICAgIEludGVycG9s YXRpb25RdWFsaXR5IG1faW50ZXJwb2xhdGlvblF1YWxpdHk7CiAKKyAgICAvLyBJZiB3ZSBjdXJy ZW50bHkgaGF2ZSBhIGNhbnZhcyAobm9uLWFudGlhbGlhc2VkIHBhdGgpIGNsaXAgYXBwbGllZC4K KyAgICBib29sIG1fY2FudmFzQ2xpcEFwcGxpZWQ7CisKICAgICBQbGF0Zm9ybUNvbnRleHRTa2lh OjpTdGF0ZSBjbG9uZUluaGVyaXRlZFByb3BlcnRpZXMoKTsKIHByaXZhdGU6CiAgICAgLy8gTm90 IHN1cHBvcnRlZC4KQEAgLTEzNCw2ICsxMzcsNyBAQCBQbGF0Zm9ybUNvbnRleHRTa2lhOjpTdGF0 ZTo6U3RhdGUoKQogICAgICwgbV9kYXNoKDApCiAgICAgLCBtX3RleHREcmF3aW5nTW9kZShjVGV4 dEZpbGwpCiAgICAgLCBtX2ludGVycG9sYXRpb25RdWFsaXR5KEludGVycG9sYXRpb25IaWdoKQor ICAgICwgbV9jYW52YXNDbGlwQXBwbGllZChmYWxzZSkKIHsKIH0KIApAQCAtMTYwLDYgKzE2NCw3 IEBAIFBsYXRmb3JtQ29udGV4dFNraWE6OlN0YXRlOjpTdGF0ZShjb25zdCBTdGF0ZSYgb3RoZXIp CiAjZW5kaWYKICAgICAsIG1fYW50aUFsaWFzQ2xpcFBhdGhzKG90aGVyLm1fYW50aUFsaWFzQ2xp cFBhdGhzKQogICAgICwgbV9pbnRlcnBvbGF0aW9uUXVhbGl0eShvdGhlci5tX2ludGVycG9sYXRp b25RdWFsaXR5KQorICAgICwgbV9jYW52YXNDbGlwQXBwbGllZChvdGhlci5tX2NhbnZhc0NsaXBB cHBsaWVkKQogewogICAgIC8vIFVwIHRoZSByZWYgY291bnQgb2YgdGhlc2UuIHNhdmVSZWYgZG9l cyBub3RoaW5nIGlmICd0aGlzJyBpcyBOVUxMLgogICAgIG1fbG9vcGVyLT5zYWZlUmVmKCk7CkBA IC01NTYsNiArNTYxLDEyIEBAIFNrUGF0aCBQbGF0Zm9ybUNvbnRleHRTa2lhOjpjdXJyZW50UGF0 aEluTG9jYWxDb29yZGluYXRlcygpIGNvbnN0CiAgICAgcmV0dXJuIGxvY2FsUGF0aDsKIH0KIAor dm9pZCBQbGF0Zm9ybUNvbnRleHRTa2lhOjpjYW52YXNDbGlwUGF0aChjb25zdCBTa1BhdGgmIHBh dGgpCit7CisgICAgbV9zdGF0ZS0+bV9jYW52YXNDbGlwQXBwbGllZCA9IHRydWU7CisgICAgbV9j YW52YXMtPmNsaXBQYXRoKHBhdGgpOworfQorCiB2b2lkIFBsYXRmb3JtQ29udGV4dFNraWE6OnNl dEZpbGxSdWxlKFNrUGF0aDo6RmlsbFR5cGUgZnIpCiB7CiAgICAgbV9wYXRoLnNldEZpbGxUeXBl KGZyKTsKQEAgLTY3NSw2ICs2ODYsMTMgQEAgdm9pZCBQbGF0Zm9ybUNvbnRleHRTa2lhOjphcHBs eUFudGlBbGlhc2VkQ2xpcFBhdGhzKFdURjo6VmVjdG9yPFNrUGF0aD4mIHBhdGhzKQogICAgIG1f Y2FudmFzLT5yZXN0b3JlKCk7CiB9CiAKK2Jvb2wgUGxhdGZvcm1Db250ZXh0U2tpYTo6Y2FuQWNj ZWxlcmF0ZSgpIGNvbnN0Cit7CisgICAgcmV0dXJuICFtX3N0YXRlLT5tX2ZpbGxTaGFkZXIgLy8g Q2FuJ3QgYWNjZWxlcmF0ZSB3aXRoIGEgZmlsbCBncmFkaWVudCBvciBwYXR0ZXJuLgorICAgICAg ICAmJiAhbV9zdGF0ZS0+bV9sb29wZXIgLy8gQ2FuJ3QgYWNjZWxlcmF0ZSB3aXRoIGEgc2hhZG93 LgorICAgICAgICAmJiAhbV9zdGF0ZS0+bV9jYW52YXNDbGlwQXBwbGllZDsgLy8gQ2FuJ3QgYWNj ZWxlcmF0ZSB3aXRoIGEgY2xpcCB0byBwYXRoIGFwcGxpZWQuCit9CisKIGNsYXNzIFdpbGxQdWJs aXNoQ2FsbGJhY2tJbXBsIDogcHVibGljIERyYXdpbmdCdWZmZXI6OldpbGxQdWJsaXNoQ2FsbGJh Y2sgewogcHVibGljOgogICAgIHN0YXRpYyBQYXNzT3duUHRyPFdpbGxQdWJsaXNoQ2FsbGJhY2s+ IGNyZWF0ZShQbGF0Zm9ybUNvbnRleHRTa2lhKiBwY3MpCmRpZmYgLS1naXQgYS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL3NraWEvUGxhdGZvcm1Db250ZXh0U2tpYS5oIGIvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9za2lhL1BsYXRmb3JtQ29udGV4dFNraWEuaAppbmRleCAyNjA2MjQwMjRi MTM0ZjBkN2QyMGMxODZkZmM4MzYxNTJjNTU1ZTQ3Li5jYjlhYTcxYTMyYjIwNmRiMDc2YmVjYjZh YTFjMzhhZWZjN2M5NGE4IDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3Nr aWEvUGxhdGZvcm1Db250ZXh0U2tpYS5oCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv c2tpYS9QbGF0Zm9ybUNvbnRleHRTa2lhLmgKQEAgLTE0Myw2ICsxNDMsOCBAQCBwdWJsaWM6CiAg ICAgdm9pZCBhZGRQYXRoKGNvbnN0IFNrUGF0aCYpOwogICAgIFNrUGF0aCBjdXJyZW50UGF0aElu TG9jYWxDb29yZGluYXRlcygpIGNvbnN0OwogCisgICAgdm9pZCBjYW52YXNDbGlwUGF0aChjb25z dCBTa1BhdGgmKTsKKwogICAgIC8vIFJldHVybnMgdGhlIGZpbGwgY29sb3IuIFRoZSByZXR1cm5l ZCBjb2xvciBoYXMgaXQncyBhbHBoYSBhZGp1c3RlZAogICAgIC8vIGJ5IHRoZSBjdXJyZW50IGFs cGhhLgogICAgIFNrQ29sb3IgZWZmZWN0aXZlRmlsbENvbG9yKCkgY29uc3Q7CkBAIC0xODAsNiAr MTgyLDggQEAgcHVibGljOgogICAgIHZvaWQgc2V0SW1hZ2VSZXNhbXBsaW5nSGludChjb25zdCBJ bnRTaXplJiBzcmNTaXplLCBjb25zdCBGbG9hdFNpemUmIGRzdFNpemUpOwogICAgIHZvaWQgY2xl YXJJbWFnZVJlc2FtcGxpbmdIaW50KCk7CiAgICAgYm9vbCBoYXNJbWFnZVJlc2FtcGxpbmdIaW50 KCkgY29uc3Q7CisKKyAgICBib29sIGNhbkFjY2VsZXJhdGUoKSBjb25zdDsKICAgICBib29sIHVz ZUdQVSgpIHsgcmV0dXJuIG1fdXNlR1BVOyB9CiAgICAgdm9pZCBzZXRTaGFyZWRHcmFwaGljc0Nv bnRleHQzRChTaGFyZWRHcmFwaGljc0NvbnRleHQzRCosIERyYXdpbmdCdWZmZXIqLCBjb25zdCBJ bnRTaXplJik7CiAgICAgR0xFUzJDYW52YXMqIGdwdUNhbnZhcygpIGNvbnN0IHsgcmV0dXJuIG1f Z3B1Q2FudmFzLmdldCgpOyB9Cg==