85539 2012-05-03 13:36:49 -0700 Move repaint counter drawing code out into a separate function 2012-05-03 13:44:59 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 615562 0 andersca 2012-05-03 13:36:49 -0700 Move repaint counter drawing code out into a separate function 615565 1 140080 andersca 2012-05-03 13:38:41 -0700 Created attachment 140080 Patch 615572 2 andersca 2012-05-03 13:44:59 -0700 Committed r116005: <http://trac.webkit.org/changeset/116005> 140080 2012-05-03 13:38:41 -0700 2012-05-03 13:40:02 -0700 Patch bug-85539-20120503134048.patch text/plain 5602 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTE1OTkxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTU5ZjRmNTg0YWJiZTBh NGViNDNhYmQwMmI4ZjE3ZWZiNjRmOWJjNi4uNDE5MmQ0OWJjYzc5MmU4NzQzNDZiYzlkNmY3YzBk ZTZhYmMxYjkxNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEyLTA1LTAzICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgTW92ZSByZXBhaW50 IGNvdW50ZXIgZHJhd2luZyBjb2RlIG91dCBpbnRvIGEgc2VwYXJhdGUgZnVuY3Rpb24KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg1NTM5CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIG1ham9yaXR5IG9m IGNvZGUgaW4gVGlsZUNhY2hlOjpkcmF3TGF5ZXIgZGVhbHMgd2l0aCBkcmF3aW5nIHRoZSByZXBh aW50IGNvdW50ZXIuIE1vdmUgdGhpcyBjb2RlIG91dAorICAgICAgICBpbnRvIGEgc2VwYXJhdGUg ZnVuY3Rpb24gdG8gbWFrZSBpdCBtb3JlIGNsZWFyIHdoYXQgZHJhd0xheWVyIGRvZXMuCisKKyAg ICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jYS9tYWMvVGlsZUNhY2hlLmg6CisgICAgICAgIChU aWxlQ2FjaGUpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2NhL21hYy9UaWxlQ2FjaGUu bW06CisgICAgICAgIChXZWJDb3JlOjpUaWxlQ2FjaGU6OmRyYXdMYXllcik6CisgICAgICAgIChX ZWJDb3JlOjpUaWxlQ2FjaGU6OmRyYXdSZXBhaW50Q291bnRlcik6CisgICAgICAgIChXZWJDb3Jl KToKKwogMjAxMi0wNS0wMyAgQW5kcmVhcyBLbGluZyAgPGtsaW5nQHdlYmtpdC5vcmc+CiAKICAg ICAgICAgUkVHUkVTU0lPTihyMTExMzg3KTogQ1NTT00gcmVwcmVzZW50YXRpb24gb2YgJ2JhY2tn cm91bmQtaW1hZ2UnIHZhbHVlcyBzaG91bGQgYmUgQ1NTUHJpbWl0aXZlVmFsdWUuCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9tYWMvVGlsZUNhY2hlLmgg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9tYWMvVGlsZUNhY2hlLmgKaW5k ZXggNTdmNDMzM2NmNTQ4M2FiYzBlYThkYTRmNGIwOGYwYjVmYzE1YjExMi4uNjFmMzA1MDBiNGE0 MjA2YmMxMDk5ZDUyYmZjN2IwNzk5NTIyODkwYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvY2EvbWFjL1RpbGVDYWNoZS5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2NhL21hYy9UaWxlQ2FjaGUuaApAQCAtNTYsNyArNTYsNyBAQCBw dWJsaWM6CiAKICAgICB2b2lkIHNldE5lZWRzRGlzcGxheSgpOwogICAgIHZvaWQgc2V0TmVlZHNE aXNwbGF5SW5SZWN0KGNvbnN0IEludFJlY3QmKTsKLSAgICB2b2lkIGRyYXdMYXllcihXZWJUaWxl TGF5ZXIqLCBDR0NvbnRleHRSZWYpOworICAgIHZvaWQgZHJhd0xheWVyKFdlYlRpbGVMYXllciAq LCBDR0NvbnRleHRSZWYpOwogCiAgICAgdm9pZCBzZXRTY2FsZShDR0Zsb2F0KTsKIApAQCAtOTIs NiArOTIsNyBAQCBwcml2YXRlOgogICAgIFJldGFpblB0cjxXZWJUaWxlTGF5ZXI+IGNyZWF0ZVRp bGVMYXllcihjb25zdCBJbnRSZWN0Jik7CiAKICAgICBib29sIHNob3VsZFNob3dSZXBhaW50Q291 bnRlcnMoKSBjb25zdDsKKyAgICB2b2lkIGRyYXdSZXBhaW50Q291bnRlcihXZWJUaWxlTGF5ZXIg KiwgQ0dDb250ZXh0UmVmKTsKIAogICAgIFdlYlRpbGVDYWNoZUxheWVyKiBtX3RpbGVDYWNoZUxh eWVyOwogICAgIFJldGFpblB0cjxDQUxheWVyPiBtX3RpbGVDb250YWluZXJMYXllcjsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhL21hYy9UaWxlQ2FjaGUu bW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9tYWMvVGlsZUNhY2hlLm1t CmluZGV4IDI2ZTA5MGM1OTNhZDc5MzNmZWJjMTQzNzFhOGZlMmU5OGUwZTFjZWEuLjlmYTZhNDhj MDI4ODRhMjJmNDFiOTllYWNhOGEzYmE4MGViMTIyOTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhL21hYy9UaWxlQ2FjaGUubW0KKysrIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2EvbWFjL1RpbGVDYWNoZS5tbQpAQCAtMTIzLDcgKzEy Myw3IEBAIHZvaWQgVGlsZUNhY2hlOjpzZXROZWVkc0Rpc3BsYXlJblJlY3QoY29uc3QgSW50UmVj dCYgcmVjdCkKICAgICB9CiB9CiAKLXZvaWQgVGlsZUNhY2hlOjpkcmF3TGF5ZXIoV2ViVGlsZUxh eWVyKiBsYXllciwgQ0dDb250ZXh0UmVmIGNvbnRleHQpCit2b2lkIFRpbGVDYWNoZTo6ZHJhd0xh eWVyKFdlYlRpbGVMYXllciAqbGF5ZXIsIENHQ29udGV4dFJlZiBjb250ZXh0KQogewogICAgIFBs YXRmb3JtQ0FMYXllciogcGxhdGZvcm1MYXllciA9IFBsYXRmb3JtQ0FMYXllcjo6cGxhdGZvcm1D QUxheWVyKG1fdGlsZUNhY2hlTGF5ZXIpOwogICAgIGlmICghcGxhdGZvcm1MYXllcikKQEAgLTEz OCwzNiArMTM4LDcgQEAgdm9pZCBUaWxlQ2FjaGU6OmRyYXdMYXllcihXZWJUaWxlTGF5ZXIqIGxh eWVyLCBDR0NvbnRleHRSZWYgY29udGV4dCkKIAogICAgIENHQ29udGV4dFJlc3RvcmVHU3RhdGUo Y29udGV4dCk7CiAKLSAgICB1bnNpZ25lZCByZXBhaW50Q291bnQgPSBbbGF5ZXIgaW5jcmVtZW50 UmVwYWludENvdW50XTsKLSAgICBpZiAoIXNob3VsZFNob3dSZXBhaW50Q291bnRlcnMoKSkKLSAg ICAgICAgcmV0dXJuOwotCi0gICAgLy8gRklYTUU6IFNvbWUgb2YgdGhpcyBjb2RlIGNvdWxkIGJl IHNoYXJlZCB3aXRoIFdlYkxheWVyLgotICAgIGNoYXIgdGV4dFsxNl07IC8vIHRoYXQncyBhIGxv dCBvZiByZXBhaW50cwotICAgIHNucHJpbnRmKHRleHQsIHNpemVvZih0ZXh0KSwgIiVkIiwgcmVw YWludENvdW50KTsKLQotICAgIENHUmVjdCBpbmRpY2F0b3JCb3ggPSBbbGF5ZXIgYm91bmRzXTsK LSAgICBpbmRpY2F0b3JCb3guc2l6ZS53aWR0aCA9IDEyICsgMTAgKiBzdHJsZW4odGV4dCk7Ci0g ICAgaW5kaWNhdG9yQm94LnNpemUuaGVpZ2h0ID0gMjc7Ci0gICAgQ0dDb250ZXh0U2F2ZUdTdGF0 ZShjb250ZXh0KTsKLQotICAgIENHQ29udGV4dFNldEFscGhhKGNvbnRleHQsIDAuNWYpOwotICAg IENHQ29udGV4dEJlZ2luVHJhbnNwYXJlbmN5TGF5ZXJXaXRoUmVjdChjb250ZXh0LCBpbmRpY2F0 b3JCb3gsIDApOwotCi0gICAgQ0dDb250ZXh0U2V0RmlsbENvbG9yV2l0aENvbG9yKGNvbnRleHQs IG1fdGlsZURlYnVnQm9yZGVyQ29sb3IuZ2V0KCkpOwotICAgIENHQ29udGV4dEZpbGxSZWN0KGNv bnRleHQsIGluZGljYXRvckJveCk7Ci0KLSAgICBpZiAocGxhdGZvcm1MYXllci0+YWNjZWxlcmF0 ZXNEcmF3aW5nKCkpCi0gICAgICAgIENHQ29udGV4dFNldFJHQkZpbGxDb2xvcihjb250ZXh0LCAx LCAwLCAwLCAxKTsKLSAgICBlbHNlCi0gICAgICAgIENHQ29udGV4dFNldFJHQkZpbGxDb2xvcihj b250ZXh0LCAxLCAxLCAxLCAxKTsKLQotICAgIENHQ29udGV4dFNldFRleHRNYXRyaXgoY29udGV4 dCwgQ0dBZmZpbmVUcmFuc2Zvcm1NYWtlU2NhbGUoMSwgLTEpKTsKLSAgICBDR0NvbnRleHRTZWxl Y3RGb250KGNvbnRleHQsICJIZWx2ZXRpY2EiLCAyMiwga0NHRW5jb2RpbmdNYWNSb21hbik7Ci0g ICAgQ0dDb250ZXh0U2hvd1RleHRBdFBvaW50KGNvbnRleHQsIGluZGljYXRvckJveC5vcmlnaW4u eCArIDUsIGluZGljYXRvckJveC5vcmlnaW4ueSArIDIyLCB0ZXh0LCBzdHJsZW4odGV4dCkpOwot Ci0gICAgQ0dDb250ZXh0RW5kVHJhbnNwYXJlbmN5TGF5ZXIoY29udGV4dCk7Ci0gICAgQ0dDb250 ZXh0UmVzdG9yZUdTdGF0ZShjb250ZXh0KTsKKyAgICBkcmF3UmVwYWludENvdW50ZXIobGF5ZXIs IGNvbnRleHQpOwogfQogCiB2b2lkIFRpbGVDYWNoZTo6c2V0U2NhbGUoQ0dGbG9hdCBzY2FsZSkK QEAgLTQzOSw0ICs0MTAsNDAgQEAgYm9vbCBUaWxlQ2FjaGU6OnNob3VsZFNob3dSZXBhaW50Q291 bnRlcnMoKSBjb25zdAogICAgIHJldHVybiBsYXllckNvbnRlbnRzLT5wbGF0Zm9ybUNBTGF5ZXJT aG93UmVwYWludENvdW50ZXIoKTsKIH0KIAordm9pZCBUaWxlQ2FjaGU6OmRyYXdSZXBhaW50Q291 bnRlcihXZWJUaWxlTGF5ZXIgKmxheWVyLCBDR0NvbnRleHRSZWYgY29udGV4dCkKK3sKKyAgICB1 bnNpZ25lZCByZXBhaW50Q291bnQgPSBbbGF5ZXIgaW5jcmVtZW50UmVwYWludENvdW50XTsKKyAg ICBpZiAoIXNob3VsZFNob3dSZXBhaW50Q291bnRlcnMoKSkKKyAgICAgICAgcmV0dXJuOworCisg ICAgLy8gRklYTUU6IFNvbWUgb2YgdGhpcyBjb2RlIGNvdWxkIGJlIHNoYXJlZCB3aXRoIFdlYkxh eWVyLgorICAgIGNoYXIgdGV4dFsxNl07IC8vIHRoYXQncyBhIGxvdCBvZiByZXBhaW50cworICAg IHNucHJpbnRmKHRleHQsIHNpemVvZih0ZXh0KSwgIiVkIiwgcmVwYWludENvdW50KTsKKworICAg IENHUmVjdCBpbmRpY2F0b3JCb3ggPSBbbGF5ZXIgYm91bmRzXTsKKyAgICBpbmRpY2F0b3JCb3gu c2l6ZS53aWR0aCA9IDEyICsgMTAgKiBzdHJsZW4odGV4dCk7CisgICAgaW5kaWNhdG9yQm94LnNp emUuaGVpZ2h0ID0gMjc7CisgICAgQ0dDb250ZXh0U2F2ZUdTdGF0ZShjb250ZXh0KTsKKworICAg IENHQ29udGV4dFNldEFscGhhKGNvbnRleHQsIDAuNWYpOworICAgIENHQ29udGV4dEJlZ2luVHJh bnNwYXJlbmN5TGF5ZXJXaXRoUmVjdChjb250ZXh0LCBpbmRpY2F0b3JCb3gsIDApOworCisgICAg Q0dDb250ZXh0U2V0RmlsbENvbG9yV2l0aENvbG9yKGNvbnRleHQsIG1fdGlsZURlYnVnQm9yZGVy Q29sb3IuZ2V0KCkpOworICAgIENHQ29udGV4dEZpbGxSZWN0KGNvbnRleHQsIGluZGljYXRvckJv eCk7CisKKyAgICBQbGF0Zm9ybUNBTGF5ZXIqIHBsYXRmb3JtTGF5ZXIgPSBQbGF0Zm9ybUNBTGF5 ZXI6OnBsYXRmb3JtQ0FMYXllcihtX3RpbGVDYWNoZUxheWVyKTsKKworICAgIGlmIChwbGF0Zm9y bUxheWVyLT5hY2NlbGVyYXRlc0RyYXdpbmcoKSkKKyAgICAgICAgQ0dDb250ZXh0U2V0UkdCRmls bENvbG9yKGNvbnRleHQsIDEsIDAsIDAsIDEpOworICAgIGVsc2UKKyAgICAgICAgQ0dDb250ZXh0 U2V0UkdCRmlsbENvbG9yKGNvbnRleHQsIDEsIDEsIDEsIDEpOworCisgICAgQ0dDb250ZXh0U2V0 VGV4dE1hdHJpeChjb250ZXh0LCBDR0FmZmluZVRyYW5zZm9ybU1ha2VTY2FsZSgxLCAtMSkpOwor ICAgIENHQ29udGV4dFNlbGVjdEZvbnQoY29udGV4dCwgIkhlbHZldGljYSIsIDIyLCBrQ0dFbmNv ZGluZ01hY1JvbWFuKTsKKyAgICBDR0NvbnRleHRTaG93VGV4dEF0UG9pbnQoY29udGV4dCwgaW5k aWNhdG9yQm94Lm9yaWdpbi54ICsgNSwgaW5kaWNhdG9yQm94Lm9yaWdpbi55ICsgMjIsIHRleHQs IHN0cmxlbih0ZXh0KSk7CisKKyAgICBDR0NvbnRleHRFbmRUcmFuc3BhcmVuY3lMYXllcihjb250 ZXh0KTsKKyAgICBDR0NvbnRleHRSZXN0b3JlR1N0YXRlKGNvbnRleHQpOworfQorCiB9IC8vIG5h bWVzcGFjZSBXZWJDb3JlCg==