52940 2011-01-21 17:04:55 -0800 [Qt] Always set composition mode through GraphicsContext 2011-01-21 17:45:31 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) All All RESOLVED FIXED Qt, QtTriaged P2 Normal --- 1 kling webkit-unassigned rhodovan.u-szeged oldest_to_newest 338434 0 kling 2011-01-21 17:04:55 -0800 GraphicsContext tracks the current composition mode so we should never call through to the QPainter directly. 338436 1 79812 kling 2011-01-21 17:05:55 -0800 Created attachment 79812 Proposed patch 338446 2 79812 kenneth 2011-01-21 17:27:45 -0800 Comment on attachment 79812 Proposed patch nice 338459 3 kling 2011-01-21 17:45:31 -0800 Committed r76415: <http://trac.webkit.org/changeset/76415> 79812 2011-01-21 17:05:55 -0800 2011-01-21 17:27:45 -0800 Proposed patch bug-52940.diff text/plain 4489 kling ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBkNTIzY2RiLi5mNWU5ZjgxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIg QEAKKzIwMTEtMDEtMjEgIEFuZHJlYXMgS2xpbmcgIDxrbGluZ0B3ZWJraXQub3JnPgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtRdF0gQWx3YXlzIHNl dCBjb21wb3NpdGlvbiBtb2RlIHRocm91Z2ggR3JhcGhpY3NDb250ZXh0CisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01Mjk0MAorCisgICAgICAgIEdyYXBo aWNzQ29udGV4dCB0cmFja3MgdGhlIGN1cnJlbnQgY29tcG9zaXRpb24gbW9kZSBzbyB3ZSBzaG91 bGQKKyAgICAgICAgbmV2ZXIgY2FsbCB0aHJvdWdoIHRvIHRoZSBRUGFpbnRlciBkaXJlY3RseS4K KworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dC5oOgorICAgICAg ICAqIHBsYXRmb3JtL2dyYXBoaWNzL3F0L0dyYXBoaWNzQ29udGV4dFF0LmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OnRvUXRDb21wb3NpdGlvbk1vZGUpOiBDaGFuZ2VkIHRoaXMgbWV0aG9kIHRvIGEg c3RhdGljIGlubGluZQorICAgICAgICBzaW5jZSBpdCdzIG9ubHkgdXNlZCBieSBHcmFwaGljc0Nv bnRleHRRdC5jcHAgbm93LgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvcXQvSW1hZ2VR dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbWFnZTo6ZHJhd1BhdHRlcm4pOgorICAgICAgICAo V2ViQ29yZTo6Qml0bWFwSW1hZ2U6OmRyYXcpOgorCiAyMDExLTAxLTIxICBDaGFybGllIFJlaXMg IDxjcmVpc0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gRmlzaGVy LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3ND b250ZXh0LmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRl eHQuaAppbmRleCAzNTgyNGRjLi42ZDZjMDQzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQuaApAQCAtNDY1LDcgKzQ2NSw2IEBAIG5h bWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgYm9vbCBpblRyYW5zcGFyZW5jeUxheWVyKCkgY29u c3Q7CiAgICAgICAgIHZvaWQgcHVzaFRyYW5zcGFyZW5jeUxheWVySW50ZXJuYWwoY29uc3QgUVJl Y3QgJnJlY3QsIHFyZWFsIG9wYWNpdHksIFFQaXhtYXAmIGFscGhhTWFzayk7CiAgICAgICAgIHZv aWQgdGFrZU93bmVyc2hpcE9mUGxhdGZvcm1Db250ZXh0KCk7Ci0gICAgICAgIHN0YXRpYyBRUGFp bnRlcjo6Q29tcG9zaXRpb25Nb2RlIHRvUXRDb21wb3NpdGlvbk1vZGUoQ29tcG9zaXRlT3BlcmF0 b3Igb3ApOwogI2VuZGlmCiAKICNpZiBQTEFURk9STShRVCkgfHwgUExBVEZPUk0oQ0FJUk8pCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9HcmFwaGljc0Nv bnRleHRRdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9HcmFwaGlj c0NvbnRleHRRdC5jcHAKaW5kZXggNGRhYmUwOS4uODdjYzg3YyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvR3JhcGhpY3NDb250ZXh0UXQuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L0dyYXBoaWNzQ29udGV4dFF0LmNw cApAQCAtNjksNyArNjksNyBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKLVFQYWludGVyOjpD b21wb3NpdGlvbk1vZGUgR3JhcGhpY3NDb250ZXh0Ojp0b1F0Q29tcG9zaXRpb25Nb2RlKENvbXBv c2l0ZU9wZXJhdG9yIG9wKQorc3RhdGljIGlubGluZSBRUGFpbnRlcjo6Q29tcG9zaXRpb25Nb2Rl IHRvUXRDb21wb3NpdGlvbk1vZGUoQ29tcG9zaXRlT3BlcmF0b3Igb3ApCiB7CiAgICAgc3dpdGNo IChvcCkgewogICAgIGNhc2UgQ29tcG9zaXRlQ2xlYXI6CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9JbWFnZVF0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL3F0L0ltYWdlUXQuY3BwCmluZGV4IDU4ZjgyZWYuLjhmMjAwYzYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L0ltYWdlUXQuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L0ltYWdlUXQuY3BwCkBA IC0xMjAsMTEgKzEyMCw5IEBAIHZvaWQgSW1hZ2U6OmRyYXdQYXR0ZXJuKEdyYXBoaWNzQ29udGV4 dCogY3R4dCwgY29uc3QgRmxvYXRSZWN0JiB0aWxlUmVjdCwgY29uc3QKIAogICAgIENvbXBvc2l0 ZU9wZXJhdG9yIHByZXZpb3VzT3BlcmF0b3IgPSBjdHh0LT5jb21wb3NpdGVPcGVyYXRpb24oKTsK IAotICAgIGN0eHQtPnNldENvbXBvc2l0ZU9wZXJhdGlvbihvcCk7Ci0gICAgUVBhaW50ZXIqIHAg PSBjdHh0LT5wbGF0Zm9ybUNvbnRleHQoKTsKLSAgICBpZiAoIXBpeG1hcC5oYXNBbHBoYSgpICYm IHAtPmNvbXBvc2l0aW9uTW9kZSgpID09IFFQYWludGVyOjpDb21wb3NpdGlvbk1vZGVfU291cmNl T3ZlcikKLSAgICAgICAgcC0+c2V0Q29tcG9zaXRpb25Nb2RlKFFQYWludGVyOjpDb21wb3NpdGlv bk1vZGVfU291cmNlKTsKKyAgICBjdHh0LT5zZXRDb21wb3NpdGVPcGVyYXRpb24oIXBpeG1hcC5o YXNBbHBoYSgpICYmIG9wID09IENvbXBvc2l0ZVNvdXJjZU92ZXIgPyBDb21wb3NpdGVDb3B5IDog b3ApOwogCisgICAgUVBhaW50ZXIqIHAgPSBjdHh0LT5wbGF0Zm9ybUNvbnRleHQoKTsKICAgICBR VHJhbnNmb3JtIHRyYW5zZm9ybShwYXR0ZXJuVHJhbnNmb3JtKTsKIAogICAgIC8vIElmIHRoaXMg d291bGQgZHJhdyBtb3JlIHRoYW4gb25lIHNjYWxlZCB0aWxlLCB3ZSBzY2FsZSB0aGUgcGl4bWFw IGZpcnN0IGFuZCB0aGVuIHVzZSB0aGUgcmVzdWx0IHRvIGRyYXcuCkBAIC0yMjMsMTUgKzIyMSw5 IEBAIHZvaWQgQml0bWFwSW1hZ2U6OmRyYXcoR3JhcGhpY3NDb250ZXh0KiBjdHh0LCBjb25zdCBG bG9hdFJlY3QmIGRzdCwKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAotICAgIFFQYWludGVyKiBw YWludGVyKGN0eHQtPnBsYXRmb3JtQ29udGV4dCgpKTsKLQotICAgIFFQYWludGVyOjpDb21wb3Np dGlvbk1vZGUgY29tcG9zaXRpb25Nb2RlID0gR3JhcGhpY3NDb250ZXh0Ojp0b1F0Q29tcG9zaXRp b25Nb2RlKG9wKTsKIAotICAgIGlmICghaW1hZ2UtPmhhc0FscGhhKCkgJiYgcGFpbnRlci0+Y29t cG9zaXRpb25Nb2RlKCkgPT0gUVBhaW50ZXI6OkNvbXBvc2l0aW9uTW9kZV9Tb3VyY2VPdmVyKQot ICAgICAgICBjb21wb3NpdGlvbk1vZGUgPSBRUGFpbnRlcjo6Q29tcG9zaXRpb25Nb2RlX1NvdXJj ZTsKLQotICAgIFFQYWludGVyOjpDb21wb3NpdGlvbk1vZGUgbGFzdENvbXBvc2l0aW9uTW9kZSA9 IHBhaW50ZXItPmNvbXBvc2l0aW9uTW9kZSgpOwotICAgIHBhaW50ZXItPnNldENvbXBvc2l0aW9u TW9kZShjb21wb3NpdGlvbk1vZGUpOworICAgIENvbXBvc2l0ZU9wZXJhdG9yIHByZXZpb3VzT3Bl cmF0b3IgPSBjdHh0LT5jb21wb3NpdGVPcGVyYXRpb24oKTsKKyAgICBjdHh0LT5zZXRDb21wb3Np dGVPcGVyYXRpb24oIWltYWdlLT5oYXNBbHBoYSgpICYmIG9wID09IENvbXBvc2l0ZVNvdXJjZU92 ZXIgPyBDb21wb3NpdGVDb3B5IDogb3ApOwogCiAgICAgQ29udGV4dFNoYWRvdyogc2hhZG93ID0g Y3R4dC0+Y29udGV4dFNoYWRvdygpOwogICAgIGlmIChzaGFkb3ctPm1fdHlwZSAhPSBDb250ZXh0 U2hhZG93OjpOb1NoYWRvdykgewpAQCAtMjQzLDExICsyMzUsOSBAQCB2b2lkIEJpdG1hcEltYWdl OjpkcmF3KEdyYXBoaWNzQ29udGV4dCogY3R4dCwgY29uc3QgRmxvYXRSZWN0JiBkc3QsCiAgICAg ICAgIH0KICAgICB9CiAKLSAgICAvLyBUZXN0IHVzaW5nIGV4YW1wbGUgc2l0ZSBhdAotICAgIC8v IGh0dHA6Ly93d3cubWV5ZXJ3ZWIuY29tL2VyaWMvY3NzL2VkZ2UvY29tcGxleHNwaXJhbC9kZW1v Lmh0bWwKLSAgICBwYWludGVyLT5kcmF3UGl4bWFwKG5vcm1hbGl6ZWREc3QsICppbWFnZSwgbm9y bWFsaXplZFNyYyk7CisgICAgY3R4dC0+cGxhdGZvcm1Db250ZXh0KCktPmRyYXdQaXhtYXAobm9y bWFsaXplZERzdCwgKmltYWdlLCBub3JtYWxpemVkU3JjKTsKIAotICAgIHBhaW50ZXItPnNldENv bXBvc2l0aW9uTW9kZShsYXN0Q29tcG9zaXRpb25Nb2RlKTsKKyAgICBjdHh0LT5zZXRDb21wb3Np dGVPcGVyYXRpb24ocHJldmlvdXNPcGVyYXRvcik7CiAKICAgICBpZiAoaW1hZ2VPYnNlcnZlcigp KQogICAgICAgICBpbWFnZU9ic2VydmVyKCktPmRpZERyYXcodGhpcyk7Cg==