73796 2011-12-04 20:38:22 -0800 WebPImageDecoder computes image width and height multiple times 2011-12-06 12:48:59 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 58851 1 noel.gordon noel.gordon abarth pascal.massimino webkit.review.bot oldest_to_newest 514861 0 noel.gordon 2011-12-04 20:38:22 -0800 The decoded image height and width are constants, so read them once rather than multiple times. 514866 1 117834 noel.gordon 2011-12-04 20:43:24 -0800 Created attachment 117834 Patch 516078 2 117834 webkit.review.bot 2011-12-06 11:29:58 -0800 Comment on attachment 117834 Patch Clearing flags on attachment: 117834 Committed r102158: <http://trac.webkit.org/changeset/102158> 516079 3 webkit.review.bot 2011-12-06 11:30:02 -0800 All reviewed patches have been landed. Closing bug. 516170 4 pascal.massimino 2011-12-06 12:48:59 -0800 LGTM. 117834 2011-12-04 20:43:24 -0800 2011-12-06 11:29:58 -0800 Patch bug-73796-20111205154031.patch text/plain 4035 noel.gordon U3VidmVyc2lvbiBSZXZpc2lvbjogMTAxOTY5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTY5YjFiOTlmMDEwZmNh Mjk3ZjdlYWEyODVmZTkzNDA5OGIzOWFjNi4uMjhiZDQzMGJmMjdjNDJiZjYzNTQ4OGIwNTNlMTBk ZDA0YjhjYWIzMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDExLTEyLTA0ICBOb2Vs IEdvcmRvbiAgPG5vZWwuZ29yZG9uQGdtYWlsLmNvbT4KKworICAgICAgICBXZWJQSW1hZ2VEZWNv ZGVyIGNvbXB1dGVzIGltYWdlIHdpZHRoIGFuZCBoZWlnaHQgbXVsdGlwbGUgdGltZXMKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTczNzk2CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgT25jZSBzdWZmaWNpZW50 IGltYWdlIGRhdGEgYXJyaXZlcywgd2UgY2FuIGNvbXB1dGUgdGhlIGRlY29kZWQgaW1hZ2UgaGVp Z2h0CisgICAgICAgIGFuZCB3aWR0aCBmcm9tIHRoZSBXRUJQIGltYWdlIGhlYWRlciBkYXRhLgor CisgICAgICAgIEZyb20gdGhlbiBvbiwgdGhlIGRlY29kZWQgaW1hZ2Ugc2l6ZSBpcyBrbm93biBz byB0aGVyZSdzIG5vIG5lZWQgdG8gcmUtcmVhZAorICAgICAgICBpdCBmcm9tIHRoZSBXRUJQIGlt YWdlIGhlYWRlciBhZ2Fpbi4KKworICAgICAgICBObyBjaGFuZ2UgaW4gYmVoYXZpb3IsIHNvIG5v IG5ldyB0ZXN0cy4KKworICAgICAgICAqIHBsYXRmb3JtL2ltYWdlLWRlY29kZXJzL3dlYnAvV0VC UEltYWdlRGVjb2Rlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpXRUJQSW1hZ2VEZWNvZGVyOjpk ZWNvZGUpOgorCiAyMDExLTEyLTA0ICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgog CiAgICAgICAgIEhJRVJBUkNIWV9SRVFVRVNUX0VSUiBjaGVjayBpbiBjaGVja0FjY2VwdENoaWxk IHNob3VsZCBiZSBvcHRpbWl6ZWQgZm9yIG5ld0NoaWxkIHdpdGhvdXQgY2hpbGRyZW4KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2ltYWdlLWRlY29kZXJzL3dlYnAvV0VCUElt YWdlRGVjb2Rlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pbWFnZS1kZWNvZGVycy93 ZWJwL1dFQlBJbWFnZURlY29kZXIuY3BwCmluZGV4IDRjZGE4MWQ4MDNlOTA1NDVmNWZmZGM4M2Y1 ZTUzNTM2ZGQ2MDhlMTkuLjY3MjNkNjFjOGRiYmM3ZTZhZjAwNDRhYjcxZDM5MWIxMjhkMGNjZmQg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2ltYWdlLWRlY29kZXJzL3dlYnAv V0VCUEltYWdlRGVjb2Rlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW1hZ2Ut ZGVjb2RlcnMvd2VicC9XRUJQSW1hZ2VEZWNvZGVyLmNwcApAQCAtODUsMjYgKzg1LDMxIEBAIGJv b2wgV0VCUEltYWdlRGVjb2Rlcjo6ZGVjb2RlKGJvb2wgb25seVNpemUpCiAgICAgaWYgKGZhaWxl ZCgpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKKyAgICBjb25zdCB1aW50OF90KiBkYXRhQnl0 ZXMgPSByZWludGVycHJldF9jYXN0PGNvbnN0IHVpbnQ4X3QqPihtX2RhdGEtPmRhdGEoKSk7CiAg ICAgY29uc3Qgc2l6ZV90IGRhdGFTaXplID0gbV9kYXRhLT5zaXplKCk7Ci0gICAgaWYgKGRhdGFT aXplIDwgc2l6ZU9mSGVhZGVyKQotICAgICAgICByZXR1cm4gdHJ1ZTsKIAotICAgIGludCB3aWR0 aCwgaGVpZ2h0OwotICAgIGNvbnN0IHVpbnQ4X3QqIGRhdGFCeXRlcyA9IHJlaW50ZXJwcmV0X2Nh c3Q8Y29uc3QgdWludDhfdCo+KG1fZGF0YS0+ZGF0YSgpKTsKLSAgICBpZiAoIVdlYlBHZXRJbmZv KGRhdGFCeXRlcywgZGF0YVNpemUsICZ3aWR0aCwgJmhlaWdodCkpCi0gICAgICAgIHJldHVybiBz ZXRGYWlsZWQoKTsKLSAgICBpZiAoIUltYWdlRGVjb2Rlcjo6aXNTaXplQXZhaWxhYmxlKCkgJiYg IXNldFNpemUod2lkdGgsIGhlaWdodCkpCi0gICAgICAgIHJldHVybiBzZXRGYWlsZWQoKTsKKyAg ICBpZiAoIUltYWdlRGVjb2Rlcjo6aXNTaXplQXZhaWxhYmxlKCkpIHsKKyAgICAgICAgaWYgKGRh dGFTaXplIDwgc2l6ZU9mSGVhZGVyKQorICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAg ICBpbnQgd2lkdGgsIGhlaWdodDsKKyAgICAgICAgaWYgKCFXZWJQR2V0SW5mbyhkYXRhQnl0ZXMs IGRhdGFTaXplLCAmd2lkdGgsICZoZWlnaHQpKQorICAgICAgICAgICAgcmV0dXJuIHNldEZhaWxl ZCgpOworICAgICAgICBpZiAoIXNldFNpemUod2lkdGgsIGhlaWdodCkpCisgICAgICAgICAgICBy ZXR1cm4gc2V0RmFpbGVkKCk7CisgICAgfQorCisgICAgQVNTRVJUKEltYWdlRGVjb2Rlcjo6aXNT aXplQXZhaWxhYmxlKCkpOwogICAgIGlmIChvbmx5U2l6ZSkKICAgICAgICAgcmV0dXJuIHRydWU7 CisgICAgaW50IHdpZHRoID0gc2l6ZSgpLndpZHRoKCk7CisgICAgaW50IGhlaWdodCA9IHNpemUo KS5oZWlnaHQoKTsKIAogICAgIGJvb2wgYWxsRGF0YVJlY2VpdmVkID0gaXNBbGxEYXRhUmVjZWl2 ZWQoKTsKICAgICBpbnQgc3RyaWRlID0gd2lkdGggKiBieXRlc1BlclBpeGVsOwogICAgIEFTU0VS VCghbV9mcmFtZUJ1ZmZlckNhY2hlLmlzRW1wdHkoKSk7CiAgICAgSW1hZ2VGcmFtZSYgYnVmZmVy ID0gbV9mcmFtZUJ1ZmZlckNhY2hlWzBdOworCiAgICAgaWYgKGJ1ZmZlci5zdGF0dXMoKSA9PSBJ bWFnZUZyYW1lOjpGcmFtZUVtcHR5KSB7Ci0gICAgICAgIEFTU0VSVCh3aWR0aCA9PSBzaXplKCku d2lkdGgoKSk7Ci0gICAgICAgIEFTU0VSVChoZWlnaHQgPT0gc2l6ZSgpLmhlaWdodCgpKTsKICAg ICAgICAgaWYgKCFidWZmZXIuc2V0U2l6ZSh3aWR0aCwgaGVpZ2h0KSkKICAgICAgICAgICAgIHJl dHVybiBzZXRGYWlsZWQoKTsKICAgICAgICAgYnVmZmVyLnNldFN0YXR1cyhhbGxEYXRhUmVjZWl2 ZWQgPyBJbWFnZUZyYW1lOjpGcmFtZUNvbXBsZXRlIDogSW1hZ2VGcmFtZTo6RnJhbWVQYXJ0aWFs KTsKQEAgLTExMyw2ICsxMTgsNyBAQCBib29sIFdFQlBJbWFnZURlY29kZXI6OmRlY29kZShib29s IG9ubHlTaXplKQogICAgICAgICBidWZmZXIuc2V0T3JpZ2luYWxGcmFtZVJlY3QoSW50UmVjdChJ bnRQb2ludCgpLCBzaXplKCkpKTsKICAgICAgICAgbV9yZ2JPdXRwdXQucmVzaXplKGhlaWdodCAq IHN0cmlkZSk7CiAgICAgfQorCiAgICAgaW50IG5ld0xhc3RWaXNpYmxlUm93ID0gMDsgLy8gTGFz dCBjb21wbGV0ZWQgcm93LgogICAgIGlmIChhbGxEYXRhUmVjZWl2ZWQpIHsKICAgICAgICAgaWYg KCFXZWJQRGVjb2RlUkdCSW50byhkYXRhQnl0ZXMsIGRhdGFTaXplLCBtX3JnYk91dHB1dC5kYXRh KCksIG1fcmdiT3V0cHV0LnNpemUoKSwgc3RyaWRlKSkKQEAgLTEzMiwxMiArMTM4LDE0IEBAIGJv b2wgV0VCUEltYWdlRGVjb2Rlcjo6ZGVjb2RlKGJvb2wgb25seVNpemUpCiAgICAgICAgIEFTU0VS VChuZXdMYXN0VmlzaWJsZVJvdyA+PSAwKTsKICAgICAgICAgQVNTRVJUKG5ld0xhc3RWaXNpYmxl Um93IDw9IGhlaWdodCk7CiAgICAgfQorCiAgICAgLy8gRklYTUU6IHJlbW92ZSB0aGlzIGRhdGEg Y29weS4KICAgICBmb3IgKGludCB5ID0gbV9sYXN0VmlzaWJsZVJvdzsgeSA8IG5ld0xhc3RWaXNp YmxlUm93OyArK3kpIHsKICAgICAgICAgY29uc3QgdWludDhfdCogY29uc3Qgc3JjID0gJm1fcmdi T3V0cHV0W3kgKiBzdHJpZGVdOwogICAgICAgICBmb3IgKGludCB4ID0gMDsgeCA8IHdpZHRoOyAr K3gpCiAgICAgICAgICAgICBidWZmZXIuc2V0UkdCQSh4LCB5LCBzcmNbYnl0ZXNQZXJQaXhlbCAq IHggKyAwXSwgc3JjW2J5dGVzUGVyUGl4ZWwgKiB4ICsgMV0sIHNyY1tieXRlc1BlclBpeGVsICog eCArIDJdLCAweGZmKTsKICAgICB9CisKICAgICBtX2xhc3RWaXNpYmxlUm93ID0gbmV3TGFzdFZp c2libGVSb3c7CiAgICAgaWYgKG1fbGFzdFZpc2libGVSb3cgPT0gaGVpZ2h0KQogICAgICAgICAg YnVmZmVyLnNldFN0YXR1cyhJbWFnZUZyYW1lOjpGcmFtZUNvbXBsZXRlKTsK