40989 2010-06-22 09:05:20 -0700 [GTK] Small code cleanup in RenderThemeGtk 2010-06-24 14:29:46 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 mrobinson webkit-unassigned oldest_to_newest 241282 0 mrobinson 2010-06-22 09:05:20 -0700 This patch will simplify the logic a bit in the paintMozillaGtkWidget function, reducing the amount of duplicated code slightly and adding a few more comments. 241299 1 59381 mrobinson 2010-06-22 09:52:33 -0700 Created attachment 59381 Cleanup patch 242619 2 59381 xan.lopez 2010-06-24 12:16:47 -0700 Comment on attachment 59381 Cleanup patch alright! 242665 3 59381 mrobinson 2010-06-24 14:29:42 -0700 Comment on attachment 59381 Cleanup patch Clearing flags on attachment: 59381 Committed r61785: <http://trac.webkit.org/changeset/61785> 242666 4 mrobinson 2010-06-24 14:29:46 -0700 All reviewed patches have been landed. Closing bug. 59381 2010-06-22 09:52:33 -0700 2010-06-24 14:29:42 -0700 Cleanup patch bug-40989-20100622095231.patch text/plain 6410 mrobinson ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NTY0NmIyYzZhY2NlOGQ3ZDJjNDdmZTFhMzgwYTVjYzc4NjA4YjNmZi4uMDlmMDVjNmRkOGU1Yzgy MDA4OTdjN2E0OTdlZDJkOWVlOTJkNjBhMiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAxMC0wNi0yMiAgTWFy dGluIFJvYmluc29uICA8bXJvYmluc29uQGlnYWxpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW0dUS10gU21hbGwgY29kZSBjbGVhbnVwIGlu IFJlbmRlclRoZW1lR3RrCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD00MDk4OQorCisgICAgICAgIFJlZHVjZSB0aGUgYW1vdW50IG9mIGR1cGxpY2F0ZWQg Y29kZSBzbGlnaHRseSBhbmQgcHJlcGFyZSB0aGlzIHNlY3Rpb24gZm9yCisgICAgICAgIGZ1dHVy ZSBpbXByb3ZlbWVudHMsIHN1Y2ggYXMgc2hhcmluZyB0aGUgY2xpcHBpbmcgcmVjdGFuZ2xlIGNh bGN1bGF0aW9uIHdpdGgKKyAgICAgICAgdGhlIHNsb3cgcGF0aC4KKworICAgICAgICBObyBuZXcg dGVzdHMgYXMgZnVuY3Rpb25hbGl0eSBoYXMgbm90IGNoYW5nZWQuCisKKyAgICAgICAgKiBwbGF0 Zm9ybS9ndGsvUmVuZGVyVGhlbWVHdGsuY3BwOgorICAgICAgICAoV2ViQ29yZTo6cGFpbnRNb3pp bGxhR3RrV2lkZ2V0KTogU21hbGwgY29kZSBjbGVhbnVwLgorCiAyMDEwLTA2LTE4ICBBbmRlcnMg Q2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFu IEJlcm5zdGVpbi4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1JlbmRlclRoZW1l R3RrLmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1JlbmRlclRoZW1lR3RrLmNwcAppbmRleCA2 MjA1ZGJkZTQ3NzM5ZDkxYzVmOTgxOTExNjJlODUwYjllOTE1ZTdlLi43NWZiOTQ2MjE4NGI2OTky YTZhMTliOGFjOGRlOTgxM2UzMTI3YmFjIDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL2d0 ay9SZW5kZXJUaGVtZUd0ay5jcHAKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvUmVuZGVyVGhl bWVHdGsuY3BwCkBAIC0yOTksNzcgKzI5OSw2MyBAQCBzdGF0aWMgdm9pZCBzZXRNb3ppbGxhU3Rh dGUoY29uc3QgUmVuZGVyVGhlbWUqIHRoZW1lLCBHdGtUaGVtZVdpZGdldFR5cGUgdHlwZSwgUgog CiBzdGF0aWMgYm9vbCBwYWludE1vemlsbGFHdGtXaWRnZXQoY29uc3QgUmVuZGVyVGhlbWVHdGsq IHRoZW1lLCBHdGtUaGVtZVdpZGdldFR5cGUgdHlwZSwgUmVuZGVyT2JqZWN0KiBvLCBjb25zdCBS ZW5kZXJPYmplY3Q6OlBhaW50SW5mbyYgaSwgY29uc3QgSW50UmVjdCYgcmVjdCkKIHsKLSAgICBH UmVmUHRyPEdka0RyYXdhYmxlPiBwaXhtYXA7Ci0KICAgICAvLyBQYWludGluZyBpcyBkaXNhYmxl ZCBzbyBqdXN0IGNsYWltIHRvIGhhdmUgc3VjY2VlZGVkCiAgICAgaWYgKGkuY29udGV4dC0+cGFp bnRpbmdEaXNhYmxlZCgpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICAvLyBObyBHZGtX aW5kb3cgdG8gcmVuZGVyIHRvLCBzbyByZXR1cm4gdHJ1ZSB0byBmYWxsIGJhY2sKLSAgICBpZiAo IWkuY29udGV4dC0+Z2RrRHJhd2FibGUoKSkKLSAgICAgICAgLy8gVGhpcyBpcyBzbG93LCB1c2Vk IG9ubHkgZHVyaW5nIHByaW50aW5nIHByb2Nlc3MKLSAgICAgICAgcGl4bWFwID0gYWRvcHRHUmVm KGdka19waXhtYXBfbmV3KDAsIHJlY3Qud2lkdGgoKSwgcmVjdC5oZWlnaHQoKSwgZ2RrX3Zpc3Vh bF9nZXRfc3lzdGVtKCktPmRlcHRoKSk7Ci0KLSAgICBHdGtXaWRnZXRTdGF0ZSBtb3pTdGF0ZTsK LSAgICBzZXRNb3ppbGxhU3RhdGUodGhlbWUsIHR5cGUsIG8sICZtb3pTdGF0ZSk7Ci0KLSAgICBp bnQgZmxhZ3M7CisgICAgR3RrV2lkZ2V0U3RhdGUgd2lkZ2V0U3RhdGU7CisgICAgc2V0TW96aWxs YVN0YXRlKHRoZW1lLCB0eXBlLCBvLCAmd2lkZ2V0U3RhdGUpOwogCiAgICAgLy8gV2UgbWlnaHQg d2FudCB0byBtYWtlIHNldHRpbmcgZmxhZ3MgdGhlIGNhbGxlcidzIGpvYiBhdCBzb21lIHBvaW50 IHJhdGhlciB0aGFuIGRvaW5nIGl0IGhlcmUuCi0gICAgc3dpdGNoICh0eXBlKSB7Ci0gICAgY2Fz ZSBNT1pfR1RLX0JVVFRPTjoKKyAgICBpbnQgZmxhZ3MgPSAwOworICAgIGlmICh0eXBlID09IE1P Wl9HVEtfQlVUVE9OKQogICAgICAgICBmbGFncyA9IEdUS19SRUxJRUZfTk9STUFMOwotICAgICAg ICBicmVhazsKLSAgICBjYXNlIE1PWl9HVEtfQ0hFQ0tCVVRUT046Ci0gICAgY2FzZSBNT1pfR1RL X1JBRElPQlVUVE9OOgorICAgIGVsc2UgaWYgKHR5cGUgPT0gTU9aX0dUS19DSEVDS0JVVFRPTiB8 fCB0eXBlID09IE1PWl9HVEtfUkFESU9CVVRUT04pCiAgICAgICAgIGZsYWdzID0gdGhlbWUtPmlz Q2hlY2tlZChvKTsKLSAgICAgICAgYnJlYWs7Ci0gICAgZGVmYXVsdDoKLSAgICAgICAgZmxhZ3Mg PSAwOwotICAgICAgICBicmVhazsKLSAgICB9Ci0KLSAgICBHdGtUZXh0RGlyZWN0aW9uIGRpcmVj dGlvbiA9IGd0a1RleHREaXJlY3Rpb24oby0+c3R5bGUoKS0+ZGlyZWN0aW9uKCkpOwogCi0gICAg aWYgKHBpeG1hcCkgewotICAgICAgICBHZGtSZWN0YW5nbGUgZ2RrUmVjdCA9IEludFJlY3QoMCwg MCwgcmVjdC53aWR0aCgpLCByZWN0LmhlaWdodCgpKTsKKyAgICBHUmVmUHRyPEdka0RyYXdhYmxl PiBkcmF3YWJsZShpLmNvbnRleHQtPmdka0RyYXdhYmxlKCkpOworICAgIEdka1JlY3RhbmdsZSBw YWludFJlY3QsIGNsaXBSZWN0OworICAgIGlmIChkcmF3YWJsZSkgeworICAgICAgICBBZmZpbmVU cmFuc2Zvcm0gY3RtID0gaS5jb250ZXh0LT5nZXRDVE0oKTsKKyAgICAgICAgSW50UG9pbnQgcG9z ID0gY3RtLm1hcFBvaW50KHJlY3QubG9jYXRpb24oKSk7CisgICAgICAgIHBhaW50UmVjdCA9IElu dFJlY3QocG9zLngoKSwgcG9zLnkoKSwgcmVjdC53aWR0aCgpLCByZWN0LmhlaWdodCgpKTsKKwor ICAgICAgICAvLyBJbnRlcnNlY3QgdGhlIGNhaXJvIHJlY3RhbmdsZSB3aXRoIHRoZSB0YXJnZXQg d2lkZ2V0IHJlZ2lvbi4gVGhpcyAgd2lsbAorICAgICAgICAvLyBwcmV2ZW50IHRoZSB0aGVtZSBk cmF3aW5nIGNvZGUgZnJvbSBkcmF3aW5nIGludG8gcmVnaW9ucyB0aGF0IGNhaXJvIHdpbGwKKyAg ICAgICAgLy8gY2xpcCBhbnl3YXkuCisgICAgICAgIGNhaXJvX3QqIGNyID0gaS5jb250ZXh0LT5w bGF0Zm9ybUNvbnRleHQoKTsKKyAgICAgICAgZG91YmxlIGNsaXBYMSwgY2xpcFgyLCBjbGlwWTEs IGNsaXBZMjsKKyAgICAgICAgY2Fpcm9fY2xpcF9leHRlbnRzKGNyLCAmY2xpcFgxLCAmY2xpcFkx LCAmY2xpcFgyLCAmY2xpcFkyKTsKKyAgICAgICAgSW50UG9pbnQgY2xpcFBvcyA9IGN0bS5tYXBQ b2ludChJbnRQb2ludChjbGlwWDEsIGNsaXBZMSkpOworCisgICAgICAgIGNsaXBSZWN0LndpZHRo ID0gY2xpcFgyIC0gY2xpcFgxOworICAgICAgICBjbGlwUmVjdC5oZWlnaHQgPSBjbGlwWTIgLSBj bGlwWTE7CisgICAgICAgIGNsaXBSZWN0LnggPSBjbGlwUG9zLngoKTsKKyAgICAgICAgY2xpcFJl Y3QueSA9IGNsaXBQb3MueSgpOworICAgICAgICBnZGtfcmVjdGFuZ2xlX2ludGVyc2VjdCgmcGFp bnRSZWN0LCAmY2xpcFJlY3QsICZjbGlwUmVjdCk7CiAKLSAgICAgICAgbW96X2d0a191c2VfdGhl bWVfcGFydHModGhlbWUtPnBhcnRzRm9yRHJhd2FibGUocGl4bWFwLmdldCgpKSk7Ci0KLSAgICAg ICAgYm9vbCByZXN1bHQgPSBtb3pfZ3RrX3dpZGdldF9wYWludCh0eXBlLCBwaXhtYXAuZ2V0KCks ICZnZGtSZWN0LCAmZ2RrUmVjdCwgJm1velN0YXRlLCBmbGFncywgZGlyZWN0aW9uKSAhPSBNT1pf R1RLX1NVQ0NFU1M7Ci0KLSAgICAgICAgaWYgKCFyZXN1bHQpIHsKLSAgICAgICAgICAgIGNhaXJv X3QqIGNyID0gaS5jb250ZXh0LT5wbGF0Zm9ybUNvbnRleHQoKTsKLSAgICAgICAgICAgIGdka19j YWlyb19zZXRfc291cmNlX3BpeG1hcChjciwgcGl4bWFwLmdldCgpLCByZWN0LngoKSwgcmVjdC55 KCkpOwotICAgICAgICAgICAgY2Fpcm9fcGFpbnQoY3IpOwotICAgICAgICB9Ci0KLSAgICAgICAg cmV0dXJuIHJlc3VsdDsKKyAgICB9IGVsc2UgeworICAgICAgICAvLyBJbiBzb21lIHNpdHVhdGlv bnMsIGxpa2UgZHVyaW5nIHByaW50IHByZXZpZXdzLCB0aGlzIEdyYXBoaWNzQ29udGV4dCBpcyBu b3QKKyAgICAgICAgLy8gYmFja2VkIGJ5IGEgR2RrRHJhd2FibGUuIEluIHRob3NlIHNpdHVhdGlv bnMsIHdlIHJlbmRlciBvbnRvIGEgcGl4bWFwIGFuZCB0aGVuCisgICAgICAgIC8vIGNvcHkgdGhl IHJlbmRlcmVkIGRhdGEgYmFjayB0byB0aGUgR3JhcGhpY3NDb250ZXh0IHZpYSBDYWlyby4KKyAg ICAgICAgZHJhd2FibGUgPSBhZG9wdEdSZWYoZ2RrX3BpeG1hcF9uZXcoMCwgcmVjdC53aWR0aCgp LCByZWN0LmhlaWdodCgpLCBnZGtfdmlzdWFsX2dldF9zeXN0ZW0oKS0+ZGVwdGgpKTsKKyAgICAg ICAgcGFpbnRSZWN0ID0gY2xpcFJlY3QgPSBJbnRSZWN0KDAsIDAsIHJlY3Qud2lkdGgoKSwgcmVj dC5oZWlnaHQoKSk7CiAgICAgfQogCi0gICAgQWZmaW5lVHJhbnNmb3JtIGN0bSA9IGkuY29udGV4 dC0+Z2V0Q1RNKCk7Ci0KLSAgICBJbnRQb2ludCBwb3MgPSBjdG0ubWFwUG9pbnQocmVjdC5sb2Nh dGlvbigpKTsKLSAgICBHZGtSZWN0YW5nbGUgZ2RrUmVjdCA9IEludFJlY3QocG9zLngoKSwgcG9z LnkoKSwgcmVjdC53aWR0aCgpLCByZWN0LmhlaWdodCgpKTsKLQotICAgIC8vIEZpbmQgdGhlIGNs aXAgcmVjdGFuZ2xlCi0gICAgY2Fpcm9fdCogY3IgPSBpLmNvbnRleHQtPnBsYXRmb3JtQ29udGV4 dCgpOwotICAgIGRvdWJsZSBjbGlwWDEsIGNsaXBYMiwgY2xpcFkxLCBjbGlwWTI7Ci0gICAgY2Fp cm9fY2xpcF9leHRlbnRzKGNyLCAmY2xpcFgxLCAmY2xpcFkxLCAmY2xpcFgyLCAmY2xpcFkyKTsK LQotICAgIEdka1JlY3RhbmdsZSBnZGtDbGlwUmVjdDsKLSAgICBnZGtDbGlwUmVjdC53aWR0aCA9 IGNsaXBYMiAtIGNsaXBYMTsKLSAgICBnZGtDbGlwUmVjdC5oZWlnaHQgPSBjbGlwWTIgLSBjbGlw WTE7Ci0gICAgSW50UG9pbnQgY2xpcFBvcyA9IGN0bS5tYXBQb2ludChJbnRQb2ludChjbGlwWDEs IGNsaXBZMSkpOwotICAgIGdka0NsaXBSZWN0LnggPSBjbGlwUG9zLngoKTsKLSAgICBnZGtDbGlw UmVjdC55ID0gY2xpcFBvcy55KCk7Ci0KLSAgICBnZGtfcmVjdGFuZ2xlX2ludGVyc2VjdCgmZ2Rr UmVjdCwgJmdka0NsaXBSZWN0LCAmZ2RrQ2xpcFJlY3QpOworICAgIG1vel9ndGtfdXNlX3RoZW1l X3BhcnRzKHRoZW1lLT5wYXJ0c0ZvckRyYXdhYmxlKGRyYXdhYmxlLmdldCgpKSk7CisgICAgYm9v bCBzdWNjZXNzID0gbW96X2d0a193aWRnZXRfcGFpbnQodHlwZSwgZHJhd2FibGUuZ2V0KCksICZw YWludFJlY3QsICZjbGlwUmVjdCwgJndpZGdldFN0YXRlLCBmbGFncywgZ3RrVGV4dERpcmVjdGlv bihvLT5zdHlsZSgpLT5kaXJlY3Rpb24oKSkpID09IE1PWl9HVEtfU1VDQ0VTUzsKKworICAgIC8v IElmIHRoZSBkcmF3aW5nIHdhcyBzdWNjZXNzZnVsIGFuZCB3ZSByZW5kZXJlZCBvbnRvIGEgcGl4 bWFwLCBjb3B5IHRoZQorICAgIC8vIHJlc3VsdHMgYmFjayB0byB0aGUgb3JpZ2luYWwgR3JhcGhp Y3NDb250ZXh0LgorICAgIGlmIChzdWNjZXNzICYmICFpLmNvbnRleHQtPmdka0RyYXdhYmxlKCkp IHsKKyAgICAgICAgY2Fpcm9fdCogY2Fpcm9Db250ZXh0ID0gaS5jb250ZXh0LT5wbGF0Zm9ybUNv bnRleHQoKTsKKyAgICAgICAgY2Fpcm9fc2F2ZShjYWlyb0NvbnRleHQpOworICAgICAgICBnZGtf Y2Fpcm9fc2V0X3NvdXJjZV9waXhtYXAoY2Fpcm9Db250ZXh0LCBkcmF3YWJsZS5nZXQoKSwgcmVj dC54KCksIHJlY3QueSgpKTsKKyAgICAgICAgY2Fpcm9fcGFpbnQoY2Fpcm9Db250ZXh0KTsKKyAg ICAgICAgY2Fpcm9fcmVzdG9yZShjYWlyb0NvbnRleHQpOworICAgIH0KIAotICAgIC8vIFNpbmNl IHRoZSB0aGVtZSByZW5kZXJlciBpcyBnb2luZyB0byBiZSBkcmF3aW5nIG9udG8gdGhpcyBHZGtE cmF3YWJsZSwKLSAgICAvLyBzZWxlY3QgdGhlIGFwcHJvcHJpYXRlIHdpZGdldHMgZm9yIHRoZSBk cmF3YWJsZSBkZXB0aC4KLSAgICBtb3pfZ3RrX3VzZV90aGVtZV9wYXJ0cyh0aGVtZS0+cGFydHNG b3JEcmF3YWJsZShpLmNvbnRleHQtPmdka0RyYXdhYmxlKCkpKTsKLSAgICByZXR1cm4gbW96X2d0 a193aWRnZXRfcGFpbnQodHlwZSwgaS5jb250ZXh0LT5nZGtEcmF3YWJsZSgpLCAmZ2RrUmVjdCwg Jmdka0NsaXBSZWN0LCAmbW96U3RhdGUsIGZsYWdzLCBkaXJlY3Rpb24pICE9IE1PWl9HVEtfU1VD Q0VTUzsKKyAgICByZXR1cm4gIXN1Y2Nlc3M7CiB9CiAKIHN0YXRpYyB2b2lkIHNldEJ1dHRvblBh ZGRpbmcoUmVuZGVyU3R5bGUqIHN0eWxlKQo=