43693 2010-08-08 11:01:52 -0700 sizeInBytes should be removed 2010-08-09 13:36:33 -0700 1 1 1 Unclassified WebKit WebGL 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 gman zmo cmarrin dglazkov kbr zmo oldest_to_newest 261909 0 gman 2010-08-08 11:01:52 -0700 WebGLContext.sizeInBytes is not part of the WebGL standard and should be removed. One of the conformance tests and a couple of the samples were using this deprecated function. I've fixed those but it seems like sizeInBytes should be removed so people don't mistakenly use it in the future. 262282 1 63920 zmo 2010-08-09 13:16:48 -0700 Created attachment 63920 patch 262287 2 zmo 2010-08-09 13:21:06 -0700 forget to mention: tests are synced with khronos. 262297 3 kbr 2010-08-09 13:33:53 -0700 Looks good to me. Consider putting sizeInBytes into webgl-test.js for better code sharing. 262299 4 zmo 2010-08-09 13:36:33 -0700 Committed r64998: <http://trac.webkit.org/changeset/64998> 63920 2010-08-09 13:16:48 -0700 2010-08-09 13:20:48 -0700 patch sizeInBytes.patch text/plain 11259 zmo SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2NDk5NikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTYgQEAKKzIwMTAtMDgtMDkgIFpoZW55YW8gTW8gIDx6bW9AZ29vZ2xlLmNvbT4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBzaXplSW5C eXRlcyBzaG91bGQgYmUgcmVtb3ZlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NDM2OTMKKworICAgICAgICAqIGh0bWwvY2FudmFzL1dlYkdMUmVuZGVy aW5nQ29udGV4dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpXZWJHTFJlbmRlcmluZ0NvbnRleHQ6 OnNpemVJbkJ5dGVzKTogRG9uJ3QgZ2VuZXJhdGUgR0wgZXJyb3JzLiAgR2VuZXJhdGUgdGhlbSBp biB0aGUgY2FsbGVycyBpbnN0ZWFkLgorICAgICAgICAoV2ViQ29yZTo6V2ViR0xSZW5kZXJpbmdD b250ZXh0Ojp2ZXJ0ZXhBdHRyaWJQb2ludGVyKTogR2VuZXJhdGUgR0wgZXJyb3IgaWYgc2l6ZUlu Qnl0ZXMgZmFpbHMuCisgICAgICAgICogaHRtbC9jYW52YXMvV2ViR0xSZW5kZXJpbmdDb250ZXh0 Lmg6IE1ha2Ugc2l6ZUluQnl0ZXMgcHJpdmF0ZSBoZWxwZXIuCisgICAgICAgICogaHRtbC9jYW52 YXMvV2ViR0xSZW5kZXJpbmdDb250ZXh0LmlkbDogUmVtb3ZlIHNpemVJbkJ5dGVzLgorCiAyMDEw LTA4LTA5ICBNYXJjdXMgQnVsYWNoICA8YnVsYWNoQGNocm9taXVtLm9yZz4KIAogICAgICAgICBS ZXZpZXdlZCBieSBKZXJlbXkgT3Jsb3cuCkluZGV4OiBXZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdM UmVuZGVyaW5nQ29udGV4dC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9odG1sL2NhbnZhcy9X ZWJHTFJlbmRlcmluZ0NvbnRleHQuY3BwCShyZXZpc2lvbiA2NDg5MCkKKysrIFdlYkNvcmUvaHRt bC9jYW52YXMvV2ViR0xSZW5kZXJpbmdDb250ZXh0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTk1 LDE0ICsxOTUsOSBAQCB2b2lkIFdlYkdMUmVuZGVyaW5nQ29udGV4dDo6cmVzaGFwZShpbnQgCiAg ICAgbV9jb250ZXh0LT5yZXNoYXBlKHdpZHRoLCBoZWlnaHQpOwogfQogCi1pbnQgV2ViR0xSZW5k ZXJpbmdDb250ZXh0OjpzaXplSW5CeXRlcyhpbnQgdHlwZSwgRXhjZXB0aW9uQ29kZSYgZWMpCitp bnQgV2ViR0xSZW5kZXJpbmdDb250ZXh0OjpzaXplSW5CeXRlcyhpbnQgdHlwZSkKIHsKLSAgICBV TlVTRURfUEFSQU0oZWMpOwotICAgIGludCByZXN1bHQgPSBtX2NvbnRleHQtPnNpemVJbkJ5dGVz KHR5cGUpOwotICAgIGlmIChyZXN1bHQgPD0gMCkKLSAgICAgICAgbV9jb250ZXh0LT5zeW50aGVz aXplR0xFcnJvcihHcmFwaGljc0NvbnRleHQzRDo6SU5WQUxJRF9FTlVNKTsKLQotICAgIHJldHVy biByZXN1bHQ7CisgICAgcmV0dXJuIG1fY29udGV4dC0+c2l6ZUluQnl0ZXModHlwZSk7CiB9CiAK IHZvaWQgV2ViR0xSZW5kZXJpbmdDb250ZXh0OjphY3RpdmVUZXh0dXJlKHVuc2lnbmVkIGxvbmcg dGV4dHVyZSwgRXhjZXB0aW9uQ29kZSYgZWMpCkBAIC0zMDIxLDYgKzMwMTYsNyBAQCB2b2lkIFdl YkdMUmVuZGVyaW5nQ29udGV4dDo6dmVydGV4QXR0cmliCiAKIHZvaWQgV2ViR0xSZW5kZXJpbmdD b250ZXh0Ojp2ZXJ0ZXhBdHRyaWJQb2ludGVyKHVuc2lnbmVkIGxvbmcgaW5kZXgsIGxvbmcgc2l6 ZSwgdW5zaWduZWQgbG9uZyB0eXBlLCBib29sIG5vcm1hbGl6ZWQsIGxvbmcgc3RyaWRlLCBsb25n IG9mZnNldCwgRXhjZXB0aW9uQ29kZSYgZWMpCiB7CisgICAgVU5VU0VEX1BBUkFNKGVjKTsKICAg ICBpZiAoaW5kZXggPj0gbV9tYXhWZXJ0ZXhBdHRyaWJzKSB7CiAgICAgICAgIG1fY29udGV4dC0+ c3ludGhlc2l6ZUdMRXJyb3IoR3JhcGhpY3NDb250ZXh0M0Q6OklOVkFMSURfVkFMVUUpOwogICAg ICAgICByZXR1cm47CkBAIC0zMDM0LDkgKzMwMzAsMTEgQEAgdm9pZCBXZWJHTFJlbmRlcmluZ0Nv bnRleHQ6OnZlcnRleEF0dHJpYgogICAgICAgICByZXR1cm47CiAgICAgfQogICAgIC8vIERldGVy bWluZSB0aGUgbnVtYmVyIG9mIGVsZW1lbnRzIHRoZSBib3VuZCBidWZmZXIgY2FuIGhvbGQsIGdp dmVuIHRoZSBvZmZzZXQsIHNpemUsIHR5cGUgYW5kIHN0cmlkZQotICAgIGxvbmcgYnl0ZXNQZXJF bGVtZW50ID0gc2l6ZSAqIHNpemVJbkJ5dGVzKHR5cGUsIGVjKTsKLSAgICBpZiAoYnl0ZXNQZXJF bGVtZW50IDw9IDApCisgICAgbG9uZyBieXRlc1BlckVsZW1lbnQgPSBzaXplICogc2l6ZUluQnl0 ZXModHlwZSk7CisgICAgaWYgKGJ5dGVzUGVyRWxlbWVudCA8PSAwKSB7CisgICAgICAgIG1fY29u dGV4dC0+c3ludGhlc2l6ZUdMRXJyb3IoR3JhcGhpY3NDb250ZXh0M0Q6OklOVkFMSURfRU5VTSk7 CiAgICAgICAgIHJldHVybjsKKyAgICB9CiAKICAgICBpZiAoaW5kZXggPj0gbV92ZXJ0ZXhBdHRy aWJTdGF0ZS5zaXplKCkpCiAgICAgICAgIG1fdmVydGV4QXR0cmliU3RhdGUucmVzaXplKGluZGV4 ICsgMSk7CkluZGV4OiBXZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdMUmVuZGVyaW5nQ29udGV4dC5o Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFdlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xSZW5kZXJpbmdDb250ZXh0 LmgJKHJldmlzaW9uIDY0ODkwKQorKysgV2ViQ29yZS9odG1sL2NhbnZhcy9XZWJHTFJlbmRlcmlu Z0NvbnRleHQuaAkod29ya2luZyBjb3B5KQpAQCAtNjAsMTAgKzYwLDYgQEAgcHVibGljOgogICAg IHZpcnR1YWwgYm9vbCBpczNkKCkgY29uc3QgeyByZXR1cm4gdHJ1ZTsgfQogICAgIHZpcnR1YWwg Ym9vbCBpc0FjY2VsZXJhdGVkKCkgY29uc3QgeyByZXR1cm4gdHJ1ZTsgfQogCi0gICAgLy8gSGVs cGVyIHRvIHJldHVybiB0aGUgc2l6ZSBpbiBieXRlcyBvZiBPcGVuR0wgZGF0YSB0eXBlcwotICAg IC8vIGxpa2UgR0xfRkxPQVQsIEdMX0lOVCwgZXRjLgotICAgIGludCBzaXplSW5CeXRlcyhpbnQg dHlwZSwgRXhjZXB0aW9uQ29kZSYgZWMpOwotCiAgICAgdm9pZCBhY3RpdmVUZXh0dXJlKHVuc2ln bmVkIGxvbmcgdGV4dHVyZSwgRXhjZXB0aW9uQ29kZSYgZWMpOwogICAgIHZvaWQgYXR0YWNoU2hh ZGVyKFdlYkdMUHJvZ3JhbSosIFdlYkdMU2hhZGVyKiwgRXhjZXB0aW9uQ29kZSYgZWMpOwogICAg IHZvaWQgYmluZEF0dHJpYkxvY2F0aW9uKFdlYkdMUHJvZ3JhbSosIHVuc2lnbmVkIGxvbmcgaW5k ZXgsIGNvbnN0IFN0cmluZyYgbmFtZSwgRXhjZXB0aW9uQ29kZSYgZWMpOwpAQCAtMzM2LDYgKzMz MiwxMCBAQCBwdWJsaWM6CiAKICAgICBib29sIGlzR0xFUzJDb21wbGlhbnQoKTsKIAorICAgIC8v IEhlbHBlciB0byByZXR1cm4gdGhlIHNpemUgaW4gYnl0ZXMgb2YgT3BlbkdMIGRhdGEgdHlwZXMK KyAgICAvLyBsaWtlIEdMX0ZMT0FULCBHTF9JTlQsIGV0Yy4KKyAgICBpbnQgc2l6ZUluQnl0ZXMo aW50IHR5cGUpOworCiAgICAgLy8gQmFzaWMgdmFsaWRhdGlvbiBvZiBjb3VudCBhbmQgb2Zmc2V0 IGFnYWluc3QgbnVtYmVyIG9mIGVsZW1lbnRzIGluIGVsZW1lbnQgYXJyYXkgYnVmZmVyCiAgICAg Ym9vbCB2YWxpZGF0ZUVsZW1lbnRBcnJheVNpemUodW5zaWduZWQgbG9uZyBjb3VudCwgdW5zaWdu ZWQgbG9uZyB0eXBlLCBsb25nIG9mZnNldCk7CiAKSW5kZXg6IFdlYkNvcmUvaHRtbC9jYW52YXMv V2ViR0xSZW5kZXJpbmdDb250ZXh0LmlkbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2h0bWwvY2Fu dmFzL1dlYkdMUmVuZGVyaW5nQ29udGV4dC5pZGwJKHJldmlzaW9uIDY0ODkwKQorKysgV2ViQ29y ZS9odG1sL2NhbnZhcy9XZWJHTFJlbmRlcmluZ0NvbnRleHQuaWRsCSh3b3JraW5nIGNvcHkpCkBA IC00NjQsOCArNDY0LDYgQEAgbW9kdWxlIGh0bWwgewogICAgICAgICBjb25zdCB1bnNpZ25lZCBp bnQgVU5QQUNLX0ZMSVBfWV9XRUJHTCAgICAgICAgICAgID0gMHg5MjQwOwogICAgICAgICBjb25z dCB1bnNpZ25lZCBpbnQgVU5QQUNLX1BSRU1VTFRJUExZX0FMUEhBX1dFQkdMID0gMHg5MjQxOwog Ci0gICAgICAgIGxvbmcgc2l6ZUluQnl0ZXMoaW4gdW5zaWduZWQgbG9uZyB0eXBlKSByYWlzZXMo RE9NRXhjZXB0aW9uKTsKLQogICAgICAgICB2b2lkICAgICAgICAgYWN0aXZlVGV4dHVyZShpbiB1 bnNpZ25lZCBsb25nIHRleHR1cmUpIHJhaXNlcyhET01FeGNlcHRpb24pOwogICAgICAgICB2b2lk ICAgICAgICAgYXR0YWNoU2hhZGVyKGluIFdlYkdMUHJvZ3JhbSBwcm9ncmFtLCBpbiBXZWJHTFNo YWRlciBzaGFkZXIpIHJhaXNlcyhET01FeGNlcHRpb24pOwogICAgICAgICB2b2lkICAgICAgICAg YmluZEF0dHJpYkxvY2F0aW9uKGluIFdlYkdMUHJvZ3JhbSBwcm9ncmFtLCBpbiB1bnNpZ25lZCBs b25nIGluZGV4LCBpbiBET01TdHJpbmcgbmFtZSkgcmFpc2VzKERPTUV4Y2VwdGlvbik7CkluZGV4 OiBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvQ2hhbmdl TG9nCShyZXZpc2lvbiA2NDk5NikKKysrIExheW91dFRlc3RzL0NoYW5nZUxvZwkod29ya2luZyBj b3B5KQpAQCAtMSwzICsxLDE0IEBACisyMDEwLTA4LTA5ICBaaGVueWFvIE1vICA8em1vQGdvb2ds ZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg c2l6ZUluQnl0ZXMgc2hvdWxkIGJlIHJlbW92ZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTQzNjkzCisKKyAgICAgICAgKiBmYXN0L2NhbnZhcy93ZWJn bC9nbC1vYmplY3QtZ2V0LWNhbGxzLWV4cGVjdGVkLnR4dDogRGVmaW5lIHNpemVJbkJ5dGVzIGFu ZCBkb24ndCB1c2UgdGhlIFdlYkdMIG9uZSAoaXQncyBiZWVuIHJlbW92ZWQpLgorICAgICAgICAq IGZhc3QvY2FudmFzL3dlYmdsL2dsLW9iamVjdC1nZXQtY2FsbHMuaHRtbDogRGl0dG8uCisgICAg ICAgICogZmFzdC9jYW52YXMvd2ViZ2wvaW5kZXgtdmFsaWRhdGlvbi5odG1sOiBEaXR0by4KKwog MjAxMC0wOC0wOSAgSmlhbiBMaSAgPGppYW5saUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgVXBk YXRlIGNocm9taXVtIHRlc3QgcmVzdWx0cy4KSW5kZXg6IExheW91dFRlc3RzL2Zhc3QvY2FudmFz L3dlYmdsL2dsLW9iamVjdC1nZXQtY2FsbHMtZXhwZWN0ZWQudHh0Cj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExh eW91dFRlc3RzL2Zhc3QvY2FudmFzL3dlYmdsL2dsLW9iamVjdC1nZXQtY2FsbHMtZXhwZWN0ZWQu dHh0CShyZXZpc2lvbiA2NDg5MCkKKysrIExheW91dFRlc3RzL2Zhc3QvY2FudmFzL3dlYmdsL2ds LW9iamVjdC1nZXQtY2FsbHMtZXhwZWN0ZWQudHh0CSh3b3JraW5nIGNvcHkpCkBAIC03NSw3ICs3 NSw3IEBAIFBBU1MgZ2wuZ2V0VW5pZm9ybShtYXRQcm9ncmFtLCBtdmFsNExvYykKIFBBU1MgZ2wu Z2V0VmVydGV4QXR0cmliKDEsIGdsLlZFUlRFWF9BVFRSSUJfQVJSQVlfQlVGRkVSX0JJTkRJTkcp IGlzIGJ1ZmZlcgogUEFTUyBnbC5nZXRWZXJ0ZXhBdHRyaWIoMSwgZ2wuVkVSVEVYX0FUVFJJQl9B UlJBWV9FTkFCTEVEKSBpcyB0cnVlCiBQQVNTIGdsLmdldFZlcnRleEF0dHJpYigxLCBnbC5WRVJU RVhfQVRUUklCX0FSUkFZX1NJWkUpIGlzIDQKLVBBU1MgKGdsLmdldFZlcnRleEF0dHJpYigxLCBn bC5WRVJURVhfQVRUUklCX0FSUkFZX1NUUklERSkgPT0gMCkgfHwgKGdsLmdldFZlcnRleEF0dHJp YigxLCBnbC5WRVJURVhfQVRUUklCX0FSUkFZX1NUUklERSkgPT0gNCAqIGdsLnNpemVJbkJ5dGVz KGdsLkZMT0FUKSkgaXMgdHJ1ZQorUEFTUyAoZ2wuZ2V0VmVydGV4QXR0cmliKDEsIGdsLlZFUlRF WF9BVFRSSUJfQVJSQVlfU1RSSURFKSA9PSAwKSB8fCAoZ2wuZ2V0VmVydGV4QXR0cmliKDEsIGds LlZFUlRFWF9BVFRSSUJfQVJSQVlfU1RSSURFKSA9PSA0ICogc2l6ZUluQnl0ZXMoZ2wuRkxPQVQp KSBpcyB0cnVlCiBQQVNTIGdsLmdldFZlcnRleEF0dHJpYigxLCBnbC5WRVJURVhfQVRUUklCX0FS UkFZX1RZUEUpIGlzIGdsLkZMT0FUCiBQQVNTIGdsLmdldFZlcnRleEF0dHJpYigxLCBnbC5WRVJU RVhfQVRUUklCX0FSUkFZX05PUk1BTElaRUQpIGlzIGZhbHNlCiBQQVNTIGdsLmdldFZlcnRleEF0 dHJpYigxLCBnbC5WRVJURVhfQVRUUklCX0FSUkFZX0VOQUJMRUQpIGlzIGZhbHNlCkluZGV4OiBM YXlvdXRUZXN0cy9mYXN0L2NhbnZhcy93ZWJnbC9nbC1vYmplY3QtZ2V0LWNhbGxzLmh0bWwKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gTGF5b3V0VGVzdHMvZmFzdC9jYW52YXMvd2ViZ2wvZ2wtb2JqZWN0LWdldC1j YWxscy5odG1sCShyZXZpc2lvbiA2NDg5MCkKKysrIExheW91dFRlc3RzL2Zhc3QvY2FudmFzL3dl YmdsL2dsLW9iamVjdC1nZXQtY2FsbHMuaHRtbAkod29ya2luZyBjb3B5KQpAQCAtMTEsNiArMTEs MjMgQEAKIDxzY3JpcHQ+CiBkZXNjcmlwdGlvbigiVGVzdCBvZiBnZXQgY2FsbHMgYWdhaW5zdCBH TCBvYmplY3RzIGxpa2UgZ2V0QnVmZmVyUGFyYW1ldGVyLCBldGMuIik7CiAKK2Z1bmN0aW9uIHNp emVJbkJ5dGVzKHR5cGUpIHsKKyAgc3dpdGNoICh0eXBlKSB7CisgIGNhc2UgZ2wuQllURToKKyAg Y2FzZSBnbC5VTlNJR05FRF9CWVRFOgorICAgIHJldHVybiAxOworICBjYXNlIGdsLlNIT1JUOgor ICBjYXNlIGdsLlVOU0lHTkVEX1NIT1JUOgorICAgIHJldHVybiAyOworICBjYXNlIGdsLklOVDoK KyAgY2FzZSBnbC5VTlNJR05FRF9JTlQ6CisgIGNhc2UgZ2wuRkxPQVQ6CisJcmV0dXJuIDQ7Cisg IGRlZmF1bHQ6CisJdGhyb3cgInVua25vd24gdHlwZSI7CisgIH0KK30KKwogdmFyIGdsID0gY3Jl YXRlM0RDb250ZXh0KCk7CiAKIHZhciBzdGFuZGFyZFZlcnQgPSBsb2FkU3RhbmRhcmRWZXJ0ZXhT aGFkZXIoZ2wpOwpAQCAtMTk3LDcgKzIxNCw3IEBAIGdsLnZlcnRleEF0dHJpYlBvaW50ZXIoMSwg NCwgZ2wuRkxPQVQsIGYKIHNob3VsZEJlKCdnbC5nZXRWZXJ0ZXhBdHRyaWIoMSwgZ2wuVkVSVEVY X0FUVFJJQl9BUlJBWV9CVUZGRVJfQklORElORyknLCAnYnVmZmVyJyk7CiBzaG91bGRCZSgnZ2wu Z2V0VmVydGV4QXR0cmliKDEsIGdsLlZFUlRFWF9BVFRSSUJfQVJSQVlfRU5BQkxFRCknLCAndHJ1 ZScpOwogc2hvdWxkQmUoJ2dsLmdldFZlcnRleEF0dHJpYigxLCBnbC5WRVJURVhfQVRUUklCX0FS UkFZX1NJWkUpJywgJzQnKTsKLXNob3VsZEJlKCcoZ2wuZ2V0VmVydGV4QXR0cmliKDEsIGdsLlZF UlRFWF9BVFRSSUJfQVJSQVlfU1RSSURFKSA9PSAwKSB8fCAoZ2wuZ2V0VmVydGV4QXR0cmliKDEs IGdsLlZFUlRFWF9BVFRSSUJfQVJSQVlfU1RSSURFKSA9PSA0ICogZ2wuc2l6ZUluQnl0ZXMoZ2wu RkxPQVQpKScsICd0cnVlJyk7CitzaG91bGRCZSgnKGdsLmdldFZlcnRleEF0dHJpYigxLCBnbC5W RVJURVhfQVRUUklCX0FSUkFZX1NUUklERSkgPT0gMCkgfHwgKGdsLmdldFZlcnRleEF0dHJpYigx LCBnbC5WRVJURVhfQVRUUklCX0FSUkFZX1NUUklERSkgPT0gNCAqIHNpemVJbkJ5dGVzKGdsLkZM T0FUKSknLCAndHJ1ZScpOwogc2hvdWxkQmUoJ2dsLmdldFZlcnRleEF0dHJpYigxLCBnbC5WRVJU RVhfQVRUUklCX0FSUkFZX1RZUEUpJywgJ2dsLkZMT0FUJyk7CiBzaG91bGRCZSgnZ2wuZ2V0VmVy dGV4QXR0cmliKDEsIGdsLlZFUlRFWF9BVFRSSUJfQVJSQVlfTk9STUFMSVpFRCknLCAnZmFsc2Un KTsKIGdsLmRpc2FibGVWZXJ0ZXhBdHRyaWJBcnJheSgxKTsKSW5kZXg6IExheW91dFRlc3RzL2Zh c3QvY2FudmFzL3dlYmdsL2luZGV4LXZhbGlkYXRpb24uaHRtbAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlv dXRUZXN0cy9mYXN0L2NhbnZhcy93ZWJnbC9pbmRleC12YWxpZGF0aW9uLmh0bWwJKHJldmlzaW9u IDY0ODkwKQorKysgTGF5b3V0VGVzdHMvZmFzdC9jYW52YXMvd2ViZ2wvaW5kZXgtdmFsaWRhdGlv bi5odG1sCSh3b3JraW5nIGNvcHkpCkBAIC0xMSw2ICsxMSwyMyBAQAogPHNjcmlwdD4KIGRlc2Ny aXB0aW9uKCJUZXN0cyB0aGF0IGluZGV4IHZhbGlkYXRpb24gdmVyaWZpZXMgdGhlIGNvcnJlY3Qg bnVtYmVyIG9mIGluZGljZXMiKTsKIAorZnVuY3Rpb24gc2l6ZUluQnl0ZXModHlwZSkgeworICBz d2l0Y2ggKHR5cGUpIHsKKyAgY2FzZSBnbC5CWVRFOgorICBjYXNlIGdsLlVOU0lHTkVEX0JZVEU6 CisgICAgcmV0dXJuIDE7CisgIGNhc2UgZ2wuU0hPUlQ6CisgIGNhc2UgZ2wuVU5TSUdORURfU0hP UlQ6CisgICAgcmV0dXJuIDI7CisgIGNhc2UgZ2wuSU5UOgorICBjYXNlIGdsLlVOU0lHTkVEX0lO VDoKKyAgY2FzZSBnbC5GTE9BVDoKKwlyZXR1cm4gNDsKKyAgZGVmYXVsdDoKKwl0aHJvdyAidW5r bm93biB0eXBlIjsKKyAgfQorfQorCiB2YXIgZ2wgPSBjcmVhdGUzRENvbnRleHQoKTsKIHZhciBw cm9ncmFtID0gbG9hZFN0YW5kYXJkUHJvZ3JhbShnbCk7CiAKQEAgLTM5LDkgKzU2LDkgQEAgZ2wu YnVmZmVyRGF0YShnbC5FTEVNRU5UX0FSUkFZX0JVRkZFUiwgaQogZ2wudXNlUHJvZ3JhbShwcm9n cmFtKTsKIHZhciB2ZXJ0ZXhMb2MgPSBnbC5nZXRBdHRyaWJMb2NhdGlvbihwcm9ncmFtLCAiYV92 ZXJ0ZXgiKTsKIHZhciBub3JtYWxMb2MgPSBnbC5nZXRBdHRyaWJMb2NhdGlvbihwcm9ncmFtLCAi YV9ub3JtYWwiKTsKLWdsLnZlcnRleEF0dHJpYlBvaW50ZXIodmVydGV4TG9jLCA0LCBnbC5GTE9B VCwgZmFsc2UsIDcgKiBnbC5zaXplSW5CeXRlcyhnbC5GTE9BVCksIDApOworZ2wudmVydGV4QXR0 cmliUG9pbnRlcih2ZXJ0ZXhMb2MsIDQsIGdsLkZMT0FULCBmYWxzZSwgNyAqIHNpemVJbkJ5dGVz KGdsLkZMT0FUKSwgMCk7CiBnbC5lbmFibGVWZXJ0ZXhBdHRyaWJBcnJheSh2ZXJ0ZXhMb2MpOwot Z2wudmVydGV4QXR0cmliUG9pbnRlcihub3JtYWxMb2MsIDMsIGdsLkZMT0FULCBmYWxzZSwgNyAq IGdsLnNpemVJbkJ5dGVzKGdsLkZMT0FUKSwgNCAqIGdsLnNpemVJbkJ5dGVzKGdsLkZMT0FUKSk7 CitnbC52ZXJ0ZXhBdHRyaWJQb2ludGVyKG5vcm1hbExvYywgMywgZ2wuRkxPQVQsIGZhbHNlLCA3 ICogc2l6ZUluQnl0ZXMoZ2wuRkxPQVQpLCA0ICogc2l6ZUluQnl0ZXMoZ2wuRkxPQVQpKTsKIGds LmVuYWJsZVZlcnRleEF0dHJpYkFycmF5KG5vcm1hbExvYyk7CiBzaG91bGRCZSgnZ2wuY2hlY2tG cmFtZWJ1ZmZlclN0YXR1cyhnbC5GUkFNRUJVRkZFUiknLCAnZ2wuRlJBTUVCVUZGRVJfQ09NUExF VEUnKTsKIHNob3VsZEJlKCdnbC5nZXRFcnJvcigpJywgJzAnKTsKQEAgLTUzLDcgKzcwLDcgQEAg ZGVidWcoIlRlc3Rpbmcgd2l0aCBvdXQtb2YtcmFuZ2UgaW5kaWNlcwogdmFyIGJ1ZmZlckluY29t cGxldGUgPSBnbC5jcmVhdGVCdWZmZXIoKTsKIGdsLmJpbmRCdWZmZXIoZ2wuQVJSQVlfQlVGRkVS LCBidWZmZXJJbmNvbXBsZXRlKTsKIGdsLmJ1ZmZlckRhdGEoZ2wuQVJSQVlfQlVGRkVSLCBkYXRh SW5jb21wbGV0ZSwgZ2wuU1RBVElDX0RSQVcpOwotZ2wudmVydGV4QXR0cmliUG9pbnRlcih2ZXJ0 ZXhMb2MsIDQsIGdsLkZMT0FULCBmYWxzZSwgNyAqIGdsLnNpemVJbkJ5dGVzKGdsLkZMT0FUKSwg MCk7CitnbC52ZXJ0ZXhBdHRyaWJQb2ludGVyKHZlcnRleExvYywgNCwgZ2wuRkxPQVQsIGZhbHNl LCA3ICogc2l6ZUluQnl0ZXMoZ2wuRkxPQVQpLCAwKTsKIGdsLmVuYWJsZVZlcnRleEF0dHJpYkFy cmF5KHZlcnRleExvYyk7CiBnbC5kaXNhYmxlVmVydGV4QXR0cmliQXJyYXkobm9ybWFsTG9jKTsK IGRlYnVnKCJFbmFibGUgdmVydGljZXMsIHZhbGlkIik7CkBAIC02MSw3ICs3OCw3IEBAIHNob3Vs ZEJlKCdnbC5nZXRFcnJvcigpJywgJzAnKTsKIHNob3VsZEJlVW5kZWZpbmVkKCdnbC5kcmF3RWxl bWVudHMoZ2wuVFJJQU5HTEVTLCAzLCBnbC5VTlNJR05FRF9TSE9SVCwgMCknKTsKIHNob3VsZEJl KCdnbC5nZXRFcnJvcigpJywgJzAnKTsKIGRlYnVnKCJFbmFibGUgbm9ybWFscywgb3V0LW9mLXJh bmdlIik7Ci1nbC52ZXJ0ZXhBdHRyaWJQb2ludGVyKG5vcm1hbExvYywgMywgZ2wuRkxPQVQsIGZh bHNlLCA3ICogZ2wuc2l6ZUluQnl0ZXMoZ2wuRkxPQVQpLCA0ICogZ2wuc2l6ZUluQnl0ZXMoZ2wu RkxPQVQpKTsKK2dsLnZlcnRleEF0dHJpYlBvaW50ZXIobm9ybWFsTG9jLCAzLCBnbC5GTE9BVCwg ZmFsc2UsIDcgKiBzaXplSW5CeXRlcyhnbC5GTE9BVCksIDQgKiBzaXplSW5CeXRlcyhnbC5GTE9B VCkpOwogZ2wuZW5hYmxlVmVydGV4QXR0cmliQXJyYXkobm9ybWFsTG9jKTsKIHNob3VsZEJlKCdn bC5nZXRFcnJvcigpJywgJzAnKTsKIHNob3VsZEJlVW5kZWZpbmVkKCdnbC5kcmF3RWxlbWVudHMo Z2wuVFJJQU5HTEVTLCAzLCBnbC5VTlNJR05FRF9TSE9SVCwgMCknKTsKQEAgLTc3LDcgKzk0LDcg QEAgc2hvdWxkQmUoJ2dsLmdldEVycm9yKCknLCAnMCcpOwogc2hvdWxkQmVVbmRlZmluZWQoJ2ds LmRyYXdFbGVtZW50cyhnbC5UUklBTkdMRVMsIDMsIGdsLlVOU0lHTkVEX1NIT1JULCAwKScpOwog c2hvdWxkQmUoJ2dsLmdldEVycm9yKCknLCAnZ2wuSU5WQUxJRF9PUEVSQVRJT04nKTsKIGRlYnVn KCJFbmFibGUgYW4gZXh0cmEgYXR0cmlidXRlIHdpdGggaW5zdWZmaWNpZW50IGRhdGEgYnVmZmVy Iik7Ci1nbC52ZXJ0ZXhBdHRyaWJQb2ludGVyKGV4dHJhTG9jLCAzLCBnbC5GTE9BVCwgZmFsc2Us IDcgKiBnbC5zaXplSW5CeXRlcyhnbC5GTE9BVCksIDQgKiBnbC5zaXplSW5CeXRlcyhnbC5GTE9B VCkpOworZ2wudmVydGV4QXR0cmliUG9pbnRlcihleHRyYUxvYywgMywgZ2wuRkxPQVQsIGZhbHNl LCA3ICogc2l6ZUluQnl0ZXMoZ2wuRkxPQVQpLCA0ICogc2l6ZUluQnl0ZXMoZ2wuRkxPQVQpKTsK IHNob3VsZEJlKCdnbC5nZXRFcnJvcigpJywgJzAnKTsKIHNob3VsZEJlVW5kZWZpbmVkKCdnbC5k cmF3RWxlbWVudHMoZ2wuVFJJQU5HTEVTLCAzLCBnbC5VTlNJR05FRF9TSE9SVCwgMCknKTsKIHNo b3VsZEJlKCdnbC5nZXRFcnJvcigpJywgJzAnKTsK