80845 2012-03-12 08:45:51 -0700 [TexMapGL] Use textures sized exactly to their contents. 2012-03-12 10:08:50 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jturcotte jturcotte noam oldest_to_newest 576150 0 jturcotte 2012-03-12 08:45:51 -0700 [TexMapGL] Use textures sized exactly to their contents. 576164 1 131332 jturcotte 2012-03-12 08:54:09 -0700 Created attachment 131332 Patch 576178 2 131332 webkit-ews 2012-03-12 09:26:06 -0700 Comment on attachment 131332 Patch Attachment 131332 did not pass qt-wk2-ews (qt): Output: http://queues.webkit.org/results/11940917 576182 3 131332 webkit-ews 2012-03-12 09:27:51 -0700 Comment on attachment 131332 Patch Attachment 131332 did not pass qt-ews (qt): Output: http://queues.webkit.org/results/11935964 576186 4 131332 noam 2012-03-12 09:31:34 -0700 Comment on attachment 131332 Patch Seems like this doesn't compile; But once you fix that the patch LGTM. 576206 5 jturcotte 2012-03-12 09:55:44 -0700 (In reply to comment #4) > (From update of attachment 131332 [details]) > Seems like this doesn't compile; But once you fix that the patch LGTM. Thx, I'll push it after the patch in bug #80844 which comes first in my clone and remove the failing part. 576219 6 jturcotte 2012-03-12 10:08:50 -0700 Committed r110438: <http://trac.webkit.org/changeset/110438> 131332 2012-03-12 08:54:09 -0700 2012-03-12 09:31:33 -0700 Patch bug-80845-20120312165315.patch text/plain 12082 jturcotte U3VidmVyc2lvbiBSZXZpc2lvbjogMTEwNDI3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTgzN2JkN2Q5YjMxNWNk ZGY2NjcxMmQ5YWYxMDhlNjk5MGUxZmExYi4uYjFjODNkNGU5YjFiMWE4NjY5NzZiNjExMjE4YWJh MWVhMGEyYTg4YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM3IEBACiAyMDEyLTAzLTEyICBKb2Nl bHluIFR1cmNvdHRlICA8am9jZWx5bi50dXJjb3R0ZUBub2tpYS5jb20+CiAKKyAgICAgICAgW1Rl eE1hcEdMXSBVc2UgdGV4dHVyZXMgc2l6ZWQgZXhhY3RseSB0byB0aGVpciBjb250ZW50cy4KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgwODQ1CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBmaXhlcyBh IHJlZ3Jlc3Npb24gaW50cm9kdWNlZCBpbiByMTA4MjczIGFzIHdlbGwgYXMgdGhlIGJ1ZyBpdCBm aXhlZC4KKyAgICAgICAgVGhlIHJlZ3Jlc3NpbmcgYmVoYXZpb3Igd2FzIHRoYXQgdGV4dHVyZXMg d2VyZSByZW5kZXJlZCBzaHJ1bmsgYnkgMSBwaXhlbAorICAgICAgICBhbmQgdGh1cyB3b3VsZCBh cHBlYXIgYmx1cnJ5IG9uIHRoZSBzY3JlZW4uCisgICAgICAgIFRoZSBvcmlnaW5hbCBwcm9ibGVt IHdhcyB0aGF0IGdhcmJhZ2UgY29udGVudHMgd291bGQgYXBwZWFyIG9uIGZpbHRlcmVkCisgICAg ICAgIHRleHR1cmVzIHNpbmNlIHdlIHdvdWxkIHJldXNlIHRleHR1cmVzIG9mIGRpZmZlcmVudCBz aXplcyBieSBnaXZpbmcgdGhlbQorICAgICAgICBhIHNsaWdodGx5IGJpZ2dlciBzaXplLgorCisg ICAgICAgIFRoaXMgcGF0Y2ggd2lsbCByZXVzZSB0aGUgdGV4dHVyZSBvbmx5IGlmIHRoZSBzaXpl IG1hdGNoZXMgZXhhY3RseSB0byBhbGxvdworICAgICAgICBlZGdlIGNsYW1waW5nIHRvIHdvcmsg cHJvcGVybHkgd2hlbiByZWRlcmluZyB3aXRoIGxpbmVhciBmaWx0ZXJpbmcuCisgICAgICAgIFJl dXNpbmcgdGV4dHVyZXMgd291bGQgb25seSBzYXZlcyB1cyB0aGUgYWxsb2NhdGlvbiBvZiBncmFw aGljIG1lbW9yeQorICAgICAgICBhbnl3YXksIHdoaWNoIGlzIG5lZ2xpZ2VhYmxlIGNvbXBhcmVk IHRvIHRleHR1cmUgdXBsb2FkLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvcXQvR3Jh cGhpY3NDb250ZXh0M0RRdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQz RFByaXZhdGU6OnBhaW50VG9UZXh0dXJlTWFwcGVyKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFw aGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlckdMLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlRleHR1 cmVNYXBwZXJHTDo6ZHJhd1RleHR1cmUpOgorICAgICAgICAoV2ViQ29yZTo6Qml0bWFwVGV4dHVy ZUdMOjpkaWRSZXNldCk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1 cmVNYXBwZXJHTC5oOgorICAgICAgICAoQml0bWFwVGV4dHVyZUdMKToKKyAgICAgICAgKiBwbGF0 Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlclNoYWRlck1hbmFnZXIuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6VGV4dHVyZU1hcHBlclNoYWRlclByb2dyYW1PcGFjaXR5QW5kTWFzazo6 VGV4dHVyZU1hcHBlclNoYWRlclByb2dyYW1PcGFjaXR5QW5kTWFzayk6CisgICAgICAgIChXZWJD b3JlOjpUZXh0dXJlTWFwcGVyU2hhZGVyUHJvZ3JhbU9wYWNpdHlBbmRNYXNrOjpwcmVwYXJlKToK KyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlclNoYWRlck1h bmFnZXIuaDoKKyAgICAgICAgKFRleHR1cmVNYXBwZXJTaGFkZXJQcm9ncmFtT3BhY2l0eUFuZE1h c2spOgorCisyMDEyLTAzLTEyICBKb2NlbHluIFR1cmNvdHRlICA8am9jZWx5bi50dXJjb3R0ZUBu b2tpYS5jb20+CisKICAgICAgICAgW1RleE1hcF0gUmVtb3ZlIEJpdG1hcFRleHR1cmU6OmRlc3Ry b3kuCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MDg0 NAogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9HcmFw aGljc0NvbnRleHQzRFF0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0 L0dyYXBoaWNzQ29udGV4dDNEUXQuY3BwCmluZGV4IDcwMDU3ODVjMDFkZTZjMzc5YjY5YWY0NjY3 M2VjZWIzNTc3YmY5YmIuLmJmNjFjOGI1MGQ5MzkyNzBmZDAwY2EwMjFlYTllOWViNGVjZTBiZmIg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L0dyYXBoaWNz Q29udGV4dDNEUXQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0 L0dyYXBoaWNzQ29udGV4dDNEUXQuY3BwCkBAIC0xMjQsNyArMTI0LDcgQEAgdm9pZCBHcmFwaGlj c0NvbnRleHQzRFByaXZhdGU6OnBhaW50VG9UZXh0dXJlTWFwcGVyKFRleHR1cmVNYXBwZXIqIHRl eHR1cmVNYXBwZXIKICAgICBpZiAodGV4dHVyZU1hcHBlci0+YWNjZWxlcmF0aW9uTW9kZSgpID09 IFRleHR1cmVNYXBwZXI6Ok9wZW5HTE1vZGUpIHsKICAgICAgICAgVGV4dHVyZU1hcHBlckdMKiB0 ZXhtYXBHTCA9IHN0YXRpY19jYXN0PFRleHR1cmVNYXBwZXJHTCo+KHRleHR1cmVNYXBwZXIpOwog ICAgICAgICBUZXh0dXJlTWFwcGVyR0w6OkZsYWdzIGZsYWdzID0gVGV4dHVyZU1hcHBlckdMOjpT aG91bGRGbGlwVGV4dHVyZSB8IChtX2NvbnRleHQtPm1fYXR0cnMuYWxwaGEgPyBUZXh0dXJlTWFw cGVyR0w6OlN1cHBvcnRzQmxlbmRpbmcgOiAwKTsKLSAgICAgICAgdGV4bWFwR0wtPmRyYXdUZXh0 dXJlKG1fY29udGV4dC0+bV90ZXh0dXJlLCBmbGFncywgRmxvYXRTaXplKDEsIDEpLCB0YXJnZXRS ZWN0LCBtYXRyaXgsIG9wYWNpdHksIG1hc2spOworICAgICAgICB0ZXhtYXBHTC0+ZHJhd1RleHR1 cmUobV9jb250ZXh0LT5tX3RleHR1cmUsIGZsYWdzLCB0YXJnZXRSZWN0LCBtYXRyaXgsIG9wYWNp dHksIG1hc2spOwogICAgICAgICByZXR1cm47CiAgICAgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlckdMLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyR0wuY3Bw CmluZGV4IDM1MDlkOWQ3MzE5YWUwMGExODk1YjJmM2Q2M2E0MzI2MzE5NmIwNjguLjAyNjEyZmU3 ZWZkNTYwOWI4NWRmZDhiZjJiOTc0YTY4OWQ0NmYzODAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyR0wuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyR0wuY3Bw CkBAIC0zMTMsMTAgKzMxMywxMCBAQCB2b2lkIFRleHR1cmVNYXBwZXJHTDo6ZHJhd1RleHR1cmUo Y29uc3QgQml0bWFwVGV4dHVyZSYgdGV4dHVyZSwgY29uc3QgRmxvYXRSZWN0JgogICAgICAgICBy ZXR1cm47CiAKICAgICBjb25zdCBCaXRtYXBUZXh0dXJlR0wmIHRleHR1cmVHTCA9IHN0YXRpY19j YXN0PGNvbnN0IEJpdG1hcFRleHR1cmVHTCY+KHRleHR1cmUpOwotICAgIGRyYXdUZXh0dXJlKHRl eHR1cmVHTC5pZCgpLCB0ZXh0dXJlR0wuaXNPcGFxdWUoKSA/IDAgOiBTdXBwb3J0c0JsZW5kaW5n LCB0ZXh0dXJlR0wucmVsYXRpdmVTaXplKCksIHRhcmdldFJlY3QsIG1hdHJpeCwgb3BhY2l0eSwg bWFzayk7CisgICAgZHJhd1RleHR1cmUodGV4dHVyZUdMLmlkKCksIHRleHR1cmVHTC5pc09wYXF1 ZSgpID8gMCA6IFN1cHBvcnRzQmxlbmRpbmcsIHRhcmdldFJlY3QsIG1hdHJpeCwgb3BhY2l0eSwg bWFzayk7CiB9CiAKLXZvaWQgVGV4dHVyZU1hcHBlckdMOjpkcmF3VGV4dHVyZSh1aW50MzJfdCB0 ZXh0dXJlLCBGbGFncyBmbGFncywgY29uc3QgRmxvYXRTaXplJiByZWxhdGl2ZVNpemUsIGNvbnN0 IEZsb2F0UmVjdCYgdGFyZ2V0UmVjdCwgY29uc3QgVHJhbnNmb3JtYXRpb25NYXRyaXgmIG1vZGVs Vmlld01hdHJpeCwgZmxvYXQgb3BhY2l0eSwgY29uc3QgQml0bWFwVGV4dHVyZSogbWFza1RleHR1 cmUpCit2b2lkIFRleHR1cmVNYXBwZXJHTDo6ZHJhd1RleHR1cmUodWludDMyX3QgdGV4dHVyZSwg RmxhZ3MgZmxhZ3MsIGNvbnN0IEZsb2F0UmVjdCYgdGFyZ2V0UmVjdCwgY29uc3QgVHJhbnNmb3Jt YXRpb25NYXRyaXgmIG1vZGVsVmlld01hdHJpeCwgZmxvYXQgb3BhY2l0eSwgY29uc3QgQml0bWFw VGV4dHVyZSogbWFza1RleHR1cmUpCiB7CiAgICAgUmVmUHRyPFRleHR1cmVNYXBwZXJTaGFkZXJQ cm9ncmFtPiBzaGFkZXJJbmZvOwogICAgIGlmIChtYXNrVGV4dHVyZSkKQEAgLTM0NCwxMCArMzQ0 LDEyIEBAIHZvaWQgVGV4dHVyZU1hcHBlckdMOjpkcmF3VGV4dHVyZSh1aW50MzJfdCB0ZXh0dXJl LCBGbGFncyBmbGFncywgY29uc3QgRmxvYXRTaXplCiAgICAgICAgIG1hdHJpeC5tMzEoKSwgbWF0 cml4Lm0zMigpLCBtYXRyaXgubTMzKCksIG1hdHJpeC5tMzQoKSwKICAgICAgICAgbWF0cml4Lm00 MSgpLCBtYXRyaXgubTQyKCksIG1hdHJpeC5tNDMoKSwgbWF0cml4Lm00NCgpCiAgICAgfTsKLSAg ICBjb25zdCBHTGZsb2F0IG00c3JjW10gPSB7cmVsYXRpdmVTaXplLndpZHRoKCksIDAsIDAsIDAs Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgMCwgcmVsYXRpdmVTaXplLmhl aWdodCgpICogKChmbGFncyAmIFNob3VsZEZsaXBUZXh0dXJlKSA/IC0xIDogMSksIDAsIDAsCi0g ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgMCwgMCwgMSwgMCwKLSAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAwLCAoZmxhZ3MgJiBTaG91bGRGbGlwVGV4dHVy ZSkgPyByZWxhdGl2ZVNpemUuaGVpZ2h0KCkgOiAwLCAwLCAxfTsKKworICAgIGNvbnN0IEdMZmxv YXQgbTRzcmNbXSA9IHsKKyAgICAgICAgMSwgMCwgMCwgMCwKKyAgICAgICAgMCwgKGZsYWdzICYg U2hvdWxkRmxpcFRleHR1cmUpID8gLTEgOiAxLCAwLCAwLAorICAgICAgICAwLCAwLCAxLCAwLAor ICAgICAgICAwLCAoZmxhZ3MgJiBTaG91bGRGbGlwVGV4dHVyZSkgPyAxIDogMCwgMCwgMX07CiAK ICAgICBHTF9DTUQoZ2xVbmlmb3JtTWF0cml4NGZ2KHNoYWRlckluZm8tPm1hdHJpeFZhcmlhYmxl KCksIDEsIEdMX0ZBTFNFLCBtNCkpCiAgICAgR0xfQ01EKGdsVW5pZm9ybU1hdHJpeDRmdihzaGFk ZXJJbmZvLT5zb3VyY2VNYXRyaXhWYXJpYWJsZSgpLCAxLCBHTF9GQUxTRSwgbTRzcmMpKQpAQCAt Mzc0LDE1ICszNzYsMTEgQEAgY29uc3QgY2hhciogVGV4dHVyZU1hcHBlckdMOjp0eXBlKCkgY29u c3QKIAogdm9pZCBCaXRtYXBUZXh0dXJlR0w6OmRpZFJlc2V0KCkKIHsKLSAgICBJbnRTaXplIG5l d1RleHR1cmVTaXplID0gbmV4dFBvd2VyT2ZUd28oY29udGVudFNpemUoKSk7Ci0gICAgYm9vbCBq dXN0Q3JlYXRlZCA9IGZhbHNlOwotICAgIGlmICghbV9pZCkgeworICAgIGlmICghbV9pZCkKICAg ICAgICAgR0xfQ01EKGdsR2VuVGV4dHVyZXMoMSwgJm1faWQpKQotICAgICAgICBqdXN0Q3JlYXRl ZCA9IHRydWU7Ci0gICAgfQogCi0gICAgaWYgKGp1c3RDcmVhdGVkIHx8IG5ld1RleHR1cmVTaXpl LndpZHRoKCkgPiBtX3RleHR1cmVTaXplLndpZHRoKCkgfHwgbmV3VGV4dHVyZVNpemUuaGVpZ2h0 KCkgPiBtX3RleHR1cmVTaXplLmhlaWdodCgpKSB7Ci0gICAgICAgIG1fdGV4dHVyZVNpemUgPSBu ZXdUZXh0dXJlU2l6ZTsKKyAgICBpZiAobV90ZXh0dXJlU2l6ZSAhPSBjb250ZW50U2l6ZSgpKSB7 CisgICAgICAgIG1fdGV4dHVyZVNpemUgPSBjb250ZW50U2l6ZSgpOwogICAgICAgICBHTF9DTUQo Z2xCaW5kVGV4dHVyZShHTF9URVhUVVJFXzJELCBtX2lkKSkKICAgICAgICAgR0xfQ01EKGdsVGV4 UGFyYW1ldGVyaShHTF9URVhUVVJFXzJELCBHTF9URVhUVVJFX01JTl9GSUxURVIsIEdMX0xJTkVB UikpCiAgICAgICAgIEdMX0NNRChnbFRleFBhcmFtZXRlcmkoR0xfVEVYVFVSRV8yRCwgR0xfVEVY VFVSRV9NQUdfRklMVEVSLCBHTF9MSU5FQVIpKQpAQCAtMzkxLDggKzM4OSw2IEBAIHZvaWQgQml0 bWFwVGV4dHVyZUdMOjpkaWRSZXNldCgpCiAgICAgICAgIEdMX0NNRChnbFRleEltYWdlMkQoR0xf VEVYVFVSRV8yRCwgMCwgR0xfUkdCQSwgbV90ZXh0dXJlU2l6ZS53aWR0aCgpLCBtX3RleHR1cmVT aXplLmhlaWdodCgpLCAwLCBHTF9SR0JBLCBHTF9VTlNJR05FRF9CWVRFLCAwKSkKICAgICB9CiAK LSAgICAvLyBXZSBkZWNyZWFzZSB0aGUgc2l6ZSBieSBvbmUsIHNpbmNlIHRoaXMgaXMgdXNlZCBh cyByZWN0YW5nbGUgY29vcmRpbmF0ZXMgYW5kIG5vdCBhcyBzaXplLgotICAgIG1fcmVsYXRpdmVT aXplID0gRmxvYXRTaXplKGZsb2F0KGNvbnRlbnRTaXplKCkud2lkdGgoKSAtIDEpIC8gbV90ZXh0 dXJlU2l6ZS53aWR0aCgpLCBmbG9hdChjb250ZW50U2l6ZSgpLmhlaWdodCgpIC0gMSkgLyBtX3Rl eHR1cmVTaXplLmhlaWdodCgpKTsKICAgICBtX3N1cmZhY2VOZWVkc1Jlc2V0ID0gdHJ1ZTsKIH0K IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1Rl eHR1cmVNYXBwZXJHTC5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFw L1RleHR1cmVNYXBwZXJHTC5oCmluZGV4IGRjM2UyNWJkNTM2ZjY5ODk2MjAwMjg4YmU2MTUzNDRm MmJjM2E1M2QuLjU1NjE4NDMwYzZmMDkzNmNkMzgyMGFjNWI2OWJjMGFiY2FjNjFkZmIgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFw cGVyR0wuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4 dHVyZU1hcHBlckdMLmgKQEAgLTQ5LDcgKzQ5LDcgQEAgcHVibGljOgogCiAgICAgLy8gcmVpbXBz IGZyb20gVGV4dHVyZU1hcHBlcgogICAgIHZpcnR1YWwgdm9pZCBkcmF3VGV4dHVyZShjb25zdCBC aXRtYXBUZXh0dXJlJiwgY29uc3QgRmxvYXRSZWN0JiwgY29uc3QgVHJhbnNmb3JtYXRpb25NYXRy aXgmLCBmbG9hdCBvcGFjaXR5LCBjb25zdCBCaXRtYXBUZXh0dXJlKiBtYXNrVGV4dHVyZSk7Ci0g ICAgdmlydHVhbCB2b2lkIGRyYXdUZXh0dXJlKHVpbnQzMl90IHRleHR1cmUsIEZsYWdzLCBjb25z dCBGbG9hdFNpemUmLCBjb25zdCBGbG9hdFJlY3QmLCBjb25zdCBUcmFuc2Zvcm1hdGlvbk1hdHJp eCYsIGZsb2F0IG9wYWNpdHksIGNvbnN0IEJpdG1hcFRleHR1cmUqIG1hc2tUZXh0dXJlKTsKKyAg ICB2aXJ0dWFsIHZvaWQgZHJhd1RleHR1cmUodWludDMyX3QgdGV4dHVyZSwgRmxhZ3MsIGNvbnN0 IEZsb2F0UmVjdCYsIGNvbnN0IFRyYW5zZm9ybWF0aW9uTWF0cml4JiwgZmxvYXQgb3BhY2l0eSwg Y29uc3QgQml0bWFwVGV4dHVyZSogbWFza1RleHR1cmUpOwogICAgIHZpcnR1YWwgdm9pZCBiaW5k U3VyZmFjZShCaXRtYXBUZXh0dXJlKiBzdXJmYWNlKTsKICAgICB2aXJ0dWFsIHZvaWQgYmVnaW5D bGlwKGNvbnN0IFRyYW5zZm9ybWF0aW9uTWF0cml4JiwgY29uc3QgRmxvYXRSZWN0Jik7CiAgICAg dmlydHVhbCB2b2lkIGJlZ2luUGFpbnRpbmcoKTsKQEAgLTgyLDE0ICs4MiwxMiBAQCBwdWJsaWM6 CiAgICAgdm9pZCBpbml0aWFsaXplU3RlbmNpbCgpOwogICAgIH5CaXRtYXBUZXh0dXJlR0woKTsK ICAgICB2aXJ0dWFsIHVpbnQzMl90IGlkKCkgY29uc3QgeyByZXR1cm4gbV9pZDsgfQotICAgIGlu bGluZSBGbG9hdFNpemUgcmVsYXRpdmVTaXplKCkgY29uc3QgeyByZXR1cm4gbV9yZWxhdGl2ZVNp emU7IH0KICAgICB2b2lkIHNldFRleHR1cmVNYXBwZXIoVGV4dHVyZU1hcHBlckdMKiB0ZXhtYXAp IHsgbV90ZXh0dXJlTWFwcGVyID0gdGV4bWFwOyB9CiAgICAgdm9pZCB1cGRhdGVDb250ZW50cyhJ bWFnZSosIGNvbnN0IEludFJlY3QmLCBjb25zdCBJbnRSZWN0JiwgUGl4ZWxGb3JtYXQpOwogICAg IHZvaWQgdXBkYXRlQ29udGVudHMoY29uc3Qgdm9pZCosIGNvbnN0IEludFJlY3QmKTsKIAogcHJp dmF0ZToKICAgICBHTHVpbnQgbV9pZDsKLSAgICBGbG9hdFNpemUgbV9yZWxhdGl2ZVNpemU7CiAg ICAgSW50U2l6ZSBtX3RleHR1cmVTaXplOwogICAgIEludFJlY3QgbV9kaXJ0eVJlY3Q7CiAgICAg R0x1aW50IG1fZmJvOwpAQCAtMTA4LDIzICsxMDYsNiBAQCBwcml2YXRlOgogICAgIGZyaWVuZCBj bGFzcyBUZXh0dXJlTWFwcGVyR0w7CiB9OwogCi0vLyBBbiBvZmZzY3JlZW4gYnVmZmVyIHRvIGJl IHJlbmRlcmVkIGJ5IHNvZnR3YXJlLgotc3RhdGljIGlubGluZSBpbnQgbmV4dFBvd2VyT2ZUd28o aW50IG51bSkKLXsKLSAgICBmb3IgKGludCBpID0gMHgxMDAwMDAwMDsgaSA+IDA7IGkgPj49IDEp IHsKLSAgICAgICAgaWYgKG51bSA9PSBpKQotICAgICAgICAgICAgcmV0dXJuIG51bTsKLSAgICAg ICAgaWYgKG51bSAmIGkpCi0gICAgICAgICAgICByZXR1cm4gKGkgPDwgMSk7Ci0gICAgfQotICAg IHJldHVybiAxOwotfQotCi1zdGF0aWMgaW5saW5lIEludFNpemUgbmV4dFBvd2VyT2ZUd28oY29u c3QgSW50U2l6ZSYgc2l6ZSkKLXsKLSAgICByZXR1cm4gSW50U2l6ZShuZXh0UG93ZXJPZlR3byhz aXplLndpZHRoKCkpLCBuZXh0UG93ZXJPZlR3byhzaXplLmhlaWdodCgpKSk7Ci19Ci0KIHR5cGVk ZWYgdWludDY0X3QgSW1hZ2VVSUQ7CiBJbWFnZVVJRCB1aWRGb3JJbWFnZShJbWFnZSopOwogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVy ZU1hcHBlclNoYWRlck1hbmFnZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvdGV4bWFwL1RleHR1cmVNYXBwZXJTaGFkZXJNYW5hZ2VyLmNwcAppbmRleCA5ZTUyY2EyYjE3 NjhiOWM0NWNmNjcyZGM0M2I3NmJjMTRmY2E0NWEwLi4xNWIxZjUxODgxZjdjNjE5ODg5MGRiNTY4 OWY0MzY1NzQ5Yzc1ZDFhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlclNoYWRlck1hbmFnZXIuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyU2hhZGVyTWFuYWdl ci5jcHAKQEAgLTU3LDEzICs1NywxMyBAQCBzdGF0aWMgY29uc3QgY2hhciogZnJhZ21lbnRTaGFk ZXJTb3VyY2VPcGFjaXR5QW5kTWFzayA9CiAKIHN0YXRpYyBjb25zdCBjaGFyKiB2ZXJ0ZXhTaGFk ZXJTb3VyY2VPcGFjaXR5QW5kTWFzayA9CiAgICAgVkVSVEVYX1NIQURFUigKLSAgICAgICAgdW5p Zm9ybSBtYXQ0IEluTWF0cml4LCBJblNvdXJjZU1hdHJpeCwgSW5NYXNrTWF0cml4OworICAgICAg ICB1bmlmb3JtIG1hdDQgSW5NYXRyaXgsIEluU291cmNlTWF0cml4OwogICAgICAgICBhdHRyaWJ1 dGUgdmVjNCBJblZlcnRleDsKICAgICAgICAgdmFyeWluZyBoaWdocCB2ZWMyIE91dFRleENvb3Jk U291cmNlLCBPdXRUZXhDb29yZE1hc2s7CiAgICAgICAgIHZvaWQgbWFpbih2b2lkKQogICAgICAg ICB7CiAgICAgICAgICAgICBPdXRUZXhDb29yZFNvdXJjZSA9IHZlYzIoSW5Tb3VyY2VNYXRyaXgg KiBJblZlcnRleCk7Ci0gICAgICAgICAgICBPdXRUZXhDb29yZE1hc2sgPSB2ZWMyKEluTWFza01h dHJpeCAqIEluVmVydGV4KTsKKyAgICAgICAgICAgIE91dFRleENvb3JkTWFzayA9IHZlYzIoSW5W ZXJ0ZXgpOwogICAgICAgICAgICAgZ2xfUG9zaXRpb24gPSBJbk1hdHJpeCAqIEluVmVydGV4Owog ICAgICAgICB9CiAgICAgKTsKQEAgLTE3MSw3ICsxNzEsNiBAQCBUZXh0dXJlTWFwcGVyU2hhZGVy UHJvZ3JhbU9wYWNpdHlBbmRNYXNrOjpUZXh0dXJlTWFwcGVyU2hhZGVyUHJvZ3JhbU9wYWNpdHlB bmRNYQogICAgIGluaXRpYWxpemVQcm9ncmFtKCk7CiAgICAgZ2V0VW5pZm9ybUxvY2F0aW9uKG1f bWF0cml4VmFyaWFibGUsICJJbk1hdHJpeCIpOwogICAgIGdldFVuaWZvcm1Mb2NhdGlvbihtX3Nv dXJjZU1hdHJpeFZhcmlhYmxlLCAiSW5Tb3VyY2VNYXRyaXgiKTsKLSAgICBnZXRVbmlmb3JtTG9j YXRpb24obV9tYXNrTWF0cml4VmFyaWFibGUsICJJbk1hc2tNYXRyaXgiKTsKICAgICBnZXRVbmlm b3JtTG9jYXRpb24obV9zb3VyY2VUZXh0dXJlVmFyaWFibGUsICJTb3VyY2VUZXh0dXJlIik7CiAg ICAgZ2V0VW5pZm9ybUxvY2F0aW9uKG1fbWFza1RleHR1cmVWYXJpYWJsZSwgIk1hc2tUZXh0dXJl Iik7CiAgICAgZ2V0VW5pZm9ybUxvY2F0aW9uKG1fb3BhY2l0eVZhcmlhYmxlLCAiT3BhY2l0eSIp OwpAQCAtMTk2LDExICsxOTUsNiBAQCB2b2lkIFRleHR1cmVNYXBwZXJTaGFkZXJQcm9ncmFtT3Bh Y2l0eUFuZE1hc2s6OnByZXBhcmUoZmxvYXQgb3BhY2l0eSwgY29uc3QgQml0bQogICAgIGNvbnN0 IEJpdG1hcFRleHR1cmVHTCogbWFza1RleHR1cmVHTCA9IHN0YXRpY19jYXN0PGNvbnN0IEJpdG1h cFRleHR1cmVHTCo+KG1hc2tUZXh0dXJlKTsKICAgICBnbEFjdGl2ZVRleHR1cmUoR0xfVEVYVFVS RTEpOwogICAgIGdsQmluZFRleHR1cmUoR0xfVEVYVFVSRV8yRCwgbWFza1RleHR1cmVHTC0+aWQo KSk7Ci0gICAgY29uc3QgR0xmbG9hdCBtNG1hc2tbXSA9IHttYXNrVGV4dHVyZUdMLT5yZWxhdGl2 ZVNpemUoKS53aWR0aCgpLCAwLCAwLCAwLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIDAsIG1hc2tUZXh0dXJlR0wtPnJlbGF0aXZlU2l6ZSgpLmhlaWdodCgpLCAwLCAwLAot ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDAsIDAsIDEsIDAsCi0gICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgMCwgMCwgMCwgMX07Ci0gICAgZ2xVbmlmb3Jt TWF0cml4NGZ2KG1fbWFza01hdHJpeFZhcmlhYmxlLCAxLCBHTF9GQUxTRSwgbTRtYXNrKTsKICAg ICBnbFVuaWZvcm0xaShtX21hc2tUZXh0dXJlVmFyaWFibGUsIDEpOwogICAgIGdsQWN0aXZlVGV4 dHVyZShHTF9URVhUVVJFMCk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlclNoYWRlck1hbmFnZXIuaCBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyU2hhZGVyTWFuYWdl ci5oCmluZGV4IDQ1MDJlN2UzYTA4ZDg4Yjk3MDQ3NWJmZjVjNzA2NDBmZGM4YzJlNjguLjQyNmI5 MDNkODJlNDJiMTQwMjA4OTAxN2Y2ZWM5Nzg0ZjBjYmI3M2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyU2hhZGVyTWFuYWdl ci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJl TWFwcGVyU2hhZGVyTWFuYWdlci5oCkBAIC04OSw3ICs4OSw2IEBAIGNsYXNzIFRleHR1cmVNYXBw ZXJTaGFkZXJQcm9ncmFtT3BhY2l0eUFuZE1hc2sgOiBwdWJsaWMgVGV4dHVyZU1hcHBlclNoYWRl clByb2dyCiBwdWJsaWM6CiAgICAgc3RhdGljIFBhc3NSZWZQdHI8VGV4dHVyZU1hcHBlclNoYWRl clByb2dyYW1PcGFjaXR5QW5kTWFzaz4gY3JlYXRlKCk7CiAgICAgdmlydHVhbCB2b2lkIHByZXBh cmUoZmxvYXQgb3BhY2l0eSwgY29uc3QgQml0bWFwVGV4dHVyZSopOwotICAgIEdMaW50IG1hc2tN YXRyaXhWYXJpYWJsZSgpIGNvbnN0IHsgcmV0dXJuIG1fbWFza01hdHJpeFZhcmlhYmxlOyB9CiAg ICAgR0xpbnQgbWFza1RleHR1cmVWYXJpYWJsZSgpIGNvbnN0IHsgcmV0dXJuIG1fbWFza1RleHR1 cmVWYXJpYWJsZTsgfQogCiBwcml2YXRlOgpAQCAtOTcsNyArOTYsNiBAQCBwcml2YXRlOgogICAg IHZpcnR1YWwgY29uc3QgY2hhciogdmVydGV4U2hhZGVyU291cmNlKCkgY29uc3Q7CiAgICAgdmly dHVhbCBjb25zdCBjaGFyKiBmcmFnbWVudFNoYWRlclNvdXJjZSgpIGNvbnN0OwogICAgIFRleHR1 cmVNYXBwZXJTaGFkZXJQcm9ncmFtT3BhY2l0eUFuZE1hc2soKTsKLSAgICBHTGludCBtX21hc2tN YXRyaXhWYXJpYWJsZTsKICAgICBHTGludCBtX21hc2tUZXh0dXJlVmFyaWFibGU7CiB9OwogCg==