58493 2011-04-13 16:25:00 -0700 Remove std:: prefix on some min/max calls 2011-04-13 16:33:52 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser simon.fraser oldest_to_newest 385345 0 simon.fraser 2011-04-13 16:25:00 -0700 Remove std:: prefix on some min/max calls 385346 1 89489 simon.fraser 2011-04-13 16:25:58 -0700 Created attachment 89489 Patch 385347 2 89489 eric 2011-04-13 16:27:44 -0700 Comment on attachment 89489 Patch OK. 385352 3 simon.fraser 2011-04-13 16:33:52 -0700 http://trac.webkit.org/changeset/83784 89489 2011-04-13 16:25:58 -0700 2011-04-13 16:27:44 -0700 Patch bug-58493-20110413162557.patch text/plain 4724 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogODM2MTcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAyNWRlZjRjNDRhM2Q1NzNk NThlNGVhZDM3ZDA3ZGQyYWRmZWI2M2YzLi43ZGE1ZWNjMzkzMWQxMmZlZjE3MGJiYTQ1NzdiMWZm ZDAxN2VkZjhiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEtMDQtMTMgIFNpbW9u IEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVtb3ZlIHN0ZDo6IHByZWZpeCBvbiBzb21lIG1p bi9tYXggY2FsbHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTU4NDkzCisKKyAgICAgICAgUmVtb3ZlIHN0ZDo6IG5hbWVzcGFjaW5nIG9uIG1pbi9tYXgg aW4gZmF2b3Igb2YgYSAndXNpbmcnIGNsYXVzZS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBo aWNzL1JvdW5kZWRJbnRSZWN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJvdW5kZWRJbnRSZWN0 OjpSYWRpaTo6ZXhwYW5kKToKKyAgICAgICAgKiByZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6Y2FsY0NvbnN0cmFpbnRTY2FsZUZvcik6CisKIDIwMTEt MDQtMTIgIERpZWdvIEdvbnphbGV6ICA8ZGllZ29oY2dAd2Via2l0Lm9yZz4KIAogICAgICAgICBS ZXZpZXdlZCBieSBLZW5uZXRoIFJvaGRlIENocmlzdGlhbnNlbi4KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL1JvdW5kZWRJbnRSZWN0LmNwcCBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL1JvdW5kZWRJbnRSZWN0LmNwcAppbmRleCA0ZTgwYzlh ZTEzMmE4MDg4ZmNkYmIzMzE5ZDgwMDg2NWE1MDU0MjAzLi43NjY0ZTdiOTYwOWE3Y2NkYjE4YzYy NWQ3YjZjMGViMmJkNWE1OWRjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9Sb3VuZGVkSW50UmVjdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvUm91bmRlZEludFJlY3QuY3BwCkBAIC0zMCw2ICszMCw4IEBACiAjaW5jbHVkZSAi SW50UmVjdC5oIgogI2luY2x1ZGUgPGFsZ29yaXRobT4KIAordXNpbmcgbmFtZXNwYWNlIHN0ZDsK KwogbmFtZXNwYWNlIFdlYkNvcmUgewogCiBib29sIFJvdW5kZWRJbnRSZWN0OjpSYWRpaTo6aXNa ZXJvKCkgY29uc3QKQEAgLTYwLDE3ICs2MiwxNyBAQCB2b2lkIFJvdW5kZWRJbnRSZWN0OjpSYWRp aTo6c2NhbGUoZmxvYXQgZmFjdG9yKQogCiB2b2lkIFJvdW5kZWRJbnRSZWN0OjpSYWRpaTo6ZXhw YW5kKGludCB0b3BXaWR0aCwgaW50IGJvdHRvbVdpZHRoLCBpbnQgbGVmdFdpZHRoLCBpbnQgcmln aHRXaWR0aCkKIHsKLSAgICBtX3RvcExlZnQuc2V0V2lkdGgoc3RkOjptYXgoMCwgbV90b3BMZWZ0 LndpZHRoKCkgKyBsZWZ0V2lkdGgpKTsKLSAgICBtX3RvcExlZnQuc2V0SGVpZ2h0KHN0ZDo6bWF4 KDAsIG1fdG9wTGVmdC5oZWlnaHQoKSArIHRvcFdpZHRoKSk7CisgICAgbV90b3BMZWZ0LnNldFdp ZHRoKG1heCgwLCBtX3RvcExlZnQud2lkdGgoKSArIGxlZnRXaWR0aCkpOworICAgIG1fdG9wTGVm dC5zZXRIZWlnaHQobWF4KDAsIG1fdG9wTGVmdC5oZWlnaHQoKSArIHRvcFdpZHRoKSk7CiAKLSAg ICBtX3RvcFJpZ2h0LnNldFdpZHRoKHN0ZDo6bWF4KDAsIG1fdG9wUmlnaHQud2lkdGgoKSArIHJp Z2h0V2lkdGgpKTsKLSAgICBtX3RvcFJpZ2h0LnNldEhlaWdodChzdGQ6Om1heCgwLCBtX3RvcFJp Z2h0LmhlaWdodCgpICsgdG9wV2lkdGgpKTsKKyAgICBtX3RvcFJpZ2h0LnNldFdpZHRoKG1heCgw LCBtX3RvcFJpZ2h0LndpZHRoKCkgKyByaWdodFdpZHRoKSk7CisgICAgbV90b3BSaWdodC5zZXRI ZWlnaHQobWF4KDAsIG1fdG9wUmlnaHQuaGVpZ2h0KCkgKyB0b3BXaWR0aCkpOwogCi0gICAgbV9i b3R0b21MZWZ0LnNldFdpZHRoKHN0ZDo6bWF4KDAsIG1fYm90dG9tTGVmdC53aWR0aCgpICsgbGVm dFdpZHRoKSk7Ci0gICAgbV9ib3R0b21MZWZ0LnNldEhlaWdodChzdGQ6Om1heCgwLCBtX2JvdHRv bUxlZnQuaGVpZ2h0KCkgKyBib3R0b21XaWR0aCkpOworICAgIG1fYm90dG9tTGVmdC5zZXRXaWR0 aChtYXgoMCwgbV9ib3R0b21MZWZ0LndpZHRoKCkgKyBsZWZ0V2lkdGgpKTsKKyAgICBtX2JvdHRv bUxlZnQuc2V0SGVpZ2h0KG1heCgwLCBtX2JvdHRvbUxlZnQuaGVpZ2h0KCkgKyBib3R0b21XaWR0 aCkpOwogCi0gICAgbV9ib3R0b21SaWdodC5zZXRXaWR0aChzdGQ6Om1heCgwLCBtX2JvdHRvbVJp Z2h0LndpZHRoKCkgKyByaWdodFdpZHRoKSk7Ci0gICAgbV9ib3R0b21SaWdodC5zZXRIZWlnaHQo c3RkOjptYXgoMCwgbV9ib3R0b21SaWdodC5oZWlnaHQoKSArIGJvdHRvbVdpZHRoKSk7CisgICAg bV9ib3R0b21SaWdodC5zZXRXaWR0aChtYXgoMCwgbV9ib3R0b21SaWdodC53aWR0aCgpICsgcmln aHRXaWR0aCkpOworICAgIG1fYm90dG9tUmlnaHQuc2V0SGVpZ2h0KG1heCgwLCBtX2JvdHRvbVJp Z2h0LmhlaWdodCgpICsgYm90dG9tV2lkdGgpKTsKIH0KIAogdm9pZCBSb3VuZGVkSW50UmVjdDo6 UmFkaWk6OmluY2x1ZGVMb2dpY2FsRWRnZXMoY29uc3QgUm91bmRlZEludFJlY3Q6OlJhZGlpJiBl ZGdlcywgYm9vbCBpc0hvcml6b250YWwsIGJvb2wgaW5jbHVkZUxvZ2ljYWxMZWZ0RWRnZSwgYm9v bCBpbmNsdWRlTG9naWNhbFJpZ2h0RWRnZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv c3R5bGUvUmVuZGVyU3R5bGUuY3BwCmluZGV4IDg5ODQ4NWZiMTc0YWFiYTUwMzgzZjNlNGJlNDc0 MzI0MDExNjE2YjIuLmY1MjU2NjY0NGMxMTQ0ZDg4MWI1ZTRmZjZlMTkwYjQ3NzA5NGEzMTAgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmNwcApAQCAt Nzc4LDIyICs3NzgsMjIgQEAgc3RhdGljIGZsb2F0IGNhbGNDb25zdHJhaW50U2NhbGVGb3IoY29u c3QgSW50UmVjdCYgcmVjdCwgY29uc3QgUm91bmRlZEludFJlY3Q6OlIKICAgICAvLyB0b3AKICAg ICByYWRpaVN1bSA9IHN0YXRpY19jYXN0PHVuc2lnbmVkPihyYWRpaS50b3BMZWZ0KCkud2lkdGgo KSkgKyBzdGF0aWNfY2FzdDx1bnNpZ25lZD4ocmFkaWkudG9wUmlnaHQoKS53aWR0aCgpKTsgLy8g Q2FzdHMgdG8gYXZvaWQgaW50ZWdlciBvdmVyZmxvdy4KICAgICBpZiAocmFkaWlTdW0gPiBzdGF0 aWNfY2FzdDx1bnNpZ25lZD4ocmVjdC53aWR0aCgpKSkKLSAgICAgICAgZmFjdG9yID0gc3RkOjpt aW4oc3RhdGljX2Nhc3Q8ZmxvYXQ+KHJlY3Qud2lkdGgoKSkgLyByYWRpaVN1bSwgZmFjdG9yKTsK KyAgICAgICAgZmFjdG9yID0gbWluKHN0YXRpY19jYXN0PGZsb2F0PihyZWN0LndpZHRoKCkpIC8g cmFkaWlTdW0sIGZhY3Rvcik7CiAKICAgICAvLyBib3R0b20KICAgICByYWRpaVN1bSA9IHN0YXRp Y19jYXN0PHVuc2lnbmVkPihyYWRpaS5ib3R0b21MZWZ0KCkud2lkdGgoKSkgKyBzdGF0aWNfY2Fz dDx1bnNpZ25lZD4ocmFkaWkuYm90dG9tUmlnaHQoKS53aWR0aCgpKTsKICAgICBpZiAocmFkaWlT dW0gPiBzdGF0aWNfY2FzdDx1bnNpZ25lZD4ocmVjdC53aWR0aCgpKSkKLSAgICAgICAgZmFjdG9y ID0gc3RkOjptaW4oc3RhdGljX2Nhc3Q8ZmxvYXQ+KHJlY3Qud2lkdGgoKSkgLyByYWRpaVN1bSwg ZmFjdG9yKTsKKyAgICAgICAgZmFjdG9yID0gbWluKHN0YXRpY19jYXN0PGZsb2F0PihyZWN0Lndp ZHRoKCkpIC8gcmFkaWlTdW0sIGZhY3Rvcik7CiAgICAgCiAgICAgLy8gbGVmdAogICAgIHJhZGlp U3VtID0gc3RhdGljX2Nhc3Q8dW5zaWduZWQ+KHJhZGlpLnRvcExlZnQoKS5oZWlnaHQoKSkgKyBz dGF0aWNfY2FzdDx1bnNpZ25lZD4ocmFkaWkuYm90dG9tTGVmdCgpLmhlaWdodCgpKTsKICAgICBp ZiAocmFkaWlTdW0gPiBzdGF0aWNfY2FzdDx1bnNpZ25lZD4ocmVjdC5oZWlnaHQoKSkpCi0gICAg ICAgIGZhY3RvciA9IHN0ZDo6bWluKHN0YXRpY19jYXN0PGZsb2F0PihyZWN0LmhlaWdodCgpKSAv IHJhZGlpU3VtLCBmYWN0b3IpOworICAgICAgICBmYWN0b3IgPSBtaW4oc3RhdGljX2Nhc3Q8Zmxv YXQ+KHJlY3QuaGVpZ2h0KCkpIC8gcmFkaWlTdW0sIGZhY3Rvcik7CiAgICAgCiAgICAgLy8gcmln aHQKICAgICByYWRpaVN1bSA9IHN0YXRpY19jYXN0PHVuc2lnbmVkPihyYWRpaS50b3BSaWdodCgp LmhlaWdodCgpKSArIHN0YXRpY19jYXN0PHVuc2lnbmVkPihyYWRpaS5ib3R0b21SaWdodCgpLmhl aWdodCgpKTsKICAgICBpZiAocmFkaWlTdW0gPiBzdGF0aWNfY2FzdDx1bnNpZ25lZD4ocmVjdC5o ZWlnaHQoKSkpCi0gICAgICAgIGZhY3RvciA9IHN0ZDo6bWluKHN0YXRpY19jYXN0PGZsb2F0Pihy ZWN0LmhlaWdodCgpKSAvIHJhZGlpU3VtLCBmYWN0b3IpOworICAgICAgICBmYWN0b3IgPSBtaW4o c3RhdGljX2Nhc3Q8ZmxvYXQ+KHJlY3QuaGVpZ2h0KCkpIC8gcmFkaWlTdW0sIGZhY3Rvcik7CiAg ICAgCiAgICAgQVNTRVJUKGZhY3RvciA8PSAxKTsKICAgICByZXR1cm4gZmFjdG9yOwo=