26291 2009-06-10 08:33:14 -0700 [Qt] build break in ImageDecoderQt.cpp. 2009-06-11 10:29:48 -0700 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED Qt P2 Normal --- 1 yongjun.zhang webkit-unassigned oldest_to_newest 125137 0 yongjun.zhang 2009-06-10 08:33:14 -0700 ImageDecoder.h changes the visibility of m_size and m_isAvailable to private which breaks the compiling of ImageDecoderQt.cpp. 125138 1 31131 yongjun.zhang 2009-06-10 08:40:30 -0700 Created attachment 31131 quick patch to fix the build break. 125281 2 31131 eric 2009-06-11 01:07:40 -0700 Comment on attachment 31131 quick patch to fix the build break. lgtm. 125311 3 31162 yongjun.zhang 2009-06-11 08:02:10 -0700 Created attachment 31162 set m_isSizeAvailable to false when failed, to keep it consistent. 125325 4 pkasting 2009-06-11 10:15:24 -0700 Drive-by, since I wrote the new ImageDecoder.h code: Remove the setSize(-1, -1) call from reset(). You can't have the size become _less_ available on receiving _more_ data; either the size was not yet set and remains unset, or it was already set and can remain set. Remove "m_sizeAvailable = false;" from ImageDecoder.h. This is inappropriate. 125327 5 ariya.hidayat 2009-06-11 10:29:06 -0700 A modified patch, after Peter's comment, is landed in r44605 http://trac.webkit.org/changeset/44605 31131 2009-06-10 08:40:30 -0700 2009-06-11 08:02:10 -0700 quick patch to fix the build break. ImageDecoderQt_build_fix.patch text/plain 2194 yongjun.zhang SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0NDU2MykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTQgQEAKKzIwMDktMDYtMTAgIFlvbmdqdW4gWmhhbmcgIDx5b25nanVuLnpoYW5n QG5va2lhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBCdWcgMjYyOTE6IFtRdF0gYnVpbGQgYnJlYWsgaW4gSW1hZ2VEZWNvZGVyUXQuY3BwLgor CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvcXQvSW1hZ2VEZWNvZGVyUXQuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6SW1hZ2VEZWNvZGVyUXQ6OnJlc2V0KToKKyAgICAgICAgKFdlYkNvcmU6 OkltYWdlRGVjb2RlclF0OjpzZXREYXRhKToKKyAgICAgICAgKFdlYkNvcmU6OkltYWdlRGVjb2Rl clF0Ojppc1NpemVBdmFpbGFibGUpOgorCiAyMDA5LTA2LTEwICBUb3IgQXJuZSBWZXN0YsO4ICA8 dG9yLmFybmUudmVzdGJvQG5va2lhLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBTaW1vbiBI YXVzbWFubi4KSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvSW1hZ2VEZWNvZGVy UXQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvSW1hZ2VE ZWNvZGVyUXQuY3BwCShyZXZpc2lvbiA0NDU2MSkKKysrIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvcXQvSW1hZ2VEZWNvZGVyUXQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yMTcsOSArMjE3LDgg QEAgdm9pZCBJbWFnZURlY29kZXJRdDo6cmVzZXQoKQogICAgIG1fZmFpbGVkID0gZmFsc2U7CiAg ICAgbV9pbWFnZUxpc3QuY2xlYXIoKTsKICAgICBtX3BpeG1hcENhY2hlLmNsZWFyKCk7Ci0gICAg bV9zaXplQXZhaWxhYmxlID0gZmFsc2U7CiAgICAgbV9sb29wQ291bnQgPSBjQW5pbWF0aW9uTm9u ZTsKLSAgICBtX3NpemUgPSBJbnRTaXplKC0xLCAtMSk7CisgICAgc2V0U2l6ZSgtMSwgLTEpOwog fQogCiB2b2lkIEltYWdlRGVjb2RlclF0OjpzZXREYXRhKGNvbnN0IEluY29taW5nRGF0YSAmZGF0 YSwgYm9vbCBhbGxEYXRhUmVjZWl2ZWQpCkBAIC0yNDcsOCArMjQ2LDggQEAgdm9pZCBJbWFnZURl Y29kZXJRdDo6c2V0RGF0YShjb25zdCBJbmNvbQogICAgIGNhc2UgUmVhZENvbnRleHQ6OlJlYWRD b21wbGV0ZToKICAgICAgICAgLy8gRGlkIHdlIHJlYWQgYW55dGhpbmcgLSB0cnkgdG8gc2V0IHRo ZSBzaXplLgogICAgICAgICBpZiAoaGFzRmlyc3RJbWFnZUhlYWRlcigpKSB7Ci0gICAgICAgICAg ICBtX3NpemVBdmFpbGFibGUgPSB0cnVlOwotICAgICAgICAgICAgbV9zaXplID0gbV9pbWFnZUxp c3RbMF0ubV9pbWFnZS5zaXplKCk7CisgICAgICAgICAgICBRU2l6ZSBpbWdTaXplID0gbV9pbWFn ZUxpc3RbMF0ubV9pbWFnZS5zaXplKCk7CisgICAgICAgICAgICBzZXRTaXplKGltZ1NpemUud2lk dGgoKSwgaW1nU2l6ZS5oZWlnaHQoKSk7CiAKICAgICAgICAgICAgIGlmIChyZWFkQ29udGV4dC5y ZWFkZXIoKS0+c3VwcG9ydHNBbmltYXRpb24oKSkgewogICAgICAgICAgICAgICAgIGlmIChyZWFk Q29udGV4dC5yZWFkZXIoKS0+bG9vcENvdW50KCkgIT0gLTEpCkBAIC0yNjUsOCArMjY0LDggQEAg dm9pZCBJbWFnZURlY29kZXJRdDo6c2V0RGF0YShjb25zdCBJbmNvbQogYm9vbCBJbWFnZURlY29k ZXJRdDo6aXNTaXplQXZhaWxhYmxlKCkgY29uc3QKIHsKICAgICBpZiAoZGVidWdJbWFnZURlY29k ZXJRdCkKLSAgICAgICAgcURlYnVnKCkgPDwgIiBJbWFnZURlY29kZXJRdDo6aXNTaXplQXZhaWxh YmxlKCkgcmV0dXJucyIgPDwgbV9zaXplQXZhaWxhYmxlOwotICAgIHJldHVybiBtX3NpemVBdmFp bGFibGU7CisgICAgICAgIHFEZWJ1ZygpIDw8ICIgSW1hZ2VEZWNvZGVyUXQ6OmlzU2l6ZUF2YWls YWJsZSgpIHJldHVybnMiIDw8IEltYWdlRGVjb2Rlcjo6aXNTaXplQXZhaWxhYmxlKCk7CisgICAg cmV0dXJuIEltYWdlRGVjb2Rlcjo6aXNTaXplQXZhaWxhYmxlKCk7CiB9CiAKIGludCBJbWFnZURl Y29kZXJRdDo6ZnJhbWVDb3VudCgpIGNvbnN0Cg== 31162 2009-06-11 08:02:10 -0700 2009-06-11 10:29:48 -0700 set m_isSizeAvailable to false when failed, to keep it consistent. buildbreak_ImageDecoderQt.patch text/plain 2857 yongjun.zhang SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0NDYwMykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTggQEAKKzIwMDktMDYtMTEgIFlvbmdqdW4gWmhhbmcgIDx5b25nanVuLnpoYW5n QG5va2lhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjYyOTEKKworICAg ICAgICBbUXRdIGJ1aWxkIGJyZWFrIGluIEltYWdlRGVjb2RlclF0LmNwcC4KKworICAgICAgICAq IHBsYXRmb3JtL2dyYXBoaWNzL3F0L0ltYWdlRGVjb2RlclF0LmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkltYWdlRGVjb2RlclF0OjpyZXNldCk6CisgICAgICAgIChXZWJDb3JlOjpJbWFnZURlY29k ZXJRdDo6c2V0RGF0YSk6CisgICAgICAgIChXZWJDb3JlOjpJbWFnZURlY29kZXJRdDo6aXNTaXpl QXZhaWxhYmxlKToKKyAgICAgICAgKiBwbGF0Zm9ybS9pbWFnZS1kZWNvZGVycy9JbWFnZURlY29k ZXIuaDoKKyAgICAgICAgKFdlYkNvcmU6OkltYWdlRGVjb2Rlcjo6c2V0U2l6ZSk6CisKIDIwMDkt MDYtMTEgIFNpbW9uIEhhdXNtYW5uICA8c2ltb24uaGF1c21hbm5Abm9raWEuY29tPgogCiAgICAg ICAgIFJ1YmJlci1zdGFtcGVkIGJ5IEFyaXlhIEhpZGF5YXQuCkluZGV4OiBXZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL3F0L0ltYWdlRGVjb2RlclF0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL3F0L0ltYWdlRGVjb2RlclF0LmNwcAkocmV2aXNpb24gNDQ2MDMp CisrKyBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L0ltYWdlRGVjb2RlclF0LmNwcAkod29y a2luZyBjb3B5KQpAQCAtMjE3LDkgKzIxNyw4IEBAIHZvaWQgSW1hZ2VEZWNvZGVyUXQ6OnJlc2V0 KCkKICAgICBtX2ZhaWxlZCA9IGZhbHNlOwogICAgIG1faW1hZ2VMaXN0LmNsZWFyKCk7CiAgICAg bV9waXhtYXBDYWNoZS5jbGVhcigpOwotICAgIG1fc2l6ZUF2YWlsYWJsZSA9IGZhbHNlOwogICAg IG1fbG9vcENvdW50ID0gY0FuaW1hdGlvbk5vbmU7Ci0gICAgbV9zaXplID0gSW50U2l6ZSgtMSwg LTEpOworICAgIHNldFNpemUoLTEsIC0xKTsKIH0KIAogdm9pZCBJbWFnZURlY29kZXJRdDo6c2V0 RGF0YShjb25zdCBJbmNvbWluZ0RhdGEgJmRhdGEsIGJvb2wgYWxsRGF0YVJlY2VpdmVkKQpAQCAt MjQ3LDggKzI0Niw4IEBAIHZvaWQgSW1hZ2VEZWNvZGVyUXQ6OnNldERhdGEoY29uc3QgSW5jb20K ICAgICBjYXNlIFJlYWRDb250ZXh0OjpSZWFkQ29tcGxldGU6CiAgICAgICAgIC8vIERpZCB3ZSBy ZWFkIGFueXRoaW5nIC0gdHJ5IHRvIHNldCB0aGUgc2l6ZS4KICAgICAgICAgaWYgKGhhc0ZpcnN0 SW1hZ2VIZWFkZXIoKSkgewotICAgICAgICAgICAgbV9zaXplQXZhaWxhYmxlID0gdHJ1ZTsKLSAg ICAgICAgICAgIG1fc2l6ZSA9IG1faW1hZ2VMaXN0WzBdLm1faW1hZ2Uuc2l6ZSgpOworICAgICAg ICAgICAgUVNpemUgaW1nU2l6ZSA9IG1faW1hZ2VMaXN0WzBdLm1faW1hZ2Uuc2l6ZSgpOworICAg ICAgICAgICAgc2V0U2l6ZShpbWdTaXplLndpZHRoKCksIGltZ1NpemUuaGVpZ2h0KCkpOwogCiAg ICAgICAgICAgICBpZiAocmVhZENvbnRleHQucmVhZGVyKCktPnN1cHBvcnRzQW5pbWF0aW9uKCkp IHsKICAgICAgICAgICAgICAgICBpZiAocmVhZENvbnRleHQucmVhZGVyKCktPmxvb3BDb3VudCgp ICE9IC0xKQpAQCAtMjY1LDggKzI2NCw4IEBAIHZvaWQgSW1hZ2VEZWNvZGVyUXQ6OnNldERhdGEo Y29uc3QgSW5jb20KIGJvb2wgSW1hZ2VEZWNvZGVyUXQ6OmlzU2l6ZUF2YWlsYWJsZSgpIGNvbnN0 CiB7CiAgICAgaWYgKGRlYnVnSW1hZ2VEZWNvZGVyUXQpCi0gICAgICAgIHFEZWJ1ZygpIDw8ICIg SW1hZ2VEZWNvZGVyUXQ6OmlzU2l6ZUF2YWlsYWJsZSgpIHJldHVybnMiIDw8IG1fc2l6ZUF2YWls YWJsZTsKLSAgICByZXR1cm4gbV9zaXplQXZhaWxhYmxlOworICAgICAgICBxRGVidWcoKSA8PCAi IEltYWdlRGVjb2RlclF0Ojppc1NpemVBdmFpbGFibGUoKSByZXR1cm5zIiA8PCBJbWFnZURlY29k ZXI6OmlzU2l6ZUF2YWlsYWJsZSgpOworICAgIHJldHVybiBJbWFnZURlY29kZXI6OmlzU2l6ZUF2 YWlsYWJsZSgpOwogfQogCiBpbnQgSW1hZ2VEZWNvZGVyUXQ6OmZyYW1lQ291bnQoKSBjb25zdApJ bmRleDogV2ViQ29yZS9wbGF0Zm9ybS9pbWFnZS1kZWNvZGVycy9JbWFnZURlY29kZXIuaAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL2ltYWdlLWRlY29kZXJzL0ltYWdlRGVjb2Rlci5o CShyZXZpc2lvbiA0NDYwMykKKysrIFdlYkNvcmUvcGxhdGZvcm0vaW1hZ2UtZGVjb2RlcnMvSW1h Z2VEZWNvZGVyLmgJKHdvcmtpbmcgY29weSkKQEAgLTIxMCw2ICsyMTAsNyBAQCBuYW1lc3BhY2Ug V2ViQ29yZSB7CiAgICAgICAgIHsKICAgICAgICAgICAgIGlmIChpc092ZXJTaXplKHdpZHRoLCBo ZWlnaHQpKSB7CiAgICAgICAgICAgICAgICAgbV9mYWlsZWQgPSB0cnVlOworICAgICAgICAgICAg ICAgIG1fc2l6ZUF2YWlsYWJsZSA9IGZhbHNlOwogICAgICAgICAgICAgICAgIHJldHVybiBmYWxz ZTsKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIG1fc2l6ZSA9IEludFNpemUod2lkdGgsIGhl aWdodCk7Cg==