44396 2010-08-22 04:56:57 -0700 [Qt] GraphicsContext: Simplify getting the clip bounding rect 2010-08-22 17:52:29 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All RESOLVED FIXED Qt, QtTriaged P3 Normal --- 1 kling webkit-qt-unassigned oldest_to_newest 267680 0 kling 2010-08-22 04:56:57 -0700 Move the Qt 4.8 version check for QPainter::clipBoundingRect() into a GraphicsContextPlatformPrivate method. 267681 1 65057 kling 2010-08-22 04:58:00 -0700 Created attachment 65057 Proposed patch 267732 2 65057 kling 2010-08-22 17:52:19 -0700 Comment on attachment 65057 Proposed patch Clearing flags on attachment: 65057 Committed r65791: <http://trac.webkit.org/changeset/65791> 267733 3 kling 2010-08-22 17:52:29 -0700 All reviewed patches have been landed. Closing bug. 65057 2010-08-22 04:58:00 -0700 2010-08-22 17:52:19 -0700 Proposed patch bug-44396.diff text/plain 3474 kling ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ODI1ZTcyYS4uOThmYmY0MiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsNSArMSwyMSBAQAogMjAxMC0wOC0yMiAgQW5kcmVhcyBLbGlu ZyAgPGFuZHJlYXMua2xpbmdAbm9raWEuY29tPgogCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFtRdF0gR3JhcGhpY3NDb250ZXh0OiBTaW1wbGlmeSBnZXR0 aW5nIHRoZSBjbGlwIGJvdW5kaW5nIHJlY3QKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTQ0Mzk2CisKKyAgICAgICAgTW92ZSB0aGUgUXQgNC44IHZlcnNp b24gY2hlY2sgZm9yIFFQYWludGVyOjpjbGlwQm91bmRpbmdSZWN0KCkKKyAgICAgICAgaW50byBh IEdyYXBoaWNzQ29udGV4dFBsYXRmb3JtUHJpdmF0ZSBtZXRob2QuCisKKyAgICAgICAgKiBwbGF0 Zm9ybS9ncmFwaGljcy9xdC9HcmFwaGljc0NvbnRleHRRdC5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpHcmFwaGljc0NvbnRleHRQbGF0Zm9ybVByaXZhdGU6OmNsaXBCb3VuZGluZ1JlY3QpOgorICAg ICAgICAoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0OjpiZWdpblRyYW5zcGFyZW5jeUxheWVyKToK KyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dDo6Y2xpcE91dCk6CisgICAgICAgIChX ZWJDb3JlOjpHcmFwaGljc0NvbnRleHQ6OmNsaXBPdXRFbGxpcHNlSW5SZWN0KToKKworMjAxMC0w OC0yMiAgQW5kcmVhcyBLbGluZyAgPGFuZHJlYXMua2xpbmdAbm9raWEuY29tPgorCiAgICAgICAg IFJldmlld2VkIGJ5IEFyaXlhIEhpZGF5YXQuCiAKICAgICAgICAgW1F0XSBHcmFkaWVudDogU3Vw cG9ydCBpbm5lciByYWRpdXMgbGFyZ2VyIHRoYW4gb3V0ZXIgcmFkaXVzCmRpZmYgLS1naXQgYS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L0dyYXBoaWNzQ29udGV4dFF0LmNwcCBiL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvR3JhcGhpY3NDb250ZXh0UXQuY3BwCmluZGV4IGM4ZTI4 M2MuLmY1NmM1NGMgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvR3Jh cGhpY3NDb250ZXh0UXQuY3BwCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvR3Jh cGhpY3NDb250ZXh0UXQuY3BwCkBAIC0yMDksNiArMjA5LDE1IEBAIHB1YmxpYzoKICAgICAgICAg cmV0dXJuIHNoYWRvdy50eXBlICE9IENvbnRleHRTaGFkb3c6Ok5vU2hhZG93OwogICAgIH0KIAor ICAgIFFSZWN0RiBjbGlwQm91bmRpbmdSZWN0KCkgY29uc3QKKyAgICB7CisjaWYgUVRfVkVSU0lP TiA+PSBRVF9WRVJTSU9OX0NIRUNLKDQsIDgsIDApCisgICAgICAgIHJldHVybiBwYWludGVyLT5j bGlwQm91bmRpbmdSZWN0KCk7CisjZWxzZQorICAgICAgICByZXR1cm4gcGFpbnRlci0+Y2xpcFJl Z2lvbigpLmJvdW5kaW5nUmVjdCgpOworI2VuZGlmCisgICAgfQorCiBwcml2YXRlOgogICAgIFFQ YWludGVyKiBwYWludGVyOwogfTsKQEAgLTkxMSw3ICs5MjAsNyBAQCB2b2lkIEdyYXBoaWNzQ29u dGV4dDo6YmVnaW5UcmFuc3BhcmVuY3lMYXllcihmbG9hdCBvcGFjaXR5KQogICAgIHcgPSBkZXZp Y2UtPndpZHRoKCk7CiAgICAgaCA9IGRldmljZS0+aGVpZ2h0KCk7CiAKLSAgICBRUmVjdEYgY2xp cCA9IHAtPmNsaXBQYXRoKCkuYm91bmRpbmdSZWN0KCk7CisgICAgUVJlY3RGIGNsaXAgPSBtX2Rh dGEtPmNsaXBCb3VuZGluZ1JlY3QoKTsKICAgICBRUmVjdEYgZGV2aWNlQ2xpcCA9IHAtPnRyYW5z Zm9ybSgpLm1hcFJlY3QoY2xpcCk7CiAgICAgeCA9IGludChxQm91bmQocXJlYWwoMCksIGRldmlj ZUNsaXAueCgpLCAocXJlYWwpdykpOwogICAgIHkgPSBpbnQocUJvdW5kKHFyZWFsKDApLCBkZXZp Y2VDbGlwLnkoKSwgKHFyZWFsKWgpKTsKQEAgLTEwNzQsMTEgKzEwODMsNyBAQCB2b2lkIEdyYXBo aWNzQ29udGV4dDo6Y2xpcE91dChjb25zdCBQYXRoJiBwYXRoKQogICAgIFFQYWludGVyUGF0aCBu ZXdDbGlwOwogICAgIG5ld0NsaXAuc2V0RmlsbFJ1bGUoUXQ6Ok9kZEV2ZW5GaWxsKTsKICAgICBp ZiAocC0+aGFzQ2xpcHBpbmcoKSkgewotI2lmIFFUX1ZFUlNJT04gPj0gUVRfVkVSU0lPTl9DSEVD Syg0LCA4LCAwKQotICAgICAgICBuZXdDbGlwLmFkZFJlY3QocC0+Y2xpcEJvdW5kaW5nUmVjdCgp KTsKLSNlbHNlCi0gICAgICAgIG5ld0NsaXAuYWRkUmVjdChwLT5jbGlwUmVnaW9uKCkuYm91bmRp bmdSZWN0KCkpOwotI2VuZGlmCisgICAgICAgIG5ld0NsaXAuYWRkUmVjdChtX2RhdGEtPmNsaXBC b3VuZGluZ1JlY3QoKSk7CiAgICAgICAgIG5ld0NsaXAuYWRkUGF0aChjbGlwcGVkT3V0KTsKICAg ICAgICAgcC0+c2V0Q2xpcFBhdGgobmV3Q2xpcCwgUXQ6OkludGVyc2VjdENsaXApOwogICAgIH0g ZWxzZSB7CkBAIC0xMTQ4LDExICsxMTUzLDcgQEAgdm9pZCBHcmFwaGljc0NvbnRleHQ6OmNsaXBP dXQoY29uc3QgSW50UmVjdCYgcmVjdCkKICAgICBRUGFpbnRlclBhdGggbmV3Q2xpcDsKICAgICBu ZXdDbGlwLnNldEZpbGxSdWxlKFF0OjpPZGRFdmVuRmlsbCk7CiAgICAgaWYgKHAtPmhhc0NsaXBw aW5nKCkpIHsKLSNpZiBRVF9WRVJTSU9OID49IFFUX1ZFUlNJT05fQ0hFQ0soNCwgOCwgMCkKLSAg ICAgICAgbmV3Q2xpcC5hZGRSZWN0KHAtPmNsaXBCb3VuZGluZ1JlY3QoKSk7Ci0jZWxzZQotICAg ICAgICBuZXdDbGlwLmFkZFJlY3QocC0+Y2xpcFJlZ2lvbigpLmJvdW5kaW5nUmVjdCgpKTsKLSNl bmRpZgorICAgICAgICBuZXdDbGlwLmFkZFJlY3QobV9kYXRhLT5jbGlwQm91bmRpbmdSZWN0KCkp OwogICAgICAgICBuZXdDbGlwLmFkZFJlY3QoUVJlY3QocmVjdCkpOwogICAgICAgICBwLT5zZXRD bGlwUGF0aChuZXdDbGlwLCBRdDo6SW50ZXJzZWN0Q2xpcCk7CiAgICAgfSBlbHNlIHsKQEAgLTEx NzQsMTEgKzExNzUsNyBAQCB2b2lkIEdyYXBoaWNzQ29udGV4dDo6Y2xpcE91dEVsbGlwc2VJblJl Y3QoY29uc3QgSW50UmVjdCYgcmVjdCkKICAgICBRUGFpbnRlclBhdGggbmV3Q2xpcDsKICAgICBu ZXdDbGlwLnNldEZpbGxSdWxlKFF0OjpPZGRFdmVuRmlsbCk7CiAgICAgaWYgKHAtPmhhc0NsaXBw aW5nKCkpIHsKLSNpZiBRVF9WRVJTSU9OID49IFFUX1ZFUlNJT05fQ0hFQ0soNCwgOCwgMCkKLSAg ICAgICAgbmV3Q2xpcC5hZGRSZWN0KHAtPmNsaXBCb3VuZGluZ1JlY3QoKSk7Ci0jZWxzZQotICAg ICAgICBuZXdDbGlwLmFkZFJlY3QocC0+Y2xpcFJlZ2lvbigpLmJvdW5kaW5nUmVjdCgpKTsKLSNl bmRpZgorICAgICAgICBuZXdDbGlwLmFkZFJlY3QobV9kYXRhLT5jbGlwQm91bmRpbmdSZWN0KCkp OwogICAgICAgICBuZXdDbGlwLmFkZEVsbGlwc2UoUVJlY3QocmVjdCkpOwogICAgICAgICBwLT5z ZXRDbGlwUGF0aChuZXdDbGlwLCBRdDo6SW50ZXJzZWN0Q2xpcCk7CiAgICAgfSBlbHNlIHsK