47361 2010-10-07 10:22:08 -0700 [GTK] Code cleanup in PluginViewGtk.cpp for transparent plugins 2010-10-07 14:51:29 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC Linux RESOLVED FIXED Gtk P3 Normal --- 1 mrobinson webkit-unassigned alex commit-queue otte xan.lopez oldest_to_newest 291095 0 mrobinson 2010-10-07 10:22:08 -0700 Benjamin Otte has suggested some code cleanup in PluginViewGtk. 291192 1 70132 mrobinson 2010-10-07 12:44:53 -0700 Created attachment 70132 Patch for this issue 291193 2 mrobinson 2010-10-07 12:46:25 -0700 I've uploaded the patch from Benjamin, r+'d it and put it on the commit queue. 291269 3 70132 commit-queue 2010-10-07 14:51:24 -0700 Comment on attachment 70132 Patch for this issue Clearing flags on attachment: 70132 Committed r69344: <http://trac.webkit.org/changeset/69344> 291270 4 commit-queue 2010-10-07 14:51:29 -0700 All reviewed patches have been landed. Closing bug. 70132 2010-10-07 12:44:53 -0700 2010-10-07 14:51:24 -0700 Patch for this issue bug-47361-20101007124451.patch text/plain 4518 mrobinson ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg OGUyMzhiZmEyMzYwYTQxYzExOWZmNmI5ZWFjYjQ5ZWE5MzA5MmFiOC4uNDM1ZTVhNzFhZjM3YTg3 YjIxNTUyMzUxZjZjNTM1Y2YzMzdhZGMwZiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAxMC0xMC0wNyAgQmVu amFtaW4gT3R0ZSAgPG90dGVAZ25vbWUub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFtHVEtdIENvZGUgY2xlYW51cCBpbiBQbHVnaW5WaWV3R3Rr LmNwcCBmb3IgdHJhbnNwYXJlbnQgcGx1Z2lucworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDczNjEKKworICAgICAgICBSZWR1Y2Ugc29tZSBjb2RlIGlu IFBsdWdpblZpZXdHdGsuY3BwIGJ5IGRvaW5nIHRoaW5ncyB3aXRoIENhaXJvIGluc3RlYWQKKyAg ICAgICAgb2YgZGlyZWN0bHkgd2l0aCBYMTEuIFRoaXMgc2hvdWxkIHdvcmsgZmluZSB3aXRoIEdE SyBkb3VibGUtYnVmZmVyaW5nLCBidXQKKyAgICAgICAgaWYgd2UgZXZlciBkaXNhYmxlIGl0LCB3 ZSdsbCBuZWVkIHRvIHZlcmlmeSB0aGF0IHRoaXMgaXMgc3RpbGwgZnVuY3Rpb25pbmcKKyAgICAg ICAgcHJvcGVybHkuCisKKyAgICAgICAgKiBwbHVnaW5zL2d0ay9QbHVnaW5WaWV3R3RrLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlBsdWdpblZpZXc6OnBhaW50KTogRG8gYSBiaXQgb2YgY29kZSBj bGVhbnVwLgorCiAyMDEwLTEwLTA3ICBLd2FuZyBZdWwgU2VvICA8c2t5dWxAY29tcGFueTEwMC5u ZXQ+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgS2VudCBUYW11cmEuCmRpZmYgLS1naXQgYS9XZWJD b3JlL3BsdWdpbnMvZ3RrL1BsdWdpblZpZXdHdGsuY3BwIGIvV2ViQ29yZS9wbHVnaW5zL2d0ay9Q bHVnaW5WaWV3R3RrLmNwcAppbmRleCBlZjA5NzI5Mzg2YmM0OGYxNjQxNTAzMWQ3NmJkMGNhMTgw N2Q5OTI5Li5kMGIzMzk3MzUxNGM3NWU2Y2Q5YzJlMzhlMmQ3M2RlZmZkOTljYzM1IDEwMDY0NAot LS0gYS9XZWJDb3JlL3BsdWdpbnMvZ3RrL1BsdWdpblZpZXdHdGsuY3BwCisrKyBiL1dlYkNvcmUv cGx1Z2lucy9ndGsvUGx1Z2luVmlld0d0ay5jcHAKQEAgLTIwOCw0NyArMjA4LDI4IEBAIHZvaWQg UGx1Z2luVmlldzo6cGFpbnQoR3JhcGhpY3NDb250ZXh0KiBjb250ZXh0LCBjb25zdCBJbnRSZWN0 JiByZWN0KQogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBtX3dpbmRvd1JlY3Qud2lkdGgoKSwKICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbV93aW5kb3dS ZWN0LmhlaWdodCgpKTsKIAotICAgIGlmIChtX2lzVHJhbnNwYXJlbnQgJiYgZHJhd2FibGVEZXB0 aCAhPSAzMikgewotICAgICAgICAvLyBBdHRlbXB0IHRvIGZha2UgaXQgd2hlbiB3ZSBkb24ndCBo YXZlIGFuIGFscGhhIGNoYW5uZWwgb24gb3VyCi0gICAgICAgIC8vIHBpeG1hcC4gIElmIHRoYXQn cyBub3QgcG9zc2libGUsIGF0IGxlYXN0IGNsZWFyIHRoZSB3aW5kb3cgdG8KLSAgICAgICAgLy8g YXZvaWQgZHJhd2luZyBhcnRpZmFjdHMuCi0gICAgICAgIEd0a1dpZGdldCogd2lkZ2V0ID0gbV9w YXJlbnRGcmFtZS0+dmlldygpLT5ob3N0V2luZG93KCktPnBsYXRmb3JtUGFnZUNsaWVudCgpOwot ICAgICAgICBHZGtEcmF3YWJsZSogZ2RrQmFja2luZ1N0b3JlID0gMDsKLSAgICAgICAgZ2ludCB4 b2ZmID0gMCwgeW9mZiA9IDA7Ci0KLSAgICAgICAgZ2RrX3dpbmRvd19nZXRfaW50ZXJuYWxfcGFp bnRfaW5mbyhndGtfd2lkZ2V0X2dldF93aW5kb3cod2lkZ2V0KSwgJmdka0JhY2tpbmdTdG9yZSwg JnhvZmYsICZ5b2ZmKTsKLQotICAgICAgICBHQyBnYyA9IFhEZWZhdWx0R0MoR0RLX0RJU1BMQVko KSwgZ2RrX3NjcmVlbl9nZXRfbnVtYmVyKGdka19zY3JlZW5fZ2V0X2RlZmF1bHQoKSkpOwotICAg ICAgICBpZiAoZ2RrQmFja2luZ1N0b3JlKSB7Ci0gICAgICAgICAgICBYQ29weUFyZWEoR0RLX0RJ U1BMQVkoKSwgR0RLX0RSQVdBQkxFX1hJRChnZGtCYWNraW5nU3RvcmUpLCBtX2RyYXdhYmxlLCBn YywKLSAgICAgICAgICAgICAgICAgICAgICBtX3dpbmRvd1JlY3QueCgpICsgZXhwb3NlZFJlY3Qu eCgpIC0geG9mZiwKLSAgICAgICAgICAgICAgICAgICAgICBtX3dpbmRvd1JlY3QueSgpICsgZXhw b3NlZFJlY3QueSgpIC0geW9mZiwKLSAgICAgICAgICAgICAgICAgICAgICBleHBvc2VkUmVjdC53 aWR0aCgpLCBleHBvc2VkUmVjdC5oZWlnaHQoKSwKLSAgICAgICAgICAgICAgICAgICAgICBleHBv c2VkUmVjdC54KCksIGV4cG9zZWRSZWN0LnkoKSk7Ci0gICAgICAgIH0gZWxzZSB7Ci0gICAgICAg ICAgICAvLyBubyB2YWxpZCBiYWNraW5nIHN0b3JlOyBjbGVhciB0byB0aGUgYmFja2dyb3VuZCBj b2xvcgotICAgICAgICAgICAgWEZpbGxSZWN0YW5nbGUoR0RLX0RJU1BMQVkoKSwgbV9kcmF3YWJs ZSwgZ2MsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICBleHBvc2VkUmVjdC54KCksIGV4cG9z ZWRSZWN0LnkoKSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgIGV4cG9zZWRSZWN0LndpZHRo KCksIGV4cG9zZWRSZWN0LmhlaWdodCgpKTsKLSAgICAgICAgfQotICAgIH0gZWxzZSBpZiAobV9p c1RyYW5zcGFyZW50KSB7CisgICAgaWYgKG1faXNUcmFuc3BhcmVudCkgewogICAgICAgICAvLyBJ ZiB3ZSBoYXZlIGEgMzIgYml0IGRyYXdhYmxlIGFuZCB0aGUgcGx1Z2luIHdhbnRzIHRyYW5zcGFy ZW5jeSwKICAgICAgICAgLy8gd2UnbGwgY2xlYXIgdGhlIGV4cG9zZWQgYXJlYSB0byB0cmFuc3Bh cmVudCBmaXJzdC4gIE90aGVyd2lzZSwKICAgICAgICAgLy8gd2UnZCBlbmQgdXAgd2l0aCBqdW5r IGluIHRoZXJlIGZyb20gdGhlIGxhc3QgcGFpbnQsIG9yLCB3b3JzZSwKICAgICAgICAgLy8gdW5p bml0aWFsaXplZCBkYXRhLgotICAgICAgICBjYWlyb190KiBjckZpbGwgPSBjYWlyb19jcmVhdGUo ZHJhd2FibGVTdXJmYWNlKTsKKyAgICAgICAgUGxhdGZvcm1SZWZQdHI8Y2Fpcm9fdD4gY3IgPSBh ZG9wdFBsYXRmb3JtUmVmKGNhaXJvX2NyZWF0ZShkcmF3YWJsZVN1cmZhY2UpKTsKIAotICAgICAg ICBjYWlyb19zZXRfb3BlcmF0b3IoY3JGaWxsLCBDQUlST19PUEVSQVRPUl9TT1VSQ0UpOwotICAg ICAgICBjYWlyb19wYXR0ZXJuX3QqIGZpbGwgPSBjYWlyb19wYXR0ZXJuX2NyZWF0ZV9yZ2JhKDAu LCAwLiwgMC4sIDAuKTsKLSAgICAgICAgY2Fpcm9fc2V0X3NvdXJjZShjckZpbGwsIGZpbGwpOwor ICAgICAgICBpZiAoIShjYWlyb19zdXJmYWNlX2dldF9jb250ZW50KGRyYXdhYmxlU3VyZmFjZSkg JiBDQUlST19DT05URU5UX0FMUEhBKSkgeworICAgICAgICAgICAgLy8gQXR0ZW1wdCB0byBmYWtl IGl0IHdoZW4gd2UgZG9uJ3QgaGF2ZSBhbiBhbHBoYSBjaGFubmVsIG9uIG91cgorICAgICAgICAg ICAgLy8gcGl4bWFwLiAgSWYgdGhhdCdzIG5vdCBwb3NzaWJsZSwgYXQgbGVhc3QgY2xlYXIgdGhl IHdpbmRvdyB0bworICAgICAgICAgICAgLy8gYXZvaWQgZHJhd2luZyBhcnRpZmFjdHMuCiAKLSAg ICAgICAgY2Fpcm9fcmVjdGFuZ2xlKGNyRmlsbCwgZXhwb3NlZFJlY3QueCgpLCBleHBvc2VkUmVj dC55KCksCi0gICAgICAgICAgICAgICAgICAgICAgICBleHBvc2VkUmVjdC53aWR0aCgpLCBleHBv c2VkUmVjdC5oZWlnaHQoKSk7Ci0gICAgICAgIGNhaXJvX2NsaXAoY3JGaWxsKTsKLSAgICAgICAg Y2Fpcm9fcGFpbnQoY3JGaWxsKTsKKyAgICAgICAgICAgIC8vIFRoaXMgV291bGQgbm90IHdvcmsg d2l0aG91dCBkb3VibGUgYnVmZmVyaW5nLCBidXQgd2UgYWx3YXlzIHVzZSBpdC4KKyAgICAgICAg ICAgIGNhaXJvX3NldF9zb3VyY2Vfc3VyZmFjZShjci5nZXQoKSwgY2Fpcm9fZ2V0X2dyb3VwX3Rh cmdldChjb250ZXh0LT5wbGF0Zm9ybUNvbnRleHQoKSksCisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgLW1fd2luZG93UmVjdC54KCksIC1tX3dpbmRvd1JlY3QueSgpKTsKKyAg ICAgICAgICAgIGNhaXJvX3NldF9vcGVyYXRvcihjci5nZXQoKSwgQ0FJUk9fT1BFUkFUT1JfU09V UkNFKTsKKyAgICAgICAgfSBlbHNlCisgICAgICAgICAgICBjYWlyb19zZXRfb3BlcmF0b3IoY3Iu Z2V0KCksIENBSVJPX09QRVJBVE9SX0NMRUFSKTsKIAotICAgICAgICBjYWlyb19kZXN0cm95KGNy RmlsbCk7Ci0gICAgICAgIGNhaXJvX3BhdHRlcm5fZGVzdHJveShmaWxsKTsKKyAgICAgICAgY2Fp cm9fcmVjdGFuZ2xlKGNyLmdldCgpLCBleHBvc2VkUmVjdC54KCksIGV4cG9zZWRSZWN0LnkoKSwK KyAgICAgICAgICAgICAgICAgICAgICAgIGV4cG9zZWRSZWN0LndpZHRoKCksIGV4cG9zZWRSZWN0 LmhlaWdodCgpKTsKKyAgICAgICAgY2Fpcm9fZmlsbChjci5nZXQoKSk7CiAgICAgfQogCiAgICAg WEV2ZW50IHhldmVudDsK