40149 2010-06-03 17:06:39 -0700 Rename internalformat to internalFormat 2010-06-17 09:54:04 -0700 1 1 1 Unclassified WebKit WebGL 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 zmo zmo commit-queue dglazkov kbr oldest_to_newest 234003 0 zmo 2010-06-03 17:06:39 -0700 GL spec uses internalformat, but according to code style, it should be internalFormat. 238198 1 58740 zmo 2010-06-14 19:06:25 -0700 Created attachment 58740 patch 238199 2 zmo 2010-06-14 19:08:02 -0700 Changed member and function names, but didn't touch input parameters to stay consistent with OpenGL spec. 239435 3 58740 commit-queue 2010-06-17 09:54:00 -0700 Comment on attachment 58740 patch Clearing flags on attachment: 58740 Committed r61333: <http://trac.webkit.org/changeset/61333> 239436 4 commit-queue 2010-06-17 09:54:04 -0700 All reviewed patches have been landed. Closing bug. 58740 2010-06-14 19:06:25 -0700 2010-06-17 09:54:00 -0700 patch internalformat.patch text/plain 12537 zmo SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2MTE3MSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMzIgQEAKKzIwMTAtMDYtMTQgIFpoZW55YW8gTW8gIDx6bW9AZ29vZ2xlLmNvbT4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW5hbWUg aW50ZXJuYWxmb3JtYXQgdG8gaW50ZXJuYWxGb3JtYXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQwMTQ5CisKKyAgICAgICAgKiBodG1sL2NhbnZhcy9X ZWJHTEZyYW1lYnVmZmVyLmNwcDogUmVuYW1lIGludGVybmFsZm9ybWF0IHRvIGludGVybmFsRm9y bWF0LgorICAgICAgICAoV2ViQ29yZTo6V2ViR0xGcmFtZWJ1ZmZlcjo6Z2V0Q29sb3JCdWZmZXJG b3JtYXQpOgorICAgICAgICAqIGh0bWwvY2FudmFzL1dlYkdMUmVuZGVyYnVmZmVyLmNwcDogRGl0 dG8uCisgICAgICAgIChXZWJDb3JlOjpXZWJHTFJlbmRlcmJ1ZmZlcjo6V2ViR0xSZW5kZXJidWZm ZXIpOgorICAgICAgICAqIGh0bWwvY2FudmFzL1dlYkdMUmVuZGVyYnVmZmVyLmg6IERpdHRvLgor ICAgICAgICAoV2ViQ29yZTo6V2ViR0xSZW5kZXJidWZmZXI6OnNldEludGVybmFsRm9ybWF0KToK KyAgICAgICAgKFdlYkNvcmU6OldlYkdMUmVuZGVyYnVmZmVyOjpnZXRJbnRlcm5hbEZvcm1hdCk6 CisgICAgICAgICogaHRtbC9jYW52YXMvV2ViR0xSZW5kZXJpbmdDb250ZXh0LmNwcDogRGl0dG8u CisgICAgICAgIChXZWJDb3JlOjpXZWJHTFJlbmRlcmluZ0NvbnRleHQ6OmNvcHlUZXhJbWFnZTJE KToKKyAgICAgICAgKFdlYkNvcmU6OldlYkdMUmVuZGVyaW5nQ29udGV4dDo6Y29weVRleFN1Yklt YWdlMkQpOgorICAgICAgICAoV2ViQ29yZTo6V2ViR0xSZW5kZXJpbmdDb250ZXh0OjpmcmFtZWJ1 ZmZlclJlbmRlcmJ1ZmZlcik6CisgICAgICAgIChXZWJDb3JlOjpXZWJHTFJlbmRlcmluZ0NvbnRl eHQ6OmdldFJlbmRlcmJ1ZmZlclBhcmFtZXRlcik6CisgICAgICAgIChXZWJDb3JlOjpXZWJHTFJl bmRlcmluZ0NvbnRleHQ6OnJlbmRlcmJ1ZmZlclN0b3JhZ2UpOgorICAgICAgICAoV2ViQ29yZTo6 V2ViR0xSZW5kZXJpbmdDb250ZXh0Ojp0ZXhJbWFnZTJEQmFzZSk6CisgICAgICAgIChXZWJDb3Jl OjpXZWJHTFJlbmRlcmluZ0NvbnRleHQ6OmlzVGV4SW50ZXJuYWxGb3JtYXRDb2xvckJ1ZmZlckNv bWJpbmF0aW9uVmFsaWQpOgorICAgICAgICAqIGh0bWwvY2FudmFzL1dlYkdMUmVuZGVyaW5nQ29u dGV4dC5oOiBEaXR0by4KKyAgICAgICAgKiBodG1sL2NhbnZhcy9XZWJHTFRleHR1cmUuY3BwOiBE aXR0by4KKyAgICAgICAgKFdlYkNvcmU6OldlYkdMVGV4dHVyZTo6V2ViR0xUZXh0dXJlKToKKyAg ICAgICAgKiBodG1sL2NhbnZhcy9XZWJHTFRleHR1cmUuaDogRGl0dG8uCisgICAgICAgIChXZWJD b3JlOjpXZWJHTFRleHR1cmU6OnNldEludGVybmFsRm9ybWF0KToKKyAgICAgICAgKFdlYkNvcmU6 OldlYkdMVGV4dHVyZTo6Z2V0SW50ZXJuYWxGb3JtYXQpOgorCiAyMDEwLTA2LTE0ICBNYXJrIFJv d2UgIDxtcm93ZUBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQnJhZHkgRWlkc29u LgpJbmRleDogV2ViQ29yZS9odG1sL2NhbnZhcy9XZWJHTEZyYW1lYnVmZmVyLmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBXZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdMRnJhbWVidWZmZXIuY3BwCShyZXZpc2lv biA2MTE3MCkKKysrIFdlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xGcmFtZWJ1ZmZlci5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTkxLDcgKzkxLDcgQEAgdW5zaWduZWQgbG9uZyBXZWJHTEZyYW1lYnVm ZmVyOjpnZXRDb2xvcgogewogICAgIGlmIChvYmplY3QoKSAmJiBtX2NvbG9yQXR0YWNobWVudCAm JiBtX2NvbG9yQXR0YWNobWVudC0+b2JqZWN0KCkpIHsKICAgICAgICAgaWYgKG1fY29sb3JBdHRh Y2htZW50LT5pc1JlbmRlcmJ1ZmZlcigpKSB7Ci0gICAgICAgICAgICB1bnNpZ25lZCBsb25nIGZv cm1hdCA9IChyZWludGVycHJldF9jYXN0PFdlYkdMUmVuZGVyYnVmZmVyKj4obV9jb2xvckF0dGFj aG1lbnQpKS0+Z2V0SW50ZXJuYWxmb3JtYXQoKTsKKyAgICAgICAgICAgIHVuc2lnbmVkIGxvbmcg Zm9ybWF0ID0gKHJlaW50ZXJwcmV0X2Nhc3Q8V2ViR0xSZW5kZXJidWZmZXIqPihtX2NvbG9yQXR0 YWNobWVudCkpLT5nZXRJbnRlcm5hbEZvcm1hdCgpOwogICAgICAgICAgICAgc3dpdGNoIChmb3Jt YXQpIHsKICAgICAgICAgICAgIGNhc2UgR3JhcGhpY3NDb250ZXh0M0Q6OlJHQkE0OgogICAgICAg ICAgICAgY2FzZSBHcmFwaGljc0NvbnRleHQzRDo6UkdCNV9BMToKQEAgLTEwMCw3ICsxMDAsNyBA QCB1bnNpZ25lZCBsb25nIFdlYkdMRnJhbWVidWZmZXI6OmdldENvbG9yCiAgICAgICAgICAgICAg ICAgcmV0dXJuIEdyYXBoaWNzQ29udGV4dDNEOjpSR0I7CiAgICAgICAgICAgICB9CiAgICAgICAg IH0gZWxzZSBpZiAobV9jb2xvckF0dGFjaG1lbnQtPmlzVGV4dHVyZSgpKQotICAgICAgICAgICAg cmV0dXJuIChyZWludGVycHJldF9jYXN0PFdlYkdMVGV4dHVyZSo+KG1fY29sb3JBdHRhY2htZW50 KSktPmdldEludGVybmFsZm9ybWF0KCk7CisgICAgICAgICAgICByZXR1cm4gKHJlaW50ZXJwcmV0 X2Nhc3Q8V2ViR0xUZXh0dXJlKj4obV9jb2xvckF0dGFjaG1lbnQpKS0+Z2V0SW50ZXJuYWxGb3Jt YXQoKTsKICAgICB9CiAgICAgcmV0dXJuIDA7CiB9CkluZGV4OiBXZWJDb3JlL2h0bWwvY2FudmFz L1dlYkdMUmVuZGVyYnVmZmVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2h0bWwvY2FudmFz L1dlYkdMUmVuZGVyYnVmZmVyLmNwcAkocmV2aXNpb24gNjExNzApCisrKyBXZWJDb3JlL2h0bWwv Y2FudmFzL1dlYkdMUmVuZGVyYnVmZmVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzksNyArMzks NyBAQCBQYXNzUmVmUHRyPFdlYkdMUmVuZGVyYnVmZmVyPiBXZWJHTFJlbmRlCiAKIFdlYkdMUmVu ZGVyYnVmZmVyOjpXZWJHTFJlbmRlcmJ1ZmZlcihXZWJHTFJlbmRlcmluZ0NvbnRleHQqIGN0eCkK ICAgICA6IENhbnZhc09iamVjdChjdHgpCi0gICAgLCBtX2ludGVybmFsZm9ybWF0KEdyYXBoaWNz Q29udGV4dDNEOjpSR0JBNCkKKyAgICAsIG1faW50ZXJuYWxGb3JtYXQoR3JhcGhpY3NDb250ZXh0 M0Q6OlJHQkE0KQogICAgICwgbV9pbml0aWFsaXplZChmYWxzZSkKIHsKICAgICBzZXRPYmplY3Qo Y29udGV4dCgpLT5ncmFwaGljc0NvbnRleHQzRCgpLT5jcmVhdGVSZW5kZXJidWZmZXIoKSk7Cklu ZGV4OiBXZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdMUmVuZGVyYnVmZmVyLmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gV2ViQ29yZS9odG1sL2NhbnZhcy9XZWJHTFJlbmRlcmJ1ZmZlci5oCShyZXZpc2lvbiA2MTE3 MCkKKysrIFdlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xSZW5kZXJidWZmZXIuaAkod29ya2luZyBj b3B5KQpAQCAtMzksOCArMzksOCBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIAogICAg ICAgICBzdGF0aWMgUGFzc1JlZlB0cjxXZWJHTFJlbmRlcmJ1ZmZlcj4gY3JlYXRlKFdlYkdMUmVu ZGVyaW5nQ29udGV4dCopOwogCi0gICAgICAgIHZvaWQgc2V0SW50ZXJuYWxmb3JtYXQodW5zaWdu ZWQgbG9uZyBpbnRlcm5hbGZvcm1hdCkgeyBtX2ludGVybmFsZm9ybWF0ID0gaW50ZXJuYWxmb3Jt YXQ7IH0KLSAgICAgICAgdW5zaWduZWQgbG9uZyBnZXRJbnRlcm5hbGZvcm1hdCgpIGNvbnN0IHsg cmV0dXJuIG1faW50ZXJuYWxmb3JtYXQ7IH0KKyAgICAgICAgdm9pZCBzZXRJbnRlcm5hbEZvcm1h dCh1bnNpZ25lZCBsb25nIGludGVybmFsZm9ybWF0KSB7IG1faW50ZXJuYWxGb3JtYXQgPSBpbnRl cm5hbGZvcm1hdDsgfQorICAgICAgICB1bnNpZ25lZCBsb25nIGdldEludGVybmFsRm9ybWF0KCkg Y29uc3QgeyByZXR1cm4gbV9pbnRlcm5hbEZvcm1hdDsgfQogCiAgICAgICAgIGJvb2wgaXNJbml0 aWFsaXplZCgpIGNvbnN0IHsgcmV0dXJuIG1faW5pdGlhbGl6ZWQ7IH0KICAgICAgICAgdm9pZCBz ZXRJbml0aWFsaXplZCgpIHsgbV9pbml0aWFsaXplZCA9IHRydWU7IH0KQEAgLTUzLDcgKzUzLDcg QEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgIHByaXZhdGU6CiAgICAgICAgIHZpcnR1YWwgYm9v bCBpc1JlbmRlcmJ1ZmZlcigpIGNvbnN0IHsgcmV0dXJuIHRydWU7IH0KIAotICAgICAgICB1bnNp Z25lZCBsb25nIG1faW50ZXJuYWxmb3JtYXQ7CisgICAgICAgIHVuc2lnbmVkIGxvbmcgbV9pbnRl cm5hbEZvcm1hdDsKICAgICAgICAgYm9vbCBtX2luaXRpYWxpemVkOwogICAgIH07CiAgICAgCklu ZGV4OiBXZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdMUmVuZGVyaW5nQ29udGV4dC5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gV2ViQ29yZS9odG1sL2NhbnZhcy9XZWJHTFJlbmRlcmluZ0NvbnRleHQuY3BwCShy ZXZpc2lvbiA2MTE3MCkKKysrIFdlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xSZW5kZXJpbmdDb250 ZXh0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDU2LDcgKzQ1Niw3IEBAIHZvaWQgV2ViR0xSZW5k ZXJpbmdDb250ZXh0Ojpjb3B5VGV4SW1hZ2UKICAgICAgICAgcmV0dXJuOwogICAgIGlmICghaXNH TEVTMkNvbXBsaWFudCgpKSB7CiAgICAgICAgIGlmIChtX2ZyYW1lYnVmZmVyQmluZGluZyAmJiBt X2ZyYW1lYnVmZmVyQmluZGluZy0+b2JqZWN0KCkKLSAgICAgICAgICAgICYmICFpc1RleEludGVy bmFsZm9ybWF0Q29sb3JCdWZmZXJDb21iaW5hdGlvblZhbGlkKGludGVybmFsZm9ybWF0LAorICAg ICAgICAgICAgJiYgIWlzVGV4SW50ZXJuYWxGb3JtYXRDb2xvckJ1ZmZlckNvbWJpbmF0aW9uVmFs aWQoaW50ZXJuYWxmb3JtYXQsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBtX2ZyYW1lYnVmZmVyQmluZGluZy0+Z2V0Q29sb3JC dWZmZXJGb3JtYXQoKSkpIHsKICAgICAgICAgICAgIG1fY29udGV4dC0+c3ludGhlc2l6ZUdMRXJy b3IoR3JhcGhpY3NDb250ZXh0M0Q6OklOVkFMSURfT1BFUkFUSU9OKTsKICAgICAgICAgICAgIHJl dHVybjsKQEAgLTQ3Myw3ICs0NzMsNyBAQCB2b2lkIFdlYkdMUmVuZGVyaW5nQ29udGV4dDo6Y29w eVRleEltYWdlCiAgICAgICAgIGlmICh0ZXggJiYgIWxldmVsKSAvLyBvbmx5IGZvciBsZXZlbCAw CiAgICAgICAgICAgICB0ZXgtPnNldFNpemUodGFyZ2V0LCB3aWR0aCwgaGVpZ2h0KTsKICAgICAg ICAgaWYgKHRleCkKLSAgICAgICAgICAgIHRleC0+c2V0SW50ZXJuYWxmb3JtYXQoaW50ZXJuYWxm b3JtYXQpOworICAgICAgICAgICAgdGV4LT5zZXRJbnRlcm5hbEZvcm1hdChpbnRlcm5hbGZvcm1h dCk7CiAgICAgfQogICAgIGlmIChtX2ZyYW1lYnVmZmVyQmluZGluZyAmJiB0ZXgpCiAgICAgICAg IG1fZnJhbWVidWZmZXJCaW5kaW5nLT5vbkF0dGFjaGVkT2JqZWN0Q2hhbmdlKHRleCk7CkBAIC00 ODUsNyArNDg1LDcgQEAgdm9pZCBXZWJHTFJlbmRlcmluZ0NvbnRleHQ6OmNvcHlUZXhTdWJJbQog ICAgIGlmICghaXNHTEVTMkNvbXBsaWFudCgpKSB7CiAgICAgICAgIFdlYkdMVGV4dHVyZSogdGV4 ID0gZ2V0VGV4dHVyZUJpbmRpbmcodGFyZ2V0KTsKICAgICAgICAgaWYgKG1fZnJhbWVidWZmZXJC aW5kaW5nICYmIG1fZnJhbWVidWZmZXJCaW5kaW5nLT5vYmplY3QoKSAmJiB0ZXgKLSAgICAgICAg ICAgICYmICFpc1RleEludGVybmFsZm9ybWF0Q29sb3JCdWZmZXJDb21iaW5hdGlvblZhbGlkKHRl eC0+Z2V0SW50ZXJuYWxmb3JtYXQoKSwKKyAgICAgICAgICAgICYmICFpc1RleEludGVybmFsRm9y bWF0Q29sb3JCdWZmZXJDb21iaW5hdGlvblZhbGlkKHRleC0+Z2V0SW50ZXJuYWxGb3JtYXQoKSwK ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIG1fZnJhbWVidWZmZXJCaW5kaW5nLT5nZXRDb2xvckJ1ZmZlckZvcm1hdCgpKSkgewog ICAgICAgICAgICAgbV9jb250ZXh0LT5zeW50aGVzaXplR0xFcnJvcihHcmFwaGljc0NvbnRleHQz RDo6SU5WQUxJRF9PUEVSQVRJT04pOwogICAgICAgICAgICAgcmV0dXJuOwpAQCAtOTI1LDE5ICs5 MjUsMTkgQEAgdm9pZCBXZWJHTFJlbmRlcmluZ0NvbnRleHQ6OmZyYW1lYnVmZmVyUgogICAgICAg ICBjYXNlIEdyYXBoaWNzQ29udGV4dDNEOjpERVBUSF9BVFRBQ0hNRU5UOgogICAgICAgICAgICAg aWYgKG1fZnJhbWVidWZmZXJCaW5kaW5nLT5pc0RlcHRoU3RlbmNpbEF0dGFjaGVkKCkgfHwgbV9m cmFtZWJ1ZmZlckJpbmRpbmctPmlzU3RlbmNpbEF0dGFjaGVkKCkpCiAgICAgICAgICAgICAgICAg aXNDb25mbGljdGVkID0gdHJ1ZTsKLSAgICAgICAgICAgIGlmIChidWZmZXItPmdldEludGVybmFs Zm9ybWF0KCkgIT0gR3JhcGhpY3NDb250ZXh0M0Q6OkRFUFRIX0NPTVBPTkVOVDE2KQorICAgICAg ICAgICAgaWYgKGJ1ZmZlci0+Z2V0SW50ZXJuYWxGb3JtYXQoKSAhPSBHcmFwaGljc0NvbnRleHQz RDo6REVQVEhfQ09NUE9ORU5UMTYpCiAgICAgICAgICAgICAgICAgaXNDb25mbGljdGVkID0gdHJ1 ZTsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICBjYXNlIEdyYXBoaWNzQ29udGV4dDNEOjpT VEVOQ0lMX0FUVEFDSE1FTlQ6CiAgICAgICAgICAgICBpZiAobV9mcmFtZWJ1ZmZlckJpbmRpbmct PmlzRGVwdGhTdGVuY2lsQXR0YWNoZWQoKSB8fCBtX2ZyYW1lYnVmZmVyQmluZGluZy0+aXNEZXB0 aEF0dGFjaGVkKCkpCiAgICAgICAgICAgICAgICAgaXNDb25mbGljdGVkID0gdHJ1ZTsKLSAgICAg ICAgICAgIGlmIChidWZmZXItPmdldEludGVybmFsZm9ybWF0KCkgIT0gR3JhcGhpY3NDb250ZXh0 M0Q6OlNURU5DSUxfSU5ERVg4KQorICAgICAgICAgICAgaWYgKGJ1ZmZlci0+Z2V0SW50ZXJuYWxG b3JtYXQoKSAhPSBHcmFwaGljc0NvbnRleHQzRDo6U1RFTkNJTF9JTkRFWDgpCiAgICAgICAgICAg ICAgICAgaXNDb25mbGljdGVkID0gdHJ1ZTsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICBj YXNlIEdyYXBoaWNzQ29udGV4dDNEOjpERVBUSF9TVEVOQ0lMX0FUVEFDSE1FTlQ6CiAgICAgICAg ICAgICBpZiAobV9mcmFtZWJ1ZmZlckJpbmRpbmctPmlzRGVwdGhBdHRhY2hlZCgpIHx8IG1fZnJh bWVidWZmZXJCaW5kaW5nLT5pc1N0ZW5jaWxBdHRhY2hlZCgpKQogICAgICAgICAgICAgICAgIGlz Q29uZmxpY3RlZCA9IHRydWU7Ci0gICAgICAgICAgICBpZiAoYnVmZmVyLT5nZXRJbnRlcm5hbGZv cm1hdCgpICE9IEdyYXBoaWNzQ29udGV4dDNEOjpERVBUSF9TVEVOQ0lMKQorICAgICAgICAgICAg aWYgKGJ1ZmZlci0+Z2V0SW50ZXJuYWxGb3JtYXQoKSAhPSBHcmFwaGljc0NvbnRleHQzRDo6REVQ VEhfU1RFTkNJTCkKICAgICAgICAgICAgICAgICBpc0NvbmZsaWN0ZWQgPSB0cnVlOwogICAgICAg ICAgICAgYnJlYWs7CiAgICAgICAgIH0KQEAgLTEzNDcsNyArMTM0Nyw3IEBAIFdlYkdMR2V0SW5m byBXZWJHTFJlbmRlcmluZ0NvbnRleHQ6OmdldFIKICAgICAgICAgICAgIG1fY29udGV4dC0+c3lu dGhlc2l6ZUdMRXJyb3IoR3JhcGhpY3NDb250ZXh0M0Q6OklOVkFMSURfT1BFUkFUSU9OKTsKICAg ICAgICAgICAgIHJldHVybiBXZWJHTEdldEluZm8oKTsKICAgICAgICAgfQotICAgICAgICByZXR1 cm4gV2ViR0xHZXRJbmZvKG1fcmVuZGVyYnVmZmVyQmluZGluZy0+Z2V0SW50ZXJuYWxmb3JtYXQo KSk7CisgICAgICAgIHJldHVybiBXZWJHTEdldEluZm8obV9yZW5kZXJidWZmZXJCaW5kaW5nLT5n ZXRJbnRlcm5hbEZvcm1hdCgpKTsKICAgICBkZWZhdWx0OgogICAgICAgICBtX2NvbnRleHQtPnN5 bnRoZXNpemVHTEVycm9yKEdyYXBoaWNzQ29udGV4dDNEOjpJTlZBTElEX0VOVU0pOwogICAgICAg ICByZXR1cm4gV2ViR0xHZXRJbmZvKCk7CkBAIC0xODI3LDcgKzE4MjcsNyBAQCB2b2lkIFdlYkdM UmVuZGVyaW5nQ29udGV4dDo6cmVuZGVyYnVmZmVyCiAgICAgY2FzZSBHcmFwaGljc0NvbnRleHQz RDo6REVQVEhfU1RFTkNJTDoKICAgICAgICAgbV9jb250ZXh0LT5yZW5kZXJidWZmZXJTdG9yYWdl KHRhcmdldCwgaW50ZXJuYWxmb3JtYXQsIHdpZHRoLCBoZWlnaHQpOwogICAgICAgICBpZiAobV9y ZW5kZXJidWZmZXJCaW5kaW5nKSB7Ci0gICAgICAgICAgICBtX3JlbmRlcmJ1ZmZlckJpbmRpbmct PnNldEludGVybmFsZm9ybWF0KGludGVybmFsZm9ybWF0KTsKKyAgICAgICAgICAgIG1fcmVuZGVy YnVmZmVyQmluZGluZy0+c2V0SW50ZXJuYWxGb3JtYXQoaW50ZXJuYWxmb3JtYXQpOwogICAgICAg ICAgICAgaWYgKG1fZnJhbWVidWZmZXJCaW5kaW5nKQogICAgICAgICAgICAgICAgIG1fZnJhbWVi dWZmZXJCaW5kaW5nLT5vbkF0dGFjaGVkT2JqZWN0Q2hhbmdlKG1fcmVuZGVyYnVmZmVyQmluZGlu Zy5nZXQoKSk7CiAgICAgICAgIH0KQEAgLTE5MTYsNyArMTkxNiw3IEBAIHZvaWQgV2ViR0xSZW5k ZXJpbmdDb250ZXh0Ojp0ZXhJbWFnZTJEQmEKICAgICAgICAgaWYgKHRleCAmJiAhbGV2ZWwpIC8v IG9ubHkgZm9yIGxldmVsIDAKICAgICAgICAgICAgIHRleC0+c2V0U2l6ZSh0YXJnZXQsIHdpZHRo LCBoZWlnaHQpOwogICAgICAgICBpZiAodGV4KQotICAgICAgICAgICAgdGV4LT5zZXRJbnRlcm5h bGZvcm1hdChpbnRlcm5hbGZvcm1hdCk7CisgICAgICAgICAgICB0ZXgtPnNldEludGVybmFsRm9y bWF0KGludGVybmFsZm9ybWF0KTsKICAgICB9CiAgICAgaWYgKG1fZnJhbWVidWZmZXJCaW5kaW5n ICYmIHRleCkKICAgICAgICAgbV9mcmFtZWJ1ZmZlckJpbmRpbmctPm9uQXR0YWNoZWRPYmplY3RD aGFuZ2UodGV4KTsKQEAgLTMyOTIsMTcgKzMyOTIsMTcgQEAgdm9pZCBXZWJHTFJlbmRlcmluZ0Nv bnRleHQ6OmNyZWF0ZUZhbGxiYQogICAgIG1fY29udGV4dC0+YmluZFRleHR1cmUoR3JhcGhpY3ND b250ZXh0M0Q6OlRFWFRVUkVfQ1VCRV9NQVAsIDApOwogfQogCi1ib29sIFdlYkdMUmVuZGVyaW5n Q29udGV4dDo6aXNUZXhJbnRlcm5hbGZvcm1hdENvbG9yQnVmZmVyQ29tYmluYXRpb25WYWxpZCh1 bnNpZ25lZCBsb25nIHRleEludGVybmFsZm9ybWF0LAorYm9vbCBXZWJHTFJlbmRlcmluZ0NvbnRl eHQ6OmlzVGV4SW50ZXJuYWxGb3JtYXRDb2xvckJ1ZmZlckNvbWJpbmF0aW9uVmFsaWQodW5zaWdu ZWQgbG9uZyB0ZXhJbnRlcm5hbEZvcm1hdCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVuc2lnbmVkIGxv bmcgY29sb3JCdWZmZXJGb3JtYXQpCiB7CiAgICAgc3dpdGNoIChjb2xvckJ1ZmZlckZvcm1hdCkg ewogICAgIGNhc2UgR3JhcGhpY3NDb250ZXh0M0Q6OkFMUEhBOgotICAgICAgICBpZiAodGV4SW50 ZXJuYWxmb3JtYXQgPT0gR3JhcGhpY3NDb250ZXh0M0Q6OkFMUEhBKQorICAgICAgICBpZiAodGV4 SW50ZXJuYWxGb3JtYXQgPT0gR3JhcGhpY3NDb250ZXh0M0Q6OkFMUEhBKQogICAgICAgICAgICAg cmV0dXJuIHRydWU7CiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgR3JhcGhpY3NDb250ZXh0M0Q6 OlJHQjoKLSAgICAgICAgaWYgKHRleEludGVybmFsZm9ybWF0ID09IEdyYXBoaWNzQ29udGV4dDNE OjpMVU1JTkFOQ0UKLSAgICAgICAgICAgIHx8IHRleEludGVybmFsZm9ybWF0ID09IEdyYXBoaWNz Q29udGV4dDNEOjpSR0IpCisgICAgICAgIGlmICh0ZXhJbnRlcm5hbEZvcm1hdCA9PSBHcmFwaGlj c0NvbnRleHQzRDo6TFVNSU5BTkNFCisgICAgICAgICAgICB8fCB0ZXhJbnRlcm5hbEZvcm1hdCA9 PSBHcmFwaGljc0NvbnRleHQzRDo6UkdCKQogICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAg ICAgIGJyZWFrOwogICAgIGNhc2UgR3JhcGhpY3NDb250ZXh0M0Q6OlJHQkE6CkluZGV4OiBXZWJD b3JlL2h0bWwvY2FudmFzL1dlYkdMUmVuZGVyaW5nQ29udGV4dC5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdl YkNvcmUvaHRtbC9jYW52YXMvV2ViR0xSZW5kZXJpbmdDb250ZXh0LmgJKHJldmlzaW9uIDYxMTcw KQorKysgV2ViQ29yZS9odG1sL2NhbnZhcy9XZWJHTFJlbmRlcmluZ0NvbnRleHQuaAkod29ya2lu ZyBjb3B5KQpAQCAtNDE2LDcgKzQxNiw3IEBAIGNsYXNzIFdlYktpdENTU01hdHJpeDsKICAgICAg ICAgLy8gSGVscGVyIGZ1bmN0aW9uIGZvciBjb3B5VGV4e1N1Yn1JbWFnZSwgY2hlY2sgd2hldGhl ciB0aGUgaW50ZXJuYWxmb3JtYXQKICAgICAgICAgLy8gYW5kIHRoZSBjb2xvciBidWZmZXIgZm9y bWF0IG9mIHRoZSBjdXJyZW50IGJvdW5kIGZyYW1lYnVmZmVyIGNvbWJpbmF0aW9uCiAgICAgICAg IC8vIGlzIHZhbGlkLgotICAgICAgICBib29sIGlzVGV4SW50ZXJuYWxmb3JtYXRDb2xvckJ1ZmZl ckNvbWJpbmF0aW9uVmFsaWQodW5zaWduZWQgbG9uZyB0ZXhJbnRlcm5hbGZvcm1hdCwKKyAgICAg ICAgYm9vbCBpc1RleEludGVybmFsRm9ybWF0Q29sb3JCdWZmZXJDb21iaW5hdGlvblZhbGlkKHVu c2lnbmVkIGxvbmcgdGV4SW50ZXJuYWxGb3JtYXQsCiAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB1bnNpZ25lZCBsb25nIGNvbG9yQnVm ZmVyRm9ybWF0KTsKIAogICAgICAgICAvLyBIZWxwZXIgZnVuY3Rpb24gdG8gZ2V0IHRoZSBjdXJy ZW50IGJvdW5kIHRleHR1cmUuCkluZGV4OiBXZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdMVGV4dHVy ZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9odG1sL2NhbnZhcy9XZWJHTFRleHR1cmUuY3Bw CShyZXZpc2lvbiA2MTE3MCkKKysrIFdlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xUZXh0dXJlLmNw cAkod29ya2luZyBjb3B5KQpAQCAtNDUsNyArNDUsNyBAQCBXZWJHTFRleHR1cmU6OldlYkdMVGV4 dHVyZShXZWJHTFJlbmRlcmluCiAgICAgLCBtX21hZ0ZpbHRlcihHcmFwaGljc0NvbnRleHQzRDo6 TElORUFSKQogICAgICwgbV93cmFwUyhHcmFwaGljc0NvbnRleHQzRDo6UkVQRUFUKQogICAgICwg bV93cmFwVChHcmFwaGljc0NvbnRleHQzRDo6UkVQRUFUKQotICAgICwgbV9pbnRlcm5hbGZvcm1h dCgwKQorICAgICwgbV9pbnRlcm5hbEZvcm1hdCgwKQogICAgICwgbV9pc05QT1QoZmFsc2UpCiAg ICAgLCBtX25lZWRUb1VzZUJsYWNrVGV4dHVyZShmYWxzZSkKIHsKSW5kZXg6IFdlYkNvcmUvaHRt bC9jYW52YXMvV2ViR0xUZXh0dXJlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9odG1sL2NhbnZh cy9XZWJHTFRleHR1cmUuaAkocmV2aXNpb24gNjExNzApCisrKyBXZWJDb3JlL2h0bWwvY2FudmFz L1dlYkdMVGV4dHVyZS5oCSh3b3JraW5nIGNvcHkpCkBAIC01Miw4ICs1Miw4IEBAIG5hbWVzcGFj ZSBXZWJDb3JlIHsKICAgICAgICAgdm9pZCBzZXRQYXJhbWV0ZXJmKHVuc2lnbmVkIGxvbmcgcG5h bWUsIGZsb2F0IHBhcmFtKTsKICAgICAgICAgdm9pZCBzZXRTaXplKHVuc2lnbmVkIGxvbmcgdGFy Z2V0LCB1bnNpZ25lZCB3aWR0aCwgdW5zaWduZWQgaGVpZ2h0KTsKIAotICAgICAgICB2b2lkIHNl dEludGVybmFsZm9ybWF0KHVuc2lnbmVkIGxvbmcgaW50ZXJuYWxmb3JtYXQpIHsgbV9pbnRlcm5h bGZvcm1hdCA9IGludGVybmFsZm9ybWF0OyB9Ci0gICAgICAgIHVuc2lnbmVkIGxvbmcgZ2V0SW50 ZXJuYWxmb3JtYXQoKSBjb25zdCB7IHJldHVybiBtX2ludGVybmFsZm9ybWF0OyB9CisgICAgICAg IHZvaWQgc2V0SW50ZXJuYWxGb3JtYXQodW5zaWduZWQgbG9uZyBpbnRlcm5hbGZvcm1hdCkgeyBt X2ludGVybmFsRm9ybWF0ID0gaW50ZXJuYWxmb3JtYXQ7IH0KKyAgICAgICAgdW5zaWduZWQgbG9u ZyBnZXRJbnRlcm5hbEZvcm1hdCgpIGNvbnN0IHsgcmV0dXJuIG1faW50ZXJuYWxGb3JtYXQ7IH0K IAogICAgICAgICBzdGF0aWMgYm9vbCBpc05QT1QodW5zaWduZWQsIHVuc2lnbmVkKTsKIApAQCAt ODAsNyArODAsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIGludCBtX3dyYXBTOwog ICAgICAgICBpbnQgbV93cmFwVDsKIAotICAgICAgICB1bnNpZ25lZCBsb25nIG1faW50ZXJuYWxm b3JtYXQ7CisgICAgICAgIHVuc2lnbmVkIGxvbmcgbV9pbnRlcm5hbEZvcm1hdDsKIAogICAgICAg ICB1bnNpZ25lZCBtX3dpZHRoWzZdOwogICAgICAgICB1bnNpZ25lZCBtX2hlaWdodFs2XTsK