138508 2014-11-07 11:10:26 -0800 Rename HTMLInputElement::imageLoader() to ensureImageLoader() 2014-11-07 14:14:49 -0800 1 1 1 Unclassified WebKit DOM 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 cdumez cdumez benjamin commit-queue kling rniwa oldest_to_newest 1047121 0 cdumez 2014-11-07 11:10:26 -0800 Rename HTMLInputElement::imageLoader() to ensureImageLoader() and have it return a reference to make it clear that it constructs an ImageLoader if missing. Also introduce a lightweight imageLoader() getter which just returns the imageLoader or null if missing. 1047126 1 241195 cdumez 2014-11-07 11:25:59 -0800 Created attachment 241195 Patch 1047173 2 241195 commit-queue 2014-11-07 14:14:44 -0800 Comment on attachment 241195 Patch Clearing flags on attachment: 241195 Committed r175764: <http://trac.webkit.org/changeset/175764> 1047174 3 commit-queue 2014-11-07 14:14:49 -0800 All reviewed patches have been landed. Closing bug. 241195 2014-11-07 11:25:59 -0800 2014-11-07 14:14:44 -0800 Patch bug-138508-20141107112609.patch text/plain 6410 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMTc1NzUyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDVhYTVhODdlMmU1N2Mx ZmNhNGM3NjhiNWM2NjRmZWRkMmFiNzZhYy4uNTM1MDhjYmMzOTVhODExYzhhM2ZjNWY0M2E3MmE1 NmNhOTMzYTc0YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMzIEBACiAyMDE0LTExLTA3ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKKyAgICAgICAgUmVuYW1lIEhUTUxJbnB1dEVs ZW1lbnQ6OmltYWdlTG9hZGVyKCkgdG8gZW5zdXJlSW1hZ2VMb2FkZXIoKQorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM4NTA4CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVuYW1lIEhUTUxJbnB1dEVsZW1l bnQ6OmltYWdlTG9hZGVyKCkgdG8gZW5zdXJlSW1hZ2VMb2FkZXIoKSBhbmQgaGF2ZQorICAgICAg ICBpdCByZXR1cm4gYSByZWZlcmVuY2UgdG8gbWFrZSBpdCBjbGVhciB0aGF0IGl0IGNvbnN0cnVj dHMgYW4KKyAgICAgICAgSW1hZ2VMb2FkZXIgaWYgbWlzc2luZy4KKyAgICAgICAgQWxzbyBpbnRy b2R1Y2UgYSBsaWdodHdlaWdodCBpbWFnZUxvYWRlcigpIGdldHRlciB3aGljaCBqdXN0IHJldHVy bnMKKyAgICAgICAgdGhlIGltYWdlTG9hZGVyIG9yIG51bGwgaWYgbWlzc2luZy4KKworICAgICAg ICBObyBuZXcgdGVzdHMsIG5vIGJlaGF2aW9yIGNoYW5nZS4KKworICAgICAgICAqIGh0bWwvSFRN TElucHV0RWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MSW5wdXRFbGVtZW50Ojpl bnN1cmVJbWFnZUxvYWRlcik6CisgICAgICAgIChXZWJDb3JlOjpIVE1MSW5wdXRFbGVtZW50Ojpk aWRNb3ZlVG9OZXdEb2N1bWVudCk6CisgICAgICAgIChXZWJDb3JlOjpIVE1MSW5wdXRFbGVtZW50 OjppbWFnZUxvYWRlcik6IERlbGV0ZWQuCisgICAgICAgICogaHRtbC9IVE1MSW5wdXRFbGVtZW50 Lmg6CisgICAgICAgIChXZWJDb3JlOjpIVE1MSW5wdXRFbGVtZW50OjppbWFnZUxvYWRlcik6Cisg ICAgICAgIChXZWJDb3JlOjpIVE1MSW5wdXRFbGVtZW50OjpoYXNJbWFnZUxvYWRlcik6IERlbGV0 ZWQuCisgICAgICAgICogaHRtbC9JbWFnZUlucHV0VHlwZS5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpJbWFnZUlucHV0VHlwZTo6c3JjQXR0cmlidXRlQ2hhbmdlZCk6CisgICAgICAgIChXZWJDb3Jl OjpJbWFnZUlucHV0VHlwZTo6YXR0YWNoKToKKyAgICAgICAgKFdlYkNvcmU6OkltYWdlSW5wdXRU eXBlOjpoZWlnaHQpOgorICAgICAgICAoV2ViQ29yZTo6SW1hZ2VJbnB1dFR5cGU6OndpZHRoKToK KworMjAxNC0xMS0wNyAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgorCiAgICAgICAg IERyb3AgdXNlbGVzcyBIVE1MRWxlbWVudDo6aXNVUkxBdHRyaWJ1dGUoKSBvdmVycmlkZQogICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM4NDc5CiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTElucHV0RWxlbWVudC5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9odG1sL0hUTUxJbnB1dEVsZW1lbnQuY3BwCmluZGV4IDYzZmEyN2ExMGZiOGFl NGEyZWRhZmNhODcxOGYzYTkwM2MyNTI4MTUuLmUxZmU5MWM5ZWE4YWE1OGU2MTRjZjY3YWFkYmFh YWE2MWEzMzUzMTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTElucHV0RWxl bWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MSW5wdXRFbGVtZW50LmNwcApA QCAtMTM0LDExICsxMzQsMTEgQEAgUGFzc1JlZlB0cjxIVE1MSW5wdXRFbGVtZW50PiBIVE1MSW5w dXRFbGVtZW50OjpjcmVhdGUoY29uc3QgUXVhbGlmaWVkTmFtZSYgdGFnTmEKICAgICByZXR1cm4g aW5wdXRFbGVtZW50LnJlbGVhc2UoKTsKIH0KIAotSFRNTEltYWdlTG9hZGVyKiBIVE1MSW5wdXRF bGVtZW50OjppbWFnZUxvYWRlcigpCitIVE1MSW1hZ2VMb2FkZXImIEhUTUxJbnB1dEVsZW1lbnQ6 OmVuc3VyZUltYWdlTG9hZGVyKCkKIHsKICAgICBpZiAoIW1faW1hZ2VMb2FkZXIpCiAgICAgICAg IG1faW1hZ2VMb2FkZXIgPSBzdGQ6Om1ha2VfdW5pcXVlPEhUTUxJbWFnZUxvYWRlcj4oKnRoaXMp OwotICAgIHJldHVybiBtX2ltYWdlTG9hZGVyLmdldCgpOworICAgIHJldHVybiAqbV9pbWFnZUxv YWRlcjsKIH0KIAogdm9pZCBIVE1MSW5wdXRFbGVtZW50OjpkaWRBZGRVc2VyQWdlbnRTaGFkb3dS b290KFNoYWRvd1Jvb3QqKQpAQCAtMTQzNiw3ICsxNDM2LDcgQEAgdm9pZCBIVE1MSW5wdXRFbGVt ZW50OjpyZW1vdmVkRnJvbShDb250YWluZXJOb2RlJiBpbnNlcnRpb25Qb2ludCkKIAogdm9pZCBI VE1MSW5wdXRFbGVtZW50OjpkaWRNb3ZlVG9OZXdEb2N1bWVudChEb2N1bWVudCogb2xkRG9jdW1l bnQpCiB7Ci0gICAgaWYgKGhhc0ltYWdlTG9hZGVyKCkpCisgICAgaWYgKGltYWdlTG9hZGVyKCkp CiAgICAgICAgIGltYWdlTG9hZGVyKCktPmVsZW1lbnREaWRNb3ZlVG9OZXdEb2N1bWVudCgpOwog CiAgICAgYm9vbCBuZWVkc1N1c3BlbnNpb25DYWxsYmFjayA9IHRoaXMtPm5lZWRzU3VzcGVuc2lv bkNhbGxiYWNrKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxJbnB1dEVs ZW1lbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTElucHV0RWxlbWVudC5oCmluZGV4IDdi NGZhYWJlNTIxN2FiZDUyMzBjOTlhNzA2MDU1OTYzMzcxYWI0YzQuLjkyMGQyNDFmM2ZkNzlmZTIw MmM0NTNjMjJmN2RiZDgxMGY4NWNiYTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwv SFRNTElucHV0RWxlbWVudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTElucHV0RWxl bWVudC5oCkBAIC0zMTAsOCArMzEwLDggQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCBzZXRS YW5nZVRleHQoY29uc3QgU3RyaW5nJiByZXBsYWNlbWVudCwgRXhjZXB0aW9uQ29kZSYpIG92ZXJy aWRlOwogICAgIHZpcnR1YWwgdm9pZCBzZXRSYW5nZVRleHQoY29uc3QgU3RyaW5nJiByZXBsYWNl bWVudCwgdW5zaWduZWQgc3RhcnQsIHVuc2lnbmVkIGVuZCwgY29uc3QgU3RyaW5nJiBzZWxlY3Rp b25Nb2RlLCBFeGNlcHRpb25Db2RlJikgb3ZlcnJpZGU7CiAKLSAgICBib29sIGhhc0ltYWdlTG9h ZGVyKCkgY29uc3QgeyByZXR1cm4gISFtX2ltYWdlTG9hZGVyOyB9Ci0gICAgSFRNTEltYWdlTG9h ZGVyKiBpbWFnZUxvYWRlcigpOworICAgIEhUTUxJbWFnZUxvYWRlciogaW1hZ2VMb2FkZXIoKSB7 IHJldHVybiBtX2ltYWdlTG9hZGVyLmdldCgpOyB9CisgICAgSFRNTEltYWdlTG9hZGVyJiBlbnN1 cmVJbWFnZUxvYWRlcigpOwogCiAjaWYgRU5BQkxFKERBVEVfQU5EX1RJTUVfSU5QVVRfVFlQRVMp CiAgICAgYm9vbCBzZXR1cERhdGVUaW1lQ2hvb3NlclBhcmFtZXRlcnMoRGF0ZVRpbWVDaG9vc2Vy UGFyYW1ldGVycyYpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9JbWFnZUlucHV0 VHlwZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0ltYWdlSW5wdXRUeXBlLmNwcAppbmRleCBh YjE1MmRjNjRmNTE4NGM1MzQxYzMzNDg3ODg0YmEyY2E3ODNmNzg4Li5lMzIxYzJlM2NhZTg5ZTRk NDQ4NWViOTYwMDkxNjM5NTlhNjZkMWU3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1s L0ltYWdlSW5wdXRUeXBlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0ltYWdlSW5wdXRU eXBlLmNwcApAQCAtMTE4LDI5ICsxMTgsMjkgQEAgdm9pZCBJbWFnZUlucHV0VHlwZTo6c3JjQXR0 cmlidXRlQ2hhbmdlZCgpCiB7CiAgICAgaWYgKCFlbGVtZW50KCkucmVuZGVyZXIoKSkKICAgICAg ICAgcmV0dXJuOwotICAgIGVsZW1lbnQoKS5pbWFnZUxvYWRlcigpLT51cGRhdGVGcm9tRWxlbWVu dElnbm9yaW5nUHJldmlvdXNFcnJvcigpOworICAgIGVsZW1lbnQoKS5lbnN1cmVJbWFnZUxvYWRl cigpLnVwZGF0ZUZyb21FbGVtZW50SWdub3JpbmdQcmV2aW91c0Vycm9yKCk7CiB9CiAKIHZvaWQg SW1hZ2VJbnB1dFR5cGU6OmF0dGFjaCgpCiB7CiAgICAgQmFzZUJ1dHRvbklucHV0VHlwZTo6YXR0 YWNoKCk7CiAKLSAgICBIVE1MSW1hZ2VMb2FkZXIqIGltYWdlTG9hZGVyID0gZWxlbWVudCgpLmlt YWdlTG9hZGVyKCk7Ci0gICAgaW1hZ2VMb2FkZXItPnVwZGF0ZUZyb21FbGVtZW50KCk7CisgICAg SFRNTEltYWdlTG9hZGVyJiBpbWFnZUxvYWRlciA9IGVsZW1lbnQoKS5lbnN1cmVJbWFnZUxvYWRl cigpOworICAgIGltYWdlTG9hZGVyLnVwZGF0ZUZyb21FbGVtZW50KCk7CiAKICAgICBhdXRvKiBy ZW5kZXJlciA9IGRvd25jYXN0PFJlbmRlckltYWdlPihlbGVtZW50KCkucmVuZGVyZXIoKSk7CiAg ICAgaWYgKCFyZW5kZXJlcikKICAgICAgICAgcmV0dXJuOwogCi0gICAgaWYgKGltYWdlTG9hZGVy LT5oYXNQZW5kaW5nQmVmb3JlTG9hZEV2ZW50KCkpCisgICAgaWYgKGltYWdlTG9hZGVyLmhhc1Bl bmRpbmdCZWZvcmVMb2FkRXZlbnQoKSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgYXV0byYgaW1h Z2VSZXNvdXJjZSA9IHJlbmRlcmVyLT5pbWFnZVJlc291cmNlKCk7Ci0gICAgaW1hZ2VSZXNvdXJj ZS5zZXRDYWNoZWRJbWFnZShpbWFnZUxvYWRlci0+aW1hZ2UoKSk7CisgICAgaW1hZ2VSZXNvdXJj ZS5zZXRDYWNoZWRJbWFnZShpbWFnZUxvYWRlci5pbWFnZSgpKTsKIAogICAgIC8vIElmIHdlIGhh dmUgbm8gaW1hZ2UgYXQgYWxsIGJlY2F1c2Ugd2UgaGF2ZSBubyBzcmMgYXR0cmlidXRlLCBzZXQK ICAgICAvLyBpbWFnZSBoZWlnaHQgYW5kIHdpZHRoIGZvciB0aGUgYWx0IHRleHQgaW5zdGVhZC4K LSAgICBpZiAoIWltYWdlTG9hZGVyLT5pbWFnZSgpICYmICFpbWFnZVJlc291cmNlLmNhY2hlZElt YWdlKCkpCisgICAgaWYgKCFpbWFnZUxvYWRlci5pbWFnZSgpICYmICFpbWFnZVJlc291cmNlLmNh Y2hlZEltYWdlKCkpCiAgICAgICAgIHJlbmRlcmVyLT5zZXRJbWFnZVNpemVGb3JBbHRUZXh0KCk7 CiB9CiAKQEAgLTE4MCwxMSArMTgwLDkgQEAgdW5zaWduZWQgSW1hZ2VJbnB1dFR5cGU6OmhlaWdo dCgpIGNvbnN0CiAgICAgICAgICAgICByZXR1cm4gaGVpZ2h0OwogCiAgICAgICAgIC8vIElmIHRo ZSBpbWFnZSBpcyBhdmFpbGFibGUsIHVzZSBpdHMgaGVpZ2h0LgotICAgICAgICBpZiAoZWxlbWVu dC0+aGFzSW1hZ2VMb2FkZXIoKSkgewotICAgICAgICAgICAgSFRNTEltYWdlTG9hZGVyKiBpbWFn ZUxvYWRlciA9IGVsZW1lbnQtPmltYWdlTG9hZGVyKCk7Ci0gICAgICAgICAgICBpZiAoaW1hZ2VM b2FkZXItPmltYWdlKCkpCi0gICAgICAgICAgICAgICAgcmV0dXJuIGltYWdlTG9hZGVyLT5pbWFn ZSgpLT5pbWFnZVNpemVGb3JSZW5kZXJlcihlbGVtZW50LT5yZW5kZXJlcigpLCAxKS5oZWlnaHQo KTsKLSAgICAgICAgfQorICAgICAgICBIVE1MSW1hZ2VMb2FkZXIqIGltYWdlTG9hZGVyID0gZWxl bWVudC0+aW1hZ2VMb2FkZXIoKTsKKyAgICAgICAgaWYgKGltYWdlTG9hZGVyICYmIGltYWdlTG9h ZGVyLT5pbWFnZSgpKQorICAgICAgICAgICAgcmV0dXJuIGltYWdlTG9hZGVyLT5pbWFnZSgpLT5p bWFnZVNpemVGb3JSZW5kZXJlcihlbGVtZW50LT5yZW5kZXJlcigpLCAxKS5oZWlnaHQoKTsKICAg ICB9CiAKICAgICBlbGVtZW50LT5kb2N1bWVudCgpLnVwZGF0ZUxheW91dCgpOwpAQCAtMjA0LDEx ICsyMDIsOSBAQCB1bnNpZ25lZCBJbWFnZUlucHV0VHlwZTo6d2lkdGgoKSBjb25zdAogICAgICAg ICAgICAgcmV0dXJuIHdpZHRoOwogCiAgICAgICAgIC8vIElmIHRoZSBpbWFnZSBpcyBhdmFpbGFi bGUsIHVzZSBpdHMgd2lkdGguCi0gICAgICAgIGlmIChlbGVtZW50LT5oYXNJbWFnZUxvYWRlcigp KSB7Ci0gICAgICAgICAgICBIVE1MSW1hZ2VMb2FkZXIqIGltYWdlTG9hZGVyID0gZWxlbWVudC0+ aW1hZ2VMb2FkZXIoKTsKLSAgICAgICAgICAgIGlmIChpbWFnZUxvYWRlci0+aW1hZ2UoKSkKLSAg ICAgICAgICAgICAgICByZXR1cm4gaW1hZ2VMb2FkZXItPmltYWdlKCktPmltYWdlU2l6ZUZvclJl bmRlcmVyKGVsZW1lbnQtPnJlbmRlcmVyKCksIDEpLndpZHRoKCk7Ci0gICAgICAgIH0KKyAgICAg ICAgSFRNTEltYWdlTG9hZGVyKiBpbWFnZUxvYWRlciA9IGVsZW1lbnQtPmltYWdlTG9hZGVyKCk7 CisgICAgICAgIGlmIChpbWFnZUxvYWRlciAmJiBpbWFnZUxvYWRlci0+aW1hZ2UoKSkKKyAgICAg ICAgICAgIHJldHVybiBpbWFnZUxvYWRlci0+aW1hZ2UoKS0+aW1hZ2VTaXplRm9yUmVuZGVyZXIo ZWxlbWVudC0+cmVuZGVyZXIoKSwgMSkud2lkdGgoKTsKICAgICB9CiAKICAgICBlbGVtZW50LT5k b2N1bWVudCgpLnVwZGF0ZUxheW91dCgpOwo=