25972 2009-05-22 18:06:43 -0700 Help Disambiguate min/max calls in TimeRanges 2009-05-29 10:37:34 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 bfulgham webkit-unassigned oldest_to_newest 122751 0 bfulgham 2009-05-22 18:06:43 -0700 I am finding that the following change is needed to get a clean build: $ diff TimeRanges.h TimeRanges.h.brent 93,94c93,94 < ret.m_start = min(m_start, range.m_start); < ret.m_end = max(m_end, range.m_end); --- > ret.m_start = std::min(m_start, range.m_start); > ret.m_end = std::max(m_end, range.m_end); It seems that some difference in the include order (or included files) allows the CG builds to handle this without needing to be told to use the std:: template call. 122752 1 30599 bfulgham 2009-05-22 18:13:22 -0700 Created attachment 30599 Help compiler figure out arguments to min/max. 122754 2 30600 bfulgham 2009-05-22 18:16:27 -0700 Created attachment 30600 Disambiguate min/max call. 122769 3 30600 eric 2009-05-22 19:52:44 -0700 Comment on attachment 30600 Disambiguate min/max call. This needs more explanation in the ChangeLog as to why this is necessary or correct. Without that I can't tell. Feel free to explain it to maciej or I (or any other reviewer) in teh bug or over IRC. 123293 4 bfulgham 2009-05-27 09:05:22 -0700 Building the Windows Cairo target, the min/max calls in TimeRanges.h are misinterpreted, leading to a compile-time error: c:\Cygwin\home\bfulgham\WebKit\WebCore\html\TimeRanges.h(93) : error C2440: '=' : cannot convert from 'WebCore::SMILTime' to 'float' No user-defined-conversion operator available that can perform this conversion, or the operator cannot be called c:\Cygwin\home\bfulgham\WebKit\WebCore\html\TimeRanges.h(94) : error C2440: '=' : cannot convert from 'WebCore::SMILTime' to 'float' No user-defined-conversion operator available that can perform this conversion, or the operator cannot be called Somehow, it seems to be confused about the correct signature for min/max, resolving to the animation/SMILTime data type: inline SMILTime max(const SMILTime& a, const SMILTime& b) { return std::max(a.value(), b.value()); } inline SMILTime min(const SMILTime& a, const SMILTime& b) { return std::min(a.value(), b.value()); } Modifying the TimeRanges implementation to explicitly use the std::min/std::max calls resolves the compile error. 123480 5 30755 bfulgham 2009-05-28 15:16:59 -0700 Created attachment 30755 Correct build error. Revise changelog to explain problem. 123486 6 30755 darin 2009-05-28 15:28:14 -0700 Comment on attachment 30755 Correct build error. > + Compiler mistakenly selects SMILTime min/max instead of STL version, Why? What even includes SMILTime? 123521 7 bfulgham 2009-05-28 22:29:21 -0700 (In reply to comment #6) > (From update of attachment 30755 [review]) > > + Compiler mistakenly selects SMILTime min/max instead of STL version, > > Why? What even includes SMILTime? > This is a byproduct of compiling the DerivedSources.cpp file, which includes and builds a ton of stuff. Something in the 300-odd files included by DerivedSources.cpp causes SMILTime.h to be included, which sets us up for the problem. 123548 8 30755 darin 2009-05-29 07:53:15 -0700 Comment on attachment 30755 Correct build error. This is close to correct, but not quite. Since this is a header, it's not appropriate to say "using namespace std" here. We need to remove that. Adding the include of <algorithm> is also good, but it needs to be sorted in with the rest of the includes, not a separate paragraph. And we do indeed need to add the "std::" prefixes. Further, SMILTime.h should not define min and max functions, since the std versions will work fine on SMILTime objects. review- because I'd prefer to see a patch that removes the incorrect "using namespace std". 123555 9 30776 bfulgham 2009-05-29 09:36:37 -0700 Created attachment 30776 Revised per Darin's suggestions. Remove 'using namespace std', place "#include <algorithm>" in similar location as other files. 123557 10 30776 aroben 2009-05-29 09:50:21 -0700 Comment on attachment 30776 Revised per Darin's suggestions. r=me 123563 11 bfulgham 2009-05-29 10:37:34 -0700 Landed in r44265. 30599 2009-05-22 18:13:22 -0700 2009-05-22 18:16:27 -0700 Help compiler figure out arguments to min/max. timeranges.patch text/plain 0 bfulgham 30600 2009-05-22 18:16:27 -0700 2009-05-28 15:16:59 -0700 Disambiguate min/max call. timeranges.patch text/plain 1279 bfulgham SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0NDA3NCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTMgQEAKKzIwMDktMDUtMjIgIEJyZW50IEZ1bGdoYW0gIDxiZnVsZ2hhbUB3ZWJr aXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNTk3MgorICAgICAgICBE aXNhbWJpZ3VhdGUgbWluL21heCBjYWxsIGluIFRpbWVSYW5nZXMuaCBoZWFkZXIuCisKKyAgICAg ICAgKiBodG1sL1RpbWVSYW5nZXMuaDoKKyAgICAgICAgKFdlYkNvcmU6OlRpbWVSYW5nZXM6OlJh bmdlOjp1bmlvbldpdGhPdmVybGFwcGluZ09yQ29udGlndW91c1JhbmdlKToKKwogMjAwOS0wNS0y MiAgQnJlbnQgRnVsZ2hhbSAgPGJmdWxnaGFtQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3 ZWQgYnkgQWRhbSBSb2Jlbi4KSW5kZXg6IFdlYkNvcmUvaHRtbC9UaW1lUmFuZ2VzLmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gV2ViQ29yZS9odG1sL1RpbWVSYW5nZXMuaAkocmV2aXNpb24gNDQwNzApCisrKyBX ZWJDb3JlL2h0bWwvVGltZVJhbmdlcy5oCSh3b3JraW5nIGNvcHkpCkBAIC0yNiw2ICsyNiw4IEBA CiAjaWZuZGVmIFRpbWVSYW5nZXNfaAogI2RlZmluZSBUaW1lUmFuZ2VzX2gKIAorI2luY2x1ZGUg PGFsZ29yaXRobT4KKwogI2luY2x1ZGUgIkV4Y2VwdGlvbkNvZGUuaCIKICNpbmNsdWRlIDx3dGYv UGFzc1JlZlB0ci5oPgogI2luY2x1ZGUgPHd0Zi9SZWZDb3VudGVkLmg+CkBAIC05MCw4ICs5Miw4 IEBAIHByaXZhdGU6CiAgICAgICAgIHsKICAgICAgICAgICAgIFJhbmdlIHJldDsKIAotICAgICAg ICAgICAgcmV0Lm1fc3RhcnQgPSBtaW4obV9zdGFydCwgcmFuZ2UubV9zdGFydCk7Ci0gICAgICAg ICAgICByZXQubV9lbmQgPSBtYXgobV9lbmQsIHJhbmdlLm1fZW5kKTsKKyAgICAgICAgICAgIHJl dC5tX3N0YXJ0ID0gc3RkOjptaW4obV9zdGFydCwgcmFuZ2UubV9zdGFydCk7CisgICAgICAgICAg ICByZXQubV9lbmQgPSBzdGQ6Om1heChtX2VuZCwgcmFuZ2UubV9lbmQpOwogCiAgICAgICAgICAg ICByZXR1cm4gcmV0OwogICAgICAgICB9Cg== 30755 2009-05-28 15:16:59 -0700 2009-05-29 09:36:37 -0700 Correct build error. smilfix.patch text/plain 1468 bfulgham SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0NDI1MikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTcgQEAKKzIwMDktMDUtMjggIEJyZW50IEZ1bGdoYW0gIDxiZnVsZ2hhbUB3ZWJr aXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IEJ1aWxkIGZpeCBmb3IgV2luZG93cyBDYWlybyB0YXJnZXQuCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNTk3MgorCisgICAgICAgIENvbXBpbGVyIG1p c3Rha2VubHkgc2VsZWN0cyBTTUlMVGltZSBtaW4vbWF4IGluc3RlYWQgb2YgU1RMIHZlcnNpb24s CisgICAgICAgIHJlc3VsdGluZyBpbiBhIGJ1aWxkIGVycm9yLiAgVGhpcyBjaGFuZ2UgbWFrZXMg dGhlIG1lYW5pbmcgb2YgdGhlCisgICAgICAgIG1pbi9tYXggZXhwbGljaXQgYW5kIGF2b2lkcyB0 aGUgcHJvYmxlbS4KKworICAgICAgICAqIGh0bWwvVGltZVJhbmdlcy5oOgorICAgICAgICAoV2Vi Q29yZTo6VGltZVJhbmdlczo6UmFuZ2U6OnVuaW9uV2l0aE92ZXJsYXBwaW5nT3JDb250aWd1b3Vz UmFuZ2UpOgorCiAyMDA5LTA1LTI4ICBCcmV0dCBXaWxzb24gIDxicmV0dHdAY2hyb21pdW0ub3Jn PgogCiAgICAgICAgIFVucmV2aWV3ZWQsIGJ1aWxkIGZpeC4KSW5kZXg6IFdlYkNvcmUvaHRtbC9U aW1lUmFuZ2VzLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9odG1sL1RpbWVSYW5nZXMuaAkocmV2 aXNpb24gNDQyMzUpCisrKyBXZWJDb3JlL2h0bWwvVGltZVJhbmdlcy5oCSh3b3JraW5nIGNvcHkp CkBAIC0yNiw2ICsyNiw4IEBACiAjaWZuZGVmIFRpbWVSYW5nZXNfaAogI2RlZmluZSBUaW1lUmFu Z2VzX2gKIAorI2luY2x1ZGUgPGFsZ29yaXRobT4KKwogI2luY2x1ZGUgIkV4Y2VwdGlvbkNvZGUu aCIKICNpbmNsdWRlIDx3dGYvUGFzc1JlZlB0ci5oPgogI2luY2x1ZGUgPHd0Zi9SZWZDb3VudGVk Lmg+CkBAIC05MCw4ICs5Miw4IEBAIHByaXZhdGU6CiAgICAgICAgIHsKICAgICAgICAgICAgIFJh bmdlIHJldDsKIAotICAgICAgICAgICAgcmV0Lm1fc3RhcnQgPSBtaW4obV9zdGFydCwgcmFuZ2Uu bV9zdGFydCk7Ci0gICAgICAgICAgICByZXQubV9lbmQgPSBtYXgobV9lbmQsIHJhbmdlLm1fZW5k KTsKKyAgICAgICAgICAgIHJldC5tX3N0YXJ0ID0gc3RkOjptaW4obV9zdGFydCwgcmFuZ2UubV9z dGFydCk7CisgICAgICAgICAgICByZXQubV9lbmQgPSBzdGQ6Om1heChtX2VuZCwgcmFuZ2UubV9l bmQpOwogCiAgICAgICAgICAgICByZXR1cm4gcmV0OwogICAgICAgICB9Cg== 30776 2009-05-29 09:36:37 -0700 2009-05-29 09:50:21 -0700 Revised per Darin's suggestions. smilfix.patch text/plain 1574 bfulgham SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0NDI1MikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTcgQEAKKzIwMDktMDUtMjkgIEJyZW50IEZ1bGdoYW0gIDxiZnVsZ2hhbUB3ZWJr aXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IEJ1aWxkIGZpeCBmb3IgV2luZG93cyBDYWlybyB0YXJnZXQuCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNTk3MgorCisgICAgICAgIENvbXBpbGVyIG1p c3Rha2VubHkgc2VsZWN0cyBTTUlMVGltZSBtaW4vbWF4IGluc3RlYWQgb2YgU1RMIHZlcnNpb24s CisgICAgICAgIHJlc3VsdGluZyBpbiBhIGJ1aWxkIGVycm9yLiAgVGhpcyBjaGFuZ2UgbWFrZXMg dGhlIG1lYW5pbmcgb2YgdGhlCisgICAgICAgIG1pbi9tYXggZXhwbGljaXQgYW5kIGF2b2lkcyB0 aGUgcHJvYmxlbS4KKworICAgICAgICAqIGh0bWwvVGltZVJhbmdlcy5oOgorICAgICAgICAoV2Vi Q29yZTo6VGltZVJhbmdlczo6UmFuZ2U6OnVuaW9uV2l0aE92ZXJsYXBwaW5nT3JDb250aWd1b3Vz UmFuZ2UpOgorCiAyMDA5LTA1LTI4ICBCcmV0dCBXaWxzb24gIDxicmV0dHdAY2hyb21pdW0ub3Jn PgogCiAgICAgICAgIFVucmV2aWV3ZWQsIGJ1aWxkIGZpeC4KSW5kZXg6IFdlYkNvcmUvaHRtbC9U aW1lUmFuZ2VzLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9odG1sL1RpbWVSYW5nZXMuaAkocmV2 aXNpb24gNDQyNjEpCisrKyBXZWJDb3JlL2h0bWwvVGltZVJhbmdlcy5oCSh3b3JraW5nIGNvcHkp CkBAIC0yNywxMiArMjcsMTIgQEAKICNkZWZpbmUgVGltZVJhbmdlc19oCiAKICNpbmNsdWRlICJF eGNlcHRpb25Db2RlLmgiCisKKyNpbmNsdWRlIDxhbGdvcml0aG0+CiAjaW5jbHVkZSA8d3RmL1Bh c3NSZWZQdHIuaD4KICNpbmNsdWRlIDx3dGYvUmVmQ291bnRlZC5oPgogI2luY2x1ZGUgPHd0Zi9W ZWN0b3IuaD4KIAotdXNpbmcgbmFtZXNwYWNlIHN0ZDsKLQogbmFtZXNwYWNlIFdlYkNvcmUgewog CiBjbGFzcyBUaW1lUmFuZ2VzIDogcHVibGljIFJlZkNvdW50ZWQ8VGltZVJhbmdlcz4gewpAQCAt OTAsOCArOTAsOCBAQCBwcml2YXRlOgogICAgICAgICB7CiAgICAgICAgICAgICBSYW5nZSByZXQ7 CiAKLSAgICAgICAgICAgIHJldC5tX3N0YXJ0ID0gbWluKG1fc3RhcnQsIHJhbmdlLm1fc3RhcnQp OwotICAgICAgICAgICAgcmV0Lm1fZW5kID0gbWF4KG1fZW5kLCByYW5nZS5tX2VuZCk7CisgICAg ICAgICAgICByZXQubV9zdGFydCA9IHN0ZDo6bWluKG1fc3RhcnQsIHJhbmdlLm1fc3RhcnQpOwor ICAgICAgICAgICAgcmV0Lm1fZW5kID0gc3RkOjptYXgobV9lbmQsIHJhbmdlLm1fZW5kKTsKIAog ICAgICAgICAgICAgcmV0dXJuIHJldDsKICAgICAgICAgfQo=