58862 2011-04-18 19:57:26 -0700 [Windows, WinCairo] Teach DIBPixelData to Write to a file 2011-04-19 10:01:47 -0700 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) PC Windows 7 RESOLVED FIXED P2 Normal --- 1 bfulgham bfulgham webkit.review.bot oldest_to_newest 388250 0 bfulgham 2011-04-18 19:57:26 -0700 The attached patch extends the DIBPixelData class with a utility function to dump the bitmap to disk. I found this extremely helpful when working on some recent Windows development. 388312 1 90149 bfulgham 2011-04-18 23:01:34 -0700 Created attachment 90149 Patch 388313 2 webkit.review.bot 2011-04-18 23:04:48 -0700 Attachment 90149 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCor..." exit_code: 1 Source/WebCore/platform/graphics/win/DIBPixelData.cpp:32: One space before end of line comments [whitespace/comments] [5] Total errors found: 1 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style. 388314 3 90150 bfulgham 2011-04-18 23:08:37 -0700 Created attachment 90150 Patch 388543 4 90150 aroben 2011-04-19 09:24:35 -0700 Comment on attachment 90150 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=90150&action=review > Source/WebCore/platform/graphics/win/DIBPixelData.cpp:32 > +const WORD s_bitmapType = 0x4d42; > +const WORD s_bitmapPixelsPerMeter = 2834; // 72 dpi No need for the s_ prefixes here. But you should mark them "static". > Source/WebCore/platform/graphics/win/DIBPixelData.h:52 > + void writeToFile(LPCWSTR); Maybe this function should be wrapped in #ifndef NDEBUG? 388563 5 bfulgham 2011-04-19 10:01:47 -0700 Landed in http://trac.webkit.org/changeset/84261. 90149 2011-04-18 23:01:34 -0700 2011-04-18 23:08:37 -0700 Patch dib_file.patch text/plain 4022 bfulgham SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg0MjIxKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTEtMDQtMTggIEJyZW50IEZ1 bGdoYW0gIDxiZnVsZ2hhbUB3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEV4dGVuZCB0aGUgRElCUGl4ZWxEYXRhIGNsYXNzIHdpdGgg dGhlIGZhY2lsaXR5IGZvciB3cml0aW5nIHRoZQorICAgICAgICBiaXRtYXAgcmVwcmVzZW50YXRp b24gdG8gZGlzayBmb3IgZGVidWdnaW5nIHB1cnBvc2VzLgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTg4NjIuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9n cmFwaGljcy93aW4vRElCUGl4ZWxEYXRhLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRJQlBpeGVs RGF0YTo6d3JpdGVUb0ZpbGUpOiBOZXcgZnVuY3Rpb24uCisgICAgICAgICogcGxhdGZvcm0vZ3Jh cGhpY3Mvd2luL0RJQlBpeGVsRGF0YS5oOgorCiAyMDExLTA0LTE4ICBQYXNjYWwgTWFzc2ltaW5v ICA8cGFzY2FsLm1hc3NpbWlub0BnbWFpbC5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQWRh bSBCYXJ0aC4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9ESUJQ aXhlbERhdGEuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL3dpbi9ESUJQaXhlbERhdGEuY3BwCShyZXZpc2lvbiA4NDIxNSkKKysrIFNvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9ESUJQaXhlbERhdGEuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC0yOCw2ICsyOCw5IEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAorY29uc3QgV09SRCBz X2JpdG1hcFR5cGUgPSAweDRkNDI7Citjb25zdCBXT1JEIHNfYml0bWFwUGl4ZWxzUGVyTWV0ZXIg PSAyODM0OyAgIC8vIDcyIGRwaQorCiBESUJQaXhlbERhdGE6OkRJQlBpeGVsRGF0YShIQklUTUFQ IGJpdG1hcCkKIHsKICAgICBpbml0aWFsaXplKGJpdG1hcCk7CkBAIC00NSw0ICs0OCwzOCBAQCB2 b2lkIERJQlBpeGVsRGF0YTo6aW5pdGlhbGl6ZShIQklUTUFQIGJpCiAgICAgbV9iaXRzUGVyUGl4 ZWwgPSBibXBJbmZvLmJtQml0c1BpeGVsOwogfQogCit2b2lkIERJQlBpeGVsRGF0YTo6d3JpdGVU b0ZpbGUoTFBDV1NUUiBmaWxlUGF0aCkKK3sNCisgICAgSEFORExFIGhGaWxlID0gOjpDcmVhdGVG aWxlKGZpbGVQYXRoLCBHRU5FUklDX1dSSVRFLCAwLCAwLCBDUkVBVEVfQUxXQVlTLCBGSUxFX0FU VFJJQlVURV9OT1JNQUwsIDApOw0KKyAgICBpZiAoSU5WQUxJRF9IQU5ETEVfVkFMVUUgPT0gaEZp bGUpCisgICAgICAgIHJldHVybjsKKw0KKyAgICBCSVRNQVBGSUxFSEVBREVSIGhlYWRlcjsNCisg ICAgaGVhZGVyLmJmVHlwZSA9IHNfYml0bWFwVHlwZTsNCisgICAgaGVhZGVyLmJmT2ZmQml0cyA9 IHNpemVvZihCSVRNQVBGSUxFSEVBREVSKSArIHNpemVvZihCSVRNQVBJTkZPSEVBREVSKTsNCisg ICAgaGVhZGVyLmJmUmVzZXJ2ZWQxID0gMDsNCisgICAgaGVhZGVyLmJmUmVzZXJ2ZWQyID0gMDsN CisgICAgaGVhZGVyLmJmU2l6ZSA9IHNpemVvZihCSVRNQVBGSUxFSEVBREVSKTsNCisNCisgICAg QklUTUFQSU5GT0hFQURFUiBpbmZvOw0KKyAgICBpbmZvLmJpU2l6ZSA9IHNpemVvZihCSVRNQVBJ TkZPSEVBREVSKTsNCisgICAgaW5mby5iaVdpZHRoID0gbV9zaXplLndpZHRoKCk7DQorICAgIGlu Zm8uYmlIZWlnaHQgPSBtX3NpemUuaGVpZ2h0KCk7DQorICAgIGluZm8uYmlQbGFuZXMgPSAxOw0K KyAgICBpbmZvLmJpQml0Q291bnQgPSBtX2JpdHNQZXJQaXhlbDsNCisgICAgaW5mby5iaUNvbXBy ZXNzaW9uID0gQklfUkdCOw0KKyAgICBpbmZvLmJpU2l6ZUltYWdlID0gYnVmZmVyTGVuZ3RoKCk7 DQorICAgIGluZm8uYmlYUGVsc1Blck1ldGVyID0gc19iaXRtYXBQaXhlbHNQZXJNZXRlcjsNCisg ICAgaW5mby5iaVlQZWxzUGVyTWV0ZXIgPSBzX2JpdG1hcFBpeGVsc1Blck1ldGVyOw0KKyAgICBp bmZvLmJpQ2xyVXNlZCA9IDA7DQorICAgIGluZm8uYmlDbHJJbXBvcnRhbnQgPSAwOw0KKw0KKyAg ICBEV09SRCBieXRlc1dyaXR0ZW4gPSAwOw0KKyAgICA6OldyaXRlRmlsZShoRmlsZSwgJmhlYWRl ciwgc2l6ZW9mKGhlYWRlciksICZieXRlc1dyaXR0ZW4sIDApOw0KKyAgICA6OldyaXRlRmlsZSho RmlsZSwgJmluZm8sIHNpemVvZihpbmZvKSwgJmJ5dGVzV3JpdHRlbiwgMCk7DQorICAgIDo6V3Jp dGVGaWxlKGhGaWxlLCBidWZmZXIoKSwgYnVmZmVyTGVuZ3RoKCksICZieXRlc1dyaXR0ZW4sIDAp Ow0KKw0KKyAgICA6OkNsb3NlSGFuZGxlKGhGaWxlKTsNCit9CisKIH0gLy8gbmFtZXNwYWNlIFdl YkNvcmUKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9ESUJQaXhl bERhdGEuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93 aW4vRElCUGl4ZWxEYXRhLmgJKHJldmlzaW9uIDg0MjE1KQorKysgU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3Mvd2luL0RJQlBpeGVsRGF0YS5oCSh3b3JraW5nIGNvcHkpCkBAIC00OSw2 ICs0OSw4IEBAIGNsYXNzIERJQlBpeGVsRGF0YSB7CiAKICAgICAgICAgdm9pZCBpbml0aWFsaXpl KEhCSVRNQVApOwogCisgICAgICAgIHZvaWQgd3JpdGVUb0ZpbGUoTFBDV1NUUik7CisKICAgICAg ICAgVUludDgqIGJ1ZmZlcigpIGNvbnN0IHsgcmV0dXJuIG1fYml0bWFwQnVmZmVyOyB9CiAgICAg ICAgIHVuc2lnbmVkIGJ1ZmZlckxlbmd0aCgpIGNvbnN0IHsgcmV0dXJuIG1fYml0bWFwQnVmZmVy TGVuZ3RoOyB9CiAgICAgICAgIGNvbnN0IEludFNpemUmIHNpemUoKSBjb25zdCB7IHJldHVybiBt X3NpemU7IH0KSW5kZXg6IFdlYktpdExpYnJhcmllcy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g V2ViS2l0TGlicmFyaWVzL0NoYW5nZUxvZwkocmV2aXNpb24gODQyMTUpCisrKyBXZWJLaXRMaWJy YXJpZXMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTIgQEAKKzIwMTEtMDQt MTcgIEJyZW50IEZ1bGdoYW0gIDxiZnVsZ2hhbUB3ZWJraXQub3JnPgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRvdWNoIHByb3BlcnR5IGZpbGUgdG8g Zm9yY2UgY2xlYW4gYnVpbGQgb24gV2luZG93cy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTU4MzAwCisKKyAgICAgICAgKiB3aW4vdG9vbHMvdnNwcm9w cy9jb21tb24udnNwcm9wczoKKwogMjAxMS0wNC0xNSAgU2hpc2hpciBBZ3Jhd2FsICA8c2hpc2hp ckBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgSmFtZXMgUm9iaW5zb24uCklu ZGV4OiBXZWJLaXRMaWJyYXJpZXMvd2luL3Rvb2xzL3ZzcHJvcHMvY29tbW9uLnZzcHJvcHMKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gV2ViS2l0TGlicmFyaWVzL3dpbi90b29scy92c3Byb3BzL2NvbW1vbi52c3By b3BzCShyZXZpc2lvbiA4NDIxNSkKKysrIFdlYktpdExpYnJhcmllcy93aW4vdG9vbHMvdnNwcm9w cy9jb21tb24udnNwcm9wcwkod29ya2luZyBjb3B5KQpAQCAtNjUsMyArNjUsNCBAQAogCS8+CiA8 L1Zpc3VhbFN0dWRpb1Byb3BlcnR5U2hlZXQ+CiAKKwo= 90150 2011-04-18 23:08:37 -0700 2011-04-19 09:24:35 -0700 Patch dib_file.patch text/plain 3113 bfulgham SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg0MjIxKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTEtMDQtMTggIEJyZW50IEZ1 bGdoYW0gIDxiZnVsZ2hhbUB3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEV4dGVuZCB0aGUgRElCUGl4ZWxEYXRhIGNsYXNzIHdpdGgg dGhlIGZhY2lsaXR5IGZvciB3cml0aW5nIHRoZQorICAgICAgICBiaXRtYXAgcmVwcmVzZW50YXRp b24gdG8gZGlzayBmb3IgZGVidWdnaW5nIHB1cnBvc2VzLgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTg4NjIuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9n cmFwaGljcy93aW4vRElCUGl4ZWxEYXRhLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRJQlBpeGVs RGF0YTo6d3JpdGVUb0ZpbGUpOiBOZXcgZnVuY3Rpb24uCisgICAgICAgICogcGxhdGZvcm0vZ3Jh cGhpY3Mvd2luL0RJQlBpeGVsRGF0YS5oOgorCiAyMDExLTA0LTE4ICBQYXNjYWwgTWFzc2ltaW5v ICA8cGFzY2FsLm1hc3NpbWlub0BnbWFpbC5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQWRh bSBCYXJ0aC4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9ESUJQ aXhlbERhdGEuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL3dpbi9ESUJQaXhlbERhdGEuY3BwCShyZXZpc2lvbiA4NDIxNSkKKysrIFNvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9ESUJQaXhlbERhdGEuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC0yOCw2ICsyOCw5IEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAorY29uc3QgV09SRCBz X2JpdG1hcFR5cGUgPSAweDRkNDI7Citjb25zdCBXT1JEIHNfYml0bWFwUGl4ZWxzUGVyTWV0ZXIg PSAyODM0OyAvLyA3MiBkcGkKKwogRElCUGl4ZWxEYXRhOjpESUJQaXhlbERhdGEoSEJJVE1BUCBi aXRtYXApCiB7CiAgICAgaW5pdGlhbGl6ZShiaXRtYXApOwpAQCAtNDUsNCArNDgsMzggQEAgdm9p ZCBESUJQaXhlbERhdGE6OmluaXRpYWxpemUoSEJJVE1BUCBiaQogICAgIG1fYml0c1BlclBpeGVs ID0gYm1wSW5mby5ibUJpdHNQaXhlbDsKIH0KIAordm9pZCBESUJQaXhlbERhdGE6OndyaXRlVG9G aWxlKExQQ1dTVFIgZmlsZVBhdGgpCit7CisgICAgSEFORExFIGhGaWxlID0gOjpDcmVhdGVGaWxl KGZpbGVQYXRoLCBHRU5FUklDX1dSSVRFLCAwLCAwLCBDUkVBVEVfQUxXQVlTLCBGSUxFX0FUVFJJ QlVURV9OT1JNQUwsIDApOworICAgIGlmIChJTlZBTElEX0hBTkRMRV9WQUxVRSA9PSBoRmlsZSkK KyAgICAgICAgcmV0dXJuOworCisgICAgQklUTUFQRklMRUhFQURFUiBoZWFkZXI7CisgICAgaGVh ZGVyLmJmVHlwZSA9IHNfYml0bWFwVHlwZTsKKyAgICBoZWFkZXIuYmZPZmZCaXRzID0gc2l6ZW9m KEJJVE1BUEZJTEVIRUFERVIpICsgc2l6ZW9mKEJJVE1BUElORk9IRUFERVIpOworICAgIGhlYWRl ci5iZlJlc2VydmVkMSA9IDA7CisgICAgaGVhZGVyLmJmUmVzZXJ2ZWQyID0gMDsKKyAgICBoZWFk ZXIuYmZTaXplID0gc2l6ZW9mKEJJVE1BUEZJTEVIRUFERVIpOworCisgICAgQklUTUFQSU5GT0hF QURFUiBpbmZvOworICAgIGluZm8uYmlTaXplID0gc2l6ZW9mKEJJVE1BUElORk9IRUFERVIpOwor ICAgIGluZm8uYmlXaWR0aCA9IG1fc2l6ZS53aWR0aCgpOworICAgIGluZm8uYmlIZWlnaHQgPSBt X3NpemUuaGVpZ2h0KCk7CisgICAgaW5mby5iaVBsYW5lcyA9IDE7CisgICAgaW5mby5iaUJpdENv dW50ID0gbV9iaXRzUGVyUGl4ZWw7CisgICAgaW5mby5iaUNvbXByZXNzaW9uID0gQklfUkdCOwor ICAgIGluZm8uYmlTaXplSW1hZ2UgPSBidWZmZXJMZW5ndGgoKTsKKyAgICBpbmZvLmJpWFBlbHNQ ZXJNZXRlciA9IHNfYml0bWFwUGl4ZWxzUGVyTWV0ZXI7CisgICAgaW5mby5iaVlQZWxzUGVyTWV0 ZXIgPSBzX2JpdG1hcFBpeGVsc1Blck1ldGVyOworICAgIGluZm8uYmlDbHJVc2VkID0gMDsKKyAg ICBpbmZvLmJpQ2xySW1wb3J0YW50ID0gMDsKKworICAgIERXT1JEIGJ5dGVzV3JpdHRlbiA9IDA7 CisgICAgOjpXcml0ZUZpbGUoaEZpbGUsICZoZWFkZXIsIHNpemVvZihoZWFkZXIpLCAmYnl0ZXNX cml0dGVuLCAwKTsKKyAgICA6OldyaXRlRmlsZShoRmlsZSwgJmluZm8sIHNpemVvZihpbmZvKSwg JmJ5dGVzV3JpdHRlbiwgMCk7CisgICAgOjpXcml0ZUZpbGUoaEZpbGUsIGJ1ZmZlcigpLCBidWZm ZXJMZW5ndGgoKSwgJmJ5dGVzV3JpdHRlbiwgMCk7CisKKyAgICA6OkNsb3NlSGFuZGxlKGhGaWxl KTsKK30KKwogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpJbmRleDogU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3Mvd2luL0RJQlBpeGVsRGF0YS5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9ESUJQaXhlbERhdGEuaAkocmV2aXNpb24gODQy MTUpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vRElCUGl4ZWxEYXRh LmgJKHdvcmtpbmcgY29weSkKQEAgLTQ5LDYgKzQ5LDggQEAgY2xhc3MgRElCUGl4ZWxEYXRhIHsK IAogICAgICAgICB2b2lkIGluaXRpYWxpemUoSEJJVE1BUCk7CiAKKyAgICAgICAgdm9pZCB3cml0 ZVRvRmlsZShMUENXU1RSKTsKKwogICAgICAgICBVSW50OCogYnVmZmVyKCkgY29uc3QgeyByZXR1 cm4gbV9iaXRtYXBCdWZmZXI7IH0KICAgICAgICAgdW5zaWduZWQgYnVmZmVyTGVuZ3RoKCkgY29u c3QgeyByZXR1cm4gbV9iaXRtYXBCdWZmZXJMZW5ndGg7IH0KICAgICAgICAgY29uc3QgSW50U2l6 ZSYgc2l6ZSgpIGNvbnN0IHsgcmV0dXJuIG1fc2l6ZTsgfQo=