53448 2011-01-31 13:01:11 -0800 Some favicons not correctly decoded by Chromium/Mac 2011-02-02 12:26:15 -0800 1 1 1 Unclassified WebKit Images 528+ (Nightly build) Mac (Intel) OS X 10.6 RESOLVED FIXED P2 Normal --- 1 maf maf kbr oldest_to_newest 342771 0 maf 2011-01-31 13:01:11 -0800 What steps will reproduce the problem? 1. Bookmark "www.frys.com" in a Chromium-based browser. Actual: No favicon show up. It is blank. Expected: Show Favicon. See chromium bug http://code.google.com/p/chromium/issues/detail?id=34797 The code responsible is Mac/Chromium specific code in the WebKit tree, specifically in WebKit/chromium/src/WebImageCG.cpp. The fix is to change the implementation of WebImage::fromData() to be more discriminating, using equivalent code to the WebImageSkia implementation. 342787 1 80674 maf 2011-01-31 13:31:32 -0800 Created attachment 80674 Use the same frame selection logic as the WebImageSkia code, rather than just picking frame[0]. 344131 2 80949 kbr 2011-02-02 12:23:53 -0800 Created attachment 80949 Patch 344133 3 kbr 2011-02-02 12:24:43 -0800 Re-indented patch for maf and provided ChangeLog entry. Verified fix manually in Chromium. 344137 4 80949 kbr 2011-02-02 12:25:14 -0800 Comment on attachment 80949 Patch Looks fine. Verified fix in Chromium. 344138 5 kbr 2011-02-02 12:26:15 -0800 Committed r77400: <http://trac.webkit.org/changeset/77400> 80674 2011-01-31 13:31:32 -0800 2011-02-02 12:23:51 -0800 Use the same frame selection logic as the WebImageSkia code, rather than just picking frame[0]. WebImageCG.cpp_fix.diff text/plain 2052 maf SW5kZXg6IGNocm9taXVtL3NyYy9XZWJJbWFnZUNHLmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBjaHJvbWl1 bS9zcmMvV2ViSW1hZ2VDRy5jcHAJKHJldmlzaW9uIDc2OTQwKQorKysgY2hyb21pdW0vc3JjL1dl YkltYWdlQ0cuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00OSwyMCArNDksMzggQEAKCiBXZWJJbWFn ZSBXZWJJbWFnZTo6ZnJvbURhdGEoY29uc3QgV2ViRGF0YSYgZGF0YSwgY29uc3QgV2ViU2l6ZSYg ZGVzaXJlZFNpemUpCiB7Ci0gICAgLy8gRklYTUU6IERvIHNvbWV0aGluZyBsaWtlIHdoYXQgV2Vi SW1hZ2VTa2lhLmNwcCBkb2VzIHRvIGVudW1lcmF0ZSBmcmFtZXMuCi0gICAgLy8gTm90IHN1cmUg d2hldGhlciB0aGUgQ0cgZGVjb2RlciB1c2VzIHRoZSBzYW1lIGZyYW1lIG9yZGVyaW5nIHJ1bGVz IChpZiBzbwotICAgIC8vIHdlIGNhbiBqdXN0IHVzZSB0aGUgc2FtZSBsb2dpYykuCi0KLSAgICBJ bWFnZVNvdXJjZSBzb3VyY2U7Ci0gICAgc291cmNlLnNldERhdGEoUGFzc1JlZlB0cjxTaGFyZWRC dWZmZXI+KGRhdGEpLmdldCgpLCB0cnVlKTsKLSAgICBpZiAoIXNvdXJjZS5pc1NpemVBdmFpbGFi bGUoKSkKLSAgICAgICAgcmV0dXJuIFdlYkltYWdlKCk7Ci0KLSAgICBSZXRhaW5QdHI8Q0dJbWFn ZVJlZj4gZnJhbWUwKEFkb3B0Q0YsIHNvdXJjZS5jcmVhdGVGcmFtZUF0SW5kZXgoMCkpOwotICAg IGlmICghZnJhbWUwKQotICAgICAgICByZXR1cm4gV2ViSW1hZ2UoKTsKLQotICAgIHJldHVybiBX ZWJJbWFnZShmcmFtZTAuZ2V0KCkpOworICBJbWFnZVNvdXJjZSBzb3VyY2U7CisgIHNvdXJjZS5z ZXREYXRhKFBhc3NSZWZQdHI8U2hhcmVkQnVmZmVyPihkYXRhKS5nZXQoKSwgdHJ1ZSk7CisgIGlm ICghc291cmNlLmlzU2l6ZUF2YWlsYWJsZSgpKQorICAgIHJldHVybiBXZWJJbWFnZSgpOworCisg IC8vIEZyYW1lcyBhcmUgYXJyYW5nZWQgYnkgZGVjcmVhc2luZyBzaXplLCB0aGVuIGRlY3JlYXNp bmcgYml0IGRlcHRoLgorICAvLyBQaWNrIHRoZSBmcmFtZSBjbG9zZXN0IHRvIHxkZXNpcmVkU2l6 ZXwncyBhcmVhIHdpdGhvdXQgYmVpbmcgc21hbGxlciwKKyAgLy8gd2hpY2ggaGFzIHRoZSBoaWdo ZXN0IGJpdCBkZXB0aC4KKyAgY29uc3Qgc2l6ZV90IGZyYW1lQ291bnQgPSBzb3VyY2UuZnJhbWVD b3VudCgpOworICBzaXplX3QgaW5kZXggPSAwOyAgLy8gRGVmYXVsdCB0byBmaXJzdCBmcmFtZSBp ZiBub25lIGFyZSBsYXJnZSBlbm91Z2guCisgIGludCBmcmFtZUFyZWFBdEluZGV4ID0gMDsKKyAg Zm9yIChzaXplX3QgaSA9IDA7IGkgPCBmcmFtZUNvdW50OyArK2kpIHsKKyAgICBjb25zdCBJbnRT aXplIGZyYW1lU2l6ZSA9IHNvdXJjZS5mcmFtZVNpemVBdEluZGV4KGkpOworICAgIGlmIChXZWJT aXplKGZyYW1lU2l6ZSkgPT0gZGVzaXJlZFNpemUpIHsKKyAgICAgIGluZGV4ID0gaTsKKyAgICAg IGJyZWFrOyAgLy8gUGVyZmVjdCBtYXRjaC4KKyAgICB9CisgICAgY29uc3QgaW50IGZyYW1lQXJl YSA9IGZyYW1lU2l6ZS53aWR0aCgpICogZnJhbWVTaXplLmhlaWdodCgpOworICAgIGlmIChmcmFt ZUFyZWEgPCAoZGVzaXJlZFNpemUud2lkdGggKiBkZXNpcmVkU2l6ZS5oZWlnaHQpKQorICAgICAg YnJlYWs7ICAvLyBObyBtb3JlIGZyYW1lcyB0aGF0IGFyZSBsYXJnZSBlbm91Z2guCisKKyAgICBp ZiAoIWkgfHwgKGZyYW1lQXJlYSA8IGZyYW1lQXJlYUF0SW5kZXgpKSB7CisgICAgICBpbmRleCA9 IGk7ICAvLyBDbG9zZXIgdG8gZGVzaXJlZCBhcmVhIHRoYW4gcHJldmlvdXMgYmVzdCBtYXRjaC4K KyAgICAgIGZyYW1lQXJlYUF0SW5kZXggPSBmcmFtZUFyZWE7CisgICAgfQorICB9CisKKyAgUmV0 YWluUHRyPENHSW1hZ2VSZWY+IGZyYW1lKEFkb3B0Q0YsIHNvdXJjZS5jcmVhdGVGcmFtZUF0SW5k ZXgoaW5kZXgpKTsKKyAgaWYgKCFmcmFtZSkKKyAgICByZXR1cm4gV2ViSW1hZ2UoKTsKKworICBy ZXR1cm4gV2ViSW1hZ2UoZnJhbWUuZ2V0KCkpOwogfQoKIHZvaWQgV2ViSW1hZ2U6OnJlc2V0KCkK 80949 2011-02-02 12:23:53 -0800 2011-02-02 12:25:14 -0800 Patch bug-53448-20110202122352.patch text/plain 2620 kbr SW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCShyZXZpc2lvbiA3NzM5NikKKysrIFNvdXJj ZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTMg QEAKKzIwMTEtMDItMDIgIE1hdHRoZXcgVm9zYnVyZ2ggIDxtYWZAY2hyb21pdW0ub3JnPgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFNvbWUgZmF2aWNv bnMgbm90IGNvcnJlY3RseSBkZWNvZGVkIGJ5IENocm9taXVtL01hYworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTM0NDgKKworICAgICAgICAqIHNyYy9X ZWJJbWFnZUNHLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViSW1hZ2U6OmZyb21EYXRhKToKKwog MjAxMS0wMi0wMiAgRGltaXRyaSBHbGF6a292ICA8ZGdsYXprb3ZAY2hyb21pdW0ub3JnPgogCiAg ICAgICAgIFJldmlld2VkIGJ5IERhdmUgSHlhdHQuCkluZGV4OiBTb3VyY2UvV2ViS2l0L2Nocm9t aXVtL3NyYy9XZWJJbWFnZUNHLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L2Nocm9t aXVtL3NyYy9XZWJJbWFnZUNHLmNwcAkocmV2aXNpb24gNzczODUpCisrKyBTb3VyY2UvV2ViS2l0 L2Nocm9taXVtL3NyYy9XZWJJbWFnZUNHLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDksMjAgKzQ5 LDM4IEBAIG5hbWVzcGFjZSBXZWJLaXQgewogCiBXZWJJbWFnZSBXZWJJbWFnZTo6ZnJvbURhdGEo Y29uc3QgV2ViRGF0YSYgZGF0YSwgY29uc3QgV2ViU2l6ZSYgZGVzaXJlZFNpemUpCiB7Ci0gICAg Ly8gRklYTUU6IERvIHNvbWV0aGluZyBsaWtlIHdoYXQgV2ViSW1hZ2VTa2lhLmNwcCBkb2VzIHRv IGVudW1lcmF0ZSBmcmFtZXMuCi0gICAgLy8gTm90IHN1cmUgd2hldGhlciB0aGUgQ0cgZGVjb2Rl ciB1c2VzIHRoZSBzYW1lIGZyYW1lIG9yZGVyaW5nIHJ1bGVzIChpZiBzbwotICAgIC8vIHdlIGNh biBqdXN0IHVzZSB0aGUgc2FtZSBsb2dpYykuCi0KICAgICBJbWFnZVNvdXJjZSBzb3VyY2U7CiAg ICAgc291cmNlLnNldERhdGEoUGFzc1JlZlB0cjxTaGFyZWRCdWZmZXI+KGRhdGEpLmdldCgpLCB0 cnVlKTsKICAgICBpZiAoIXNvdXJjZS5pc1NpemVBdmFpbGFibGUoKSkKICAgICAgICAgcmV0dXJu IFdlYkltYWdlKCk7CiAKLSAgICBSZXRhaW5QdHI8Q0dJbWFnZVJlZj4gZnJhbWUwKEFkb3B0Q0Ys IHNvdXJjZS5jcmVhdGVGcmFtZUF0SW5kZXgoMCkpOwotICAgIGlmICghZnJhbWUwKQorICAgIC8v IEZyYW1lcyBhcmUgYXJyYW5nZWQgYnkgZGVjcmVhc2luZyBzaXplLCB0aGVuIGRlY3JlYXNpbmcg Yml0IGRlcHRoLgorICAgIC8vIFBpY2sgdGhlIGZyYW1lIGNsb3Nlc3QgdG8gfGRlc2lyZWRTaXpl fCdzIGFyZWEgd2l0aG91dCBiZWluZyBzbWFsbGVyLAorICAgIC8vIHdoaWNoIGhhcyB0aGUgaGln aGVzdCBiaXQgZGVwdGguCisgICAgY29uc3Qgc2l6ZV90IGZyYW1lQ291bnQgPSBzb3VyY2UuZnJh bWVDb3VudCgpOworICAgIHNpemVfdCBpbmRleCA9IDA7IC8vIERlZmF1bHQgdG8gZmlyc3QgZnJh bWUgaWYgbm9uZSBhcmUgbGFyZ2UgZW5vdWdoLgorICAgIGludCBmcmFtZUFyZWFBdEluZGV4ID0g MDsKKyAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IGZyYW1lQ291bnQ7ICsraSkgeworICAgICAg ICBjb25zdCBJbnRTaXplIGZyYW1lU2l6ZSA9IHNvdXJjZS5mcmFtZVNpemVBdEluZGV4KGkpOwor ICAgICAgICBpZiAoV2ViU2l6ZShmcmFtZVNpemUpID09IGRlc2lyZWRTaXplKSB7CisgICAgICAg ICAgICBpbmRleCA9IGk7CisgICAgICAgICAgICBicmVhazsgLy8gUGVyZmVjdCBtYXRjaC4KKyAg ICAgICAgfQorICAgICAgICBjb25zdCBpbnQgZnJhbWVBcmVhID0gZnJhbWVTaXplLndpZHRoKCkg KiBmcmFtZVNpemUuaGVpZ2h0KCk7CisgICAgICAgIGlmIChmcmFtZUFyZWEgPCAoZGVzaXJlZFNp emUud2lkdGggKiBkZXNpcmVkU2l6ZS5oZWlnaHQpKQorICAgICAgICAgICAgYnJlYWs7IC8vIE5v IG1vcmUgZnJhbWVzIHRoYXQgYXJlIGxhcmdlIGVub3VnaC4KKworICAgICAgICBpZiAoIWkgfHwg KGZyYW1lQXJlYSA8IGZyYW1lQXJlYUF0SW5kZXgpKSB7CisgICAgICAgICAgICBpbmRleCA9IGk7 IC8vIENsb3NlciB0byBkZXNpcmVkIGFyZWEgdGhhbiBwcmV2aW91cyBiZXN0IG1hdGNoLgorICAg ICAgICAgICAgZnJhbWVBcmVhQXRJbmRleCA9IGZyYW1lQXJlYTsKKyAgICAgICAgfQorICAgIH0K KworICAgIFJldGFpblB0cjxDR0ltYWdlUmVmPiBmcmFtZShBZG9wdENGLCBzb3VyY2UuY3JlYXRl RnJhbWVBdEluZGV4KGluZGV4KSk7CisgICAgaWYgKCFmcmFtZSkKICAgICAgICAgcmV0dXJuIFdl YkltYWdlKCk7CiAKLSAgICByZXR1cm4gV2ViSW1hZ2UoZnJhbWUwLmdldCgpKTsKKyAgICByZXR1 cm4gV2ViSW1hZ2UoZnJhbWUuZ2V0KCkpOwogfQogCiB2b2lkIFdlYkltYWdlOjpyZXNldCgpCg==