39460 2010-05-20 17:27:01 -0700 Javascript image prefetching does not report to squirrelfish GC 2010-05-28 00:58:50 -0700 1 1 1 Unclassified WebKit WebCore JavaScript 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 nlawrence nlawrence commit-queue dglazkov ggaren nlawrence simon.fraser slewis webkit.review.bot oldest_to_newest 228648 0 nlawrence 2010-05-20 17:27:01 -0700 When an image is preloaded in javascript, the size of the image is never reported to the javascript garbage collector. If a large image is repeatedly preloaded but never used, it will not free any of the images until the garbage collector has run out of space to allocate any new free javascript variables. 228650 1 56651 nlawrence 2010-05-20 17:28:56 -0700 Created attachment 56651 Suggested patch Adds a check to see if an image is loaded but is not part of the document. 228655 2 webkit.review.bot 2010-05-20 17:37:16 -0700 Attachment 56651 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style', '--no-squash']" exit_code: 1 WebCore/manual-tests/image-prefetch-stress.html:6: Line contains tab character. [whitespace/tab] [5] WebCore/manual-tests/image-prefetch-stress.html:7: Line contains tab character. [whitespace/tab] [5] WebCore/manual-tests/image-prefetch-stress.html:8: Line contains tab character. [whitespace/tab] [5] WebCore/manual-tests/image-prefetch-stress.html:9: Line contains tab character. [whitespace/tab] [5] WebCore/manual-tests/image-prefetch-stress.html:10: Line contains tab character. [whitespace/tab] [5] WebCore/manual-tests/image-prefetch-stress.html:14: Line contains tab character. [whitespace/tab] [5] WebCore/manual-tests/image-prefetch-stress.html:15: Line contains tab character. [whitespace/tab] [5] WebCore/manual-tests/image-prefetch-stress.html:16: Line contains tab character. [whitespace/tab] [5] WebCore/manual-tests/image-prefetch-stress.html:17: Line contains tab character. [whitespace/tab] [5] WebCore/manual-tests/image-prefetch-stress.html:18: Line contains tab character. [whitespace/tab] [5] WebCore/manual-tests/image-prefetch-stress.html:19: Line contains tab character. [whitespace/tab] [5] Total errors found: 11 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 228657 3 webkit.review.bot 2010-05-20 17:41:10 -0700 Attachment 56651 did not build on chromium: Build output: http://webkit-commit-queue.appspot.com/results/2301384 228661 4 56654 nlawrence 2010-05-20 17:46:28 -0700 Created attachment 56654 Updated 56651 Updates style changes and adds ifdefs around JSC specific code. 228775 5 56654 mrowe 2010-05-21 00:13:33 -0700 Comment on attachment 56654 Updated 56651 Your manual test references a file URL that exists only on your machine. You should either update the test to use an image that exists in the SVN repository or add a suitable image alongside the test. 228938 6 ggaren 2010-05-21 08:48:38 -0700 > JSC::JSGlobalData *globalData WebKit style puts the "*" next to the type name, since "pointer" is logically a party of the type. > +i = 0; > +setInterval(function(){ > + x = new Image(); Need 'var' in front of these two variable declarations for "i" and "x". With this patch, how many images load / how much memory is used before GC triggers? 229116 7 56749 nlawrence 2010-05-21 15:04:19 -0700 Created attachment 56749 more style changes. re ggaren: It should garbage collect after maxExtraCost additional memory has been reported to the garbage collector (what appears to be a megabyte). On my system, with only the manual test running in the browser, the usage doesn't seem to get above 130MB. 229165 8 56749 ggaren 2010-05-21 16:30:51 -0700 Comment on attachment 56749 more style changes. I asked Nathan to take another look at this because the patch doesn't seem to fully solve the problem. In his test, about 130MB of image data is still reported as allocated, and the number of live JSHTMLImageElements still increases linearly. 231500 9 57280 nlawrence 2010-05-27 16:36:28 -0700 Created attachment 57280 Fixed test case. It appears that the number of live HTMLImageElements is still increasing because the image elements are being created faster than they can load creating a backlog of images to be loaded. The new test case doesn't load images as quickly, showing that the patch does in fact work. 231512 10 57280 ggaren 2010-05-27 17:30:19 -0700 Comment on attachment 57280 Fixed test case. r=me 231513 11 57280 commit-queue 2010-05-27 17:45:09 -0700 Comment on attachment 57280 Fixed test case. Clearing flags on attachment: 57280 Committed r60337: <http://trac.webkit.org/changeset/60337> 231514 12 commit-queue 2010-05-27 17:45:15 -0700 All reviewed patches have been landed. Closing bug. 231515 13 simon.fraser 2010-05-27 17:47:52 -0700 Is a similar fix needed for Audio and Video elements? 231521 14 ggaren 2010-05-27 18:06:33 -0700 (In reply to comment #13) > Is a similar fix needed for Audio and Video elements? Do those elements preload while outside the document? If so, yes. 231523 15 ggaren 2010-05-27 18:08:49 -0700 Dan pointed out on IRC that checking just for the <img> tag is probably sufficient, since that's what new Image uses. 231527 16 simon.fraser 2010-05-27 18:24:34 -0700 (In reply to comment #14) > Do those elements preload while outside the document? If so, yes. Indeed they do. I filed bug 39858. 231531 17 nlawrence 2010-05-27 18:59:57 -0700 Because not just <img> and <image> elements can preload images, we don't want to restrict based on the element associated with the loader. 231532 18 57287 nlawrence 2010-05-27 19:00:34 -0700 Created attachment 57287 removed <img> and <image> tag checks. 231575 19 57287 ggaren 2010-05-27 23:44:04 -0700 Comment on attachment 57287 removed <img> and <image> tag checks. r=me 231592 20 57287 commit-queue 2010-05-28 00:58:44 -0700 Comment on attachment 57287 removed <img> and <image> tag checks. Clearing flags on attachment: 57287 Committed r60345: <http://trac.webkit.org/changeset/60345> 231593 21 commit-queue 2010-05-28 00:58:50 -0700 All reviewed patches have been landed. Closing bug. 56651 2010-05-20 17:28:56 -0700 2010-05-20 17:46:28 -0700 Suggested patch nlawrence-image-gc.patch text/plain 2646 nlawrence SW5kZXg6IFdlYkNvcmUvaHRtbC9IVE1MSW1hZ2VMb2FkZXIuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdl YkNvcmUvaHRtbC9IVE1MSW1hZ2VMb2FkZXIuY3BwCShyZXZpc2lvbiA1OTY3MCkKKysrIFdlYkNv cmUvaHRtbC9IVE1MSW1hZ2VMb2FkZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xLDcgKzEsNyBA QAogLyoKICAqIENvcHlyaWdodCAoQykgMTk5OSBMYXJzIEtub2xsIChrbm9sbEBrZGUub3JnKQog ICogICAgICAgICAgIChDKSAxOTk5IEFudHRpIEtvaXZpc3RvIChrb2l2aXN0b0BrZGUub3JnKQot ICogQ29weXJpZ2h0IChDKSAyMDA0LCAyMDA1LCAyMDA2LCAyMDA3IEFwcGxlIEluYy4gQWxsIHJp Z2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAwNCwgMjAwNSwgMjAwNiwgMjAwNywg MjAxMCBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICogVGhpcyBsaWJyYXJ5 IGlzIGZyZWUgc29mdHdhcmU7IHlvdSBjYW4gcmVkaXN0cmlidXRlIGl0IGFuZC9vcgogICogbW9k aWZ5IGl0IHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgR05VIExpYnJhcnkgR2VuZXJhbCBQdWJsaWMK QEAgLTI3LDggKzI3LDEwIEBACiAjaW5jbHVkZSAiRWxlbWVudC5oIgogI2luY2x1ZGUgIkV2ZW50 LmgiCiAjaW5jbHVkZSAiRXZlbnROYW1lcy5oIgorI2luY2x1ZGUgIkhUTUxJbWFnZUVsZW1lbnQu aCIKICNpbmNsdWRlICJIVE1MTmFtZXMuaCIKICNpbmNsdWRlICJIVE1MT2JqZWN0RWxlbWVudC5o IgorI2luY2x1ZGUgIkpTRE9NV2luZG93QmFzZS5oIgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAK QEAgLTYxLDYgKzYzLDE3IEBAIHZvaWQgSFRNTEltYWdlTG9hZGVyOjpub3RpZnlGaW5pc2hlZChD YWMKICAgICBFbGVtZW50KiBlbGVtID0gZWxlbWVudCgpOwogICAgIEltYWdlTG9hZGVyOjpub3Rp ZnlGaW5pc2hlZChjYWNoZWRJbWFnZSk7CiAKKyNpZiBVU0UoSlNDKQorICAgIGlmICghY2FjaGVk SW1hZ2UtPmVycm9yT2NjdXJyZWQoKSAmJiAhY2FjaGVkSW1hZ2UtPmh0dHBTdGF0dXNDb2RlRXJy b3JPY2N1cnJlZCgpCisgICAgICAgICYmIChlbGVtLT5oYXNUYWdOYW1lKEhUTUxOYW1lczo6aW1n VGFnKSB8fCBlbGVtLT5oYXNUYWdOYW1lKEhUTUxOYW1lczo6aW1hZ2VUYWcpKSApIHsKKyAgICAg ICAgSFRNTEltYWdlRWxlbWVudCogaW1nID0gc3RhdGljX2Nhc3Q8SFRNTEltYWdlRWxlbWVudCo+ KGVsZW0pOworICAgICAgICBpZiAoIWltZy0+aW5Eb2N1bWVudCgpKSB7CisgICAgICAgICAgICBK U0M6OkpTR2xvYmFsRGF0YSAqZ2xvYmFsRGF0YSA9IEpTRE9NV2luZG93QmFzZTo6Y29tbW9uSlNH bG9iYWxEYXRhKCk7CisgICAgICAgICAgICBnbG9iYWxEYXRhLT5oZWFwLnJlcG9ydEV4dHJhTWVt b3J5Q29zdChjYWNoZWRJbWFnZS0+ZW5jb2RlZFNpemUoKSk7CisgICAgICAgIH0KKyAgICB9Cisj ZW5kaWYKKwogICAgIGlmICgoY2FjaGVkSW1hZ2UtPmVycm9yT2NjdXJyZWQoKSB8fCBjYWNoZWRJ bWFnZS0+aHR0cFN0YXR1c0NvZGVFcnJvck9jY3VycmVkKCkpICYmIGVsZW0tPmhhc1RhZ05hbWUo SFRNTE5hbWVzOjpvYmplY3RUYWcpKQogICAgICAgICBzdGF0aWNfY2FzdDxIVE1MT2JqZWN0RWxl bWVudCo+KGVsZW0pLT5yZW5kZXJGYWxsYmFja0NvbnRlbnQoKTsKIH0KSW5kZXg6IFdlYkNvcmUv bWFudWFsLXRlc3RzL2ltYWdlLXByZWZldGNoLXN0cmVzcy5odG1sCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdl YkNvcmUvbWFudWFsLXRlc3RzL2ltYWdlLXByZWZldGNoLXN0cmVzcy5odG1sCShyZXZpc2lvbiAw KQorKysgV2ViQ29yZS9tYW51YWwtdGVzdHMvaW1hZ2UtcHJlZmV0Y2gtc3RyZXNzLmh0bWwJKHJl dmlzaW9uIDApCkBAIC0wLDAgKzEsMjEgQEAKKzxodG1sPgorPHNjcmlwdCB0eXBlPSJ0ZXh0L2ph dmFzY3JpcHQiPgorKGZ1bmN0aW9uKCl7CitpID0gMDsKK3NldEludGVydmFsKGZ1bmN0aW9uKCkK Kwl7CisJeCA9IG5ldyBJbWFnZSgpOworCXguc3JjID0gImZpbGU6Ly8vVm9sdW1lcy9EYXRhL25s YXdyZW4yL0ltYWdlVGVzdC9sZWdvLmpwZz8iICsgaTsKKwlpKys7CisJfSwgMTAwKTsKK30pKCkK Kzwvc2NyaXB0PgorPGJvZHk+CisJV2hlbiBhbiBpbWFnZSBpcyBwcmVsb2FkZWQgaW4gamF2YXNj cmlwdCwgdGhlIHNpemUgb2YgdGhlIGltYWdlIGlzIG5ldmVyCisJcmVwb3J0ZWQgdG8gdGhlIGph dmFzY3JpcHQgZ2FyYmFnZSBjb2xsZWN0b3IuICBJZiBhIGxhcmdlIGltYWdlIGlzIHJlcGVhdGVk bHkKKwlwcmVsb2FkZWQgYnV0IG5ldmVyIHVzZWQsIGl0IHdpbGwgbm90IGZyZWUgYW55IG9mIHRo ZSBpbWFnZXMgdW50aWwgdGhlCisJZ2FyYmFnZSBjb2xsZWN0b3IgaGFzIHJ1biBvdXQgb2Ygc3Bh Y2UgdG8gYWxsb2NhdGUgYW55IG5ldyBmcmVlIGphdmFzY3JpcHQKKwl2YXJpYWJsZXMuICBUaGlz IHRlc3QgcGFzc2VzIGlmIGFmdGVyIGEgY2VydGFpbiBwb2ludCwgdGhlIG51bWJlciBvZiBhbGxv Y2F0ZWQKKwlpbWFnZXMgYXMgcmVwb3J0ZWQgYnkgdGhlIGNhY2hlcyB3aW5kb3cgc3RvcHMgZ3Jv d2luZy4KKzwvYm9keT4KKzwvaHRtbD4K 56654 2010-05-20 17:46:28 -0700 2010-05-21 15:04:19 -0700 Updated 56651 nlawrence-image-gc.patch text/plain 2722 nlawrence SW5kZXg6IFdlYkNvcmUvaHRtbC9IVE1MSW1hZ2VMb2FkZXIuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdl YkNvcmUvaHRtbC9IVE1MSW1hZ2VMb2FkZXIuY3BwCShyZXZpc2lvbiA1OTY3MCkKKysrIFdlYkNv cmUvaHRtbC9IVE1MSW1hZ2VMb2FkZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xLDcgKzEsNyBA QAogLyoKICAqIENvcHlyaWdodCAoQykgMTk5OSBMYXJzIEtub2xsIChrbm9sbEBrZGUub3JnKQog ICogICAgICAgICAgIChDKSAxOTk5IEFudHRpIEtvaXZpc3RvIChrb2l2aXN0b0BrZGUub3JnKQot ICogQ29weXJpZ2h0IChDKSAyMDA0LCAyMDA1LCAyMDA2LCAyMDA3IEFwcGxlIEluYy4gQWxsIHJp Z2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAwNCwgMjAwNSwgMjAwNiwgMjAwNywg MjAxMCBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICogVGhpcyBsaWJyYXJ5 IGlzIGZyZWUgc29mdHdhcmU7IHlvdSBjYW4gcmVkaXN0cmlidXRlIGl0IGFuZC9vcgogICogbW9k aWZ5IGl0IHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgR05VIExpYnJhcnkgR2VuZXJhbCBQdWJsaWMK QEAgLTI3LDkgKzI3LDE0IEBACiAjaW5jbHVkZSAiRWxlbWVudC5oIgogI2luY2x1ZGUgIkV2ZW50 LmgiCiAjaW5jbHVkZSAiRXZlbnROYW1lcy5oIgorI2luY2x1ZGUgIkhUTUxJbWFnZUVsZW1lbnQu aCIKICNpbmNsdWRlICJIVE1MTmFtZXMuaCIKICNpbmNsdWRlICJIVE1MT2JqZWN0RWxlbWVudC5o IgogCisjaWYgVVNFKEpTQykKKyNpbmNsdWRlICJKU0RPTVdpbmRvd0Jhc2UuaCIKKyNlbmRpZgor CiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIEhUTUxJbWFnZUxvYWRlcjo6SFRNTEltYWdlTG9hZGVy KEVsZW1lbnQqIG5vZGUpCkBAIC02MSw2ICs2NiwxNyBAQCB2b2lkIEhUTUxJbWFnZUxvYWRlcjo6 bm90aWZ5RmluaXNoZWQoQ2FjCiAgICAgRWxlbWVudCogZWxlbSA9IGVsZW1lbnQoKTsKICAgICBJ bWFnZUxvYWRlcjo6bm90aWZ5RmluaXNoZWQoY2FjaGVkSW1hZ2UpOwogCisjaWYgVVNFKEpTQykK KyAgICBpZiAoIWNhY2hlZEltYWdlLT5lcnJvck9jY3VycmVkKCkgJiYgIWNhY2hlZEltYWdlLT5o dHRwU3RhdHVzQ29kZUVycm9yT2NjdXJyZWQoKQorICAgICAgICAmJiAoZWxlbS0+aGFzVGFnTmFt ZShIVE1MTmFtZXM6OmltZ1RhZykgfHwgZWxlbS0+aGFzVGFnTmFtZShIVE1MTmFtZXM6OmltYWdl VGFnKSkgKSB7CisgICAgICAgIEhUTUxJbWFnZUVsZW1lbnQqIGltZyA9IHN0YXRpY19jYXN0PEhU TUxJbWFnZUVsZW1lbnQqPihlbGVtKTsKKyAgICAgICAgaWYgKCFpbWctPmluRG9jdW1lbnQoKSkg eworICAgICAgICAgICAgSlNDOjpKU0dsb2JhbERhdGEgKmdsb2JhbERhdGEgPSBKU0RPTVdpbmRv d0Jhc2U6OmNvbW1vbkpTR2xvYmFsRGF0YSgpOworICAgICAgICAgICAgZ2xvYmFsRGF0YS0+aGVh cC5yZXBvcnRFeHRyYU1lbW9yeUNvc3QoY2FjaGVkSW1hZ2UtPmVuY29kZWRTaXplKCkpOworICAg ICAgICB9CisgICAgfQorI2VuZGlmCisKICAgICBpZiAoKGNhY2hlZEltYWdlLT5lcnJvck9jY3Vy cmVkKCkgfHwgY2FjaGVkSW1hZ2UtPmh0dHBTdGF0dXNDb2RlRXJyb3JPY2N1cnJlZCgpKSAmJiBl bGVtLT5oYXNUYWdOYW1lKEhUTUxOYW1lczo6b2JqZWN0VGFnKSkKICAgICAgICAgc3RhdGljX2Nh c3Q8SFRNTE9iamVjdEVsZW1lbnQqPihlbGVtKS0+cmVuZGVyRmFsbGJhY2tDb250ZW50KCk7CiB9 CkluZGV4OiBXZWJDb3JlL21hbnVhbC10ZXN0cy9pbWFnZS1wcmVmZXRjaC1zdHJlc3MuaHRtbAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBXZWJDb3JlL21hbnVhbC10ZXN0cy9pbWFnZS1wcmVmZXRjaC1zdHJlc3Mu aHRtbAkocmV2aXNpb24gMCkKKysrIFdlYkNvcmUvbWFudWFsLXRlc3RzL2ltYWdlLXByZWZldGNo LXN0cmVzcy5odG1sCShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDIwIEBACis8aHRtbD4KKzxzY3Jp cHQgdHlwZT0idGV4dC9qYXZhc2NyaXB0Ij4KKyhmdW5jdGlvbigpeworaSA9IDA7CitzZXRJbnRl cnZhbChmdW5jdGlvbigpeworICAgIHggPSBuZXcgSW1hZ2UoKTsKKyAgICB4LnNyYyA9ICJmaWxl Oi8vL1ZvbHVtZXMvRGF0YS9ubGF3cmVuMi9JbWFnZVRlc3QvbGVnby5qcGc/IiArIGk7CisgICAg aSsrOworICAgIH0sIDEwMCk7Cit9KSgpCis8L3NjcmlwdD4KKzxib2R5PgorV2hlbiBhbiBpbWFn ZSBpcyBwcmVsb2FkZWQgaW4gamF2YXNjcmlwdCwgdGhlIHNpemUgb2YgdGhlIGltYWdlIGlzIG5l dmVyCityZXBvcnRlZCB0byB0aGUgamF2YXNjcmlwdCBnYXJiYWdlIGNvbGxlY3Rvci4gIElmIGEg bGFyZ2UgaW1hZ2UgaXMgcmVwZWF0ZWRseQorcHJlbG9hZGVkIGJ1dCBuZXZlciB1c2VkLCBpdCB3 aWxsIG5vdCBmcmVlIGFueSBvZiB0aGUgaW1hZ2VzIHVudGlsIHRoZQorZ2FyYmFnZSBjb2xsZWN0 b3IgaGFzIHJ1biBvdXQgb2Ygc3BhY2UgdG8gYWxsb2NhdGUgYW55IG5ldyBmcmVlIGphdmFzY3Jp cHQKK3ZhcmlhYmxlcy4gIFRoaXMgdGVzdCBwYXNzZXMgaWYgYWZ0ZXIgYSBjZXJ0YWluIHBvaW50 LCB0aGUgbnVtYmVyIG9mIGFsbG9jYXRlZAoraW1hZ2VzIGFzIHJlcG9ydGVkIGJ5IHRoZSBjYWNo ZXMgd2luZG93IHN0b3BzIGdyb3dpbmcuCis8L2JvZHk+Cis8L2h0bWw+Cg== 56749 2010-05-21 15:04:19 -0700 2010-05-27 16:36:28 -0700 more style changes. nlawrence-image-gc.patch text/plain 2746 nlawrence SW5kZXg6IFdlYkNvcmUvaHRtbC9IVE1MSW1hZ2VMb2FkZXIuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdl YkNvcmUvaHRtbC9IVE1MSW1hZ2VMb2FkZXIuY3BwCShyZXZpc2lvbiA1OTk0OSkKKysrIFdlYkNv cmUvaHRtbC9IVE1MSW1hZ2VMb2FkZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xLDcgKzEsNyBA QAogLyoKICAqIENvcHlyaWdodCAoQykgMTk5OSBMYXJzIEtub2xsIChrbm9sbEBrZGUub3JnKQog ICogICAgICAgICAgIChDKSAxOTk5IEFudHRpIEtvaXZpc3RvIChrb2l2aXN0b0BrZGUub3JnKQot ICogQ29weXJpZ2h0IChDKSAyMDA0LCAyMDA1LCAyMDA2LCAyMDA3IEFwcGxlIEluYy4gQWxsIHJp Z2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAwNCwgMjAwNSwgMjAwNiwgMjAwNywg MjAxMCBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICogVGhpcyBsaWJyYXJ5 IGlzIGZyZWUgc29mdHdhcmU7IHlvdSBjYW4gcmVkaXN0cmlidXRlIGl0IGFuZC9vcgogICogbW9k aWZ5IGl0IHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgR05VIExpYnJhcnkgR2VuZXJhbCBQdWJsaWMK QEAgLTI3LDkgKzI3LDE0IEBACiAjaW5jbHVkZSAiRWxlbWVudC5oIgogI2luY2x1ZGUgIkV2ZW50 LmgiCiAjaW5jbHVkZSAiRXZlbnROYW1lcy5oIgorI2luY2x1ZGUgIkhUTUxJbWFnZUVsZW1lbnQu aCIKICNpbmNsdWRlICJIVE1MTmFtZXMuaCIKICNpbmNsdWRlICJIVE1MT2JqZWN0RWxlbWVudC5o IgogCisjaWYgVVNFKEpTQykKKyNpbmNsdWRlICJKU0RPTVdpbmRvd0Jhc2UuaCIKKyNlbmRpZgor CiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIEhUTUxJbWFnZUxvYWRlcjo6SFRNTEltYWdlTG9hZGVy KEVsZW1lbnQqIG5vZGUpCkBAIC02MSw2ICs2NiwxNyBAQCB2b2lkIEhUTUxJbWFnZUxvYWRlcjo6 bm90aWZ5RmluaXNoZWQoQ2FjCiAgICAgRWxlbWVudCogZWxlbSA9IGVsZW1lbnQoKTsKICAgICBJ bWFnZUxvYWRlcjo6bm90aWZ5RmluaXNoZWQoY2FjaGVkSW1hZ2UpOwogCisjaWYgVVNFKEpTQykK KyAgICBpZiAoIWNhY2hlZEltYWdlLT5lcnJvck9jY3VycmVkKCkgJiYgIWNhY2hlZEltYWdlLT5o dHRwU3RhdHVzQ29kZUVycm9yT2NjdXJyZWQoKQorICAgICAgICAmJiAoZWxlbS0+aGFzVGFnTmFt ZShIVE1MTmFtZXM6OmltZ1RhZykgfHwgZWxlbS0+aGFzVGFnTmFtZShIVE1MTmFtZXM6OmltYWdl VGFnKSkgKSB7CisgICAgICAgIEhUTUxJbWFnZUVsZW1lbnQqIGltZyA9IHN0YXRpY19jYXN0PEhU TUxJbWFnZUVsZW1lbnQqPihlbGVtKTsKKyAgICAgICAgaWYgKCFpbWctPmluRG9jdW1lbnQoKSkg eworICAgICAgICAgICAgSlNDOjpKU0dsb2JhbERhdGEqIGdsb2JhbERhdGEgPSBKU0RPTVdpbmRv d0Jhc2U6OmNvbW1vbkpTR2xvYmFsRGF0YSgpOworICAgICAgICAgICAgZ2xvYmFsRGF0YS0+aGVh cC5yZXBvcnRFeHRyYU1lbW9yeUNvc3QoY2FjaGVkSW1hZ2UtPmVuY29kZWRTaXplKCkpOworICAg ICAgICB9CisgICAgfQorI2VuZGlmCisKICAgICBpZiAoKGNhY2hlZEltYWdlLT5lcnJvck9jY3Vy cmVkKCkgfHwgY2FjaGVkSW1hZ2UtPmh0dHBTdGF0dXNDb2RlRXJyb3JPY2N1cnJlZCgpKSAmJiBl bGVtLT5oYXNUYWdOYW1lKEhUTUxOYW1lczo6b2JqZWN0VGFnKSkKICAgICAgICAgc3RhdGljX2Nh c3Q8SFRNTE9iamVjdEVsZW1lbnQqPihlbGVtKS0+cmVuZGVyRmFsbGJhY2tDb250ZW50KCk7CiB9 CkluZGV4OiBXZWJDb3JlL21hbnVhbC10ZXN0cy9pbWFnZS1wcmVmZXRjaC1zdHJlc3MuaHRtbAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBXZWJDb3JlL21hbnVhbC10ZXN0cy9pbWFnZS1wcmVmZXRjaC1zdHJlc3Mu aHRtbAkocmV2aXNpb24gMCkKKysrIFdlYkNvcmUvbWFudWFsLXRlc3RzL2ltYWdlLXByZWZldGNo LXN0cmVzcy5odG1sCShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDIwIEBACis8aHRtbD4KKzxzY3Jp cHQgdHlwZT0idGV4dC9qYXZhc2NyaXB0Ij4KKyhmdW5jdGlvbigpewordmFyIGkgPSAwOworc2V0 SW50ZXJ2YWwoZnVuY3Rpb24oKXsKKyAgICB2YXIgeCA9IG5ldyBJbWFnZSgpOworICAgIHguc3Jj ID0gImh0dHA6Ly91cGxvYWQud2lraW1lZGlhLm9yZy93aWtpcGVkaWEvY29tbW9ucy85LzlkL01P RElTX01hcC5qcGc/IiArIGk7CisgICAgaSsrOworICAgIH0sIDEwMCk7Cit9KSgpCis8L3Njcmlw dD4KKzxib2R5PgorV2hlbiBhbiBpbWFnZSBpcyBwcmVsb2FkZWQgaW4gamF2YXNjcmlwdCwgdGhl IHNpemUgb2YgdGhlIGltYWdlIGlzIG5ldmVyCityZXBvcnRlZCB0byB0aGUgamF2YXNjcmlwdCBn YXJiYWdlIGNvbGxlY3Rvci4gIElmIGEgbGFyZ2UgaW1hZ2UgaXMgcmVwZWF0ZWRseQorcHJlbG9h ZGVkIGJ1dCBuZXZlciB1c2VkLCBpdCB3aWxsIG5vdCBmcmVlIGFueSBvZiB0aGUgaW1hZ2VzIHVu dGlsIHRoZQorZ2FyYmFnZSBjb2xsZWN0b3IgaGFzIHJ1biBvdXQgb2Ygc3BhY2UgdG8gYWxsb2Nh dGUgYW55IG5ldyBmcmVlIGphdmFzY3JpcHQKK3ZhcmlhYmxlcy4gIFRoaXMgdGVzdCBwYXNzZXMg aWYgYWZ0ZXIgYSBjZXJ0YWluIHBvaW50LCB0aGUgbnVtYmVyIG9mIGFsbG9jYXRlZAoraW1hZ2Vz IGFzIHJlcG9ydGVkIGJ5IHRoZSBjYWNoZXMgd2luZG93IHN0b3BzIGdyb3dpbmcuCis8L2JvZHk+ Cis8L2h0bWw+Cg== 57280 2010-05-27 16:36:28 -0700 2010-05-27 19:00:34 -0700 Fixed test case. nlawrence-image-gc.patch text/plain 3654 nlawrence SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2MDMyNykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTkgQEAKKzIwMTAtMDUtMjcgIE5hdGhhbiBMYXdyZW5jZSAgPG5sYXdyZW5jZUBh cHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM5NDYwCisKKyAgICAg ICAgRml4ZXMgdGhlIGlzc3VlIHdoZXJlIGltYWdlcyBwcmVmZXRjaGVkIGJ5IEphdmFTY3JpcHQg ZG8gbm90IHJlcG9ydAorICAgICAgICB0aGVpciBtZW1vcnkgdXNhZ2UgdG8gdGhlIEdDLgorCisg ICAgICAgIFRoZXJlIGlzIGEgbmV3IHRlc3QgbWFudWFsLXRlc3RzL2ltYWdlLXByZWZldGNoLXN0 cmVzcy5odG1sIHRoYXQgbG9hZHMKKyAgICAgICAgYSBuZXcgNE1CIGltYWdlIGV2ZXJ5IGhhbGYg YSBzZWNvbmQuCisKKyAgICAgICAgKiBodG1sL0hUTUxJbWFnZUxvYWRlci5jcHA6CisgICAgICAg IChXZWJDb3JlOjpIVE1MSW1hZ2VMb2FkZXI6Om5vdGlmeUZpbmlzaGVkKToKKyAgICAgICAgKiBt YW51YWwtdGVzdHMvaW1hZ2UtcHJlZmV0Y2gtc3RyZXNzLmh0bWw6IEFkZGVkLgorCiAyMDEwLTA1 LTI3ICBQYXZlbCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJl dmlld2VkIGJ5IFl1cnkgU2VtaWtoYXRza3kuCkluZGV4OiBXZWJDb3JlL2h0bWwvSFRNTEltYWdl TG9hZGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2h0bWwvSFRNTEltYWdlTG9hZGVyLmNw cAkocmV2aXNpb24gNjAzMjcpCisrKyBXZWJDb3JlL2h0bWwvSFRNTEltYWdlTG9hZGVyLmNwcAko d29ya2luZyBjb3B5KQpAQCAtMSw3ICsxLDcgQEAKIC8qCiAgKiBDb3B5cmlnaHQgKEMpIDE5OTkg TGFycyBLbm9sbCAoa25vbGxAa2RlLm9yZykKICAqICAgICAgICAgICAoQykgMTk5OSBBbnR0aSBL b2l2aXN0byAoa29pdmlzdG9Aa2RlLm9yZykKLSAqIENvcHlyaWdodCAoQykgMjAwNCwgMjAwNSwg MjAwNiwgMjAwNyBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmlnaHQg KEMpIDIwMDQsIDIwMDUsIDIwMDYsIDIwMDcsIDIwMTAgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJl c2VydmVkLgogICoKICAqIFRoaXMgbGlicmFyeSBpcyBmcmVlIHNvZnR3YXJlOyB5b3UgY2FuIHJl ZGlzdHJpYnV0ZSBpdCBhbmQvb3IKICAqIG1vZGlmeSBpdCB1bmRlciB0aGUgdGVybXMgb2YgdGhl IEdOVSBMaWJyYXJ5IEdlbmVyYWwgUHVibGljCkBAIC0yNyw5ICsyNywxNCBAQAogI2luY2x1ZGUg IkVsZW1lbnQuaCIKICNpbmNsdWRlICJFdmVudC5oIgogI2luY2x1ZGUgIkV2ZW50TmFtZXMuaCIK KyNpbmNsdWRlICJIVE1MSW1hZ2VFbGVtZW50LmgiCiAjaW5jbHVkZSAiSFRNTE5hbWVzLmgiCiAj aW5jbHVkZSAiSFRNTE9iamVjdEVsZW1lbnQuaCIKIAorI2lmIFVTRShKU0MpCisjaW5jbHVkZSAi SlNET01XaW5kb3dCYXNlLmgiCisjZW5kaWYKKwogbmFtZXNwYWNlIFdlYkNvcmUgewogCiBIVE1M SW1hZ2VMb2FkZXI6OkhUTUxJbWFnZUxvYWRlcihFbGVtZW50KiBub2RlKQpAQCAtNjEsNiArNjYs MTcgQEAgdm9pZCBIVE1MSW1hZ2VMb2FkZXI6Om5vdGlmeUZpbmlzaGVkKENhYwogICAgIEVsZW1l bnQqIGVsZW0gPSBlbGVtZW50KCk7CiAgICAgSW1hZ2VMb2FkZXI6Om5vdGlmeUZpbmlzaGVkKGNh Y2hlZEltYWdlKTsKIAorI2lmIFVTRShKU0MpCisgICAgaWYgKCFjYWNoZWRJbWFnZS0+ZXJyb3JP Y2N1cnJlZCgpICYmICFjYWNoZWRJbWFnZS0+aHR0cFN0YXR1c0NvZGVFcnJvck9jY3VycmVkKCkK KyAgICAgICAgJiYgKGVsZW0tPmhhc1RhZ05hbWUoSFRNTE5hbWVzOjppbWdUYWcpIHx8IGVsZW0t Pmhhc1RhZ05hbWUoSFRNTE5hbWVzOjppbWFnZVRhZykpICkgeworICAgICAgICBIVE1MSW1hZ2VF bGVtZW50KiBpbWcgPSBzdGF0aWNfY2FzdDxIVE1MSW1hZ2VFbGVtZW50Kj4oZWxlbSk7CisgICAg ICAgIGlmICghaW1nLT5pbkRvY3VtZW50KCkpIHsKKyAgICAgICAgICAgIEpTQzo6SlNHbG9iYWxE YXRhKiBnbG9iYWxEYXRhID0gSlNET01XaW5kb3dCYXNlOjpjb21tb25KU0dsb2JhbERhdGEoKTsK KyAgICAgICAgICAgIGdsb2JhbERhdGEtPmhlYXAucmVwb3J0RXh0cmFNZW1vcnlDb3N0KGNhY2hl ZEltYWdlLT5lbmNvZGVkU2l6ZSgpKTsKKyAgICAgICAgfQorICAgIH0KKyNlbmRpZgorCiAgICAg aWYgKChjYWNoZWRJbWFnZS0+ZXJyb3JPY2N1cnJlZCgpIHx8IGNhY2hlZEltYWdlLT5odHRwU3Rh dHVzQ29kZUVycm9yT2NjdXJyZWQoKSkgJiYgZWxlbS0+aGFzVGFnTmFtZShIVE1MTmFtZXM6Om9i amVjdFRhZykpCiAgICAgICAgIHN0YXRpY19jYXN0PEhUTUxPYmplY3RFbGVtZW50Kj4oZWxlbSkt PnJlbmRlckZhbGxiYWNrQ29udGVudCgpOwogfQpJbmRleDogV2ViQ29yZS9tYW51YWwtdGVzdHMv aW1hZ2UtcHJlZmV0Y2gtc3RyZXNzLmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9tYW51YWwt dGVzdHMvaW1hZ2UtcHJlZmV0Y2gtc3RyZXNzLmh0bWwJKHJldmlzaW9uIDApCisrKyBXZWJDb3Jl L21hbnVhbC10ZXN0cy9pbWFnZS1wcmVmZXRjaC1zdHJlc3MuaHRtbAkocmV2aXNpb24gMCkKQEAg LTAsMCArMSwyMCBAQAorPGh0bWw+Cis8c2NyaXB0IHR5cGU9InRleHQvamF2YXNjcmlwdCI+Ciso ZnVuY3Rpb24oKXsKKyB2YXIgaSA9IDA7CitzZXRJbnRlcnZhbChmdW5jdGlvbigpeworICAgIHZh ciB4ID0gbmV3IEltYWdlKCk7CisgICAgeC5zcmMgPSAiaHR0cDovL3VwbG9hZC53aWtpbWVkaWEu b3JnL3dpa2lwZWRpYS9jb21tb25zL2UvZTkvU29tYnJlcm9fR2FsYXh5X2luX2luZnJhcmVkX2xp Z2h0XyUyOEh1YmJsZV9TcGFjZV9UZWxlc2NvcGVfYW5kX1NwaXR6ZXJfU3BhY2VfVGVsZXNjb3Bl JTI5LmpwZz8iICsgaTsKKyAgICBpKys7CisgICAgfSwgNTAwKTsKK30pKCkKKzwvc2NyaXB0Pgor PGJvZHk+CitXaGVuIGFuIGltYWdlIGlzIHByZWxvYWRlZCBpbiBqYXZhc2NyaXB0LCB0aGUgc2l6 ZSBvZiB0aGUgaW1hZ2UgaXMgbmV2ZXIKK3JlcG9ydGVkIHRvIHRoZSBqYXZhc2NyaXB0IGdhcmJh Z2UgY29sbGVjdG9yLiAgSWYgYSBsYXJnZSBpbWFnZSBpcyByZXBlYXRlZGx5CitwcmVsb2FkZWQg YnV0IG5ldmVyIHVzZWQsIGl0IHdpbGwgbm90IGZyZWUgYW55IG9mIHRoZSBpbWFnZXMgdW50aWwg dGhlCitnYXJiYWdlIGNvbGxlY3RvciBoYXMgcnVuIG91dCBvZiBzcGFjZSB0byBhbGxvY2F0ZSBh bnkgbmV3IGZyZWUgamF2YXNjcmlwdAordmFyaWFibGVzLiAgVGhpcyB0ZXN0IHBhc3NlcyBpZiBh ZnRlciBhIGNlcnRhaW4gcG9pbnQsIHRoZSBudW1iZXIgb2YgYWxsb2NhdGVkCitpbWFnZXMgYXMg cmVwb3J0ZWQgYnkgdGhlIGNhY2hlcyB3aW5kb3cgc3RvcHMgZ3Jvd2luZy4KKzwvYm9keT4KKzwv aHRtbD4K 57287 2010-05-27 19:00:34 -0700 2010-05-28 00:58:44 -0700 removed <img> and <image> tag checks. nlawrence-image-gc2.patch text/plain 1985 nlawrence SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2MDMzOCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTcgQEAKKzIwMTAtMDUtMjcgIE5hdGhhbiBMYXdyZW5jZSAgPG5sYXdyZW5jZUBh cHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM5NDYwCisKKyAgICAg ICAgQmVjYXVzZSBub3QganVzdCA8aW1nPiBhbmQgPGltYWdlPiBlbGVtZW50cyBjYW4gcHJlbG9h ZCBpbWFnZXMsIHdlCisgICAgICAgIGRvbnQgd2FudCB0byByZXN0cmljdCB0aGUgZWxlbWVudCBh c3NvY2lhdGVkIHdpdGggdGhlIGxvYWRlci4KKworICAgICAgICBObyBuZXcgdGVzdHMuIFNob3Vs ZCBzaGFyZSB0aGUgc2FtZSB0ZXN0cyBhcyB0aGUgbGFzdCBwYXRjaC4KKworICAgICAgICAqIGh0 bWwvSFRNTEltYWdlTG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxJbWFnZUxvYWRl cjo6bm90aWZ5RmluaXNoZWQpOgorCiAyMDEwLTA1LTI3ICBOYXRoYW4gTGF3cmVuY2UgIDxubGF3 cmVuY2VAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEdlb2ZmcmV5IEdhcmVuLgpJ bmRleDogV2ViQ29yZS9odG1sL0hUTUxJbWFnZUxvYWRlci5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vi Q29yZS9odG1sL0hUTUxJbWFnZUxvYWRlci5jcHAJKHJldmlzaW9uIDYwMzM3KQorKysgV2ViQ29y ZS9odG1sL0hUTUxJbWFnZUxvYWRlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI3LDcgKzI3LDYg QEAKICNpbmNsdWRlICJFbGVtZW50LmgiCiAjaW5jbHVkZSAiRXZlbnQuaCIKICNpbmNsdWRlICJF dmVudE5hbWVzLmgiCi0jaW5jbHVkZSAiSFRNTEltYWdlRWxlbWVudC5oIgogI2luY2x1ZGUgIkhU TUxOYW1lcy5oIgogI2luY2x1ZGUgIkhUTUxPYmplY3RFbGVtZW50LmgiCiAKQEAgLTYwLDE3ICs1 OSwxNSBAQCBTdHJpbmcgSFRNTEltYWdlTG9hZGVyOjpzb3VyY2VVUkkoY29uc3QgCiB9CiAKIHZv aWQgSFRNTEltYWdlTG9hZGVyOjpub3RpZnlGaW5pc2hlZChDYWNoZWRSZXNvdXJjZSopCi17ICAg IAorewogICAgIENhY2hlZEltYWdlKiBjYWNoZWRJbWFnZSA9IGltYWdlKCk7CiAKICAgICBFbGVt ZW50KiBlbGVtID0gZWxlbWVudCgpOwogICAgIEltYWdlTG9hZGVyOjpub3RpZnlGaW5pc2hlZChj YWNoZWRJbWFnZSk7CiAKICNpZiBVU0UoSlNDKQotICAgIGlmICghY2FjaGVkSW1hZ2UtPmVycm9y T2NjdXJyZWQoKSAmJiAhY2FjaGVkSW1hZ2UtPmh0dHBTdGF0dXNDb2RlRXJyb3JPY2N1cnJlZCgp Ci0gICAgICAgICYmIChlbGVtLT5oYXNUYWdOYW1lKEhUTUxOYW1lczo6aW1nVGFnKSB8fCBlbGVt LT5oYXNUYWdOYW1lKEhUTUxOYW1lczo6aW1hZ2VUYWcpKSApIHsKLSAgICAgICAgSFRNTEltYWdl RWxlbWVudCogaW1nID0gc3RhdGljX2Nhc3Q8SFRNTEltYWdlRWxlbWVudCo+KGVsZW0pOwotICAg ICAgICBpZiAoIWltZy0+aW5Eb2N1bWVudCgpKSB7CisgICAgaWYgKCFjYWNoZWRJbWFnZS0+ZXJy b3JPY2N1cnJlZCgpICYmICFjYWNoZWRJbWFnZS0+aHR0cFN0YXR1c0NvZGVFcnJvck9jY3VycmVk KCkpIHsKKyAgICAgICAgaWYgKCFlbGVtLT5pbkRvY3VtZW50KCkpIHsKICAgICAgICAgICAgIEpT Qzo6SlNHbG9iYWxEYXRhKiBnbG9iYWxEYXRhID0gSlNET01XaW5kb3dCYXNlOjpjb21tb25KU0ds b2JhbERhdGEoKTsKICAgICAgICAgICAgIGdsb2JhbERhdGEtPmhlYXAucmVwb3J0RXh0cmFNZW1v cnlDb3N0KGNhY2hlZEltYWdlLT5lbmNvZGVkU2l6ZSgpKTsKICAgICAgICAgfQo=