37979 2010-04-22 00:36:17 -0700 [chromium] fix ImageDiff compile on windows 2010-04-22 01:04:24 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 tony webkit-unassigned oldest_to_newest 215755 0 tony 2010-04-22 00:36:17 -0700 [chromium] fix ImageDiff compile on windows 215756 1 54035 tony 2010-04-22 00:36:41 -0700 Created attachment 54035 Patch 215768 2 54035 tkent 2010-04-22 00:55:05 -0700 Comment on attachment 54035 Patch This is a build fix. So I think we may commit it without review. > --- a/WebKitTools/DumpRenderTree/chromium/ImageDiff.cpp > +++ b/WebKitTools/DumpRenderTree/chromium/ImageDiff.cpp > @@ -39,12 +39,15 @@ > #include "gfx/codec/png_codec.h" > #include <algorithm> > #include <stdio.h> > -#include <string.h> > -#include <string> > #include <vector> strcmp() is used. We had better not remove string.h. 215769 3 54039 tony 2010-04-22 01:00:00 -0700 Created attachment 54039 Patch 215770 4 tony 2010-04-22 01:03:25 -0700 (In reply to comment #2) > (From update of attachment 54035 [details]) > > --- a/WebKitTools/DumpRenderTree/chromium/ImageDiff.cpp > > +++ b/WebKitTools/DumpRenderTree/chromium/ImageDiff.cpp > > @@ -39,12 +39,15 @@ > > #include "gfx/codec/png_codec.h" > > #include <algorithm> > > #include <stdio.h> > > -#include <string.h> > > -#include <string> > > #include <vector> > > strcmp() is used. We had better not remove string.h. Good catch. Attempting to land the revised patch now. 215771 5 tony 2010-04-22 01:04:02 -0700 Committed r58073: <http://trac.webkit.org/changeset/58073> 54035 2010-04-22 00:36:41 -0700 2010-04-22 00:59:54 -0700 Patch bug-37979-20100422163639.patch text/plain 1082 tony ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBmMGZhZDgxLi5hZWJjMGFjIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMTAtMDQt MjIgIFRvbnkgQ2hhbmcgIDx0b255QGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbY2hyb21pdW1dIGZpeCBJbWFnZURpZmYgY29t cGlsZSBvbiB3aW5kb3dzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0zNzk3OQorCisgICAgICAgICogRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vSW1hZ2VE aWZmLmNwcDoKKwogMjAxMC0wNC0yMSAgQWRhbSBCYXJ0aCAgPGFiYXJ0aEB3ZWJraXQub3JnPgog CiAgICAgICAgIFJldmlld2VkIGJ5IEVyaWMgU2VpZGVsLgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9v bHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vSW1hZ2VEaWZmLmNwcCBiL1dlYktpdFRvb2xzL0R1 bXBSZW5kZXJUcmVlL2Nocm9taXVtL0ltYWdlRGlmZi5jcHAKaW5kZXggODFkNWY2Mi4uZDQ1NDYz MiAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vSW1hZ2VE aWZmLmNwcAorKysgYi9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9JbWFnZURp ZmYuY3BwCkBAIC0zOSwxMiArMzksMTUgQEAKICNpbmNsdWRlICJnZngvY29kZWMvcG5nX2NvZGVj LmgiCiAjaW5jbHVkZSA8YWxnb3JpdGhtPgogI2luY2x1ZGUgPHN0ZGlvLmg+Ci0jaW5jbHVkZSA8 c3RyaW5nLmg+Ci0jaW5jbHVkZSA8c3RyaW5nPgogI2luY2x1ZGUgPHZlY3Rvcj4KICNpbmNsdWRl IDx3dGYvT3duQXJyYXlQdHIuaD4KICNpbmNsdWRlIDx3dGYvVmVjdG9yLmg+CiAKKyNpZiBPUyhX SU5ET1dTKQorI2luY2x1ZGUgPHdpbmRvd3MuaD4KKyNkZWZpbmUgUEFUSF9NQVggTUFYX1BBVEgK KyNlbmRpZgorCiB1c2luZyBuYW1lc3BhY2UgZ2Z4OwogdXNpbmcgbmFtZXNwYWNlIHN0ZDsKIAo= 54039 2010-04-22 01:00:00 -0700 2010-04-22 01:04:24 -0700 Patch bug-37979-20100422165958.patch text/plain 1073 tony ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBiNGUxZTI5Li5kMmM0MTBmIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMTAtMDQt MjIgIFRvbnkgQ2hhbmcgIDx0b255QGNocm9taXVtLm9yZz4KKworICAgICAgICBOb3QgcmV2aWV3 ZWQsIGJ1aWxkIGZpeCBmb3IgY2hyb21pdW0gV2luZG93cy4KKworICAgICAgICBbY2hyb21pdW1d IGZpeCBJbWFnZURpZmYgY29tcGlsZSBvbiB3aW5kb3dzCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNzk3OQorCisgICAgICAgICogRHVtcFJlbmRlclRy ZWUvY2hyb21pdW0vSW1hZ2VEaWZmLmNwcDoKKwogMjAxMC0wNC0yMiAgQWRhbSBCYXJ0aCAgPGFi YXJ0aEB3ZWJraXQub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHI1ODA2 OS4KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL0ltYWdl RGlmZi5jcHAgYi9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9JbWFnZURpZmYu Y3BwCmluZGV4IDgxZDVmNjIuLjI3ZTk5NDYgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL0R1bXBS ZW5kZXJUcmVlL2Nocm9taXVtL0ltYWdlRGlmZi5jcHAKKysrIGIvV2ViS2l0VG9vbHMvRHVtcFJl bmRlclRyZWUvY2hyb21pdW0vSW1hZ2VEaWZmLmNwcApAQCAtNDAsMTEgKzQwLDE1IEBACiAjaW5j bHVkZSA8YWxnb3JpdGhtPgogI2luY2x1ZGUgPHN0ZGlvLmg+CiAjaW5jbHVkZSA8c3RyaW5nLmg+ Ci0jaW5jbHVkZSA8c3RyaW5nPgogI2luY2x1ZGUgPHZlY3Rvcj4KICNpbmNsdWRlIDx3dGYvT3du QXJyYXlQdHIuaD4KICNpbmNsdWRlIDx3dGYvVmVjdG9yLmg+CiAKKyNpZiBPUyhXSU5ET1dTKQor I2luY2x1ZGUgPHdpbmRvd3MuaD4KKyNkZWZpbmUgUEFUSF9NQVggTUFYX1BBVEgKKyNlbmRpZgor CiB1c2luZyBuYW1lc3BhY2UgZ2Z4OwogdXNpbmcgbmFtZXNwYWNlIHN0ZDsKIAo=