42513 2010-07-17 23:13:36 -0700 [Qt] Don't unnecessarily copy QPainterPath in fillPath() and strokePath() 2010-07-19 19:04:12 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All RESOLVED FIXED Performance, Qt, QtTriaged P2 Normal --- 1 kling kling oldest_to_newest 252954 0 kling 2010-07-17 23:13:36 -0700 GraphicsContext::fillPath() and GraphicsContext::strokePath() currently deep-copy m_data->currentPath before filling/stroking with it. Since m_data->currentPath is cleared at the end of these functions, it's perfectly safe to fill/stroke using m_data->currentPath instead of a copy. 252955 1 61901 kling 2010-07-17 23:15:18 -0700 Created attachment 61901 Proposed patch 253158 2 61901 kenneth 2010-07-19 05:53:21 -0700 Comment on attachment 61901 Proposed patch r- due to changed requested on irc. 253216 3 61956 kling 2010-07-19 08:10:32 -0700 Created attachment 61956 Proposed patch v2 253522 4 61956 kling 2010-07-19 19:04:02 -0700 Comment on attachment 61956 Proposed patch v2 Clearing flags on attachment: 61956 Committed r63706: <http://trac.webkit.org/changeset/63706> 253523 5 kling 2010-07-19 19:04:12 -0700 All reviewed patches have been landed. Closing bug. 61901 2010-07-17 23:15:18 -0700 2010-07-19 08:10:32 -0700 Proposed patch bug-42513.diff text/plain 3960 kling ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg YWVmZTk1Ni4uYmUwNTcwMyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxMC0wNy0xNyAgQW5kcmVhcyBLbGlu ZyAgPGFuZHJlYXMua2xpbmdAbm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFtRdF0gRG9uJ3QgdW5uZWNlc3NhcmlseSBjb3B5IFFQYWlu dGVyUGF0aCBpbiBmaWxsUGF0aCgpIGFuZCBzdHJva2VQYXRoKCkKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQyNTEzCisKKyAgICAgICAgQXZvaWQgbWFr aW5nIHVubmVjZXNzYXJ5IGRlZXAtY29waWVzIG9mIFFQYWludGVyUGF0aHMgdGhhdCB3aWxsCisg ICAgICAgIGJlIGRpc2NhcmRlZCBhZnRlciB1c2UuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFw aGljcy9xdC9HcmFwaGljc0NvbnRleHRRdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGlj c0NvbnRleHQ6OmZpbGxQYXRoKToKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dDo6 c3Ryb2tlUGF0aCk6CisKIDIwMTAtMDctMTcgIFRKIExlZSAgPHRqbGVlMDkwOUBnbWFpbC5jb20+ CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgVGltb3RoeSBIYXRjaGVyLgpkaWZmIC0tZ2l0IGEvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9HcmFwaGljc0NvbnRleHRRdC5jcHAgYi9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL3F0L0dyYXBoaWNzQ29udGV4dFF0LmNwcAppbmRleCBjNmFjOGE2 Li42Nzg0NDEwIDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L0dyYXBo aWNzQ29udGV4dFF0LmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L0dyYXBo aWNzQ29udGV4dFF0LmNwcApAQCAtNTY3LDIxICs1NjcsMjAgQEAgdm9pZCBHcmFwaGljc0NvbnRl eHQ6OmZpbGxQYXRoKCkKICAgICAgICAgcmV0dXJuOwogCiAgICAgUVBhaW50ZXIqIHAgPSBtX2Rh dGEtPnAoKTsKLSAgICBRUGFpbnRlclBhdGggcGF0aCA9IG1fZGF0YS0+Y3VycmVudFBhdGg7Ci0g ICAgcGF0aC5zZXRGaWxsUnVsZSh0b1F0RmlsbFJ1bGUoZmlsbFJ1bGUoKSkpOworICAgIG1fZGF0 YS0+Y3VycmVudFBhdGguc2V0RmlsbFJ1bGUodG9RdEZpbGxSdWxlKGZpbGxSdWxlKCkpKTsKIAog ICAgIGlmIChtX2NvbW1vbi0+c3RhdGUuZmlsbFBhdHRlcm4gfHwgbV9jb21tb24tPnN0YXRlLmZp bGxHcmFkaWVudCB8fCBmaWxsQ29sb3IoKS5hbHBoYSgpKSB7Ci0gICAgICAgIGRyYXdGaWxsZWRT aGFkb3dQYXRoKHRoaXMsIHAsIHBhdGgpOworICAgICAgICBkcmF3RmlsbGVkU2hhZG93UGF0aCh0 aGlzLCBwLCBtX2RhdGEtPmN1cnJlbnRQYXRoKTsKICAgICAgICAgaWYgKG1fY29tbW9uLT5zdGF0 ZS5maWxsUGF0dGVybikgewogICAgICAgICAgICAgQWZmaW5lVHJhbnNmb3JtIGFmZmluZTsKLSAg ICAgICAgICAgIHAtPmZpbGxQYXRoKHBhdGgsIFFCcnVzaChtX2NvbW1vbi0+c3RhdGUuZmlsbFBh dHRlcm4tPmNyZWF0ZVBsYXRmb3JtUGF0dGVybihhZmZpbmUpKSk7CisgICAgICAgICAgICBwLT5m aWxsUGF0aChtX2RhdGEtPmN1cnJlbnRQYXRoLCBRQnJ1c2gobV9jb21tb24tPnN0YXRlLmZpbGxQ YXR0ZXJuLT5jcmVhdGVQbGF0Zm9ybVBhdHRlcm4oYWZmaW5lKSkpOwogICAgICAgICB9IGVsc2Ug aWYgKG1fY29tbW9uLT5zdGF0ZS5maWxsR3JhZGllbnQpIHsKICAgICAgICAgICAgIFFCcnVzaCBi cnVzaCgqbV9jb21tb24tPnN0YXRlLmZpbGxHcmFkaWVudC0+cGxhdGZvcm1HcmFkaWVudCgpKTsK ICAgICAgICAgICAgIGJydXNoLnNldFRyYW5zZm9ybShtX2NvbW1vbi0+c3RhdGUuZmlsbEdyYWRp ZW50LT5ncmFkaWVudFNwYWNlVHJhbnNmb3JtKCkpOwotICAgICAgICAgICAgcC0+ZmlsbFBhdGgo cGF0aCwgYnJ1c2gpOworICAgICAgICAgICAgcC0+ZmlsbFBhdGgobV9kYXRhLT5jdXJyZW50UGF0 aCwgYnJ1c2gpOwogICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgaWYgKGZpbGxDb2xvcigp LmFscGhhKCkpCi0gICAgICAgICAgICAgICAgcC0+ZmlsbFBhdGgocGF0aCwgcC0+YnJ1c2goKSk7 CisgICAgICAgICAgICAgICAgcC0+ZmlsbFBhdGgobV9kYXRhLT5jdXJyZW50UGF0aCwgcC0+YnJ1 c2goKSk7CiAgICAgICAgIH0KICAgICB9CiAgICAgbV9kYXRhLT5jdXJyZW50UGF0aCA9IFFQYWlu dGVyUGF0aCgpOwpAQCAtNTk0LDggKzU5Myw3IEBAIHZvaWQgR3JhcGhpY3NDb250ZXh0OjpzdHJv a2VQYXRoKCkKIAogICAgIFFQYWludGVyKiBwID0gbV9kYXRhLT5wKCk7CiAgICAgUVBlbiBwZW4o cC0+cGVuKCkpOwotICAgIFFQYWludGVyUGF0aCBwYXRoID0gbV9kYXRhLT5jdXJyZW50UGF0aDsK LSAgICBwYXRoLnNldEZpbGxSdWxlKHRvUXRGaWxsUnVsZShmaWxsUnVsZSgpKSk7CisgICAgbV9k YXRhLT5jdXJyZW50UGF0aC5zZXRGaWxsUnVsZSh0b1F0RmlsbFJ1bGUoZmlsbFJ1bGUoKSkpOwog CiAgICAgaWYgKG1fY29tbW9uLT5zdGF0ZS5zdHJva2VQYXR0ZXJuIHx8IG1fY29tbW9uLT5zdGF0 ZS5zdHJva2VHcmFkaWVudCB8fCBzdHJva2VDb2xvcigpLmFscGhhKCkpIHsKICAgICAgICAgRmxv YXRTaXplIHNoYWRvd1NpemU7CkBAIC02MDYsMjMgKzYwNCwyMyBAQCB2b2lkIEdyYXBoaWNzQ29u dGV4dDo6c3Ryb2tlUGF0aCgpCiAgICAgICAgICAgICBwLT50cmFuc2xhdGUoc2hhZG93U2l6ZS53 aWR0aCgpLCBzaGFkb3dTaXplLmhlaWdodCgpKTsKICAgICAgICAgICAgIFFQZW4gc2hhZG93UGVu KHBlbik7CiAgICAgICAgICAgICBzaGFkb3dQZW4uc2V0Q29sb3Ioc2hhZG93Q29sb3IpOwotICAg ICAgICAgICAgcC0+c3Ryb2tlUGF0aChwYXRoLCBzaGFkb3dQZW4pOworICAgICAgICAgICAgcC0+ c3Ryb2tlUGF0aChtX2RhdGEtPmN1cnJlbnRQYXRoLCBzaGFkb3dQZW4pOwogICAgICAgICAgICAg cC0+c2V0V29ybGRUcmFuc2Zvcm0odCk7CiAgICAgICAgIH0KICAgICAgICAgaWYgKG1fY29tbW9u LT5zdGF0ZS5zdHJva2VQYXR0ZXJuKSB7CiAgICAgICAgICAgICBBZmZpbmVUcmFuc2Zvcm0gYWZm aW5lOwogICAgICAgICAgICAgcGVuLnNldEJydXNoKFFCcnVzaChtX2NvbW1vbi0+c3RhdGUuc3Ry b2tlUGF0dGVybi0+Y3JlYXRlUGxhdGZvcm1QYXR0ZXJuKGFmZmluZSkpKTsKICAgICAgICAgICAg IHAtPnNldFBlbihwZW4pOwotICAgICAgICAgICAgcC0+c3Ryb2tlUGF0aChwYXRoLCBwZW4pOwor ICAgICAgICAgICAgcC0+c3Ryb2tlUGF0aChtX2RhdGEtPmN1cnJlbnRQYXRoLCBwZW4pOwogICAg ICAgICB9IGVsc2UgaWYgKG1fY29tbW9uLT5zdGF0ZS5zdHJva2VHcmFkaWVudCkgewogICAgICAg ICAgICAgUUJydXNoIGJydXNoKCptX2NvbW1vbi0+c3RhdGUuc3Ryb2tlR3JhZGllbnQtPnBsYXRm b3JtR3JhZGllbnQoKSk7CiAgICAgICAgICAgICBicnVzaC5zZXRUcmFuc2Zvcm0obV9jb21tb24t PnN0YXRlLnN0cm9rZUdyYWRpZW50LT5ncmFkaWVudFNwYWNlVHJhbnNmb3JtKCkpOwogICAgICAg ICAgICAgcGVuLnNldEJydXNoKGJydXNoKTsKICAgICAgICAgICAgIHAtPnNldFBlbihwZW4pOwot ICAgICAgICAgICAgcC0+c3Ryb2tlUGF0aChwYXRoLCBwZW4pOworICAgICAgICAgICAgcC0+c3Ry b2tlUGF0aChtX2RhdGEtPmN1cnJlbnRQYXRoLCBwZW4pOwogICAgICAgICB9IGVsc2UgewogICAg ICAgICAgICAgaWYgKHN0cm9rZUNvbG9yKCkuYWxwaGEoKSkKLSAgICAgICAgICAgICAgICBwLT5z dHJva2VQYXRoKHBhdGgsIHBlbik7CisgICAgICAgICAgICAgICAgcC0+c3Ryb2tlUGF0aChtX2Rh dGEtPmN1cnJlbnRQYXRoLCBwZW4pOwogICAgICAgICB9CiAgICAgfQogICAgIG1fZGF0YS0+Y3Vy cmVudFBhdGggPSBRUGFpbnRlclBhdGgoKTsK 61956 2010-07-19 08:10:32 -0700 2010-07-19 19:04:02 -0700 Proposed patch v2 bug-42513-v2.diff text/plain 1655 kling ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NDdiMDA0YS4uZjAxYjliZCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxMC0wNy0xOSAgQW5kcmVhcyBLbGlu ZyAgPGFuZHJlYXMua2xpbmdAbm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFtRdF0gRG9uJ3QgdW5uZWNlc3NhcmlseSBjb3B5IFFQYWlu dGVyUGF0aCBpbiBmaWxsUGF0aCgpIGFuZCBzdHJva2VQYXRoKCkKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQyNTEzCisKKyAgICAgICAgQXZvaWQgbWFr aW5nIHVubmVjZXNzYXJ5IGRlZXAtY29waWVzIG9mIFFQYWludGVyUGF0aHMgdGhhdCB3aWxsCisg ICAgICAgIGJlIGRpc2NhcmRlZCBhZnRlciB1c2UuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFw aGljcy9xdC9HcmFwaGljc0NvbnRleHRRdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGlj c0NvbnRleHQ6OmZpbGxQYXRoKToKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dDo6 c3Ryb2tlUGF0aCk6CisKIDIwMTAtMDctMTQgIEFuZHJlYXMgS2xpbmcgIDxhbmRyZWFzLmtsaW5n QG5va2lhLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBLZW5uZXRoIFJvaGRlIENocmlzdGlh bnNlbi4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvR3JhcGhpY3ND b250ZXh0UXQuY3BwIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9HcmFwaGljc0NvbnRl eHRRdC5jcHAKaW5kZXggNDU3MDZlOC4uYTgyODA3MCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9xdC9HcmFwaGljc0NvbnRleHRRdC5jcHAKKysrIGIvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9xdC9HcmFwaGljc0NvbnRleHRRdC5jcHAKQEAgLTU2Nyw3ICs1NjcsNyBA QCB2b2lkIEdyYXBoaWNzQ29udGV4dDo6ZmlsbFBhdGgoKQogICAgICAgICByZXR1cm47CiAKICAg ICBRUGFpbnRlciogcCA9IG1fZGF0YS0+cCgpOwotICAgIFFQYWludGVyUGF0aCBwYXRoID0gbV9k YXRhLT5jdXJyZW50UGF0aDsKKyAgICBRUGFpbnRlclBhdGgmIHBhdGggPSBtX2RhdGEtPmN1cnJl bnRQYXRoOyAvLyBBdm9pZCBkZXRhY2hpbmcgdGhlIFFQYWludGVyUGF0aAogICAgIHBhdGguc2V0 RmlsbFJ1bGUodG9RdEZpbGxSdWxlKGZpbGxSdWxlKCkpKTsKIAogICAgIGRyYXdGaWxsZWRTaGFk b3dQYXRoKHRoaXMsIHAsIHBhdGgpOwpAQCAtNTkxLDcgKzU5MSw3IEBAIHZvaWQgR3JhcGhpY3ND b250ZXh0OjpzdHJva2VQYXRoKCkKIAogICAgIFFQYWludGVyKiBwID0gbV9kYXRhLT5wKCk7CiAg ICAgUVBlbiBwZW4ocC0+cGVuKCkpOwotICAgIFFQYWludGVyUGF0aCBwYXRoID0gbV9kYXRhLT5j dXJyZW50UGF0aDsKKyAgICBRUGFpbnRlclBhdGgmIHBhdGggPSBtX2RhdGEtPmN1cnJlbnRQYXRo OyAvLyBBdm9pZCBkZXRhY2hpbmcgdGhlIFFQYWludGVyUGF0aAogICAgIHBhdGguc2V0RmlsbFJ1 bGUodG9RdEZpbGxSdWxlKGZpbGxSdWxlKCkpKTsKIAogICAgIEZsb2F0U2l6ZSBzaGFkb3dTaXpl Owo=