52054 2011-01-07 05:23:58 -0800 [GTK] Port progressbar painting to GtkStyleContext 2011-01-10 01:10:41 -0800 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 50820 1 cgarcia webkit-unassigned mrobinson oldest_to_newest 330735 0 cgarcia 2011-01-07 05:23:58 -0800 Use GtkStyleContext api to paint progressbarsd when using gtk3 330738 1 78224 cgarcia 2011-01-07 05:32:08 -0800 Created attachment 78224 Use GtkStyleContext API to paint progressbars 331250 2 78224 mrobinson 2011-01-08 12:43:03 -0800 Comment on attachment 78224 Use GtkStyleContext API to paint progressbars View in context: https://bugs.webkit.org/attachment.cgi?id=78224&action=review Looks great, but please see below before landing this. > WebCore/platform/gtk/RenderThemeGtk3.cpp:369 > +static const int progressActivityBlocks = 5; > +static const int progressAnimationFrames = 10; > +static const double progressAnimationInterval = 0.125; Include a comment before these values which explains where they originate from. > WebCore/platform/gtk/RenderThemeGtk3.cpp:411 > + double progress = renderProgress->animationProgress(); I think this should be called animationProgress, to avoid confusing it with the actual progress position. Please just rename before landing. Thanks! 331534 3 cgarcia 2011-01-10 01:10:18 -0800 Committed r75364: <http://trac.webkit.org/changeset/75364> 78224 2011-01-07 05:32:08 -0800 2011-01-10 01:10:41 -0800 Use GtkStyleContext API to paint progressbars style-context-progressbars.diff text/plain 6925 cgarcia ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MzRhNjAwZi4uY2MyZjgzOCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNCBAQAorMjAxMS0wMS0wNyAgQ2FybG9zIEdhcmNp YSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgW0dUS10gUG9ydCBwcm9ncmVzc2JhciBwYWludGluZyB0 byBHdGtTdHlsZUNvbnRleHQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTUyMDU0CisKKyAgICAgICAgVXNlIEd0a1N0eWxlQ29udGV4dCBBUEkgdG8gcGFp bnQgcHJvZ3Jlc3NiYXJzIHdoZW4gYnVpbGRpbmcgd2l0aAorICAgICAgICBHVEsrIDMueC4gQWxz byBhZGQgc3VwcG9ydCBmb3IgaW5kZXRlcm1pbmF0ZSBwcm9ncmVzc2JhcnMuCisKKyAgICAgICAg Tm8gbmV3IHRlc3RzLiBUaGlzIHNob3VsZCBub3QgY2hhbmdlIGZ1bmN0aW9uYWxpdHkuCisKKyAg ICAgICAgKiBwbGF0Zm9ybS9ndGsvUmVuZGVyVGhlbWVHdGsuY3BwOgorICAgICAgICAqIHBsYXRm b3JtL2d0ay9SZW5kZXJUaGVtZUd0azIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGhl bWVHdGs6OmFuaW1hdGlvblJlcGVhdEludGVydmFsRm9yUHJvZ3Jlc3NCYXIpOgorICAgICAgICAo V2ViQ29yZTo6UmVuZGVyVGhlbWVHdGs6OmFuaW1hdGlvbkR1cmF0aW9uRm9yUHJvZ3Jlc3NCYXIp OgorICAgICAgICAqIHBsYXRmb3JtL2d0ay9SZW5kZXJUaGVtZUd0azMuY3BwOgorICAgICAgICAo V2ViQ29yZTo6UmVuZGVyVGhlbWVHdGs6OmFuaW1hdGlvblJlcGVhdEludGVydmFsRm9yUHJvZ3Jl c3NCYXIpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGhlbWVHdGs6OmFuaW1hdGlvbkR1cmF0 aW9uRm9yUHJvZ3Jlc3NCYXIpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGhlbWVHdGs6OnBh aW50UHJvZ3Jlc3NCYXIpOgorCiAyMDExLTAxLTA2ICBBZGFtIEJhcnRoICA8YWJhcnRoQHdlYmtp dC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCmRpZmYgLS1naXQgYS9X ZWJDb3JlL3BsYXRmb3JtL2d0ay9SZW5kZXJUaGVtZUd0ay5jcHAgYi9XZWJDb3JlL3BsYXRmb3Jt L2d0ay9SZW5kZXJUaGVtZUd0ay5jcHAKaW5kZXggNzA0YTU1Yy4uMzY0NTIzYiAxMDA2NDQKLS0t IGEvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvUmVuZGVyVGhlbWVHdGsuY3BwCisrKyBiL1dlYkNvcmUv cGxhdGZvcm0vZ3RrL1JlbmRlclRoZW1lR3RrLmNwcApAQCAtNTY1LDIwICs1NjUsNiBAQCBib29s IFJlbmRlclRoZW1lR3RrOjpwYWludE1lZGlhQ3VycmVudFRpbWUoUmVuZGVyT2JqZWN0KiByZW5k ZXJPYmplY3QsIGNvbnN0IFBhaQogI2VuZGlmCiAKICNpZiBFTkFCTEUoUFJPR1JFU1NfVEFHKQot ZG91YmxlIFJlbmRlclRoZW1lR3RrOjphbmltYXRpb25SZXBlYXRJbnRlcnZhbEZvclByb2dyZXNz QmFyKFJlbmRlclByb2dyZXNzKikgY29uc3QKLXsKLSAgICAvLyBGSVhNRTogSXQgZG9lc24ndCBs b29rIGxpa2UgdGhlcmUgaXMgYSBnb29kIHdheSB5ZXQgdG8gc3VwcG9ydCBhbmltYXRlZAotICAg IC8vIHByb2dyZXNzIGJhcnMgd2l0aCB0aGUgTW96aWxsYSB0aGVtZSBkcmF3aW5nIGNvZGUuCi0g ICAgcmV0dXJuIDA7Ci19Ci0KLWRvdWJsZSBSZW5kZXJUaGVtZUd0azo6YW5pbWF0aW9uRHVyYXRp b25Gb3JQcm9ncmVzc0JhcihSZW5kZXJQcm9ncmVzcyopIGNvbnN0Ci17Ci0gICAgLy8gRklYTUU6 IEl0IGRvZXNuJ3QgbG9vayBsaWtlIHRoZXJlIGlzIGEgZ29vZCB3YXkgeWV0IHRvIHN1cHBvcnQg YW5pbWF0ZWQKLSAgICAvLyBwcm9ncmVzcyBiYXJzIHdpdGggdGhlIE1vemlsbGEgdGhlbWUgZHJh d2luZyBjb2RlLgotICAgIHJldHVybiAwOwotfQotCiB2b2lkIFJlbmRlclRoZW1lR3RrOjphZGp1 c3RQcm9ncmVzc0JhclN0eWxlKENTU1N0eWxlU2VsZWN0b3IqLCBSZW5kZXJTdHlsZSogc3R5bGUs IEVsZW1lbnQqKSBjb25zdAogewogICAgIHN0eWxlLT5zZXRCb3hTaGFkb3coMCk7CmRpZmYgLS1n aXQgYS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9SZW5kZXJUaGVtZUd0azIuY3BwIGIvV2ViQ29yZS9w bGF0Zm9ybS9ndGsvUmVuZGVyVGhlbWVHdGsyLmNwcAppbmRleCAxNjg0OWQ0Li5hOTUwNDI3IDEw MDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9SZW5kZXJUaGVtZUd0azIuY3BwCisrKyBi L1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1JlbmRlclRoZW1lR3RrMi5jcHAKQEAgLTMyOSw2ICszMjks MjAgQEAgdm9pZCBSZW5kZXJUaGVtZUd0azo6YWRqdXN0U2xpZGVyVGh1bWJTaXplKFJlbmRlck9i amVjdCogbykgY29uc3QKIH0KIAogI2lmIEVOQUJMRShQUk9HUkVTU19UQUcpCitkb3VibGUgUmVu ZGVyVGhlbWVHdGs6OmFuaW1hdGlvblJlcGVhdEludGVydmFsRm9yUHJvZ3Jlc3NCYXIoUmVuZGVy UHJvZ3Jlc3MqKSBjb25zdAoreworICAgIC8vIEZJWE1FOiBJdCBkb2Vzbid0IGxvb2sgbGlrZSB0 aGVyZSBpcyBhIGdvb2Qgd2F5IHlldCB0byBzdXBwb3J0IGFuaW1hdGVkCisgICAgLy8gcHJvZ3Jl c3MgYmFycyB3aXRoIHRoZSBNb3ppbGxhIHRoZW1lIGRyYXdpbmcgY29kZS4KKyAgICByZXR1cm4g MDsKK30KKworZG91YmxlIFJlbmRlclRoZW1lR3RrOjphbmltYXRpb25EdXJhdGlvbkZvclByb2dy ZXNzQmFyKFJlbmRlclByb2dyZXNzKikgY29uc3QKK3sKKyAgICAvLyBGSVhNRTogSXQgZG9lc24n dCBsb29rIGxpa2UgdGhlcmUgaXMgYSBnb29kIHdheSB5ZXQgdG8gc3VwcG9ydCBhbmltYXRlZAor ICAgIC8vIHByb2dyZXNzIGJhcnMgd2l0aCB0aGUgTW96aWxsYSB0aGVtZSBkcmF3aW5nIGNvZGUu CisgICAgcmV0dXJuIDA7Cit9CisKIGJvb2wgUmVuZGVyVGhlbWVHdGs6OnBhaW50UHJvZ3Jlc3NC YXIoUmVuZGVyT2JqZWN0KiByZW5kZXJPYmplY3QsIGNvbnN0IFBhaW50SW5mbyYgcGFpbnRJbmZv LCBjb25zdCBJbnRSZWN0JiByZWN0KQogewogICAgIGlmICghcmVuZGVyT2JqZWN0LT5pc1Byb2dy ZXNzKCkpCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9SZW5kZXJUaGVtZUd0azMu Y3BwIGIvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvUmVuZGVyVGhlbWVHdGszLmNwcAppbmRleCBhMzdh YmM3Li42OWUxZTBhIDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9SZW5kZXJUaGVt ZUd0azMuY3BwCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1JlbmRlclRoZW1lR3RrMy5jcHAK QEAgLTM2NCwzMSArMzY0LDY2IEBAIHZvaWQgUmVuZGVyVGhlbWVHdGs6OmFkanVzdFNsaWRlclRo dW1iU2l6ZShSZW5kZXJPYmplY3QqIG8pIGNvbnN0CiB9CiAKICNpZiBFTkFCTEUoUFJPR1JFU1Nf VEFHKQorc3RhdGljIGNvbnN0IGludCBwcm9ncmVzc0FjdGl2aXR5QmxvY2tzID0gNTsKK3N0YXRp YyBjb25zdCBpbnQgcHJvZ3Jlc3NBbmltYXRpb25GcmFtZXMgPSAxMDsKK3N0YXRpYyBjb25zdCBk b3VibGUgcHJvZ3Jlc3NBbmltYXRpb25JbnRlcnZhbCA9IDAuMTI1OworZG91YmxlIFJlbmRlclRo ZW1lR3RrOjphbmltYXRpb25SZXBlYXRJbnRlcnZhbEZvclByb2dyZXNzQmFyKFJlbmRlclByb2dy ZXNzKikgY29uc3QKK3sKKyAgICByZXR1cm4gcHJvZ3Jlc3NBbmltYXRpb25JbnRlcnZhbDsKK30K KworZG91YmxlIFJlbmRlclRoZW1lR3RrOjphbmltYXRpb25EdXJhdGlvbkZvclByb2dyZXNzQmFy KFJlbmRlclByb2dyZXNzKikgY29uc3QKK3sKKyAgICByZXR1cm4gcHJvZ3Jlc3NBbmltYXRpb25J bnRlcnZhbCAqIHByb2dyZXNzQW5pbWF0aW9uRnJhbWVzICogMjsgLy8gIjIiIGZvciBiYWNrIGFu ZCBmb3J0aDsKK30KKwogYm9vbCBSZW5kZXJUaGVtZUd0azo6cGFpbnRQcm9ncmVzc0JhcihSZW5k ZXJPYmplY3QqIHJlbmRlck9iamVjdCwgY29uc3QgUGFpbnRJbmZvJiBwYWludEluZm8sIGNvbnN0 IEludFJlY3QmIHJlY3QpCiB7CiAgICAgaWYgKCFyZW5kZXJPYmplY3QtPmlzUHJvZ3Jlc3MoKSkK ICAgICAgICAgcmV0dXJuIHRydWU7CiAKLSAgICBHdGtXaWRnZXQqIHByb2dyZXNzQmFyV2lkZ2V0 ID0gbW96X2d0a19nZXRfcHJvZ3Jlc3Nfd2lkZ2V0KCk7Ci0gICAgaWYgKCFwcm9ncmVzc0Jhcldp ZGdldCkKLSAgICAgICAgcmV0dXJuIHRydWU7CisgICAgR3RrU3R5bGVDb250ZXh0KiBjb250ZXh0 ID0gZ2V0U3R5bGVDb250ZXh0KEdUS19UWVBFX1BST0dSRVNTX0JBUik7CisgICAgZ3RrX3N0eWxl X2NvbnRleHRfc2F2ZShjb250ZXh0KTsKIAotICAgIGlmIChwYWludFJlbmRlck9iamVjdChNT1pf R1RLX1BST0dSRVNTQkFSLCByZW5kZXJPYmplY3QsIHBhaW50SW5mby5jb250ZXh0LCByZWN0KSkK LSAgICAgICAgcmV0dXJuIHRydWU7CisgICAgZ3RrX3N0eWxlX2NvbnRleHRfYWRkX2NsYXNzKGNv bnRleHQsIEdUS19TVFlMRV9DTEFTU19UUk9VR0gpOworCisgICAgZ3RrX3JlbmRlcl9iYWNrZ3Jv dW5kKGNvbnRleHQsIHBhaW50SW5mby5jb250ZXh0LT5wbGF0Zm9ybUNvbnRleHQoKSwgcmVjdC54 KCksIHJlY3QueSgpLCByZWN0LndpZHRoKCksIHJlY3QuaGVpZ2h0KCkpOworICAgIGd0a19yZW5k ZXJfZnJhbWUoY29udGV4dCwgcGFpbnRJbmZvLmNvbnRleHQtPnBsYXRmb3JtQ29udGV4dCgpLCBy ZWN0LngoKSwgcmVjdC55KCksIHJlY3Qud2lkdGgoKSwgcmVjdC5oZWlnaHQoKSk7CisKKyAgICBn dGtfc3R5bGVfY29udGV4dF9yZXN0b3JlKGNvbnRleHQpOworCisgICAgZ3RrX3N0eWxlX2NvbnRl eHRfc2F2ZShjb250ZXh0KTsKKyAgICBndGtfc3R5bGVfY29udGV4dF9hZGRfY2xhc3MoY29udGV4 dCwgR1RLX1NUWUxFX0NMQVNTX1BST0dSRVNTQkFSKTsKIAotICAgIEludFJlY3QgY2h1bmtSZWN0 KHJlY3QpOwogICAgIFJlbmRlclByb2dyZXNzKiByZW5kZXJQcm9ncmVzcyA9IHRvUmVuZGVyUHJv Z3Jlc3MocmVuZGVyT2JqZWN0KTsKIAotICAgIEd0a1N0eWxlKiBzdHlsZSA9IGd0a193aWRnZXRf Z2V0X3N0eWxlKHByb2dyZXNzQmFyV2lkZ2V0KTsKLSAgICBjaHVua1JlY3Quc2V0SGVpZ2h0KGNo dW5rUmVjdC5oZWlnaHQoKSAtICgyICogc3R5bGUtPnl0aGlja25lc3MpKTsKLSAgICBjaHVua1Jl Y3Quc2V0WShjaHVua1JlY3QueSgpICsgc3R5bGUtPnl0aGlja25lc3MpOwotICAgIGNodW5rUmVj dC5zZXRXaWR0aCgoY2h1bmtSZWN0LndpZHRoKCkgLSAoMiAqIHN0eWxlLT54dGhpY2tuZXNzKSkg KiByZW5kZXJQcm9ncmVzcy0+cG9zaXRpb24oKSk7Ci0gICAgaWYgKHJlbmRlck9iamVjdC0+c3R5 bGUoKS0+ZGlyZWN0aW9uKCkgPT0gUlRMKQotICAgICAgICBjaHVua1JlY3Quc2V0WChyZWN0Lngo KSArIHJlY3Qud2lkdGgoKSAtIGNodW5rUmVjdC53aWR0aCgpIC0gc3R5bGUtPnh0aGlja25lc3Mp OwotICAgIGVsc2UKLSAgICAgICAgY2h1bmtSZWN0LnNldFgoY2h1bmtSZWN0LngoKSArIHN0eWxl LT54dGhpY2tuZXNzKTsKKyAgICBHdGtCb3JkZXIgcGFkZGluZzsKKyAgICBndGtfc3R5bGVfY29u dGV4dF9nZXRfcGFkZGluZyhjb250ZXh0LCBzdGF0aWNfY2FzdDxHdGtTdGF0ZUZsYWdzPigwKSwg JnBhZGRpbmcpOworICAgIEludFJlY3QgcHJvZ3Jlc3NSZWN0KHJlY3QueCgpICsgcGFkZGluZy5s ZWZ0LCByZWN0LnkoKSArIHBhZGRpbmcudG9wLAorICAgICAgICAgICAgICAgICAgICAgICAgIHJl Y3Qud2lkdGgoKSAtIChwYWRkaW5nLmxlZnQgKyBwYWRkaW5nLnJpZ2h0KSwKKyAgICAgICAgICAg ICAgICAgICAgICAgICByZWN0LmhlaWdodCgpIC0gKHBhZGRpbmcudG9wICsgcGFkZGluZy5ib3R0 b20pKTsKKworICAgIGlmIChyZW5kZXJQcm9ncmVzcy0+aXNEZXRlcm1pbmF0ZSgpKSB7CisgICAg ICAgIHByb2dyZXNzUmVjdC5zZXRXaWR0aChwcm9ncmVzc1JlY3Qud2lkdGgoKSAqIHJlbmRlclBy b2dyZXNzLT5wb3NpdGlvbigpKTsKKyAgICAgICAgaWYgKHJlbmRlck9iamVjdC0+c3R5bGUoKS0+ ZGlyZWN0aW9uKCkgPT0gUlRMKQorICAgICAgICAgICAgcHJvZ3Jlc3NSZWN0LnNldFgocmVjdC54 KCkgKyByZWN0LndpZHRoKCkgLSBwcm9ncmVzc1JlY3Qud2lkdGgoKSAtIHBhZGRpbmcucmlnaHQp OworICAgIH0gZWxzZSB7CisgICAgICAgIGRvdWJsZSBwcm9ncmVzcyA9IHJlbmRlclByb2dyZXNz LT5hbmltYXRpb25Qcm9ncmVzcygpOworCisgICAgICAgIHByb2dyZXNzUmVjdC5zZXRXaWR0aCht YXgoMiwgcHJvZ3Jlc3NSZWN0LndpZHRoKCkgLyBwcm9ncmVzc0FjdGl2aXR5QmxvY2tzKSk7Cisg ICAgICAgIGludCBtb3ZhYmxlV2lkdGggPSByZWN0LndpZHRoKCkgLSBwcm9ncmVzc1JlY3Qud2lk dGgoKTsKKyAgICAgICAgaWYgKHByb2dyZXNzIDwgMC41KQorICAgICAgICAgICAgcHJvZ3Jlc3NS ZWN0LnNldFgocHJvZ3Jlc3NSZWN0LngoKSArIChwcm9ncmVzcyAqIDIgKiBtb3ZhYmxlV2lkdGgp KTsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAgcHJvZ3Jlc3NSZWN0LnNldFgocHJvZ3Jlc3NS ZWN0LngoKSArICgoMS4wIC0gcHJvZ3Jlc3MpICogMiAqIG1vdmFibGVXaWR0aCkpOworICAgIH0K KworICAgIGlmICghcHJvZ3Jlc3NSZWN0LmlzRW1wdHkoKSkKKyAgICAgICAgZ3RrX3JlbmRlcl9h Y3Rpdml0eShjb250ZXh0LCBwYWludEluZm8uY29udGV4dC0+cGxhdGZvcm1Db250ZXh0KCksIHBy b2dyZXNzUmVjdC54KCksIHByb2dyZXNzUmVjdC55KCksIHByb2dyZXNzUmVjdC53aWR0aCgpLCBw cm9ncmVzc1JlY3QuaGVpZ2h0KCkpOwogCi0gICAgcmV0dXJuIHBhaW50UmVuZGVyT2JqZWN0KE1P Wl9HVEtfUFJPR1JFU1NfQ0hVTkssIHJlbmRlck9iamVjdCwgcGFpbnRJbmZvLmNvbnRleHQsIGNo dW5rUmVjdCk7CisgICAgZ3RrX3N0eWxlX2NvbnRleHRfcmVzdG9yZShjb250ZXh0KTsKKworICAg IHJldHVybiBmYWxzZTsKIH0KICNlbmRpZgogCg==