48626 2010-10-29 05:55:47 -0700 [Qt] Make GraphicsContext cheaper to construct 2010-10-29 06:45:17 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) All All RESOLVED FIXED Performance, Qt, QtTriaged P2 Normal --- 1 kling webkit-qt-unassigned oldest_to_newest 301705 0 kling 2010-10-29 05:55:47 -0700 We're currently doing some unnecessary stuff, like creating a black QBrush and throwing it away, and using setRenderHint() instead of setRenderHints(). 301707 1 72320 kling 2010-10-29 06:09:10 -0700 Created attachment 72320 Proposed patch 301713 2 72320 kenneth 2010-10-29 06:17:49 -0700 Comment on attachment 72320 Proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=72320&action=review > WebCore/ChangeLog:10 > + - Don't call setPlatform*(), set the painter brush and pen directly. Maybe add a comment about this in the code so that noone adds setPlatform in the future. > WebCore/platform/graphics/qt/GraphicsContextQt.cpp:238 > + // use the default the QPainter was constructed with Comments start with capital letter and ends with a dot, you should know that by now :-) > WebCore/platform/graphics/qt/GraphicsContextQt.cpp:257 > + // solidColor is initialized with the fillColor() Again! </3 301726 3 kling 2010-10-29 06:45:17 -0700 Committed r70870: <http://trac.webkit.org/changeset/70870> 72320 2010-10-29 06:09:10 -0700 2010-10-29 06:17:49 -0700 Proposed patch bug-48626.diff text/plain 3890 kling ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ZDkwMTIyZC4uZGNkODlkOCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAxMC0xMC0yOSAgQW5kcmVhcyBLbGlu ZyAgPGtsaW5nQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgW1F0XSBNYWtlIEdyYXBoaWNzQ29udGV4dCBjaGVhcGVyIHRvIGNvbnN0 cnVjdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDg2 MjYKKworICAgICAgICBEbyBsZXNzIHVubmVjZXNzYXJ5IHRoaW5ncyB3aGVuIGNyZWF0aW5nIHRo ZSBRdCBHcmFwaGljc0NvbnRleHQ6CisgICAgICAgIC0gRG9uJ3QgY3JlYXRlIGEgYmxhY2sgUUJy dXNoIHRoYXQncyBpbW1lZGlhdGVseSBkaXNjYXJkZWQuCisgICAgICAgIC0gRG9uJ3QgY2FsbCBz ZXRQbGF0Zm9ybSooKSwgc2V0IHRoZSBwYWludGVyIGJydXNoIGFuZCBwZW4gZGlyZWN0bHkuCisg ICAgICAgIC0gQ2FsbCBzZXRSZW5kZXJIaW50cygpIG9uY2UgaW5zdGVhZCBvZiBtdWx0aXBsZSBz ZXRSZW5kZXJIaW50KCkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9xdC9HcmFwaGlj c0NvbnRleHRRdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHRQbGF0Zm9y bVByaXZhdGU6OkdyYXBoaWNzQ29udGV4dFBsYXRmb3JtUHJpdmF0ZSk6CisgICAgICAgIChXZWJD b3JlOjpHcmFwaGljc0NvbnRleHQ6OkdyYXBoaWNzQ29udGV4dCk6CisKIDIwMTAtMTAtMjcgIE5p a29sYXMgWmltbWVybWFubiAgPG56aW1tZXJtYW5uQHJpbS5jb20+CiAKICAgICAgICAgUmV2aWV3 ZWQgYnkgRGlyayBTY2h1bHplLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9xdC9HcmFwaGljc0NvbnRleHRRdC5jcHAgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0 L0dyYXBoaWNzQ29udGV4dFF0LmNwcAppbmRleCA4YjM0ZjUxLi4zNThjOTU1IDEwMDY0NAotLS0g YS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L0dyYXBoaWNzQ29udGV4dFF0LmNwcAorKysg Yi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L0dyYXBoaWNzQ29udGV4dFF0LmNwcApAQCAt MTcxLDcgKzE3MSw3IEBAIHN0YXRpYyBpbmxpbmUgUXQ6OkZpbGxSdWxlIHRvUXRGaWxsUnVsZShX aW5kUnVsZSBydWxlKQogCiBjbGFzcyBHcmFwaGljc0NvbnRleHRQbGF0Zm9ybVByaXZhdGUgOiBw dWJsaWMgTm9uY29weWFibGUgewogcHVibGljOgotICAgIEdyYXBoaWNzQ29udGV4dFBsYXRmb3Jt UHJpdmF0ZShRUGFpbnRlciogcGFpbnRlcik7CisgICAgR3JhcGhpY3NDb250ZXh0UGxhdGZvcm1Q cml2YXRlKFFQYWludGVyKiwgY29uc3QgUUNvbG9yJiBpbml0aWFsU29saWRDb2xvcik7CiAgICAg fkdyYXBoaWNzQ29udGV4dFBsYXRmb3JtUHJpdmF0ZSgpOwogCiAgICAgaW5saW5lIFFQYWludGVy KiBwKCkgY29uc3QKQEAgLTIyNSw0MiArMjI1LDQyIEBAIHByaXZhdGU6CiB9OwogCiAKLUdyYXBo aWNzQ29udGV4dFBsYXRmb3JtUHJpdmF0ZTo6R3JhcGhpY3NDb250ZXh0UGxhdGZvcm1Qcml2YXRl KFFQYWludGVyKiBwKQorR3JhcGhpY3NDb250ZXh0UGxhdGZvcm1Qcml2YXRlOjpHcmFwaGljc0Nv bnRleHRQbGF0Zm9ybVByaXZhdGUoUVBhaW50ZXIqIHAsIGNvbnN0IFFDb2xvciYgaW5pdGlhbFNv bGlkQ29sb3IpCisgICAgOiBhbnRpQWxpYXNpbmdGb3JSZWN0c0FuZExpbmVzKGZhbHNlKQorICAg ICwgbGF5ZXJDb3VudCgwKQorICAgICwgc29saWRDb2xvcihpbml0aWFsU29saWRDb2xvcikKKyAg ICAsIGltYWdlSW50ZXJwb2xhdGlvblF1YWxpdHkoSW50ZXJwb2xhdGlvbkRlZmF1bHQpCisgICAg LCBwYWludGVyKHApCiB7Ci0gICAgcGFpbnRlciA9IHA7Ci0gICAgbGF5ZXJDb3VudCA9IDA7Ci0K LSAgICBzb2xpZENvbG9yID0gUUJydXNoKFF0OjpibGFjayk7CisgICAgaWYgKCFwYWludGVyKQor ICAgICAgICByZXR1cm47CiAKLSAgICBpbWFnZUludGVycG9sYXRpb25RdWFsaXR5ID0gSW50ZXJw b2xhdGlvbkRlZmF1bHQ7CisgICAgLy8gdXNlIHRoZSBkZWZhdWx0IHRoZSBRUGFpbnRlciB3YXMg Y29uc3RydWN0ZWQgd2l0aAorICAgIGFudGlBbGlhc2luZ0ZvclJlY3RzQW5kTGluZXMgPSBwYWlu dGVyLT50ZXN0UmVuZGVySGludChRUGFpbnRlcjo6QW50aWFsaWFzaW5nKTsKIAotICAgIGlmIChw YWludGVyKSB7Ci0gICAgICAgIC8vIHVzZSB0aGUgZGVmYXVsdCB0aGUgUVBhaW50ZXIgd2FzIGNv bnN0cnVjdGVkIHdpdGgKLSAgICAgICAgYW50aUFsaWFzaW5nRm9yUmVjdHNBbmRMaW5lcyA9IHBh aW50ZXItPnRlc3RSZW5kZXJIaW50KFFQYWludGVyOjpBbnRpYWxpYXNpbmcpOwotICAgICAgICAv LyBGSVhNRTogTWF5YmUgb25seSBlbmFibGUgaW4gU1ZHIG1vZGU/Ci0gICAgICAgIHBhaW50ZXIt PnNldFJlbmRlckhpbnQoUVBhaW50ZXI6OkFudGlhbGlhc2luZywgdHJ1ZSk7Ci0gICAgICAgIHBh aW50ZXItPnNldFJlbmRlckhpbnQoUVBhaW50ZXI6OlNtb290aFBpeG1hcFRyYW5zZm9ybSwgdHJ1 ZSk7Ci0gICAgfSBlbHNlCi0gICAgICAgIGFudGlBbGlhc2luZ0ZvclJlY3RzQW5kTGluZXMgPSBm YWxzZTsKKyAgICBwYWludGVyLT5zZXRSZW5kZXJIaW50cyhRUGFpbnRlcjo6QW50aWFsaWFzaW5n IHwgUVBhaW50ZXI6OlNtb290aFBpeG1hcFRyYW5zZm9ybSwgdHJ1ZSk7CiB9CiAKIEdyYXBoaWNz Q29udGV4dFBsYXRmb3JtUHJpdmF0ZTo6fkdyYXBoaWNzQ29udGV4dFBsYXRmb3JtUHJpdmF0ZSgp CiB7CiB9CiAKLUdyYXBoaWNzQ29udGV4dDo6R3JhcGhpY3NDb250ZXh0KFBsYXRmb3JtR3JhcGhp Y3NDb250ZXh0KiBjb250ZXh0KQorR3JhcGhpY3NDb250ZXh0OjpHcmFwaGljc0NvbnRleHQoUGxh dGZvcm1HcmFwaGljc0NvbnRleHQqIHBhaW50ZXIpCiAgICAgOiBtX2NvbW1vbihjcmVhdGVHcmFw aGljc0NvbnRleHRQcml2YXRlKCkpCi0gICAgLCBtX2RhdGEobmV3IEdyYXBoaWNzQ29udGV4dFBs YXRmb3JtUHJpdmF0ZShjb250ZXh0KSkKKyAgICAsIG1fZGF0YShuZXcgR3JhcGhpY3NDb250ZXh0 UGxhdGZvcm1Qcml2YXRlKHBhaW50ZXIsIGZpbGxDb2xvcigpKSkKIHsKLSAgICBzZXRQYWludGlu Z0Rpc2FibGVkKCFjb250ZXh0KTsKLSAgICBpZiAoY29udGV4dCkgewotICAgICAgICAvLyBNYWtl IHN1cmUgdGhlIGNvbnRleHQgc3RhcnRzIGluIHN5bmMgd2l0aCBvdXIgc3RhdGUuCi0gICAgICAg IHNldFBsYXRmb3JtRmlsbENvbG9yKGZpbGxDb2xvcigpLCBDb2xvclNwYWNlRGV2aWNlUkdCKTsK LSAgICAgICAgc2V0UGxhdGZvcm1TdHJva2VDb2xvcihzdHJva2VDb2xvcigpLCBDb2xvclNwYWNl RGV2aWNlUkdCKTsKKyAgICBzZXRQYWludGluZ0Rpc2FibGVkKCFwYWludGVyKTsKIAotICAgICAg ICAvLyBNYWtlIHN1cmUgd2Ugc3RhcnQgd2l0aCB0aGUgY29ycmVjdCBqb2luIG1vZGUuCi0gICAg ICAgIHNldExpbmVKb2luKE1pdGVySm9pbik7Ci0gICAgfQorICAgIGlmICghcGFpbnRlcikKKyAg ICAgICAgcmV0dXJuOworCisgICAgLy8gc29saWRDb2xvciBpcyBpbml0aWFsaXplZCB3aXRoIHRo ZSBmaWxsQ29sb3IoKQorICAgIHBhaW50ZXItPnNldEJydXNoKG1fZGF0YS0+c29saWRDb2xvcik7 CisKKyAgICBRUGVuIHBlbihwYWludGVyLT5wZW4oKSk7CisgICAgcGVuLnNldENvbG9yKHN0cm9r ZUNvbG9yKCkpOworICAgIHBlbi5zZXRKb2luU3R5bGUodG9RdExpbmVKb2luKE1pdGVySm9pbikp OworICAgIHBhaW50ZXItPnNldFBlbihwZW4pOwogfQogCiBHcmFwaGljc0NvbnRleHQ6On5HcmFw aGljc0NvbnRleHQoKQo=