11635 2006-11-17 12:02:01 -0800 Fix potential issue with non-xslt build 2006-11-17 12:49:46 -0800 1 1 1 Unclassified WebKit WebCore Misc. 420+ All All RESOLVED FIXED P2 Normal --- 1 sam webkit-unassigned oldest_to_newest 45552 0 sam 2006-11-17 12:02:01 -0800 On line 203 of WebCore/dom/ProcessingInstruction.cpp (http://trac.webkit.org/projects/webkit/browser/trunk/WebCore/dom/ProcessingInstruction.cpp#L203) the "ASSERT(!m_isXSL);" should be wrapped in an #if XSLT_SUPPORT block. 45556 1 11554 rwlbuis 2006-11-17 12:16:04 -0800 Created attachment 11554 First attempt As the ChangeLog entry says, fixes the issues and does some style fixing. Cheers, Rob. 45558 2 11554 mitz 2006-11-17 12:20:51 -0800 Comment on attachment 11554 First attempt r=me 45534 3 rwlbuis 2006-11-17 12:49:46 -0800 Landed in r17829. 11554 2006-11-17 12:16:04 -0800 2006-11-17 12:20:51 -0800 First attempt 11635.diff text/plain 3317 rwlbuis SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAxNzgyOCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTkgQEAKKzIwMDYtMTEtMTcgIFJvYiBCdWlzICA8YnVpc0BrZGUub3JnPgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGh0dHA6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExNjM1CisgICAgICAgIEJ1ZyAxMTYzNTogRml4 IHBvdGVudGlhbCBpc3N1ZSB3aXRoIG5vbi14c2x0IGJ1aWxkCisKKyAgICAgICAgRml4IHRoZSBp c3N1ZSBhbmQgZG8gc3R5bGUgZ3VpZGVsaW5lIGNvcnJlY3Rpb25zLgorCisgICAgICAgICogZG9t L1Byb2Nlc3NpbmdJbnN0cnVjdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQcm9jZXNzaW5n SW5zdHJ1Y3Rpb246OmNoZWNrU3R5bGVTaGVldCk6CisgICAgICAgIChXZWJDb3JlOjpQcm9jZXNz aW5nSW5zdHJ1Y3Rpb246OnNoZWV0TG9hZGVkKToKKyAgICAgICAgKFdlYkNvcmU6OlByb2Nlc3Np bmdJbnN0cnVjdGlvbjo6c2V0Q1NTU3R5bGVTaGVldCk6CisgICAgICAgIChXZWJDb3JlOjpQcm9j ZXNzaW5nSW5zdHJ1Y3Rpb246OnNldFhTTFN0eWxlU2hlZXQpOgorICAgICAgICAoV2ViQ29yZTo6 UHJvY2Vzc2luZ0luc3RydWN0aW9uOjpwYXJzZVN0eWxlU2hlZXQpOgorCiAyMDA2LTExLTE3ICBU aW1vdGh5IEhhdGNoZXIgIDx0aW1vdGh5QGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBi eSBIYXJyaXNvbi4KSW5kZXg6IFdlYkNvcmUvZG9tL1Byb2Nlc3NpbmdJbnN0cnVjdGlvbi5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gV2ViQ29yZS9kb20vUHJvY2Vzc2luZ0luc3RydWN0aW9uLmNwcAkocmV2 aXNpb24gMTc4MjcpCisrKyBXZWJDb3JlL2RvbS9Qcm9jZXNzaW5nSW5zdHJ1Y3Rpb24uY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC0xMjAsNyArMTIwLDcgQEAgYm9vbCBQcm9jZXNzaW5nSW5zdHJ1Y3Rp b246OmNoZWNrU3R5bGVTaAogICAgICAgICBTdHJpbmcgdHlwZTsKICAgICAgICAgaWYgKGkgIT0g YXR0cnMuZW5kKCkpCiAgICAgICAgICAgICB0eXBlID0gaS0+c2Vjb25kOwotICAgICAgICAKKwog ICAgICAgICBib29sIGlzQ1NTID0gdHlwZS5pc0VtcHR5KCkgfHwgdHlwZSA9PSAidGV4dC9jc3Mi OwogI2lmIFhTTFRfU1VQUE9SVAogICAgICAgICBtX2lzWFNMID0gKHR5cGUgPT0gInRleHQveG1s IiB8fCB0eXBlID09ICJ0ZXh0L3hzbCIgfHwgdHlwZSA9PSAiYXBwbGljYXRpb24veG1sIiB8fApA QCAtMTQyLDcgKzE0Miw3IEBAIGJvb2wgUHJvY2Vzc2luZ0luc3RydWN0aW9uOjpjaGVja1N0eWxl U2gKICAgICAgICAgICAgICAgICBpZiAobV9pc1hTTCkgewogICAgICAgICAgICAgICAgICAgICBt X3NoZWV0ID0gbmV3IFhTTFN0eWxlU2hlZXQodGhpcywgbV9sb2NhbEhyZWYsIHRydWUpOwogICAg ICAgICAgICAgICAgICAgICBtX2xvYWRpbmcgPSBmYWxzZTsKLSAgICAgICAgICAgICAgICB9ICAg ICAgICAgICAgICAgICAgICAKKyAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgcmV0 dXJuICFtX2lzWFNMOwogI2VuZGlmCiAgICAgICAgICAgICB9CkBAIC0xNjcsMTMgKzE2NywxMiBA QCBib29sIFByb2Nlc3NpbmdJbnN0cnVjdGlvbjo6Y2hlY2tTdHlsZVNoCiAgICAgICAgICAgICAg ICAgICAgICAgICBtX2NhY2hlZFNoZWV0ID0gZG9jdW1lbnQoKS0+ZG9jTG9hZGVyKCktPnJlcXVl c3RDU1NTdHlsZVNoZWV0KGRvY3VtZW50KCktPmNvbXBsZXRlVVJMKGhyZWYpLCBjaGFyc2V0KTsK ICAgICAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgICAgICBpZiAobV9jYWNoZWRT aGVldCkKLSAgICAgICAgICAgICAgICAgICAgICAgIG1fY2FjaGVkU2hlZXQtPnJlZiggdGhpcyAp OworICAgICAgICAgICAgICAgICAgICAgICAgbV9jYWNoZWRTaGVldC0+cmVmKHRoaXMpOwogI2lm IFhTTFRfU1VQUE9SVAogICAgICAgICAgICAgICAgICAgICByZXR1cm4gIW1faXNYU0w7CiAjZW5k aWYKICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICB9Ci0KICAgICAgICAgfQogICAgIH0K ICAgICAKQEAgLTE5MywyMCArMTkyLDIyIEBAIGJvb2wgUHJvY2Vzc2luZ0luc3RydWN0aW9uOjpz aGVldExvYWRlZCgKIHsKICAgICBpZiAoIWlzTG9hZGluZygpKSB7CiAgICAgICAgIGRvY3VtZW50 KCktPnN0eWxlc2hlZXRMb2FkZWQoKTsKLSAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgcmV0dXJu IHRydWU7CiAgICAgfQogICAgIHJldHVybiBmYWxzZTsKIH0KIAotdm9pZCBQcm9jZXNzaW5nSW5z dHJ1Y3Rpb246OnNldENTU1N0eWxlU2hlZXQoY29uc3QgU3RyaW5nICZ1cmwsIGNvbnN0IFN0cmlu ZyYgY2hhcnNldCwgY29uc3QgU3RyaW5nICZzaGVldCkKK3ZvaWQgUHJvY2Vzc2luZ0luc3RydWN0 aW9uOjpzZXRDU1NTdHlsZVNoZWV0KGNvbnN0IFN0cmluZyYgdXJsLCBjb25zdCBTdHJpbmcmIGNo YXJzZXQsIGNvbnN0IFN0cmluZyYgc2hlZXQpCiB7CisjaWYgWFNMVF9TVVBQT1JUCiAgICAgQVNT RVJUKCFtX2lzWFNMKTsKKyNlbmRpZgogICAgIG1fc2hlZXQgPSBuZXcgQ1NTU3R5bGVTaGVldCh0 aGlzLCB1cmwsIGNoYXJzZXQpOwogICAgIHBhcnNlU3R5bGVTaGVldChzaGVldCk7CiB9CiAKICNp ZiBYU0xUX1NVUFBPUlQKLXZvaWQgUHJvY2Vzc2luZ0luc3RydWN0aW9uOjpzZXRYU0xTdHlsZVNo ZWV0KGNvbnN0IFN0cmluZyAmdXJsLCBjb25zdCBTdHJpbmcgJnNoZWV0KQordm9pZCBQcm9jZXNz aW5nSW5zdHJ1Y3Rpb246OnNldFhTTFN0eWxlU2hlZXQoY29uc3QgU3RyaW5nJiB1cmwsIGNvbnN0 IFN0cmluZyYgc2hlZXQpCiB7CiAgICAgQVNTRVJUKG1faXNYU0wpOwogICAgIG1fc2hlZXQgPSBu ZXcgWFNMU3R5bGVTaGVldCh0aGlzLCB1cmwpOwpAQCAtMjE0LDcgKzIxNSw3IEBAIHZvaWQgUHJv Y2Vzc2luZ0luc3RydWN0aW9uOjpzZXRYU0xTdHlsZVMKIH0KICNlbmRpZgogCi12b2lkIFByb2Nl c3NpbmdJbnN0cnVjdGlvbjo6cGFyc2VTdHlsZVNoZWV0KGNvbnN0IFN0cmluZyAmc2hlZXQpCit2 b2lkIFByb2Nlc3NpbmdJbnN0cnVjdGlvbjo6cGFyc2VTdHlsZVNoZWV0KGNvbnN0IFN0cmluZyYg c2hlZXQpCiB7CiAgICAgbV9zaGVldC0+cGFyc2VTdHJpbmcoc2hlZXQpOwogICAgIGlmIChtX2Nh Y2hlZFNoZWV0KQo=