60368 2011-05-06 06:21:52 -0700 [GTK] Implement NetscapePlugin::platformPaint for GTK platform 2011-05-06 09:56:04 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) PC Linux RESOLVED FIXED Gtk P2 Normal --- 1 cgarcia webkit-unassigned mrobinson oldest_to_newest 399472 0 cgarcia 2011-05-06 06:21:52 -0700 There's common code for X11, but the GTK specific part is still missing. 399473 1 92577 cgarcia 2011-05-06 06:23:46 -0700 Created attachment 92577 Patch 399520 2 92577 mrobinson 2011-05-06 08:11:55 -0700 Comment on attachment 92577 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=92577&action=review Looking good. Just a couple comments. > Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp:224 > +#elif PLATFORM(GTK) > + RefPtr<cairo_surface_t> drawableSurface = adoptRef(cairo_xlib_surface_create(x11Display(), > + m_drawable, > + static_cast<NPSetWindowCallbackStruct*>(m_npWindow.ws_info)->visual, > + m_frameRect.width(), > + m_frameRect.height())); Wouldn't it be better to wrap this surface in a Cairo surface after the calls to NPP_HandleEvent and XSync, like Qt? > Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp:267 > + cairo_rectangle(cr, > + m_frameRect.x() + exposedRect.x(), m_frameRect.y() + exposedRect.y(), > + exposedRect.width(), exposedRect.height()); Do you mind just putting this one on one line? 120 character is generally okay. Sorry for the nit. :) 399536 3 cgarcia 2011-05-06 08:54:58 -0700 (In reply to comment #2) > (From update of attachment 92577 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=92577&action=review > > Looking good. Just a couple comments. > > > Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp:224 > > +#elif PLATFORM(GTK) > > + RefPtr<cairo_surface_t> drawableSurface = adoptRef(cairo_xlib_surface_create(x11Display(), > > + m_drawable, > > + static_cast<NPSetWindowCallbackStruct*>(m_npWindow.ws_info)->visual, > > + m_frameRect.width(), > > + m_frameRect.height())); > > Wouldn't it be better to wrap this surface in a Cairo surface after the calls to NPP_HandleEvent and XSync, like Qt? I'm not sure I understand what you mean by "wrap this surface in a Cairo surface". I tried to follow the current webkit1 approach. > > Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp:267 > > + cairo_rectangle(cr, > > + m_frameRect.x() + exposedRect.x(), m_frameRect.y() + exposedRect.y(), > > + exposedRect.width(), exposedRect.height()); > > Do you mind just putting this one on one line? 120 character is generally okay. Sorry for the nit. :) Sure, no problem 399539 4 mrobinson 2011-05-06 09:00:45 -0700 (In reply to comment #3) > > Wouldn't it be better to wrap this surface in a Cairo surface after the calls to NPP_HandleEvent and XSync, like Qt? > I'm not sure I understand what you mean by "wrap this surface in a Cairo surface". I tried to follow the current webkit1 approach. Sorry. I should have said wrap m_drawable in a Cairo surface. In the Qt port they wait until right before blitting to do this. Perhaps it isn't possible with the XLib backend, but couldn't the surface be out of sync according to the API. In any case, I think it's better to mirror the Qt port for clarity, unless it's specifically an error in this case. You could use m_pluginDisplay instead of x11Display() if you did. 399566 5 92591 cgarcia 2011-05-06 09:42:51 -0700 Created attachment 92591 Updated patch 399570 6 92591 mrobinson 2011-05-06 09:46:27 -0700 Comment on attachment 92591 Updated patch Thanks! 399580 7 cgarcia 2011-05-06 09:56:04 -0700 Committed r85953: <http://trac.webkit.org/changeset/85953> 92577 2011-05-06 06:23:46 -0700 2011-05-06 09:42:51 -0700 Patch wk2-netscape-plugin-gtk.diff text/plain 2874 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCAyNzMzZWNjLi5jZDUxMjY4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTUg QEAKIDIwMTEtMDUtMDYgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgogCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtHVEtd IEltcGxlbWVudCBOZXRzY2FwZVBsdWdpbjo6cGxhdGZvcm1QYWludCBmb3IgR1RLIHBsYXRmb3Jt CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MDM2OAor CisgICAgICAgICogV2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBlL3gxMS9OZXRzY2FwZVBsdWdp blgxMS5jcHA6CisgICAgICAgIChXZWJLaXQ6Ok5ldHNjYXBlUGx1Z2luOjpwbGF0Zm9ybVBhaW50 KToKKworMjAxMS0wNS0wNiAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5j b20+CisKICAgICAgICAgVW5yZXZpZXdlZC4gRml4IFdlYktpdDIgR1RLIGJ1aWxkIGFmdGVyIHI4 NTg2MC4KIAogICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1BhZ2VDbGllbnRJbXBsLmg6IEZp eCB0eXBvLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05l dHNjYXBlL3gxMS9OZXRzY2FwZVBsdWdpblgxMS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9j ZXNzL1BsdWdpbnMvTmV0c2NhcGUveDExL05ldHNjYXBlUGx1Z2luWDExLmNwcAppbmRleCBiOGM4 ZjJhLi4wNjU2Yzc4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdp bnMvTmV0c2NhcGUveDExL05ldHNjYXBlUGx1Z2luWDExLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUveDExL05ldHNjYXBlUGx1Z2luWDExLmNwcApA QCAtMzksNiArMzksOSBAQAogI2luY2x1ZGUgPFFQaXhtYXA+CiAjaW5jbHVkZSA8UVgxMUluZm8+ CiAjZWxpZiBQTEFURk9STShHVEspCisjaW5jbHVkZSAiUGxhdGZvcm1Db250ZXh0Q2Fpcm8uaCIK KyNpbmNsdWRlICJSZWZQdHJDYWlyby5oIgorI2luY2x1ZGUgPGNhaXJvL2NhaXJvLXhsaWIuaD4K ICNpbmNsdWRlIDxnZGsvZ2RreC5oPgogI2luY2x1ZGUgPFdlYkNvcmUvR3RrVmVyc2lvbmluZy5o PgogI2VuZGlmCkBAIC0yMTMsNiArMjE2LDEyIEBAIHZvaWQgTmV0c2NhcGVQbHVnaW46OnBsYXRm b3JtUGFpbnQoR3JhcGhpY3NDb250ZXh0KiBjb250ZXh0LCBjb25zdCBJbnRSZWN0JiBkaXJ0CiAj aWYgUExBVEZPUk0oUVQpCiAgICAgUVBhaW50ZXIqIHBhaW50ZXIgPSBjb250ZXh0LT5wbGF0Zm9y bUNvbnRleHQoKTsKICAgICBwYWludGVyLT50cmFuc2xhdGUobV9mcmFtZVJlY3QueCgpLCBtX2Zy YW1lUmVjdC55KCkpOworI2VsaWYgUExBVEZPUk0oR1RLKQorICAgIFJlZlB0cjxjYWlyb19zdXJm YWNlX3Q+IGRyYXdhYmxlU3VyZmFjZSA9IGFkb3B0UmVmKGNhaXJvX3hsaWJfc3VyZmFjZV9jcmVh dGUoeDExRGlzcGxheSgpLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbV9kcmF3YWJsZSwKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIHN0YXRpY19jYXN0PE5QU2V0V2luZG93Q2FsbGJhY2tTdHJ1 Y3QqPihtX25wV2luZG93LndzX2luZm8pLT52aXN1YWwsCisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBtX2ZyYW1lUmVjdC53aWR0aCgpLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbV9mcmFtZVJl Y3QuaGVpZ2h0KCkpKTsKICNlbHNlCiAgICAgbm90SW1wbGVtZW50ZWQoKTsKICAgICByZXR1cm47 CkBAIC0yNDcsNiArMjU2LDIwIEBAIHZvaWQgTmV0c2NhcGVQbHVnaW46OnBsYXRmb3JtUGFpbnQo R3JhcGhpY3NDb250ZXh0KiBjb250ZXh0LCBjb25zdCBJbnRSZWN0JiBkaXJ0CiAgICAgcGFpbnRl ci0+ZHJhd1BpeG1hcChRUG9pbnQoZXhwb3NlZFJlY3QueCgpLCBleHBvc2VkUmVjdC55KCkpLCBx dERyYXdhYmxlLCBleHBvc2VkUmVjdCk7CiAKICAgICBwYWludGVyLT50cmFuc2xhdGUoLW1fZnJh bWVSZWN0LngoKSwgLW1fZnJhbWVSZWN0LnkoKSk7CisjZWxpZiBQTEFURk9STShHVEspCisgICAg Y2Fpcm9fdCogY3IgPSBjb250ZXh0LT5wbGF0Zm9ybUNvbnRleHQoKS0+Y3IoKTsKKyAgICBjYWly b19zYXZlKGNyKTsKKworICAgIGNhaXJvX3NldF9zb3VyY2Vfc3VyZmFjZShjciwgZHJhd2FibGVT dXJmYWNlLmdldCgpLCBtX2ZyYW1lUmVjdC54KCksIG1fZnJhbWVSZWN0LnkoKSk7CisKKyAgICBj YWlyb19yZWN0YW5nbGUoY3IsCisgICAgICAgICAgICAgICAgICAgIG1fZnJhbWVSZWN0LngoKSAr IGV4cG9zZWRSZWN0LngoKSwgbV9mcmFtZVJlY3QueSgpICsgZXhwb3NlZFJlY3QueSgpLAorICAg ICAgICAgICAgICAgICAgICBleHBvc2VkUmVjdC53aWR0aCgpLCBleHBvc2VkUmVjdC5oZWlnaHQo KSk7CisgICAgY2Fpcm9fY2xpcChjcik7CisgICAgY2Fpcm9fc2V0X29wZXJhdG9yKGNyLCBDQUlS T19PUEVSQVRPUl9TT1VSQ0UpOworICAgIGNhaXJvX3BhaW50KGNyKTsKKworICAgIGNhaXJvX3Jl c3RvcmUoY3IpOwogI2VuZGlmCiB9CiAK 92591 2011-05-06 09:42:51 -0700 2011-05-06 09:46:26 -0700 Updated patch wk2-netscape-plugin-gtk2.diff text/plain 2838 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCAwNGFiNjFlLi41MjkyZDc2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTUg QEAKIDIwMTEtMDUtMDYgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgogCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtHVEtd IEltcGxlbWVudCBOZXRzY2FwZVBsdWdpbjo6cGxhdGZvcm1QYWludCBmb3IgR1RLIHBsYXRmb3Jt CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MDM2OAor CisgICAgICAgICogV2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBlL3gxMS9OZXRzY2FwZVBsdWdp blgxMS5jcHA6CisgICAgICAgIChXZWJLaXQ6Ok5ldHNjYXBlUGx1Z2luOjpwbGF0Zm9ybVBhaW50 KToKKworMjAxMS0wNS0wNiAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5j b20+CisKICAgICAgICAgUmV2aWV3ZWQgYnkgTWFydGluIFJvYmluc29uLgogCiAgICAgICAgIFNo YXJlIFBsdWdpbkluZm9TdG9yZSBpbXBsZW1lbnRhdGlvbiBiZXR3ZWVuIFF0IGFuZCBHVEsgcG9y dHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9OZXRzY2Fw ZS94MTEvTmV0c2NhcGVQbHVnaW5YMTEuY3BwIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9Q bHVnaW5zL05ldHNjYXBlL3gxMS9OZXRzY2FwZVBsdWdpblgxMS5jcHAKaW5kZXggYjhjOGYyYS4u ZDcxM2U2MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05l dHNjYXBlL3gxMS9OZXRzY2FwZVBsdWdpblgxMS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvV2Vi UHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBlL3gxMS9OZXRzY2FwZVBsdWdpblgxMS5jcHAKQEAgLTM5 LDYgKzM5LDkgQEAKICNpbmNsdWRlIDxRUGl4bWFwPgogI2luY2x1ZGUgPFFYMTFJbmZvPgogI2Vs aWYgUExBVEZPUk0oR1RLKQorI2luY2x1ZGUgIlBsYXRmb3JtQ29udGV4dENhaXJvLmgiCisjaW5j bHVkZSAiUmVmUHRyQ2Fpcm8uaCIKKyNpbmNsdWRlIDxjYWlyby9jYWlyby14bGliLmg+CiAjaW5j bHVkZSA8Z2RrL2dka3guaD4KICNpbmNsdWRlIDxXZWJDb3JlL0d0a1ZlcnNpb25pbmcuaD4KICNl bmRpZgpAQCAtMjEzLDcgKzIxNiw3IEBAIHZvaWQgTmV0c2NhcGVQbHVnaW46OnBsYXRmb3JtUGFp bnQoR3JhcGhpY3NDb250ZXh0KiBjb250ZXh0LCBjb25zdCBJbnRSZWN0JiBkaXJ0CiAjaWYgUExB VEZPUk0oUVQpCiAgICAgUVBhaW50ZXIqIHBhaW50ZXIgPSBjb250ZXh0LT5wbGF0Zm9ybUNvbnRl eHQoKTsKICAgICBwYWludGVyLT50cmFuc2xhdGUobV9mcmFtZVJlY3QueCgpLCBtX2ZyYW1lUmVj dC55KCkpOwotI2Vsc2UKKyNlbGlmICFQTEFURk9STShHVEspCiAgICAgbm90SW1wbGVtZW50ZWQo KTsKICAgICByZXR1cm47CiAjZW5kaWYKQEAgLTI0Nyw2ICsyNTAsMjMgQEAgdm9pZCBOZXRzY2Fw ZVBsdWdpbjo6cGxhdGZvcm1QYWludChHcmFwaGljc0NvbnRleHQqIGNvbnRleHQsIGNvbnN0IElu dFJlY3QmIGRpcnQKICAgICBwYWludGVyLT5kcmF3UGl4bWFwKFFQb2ludChleHBvc2VkUmVjdC54 KCksIGV4cG9zZWRSZWN0LnkoKSksIHF0RHJhd2FibGUsIGV4cG9zZWRSZWN0KTsKIAogICAgIHBh aW50ZXItPnRyYW5zbGF0ZSgtbV9mcmFtZVJlY3QueCgpLCAtbV9mcmFtZVJlY3QueSgpKTsKKyNl bGlmIFBMQVRGT1JNKEdUSykKKyAgICBSZWZQdHI8Y2Fpcm9fc3VyZmFjZV90PiBkcmF3YWJsZVN1 cmZhY2UgPSBhZG9wdFJlZihjYWlyb194bGliX3N1cmZhY2VfY3JlYXRlKG1fcGx1Z2luRGlzcGxh eSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1fZHJhd2FibGUsCisgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBzdGF0aWNfY2FzdDxOUFNldFdpbmRvd0NhbGxiYWNrU3RydWN0Kj4obV9ucFdpbmRv dy53c19pbmZvKS0+dmlzdWFsLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbV9mcmFtZVJlY3Qu d2lkdGgoKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1fZnJhbWVSZWN0LmhlaWdodCgpKSk7 CisgICAgY2Fpcm9fdCogY3IgPSBjb250ZXh0LT5wbGF0Zm9ybUNvbnRleHQoKS0+Y3IoKTsKKyAg ICBjYWlyb19zYXZlKGNyKTsKKworICAgIGNhaXJvX3NldF9zb3VyY2Vfc3VyZmFjZShjciwgZHJh d2FibGVTdXJmYWNlLmdldCgpLCBtX2ZyYW1lUmVjdC54KCksIG1fZnJhbWVSZWN0LnkoKSk7CisK KyAgICBjYWlyb19yZWN0YW5nbGUoY3IsIG1fZnJhbWVSZWN0LngoKSArIGV4cG9zZWRSZWN0Lngo KSwgbV9mcmFtZVJlY3QueSgpICsgZXhwb3NlZFJlY3QueSgpLCBleHBvc2VkUmVjdC53aWR0aCgp LCBleHBvc2VkUmVjdC5oZWlnaHQoKSk7CisgICAgY2Fpcm9fY2xpcChjcik7CisgICAgY2Fpcm9f c2V0X29wZXJhdG9yKGNyLCBDQUlST19PUEVSQVRPUl9TT1VSQ0UpOworICAgIGNhaXJvX3BhaW50 KGNyKTsKKworICAgIGNhaXJvX3Jlc3RvcmUoY3IpOwogI2VuZGlmCiB9CiAK