28346 2009-08-15 19:28:52 -0700 [GTK] Support for cursors that are images 2009-08-24 11:15:33 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC Linux RESOLVED FIXED Gtk P2 Normal --- 28345 1 mrobinson webkit-unassigned eric gustavo jmalonzo krit oldest_to_newest 140510 0 34911 mrobinson 2009-08-15 19:28:52 -0700 Created attachment 34911 Support for images as cursors GTK does not yet seem to support cursors that are images. I've attached a patch which adds this, but it does not seem to work correctly because of #28345. 140511 1 mrobinson 2009-08-15 19:30:48 -0700 Just to clarify: currently this patch creates cursors which have a lots of artifacts. This can be observed by applying this patch and visiting: http://www.worldtimzone.com/mozilla/testcase/css3cursors.html 140513 2 jmalonzo 2009-08-15 19:43:41 -0700 (In reply to comment #1) > Just to clarify: currently this patch creates cursors which have a lots of > artifacts. This can be observed by applying this patch and visiting: > http://www.worldtimzone.com/mozilla/testcase/css3cursors.html Hi Martin. Is it possible to add a test for this similar to the one above? 140515 3 34912 mrobinson 2009-08-15 20:08:42 -0700 Created attachment 34912 Patch with manual test added I've added a manual test for this issue in WebCore/manual-tests/gtk/cursor-image.html 140560 4 krit 2009-08-16 09:06:03 -0700 You need te set the review flag to get this patch reviewed. 141030 5 35022 mrobinson 2009-08-17 23:40:48 -0700 Created attachment 35022 Updated patch ready for review I had planned to wait for the blocking issue to be resolved, but I've taken your cue and prepared the patch for review. 141262 6 35022 eric 2009-08-18 14:58:15 -0700 Comment on attachment 35022 Updated patch ready for review Why is the memory management correct here? Do we need to release/destroy this cursor ever? I take it "getGdkPixbuf()" causes the pixbuf to be reffed? 141275 7 mrobinson 2009-08-18 15:12:00 -0700 (In reply to comment #6) > (From update of attachment 35022 [details]) > Why is the memory management correct here? Do we need to release/destroy this > cursor ever? > > I take it "getGdkPixbuf()" causes the pixbuf to be reffed? getGdkPixbuf() constructs a new GdkPixbuf* from a cairo_surface_t*. Its reference count will be initialized to 1. gdk_cursor_new_from_pixbuf will copy bytes from a GdkPixbuf* as can be seen here: http://google.com/codesearch/p?hl=en&sa=N&cd=2&ct=rc#83-cTy5ZCbw/gtk+-2.4.12/gdk/x11/gdkcursor-x11.c&q=gdk_cursor_new_from_pixbuf&l=387 Since the GdkPixbuf was merely an intermediary between the cairo_surface_t and the GdkPointer, it is no longer needed. gdk_pixbuf_unref will decrease the reference count of the GdkPixbuf from 1 to 0, freeing the memory and preventing a leak. 141282 8 mrobinson 2009-08-18 15:17:00 -0700 I should clarify the removal of the original gdk_cursor_ref(...) as well. Previously the stub method increased the reference count of a GdkCursor created via another Cursor constructor. This patch constructs an entirely new GdkCursor instead, which should already have a reference count of 1. 142252 9 35022 gustavo 2009-08-23 16:01:58 -0700 Comment on attachment 35022 Updated patch ready for review Good to see this moving forward =). 142253 10 35022 eric 2009-08-23 16:02:56 -0700 Comment on attachment 35022 Updated patch ready for review Rejecting patch 35022 from commit-queue. This patch will require manual commit. Patch https://bugs.webkit.org/attachment.cgi?id=35022 from bug 28346 failed to download and apply. 142310 11 35022 gustavo 2009-08-24 07:56:15 -0700 Comment on attachment 35022 Updated patch ready for review Landed as r47712. I had overlooked the fact that I could not determine the origin of the .cur file. I replaced the one you provided with a cell.cur from Mozilla sources, that I know is licensed in a good way. 142337 12 eric 2009-08-24 11:15:33 -0700 Sadly svn-apply can't handle git binary patches: patch: **** Only garbage was found in the patch input. patch -p0 "WebCore/manual-tests/gtk/resources/redcursor.cur" returned 2. Pass --force to ignore patch failures. Logging in as eric@webkit.org... Rejecting patch 35022 from commit-queue. This patch will require manual commit. bug 26830. 34911 2009-08-15 19:28:52 -0700 2009-08-15 20:08:42 -0700 Support for images as cursors 0001-Add-support-for-images-as-cursors.patch text/plain 1318 mrobinson RnJvbSBiNTFiYzc1NGIxNjMzN2QzYzYzNTA3ZGZmMWQxNDdiYTBlNGRlNDNlIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNYXJ0aW4gUm9iaW5zb24gPG1hcnRpbi5qYW1lcy5yb2JpbnNv bkBnbWFpbC5jb20+CkRhdGU6IFNhdCwgMTUgQXVnIDIwMDkgMTk6Mjc6MzEgLTA3MDAKU3ViamVj dDogW1BBVENIXSBBZGQgc3VwcG9ydCBmb3IgaW1hZ2VzIGFzIGN1cnNvcnMuCgotLS0KIFdlYkNv cmUvcGxhdGZvcm0vZ3RrL0N1cnNvckd0ay5jcHAgfCAgIDE1ICsrKysrKystLS0tLS0tLQogMSBm aWxlcyBjaGFuZ2VkLCA3IGluc2VydGlvbnMoKyksIDggZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0 IGEvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvQ3Vyc29yR3RrLmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0v Z3RrL0N1cnNvckd0ay5jcHAKaW5kZXggMTE1NzYwZS4uODYwYzNlMyAxMDA2NDQKLS0tIGEvV2Vi Q29yZS9wbGF0Zm9ybS9ndGsvQ3Vyc29yR3RrLmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL2d0 ay9DdXJzb3JHdGsuY3BwCkBAIC0yOCw2ICsyOCw5IEBACiAjaW5jbHVkZSAiY29uZmlnLmgiCiAj aW5jbHVkZSAiQ3Vyc29yR3RrLmgiCiAKKyNpbmNsdWRlICJJbWFnZS5oIgorI2luY2x1ZGUgIklu dFBvaW50LmgiCisKICNpbmNsdWRlIDx3dGYvQXNzZXJ0aW9ucy5oPgogCiAjaW5jbHVkZSA8Z2Rr L2dkay5oPgpAQCAtNjAsMTUgKzYzLDExIEBAIEN1cnNvcjo6Q3Vyc29yKGNvbnN0IEN1cnNvciYg b3RoZXIpCiAgICAgICAgIGdka19jdXJzb3JfcmVmKG1faW1wbCk7CiB9CiAKLUN1cnNvcjo6Q3Vy c29yKEltYWdlKiwgY29uc3QgSW50UG9pbnQmKQorQ3Vyc29yOjpDdXJzb3IoSW1hZ2UqIGltYWdl LCBjb25zdCBJbnRQb2ludCYgaG90c3BvdCkKIHsKLSAgICAvLyBGSVhNRTogV2UgZG9uJ3Qgc3Vw cG9ydCBpbWFnZXMgZm9yIGN1cnNvcnMgeWV0LgotICAgIC8vIFRoaXMgaXMganVzdCBhIHBsYWNl aG9sZGVyIHRvIGF2b2lkIGNyYXNoZXMuCi0gICAgQ3Vyc29yIG90aGVyKGNyb3NzQ3Vyc29yKCkp OwotICAgIG1faW1wbCA9IG90aGVyLm1faW1wbDsKLQotICAgIGlmIChtX2ltcGwpCi0gICAgICAg IGdka19jdXJzb3JfcmVmKG1faW1wbCk7CisgICAgR2RrUGl4YnVmKiBpbWcgPSBpbWFnZS0+Z2V0 R2RrUGl4YnVmKCk7CisgICAgbV9pbXBsID0gZ2RrX2N1cnNvcl9uZXdfZnJvbV9waXhidWYoZ2Rr X2Rpc3BsYXlfZ2V0X2RlZmF1bHQoKSwgaW1nLCBob3RzcG90LngoKSwgaG90c3BvdC55KCkpOwor ICAgIGdka19waXhidWZfdW5yZWYoaW1nKTsKIH0KIAogQ3Vyc29yOjp+Q3Vyc29yKCkKLS0gCjEu Ni4wLjQKCg== 34912 2009-08-15 20:08:42 -0700 2009-08-17 23:40:48 -0700 Patch with manual test added 0001-Add-support-for-images-as-cursors.patch text/plain 2530 mrobinson RnJvbSAwNjE2YWZjMTM5MzhmOTRlYWY4MzU1MTNlYzgyZDIzZWQ0YThlZWE2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNYXJ0aW4gUm9iaW5zb24gPG1hcnRpbi5qYW1lcy5yb2JpbnNv bkBnbWFpbC5jb20+CkRhdGU6IFNhdCwgMTUgQXVnIDIwMDkgMTk6Mjc6MzEgLTA3MDAKU3ViamVj dDogW1BBVENIXSBBZGQgc3VwcG9ydCBmb3IgaW1hZ2VzIGFzIGN1cnNvcnMuCgotLS0KIFdlYkNv cmUvbWFudWFsLXRlc3RzL2d0ay9jdXJzb3ItaW1hZ2UuaHRtbCAgICAgICB8ICAgIDIgKysKIFdl YkNvcmUvbWFudWFsLXRlc3RzL2d0ay9yZXNvdXJjZXMvcmVkY3Vyc29yLmN1ciB8ICBCaW4gMCAt PiA3NjYgYnl0ZXMKIFdlYkNvcmUvcGxhdGZvcm0vZ3RrL0N1cnNvckd0ay5jcHAgICAgICAgICAg ICAgICB8ICAgMTUgKysrKysrKy0tLS0tLS0tCiAzIGZpbGVzIGNoYW5nZWQsIDkgaW5zZXJ0aW9u cygrKSwgOCBkZWxldGlvbnMoLSkKIGNyZWF0ZSBtb2RlIDEwMDY0NCBXZWJDb3JlL21hbnVhbC10 ZXN0cy9ndGsvY3Vyc29yLWltYWdlLmh0bWwKIGNyZWF0ZSBtb2RlIDEwMDY0NCBXZWJDb3JlL21h bnVhbC10ZXN0cy9ndGsvcmVzb3VyY2VzL3JlZGN1cnNvci5jdXIKCmRpZmYgLS1naXQgYS9XZWJD b3JlL21hbnVhbC10ZXN0cy9ndGsvY3Vyc29yLWltYWdlLmh0bWwgYi9XZWJDb3JlL21hbnVhbC10 ZXN0cy9ndGsvY3Vyc29yLWltYWdlLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAw MDAwMC4uMTJlZjJjZAotLS0gL2Rldi9udWxsCisrKyBiL1dlYkNvcmUvbWFudWFsLXRlc3RzL2d0 ay9jdXJzb3ItaW1hZ2UuaHRtbApAQCAtMCwwICsxLDIgQEAKKzxkaXY+TW91c2Ugb3ZlciB0aGUg Z3JleSBibG9ja3MgdG8gY2hhbmdlIHRoZSBjdXJzb3IgdG8gYSByZWQgYXJyb3cuPC9kaXY+Cis8 ZGl2IHN0eWxlPSJ3aWR0aDogMTAwcHg7IGhlaWdodDogMTAwcHg7IGJhY2tncm91bmQ6IGxpZ2h0 Ymx1ZTsgY3Vyc29yOnVybChyZXNvdXJjZXMvcmVkY3Vyc29yLmN1ciksIGRlZmF1bHQ7Ij4mbmJz cDs8L2Rpdj4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvbWFudWFsLXRlc3RzL2d0ay9yZXNvdXJjZXMv cmVkY3Vyc29yLmN1ciBiL1dlYkNvcmUvbWFudWFsLXRlc3RzL2d0ay9yZXNvdXJjZXMvcmVkY3Vy c29yLmN1cgpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwLi5jNDY0YjBhMzRmZWE4YzVjZWMyNTU2OGRiOTA4OTc1NGE2MTlk Mzc1CkdJVCBiaW5hcnkgcGF0Y2gKbGl0ZXJhbCA3NjYKemNtZHMjRiVINW8zYEt0bTUranxFSTtB NWNIej56cVltVSZoeDlNPj4wK2tUdnJEY2RLN0ZPSW1KS3cpaVdHUGFtCnpwdGh9Kjw2Y1E4PktS KE5MZVFRcENBe3lFRm1Yfl4zekBCXlhgKkpzbUw7PmkxSFJuSz5Ibmh7e0VYNC1GbmluVQp6VEtA TkRxdlBPQE09dXBeOUx4SyVGN0ohOHZ4UDJnTVFAez50P2g3KXgzI3tpT3x5YF5mdUd+bW5MUiV8 ZGIxbGAKWCUmZGswM35sUDUyWHlaMy1+ZE82Jl9OR3h5RkhmZwoKbGl0ZXJhbCAwCkhjbVY/ZDAw MDAxCgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvQ3Vyc29yR3RrLmNwcCBiL1dl YkNvcmUvcGxhdGZvcm0vZ3RrL0N1cnNvckd0ay5jcHAKaW5kZXggMTE1NzYwZS4uODYwYzNlMyAx MDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvQ3Vyc29yR3RrLmNwcAorKysgYi9XZWJD b3JlL3BsYXRmb3JtL2d0ay9DdXJzb3JHdGsuY3BwCkBAIC0yOCw2ICsyOCw5IEBACiAjaW5jbHVk ZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAiQ3Vyc29yR3RrLmgiCiAKKyNpbmNsdWRlICJJbWFnZS5o IgorI2luY2x1ZGUgIkludFBvaW50LmgiCisKICNpbmNsdWRlIDx3dGYvQXNzZXJ0aW9ucy5oPgog CiAjaW5jbHVkZSA8Z2RrL2dkay5oPgpAQCAtNjAsMTUgKzYzLDExIEBAIEN1cnNvcjo6Q3Vyc29y KGNvbnN0IEN1cnNvciYgb3RoZXIpCiAgICAgICAgIGdka19jdXJzb3JfcmVmKG1faW1wbCk7CiB9 CiAKLUN1cnNvcjo6Q3Vyc29yKEltYWdlKiwgY29uc3QgSW50UG9pbnQmKQorQ3Vyc29yOjpDdXJz b3IoSW1hZ2UqIGltYWdlLCBjb25zdCBJbnRQb2ludCYgaG90c3BvdCkKIHsKLSAgICAvLyBGSVhN RTogV2UgZG9uJ3Qgc3VwcG9ydCBpbWFnZXMgZm9yIGN1cnNvcnMgeWV0LgotICAgIC8vIFRoaXMg aXMganVzdCBhIHBsYWNlaG9sZGVyIHRvIGF2b2lkIGNyYXNoZXMuCi0gICAgQ3Vyc29yIG90aGVy KGNyb3NzQ3Vyc29yKCkpOwotICAgIG1faW1wbCA9IG90aGVyLm1faW1wbDsKLQotICAgIGlmICht X2ltcGwpCi0gICAgICAgIGdka19jdXJzb3JfcmVmKG1faW1wbCk7CisgICAgR2RrUGl4YnVmKiBp bWcgPSBpbWFnZS0+Z2V0R2RrUGl4YnVmKCk7CisgICAgbV9pbXBsID0gZ2RrX2N1cnNvcl9uZXdf ZnJvbV9waXhidWYoZ2RrX2Rpc3BsYXlfZ2V0X2RlZmF1bHQoKSwgaW1nLCBob3RzcG90LngoKSwg aG90c3BvdC55KCkpOworICAgIGdka19waXhidWZfdW5yZWYoaW1nKTsKIH0KIAogQ3Vyc29yOjp+ Q3Vyc29yKCkKLS0gCjEuNi4wLjQKCg== 35022 2009-08-17 23:40:48 -0700 2009-08-24 07:56:15 -0700 Updated patch ready for review 0001-Add-support-for-images-as-cursors.patch text/plain 3358 mrobinson RnJvbSBlOTI3ZjI2ODg1Y2IwM2UwNmQ5MzVlMmIwMzc1ZWM2N2I2MzhkMmQwIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNYXJ0aW4gUm9iaW5zb24gPG1hcnRpbi5qYW1lcy5yb2JpbnNv bkBnbWFpbC5jb20+CkRhdGU6IFNhdCwgMTUgQXVnIDIwMDkgMTk6Mjc6MzEgLTA3MDAKU3ViamVj dDogW1BBVENIXSBBZGQgc3VwcG9ydCBmb3IgaW1hZ2VzIGFzIGN1cnNvcnMuCgotLS0KIFdlYkNv cmUvQ2hhbmdlTG9nICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB8ICAgMTUgKysrKysr KysrKysrKysrCiBXZWJDb3JlL21hbnVhbC10ZXN0cy9ndGsvY3Vyc29yLWltYWdlLmh0bWwgICAg ICAgfCAgICAyICsrCiBXZWJDb3JlL21hbnVhbC10ZXN0cy9ndGsvcmVzb3VyY2VzL3JlZGN1cnNv ci5jdXIgfCAgQmluIDAgLT4gNzY2IGJ5dGVzCiBXZWJDb3JlL3BsYXRmb3JtL2d0ay9DdXJzb3JH dGsuY3BwICAgICAgICAgICAgICAgfCAgIDE1ICsrKysrKystLS0tLS0tLQogNCBmaWxlcyBjaGFu Z2VkLCAyNCBpbnNlcnRpb25zKCspLCA4IGRlbGV0aW9ucygtKQogY3JlYXRlIG1vZGUgMTAwNjQ0 IFdlYkNvcmUvbWFudWFsLXRlc3RzL2d0ay9jdXJzb3ItaW1hZ2UuaHRtbAogY3JlYXRlIG1vZGUg MTAwNjQ0IFdlYkNvcmUvbWFudWFsLXRlc3RzL2d0ay9yZXNvdXJjZXMvcmVkY3Vyc29yLmN1cgoK ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg M2ZjYzAwNi4uYzhkOTNlOSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAwOS0wOC0xNyAgTWFydGluIFJvYmlu c29uICA8bWFydGluLmphbWVzLnJvYmluc29uQGdtYWlsLmNvbT4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbR1RLXSBTdXBwb3J0IGZvciBjdXJzb3Jz IHRoYXQgYXJlIGltYWdlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MjgzNDYKKworICAgICAgICBBZGRlZCBzdXBwb3J0IGZvciBjdXJzb3JzIHdoaWNo IGFyZSBpbWFnZXMgZm9yIEN1cnNvckd0ay4gQWRkZWQKKyAgICAgICAgYSBtYW51YWwgdGVzdCBm b3IgdGhpcy4KKworICAgICAgICAqIG1hbnVhbC10ZXN0cy9ndGsvY3Vyc29yLWltYWdlLmh0bWw6 IEFkZGVkLgorICAgICAgICAqIG1hbnVhbC10ZXN0cy9ndGsvcmVzb3VyY2VzL3JlZGN1cnNvci5j dXI6IEFkZGVkLgorICAgICAgICAqIHBsYXRmb3JtL2d0ay9DdXJzb3JHdGsuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6Q3Vyc29yOjpDdXJzb3IpOgorCiAyMDA5LTA4LTE3ICBTaW1vbiBGcmFzZXIg IDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhdmUgSHlh dHQuCmRpZmYgLS1naXQgYS9XZWJDb3JlL21hbnVhbC10ZXN0cy9ndGsvY3Vyc29yLWltYWdlLmh0 bWwgYi9XZWJDb3JlL21hbnVhbC10ZXN0cy9ndGsvY3Vyc29yLWltYWdlLmh0bWwKbmV3IGZpbGUg bW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMTJlZjJjZAotLS0gL2Rldi9udWxsCisrKyBiL1dl YkNvcmUvbWFudWFsLXRlc3RzL2d0ay9jdXJzb3ItaW1hZ2UuaHRtbApAQCAtMCwwICsxLDIgQEAK KzxkaXY+TW91c2Ugb3ZlciB0aGUgZ3JleSBibG9ja3MgdG8gY2hhbmdlIHRoZSBjdXJzb3IgdG8g YSByZWQgYXJyb3cuPC9kaXY+Cis8ZGl2IHN0eWxlPSJ3aWR0aDogMTAwcHg7IGhlaWdodDogMTAw cHg7IGJhY2tncm91bmQ6IGxpZ2h0Ymx1ZTsgY3Vyc29yOnVybChyZXNvdXJjZXMvcmVkY3Vyc29y LmN1ciksIGRlZmF1bHQ7Ij4mbmJzcDs8L2Rpdj4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvbWFudWFs LXRlc3RzL2d0ay9yZXNvdXJjZXMvcmVkY3Vyc29yLmN1ciBiL1dlYkNvcmUvbWFudWFsLXRlc3Rz L2d0ay9yZXNvdXJjZXMvcmVkY3Vyc29yLmN1cgpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5jNDY0YjBhMzRmZWE4YzVj ZWMyNTU2OGRiOTA4OTc1NGE2MTlkMzc1CkdJVCBiaW5hcnkgcGF0Y2gKbGl0ZXJhbCA3NjYKemNt ZHMjRiVINW8zYEt0bTUranxFSTtBNWNIej56cVltVSZoeDlNPj4wK2tUdnJEY2RLN0ZPSW1KS3cp aVdHUGFtCnpwdGh9Kjw2Y1E4PktSKE5MZVFRcENBe3lFRm1Yfl4zekBCXlhgKkpzbUw7PmkxSFJu Sz5Ibmh7e0VYNC1GbmluVQp6VEtATkRxdlBPQE09dXBeOUx4SyVGN0ohOHZ4UDJnTVFAez50P2g3 KXgzI3tpT3x5YF5mdUd+bW5MUiV8ZGIxbGAKWCUmZGswM35sUDUyWHlaMy1+ZE82Jl9OR3h5Rkhm ZwoKbGl0ZXJhbCAwCkhjbVY/ZDAwMDAxCgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9n dGsvQ3Vyc29yR3RrLmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0N1cnNvckd0ay5jcHAKaW5k ZXggMTE1NzYwZS4uMDVkNzcyYSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvQ3Vy c29yR3RrLmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL2d0ay9DdXJzb3JHdGsuY3BwCkBAIC0y OCw2ICsyOCw5IEBACiAjaW5jbHVkZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAiQ3Vyc29yR3RrLmgi CiAKKyNpbmNsdWRlICJJbWFnZS5oIgorI2luY2x1ZGUgIkludFBvaW50LmgiCisKICNpbmNsdWRl IDx3dGYvQXNzZXJ0aW9ucy5oPgogCiAjaW5jbHVkZSA8Z2RrL2dkay5oPgpAQCAtNjAsMTUgKzYz LDExIEBAIEN1cnNvcjo6Q3Vyc29yKGNvbnN0IEN1cnNvciYgb3RoZXIpCiAgICAgICAgIGdka19j dXJzb3JfcmVmKG1faW1wbCk7CiB9CiAKLUN1cnNvcjo6Q3Vyc29yKEltYWdlKiwgY29uc3QgSW50 UG9pbnQmKQorQ3Vyc29yOjpDdXJzb3IoSW1hZ2UqIGltYWdlLCBjb25zdCBJbnRQb2ludCYgaG90 U3BvdCkKIHsKLSAgICAvLyBGSVhNRTogV2UgZG9uJ3Qgc3VwcG9ydCBpbWFnZXMgZm9yIGN1cnNv cnMgeWV0LgotICAgIC8vIFRoaXMgaXMganVzdCBhIHBsYWNlaG9sZGVyIHRvIGF2b2lkIGNyYXNo ZXMuCi0gICAgQ3Vyc29yIG90aGVyKGNyb3NzQ3Vyc29yKCkpOwotICAgIG1faW1wbCA9IG90aGVy Lm1faW1wbDsKLQotICAgIGlmIChtX2ltcGwpCi0gICAgICAgIGdka19jdXJzb3JfcmVmKG1faW1w bCk7CisgICAgR2RrUGl4YnVmKiBwaXhidWYgPSBpbWFnZS0+Z2V0R2RrUGl4YnVmKCk7CisgICAg bV9pbXBsID0gZ2RrX2N1cnNvcl9uZXdfZnJvbV9waXhidWYoZ2RrX2Rpc3BsYXlfZ2V0X2RlZmF1 bHQoKSwgcGl4YnVmLCBob3RTcG90LngoKSwgaG90U3BvdC55KCkpOworICAgIGdka19waXhidWZf dW5yZWYocGl4YnVmKTsKIH0KIAogQ3Vyc29yOjp+Q3Vyc29yKCkKLS0gCjEuNi4wLjQKCg==