45826 2010-09-15 11:34:28 -0700 [GTK] Implement dissolveDragImageToFraction 2010-09-16 13:51:21 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC Linux RESOLVED FIXED Gtk P3 Normal --- 1 mrobinson webkit-unassigned gustavo webkit.review.bot xan.lopez oldest_to_newest 279634 0 mrobinson 2010-09-15 11:34:28 -0700 The image during drags is opaque and probably a bit too bit. This patch tracks adding transparency and making the size on part with Chromium. 279637 1 67694 mrobinson 2010-09-15 11:48:26 -0700 Created attachment 67694 Patch for this issue 279638 2 webkit.review.bot 2010-09-15 11:49:45 -0700 Attachment 67694 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style']" exit_code: 1 WebCore/platform/DragImage.h:51: cairo_surface_t is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] Total errors found: 1 in 10 files If any of these errors are false positives, please file a bug against check-webkit-style. 279906 3 mrobinson 2010-09-15 19:21:11 -0700 Style bot bug filed here: https://bugs.webkit.org/show_bug.cgi?id=45867 280272 4 67694 xan.lopez 2010-09-16 12:24:03 -0700 Comment on attachment 67694 Patch for this issue Ay caramba. 280337 5 67694 mrobinson 2010-09-16 13:51:17 -0700 Comment on attachment 67694 Patch for this issue Clearing flags on attachment: 67694 Committed r67664: <http://trac.webkit.org/changeset/67664> 280338 6 mrobinson 2010-09-16 13:51:21 -0700 All reviewed patches have been landed. Closing bug. 67694 2010-09-15 11:48:26 -0700 2010-09-16 13:51:17 -0700 Patch for this issue bug-45826-20100915114825.patch text/plain 14118 mrobinson ZGlmZiAtLWdpdCBhL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZyBiL0phdmFTY3JpcHRDb3JlL0No YW5nZUxvZwppbmRleCAwZTUzMjEwYTJlMmYxMjFlMGU4ZmRjMDAzODhiNGQ2MDMwMmIzZTUyLi45 OGY1OTJlMDAxMTQxNTA3N2E1NzBlZmMzYjVlYjAzOGZlZTFmYWM5IDEwMDY0NAotLS0gYS9KYXZh U2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMTIgQEAKKzIwMTAtMDktMTUgIE1hcnRpbiBSb2JpbnNvbiAgPG1yb2JpbnNvbkBpZ2Fs aWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFtHVEtdIEltcGxlbWVudCBkaXNzb2x2ZURyYWdJbWFnZVRvRnJhY3Rpb24KKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ1ODI2CisKKyAgICAgICAgKiB3 dGYvZ29iamVjdC9HVHlwZWRlZnMuaDogQWRkZWQgZm9yd2FyZCBkZWNsYXJhdGlvbnMgZm9yIEd0 a1dpbmRvdyBhbmQgR2RrRXZlbnRFeHBvc2UuCisKIDIwMTAtMDktMTQgIFN0ZXZlIEZhbGtlbmJ1 cmcgIDxzZmFsa2VuQGFwcGxlLmNvbT4KIAogICAgICAgICBXaW5kb3dzIHByb2R1Y3Rpb24gYnVp bGQgZml4LgpkaWZmIC0tZ2l0IGEvSmF2YVNjcmlwdENvcmUvd3RmL2dvYmplY3QvR1R5cGVkZWZz LmggYi9KYXZhU2NyaXB0Q29yZS93dGYvZ29iamVjdC9HVHlwZWRlZnMuaAppbmRleCBlNzliYTMz NGUxYjNjNGVlOTA1MDAxYjhlYzViZDdmMjI0OWJiZTVhLi5iMTYwMGMyOWZlMjQ1YWYzNDExNTgy MGMzZjJjNmRiOWJmZDQ4YzdmIDEwMDY0NAotLS0gYS9KYXZhU2NyaXB0Q29yZS93dGYvZ29iamVj dC9HVHlwZWRlZnMuaAorKysgYi9KYXZhU2NyaXB0Q29yZS93dGYvZ29iamVjdC9HVHlwZWRlZnMu aApAQCAtNDUsNiArNDUsNyBAQCB0eXBlZGVmIHN0cnVjdCBfR2RrQ3Vyc29yIEdka0N1cnNvcjsK IHR5cGVkZWYgc3RydWN0IF9HZGtEcmFnQ29udGV4dCBHZGtEcmFnQ29udGV4dDsKIHR5cGVkZWYg c3RydWN0IF9HZGtEcmF3YWJsZSBHZGtEcmF3YWJsZTsKIHR5cGVkZWYgc3RydWN0IF9HZGtFdmVu dENvbmZpZ3VyZSBHZGtFdmVudENvbmZpZ3VyZTsKK3R5cGVkZWYgc3RydWN0IF9HZGtFdmVudEV4 cG9zZSBHZGtFdmVudEV4cG9zZTsKIHR5cGVkZWYgc3RydWN0IF9HZGtQaXhidWYgR2RrUGl4YnVm OwogdHlwZWRlZiBzdHJ1Y3QgX0dFcnJvciBHRXJyb3I7CiB0eXBlZGVmIHN0cnVjdCBfR0ZpbGUg R0ZpbGU7CkBAIC03OSw2ICs4MCw3IEBAIHR5cGVkZWYgc3RydWN0IF9HdGtTdHlsZSBHdGtTdHls ZTsKIHR5cGVkZWYgc3RydWN0IF9HdGtUYXJnZXRMaXN0IEd0a1RhcmdldExpc3Q7CiB0eXBlZGVm IHN0cnVjdCBfR3RrVGhlbWVQYXJ0cyBHdGtUaGVtZVBhcnRzOwogdHlwZWRlZiBzdHJ1Y3QgX0d0 a1dpZGdldCBHdGtXaWRnZXQ7Cit0eXBlZGVmIHN0cnVjdCBfR3RrV2luZG93IEd0a1dpbmRvdzsK IAogI2lmZGVmIEdUS19BUElfVkVSU0lPTl8yCiB0eXBlZGVmIHN0cnVjdCBfR2RrUmVjdGFuZ2xl IEdka1JlY3RhbmdsZTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9D aGFuZ2VMb2cKaW5kZXggODdiNzQ3Mjg3NGI4ZDdlNzVlOTM1M2Y1NTEwOTc1MGE3YzQzNWY1My4u MTg1ZDZiMDFlYjQxODk4ZGQ3NWU1ZWMyODZhMmRmYjQwNmI1NTdiNyAxMDA2NDQKLS0tIGEvV2Vi Q29yZS9DaGFuZ2VMb2cKKysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyOSBAQAor MjAxMC0wOS0xNSAgTWFydGluIFJvYmluc29uICA8bXJvYmluc29uQGlnYWxpYS5jb20+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW0dUS10gSW1wbGVt ZW50IGRpc3NvbHZlRHJhZ0ltYWdlVG9GcmFjdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDU4MjYKKworICAgICAgICBDb252ZXJ0IHRoZSBkcmFn IGltYWdlIGZyb20gYSBHZGtQaXhidWYgdG8gYSBDYWlybyBzdXJmYWNlLiBOb3Qgb25seQorICAg ICAgICBtaWdodCB0aGlzIGFsbG93IGNvZGUgdG8gYmUgc2hhcmVkIGJldHdlZW4gQ2Fpcm8gcG9y dHMgaXQgcHJldmVudHMgYQorICAgICAgICBmdWxsIGRhdGEgY29weSB3aGVuIHRoZSBpbWFnZSBp cyBub3QgcmVzaXplZCBhbmQgbWFrZXMgdGhlIGltcGxlbWVudGF0aW9uCisgICAgICAgIG9mIGRp c3NvbHZlRHJhZ0ltYWdlVG9GcmFjdGlvbiBtb3JlIHN0cmFpZ2h0LWZvcndhcmQuCisKKyAgICAg ICAgVGhpcyBmZWF0dXJlIGlzIGNvdmVyZWQgYnkgbWFudWFsLXRlc3RzL2RyYWctaW1hZ2UuaHRt bC4KKworICAgICAgICAqIHBhZ2UvZ3RrL0RyYWdDb250cm9sbGVyR3RrLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OkRyYWdDb250cm9sbGVyOjptYXhEcmFnSW1hZ2VTaXplKTogTWFrZSB0aGUgbWF4 aW11bSBzaXplIG9mIHRoZSBkcmFnCisgICAgICAgIGltYWdlIGEgbGl0dGxlIHNtYWxsZXIuCisg ICAgICAgICogcGxhdGZvcm0vRHJhZ0ltYWdlLmg6IENoYW5nZWQgdGhlIGRyYWcgaW1hZ2UgdHlw ZSB0byBiZSBhIGNhaXJvX3N1cmZhY2VfdCouCisgICAgICAgICogcGxhdGZvcm0vZ3RrL0RyYWdJ bWFnZUd0ay5jcHA6CisgICAgICAgIChXZWJDb3JlOjpkcmFnSW1hZ2VTaXplKTogUmVpbXBsZW1l bnRlZCB0byByZWZsZWN0IG5ldyBkcmFnIGltYWdlIHR5cGUuCisgICAgICAgIChXZWJDb3JlOjpk ZWxldGVEcmFnSW1hZ2UpOiBEaXR0by4KKyAgICAgICAgKFdlYkNvcmU6OnNjYWxlRHJhZ0ltYWdl KTogRGl0dG8uCisgICAgICAgIChXZWJDb3JlOjpkaXNzb2x2ZURyYWdJbWFnZVRvRnJhY3Rpb24p OiBGaWxsZWQgdGhlIHN0dWIgb2YgdGhpcyBmdW5jdGlvbi4KKyAgICAgICAgKFdlYkNvcmU6OmNy ZWF0ZURyYWdJbWFnZUZyb21JbWFnZSk6IFJlaW1wbGVtZW50ZWQgdG8gcmVmbGVjdCBuZXcgZHJh ZyBpbWFnZSB0eXBlLgorICAgICAgICAqIHBsYXRmb3JtL2d0ay9HdGtWZXJzaW9uaW5nLmg6IEFk ZGVkIGRlZmluaXRpb24gZm9yIGd0a193aWRnZXRfZ2V0X3JlYWxpemVkIGZvciBvbGRlciBHVEsr cy4KKwogMjAxMC0wOS0xNCAgQW5kcmVhcyBLbGluZyAgPGFuZHJlYXMua2xpbmdAbm9raWEuY29t PgogCiAgICAgICAgIFJldmlld2VkIGJ5IEFudG9uaW8gR29tZXMuCmRpZmYgLS1naXQgYS9XZWJD b3JlL3BhZ2UvZ3RrL0RyYWdDb250cm9sbGVyR3RrLmNwcCBiL1dlYkNvcmUvcGFnZS9ndGsvRHJh Z0NvbnRyb2xsZXJHdGsuY3BwCmluZGV4IGMwNjRhODc2ZThiNThhZGUwMzM5OWU4ZDZmNDk4NTNk NTc0YTI3NjcuLjVmOTA0NGY2YzViOGQ5ZjAxMzhiZDliYWY0OTIxM2IyNDVmOTQ2ZTIgMTAwNjQ0 Ci0tLSBhL1dlYkNvcmUvcGFnZS9ndGsvRHJhZ0NvbnRyb2xsZXJHdGsuY3BwCisrKyBiL1dlYkNv cmUvcGFnZS9ndGsvRHJhZ0NvbnRyb2xsZXJHdGsuY3BwCkBAIC01OCw4ICs1OCw3IEBAIERyYWdP cGVyYXRpb24gRHJhZ0NvbnRyb2xsZXI6OmRyYWdPcGVyYXRpb24oRHJhZ0RhdGEqIGRyYWdEYXRh KQogCiBjb25zdCBJbnRTaXplJiBEcmFnQ29udHJvbGxlcjo6bWF4RHJhZ0ltYWdlU2l6ZSgpCiB7 Ci0gICAgc3RhdGljIGNvbnN0IEludFNpemUgbWF4RHJhZ0ltYWdlU2l6ZSg0MDAsIDQwMCk7Ci0K KyAgICBzdGF0aWMgY29uc3QgSW50U2l6ZSBtYXhEcmFnSW1hZ2VTaXplKDIwMCwgMjAwKTsKICAg ICByZXR1cm4gbWF4RHJhZ0ltYWdlU2l6ZTsKIH0KIApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0 Zm9ybS9EcmFnSW1hZ2UuaCBiL1dlYkNvcmUvcGxhdGZvcm0vRHJhZ0ltYWdlLmgKaW5kZXggNDgz ZTJkMGNkNjQ0OGYzNjliMjBhZmYyNDUyNjVmOGQwMDMxMzRjZS4uYTRhYWQ0NzRiMGRlYzhhMDZj ZWQzYTlkMTRiNTg3ZjM1OWM0YmRjMiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9EcmFn SW1hZ2UuaAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL0RyYWdJbWFnZS5oCkBAIC00OCw3ICs0OCw3 IEBAIGNsYXNzIHd4RHJhZ0ltYWdlOwogI2VsaWYgUExBVEZPUk0oQ0hST01JVU0pCiAjaW5jbHVk ZSAiRHJhZ0ltYWdlUmVmLmgiCiAjZWxpZiBQTEFURk9STShHVEspCi10eXBlZGVmIHN0cnVjdCBf R2RrUGl4YnVmIEdka1BpeGJ1ZjsKK3R5cGVkZWYgc3RydWN0IF9jYWlyb19zdXJmYWNlIGNhaXJv X3N1cmZhY2VfdDsKICNlbGlmIFBMQVRGT1JNKEhBSUtVKQogY2xhc3MgQkJpdG1hcDsKICNlbGlm IFBMQVRGT1JNKEJSRVdNUCkKQEAgLTc1LDcgKzc1LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewog I2VsaWYgUExBVEZPUk0oV1gpCiAgICAgdHlwZWRlZiB3eERyYWdJbWFnZSogRHJhZ0ltYWdlUmVm OwogI2VsaWYgUExBVEZPUk0oR1RLKQotICAgIHR5cGVkZWYgR2RrUGl4YnVmKiBEcmFnSW1hZ2VS ZWY7CisgICAgdHlwZWRlZiBjYWlyb19zdXJmYWNlX3QqIERyYWdJbWFnZVJlZjsKICNlbGlmIFBM QVRGT1JNKEhBSUtVKQogICAgIHR5cGVkZWYgQkJpdG1hcCogRHJhZ0ltYWdlUmVmOwogI2VsaWYg UExBVEZPUk0oQlJFV01QKQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvRHJhZ0lt YWdlR3RrLmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0RyYWdJbWFnZUd0ay5jcHAKaW5kZXgg NGM3NzgzMGE2Y2UyZTU4YWJkMDMyODAzMTUxMDJmZWNjM2ViNjMwYi4uOWQwZDgzODkxZGZlNTdi MmQ1OGY2ZDQyZTM4NjBkODkxZWZlYjk4MSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9n dGsvRHJhZ0ltYWdlR3RrLmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL2d0ay9EcmFnSW1hZ2VH dGsuY3BwCkBAIC0xLDQgKzEsNiBAQAogLyoKKyAqIDIwMTAgSWdhbGlhIFMuTAorICoKICAqICBU aGlzIGxpYnJhcnkgaXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUgaXQgYW5k L29yCiAgKiAgbW9kaWZ5IGl0IHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgR05VIExlc3NlciBHZW5l cmFsIFB1YmxpYwogICogIExpY2Vuc2UgYXMgcHVibGlzaGVkIGJ5IHRoZSBGcmVlIFNvZnR3YXJl IEZvdW5kYXRpb247IGVpdGhlcgpAQCAtMTksMTUgKzIxLDE1IEBACiAKICNpbmNsdWRlICJDYWNo ZWRJbWFnZS5oIgogI2luY2x1ZGUgIkltYWdlLmgiCi0KLSNpbmNsdWRlIDxndGsvZ3RrLmg+Cisj aW5jbHVkZSAiUGxhdGZvcm1SZWZQdHJDYWlyby5oIgorI2luY2x1ZGUgPGNhaXJvLmg+CiAKIG5h bWVzcGFjZSBXZWJDb3JlIHsKIAogSW50U2l6ZSBkcmFnSW1hZ2VTaXplKERyYWdJbWFnZVJlZiBp bWFnZSkKIHsKICAgICBpZiAoaW1hZ2UpCi0gICAgICAgIHJldHVybiBJbnRTaXplKGdka19waXhi dWZfZ2V0X3dpZHRoKGltYWdlKSwgZ2RrX3BpeGJ1Zl9nZXRfaGVpZ2h0KGltYWdlKSk7CisgICAg ICAgIHJldHVybiBJbnRTaXplKGNhaXJvX2ltYWdlX3N1cmZhY2VfZ2V0X3dpZHRoKGltYWdlKSwg Y2Fpcm9faW1hZ2Vfc3VyZmFjZV9nZXRfaGVpZ2h0KGltYWdlKSk7CiAKICAgICByZXR1cm4gSW50 U2l6ZSgwLCAwKTsKIH0KQEAgLTM1LDMyICszNyw0NSBAQCBJbnRTaXplIGRyYWdJbWFnZVNpemUo RHJhZ0ltYWdlUmVmIGltYWdlKQogdm9pZCBkZWxldGVEcmFnSW1hZ2UoRHJhZ0ltYWdlUmVmIGlt YWdlKQogewogICAgIGlmIChpbWFnZSkKLSAgICAgICAgZ19vYmplY3RfdW5yZWYoaW1hZ2UpOwor ICAgICAgICBjYWlyb19zdXJmYWNlX2Rlc3Ryb3koaW1hZ2UpOwogfQogCiBEcmFnSW1hZ2VSZWYg c2NhbGVEcmFnSW1hZ2UoRHJhZ0ltYWdlUmVmIGltYWdlLCBGbG9hdFNpemUgc2NhbGUpCiB7Ci0g ICAgaWYgKGltYWdlKSB7Ci0gICAgICAgIEludFNpemUgaW1hZ2VTaXplID0gZHJhZ0ltYWdlU2l6 ZShpbWFnZSk7Ci0gICAgICAgIEdka1BpeGJ1Ziogc2NhbGVkSW1hZ2UgPSBnZGtfcGl4YnVmX3Nj YWxlX3NpbXBsZShpbWFnZSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIGltYWdlU2l6ZS53aWR0aCgpICogc2NhbGUud2lkdGgoKSwKLSAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlt YWdlU2l6ZS5oZWlnaHQoKSAqIHNjYWxlLmhlaWdodCgpLAotICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgR0RLX0lOVEVSUF9CSUxJTkVBUik7 Ci0gICAgICAgIGRlbGV0ZURyYWdJbWFnZShpbWFnZSk7Ci0gICAgICAgIHJldHVybiBzY2FsZWRJ bWFnZTsKLSAgICB9CisgICAgaWYgKCFpbWFnZSkKKyAgICAgICAgcmV0dXJuIDA7CiAKLSAgICBy ZXR1cm4gMDsKKyAgICBpbnQgbmV3V2lkdGggPSBzY2FsZS53aWR0aCgpICogY2Fpcm9faW1hZ2Vf c3VyZmFjZV9nZXRfd2lkdGgoaW1hZ2UpOworICAgIGludCBuZXdIZWlnaHQgPSBzY2FsZS5oZWln aHQoKSAqIGNhaXJvX2ltYWdlX3N1cmZhY2VfZ2V0X2hlaWdodChpbWFnZSk7CisgICAgY2Fpcm9f c3VyZmFjZV90KiBzY2FsZWRTdXJmYWNlID0gY2Fpcm9fc3VyZmFjZV9jcmVhdGVfc2ltaWxhcihp bWFnZSwgQ0FJUk9fQ09OVEVOVF9DT0xPUl9BTFBIQSwgbmV3V2lkdGgsIG5ld0hlaWdodCk7CisK KyAgICBQbGF0Zm9ybVJlZlB0cjxjYWlyb190PiBjb250ZXh0ID0gYWRvcHRQbGF0Zm9ybVJlZihj YWlyb19jcmVhdGUoc2NhbGVkU3VyZmFjZSkpOworICAgIGNhaXJvX3NjYWxlKGNvbnRleHQuZ2V0 KCksIHNjYWxlLndpZHRoKCksIHNjYWxlLmhlaWdodCgpKTsKKyAgICBjYWlyb19wYXR0ZXJuX3Nl dF9leHRlbmQoY2Fpcm9fZ2V0X3NvdXJjZShjb250ZXh0LmdldCgpKSwgQ0FJUk9fRVhURU5EX1BB RCk7CisgICAgY2Fpcm9fcGF0dGVybl9zZXRfZmlsdGVyKGNhaXJvX2dldF9zb3VyY2UoY29udGV4 dC5nZXQoKSksIENBSVJPX0ZJTFRFUl9CRVNUKTsKKyAgICBjYWlyb19zZXRfb3BlcmF0b3IoY29u dGV4dC5nZXQoKSwgQ0FJUk9fT1BFUkFUT1JfU09VUkNFKTsKKyAgICBjYWlyb19zZXRfc291cmNl X3N1cmZhY2UoY29udGV4dC5nZXQoKSwgaW1hZ2UsIDAsIDApOworICAgIGNhaXJvX3BhaW50KGNv bnRleHQuZ2V0KCkpOworCisgICAgZGVsZXRlRHJhZ0ltYWdlKGltYWdlKTsKKyAgICByZXR1cm4g c2NhbGVkU3VyZmFjZTsKIH0KIAotRHJhZ0ltYWdlUmVmIGRpc3NvbHZlRHJhZ0ltYWdlVG9GcmFj dGlvbihEcmFnSW1hZ2VSZWYgaW1hZ2UsIGZsb2F0KQorRHJhZ0ltYWdlUmVmIGRpc3NvbHZlRHJh Z0ltYWdlVG9GcmFjdGlvbihEcmFnSW1hZ2VSZWYgaW1hZ2UsIGZsb2F0IGZyYWN0aW9uKQogewor ICAgIGlmICghaW1hZ2UpCisgICAgICAgIHJldHVybiAwOworCisgICAgUGxhdGZvcm1SZWZQdHI8 Y2Fpcm9fdD4gY29udGV4dCA9IGFkb3B0UGxhdGZvcm1SZWYoY2Fpcm9fY3JlYXRlKGltYWdlKSk7 CisgICAgY2Fpcm9fc2V0X29wZXJhdG9yKGNvbnRleHQuZ2V0KCksIENBSVJPX09QRVJBVE9SX0RF U1RfSU4pOworICAgIGNhaXJvX3NldF9zb3VyY2VfcmdiYShjb250ZXh0LmdldCgpLCAwLCAwLCAw LCBmcmFjdGlvbik7CisgICAgY2Fpcm9fcGFpbnQoY29udGV4dC5nZXQoKSk7CiAgICAgcmV0dXJu IGltYWdlOwogfQogCiBEcmFnSW1hZ2VSZWYgY3JlYXRlRHJhZ0ltYWdlRnJvbUltYWdlKEltYWdl KiBpbWFnZSkKIHsKLSAgICByZXR1cm4gaW1hZ2UtPmdldEdka1BpeGJ1ZigpOworICAgIHJldHVy biBjYWlyb19zdXJmYWNlX3JlZmVyZW5jZShpbWFnZS0+bmF0aXZlSW1hZ2VGb3JDdXJyZW50RnJh bWUoKSk7CiB9CiAKIERyYWdJbWFnZVJlZiBjcmVhdGVEcmFnSW1hZ2VJY29uRm9yQ2FjaGVkSW1h Z2UoQ2FjaGVkSW1hZ2UqKQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvR3RrVmVy c2lvbmluZy5oIGIvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvR3RrVmVyc2lvbmluZy5oCmluZGV4IDJj NmIwMGE1YjdiMDRkMDJiYTMxZTkyNDQwZjE3ZmY3YTNjZjY4ZmYuLjg2N2UxNGY3OTQyOTEyZWJi MzQ4M2JhZDg3YWY5NWM3NzQwYjZkNjkgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vZ3Rr L0d0a1ZlcnNpb25pbmcuaAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL2d0ay9HdGtWZXJzaW9uaW5n LmgKQEAgLTQyLDYgKzQyLDcgQEAgR19CRUdJTl9ERUNMUwogI2VuZGlmIC8vIEdUS19DSEVDS19W RVJTSU9OKDIsIDIxLCAyKQogCiAjaWYgIUdUS19DSEVDS19WRVJTSU9OKDIsIDIwLCAwKQorI2Rl ZmluZSBndGtfd2lkZ2V0X2dldF9yZWFsaXplZCh3aWRnZXQpIEdUS19XSURHRVRfUkVBTElaRUQo d2lkZ2V0KQogI2RlZmluZSBndGtfd2lkZ2V0X3NldF9yZWFsaXplZCh3aWRnZXQsIFRSVUUpIEdU S19XSURHRVRfU0VUX0ZMQUdTKCh3aWRnZXQpLCBHVEtfUkVBTElaRUQpCiAjZGVmaW5lIGd0a19y YW5nZV9nZXRfbWluX3NsaWRlcl9zaXplKHJhbmdlKSAocmFuZ2UpLT5taW5fc2xpZGVyX3NpemUK ICNlbmRpZiAvLyBHVEtfQ0hFQ0tfVkVSU0lPTigyLCAyMCwgMCkKZGlmZiAtLWdpdCBhL1dlYktp dC9ndGsvQ2hhbmdlTG9nIGIvV2ViS2l0L2d0ay9DaGFuZ2VMb2cKaW5kZXggOTM3MTUyMzA3ZmUw N2MzZjlmZTZjOGY4NjJlMjFiZmI3ZDk3ZWIxMS4uMDcyZWU2MTlmYjMxNDAyODY0Yzg5ZDAxMjgz ZjBhNmI3NjdkNzgwZSAxMDA2NDQKLS0tIGEvV2ViS2l0L2d0ay9DaGFuZ2VMb2cKKysrIGIvV2Vi S2l0L2d0ay9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMyBAQAorMjAxMC0wOS0xNSAgTWFydGluIFJv Ymluc29uICA8bXJvYmluc29uQGlnYWxpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgW0dUS10gSW1wbGVtZW50IGRpc3NvbHZlRHJhZ0ltYWdl VG9GcmFjdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9NDU4MjYKKworICAgICAgICBUbyBzdXBwb3J0IGZ1bGwgYWxwaGEgaW4gdGhlIGRyYWcgaWNv biwgY2hhbmdlZCB0aGUgZHJhZyBpY29uIHRvIGJlIGEgCisgICAgICAgIEd0a1dpbmRvdyB3aXRo IGFuIFJHQkEgY29sb3JtYXAuIEFkZGVkIGxvZ2ljIHRvIHN1cHBvcnQgcGFpbnRpbmcgdGhlIGRy YWcKKyAgICAgICAgaW1hZ2UgdG8gdGhpcyB3aW5kb3cgZHVyaW5nIHRoZSBleHBvc2UgZXZlbnQu CisKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9EcmFnQ2xpZW50R3RrLmNwcDoKKyAgICAgICAg KFdlYktpdDo6ZHJhZ0ljb25XaW5kb3dFeHBvc2VFdmVudENhbGxiYWNrKTogQWRkZWQuCisgICAg ICAgIChXZWJLaXQ6OkRyYWdDbGllbnQ6OkRyYWdDbGllbnQpOiBJbml0aWFsaXplIHRoZSBuZXcg ZHJhZyBpY29uIHdpbmRvdy4KKyAgICAgICAgKFdlYktpdDo6RHJhZ0NsaWVudDo6fkRyYWdDbGll bnQpOiBEaXNjb25uZWN0IHRoZSBleHBvc2UgZXZlbnQgc2lnbmFsLgorICAgICAgICAoV2ViS2l0 OjpEcmFnQ2xpZW50OjpzdGFydERyYWcpOiBSZXNpemUgdGhlIGRyYWcgaWNvbiB3aW5kb3cgdGhl IGFwcHJvcHJpYXRlIHNpemUgYW5kCisgICAgICAgIGlmIG5lY2Vzc2FyeSwgc2V0IGl0cyBjb2xv cm1hcC4KKyAgICAgICAgKFdlYktpdDo6RHJhZ0NsaWVudDo6ZHJhZ0ljb25XaW5kb3dFeHBvc2VF dmVudCk6IEFkZGVkLgorICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0RyYWdDbGllbnRHdGsuaDog QWRkZWQgbmV3IG1lbWJlciBhbmQgbWV0aG9kIGRlY2xhcmF0aW9ucy4KKwogMjAxMC0wOS0xMyAg RW5yaWNhIENhc3VjY2kgIDxlbnJpY2FAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5 IFNhbSBXZWluaWcuCmRpZmYgLS1naXQgYS9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0RyYWdD bGllbnRHdGsuY3BwIGIvV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9EcmFnQ2xpZW50R3RrLmNw cAppbmRleCBiNjA3NWI2OWU4ZTZmMTQyODFkNTdiZGJkMjE1MTQ5MTI2Y2U2OWQ5Li5lYmRlZTE5 OTA3NGJmZDIxZmZlZjYyODQ4MjU0YjdlZGFkNGVhMmM3IDEwMDY0NAotLS0gYS9XZWJLaXQvZ3Rr L1dlYkNvcmVTdXBwb3J0L0RyYWdDbGllbnRHdGsuY3BwCisrKyBiL1dlYktpdC9ndGsvV2ViQ29y ZVN1cHBvcnQvRHJhZ0NsaWVudEd0ay5jcHAKQEAgLTM0LDE2ICszNCwzMCBAQAogI2luY2x1ZGUg IlJlbmRlck9iamVjdC5oIgogI2luY2x1ZGUgIndlYmtpdHByaXZhdGUuaCIKICNpbmNsdWRlICJ3 ZWJraXR3ZWJ2aWV3LmgiCisjaW5jbHVkZSA8Z2RrL2dkay5oPgogI2luY2x1ZGUgPGd0ay9ndGsu aD4KIAogdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAKIG5hbWVzcGFjZSBXZWJLaXQgewogCitz dGF0aWMgZ2Jvb2xlYW4gZHJhZ0ljb25XaW5kb3dFeHBvc2VFdmVudENhbGxiYWNrKEd0a1dpZGdl dCogd2lkZ2V0LCBHZGtFdmVudEV4cG9zZSogZXZlbnQsIERyYWdDbGllbnQqIGNsaWVudCkKK3sK KyAgICBjbGllbnQtPmRyYWdJY29uV2luZG93RXhwb3NlRXZlbnQod2lkZ2V0LCBldmVudCk7Cisg ICAgcmV0dXJuIFRSVUU7Cit9CisKIERyYWdDbGllbnQ6OkRyYWdDbGllbnQoV2ViS2l0V2ViVmll dyogd2ViVmlldykKICAgICA6IG1fd2ViVmlldyh3ZWJWaWV3KQogICAgICwgbV9zdGFydFBvcygw LCAwKQorICAgICwgbV9kcmFnSWNvbldpbmRvdyhndGtfd2luZG93X25ldyhHVEtfV0lORE9XX1BP UFVQKSkKIHsKKyAgICBnX3NpZ25hbF9jb25uZWN0KG1fZHJhZ0ljb25XaW5kb3cuZ2V0KCksICJl eHBvc2UtZXZlbnQiLCBHX0NBTExCQUNLKGRyYWdJY29uV2luZG93RXhwb3NlRXZlbnRDYWxsYmFj ayksIHRoaXMpOworfQorCitEcmFnQ2xpZW50Ojp+RHJhZ0NsaWVudCgpCit7CisgICAgZ19zaWdu YWxfaGFuZGxlcnNfZGlzY29ubmVjdF9ieV9mdW5jKG1fZHJhZ0ljb25XaW5kb3cuZ2V0KCksIChn cG9pbnRlcikgZHJhZ0ljb25XaW5kb3dFeHBvc2VFdmVudENhbGxiYWNrLCB0aGlzKTsKIH0KIAog dm9pZCBEcmFnQ2xpZW50Ojp3aWxsUGVyZm9ybURyYWdEZXN0aW5hdGlvbkFjdGlvbihEcmFnRGVz dGluYXRpb25BY3Rpb24sIERyYWdEYXRhKikKQEAgLTgzLDEyICs5NywzOCBAQCB2b2lkIERyYWdD bGllbnQ6OnN0YXJ0RHJhZyhEcmFnSW1hZ2VSZWYgaW1hZ2UsIGNvbnN0IEludFBvaW50JiBkcmFn SW1hZ2VPcmlnaW4sCiAgICAgLy8gaGFwcGVuIGlmIGEgZHJhZyBpcyBmb2xsb3dlZCB2ZXJ5IHF1 aWNrbHkgYnkgYW5vdGhlciBjbGljayAobGlrZSBpbiB0aGUgRFJUKS4KICAgICB3ZWJWaWV3LT5w cml2LT5wcmV2aW91c0NsaWNrVGltZSA9IDA7CiAKLSAgICBpZiAoaW1hZ2UpCi0gICAgICAgIGd0 a19kcmFnX3NldF9pY29uX3BpeGJ1Zihjb250ZXh0LCBpbWFnZSwgZXZlbnRQb3MueCgpIC0gZHJh Z0ltYWdlT3JpZ2luLngoKSwgZXZlbnRQb3MueSgpIC0gZHJhZ0ltYWdlT3JpZ2luLnkoKSk7Ci0g ICAgZWxzZQorICAgIC8vIFRoaXMgc3RyYXRlZ3kgb3JpZ2luYWxseSBjb21lcyBmcm9tIENocm9t aXVtOgorICAgIC8vIHNyYy9jaHJvbWUvYnJvd3Nlci9ndGsvdGFiX2NvbnRlbnRzX2RyYWdfc291 cmNlLmNjCisgICAgaWYgKGltYWdlKSB7CisgICAgICAgIG1fZHJhZ0ltYWdlID0gaW1hZ2U7Cisg ICAgICAgIEludFNpemUgaW1hZ2VTaXplKGNhaXJvX2ltYWdlX3N1cmZhY2VfZ2V0X3dpZHRoKGlt YWdlKSwgY2Fpcm9faW1hZ2Vfc3VyZmFjZV9nZXRfaGVpZ2h0KGltYWdlKSk7CisgICAgICAgIGd0 a193aW5kb3dfcmVzaXplKEdUS19XSU5ET1cobV9kcmFnSWNvbldpbmRvdy5nZXQoKSksIGltYWdl U2l6ZS53aWR0aCgpLCBpbWFnZVNpemUuaGVpZ2h0KCkpOworCisgICAgICAgIGlmICghZ3RrX3dp ZGdldF9nZXRfcmVhbGl6ZWQobV9kcmFnSWNvbldpbmRvdy5nZXQoKSkpIHsKKyAgICAgICAgICAg IEdka1NjcmVlbiogc2NyZWVuID0gZ3RrX3dpZGdldF9nZXRfc2NyZWVuKG1fZHJhZ0ljb25XaW5k b3cuZ2V0KCkpOworICAgICAgICAgICAgR2RrQ29sb3JtYXAqIHJnYmEgPSBnZGtfc2NyZWVuX2dl dF9yZ2JhX2NvbG9ybWFwKHNjcmVlbik7CisgICAgICAgICAgICBpZiAocmdiYSkKKyAgICAgICAg ICAgICAgICBndGtfd2lkZ2V0X3NldF9jb2xvcm1hcChtX2RyYWdJY29uV2luZG93LmdldCgpLCBy Z2JhKTsKKyAgICAgICAgfQorCisgICAgICAgIEludFNpemUgb3JpZ2luID0gZXZlbnRQb3MgLSBk cmFnSW1hZ2VPcmlnaW47CisgICAgICAgIGd0a19kcmFnX3NldF9pY29uX3dpZGdldChjb250ZXh0 LCBtX2RyYWdJY29uV2luZG93LmdldCgpLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgb3JpZ2luLndpZHRoKCksIG9yaWdpbi5oZWlnaHQoKSk7CisgICAgfSBlbHNlCiAgICAgICAg IGd0a19kcmFnX3NldF9pY29uX2RlZmF1bHQoY29udGV4dCk7CiB9CiAKK3ZvaWQgRHJhZ0NsaWVu dDo6ZHJhZ0ljb25XaW5kb3dFeHBvc2VFdmVudChHdGtXaWRnZXQqIHdpZGdldCwgR2RrRXZlbnRF eHBvc2UqIGV2ZW50KQoreworICAgIFBsYXRmb3JtUmVmUHRyPGNhaXJvX3Q+IGNvbnRleHQgPSBh ZG9wdFBsYXRmb3JtUmVmKGdka19jYWlyb19jcmVhdGUoZXZlbnQtPndpbmRvdykpOworICAgIGNh aXJvX3JlY3RhbmdsZShjb250ZXh0LmdldCgpLCAwLCAwLAorICAgICAgICAgICAgICAgICAgICBj YWlyb19pbWFnZV9zdXJmYWNlX2dldF93aWR0aChtX2RyYWdJbWFnZS5nZXQoKSksCisgICAgICAg ICAgICAgICAgICAgIGNhaXJvX2ltYWdlX3N1cmZhY2VfZ2V0X2hlaWdodChtX2RyYWdJbWFnZS5n ZXQoKSkpOworICAgIGNhaXJvX3NldF9vcGVyYXRvcihjb250ZXh0LmdldCgpLCBDQUlST19PUEVS QVRPUl9TT1VSQ0UpOworICAgIGNhaXJvX3NldF9zb3VyY2Vfc3VyZmFjZShjb250ZXh0LmdldCgp LCBtX2RyYWdJbWFnZS5nZXQoKSwgMCwgMCk7CisgICAgY2Fpcm9fZmlsbChjb250ZXh0LmdldCgp KTsKK30KKwogRHJhZ0ltYWdlUmVmIERyYWdDbGllbnQ6OmNyZWF0ZURyYWdJbWFnZUZvckxpbmso S1VSTCYsIGNvbnN0IFN0cmluZyYsIEZyYW1lKikKIHsKICAgICBub3RJbXBsZW1lbnRlZCgpOwpk aWZmIC0tZ2l0IGEvV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9EcmFnQ2xpZW50R3RrLmggYi9X ZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0RyYWdDbGllbnRHdGsuaAppbmRleCA1MTQ4NTJlNjBi ZTNmYzRhNGU1ZDBiODhjYjFhZTU5ODlkOTM1MmZiLi4yYWI3ZTJkMDA3MWRmZDhkYjA1YjM3NTZl ZTg5OGY1MGU3Mzc0YzQ4IDEwMDY0NAotLS0gYS9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0Ry YWdDbGllbnRHdGsuaAorKysgYi9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0RyYWdDbGllbnRH dGsuaApAQCAtMzEsNiArMzEsOCBAQAogI2RlZmluZSBEcmFnQ2xpZW50R3RrX2gKIAogI2luY2x1 ZGUgIkRyYWdDbGllbnQuaCIKKyNpbmNsdWRlICJHUmVmUHRyLmgiCisjaW5jbHVkZSAiUGxhdGZv cm1SZWZQdHJDYWlyby5oIgogCiB0eXBlZGVmIHN0cnVjdCBfV2ViS2l0V2ViVmlldyBXZWJLaXRX ZWJWaWV3OwogCkBAIC0zOSw2ICs0MSw3IEBAIG5hbWVzcGFjZSBXZWJLaXQgewogICAgIGNsYXNz IERyYWdDbGllbnQgOiBwdWJsaWMgV2ViQ29yZTo6RHJhZ0NsaWVudCB7CiAgICAgcHVibGljOgog ICAgICAgICBEcmFnQ2xpZW50KFdlYktpdFdlYlZpZXcqKTsKKyAgICAgICAgfkRyYWdDbGllbnQo KTsKIAogICAgICAgICB2aXJ0dWFsIHZvaWQgd2lsbFBlcmZvcm1EcmFnRGVzdGluYXRpb25BY3Rp b24oV2ViQ29yZTo6RHJhZ0Rlc3RpbmF0aW9uQWN0aW9uLCBXZWJDb3JlOjpEcmFnRGF0YSopOwog ICAgICAgICB2aXJ0dWFsIHZvaWQgd2lsbFBlcmZvcm1EcmFnU291cmNlQWN0aW9uKFdlYkNvcmU6 OkRyYWdTb3VyY2VBY3Rpb24sIGNvbnN0IFdlYkNvcmU6OkludFBvaW50JiwgV2ViQ29yZTo6Q2xp cGJvYXJkKik7CkBAIC01MSw5ICs1NCwxMyBAQCBuYW1lc3BhY2UgV2ViS2l0IHsKIAogICAgICAg ICB2aXJ0dWFsIHZvaWQgZHJhZ0NvbnRyb2xsZXJEZXN0cm95ZWQoKTsKIAorICAgICAgICB2b2lk IGRyYWdJY29uV2luZG93RXhwb3NlRXZlbnQoR3RrV2lkZ2V0KiwgR2RrRXZlbnRFeHBvc2UqKTsK KwogICAgIHByaXZhdGU6CiAgICAgICAgIFdlYktpdFdlYlZpZXcqIG1fd2ViVmlldzsKICAgICAg ICAgV2ViQ29yZTo6SW50UG9pbnQgbV9zdGFydFBvczsKKyAgICAgICAgUGxhdGZvcm1SZWZQdHI8 R3RrV2lkZ2V0PiBtX2RyYWdJY29uV2luZG93OworICAgICAgICBQbGF0Zm9ybVJlZlB0cjxjYWly b19zdXJmYWNlX3Q+IG1fZHJhZ0ltYWdlOwogICAgIH07CiB9CiAK