143217 2015-03-30 05:26:24 -0700 [GTK] DnD icon/widget has odd background 2015-03-31 00:50:49 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 1 carlosg webkit-unassigned carlosg cgarcia gustavo pnormand svillar oldest_to_newest 1081137 0 carlosg 2015-03-30 05:26:24 -0700 If you DnD anything, the DnD icon shows an odd background. During the weekend I found out that WebKitGtk is using gtk_drag_set_icon_widget(), but is not setting the passed GtkWindow widget as app-paintable, which forces background rendering that would be unintended here. After some chatting with KaL on #gtk+, it seems like a better approach though is using gtk_drag_set_icon_surface(): KaL garnacho_: we should probably use gtk_drag_set_icon_surface I don't know why we use a widget for that, TBH since the drag icon is rendered into a cairo surface in webcore Doing either would fix the odd background on DnD icons. 1081142 1 cgarcia 2015-03-30 05:58:47 -0700 We can just remove DragIcon entirely, and use simply gtk_drag_set_icon_surface(). 1081149 2 249726 cgarcia 2015-03-30 06:24:18 -0700 Created attachment 249726 Patch 1081155 3 249726 mrobinson 2015-03-30 08:07:25 -0700 Comment on attachment 249726 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=249726&action=review > Source/WebCore/ChangeLog:10 > + Remove DragIcon class since it's no longer needed with GTK+3 and > + the GTK+2 code there is unused. > + It's great that GTK+ improved the API here. Do you mind explaining a bit more here why this is no longer necessary for GTK+3? What changes allow us to work properly with composited window managers without a window? 1081161 4 cgarcia 2015-03-30 08:26:30 -0700 (In reply to comment #3) > Comment on attachment 249726 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=249726&action=review > > > Source/WebCore/ChangeLog:10 > > + Remove DragIcon class since it's no longer needed with GTK+3 and > > + the GTK+2 code there is unused. > > + > > It's great that GTK+ improved the API here. Do you mind explaining a bit > more here why this is no longer necessary for GTK+3? What changes allow us > to work properly with composited window managers without a window? GTK+ knows what to do with a cairo surface, I guess we migrated the gtk+2 code to gtk+3 without realizing that using the surface was enough. 1081162 5 249726 mrobinson 2015-03-30 08:30:48 -0700 Comment on attachment 249726 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=249726&action=review >>> Source/WebCore/ChangeLog:10 >>> + >> >> It's great that GTK+ improved the API here. Do you mind explaining a bit more here why this is no longer necessary for GTK+3? What changes allow us to work properly with composited window managers without a window? > > GTK+ knows what to do with a cairo surface, I guess we migrated the gtk+2 code to gtk+3 without realizing that using the surface was enough. Cool, do you mind just dropping something like that into the ChangeLog? 1081574 6 cgarcia 2015-03-31 00:50:49 -0700 Committed r182175: <http://trac.webkit.org/changeset/182175> 249726 2015-03-30 06:24:18 -0700 2015-03-30 08:30:48 -0700 Patch wk2-drag-icon.diff text/plain 11574 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA5MWQxZjlhLi44YmYwZTljIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcg QEAKKzIwMTUtMDMtMzAgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFtHVEtdIERuRCBpY29uL3dpZGdldCBoYXMgb2RkIGJhY2tncm91bmQKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MzIxNworCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlbW92ZSBEcmFn SWNvbiBjbGFzcyBzaW5jZSBpdCdzIG5vIGxvbmdlciBuZWVkZWQgd2l0aCBHVEsrMyBhbmQKKyAg ICAgICAgdGhlIEdUSysyIGNvZGUgdGhlcmUgaXMgdW51c2VkLgorCisgICAgICAgICogUGxhdGZv cm1HVEsuY21ha2U6CisgICAgICAgICogcGxhdGZvcm0vZ3RrL0RyYWdJY29uLmNwcDogUmVtb3Zl ZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9ndGsvRHJhZ0ljb24uaDogUmVtb3ZlZC4KKwogMjAxNS0w My0yNCAgWW9hdiBXZWlzcyAgPHlvYXZAeW9hdi53cz4KIAogICAgICAgICBTdG9wIGltYWdlIGZy b20gZGlzcGxheWluZyB3aGVuIHNyYyBhdHRyaWJ1dGUgaXMgcmVtb3ZlZCBvciBlbXB0aWVkCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9QbGF0Zm9ybUdUSy5jbWFrZSBiL1NvdXJjZS9XZWJD b3JlL1BsYXRmb3JtR1RLLmNtYWtlCmluZGV4IDQ1MjZjMDYuLjdmNzk0ZjUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL1BsYXRmb3JtR1RLLmNtYWtlCisrKyBiL1NvdXJjZS9XZWJDb3JlL1Bs YXRmb3JtR1RLLmNtYWtlCkBAIC0yMTQsNyArMjE0LDYgQEAgbGlzdChBUFBFTkQgV2ViQ29yZVBs YXRmb3JtR1RLX1NPVVJDRVMKICAgICBwbGF0Zm9ybS9ndGsvQ3Vyc29yR3RrLmNwcAogICAgIHBs YXRmb3JtL2d0ay9EYXRhT2JqZWN0R3RrLmNwcAogICAgIHBsYXRmb3JtL2d0ay9EcmFnRGF0YUd0 ay5jcHAKLSAgICBwbGF0Zm9ybS9ndGsvRHJhZ0ljb24uY3BwCiAgICAgcGxhdGZvcm0vZ3RrL0Ry YWdJbWFnZUd0ay5jcHAKICAgICBwbGF0Zm9ybS9ndGsvR1JlZlB0ckd0ay5jcHAKICAgICBwbGF0 Zm9ybS9ndGsvR3RrVXRpbGl0aWVzLmNwcApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3RrL0RyYWdJY29uLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9EcmFn SWNvbi5jcHAKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDVkYzhiYmMuLjAwMDAwMDAK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0RyYWdJY29uLmNwcAorKysgL2Rldi9u dWxsCkBAIC0xLDEzMCArMCwwIEBACi0vKgotICogQ29weXJpZ2h0IChDKSAyMDExIElnYWxpYSBT LkwuCi0gKgotICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBm b3Jtcywgd2l0aCBvciB3aXRob3V0Ci0gKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJv dmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKLSAqIGFyZSBtZXQ6Ci0gKiAxLiBS ZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHly aWdodAotICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxv d2luZyBkaXNjbGFpbWVyLgotICogMi4gUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11 c3QgcmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQKLSAqICAgIG5vdGljZSwgdGhpcyBsaXN0 IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0aGUKLSAqICAg IGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZSBk aXN0cmlidXRpb24uCi0gKgotICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBBUFBMRSBJ TkMuIEFORCBJVFMgQ09OVFJJQlVUT1JTIGBgQVMgSVMnJwotICogQU5EIEFOWSBFWFBSRVNTIE9S IElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sCi0gKiBU SEUgSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1Ig QSBQQVJUSUNVTEFSCi0gKiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiBJTiBOTyBFVkVOVCBTSEFM TCBBUFBMRSBJTkMuIE9SIElUUyBDT05UUklCVVRPUlMKLSAqIEJFIExJQUJMRSBGT1IgQU5ZIERJ UkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJQUwsIEVYRU1QTEFSWSwgT1IKLSAqIENP TlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFBST0NV UkVNRU5UIE9GCi0gKiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwg REFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5FU1MKLSAqIElOVEVSUlVQVElPTikgSE9XRVZFUiBD QVVTRUQgQU5EIE9OIEFOWSBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVSIElOCi0gKiBDT05U UkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVCAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1Ig T1RIRVJXSVNFKQotICogQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFIE9GIFRISVMg U09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRgotICogVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0gg REFNQUdFLgotICovCi0KLSNpbmNsdWRlICJjb25maWcuaCIKLSNpbmNsdWRlICJEcmFnSWNvbi5o IgotI2luY2x1ZGUgIkdka0NhaXJvVXRpbGl0aWVzLmgiCi0KLSNpbmNsdWRlIDxndGsvZ3RrLmg+ Ci0KLW5hbWVzcGFjZSBXZWJDb3JlIHsKLQotI2lmZGVmIEdUS19BUElfVkVSU0lPTl8yCi1zdGF0 aWMgZ2Jvb2xlYW4gZHJhZ0ljb25XaW5kb3dEcmF3RXZlbnRDYWxsYmFjayhHdGtXaWRnZXQqLCBH ZGtFdmVudEV4cG9zZSogZXZlbnQsIERyYWdJY29uKiBpY29uKQotewotICAgIFJlZlB0cjxjYWly b190PiBjb250ZXh0ID0gYWRvcHRSZWYoZ2RrX2NhaXJvX2NyZWF0ZShldmVudC0+d2luZG93KSk7 Ci0gICAgaWNvbi0+ZHJhdyhjb250ZXh0LmdldCgpKTsKLSAgICByZXR1cm4gVFJVRTsKLX0KLSNl bHNlCi1zdGF0aWMgZ2Jvb2xlYW4gZHJhZ0ljb25XaW5kb3dEcmF3RXZlbnRDYWxsYmFjayhHdGtX aWRnZXQqLCBjYWlyb190KiBjb250ZXh0LCBEcmFnSWNvbiogaWNvbikKLXsKLSAgICBpZiAoIWdk a19jYWlyb19nZXRfY2xpcF9yZWN0YW5nbGUoY29udGV4dCwgMCkpCi0gICAgICAgIHJldHVybiBG QUxTRTsKLSAgICBpY29uLT5kcmF3KGNvbnRleHQpOwotICAgIHJldHVybiBUUlVFOwotfQotI2Vu ZGlmIC8vIEdUS19BUElfVkVSU0lPTl8yCi0KLURyYWdJY29uOjpEcmFnSWNvbigpCi0gICAgOiBp c0NvbXBvc2l0ZWQoZ2RrX3NjcmVlbl9pc19jb21wb3NpdGVkKGdka19zY3JlZW5fZ2V0X2RlZmF1 bHQoKSkpCi0gICAgLCBtX3dpbmRvdygwKQotewotICAgIGlmICghaXNDb21wb3NpdGVkKQotICAg ICAgICByZXR1cm47Ci0KLSAgICBtX3dpbmRvdyA9IGd0a193aW5kb3dfbmV3KEdUS19XSU5ET1df UE9QVVApOwotI2lmZGVmIEdUS19BUElfVkVSU0lPTl8yCi0gICAgZ19zaWduYWxfY29ubmVjdCht X3dpbmRvdywgImV4cG9zZS1ldmVudCIsIEdfQ0FMTEJBQ0soZHJhZ0ljb25XaW5kb3dEcmF3RXZl bnRDYWxsYmFjayksIHRoaXMpOwotI2Vsc2UKLSAgICBnX3NpZ25hbF9jb25uZWN0KG1fd2luZG93 LCAiZHJhdyIsIEdfQ0FMTEJBQ0soZHJhZ0ljb25XaW5kb3dEcmF3RXZlbnRDYWxsYmFjayksIHRo aXMpOwotI2VuZGlmCi0KLSAgICAvLyBUaGlzIHN0cmF0ZWd5IG9yaWdpbmFsbHkgY29tZXMgZnJv bSBDaHJvbWl1bTogc3JjL2Nocm9tZS9icm93c2VyL2d0ay90YWJfY29udGVudHNfZHJhZ19zb3Vy Y2UuY2MKLSAgICBHZGtTY3JlZW4qIHNjcmVlbiA9IGd0a193aWRnZXRfZ2V0X3NjcmVlbihtX3dp bmRvdyk7Ci0jaWZkZWYgR1RLX0FQSV9WRVJTSU9OXzIKLSAgICBHZGtDb2xvcm1hcCogcmdiYSA9 IGdka19zY3JlZW5fZ2V0X3JnYmFfY29sb3JtYXAoc2NyZWVuKTsKLSAgICBpZiAocmdiYSkKLSAg ICAgICAgZ3RrX3dpZGdldF9zZXRfY29sb3JtYXAobV93aW5kb3csIHJnYmEpOwotI2Vsc2UKLSAg ICBHZGtWaXN1YWwqIHZpc3VhbCA9IGdka19zY3JlZW5fZ2V0X3JnYmFfdmlzdWFsKHNjcmVlbik7 Ci0gICAgaWYgKCF2aXN1YWwpCi0gICAgICAgIHZpc3VhbCA9IGdka19zY3JlZW5fZ2V0X3N5c3Rl bV92aXN1YWwoc2NyZWVuKTsKLSAgICBndGtfd2lkZ2V0X3NldF92aXN1YWwobV93aW5kb3csIHZp c3VhbCk7Ci0jZW5kaWYgLy8gR1RLX0FQSV9WRVJTSU9OXzIKLX0KLQotRHJhZ0ljb246On5EcmFn SWNvbigpCi17Ci0gICAgaWYgKG1fd2luZG93KQotICAgICAgICBndGtfd2lkZ2V0X2Rlc3Ryb3ko bV93aW5kb3cpOwotfQotCi12b2lkIERyYWdJY29uOjpkcmF3KGNhaXJvX3QqIGNvbnRleHQpCi17 Ci0gICAgY2Fpcm9fcmVjdGFuZ2xlKGNvbnRleHQsIDAsIDAsCi0gICAgICAgICAgICAgICAgICAg IGNhaXJvX2ltYWdlX3N1cmZhY2VfZ2V0X3dpZHRoKG1faW1hZ2UuZ2V0KCkpLAotICAgICAgICAg ICAgICAgICAgICBjYWlyb19pbWFnZV9zdXJmYWNlX2dldF9oZWlnaHQobV9pbWFnZS5nZXQoKSkp OwotICAgIGNhaXJvX3NldF9vcGVyYXRvcihjb250ZXh0LCBDQUlST19PUEVSQVRPUl9TT1VSQ0Up OwotICAgIGNhaXJvX3NldF9zb3VyY2Vfc3VyZmFjZShjb250ZXh0LCBtX2ltYWdlLmdldCgpLCAw LCAwKTsKLSAgICBjYWlyb19maWxsKGNvbnRleHQpOwotfQotCi12b2lkIERyYWdJY29uOjpzZXRJ bWFnZShjYWlyb19zdXJmYWNlX3QqIGltYWdlKQotewotICAgIEFTU0VSVChpbWFnZSk7Ci0gICAg bV9pbWFnZSA9IGltYWdlOwotICAgIG1faW1hZ2VTaXplID0gSW50U2l6ZShjYWlyb19pbWFnZV9z dXJmYWNlX2dldF93aWR0aChpbWFnZSksIGNhaXJvX2ltYWdlX3N1cmZhY2VfZ2V0X2hlaWdodChp bWFnZSkpOwotICAgIGlmIChpc0NvbXBvc2l0ZWQpIHsKLSAgICAgICAgZ3RrX3dpbmRvd19yZXNp emUoR1RLX1dJTkRPVyhtX3dpbmRvdyksIG1faW1hZ2VTaXplLndpZHRoKCksIG1faW1hZ2VTaXpl LmhlaWdodCgpKTsKLSAgICAgICAgcmV0dXJuOwotICAgIH0KLQotI2lmZGVmIEdUS19BUElfVkVS U0lPTl8yCi0gICAgbV9waXhidWYgPSBhZG9wdEdSZWYoY2Fpcm9TdXJmYWNlVG9HZGtQaXhidWYo aW1hZ2UpKTsKLSNlbmRpZgotfQotCi12b2lkIERyYWdJY29uOjp1c2VGb3JEcmFnKEdka0RyYWdD b250ZXh0KiBjb250ZXh0KQotewotICAgIEludFBvaW50IGhvdHNwb3QobV9pbWFnZVNpemUpOwot ICAgIGhvdHNwb3Quc2NhbGUoMC41LCAwLjUpOwotICAgIHVzZUZvckRyYWcoY29udGV4dCwgaG90 c3BvdCk7Ci19Ci0KLXZvaWQgRHJhZ0ljb246OnVzZUZvckRyYWcoR2RrRHJhZ0NvbnRleHQqIGNv bnRleHQsIGNvbnN0IEludFBvaW50JiBob3RzcG90KQotewotICAgIGlmIChpc0NvbXBvc2l0ZWQp IHsKLSAgICAgICAgZ3RrX2RyYWdfc2V0X2ljb25fd2lkZ2V0KGNvbnRleHQsIG1fd2luZG93LCBo b3RzcG90LngoKSwgaG90c3BvdC55KCkpOwotICAgICAgICByZXR1cm47Ci0gICAgfQotI2lmZGVm IEdUS19BUElfVkVSU0lPTl8yCi0gICAgZ3RrX2RyYWdfc2V0X2ljb25fcGl4YnVmKGNvbnRleHQs IG1fcGl4YnVmLmdldCgpLCBob3RzcG90LngoKSwgaG90c3BvdC55KCkpOwotI2Vsc2UKLSAgICBn dGtfZHJhZ19zZXRfaWNvbl9zdXJmYWNlKGNvbnRleHQsIG1faW1hZ2UuZ2V0KCkpOwotI2VuZGlm Ci19Ci0KLX0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2d0ay9EcmFnSWNvbi5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0Ry YWdJY29uLmgKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IGZiZTQzNWQuLjAwMDAwMDAK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0RyYWdJY29uLmgKKysrIC9kZXYvbnVs bApAQCAtMSw1NyArMCwwIEBACi0vKgotICogQ29weXJpZ2h0IChDKSAyMDExIElnYWxpYSBTLkwu Ci0gKgotICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jt cywgd2l0aCBvciB3aXRob3V0Ci0gKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlk ZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKLSAqIGFyZSBtZXQ6Ci0gKiAxLiBSZWRp c3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdo dAotICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2lu ZyBkaXNjbGFpbWVyLgotICogMi4gUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3Qg cmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQKLSAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9m IGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0aGUKLSAqICAgIGRv Y3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZSBkaXN0 cmlidXRpb24uCi0gKgotICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBBUFBMRSBJTkMu IEFORCBJVFMgQ09OVFJJQlVUT1JTIGBgQVMgSVMnJwotICogQU5EIEFOWSBFWFBSRVNTIE9SIElN UExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sCi0gKiBUSEUg SU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IgQSBQ QVJUSUNVTEFSCi0gKiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiBJTiBOTyBFVkVOVCBTSEFMTCBB UFBMRSBJTkMuIE9SIElUUyBDT05UUklCVVRPUlMKLSAqIEJFIExJQUJMRSBGT1IgQU5ZIERJUkVD VCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJQUwsIEVYRU1QTEFSWSwgT1IKLSAqIENPTlNF UVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFBST0NVUkVN RU5UIE9GCi0gKiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwgREFU QSwgT1IgUFJPRklUUzsgT1IgQlVTSU5FU1MKLSAqIElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVT RUQgQU5EIE9OIEFOWSBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVSIElOCi0gKiBDT05UUkFD VCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVCAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RI RVJXSVNFKQotICogQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFIE9GIFRISVMgU09G VFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRgotICogVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFN QUdFLgotICovCi0KLSNpZm5kZWYgRHJhZ0ljb25faAotI2RlZmluZSBEcmFnSWNvbl9oCi0KLSNp bmNsdWRlICJJbnRQb2ludC5oIgotI2luY2x1ZGUgPFJlZlB0ckNhaXJvLmg+Ci0jaW5jbHVkZSA8 d3RmL2dvYmplY3QvR1JlZlB0ci5oPgotCi1uYW1lc3BhY2UgV2ViQ29yZSB7Ci0KLWNsYXNzIERy YWdJY29uIHsKLXB1YmxpYzoKLSAgICBEcmFnSWNvbigpOwotICAgIHZpcnR1YWwgfkRyYWdJY29u KCk7Ci0KLSAgICB2b2lkIGRyYXcoY2Fpcm9fdCopOwotICAgIHZvaWQgc2V0SW1hZ2UoY2Fpcm9f c3VyZmFjZV90Kik7Ci0gICAgdm9pZCB1c2VGb3JEcmFnKEdka0RyYWdDb250ZXh0Kik7Ci0gICAg dm9pZCB1c2VGb3JEcmFnKEdka0RyYWdDb250ZXh0KiwgY29uc3QgSW50UG9pbnQmIGhvdHNwb3Qp OwotCi1wcml2YXRlOgotICAgIGJvb2wgaXNDb21wb3NpdGVkOwotICAgIEd0a1dpZGdldCogbV93 aW5kb3c7Ci0gICAgUmVmUHRyPGNhaXJvX3N1cmZhY2VfdD4gbV9pbWFnZTsKLSAgICBJbnRTaXpl IG1faW1hZ2VTaXplOwotI2lmZGVmIEdUS19BUElfVkVSU0lPTl8yCi0gICAgR1JlZlB0cjxHZGtQ aXhidWY+IG1fcGl4YnVmOwotI2VuZGlmCi19OwotCi19Ci0KLSNlbmRpZiAvLyBEcmFnSWNvbl9o CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cKaW5kZXggNTM4OTE3NS4uY2VkMGZkMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4 IEBACisyMDE1LTAzLTMwICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNv bT4KKworICAgICAgICBbR1RLXSBEbkQgaWNvbi93aWRnZXQgaGFzIG9kZCBiYWNrZ3JvdW5kCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDMyMTcKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVc2UgZ3RrX2Ry YWdfc2V0X2ljb25fc3VyZmFjZSgpIHRvIHNldCB0aGUgZHJhZyBpY29uIGltYWdlLAorICAgICAg ICBpbnN0ZWFkIG9mIERyYWdJY29uIGNsYXNzLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9n dGsvV2ViS2l0V2ViVmlldy5jcHA6CisgICAgICAgICogVUlQcm9jZXNzL2d0ay9EcmFnQW5kRHJv cEhhbmRsZXIuY3BwOgorICAgICAgICAoV2ViS2l0OjpEcmFnQW5kRHJvcEhhbmRsZXI6OnN0YXJ0 RHJhZyk6CisgICAgICAgICogVUlQcm9jZXNzL2d0ay9EcmFnQW5kRHJvcEhhbmRsZXIuaDoKKwog MjAxNS0wMy0yNSAgWmFuIERvYmVyc2VrICA8emRvYmVyc2VrQGlnYWxpYS5jb20+CiAKICAgICAg ICAgW1dLMl0gV2ViVXNlck1lZGlhQ2xpZW50OjpwYWdlRGVzdHJveWVkKCkgdmlydHVhbCBtZXRo b2Qgc2hvdWxkIGJlIG1hcmtlZCBhcyBvdmVycmlkZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlldy5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3LmNwcAppbmRleCBhNTg3ODk3Li5jZDZkYTRh IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJW aWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJW aWV3LmNwcApAQCAtNjIsNyArNjIsNiBAQAogI2luY2x1ZGUgIldlYktpdFdpbmRvd1Byb3BlcnRp ZXNQcml2YXRlLmgiCiAjaW5jbHVkZSA8SmF2YVNjcmlwdENvcmUvQVBJQ2FzdC5oPgogI2luY2x1 ZGUgPFdlYkNvcmUvQ2VydGlmaWNhdGVJbmZvLmg+Ci0jaW5jbHVkZSA8V2ViQ29yZS9EcmFnSWNv bi5oPgogI2luY2x1ZGUgPFdlYkNvcmUvR1VuaXF1ZVB0ckd0ay5oPgogI2luY2x1ZGUgPFdlYkNv cmUvR1VuaXF1ZVB0clNvdXAuaD4KICNpbmNsdWRlIDxXZWJDb3JlL0d0a1V0aWxpdGllcy5oPgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2d0ay9EcmFnQW5kRHJvcEhhbmRs ZXIuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2d0ay9EcmFnQW5kRHJvcEhhbmRsZXIu Y3BwCmluZGV4IDllNDQ2YTguLjhhNmFkYjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9ndGsvRHJhZ0FuZERyb3BIYW5kbGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvZ3RrL0RyYWdBbmREcm9wSGFuZGxlci5jcHAKQEAgLTMxLDcgKzMxLDYgQEAKICNp bmNsdWRlICJXZWJQYWdlUHJveHkuaCIKICNpbmNsdWRlIDxXZWJDb3JlL0RhdGFPYmplY3RHdGsu aD4KICNpbmNsdWRlIDxXZWJDb3JlL0RyYWdEYXRhLmg+Ci0jaW5jbHVkZSA8V2ViQ29yZS9EcmFn SWNvbi5oPgogI2luY2x1ZGUgPFdlYkNvcmUvR1JlZlB0ckd0ay5oPgogI2luY2x1ZGUgPFdlYkNv cmUvR3RrVXRpbGl0aWVzLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9QYXN0ZWJvYXJkSGVscGVyLmg+ CkBAIC0xMjEsOCArMTIwLDkgQEAgdm9pZCBEcmFnQW5kRHJvcEhhbmRsZXI6OnN0YXJ0RHJhZyhj b25zdCBEcmFnRGF0YSYgZHJhZ0RhdGEsIFBhc3NSZWZQdHI8U2hhcmVhYmwKIAogICAgIGlmIChk cmFnSW1hZ2UpIHsKICAgICAgICAgUmVmUHRyPGNhaXJvX3N1cmZhY2VfdD4gaW1hZ2UoZHJhZ0lt YWdlLT5jcmVhdGVDYWlyb1N1cmZhY2UoKSk7Ci0gICAgICAgIG1fZHJhZ0ljb24uc2V0SW1hZ2Uo aW1hZ2UuZ2V0KCkpOwotICAgICAgICBtX2RyYWdJY29uLnVzZUZvckRyYWcoY29udGV4dCk7Cisg ICAgICAgIC8vIFVzZSB0aGUgY2VudGVyIG9mIHRoZSBkcmFnIGltYWdlIGFzIGhvdHNwb3QuCisg ICAgICAgIGNhaXJvX3N1cmZhY2Vfc2V0X2RldmljZV9vZmZzZXQoaW1hZ2UuZ2V0KCksIC1jYWly b19pbWFnZV9zdXJmYWNlX2dldF93aWR0aChpbWFnZS5nZXQoKSkgLyAyLCAtY2Fpcm9faW1hZ2Vf c3VyZmFjZV9nZXRfaGVpZ2h0KGltYWdlLmdldCgpKSAvIDIpOworICAgICAgICBndGtfZHJhZ19z ZXRfaWNvbl9zdXJmYWNlKGNvbnRleHQsIGltYWdlLmdldCgpKTsKICAgICB9IGVsc2UKICAgICAg ICAgZ3RrX2RyYWdfc2V0X2ljb25fZGVmYXVsdChjb250ZXh0KTsKIH0KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9ndGsvRHJhZ0FuZERyb3BIYW5kbGVyLmggYi9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvZ3RrL0RyYWdBbmREcm9wSGFuZGxlci5oCmluZGV4IDM0ZWY5YzIu LmVlMzI2OTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9ndGsvRHJhZ0Fu ZERyb3BIYW5kbGVyLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2d0ay9EcmFnQW5k RHJvcEhhbmRsZXIuaApAQCAtMjksNyArMjksNyBAQAogI2lmIEVOQUJMRShEUkFHX1NVUFBPUlQp CiAKICNpbmNsdWRlIDxXZWJDb3JlL0RhdGFPYmplY3RHdGsuaD4KLSNpbmNsdWRlIDxXZWJDb3Jl L0RyYWdJY29uLmg+CisjaW5jbHVkZSA8V2ViQ29yZS9JbnRQb2ludC5oPgogI2luY2x1ZGUgPHd0 Zi9IYXNoTWFwLmg+CiAjaW5jbHVkZSA8d3RmL05vbmNvcHlhYmxlLmg+CiAKQEAgLTM4LDcgKzM4 LDYgQEAgdHlwZWRlZiBzdHJ1Y3QgX0d0a1NlbGVjdGlvbkRhdGEgR3RrU2VsZWN0aW9uRGF0YTsK IAogbmFtZXNwYWNlIFdlYkNvcmUgewogY2xhc3MgRHJhZ0RhdGE7Ci1jbGFzcyBJbnRQb2ludDsK IH0KIAogbmFtZXNwYWNlIFdlYktpdCB7CkBAIC03NSw3ICs3NCw2IEBAIHByaXZhdGU6CiAgICAg V2ViQ29yZTo6RGF0YU9iamVjdEd0ayogcmVxdWVzdERyYWdEYXRhKEdka0RyYWdDb250ZXh0Kiwg Y29uc3QgV2ViQ29yZTo6SW50UG9pbnQmIHBvc2l0aW9uLCB1bnNpZ25lZCB0aW1lKTsKIAogICAg IFdlYlBhZ2VQcm94eSYgbV9wYWdlOwotICAgIFdlYkNvcmU6OkRyYWdJY29uIG1fZHJhZ0ljb247 CiAgICAgSGFzaE1hcDxHZGtEcmFnQ29udGV4dCosIHN0ZDo6dW5pcXVlX3B0cjxEcm9wcGluZ0Nv bnRleHQ+PiBtX2Ryb3BwaW5nQ29udGV4dHM7CiAgICAgSGFzaE1hcDxHZGtEcmFnQ29udGV4dCos IFJlZlB0cjxXZWJDb3JlOjpEYXRhT2JqZWN0R3RrPj4gbV9kcmFnZ2luZ0RhdGFPYmplY3RzOwog fTsK