13985 2007-06-04 07:58:31 -0700 WebCore/rendering/RenderTable.cpp fails to compile with gcc 4.2.x 2007-07-06 04:45:30 -0700 1 1 1 Unclassified WebKit WebCore Misc. 523.x (Safari 3) PC Linux RESOLVED FIXED P2 Normal --- 1 bero webkit-unassigned ddkilzer mrowe oldest_to_newest 8461 0 bero 2007-06-04 07:58:31 -0700 ../../../WebCore/rendering/RenderTable.cpp: In member function 'int WebCore::RenderTable::calcBorderLeft() const': ../../../WebCore/rendering/RenderTable.cpp:722: error: no matching function for call to 'max(unsigned int&, const short unsigned int:12&)' ../../../WebCore/rendering/RenderTable.cpp:735: error: no matching function for call to 'max(unsigned int&, const short unsigned int:12&)' ../../../WebCore/rendering/RenderTable.cpp:749: error: no matching function for call to 'max(unsigned int&, const short unsigned int:12&)' ../../../WebCore/rendering/RenderTable.cpp:751: error: no matching function for call to 'max(unsigned int&, const short unsigned int:12&)' ../../../WebCore/rendering/RenderTable.cpp: In member function 'int WebCore::RenderTable::calcBorderRight() const': ../../../WebCore/rendering/RenderTable.cpp:781: error: no matching function for call to 'max(unsigned int&, const short unsigned int:12&)' ../../../WebCore/rendering/RenderTable.cpp:794: error: no matching function for call to 'max(unsigned int&, const short unsigned int:12&)' ../../../WebCore/rendering/RenderTable.cpp:808: error: no matching function for call to 'max(unsigned int&, const short unsigned int:12&)' ../../../WebCore/rendering/RenderTable.cpp:810: error: no matching function for call to 'max(unsigned int&, const short unsigned int:12&)' make[1]: *** [tmp/RenderTable.o] Error 1 8459 1 14851 bero 2007-06-04 08:15:48 -0700 Created attachment 14851 Fix The problem is that "unsigned int" and "unsigned int:12" are no longer considered the same type. 8444 2 14851 ddkilzer 2007-06-04 09:48:34 -0700 Comment on attachment 14851 Fix Thanks for posting a patch to fix this, Bernhard! In the future, please set the "review?" flag on patches so that they may be flagged for review, and please add a ChangeLog entry for the updates. See this page for more details: http://webkit.org/coding/contributing.html >- borderWidth = max(borderWidth, gb.width); >+ borderWidth = max(borderWidth, (unsigned int)gb.width); In all of these cases, we prefer to use the static_cast<>() syntax and "unsigned" instead of "unsigned int": >+ borderWidth = max(borderWidth, static_cast<unsigned>(gb.width)); Please add a ChangeLog entry, update the patch and repost. Thanks! 8231 3 14859 bero 2007-06-05 00:56:00 -0700 Created attachment 14859 Fix adjusted to WebKit coding style 8232 4 14860 bero 2007-06-05 00:57:32 -0700 Created attachment 14860 Fix adjusted to WebKit coding style Forgot to do the unsigned int -> unsigned bit, updated patch 8364 5 14860 sam 2007-06-06 11:45:22 -0700 Comment on attachment 14860 Fix adjusted to WebKit coding style This looks fine. 7198 6 14860 mrowe 2007-06-18 10:03:30 -0700 Comment on attachment 14860 Fix adjusted to WebKit coding style Your patch is in some weird format that svn-apply does not understand. Can you please resubmit it in a format that we can actually apply? 7030 7 15140 bero 2007-06-20 09:13:50 -0700 Created attachment 15140 Same patch, rediffed to not need patch -p1 The patch was a standard unified diff, you just need to use patch -p1 to apply it because its path names include the name of the top level directory. Rediffed to apply with patch -p0, which seems to be what svn-apply uses. 5387 8 mrowe 2007-07-06 04:45:30 -0700 Landed in r24058. Thanks for the patch! I think the thing that threw svn-apply off was the lack of the "Index: path/to/file" headers in the patch. Keep in mind that our style guideline requires spaces rather than tabs for indentation, even in the ChangeLog. 14851 2007-06-04 08:15:48 -0700 2007-06-05 00:56:00 -0700 Fix WebKit-gcc-4.2.patch text/plain 2585 bero LS0tIFdlYktpdC9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJsZS5jcHAuYXJrCTIwMDctMDYt MDQgMTY6NDk6MTMuMDAwMDAwMDAwICswMDAwCisrKyBXZWJLaXQvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyVGFibGUuY3BwCTIwMDctMDYtMDQgMTc6MDc6MzYuMDAwMDAwMDAwICswMDAwCkBAIC03 MTksNyArNzE5LDcgQEAKICAgICAgICAgICAgIGlmIChnYi5zdHlsZSgpID09IEJISURERU4pCiAg ICAgICAgICAgICAgICAgcmV0dXJuIDA7CiAgICAgICAgICAgICBpZiAoZ2Iuc3R5bGUoKSA+IEJI SURERU4pCi0gICAgICAgICAgICAgICAgYm9yZGVyV2lkdGggPSBtYXgoYm9yZGVyV2lkdGgsIGdi LndpZHRoKTsKKyAgICAgICAgICAgICAgICBib3JkZXJXaWR0aCA9IG1heChib3JkZXJXaWR0aCwg KHVuc2lnbmVkIGludClnYi53aWR0aCk7CiAgICAgICAgIH0KICAgICAgICAgCiAgICAgICAgIFJl bmRlclRhYmxlU2VjdGlvbiogZmlyc3ROb25FbXB0eVNlY3Rpb24gPSBtX2hlYWQgPyBtX2hlYWQg OiAobV9maXJzdEJvZHkgPyBtX2ZpcnN0Qm9keSA6IG1fZm9vdCk7CkBAIC03MzIsNyArNzMyLDcg QEAKICAgICAgICAgICAgICAgICByZXR1cm4gMDsKIAogICAgICAgICAgICAgaWYgKHNiLnN0eWxl KCkgPiBCSElEREVOKQotICAgICAgICAgICAgICAgIGJvcmRlcldpZHRoID0gbWF4KGJvcmRlcldp ZHRoLCBzYi53aWR0aCk7CisgICAgICAgICAgICAgICAgYm9yZGVyV2lkdGggPSBtYXgoYm9yZGVy V2lkdGgsICh1bnNpZ25lZCBpbnQpc2Iud2lkdGgpOwogCiAgICAgICAgICAgICBjb25zdCBSZW5k ZXJUYWJsZVNlY3Rpb246OkNlbGxTdHJ1Y3QmIGNzID0gZmlyc3ROb25FbXB0eVNlY3Rpb24tPmNl bGxBdCgwLCBsZWZ0bW9zdENvbHVtbik7CiAgICAgICAgICAgICAKQEAgLTc0Niw5ICs3NDYsOSBA QAogICAgICAgICAgICAgICAgICAgICByZXR1cm4gMDsKIAogICAgICAgICAgICAgICAgIGlmIChj Yi5zdHlsZSgpID4gQkhJRERFTikKLSAgICAgICAgICAgICAgICAgICAgYm9yZGVyV2lkdGggPSBt YXgoYm9yZGVyV2lkdGgsIGNiLndpZHRoKTsKKyAgICAgICAgICAgICAgICAgICAgYm9yZGVyV2lk dGggPSBtYXgoYm9yZGVyV2lkdGgsICh1bnNpZ25lZCBpbnQpY2Iud2lkdGgpOwogICAgICAgICAg ICAgICAgIGlmIChyYi5zdHlsZSgpID4gQkhJRERFTikKLSAgICAgICAgICAgICAgICAgICAgYm9y ZGVyV2lkdGggPSBtYXgoYm9yZGVyV2lkdGgsIHJiLndpZHRoKTsKKyAgICAgICAgICAgICAgICAg ICAgYm9yZGVyV2lkdGggPSBtYXgoYm9yZGVyV2lkdGgsICh1bnNpZ25lZCBpbnQpcmIud2lkdGgp OwogICAgICAgICAgICAgfQogICAgICAgICB9CiAgICAgICAgIHJldHVybiBib3JkZXJXaWR0aCAv IDI7CkBAIC03NzgsNyArNzc4LDcgQEAKICAgICAgICAgICAgIGlmIChnYi5zdHlsZSgpID09IEJI SURERU4pCiAgICAgICAgICAgICAgICAgcmV0dXJuIDA7CiAgICAgICAgICAgICBpZiAoZ2Iuc3R5 bGUoKSA+IEJISURERU4pCi0gICAgICAgICAgICAgICAgYm9yZGVyV2lkdGggPSBtYXgoYm9yZGVy V2lkdGgsIGdiLndpZHRoKTsKKyAgICAgICAgICAgICAgICBib3JkZXJXaWR0aCA9IG1heChib3Jk ZXJXaWR0aCwgKHVuc2lnbmVkIGludClnYi53aWR0aCk7CiAgICAgICAgIH0KICAgICAgICAgCiAg ICAgICAgIFJlbmRlclRhYmxlU2VjdGlvbiogZmlyc3ROb25FbXB0eVNlY3Rpb24gPSBtX2hlYWQg PyBtX2hlYWQgOiAobV9maXJzdEJvZHkgPyBtX2ZpcnN0Qm9keSA6IG1fZm9vdCk7CkBAIC03OTEs NyArNzkxLDcgQEAKICAgICAgICAgICAgICAgICByZXR1cm4gMDsKIAogICAgICAgICAgICAgaWYg KHNiLnN0eWxlKCkgPiBCSElEREVOKQotICAgICAgICAgICAgICAgIGJvcmRlcldpZHRoID0gbWF4 KGJvcmRlcldpZHRoLCBzYi53aWR0aCk7CisgICAgICAgICAgICAgICAgYm9yZGVyV2lkdGggPSBt YXgoYm9yZGVyV2lkdGgsICh1bnNpZ25lZCBpbnQpc2Iud2lkdGgpOwogCiAgICAgICAgICAgICBj b25zdCBSZW5kZXJUYWJsZVNlY3Rpb246OkNlbGxTdHJ1Y3QmIGNzID0gZmlyc3ROb25FbXB0eVNl Y3Rpb24tPmNlbGxBdCgwLCByaWdodG1vc3RDb2x1bW4pOwogICAgICAgICAgICAgCkBAIC04MDUs OSArODA1LDkgQEAKICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIDA7CiAKICAgICAgICAgICAg ICAgICBpZiAoY2Iuc3R5bGUoKSA+IEJISURERU4pCi0gICAgICAgICAgICAgICAgICAgIGJvcmRl cldpZHRoID0gbWF4KGJvcmRlcldpZHRoLCBjYi53aWR0aCk7CisgICAgICAgICAgICAgICAgICAg IGJvcmRlcldpZHRoID0gbWF4KGJvcmRlcldpZHRoLCAodW5zaWduZWQgaW50KWNiLndpZHRoKTsK ICAgICAgICAgICAgICAgICBpZiAocmIuc3R5bGUoKSA+IEJISURERU4pCi0gICAgICAgICAgICAg ICAgICAgIGJvcmRlcldpZHRoID0gbWF4KGJvcmRlcldpZHRoLCByYi53aWR0aCk7CisgICAgICAg ICAgICAgICAgICAgIGJvcmRlcldpZHRoID0gbWF4KGJvcmRlcldpZHRoLCAodW5zaWduZWQgaW50 KXJiLndpZHRoKTsKICAgICAgICAgICAgIH0KICAgICAgICAgfQogICAgICAgICByZXR1cm4gKGJv cmRlcldpZHRoICsgMSkgLyAyOwo= 14859 2007-06-05 00:56:00 -0700 2007-06-05 00:57:32 -0700 Fix adjusted to WebKit coding style WebKit-gcc-4.2.patch text/plain 3099 bero LS0tIFdlYktpdC9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJsZS5jcHAuYXJrCTIwMDctMDYt MDQgMTY6NDk6MTMuMDAwMDAwMDAwICswMDAwCisrKyBXZWJLaXQvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyVGFibGUuY3BwCTIwMDctMDYtMDQgMTc6MDc6MzYuMDAwMDAwMDAwICswMDAwCkBAIC03 MTksNyArNzE5LDcgQEAKICAgICAgICAgICAgIGlmIChnYi5zdHlsZSgpID09IEJISURERU4pCiAg ICAgICAgICAgICAgICAgcmV0dXJuIDA7CiAgICAgICAgICAgICBpZiAoZ2Iuc3R5bGUoKSA+IEJI SURERU4pCi0gICAgICAgICAgICAgICAgYm9yZGVyV2lkdGggPSBtYXgoYm9yZGVyV2lkdGgsIGdi LndpZHRoKTsKKyAgICAgICAgICAgICAgICBib3JkZXJXaWR0aCA9IG1heChib3JkZXJXaWR0aCwg c3RhdGljX2Nhc3Q8dW5zaWduZWQgaW50PihnYi53aWR0aCkpOwogICAgICAgICB9CiAgICAgICAg IAogICAgICAgICBSZW5kZXJUYWJsZVNlY3Rpb24qIGZpcnN0Tm9uRW1wdHlTZWN0aW9uID0gbV9o ZWFkID8gbV9oZWFkIDogKG1fZmlyc3RCb2R5ID8gbV9maXJzdEJvZHkgOiBtX2Zvb3QpOwpAQCAt NzMyLDcgKzczMiw3IEBACiAgICAgICAgICAgICAgICAgcmV0dXJuIDA7CiAKICAgICAgICAgICAg IGlmIChzYi5zdHlsZSgpID4gQkhJRERFTikKLSAgICAgICAgICAgICAgICBib3JkZXJXaWR0aCA9 IG1heChib3JkZXJXaWR0aCwgc2Iud2lkdGgpOworICAgICAgICAgICAgICAgIGJvcmRlcldpZHRo ID0gbWF4KGJvcmRlcldpZHRoLCBzdGF0aWNfY2FzdDx1bnNpZ25lZCBpbnQ+KHNiLndpZHRoKSk7 CiAKICAgICAgICAgICAgIGNvbnN0IFJlbmRlclRhYmxlU2VjdGlvbjo6Q2VsbFN0cnVjdCYgY3Mg PSBmaXJzdE5vbkVtcHR5U2VjdGlvbi0+Y2VsbEF0KDAsIGxlZnRtb3N0Q29sdW1uKTsKICAgICAg ICAgICAgIApAQCAtNzQ2LDkgKzc0Niw5IEBACiAgICAgICAgICAgICAgICAgICAgIHJldHVybiAw OwogCiAgICAgICAgICAgICAgICAgaWYgKGNiLnN0eWxlKCkgPiBCSElEREVOKQotICAgICAgICAg ICAgICAgICAgICBib3JkZXJXaWR0aCA9IG1heChib3JkZXJXaWR0aCwgY2Iud2lkdGgpOworICAg ICAgICAgICAgICAgICAgICBib3JkZXJXaWR0aCA9IG1heChib3JkZXJXaWR0aCwgc3RhdGljX2Nh c3Q8dW5zaWduZWQgaW50PihjYi53aWR0aCkpOwogICAgICAgICAgICAgICAgIGlmIChyYi5zdHls ZSgpID4gQkhJRERFTikKLSAgICAgICAgICAgICAgICAgICAgYm9yZGVyV2lkdGggPSBtYXgoYm9y ZGVyV2lkdGgsIHJiLndpZHRoKTsKKyAgICAgICAgICAgICAgICAgICAgYm9yZGVyV2lkdGggPSBt YXgoYm9yZGVyV2lkdGgsIHN0YXRpY19jYXN0PHVuc2lnbmVkIGludD4ocmIud2lkdGgpKTsKICAg ICAgICAgICAgIH0KICAgICAgICAgfQogICAgICAgICByZXR1cm4gYm9yZGVyV2lkdGggLyAyOwpA QCAtNzc4LDcgKzc3OCw3IEBACiAgICAgICAgICAgICBpZiAoZ2Iuc3R5bGUoKSA9PSBCSElEREVO KQogICAgICAgICAgICAgICAgIHJldHVybiAwOwogICAgICAgICAgICAgaWYgKGdiLnN0eWxlKCkg PiBCSElEREVOKQotICAgICAgICAgICAgICAgIGJvcmRlcldpZHRoID0gbWF4KGJvcmRlcldpZHRo LCBnYi53aWR0aCk7CisgICAgICAgICAgICAgICAgYm9yZGVyV2lkdGggPSBtYXgoYm9yZGVyV2lk dGgsIHN0YXRpY19jYXN0PHVuc2lnbmVkIGludD4oZ2Iud2lkdGgpKTsKICAgICAgICAgfQogICAg ICAgICAKICAgICAgICAgUmVuZGVyVGFibGVTZWN0aW9uKiBmaXJzdE5vbkVtcHR5U2VjdGlvbiA9 IG1faGVhZCA/IG1faGVhZCA6IChtX2ZpcnN0Qm9keSA/IG1fZmlyc3RCb2R5IDogbV9mb290KTsK QEAgLTc5MSw3ICs3OTEsNyBAQAogICAgICAgICAgICAgICAgIHJldHVybiAwOwogCiAgICAgICAg ICAgICBpZiAoc2Iuc3R5bGUoKSA+IEJISURERU4pCi0gICAgICAgICAgICAgICAgYm9yZGVyV2lk dGggPSBtYXgoYm9yZGVyV2lkdGgsIHNiLndpZHRoKTsKKyAgICAgICAgICAgICAgICBib3JkZXJX aWR0aCA9IG1heChib3JkZXJXaWR0aCwgc3RhdGljX2Nhc3Q8dW5zaWduZWQgaW50PihzYi53aWR0 aCkpOwogCiAgICAgICAgICAgICBjb25zdCBSZW5kZXJUYWJsZVNlY3Rpb246OkNlbGxTdHJ1Y3Qm IGNzID0gZmlyc3ROb25FbXB0eVNlY3Rpb24tPmNlbGxBdCgwLCByaWdodG1vc3RDb2x1bW4pOwog ICAgICAgICAgICAgCkBAIC04MDUsOSArODA1LDkgQEAKICAgICAgICAgICAgICAgICAgICAgcmV0 dXJuIDA7CiAKICAgICAgICAgICAgICAgICBpZiAoY2Iuc3R5bGUoKSA+IEJISURERU4pCi0gICAg ICAgICAgICAgICAgICAgIGJvcmRlcldpZHRoID0gbWF4KGJvcmRlcldpZHRoLCBjYi53aWR0aCk7 CisgICAgICAgICAgICAgICAgICAgIGJvcmRlcldpZHRoID0gbWF4KGJvcmRlcldpZHRoLCBzdGF0 aWNfY2FzdDx1bnNpZ25lZCBpbnQ+KGNiLndpZHRoKSk7CiAgICAgICAgICAgICAgICAgaWYgKHJi LnN0eWxlKCkgPiBCSElEREVOKQotICAgICAgICAgICAgICAgICAgICBib3JkZXJXaWR0aCA9IG1h eChib3JkZXJXaWR0aCwgcmIud2lkdGgpOworICAgICAgICAgICAgICAgICAgICBib3JkZXJXaWR0 aCA9IG1heChib3JkZXJXaWR0aCwgc3RhdGljX2Nhc3Q8dW5zaWduZWQgaW50PihyYi53aWR0aCkp OwogICAgICAgICAgICAgfQogICAgICAgICB9CiAgICAgICAgIHJldHVybiAoYm9yZGVyV2lkdGgg KyAxKSAvIDI7Ci0tLSBXZWJLaXQvV2ViQ29yZS9DaGFuZ2VMb2cuYXJrCTIwMDctMDYtMDUgMDk6 NDY6NTMuMDAwMDAwMDAwICswMDAwCisrKyBXZWJLaXQvV2ViQ29yZS9DaGFuZ2VMb2cJMjAwNy0w Ni0wNSAwOTo1MTowOC4wMDAwMDAwMDAgKzAwMDAKQEAgLTAsMCArMSwxMCBAQAorMjAwNy0wNi0w NSAgQmVybmhhcmQgUm9zZW5rcmFlbnplciAgPGJlcm9AYXJrbGludXgub3JnPgorCisJaHR0cDov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM5ODUjCisKKwlNYWtlIGl0IGNvbXBp bGUgd2l0aCBnY2MgPj0gNC4yCisKKwkqIHJlbmRlcmluZy9SZW5kZXJUYWJsZS5jcHA6CisJKFdl YktpdDo6UmVuZGVyVGFibGU6OmNhbGNCb3JkZXJMZWZ0KQorCShXZWJLaXQ6OlJlbmRlclRhYmxl OjpjYWxjQm9yZGVyUmlnaHQpCisK 14860 2007-06-05 00:57:32 -0700 2007-06-20 09:13:50 -0700 Fix adjusted to WebKit coding style WebKit-gcc-4.2.patch text/plain 3067 bero LS0tIFdlYktpdC9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJsZS5jcHAuYXJrCTIwMDctMDYt MDQgMTY6NDk6MTMuMDAwMDAwMDAwICswMDAwCisrKyBXZWJLaXQvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyVGFibGUuY3BwCTIwMDctMDYtMDQgMTc6MDc6MzYuMDAwMDAwMDAwICswMDAwCkBAIC03 MTksNyArNzE5LDcgQEAKICAgICAgICAgICAgIGlmIChnYi5zdHlsZSgpID09IEJISURERU4pCiAg ICAgICAgICAgICAgICAgcmV0dXJuIDA7CiAgICAgICAgICAgICBpZiAoZ2Iuc3R5bGUoKSA+IEJI SURERU4pCi0gICAgICAgICAgICAgICAgYm9yZGVyV2lkdGggPSBtYXgoYm9yZGVyV2lkdGgsIGdi LndpZHRoKTsKKyAgICAgICAgICAgICAgICBib3JkZXJXaWR0aCA9IG1heChib3JkZXJXaWR0aCwg c3RhdGljX2Nhc3Q8dW5zaWduZWQ+KGdiLndpZHRoKSk7CiAgICAgICAgIH0KICAgICAgICAgCiAg ICAgICAgIFJlbmRlclRhYmxlU2VjdGlvbiogZmlyc3ROb25FbXB0eVNlY3Rpb24gPSBtX2hlYWQg PyBtX2hlYWQgOiAobV9maXJzdEJvZHkgPyBtX2ZpcnN0Qm9keSA6IG1fZm9vdCk7CkBAIC03MzIs NyArNzMyLDcgQEAKICAgICAgICAgICAgICAgICByZXR1cm4gMDsKIAogICAgICAgICAgICAgaWYg KHNiLnN0eWxlKCkgPiBCSElEREVOKQotICAgICAgICAgICAgICAgIGJvcmRlcldpZHRoID0gbWF4 KGJvcmRlcldpZHRoLCBzYi53aWR0aCk7CisgICAgICAgICAgICAgICAgYm9yZGVyV2lkdGggPSBt YXgoYm9yZGVyV2lkdGgsIHN0YXRpY19jYXN0PHVuc2lnbmVkPihzYi53aWR0aCkpOwogCiAgICAg ICAgICAgICBjb25zdCBSZW5kZXJUYWJsZVNlY3Rpb246OkNlbGxTdHJ1Y3QmIGNzID0gZmlyc3RO b25FbXB0eVNlY3Rpb24tPmNlbGxBdCgwLCBsZWZ0bW9zdENvbHVtbik7CiAgICAgICAgICAgICAK QEAgLTc0Niw5ICs3NDYsOSBAQAogICAgICAgICAgICAgICAgICAgICByZXR1cm4gMDsKIAogICAg ICAgICAgICAgICAgIGlmIChjYi5zdHlsZSgpID4gQkhJRERFTikKLSAgICAgICAgICAgICAgICAg ICAgYm9yZGVyV2lkdGggPSBtYXgoYm9yZGVyV2lkdGgsIGNiLndpZHRoKTsKKyAgICAgICAgICAg ICAgICAgICAgYm9yZGVyV2lkdGggPSBtYXgoYm9yZGVyV2lkdGgsIHN0YXRpY19jYXN0PHVuc2ln bmVkPihjYi53aWR0aCkpOwogICAgICAgICAgICAgICAgIGlmIChyYi5zdHlsZSgpID4gQkhJRERF TikKLSAgICAgICAgICAgICAgICAgICAgYm9yZGVyV2lkdGggPSBtYXgoYm9yZGVyV2lkdGgsIHJi LndpZHRoKTsKKyAgICAgICAgICAgICAgICAgICAgYm9yZGVyV2lkdGggPSBtYXgoYm9yZGVyV2lk dGgsIHN0YXRpY19jYXN0PHVuc2lnbmVkPihyYi53aWR0aCkpOwogICAgICAgICAgICAgfQogICAg ICAgICB9CiAgICAgICAgIHJldHVybiBib3JkZXJXaWR0aCAvIDI7CkBAIC03NzgsNyArNzc4LDcg QEAKICAgICAgICAgICAgIGlmIChnYi5zdHlsZSgpID09IEJISURERU4pCiAgICAgICAgICAgICAg ICAgcmV0dXJuIDA7CiAgICAgICAgICAgICBpZiAoZ2Iuc3R5bGUoKSA+IEJISURERU4pCi0gICAg ICAgICAgICAgICAgYm9yZGVyV2lkdGggPSBtYXgoYm9yZGVyV2lkdGgsIGdiLndpZHRoKTsKKyAg ICAgICAgICAgICAgICBib3JkZXJXaWR0aCA9IG1heChib3JkZXJXaWR0aCwgc3RhdGljX2Nhc3Q8 dW5zaWduZWQ+KGdiLndpZHRoKSk7CiAgICAgICAgIH0KICAgICAgICAgCiAgICAgICAgIFJlbmRl clRhYmxlU2VjdGlvbiogZmlyc3ROb25FbXB0eVNlY3Rpb24gPSBtX2hlYWQgPyBtX2hlYWQgOiAo bV9maXJzdEJvZHkgPyBtX2ZpcnN0Qm9keSA6IG1fZm9vdCk7CkBAIC03OTEsNyArNzkxLDcgQEAK ICAgICAgICAgICAgICAgICByZXR1cm4gMDsKIAogICAgICAgICAgICAgaWYgKHNiLnN0eWxlKCkg PiBCSElEREVOKQotICAgICAgICAgICAgICAgIGJvcmRlcldpZHRoID0gbWF4KGJvcmRlcldpZHRo LCBzYi53aWR0aCk7CisgICAgICAgICAgICAgICAgYm9yZGVyV2lkdGggPSBtYXgoYm9yZGVyV2lk dGgsIHN0YXRpY19jYXN0PHVuc2lnbmVkPihzYi53aWR0aCkpOwogCiAgICAgICAgICAgICBjb25z dCBSZW5kZXJUYWJsZVNlY3Rpb246OkNlbGxTdHJ1Y3QmIGNzID0gZmlyc3ROb25FbXB0eVNlY3Rp b24tPmNlbGxBdCgwLCByaWdodG1vc3RDb2x1bW4pOwogICAgICAgICAgICAgCkBAIC04MDUsOSAr ODA1LDkgQEAKICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIDA7CiAKICAgICAgICAgICAgICAg ICBpZiAoY2Iuc3R5bGUoKSA+IEJISURERU4pCi0gICAgICAgICAgICAgICAgICAgIGJvcmRlcldp ZHRoID0gbWF4KGJvcmRlcldpZHRoLCBjYi53aWR0aCk7CisgICAgICAgICAgICAgICAgICAgIGJv cmRlcldpZHRoID0gbWF4KGJvcmRlcldpZHRoLCBzdGF0aWNfY2FzdDx1bnNpZ25lZD4oY2Iud2lk dGgpKTsKICAgICAgICAgICAgICAgICBpZiAocmIuc3R5bGUoKSA+IEJISURERU4pCi0gICAgICAg ICAgICAgICAgICAgIGJvcmRlcldpZHRoID0gbWF4KGJvcmRlcldpZHRoLCByYi53aWR0aCk7Cisg ICAgICAgICAgICAgICAgICAgIGJvcmRlcldpZHRoID0gbWF4KGJvcmRlcldpZHRoLCBzdGF0aWNf Y2FzdDx1bnNpZ25lZD4ocmIud2lkdGgpKTsKICAgICAgICAgICAgIH0KICAgICAgICAgfQogICAg ICAgICByZXR1cm4gKGJvcmRlcldpZHRoICsgMSkgLyAyOwotLS0gV2ViS2l0L1dlYkNvcmUvQ2hh bmdlTG9nLmFyawkyMDA3LTA2LTA1IDA5OjQ2OjUzLjAwMDAwMDAwMCArMDAwMAorKysgV2ViS2l0 L1dlYkNvcmUvQ2hhbmdlTG9nCTIwMDctMDYtMDUgMDk6NTE6MDguMDAwMDAwMDAwICswMDAwCkBA IC0wLDAgKzEsMTAgQEAKKzIwMDctMDYtMDUgIEJlcm5oYXJkIFJvc2Vua3JhZW56ZXIgIDxiZXJv QGFya2xpbnV4Lm9yZz4KKworCWh0dHA6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTEzOTg1IworCisJTWFrZSBpdCBjb21waWxlIHdpdGggZ2NjID49IDQuMgorCisJKiByZW5kZXJp bmcvUmVuZGVyVGFibGUuY3BwOgorCShXZWJLaXQ6OlJlbmRlclRhYmxlOjpjYWxjQm9yZGVyTGVm dCkKKwkoV2ViS2l0OjpSZW5kZXJUYWJsZTo6Y2FsY0JvcmRlclJpZ2h0KQorCg== 15140 2007-06-20 09:13:50 -0700 2007-06-24 22:02:49 -0700 Same patch, rediffed to not need patch -p1 WebKit-gcc-4.2.patch text/plain 3484 bero SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAyMzY1MCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTMgQEAKKzIwMDctMDYtMDUgIEJlcm5oYXJkIFJvc2Vua3JhZW56ZXIgIDxiZXJv QGFya2xpbnV4Lm9yZz4KKworCWh0dHA6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTEzOTg1IworCisJTWFrZSBpdCBjb21waWxlIHdpdGggZ2NjID49IDQuMgorCisJKiByZW5kZXJp bmcvUmVuZGVyVGFibGUuY3BwOgorCShXZWJLaXQ6OlJlbmRlclRhYmxlOjpjYWxjQm9yZGVyTGVm dCkKKwkoV2ViS2l0OjpSZW5kZXJUYWJsZTo6Y2FsY0JvcmRlclJpZ2h0KQorCiAyMDA3LTA2LTE5 ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3 ZWQgYnkgS2V2aW4gRGVja2VyLgpJbmRleDogV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGFibGUu Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRhYmxlLmNwcAkocmV2 aXNpb24gMjM2NTApCisrKyBXZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJsZS5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTcxOSw3ICs3MTksNyBAQCBpbnQgUmVuZGVyVGFibGU6OmNhbGNCb3JkZXJM ZWZ0KCkgY29uc3QKICAgICAgICAgICAgIGlmIChnYi5zdHlsZSgpID09IEJISURERU4pCiAgICAg ICAgICAgICAgICAgcmV0dXJuIDA7CiAgICAgICAgICAgICBpZiAoZ2Iuc3R5bGUoKSA+IEJISURE RU4pCi0gICAgICAgICAgICAgICAgYm9yZGVyV2lkdGggPSBtYXgoYm9yZGVyV2lkdGgsIGdiLndp ZHRoKTsKKyAgICAgICAgICAgICAgICBib3JkZXJXaWR0aCA9IG1heChib3JkZXJXaWR0aCwgc3Rh dGljX2Nhc3Q8dW5zaWduZWQ+KGdiLndpZHRoKSk7CiAgICAgICAgIH0KICAgICAgICAgCiAgICAg ICAgIFJlbmRlclRhYmxlU2VjdGlvbiogZmlyc3ROb25FbXB0eVNlY3Rpb24gPSBtX2hlYWQgPyBt X2hlYWQgOiAobV9maXJzdEJvZHkgPyBtX2ZpcnN0Qm9keSA6IG1fZm9vdCk7CkBAIC03MzIsNyAr NzMyLDcgQEAgaW50IFJlbmRlclRhYmxlOjpjYWxjQm9yZGVyTGVmdCgpIGNvbnN0CiAgICAgICAg ICAgICAgICAgcmV0dXJuIDA7CiAKICAgICAgICAgICAgIGlmIChzYi5zdHlsZSgpID4gQkhJRERF TikKLSAgICAgICAgICAgICAgICBib3JkZXJXaWR0aCA9IG1heChib3JkZXJXaWR0aCwgc2Iud2lk dGgpOworICAgICAgICAgICAgICAgIGJvcmRlcldpZHRoID0gbWF4KGJvcmRlcldpZHRoLCBzdGF0 aWNfY2FzdDx1bnNpZ25lZD4oc2Iud2lkdGgpKTsKIAogICAgICAgICAgICAgY29uc3QgUmVuZGVy VGFibGVTZWN0aW9uOjpDZWxsU3RydWN0JiBjcyA9IGZpcnN0Tm9uRW1wdHlTZWN0aW9uLT5jZWxs QXQoMCwgbGVmdG1vc3RDb2x1bW4pOwogICAgICAgICAgICAgCkBAIC03NDYsOSArNzQ2LDkgQEAg aW50IFJlbmRlclRhYmxlOjpjYWxjQm9yZGVyTGVmdCgpIGNvbnN0CiAgICAgICAgICAgICAgICAg ICAgIHJldHVybiAwOwogCiAgICAgICAgICAgICAgICAgaWYgKGNiLnN0eWxlKCkgPiBCSElEREVO KQotICAgICAgICAgICAgICAgICAgICBib3JkZXJXaWR0aCA9IG1heChib3JkZXJXaWR0aCwgY2Iu d2lkdGgpOworICAgICAgICAgICAgICAgICAgICBib3JkZXJXaWR0aCA9IG1heChib3JkZXJXaWR0 aCwgc3RhdGljX2Nhc3Q8dW5zaWduZWQ+KGNiLndpZHRoKSk7CiAgICAgICAgICAgICAgICAgaWYg KHJiLnN0eWxlKCkgPiBCSElEREVOKQotICAgICAgICAgICAgICAgICAgICBib3JkZXJXaWR0aCA9 IG1heChib3JkZXJXaWR0aCwgcmIud2lkdGgpOworICAgICAgICAgICAgICAgICAgICBib3JkZXJX aWR0aCA9IG1heChib3JkZXJXaWR0aCwgc3RhdGljX2Nhc3Q8dW5zaWduZWQ+KHJiLndpZHRoKSk7 CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KICAgICAgICAgcmV0dXJuIGJvcmRlcldpZHRoIC8g MjsKQEAgLTc3OCw3ICs3NzgsNyBAQCBpbnQgUmVuZGVyVGFibGU6OmNhbGNCb3JkZXJSaWdodCgp IGNvbnN0CiAgICAgICAgICAgICBpZiAoZ2Iuc3R5bGUoKSA9PSBCSElEREVOKQogICAgICAgICAg ICAgICAgIHJldHVybiAwOwogICAgICAgICAgICAgaWYgKGdiLnN0eWxlKCkgPiBCSElEREVOKQot ICAgICAgICAgICAgICAgIGJvcmRlcldpZHRoID0gbWF4KGJvcmRlcldpZHRoLCBnYi53aWR0aCk7 CisgICAgICAgICAgICAgICAgYm9yZGVyV2lkdGggPSBtYXgoYm9yZGVyV2lkdGgsIHN0YXRpY19j YXN0PHVuc2lnbmVkPihnYi53aWR0aCkpOwogICAgICAgICB9CiAgICAgICAgIAogICAgICAgICBS ZW5kZXJUYWJsZVNlY3Rpb24qIGZpcnN0Tm9uRW1wdHlTZWN0aW9uID0gbV9oZWFkID8gbV9oZWFk IDogKG1fZmlyc3RCb2R5ID8gbV9maXJzdEJvZHkgOiBtX2Zvb3QpOwpAQCAtNzkxLDcgKzc5MSw3 IEBAIGludCBSZW5kZXJUYWJsZTo6Y2FsY0JvcmRlclJpZ2h0KCkgY29uc3QKICAgICAgICAgICAg ICAgICByZXR1cm4gMDsKIAogICAgICAgICAgICAgaWYgKHNiLnN0eWxlKCkgPiBCSElEREVOKQot ICAgICAgICAgICAgICAgIGJvcmRlcldpZHRoID0gbWF4KGJvcmRlcldpZHRoLCBzYi53aWR0aCk7 CisgICAgICAgICAgICAgICAgYm9yZGVyV2lkdGggPSBtYXgoYm9yZGVyV2lkdGgsIHN0YXRpY19j YXN0PHVuc2lnbmVkPihzYi53aWR0aCkpOwogCiAgICAgICAgICAgICBjb25zdCBSZW5kZXJUYWJs ZVNlY3Rpb246OkNlbGxTdHJ1Y3QmIGNzID0gZmlyc3ROb25FbXB0eVNlY3Rpb24tPmNlbGxBdCgw LCByaWdodG1vc3RDb2x1bW4pOwogICAgICAgICAgICAgCkBAIC04MDUsOSArODA1LDkgQEAgaW50 IFJlbmRlclRhYmxlOjpjYWxjQm9yZGVyUmlnaHQoKSBjb25zdAogICAgICAgICAgICAgICAgICAg ICByZXR1cm4gMDsKIAogICAgICAgICAgICAgICAgIGlmIChjYi5zdHlsZSgpID4gQkhJRERFTikK LSAgICAgICAgICAgICAgICAgICAgYm9yZGVyV2lkdGggPSBtYXgoYm9yZGVyV2lkdGgsIGNiLndp ZHRoKTsKKyAgICAgICAgICAgICAgICAgICAgYm9yZGVyV2lkdGggPSBtYXgoYm9yZGVyV2lkdGgs IHN0YXRpY19jYXN0PHVuc2lnbmVkPihjYi53aWR0aCkpOwogICAgICAgICAgICAgICAgIGlmIChy Yi5zdHlsZSgpID4gQkhJRERFTikKLSAgICAgICAgICAgICAgICAgICAgYm9yZGVyV2lkdGggPSBt YXgoYm9yZGVyV2lkdGgsIHJiLndpZHRoKTsKKyAgICAgICAgICAgICAgICAgICAgYm9yZGVyV2lk dGggPSBtYXgoYm9yZGVyV2lkdGgsIHN0YXRpY19jYXN0PHVuc2lnbmVkPihyYi53aWR0aCkpOwog ICAgICAgICAgICAgfQogICAgICAgICB9CiAgICAgICAgIHJldHVybiAoYm9yZGVyV2lkdGggKyAx KSAvIDI7Cg==