4849 2005-09-04 13:10:36 -0700 htmltokenizer.cpp won't compile with TOKEN_DEBUG defined 2005-09-20 10:10:30 -0700 1 1 1 Unclassified WebKit New Bugs 420+ All OS X 10.4 VERIFIED FIXED P2 Trivial --- 1 ap hyatt oldest_to_newest 18687 0 ap 2005-09-04 13:10:36 -0700 Several fixes to make it compile cleanly in debug mode (I'm using a locally modified KWQKDebug.h that actually prints something). 18688 1 3759 ap 2005-09-04 13:11:18 -0700 Created attachment 3759 proposed patch 18977 2 oliver 2005-09-07 03:56:18 -0700 Mark the patch for review 19013 3 3759 darin 2005-09-07 08:19:39 -0700 Comment on attachment 3759 proposed patch It's really ugly that this includes calls to operator->, and the string is not guaranteed to be contiguous, so it won't always work. But on the other hand, at least it compiles. Maybe later we'll just remove all this code. r=me 3759 2005-09-04 13:11:18 -0700 2005-09-07 08:19:39 -0700 proposed patch TOKEN_DEBUG.txt text/plain 3669 ap SW5kZXg6IGh0bWx0b2tlbml6ZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KUkNTIGZpbGU6IC9jdnMvcm9vdC9X ZWJDb3JlL2todG1sL2h0bWwvaHRtbHRva2VuaXplci5jcHAsdgpyZXRyaWV2aW5nIHJldmlzaW9u IDEuMTA5CmRpZmYgLXAgLXUgLXIxLjEwOSBodG1sdG9rZW5pemVyLmNwcAotLS0gaHRtbHRva2Vu aXplci5jcHAJMjcgQXVnIDIwMDUgMDA6MTI6MzMgLTAwMDAJMS4xMDkKKysrIGh0bWx0b2tlbml6 ZXIuY3BwCTQgU2VwIDIwMDUgMTg6MTQ6NTggLTAwMDAKQEAgLTU4Myw3ICs1ODMsNyBAQCB2b2lk IEhUTUxUb2tlbml6ZXI6OnBhcnNlQ29tbWVudChUb2tlbml6CiAgICAgICAgIHNjcmlwdENvZGVb IHNjcmlwdENvZGVTaXplKysgXSA9ICpzcmM7CiAjaWYgZGVmaW5lZChUT0tFTl9ERUJVRykgJiYg VE9LRU5fREVCVUcgPiAxCiAgICAgICAgIHFEZWJ1ZygiY29tbWVudCBpcyBub3c6IColcyoiLAot ICAgICAgICAgICAgICAgUUNvbnN0U3RyaW5nKChRQ2hhciopc3JjLmN1cnJlbnQoKSwga01pbigx Niwgc3JjLmxlbmd0aCgpKSkuc3RyaW5nKCkubGF0aW4xKCkpOworICAgICAgICAgICAgICAgUUNv bnN0U3RyaW5nKChRQ2hhciopc3JjLm9wZXJhdG9yLT4oKSwga01pbigxNlUsIHNyYy5sZW5ndGgo KSkpLnFzdHJpbmcoKS5sYXRpbjEoKSk7CiAjZW5kaWYKIAogICAgICAgICBpZiAoc3RyaWN0KSB7 CkBAIC04NzksMTAgKzg4MCwxMCBAQCB2b2lkIEhUTUxUb2tlbml6ZXI6OnBhcnNlVGFnKFRva2Vu aXplclN0CiAgICAgICAgIGNoZWNrQnVmZmVyKCk7CiAjaWYgZGVmaW5lZChUT0tFTl9ERUJVRykg JiYgVE9LRU5fREVCVUcgPiAxCiAgICAgICAgIHVpbnQgbCA9IDA7Ci0gICAgICAgIHdoaWxlKGwg PCBzcmMubGVuZ3RoKCkgJiYgKCooc3JjLmN1cnJlbnQoKStsKSkubGF0aW4xKCkgIT0gJz4nKQor ICAgICAgICB3aGlsZShsIDwgc3JjLmxlbmd0aCgpICYmICgqKHNyYy5vcGVyYXRvci0+KCkrbCkp LmxhdGluMSgpICE9ICc+JykKICAgICAgICAgICAgIGwrKzsKICAgICAgICAgcURlYnVnKCJzcmMg aXMgbm93OiAqJXMqLCB0cXVvdGU6ICVkIiwKLSAgICAgICAgICAgICAgIFFDb25zdFN0cmluZygo UUNoYXIqKXNyYy5jdXJyZW50KCksIGwpLnFzdHJpbmcoKS5sYXRpbjEoKSwgdHF1b3RlKTsKKyAg ICAgICAgICAgICAgIFFDb25zdFN0cmluZygoUUNoYXIqKXNyYy5vcGVyYXRvci0+KCksIGwpLnFz dHJpbmcoKS5sYXRpbjEoKSwgdHF1b3RlKTsKICNlbmRpZgogICAgICAgICBzd2l0Y2godGFnKSB7 CiAgICAgICAgIGNhc2UgTm9UYWc6CkBAIC0xMjI0LDcgKzEyMjUsNyBAQCB2b2lkIEhUTUxUb2tl bml6ZXI6OnBhcnNlVGFnKFRva2VuaXplclN0CiAKICAgICAgICAgICAgIEF0b21pY1N0cmluZyB0 YWdOYW1lID0gY3VyclRva2VuLnRhZ05hbWU7CiAjaWYgZGVmaW5lZChUT0tFTl9ERUJVRykgJiYg VE9LRU5fREVCVUcgPiAwCi0gICAgICAgICAgICBrZERlYnVnKCA2MDM2ICkgPDwgImFwcGVuZGlu ZyBUYWc6ICIgPDwgdGFnSUQgPDwgZW5kbDsKKyAgICAgICAgICAgIGtkRGVidWcoIDYwMzYgKSA8 PCAiYXBwZW5kaW5nIFRhZzogIiA8PCB0YWdOYW1lLnFzdHJpbmcoKSA8PCBlbmRsOwogI2VuZGlm CiAKICAgICAgICAgICAgIC8vIEhhbmRsZSA8c2NyaXB0IHNyYz0iZm9vIi8+IGxpa2UgTW96aWxs YS9PcGVyYS4gV2UgaGF2ZSB0byBkbyB0aGlzIG5vdyBmb3IgRGFzaGJvYXJkCkBAIC0xMzk4LDcg KzEzOTksNyBAQCB2b2lkIEhUTUxUb2tlbml6ZXI6OmFkZFBlbmRpbmcoKQogdm9pZCBIVE1MVG9r ZW5pemVyOjp3cml0ZShjb25zdCBUb2tlbml6ZXJTdHJpbmcgJnN0ciwgYm9vbCBhcHBlbmREYXRh KQogewogI2lmZGVmIFRPS0VOX0RFQlVHCi0gICAga2REZWJ1ZyggNjAzNiApIDw8IHRoaXMgPDwg IiBUb2tlbml6ZXI6OndyaXRlKFwiIiA8PCBzdHIgPDwgIlwiLCIgPDwgYXBwZW5kRGF0YSA8PCAi KSIgPDwgZW5kbDsKKyAgICBrZERlYnVnKCA2MDM2ICkgPDwgdGhpcyA8PCAiIFRva2VuaXplcjo6 d3JpdGUoXCIiIDw8IHN0ci50b1N0cmluZygpIDw8ICJcIiwiIDw8IGFwcGVuZERhdGEgPDwgIiki IDw8IGVuZGw7CiAjZW5kaWYKIAogICAgIGlmICghYnVmZmVyKQpAQCAtMTgyOCw4ICsxODI5LDgg QEAgdm9pZCBIVE1MVG9rZW5pemVyOjpwcm9jZXNzVG9rZW4oKQogICAgIGlmICggZGVzdCA+IGJ1 ZmZlciApCiAgICAgewogI2lmZGVmIFRPS0VOX0RFQlVHCi0gICAgICAgIGlmKGN1cnJUb2tlbi5p ZCkgewotICAgICAgICAgICAgcURlYnVnKCAidW5leHBlY3RlZCB0b2tlbiBpZDogJWQsIHN0cjog KiVzKiIsIGN1cnJUb2tlbi5pZCxRQ29uc3RTdHJpbmcoIGJ1ZmZlcixkZXN0LWJ1ZmZlciApLnFz dHJpbmcoKS5sYXRpbjEoKSApOworICAgICAgICBpZihjdXJyVG9rZW4udGFnTmFtZS5sZW5ndGgo KSkgeworICAgICAgICAgICAgcURlYnVnKCAidW5leHBlY3RlZCB0b2tlbjogJXMsIHN0cjogKiVz KiIsIGN1cnJUb2tlbi50YWdOYW1lLnFzdHJpbmcoKS5sYXRpbjEoKSxRQ29uc3RTdHJpbmcoIGJ1 ZmZlcixkZXN0LWJ1ZmZlciApLnFzdHJpbmcoKS5sYXRpbjEoKSApOwogICAgICAgICAgICAgYXNz ZXJ0KDApOwogICAgICAgICB9CiAKQEAgLTE4NDksMTIgKzE4NTAsMTIgQEAgdm9pZCBIVE1MVG9r ZW5pemVyOjpwcm9jZXNzVG9rZW4oKQogICAgIGRlc3QgPSBidWZmZXI7CiAKICNpZmRlZiBUT0tF Tl9ERUJVRwotICAgIFFTdHJpbmcgbmFtZSA9IGdldFRhZ05hbWUoY3VyclRva2VuLmlkKS5xc3Ry aW5nKCk7CisgICAgUVN0cmluZyBuYW1lID0gY3VyclRva2VuLnRhZ05hbWUucXN0cmluZygpOwog ICAgIFFTdHJpbmcgdGV4dDsKICAgICBpZihjdXJyVG9rZW4udGV4dCkKICAgICAgICAgdGV4dCA9 IFFDb25zdFN0cmluZyhjdXJyVG9rZW4udGV4dC0+cywgY3VyclRva2VuLnRleHQtPmwpLnFzdHJp bmcoKTsKIAotICAgIGtkRGVidWcoIDYwMzYgKSA8PCAiVG9rZW4gLS0+ICIgPDwgbmFtZSA8PCAi ICAgaWQgPSAiIDw8IGN1cnJUb2tlbi5pZCA8PCBlbmRsOworICAgIGtkRGVidWcoIDYwMzYgKSA8 PCAiVG9rZW4gLS0+ICIgPDwgbmFtZSA8PCBlbmRsOwogICAgIGlmIChjdXJyVG9rZW4uZmxhdCkK ICAgICAgICAga2REZWJ1ZyggNjAzNiApIDw8ICJUb2tlbiBpcyBGTEFUISIgPDwgZW5kbDsKICAg ICBpZighdGV4dC5pc051bGwoKSkKQEAgLTE4NjQsNyArMTg2NSw3IEBAIHZvaWQgSFRNTFRva2Vu aXplcjo6cHJvY2Vzc1Rva2VuKCkKICAgICAgICAga2REZWJ1ZyggNjAzNiApIDw8ICJBdHRyaWJ1 dGVzOiAiIDw8IGwgPDwgZW5kbDsKICAgICAgICAgZm9yICh1bnNpZ25lZCBsb25nIGkgPSAwOyBp IDwgbDsgKytpKSB7CiAgICAgICAgICAgICBBdHRyaWJ1dGVJbXBsKiBjID0gY3VyclRva2VuLmF0 dHJzLT5hdHRyaWJ1dGVJdGVtKGkpOwotICAgICAgICAgICAga2REZWJ1ZyggNjAzNiApIDw8ICIg ICAgIiA8PCBjLT5uYW1lKCkucXN0cmluZygpCisgICAgICAgICAgICBrZERlYnVnKCA2MDM2ICkg PDwgIiAgICAiIDw8IGMtPmxvY2FsTmFtZSgpLnFzdHJpbmcoKQogICAgICAgICAgICAgICAgICAg ICAgICAgICAgIDw8ICI9XCIiIDw8IGMtPnZhbHVlKCkucXN0cmluZygpIDw8ICJcIiIgPDwgZW5k bDsKICAgICAgICAgfQogICAgIH0K