82283 2012-03-26 18:39:01 -0700 ImageLoader::m_firedLoadEvent is a confusing name 2012-03-27 14:30:30 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 webkit.review.bot abarth abarth ap haraken japhet tkent oldest_to_newest 588444 0 webkit.review.bot 2012-03-26 18:39:01 -0700 Clean up ImageLoader::m_firedLoadEvent Requested by abarth on #webkit. 588579 1 133980 abarth 2012-03-26 22:56:15 -0700 Created attachment 133980 Patch 588585 2 133980 haraken 2012-03-26 23:04:03 -0700 Comment on attachment 133980 Patch OK 588617 3 133980 webkit.review.bot 2012-03-27 00:21:55 -0700 Comment on attachment 133980 Patch Clearing flags on attachment: 133980 Committed r112215: <http://trac.webkit.org/changeset/112215> 588618 4 webkit.review.bot 2012-03-27 00:21:59 -0700 All reviewed patches have been landed. Closing bug. 589284 5 ap 2012-03-27 14:21:44 -0700 I had an abandoned patch for the same some time ago, <https://bugs.webkit.org/attachment.cgi?id=76669&action=review>. It got stuck because it was trying to do too much at once. Now that you're at it, perhaps you'll have the interest to finish the job, and make script elements sensible, too? 589292 6 abarth 2012-03-27 14:30:30 -0700 > Now that you're at it, perhaps you'll have the interest to finish the job, and make script elements sensible, too? Yeah, I saw the script element one in my grep as well. I'm happy to change that one too. 133980 2012-03-26 22:56:15 -0700 2012-03-27 00:21:55 -0700 Patch bug-82283-20120326225614.patch text/plain 12312 abarth SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDExMjIwNykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQ0IEBACisyMDEyLTAzLTI2ICBBZGFtIEJh cnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CisKKyAgICAgICAgSW1hZ2VMb2FkZXI6Om1fZmlyZWRM b2FkRXZlbnQgaXMgYSBjb25mdXNpbmcgbmFtZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODIyODMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBUaGlzIHBhdGNoIHJlbmFtZXMgbV9maXJlZExvYWRFdmVudCAo YW5kIGZyaWVuZHMpIHRvCisgICAgICAgIG1faGFzUGVuZGluZ0xvYWRFdmVudCAoYW5kIG5lZ2F0 ZXMgdGhlIHZhbHVlKS4gIFRoYXQgbmFtZSBtb3JlCisgICAgICAgIGFjY3VyYXRlbHkgcmVmbGVj dHMgdGhlIHNlbWFudGljcyBvZiB0aGlzIHBpZWNlIG9mIHN0YXRlLiAgRm9yIGV4YW1wbGUsCisg ICAgICAgIHdlIG5vdyBpbml0aWFsaXplIG1faGFzUGVuZGluZ0xvYWRFdmVudCB0byBmYWxzZSwg d2hpY2ggbWFrZXMgc2Vuc2UgYXMKKyAgICAgICAgdGhlcmUgaXMgbm8gcGVuZGluZyBsb2FkIGV2 ZW50LCB3aGVyZWFzIGJlZm9yZSB3ZSBpbml0aWFsaXplZAorICAgICAgICBtX2ZpcmVkTG9hZEV2 ZW50IHRvIHRydWUsIHdoaWNoIG1hZGUgbGVzcyBzZW5zZSBzaW5jZSB3ZSBoYWRuJ3QgeWV0Cisg ICAgICAgIGFjdHVhbGx5IGZpcmVkIHRoZSBsb2FkIGV2ZW50LgorCisgICAgICAgICogYmluZGlu Z3MvdjgvVjhHQ0NvbnRyb2xsZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Y2FsY3VsYXRlR3Jv dXBJZCk6CisgICAgICAgICogaHRtbC9IVE1MSW1hZ2VFbGVtZW50LmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkhUTUxJbWFnZUVsZW1lbnQ6OmF0dGFjaCk6CisgICAgICAgICogaHRtbC9IVE1MSW1h Z2VFbGVtZW50Lmg6CisgICAgICAgIChIVE1MSW1hZ2VFbGVtZW50KToKKyAgICAgICAgKFdlYkNv cmU6OkhUTUxJbWFnZUVsZW1lbnQ6Omhhc1BlbmRpbmdMb2FkRXZlbnQpOgorICAgICAgICAoV2Vi Q29yZTo6SFRNTEltYWdlRWxlbWVudDo6aGFzUGVuZGluZ0FjdGl2aXR5KToKKyAgICAgICAgKiBo dG1sL0ltYWdlSW5wdXRUeXBlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkltYWdlSW5wdXRUeXBl OjphdHRhY2gpOgorICAgICAgICAqIGxvYWRlci9JbWFnZUxvYWRlci5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpJbWFnZUxvYWRlcjo6SW1hZ2VMb2FkZXIpOgorICAgICAgICAoV2ViQ29yZTo6SW1h Z2VMb2FkZXI6On5JbWFnZUxvYWRlcik6CisgICAgICAgIChXZWJDb3JlOjpJbWFnZUxvYWRlcjo6 c2V0SW1hZ2UpOgorICAgICAgICAoV2ViQ29yZTo6SW1hZ2VMb2FkZXI6OnVwZGF0ZUZyb21FbGVt ZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkltYWdlTG9hZGVyOjpub3RpZnlGaW5pc2hlZCk6Cisg ICAgICAgIChXZWJDb3JlOjpJbWFnZUxvYWRlcjo6ZGlzcGF0Y2hQZW5kaW5nQmVmb3JlTG9hZEV2 ZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkltYWdlTG9hZGVyOjpkaXNwYXRjaFBlbmRpbmdMb2Fk RXZlbnQpOgorICAgICAgICAoV2ViQ29yZTo6SW1hZ2VMb2FkZXI6OmRpc3BhdGNoUGVuZGluZ0Vy cm9yRXZlbnQpOgorICAgICAgICAqIGxvYWRlci9JbWFnZUxvYWRlci5oOgorICAgICAgICAoV2Vi Q29yZTo6SW1hZ2VMb2FkZXI6Omhhc1BlbmRpbmdCZWZvcmVMb2FkRXZlbnQpOgorICAgICAgICAo V2ViQ29yZTo6SW1hZ2VMb2FkZXI6Omhhc1BlbmRpbmdMb2FkRXZlbnQpOgorICAgICAgICAoSW1h Z2VMb2FkZXIpOgorICAgICAgICAqIHN2Zy9TVkdJbWFnZUVsZW1lbnQuY3BwOgorICAgICAgICAo V2ViQ29yZTo6U1ZHSW1hZ2VFbGVtZW50OjpoYXZlTG9hZGVkUmVxdWlyZWRSZXNvdXJjZXMpOgor CiAyMDEyLTAzLTI2ICBTaGVyaWZmIEJvdCAgPHdlYmtpdC5yZXZpZXcuYm90QGdtYWlsLmNvbT4K IAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByMTEyMTk5LgpJbmRleDogU291cmNl L1dlYkNvcmUvYmluZGluZ3MvdjgvVjhHQ0NvbnRyb2xsZXIuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4R0NDb250cm9sbGVyLmNwcAkocmV2aXNpb24gMTEy MjA2KQorKysgU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvVjhHQ0NvbnRyb2xsZXIuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC0yOTEsNyArMjkxLDcgQEAgdHlwZWRlZiBWZWN0b3I8R3JvdXBlckl0 ZW0+IEdyb3VwZXJMaXN0OwogLy8gZWxlbWVudCBvZiB0aGUgdHJlZSB0byB3aGljaCBpdCBiZWxv bmdzLgogc3RhdGljIEdyb3VwSWQgY2FsY3VsYXRlR3JvdXBJZChOb2RlKiBub2RlKQogewotICAg IGlmIChub2RlLT5pbkRvY3VtZW50KCkgfHwgKG5vZGUtPmhhc1RhZ05hbWUoSFRNTE5hbWVzOjpp bWdUYWcpICYmICFzdGF0aWNfY2FzdDxIVE1MSW1hZ2VFbGVtZW50Kj4obm9kZSktPmhhdmVGaXJl ZExvYWRFdmVudCgpKSkKKyAgICBpZiAobm9kZS0+aW5Eb2N1bWVudCgpIHx8IChub2RlLT5oYXNU YWdOYW1lKEhUTUxOYW1lczo6aW1nVGFnKSAmJiBzdGF0aWNfY2FzdDxIVE1MSW1hZ2VFbGVtZW50 Kj4obm9kZSktPmhhc1BlbmRpbmdMb2FkRXZlbnQoKSkpCiAgICAgICAgIHJldHVybiBHcm91cElk KG5vZGUtPmRvY3VtZW50KCkpOwogCiAgICAgTm9kZSogcm9vdCA9IG5vZGU7CkluZGV4OiBTb3Vy Y2UvV2ViQ29yZS9odG1sL0hUTUxJbWFnZUVsZW1lbnQuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL2h0bWwvSFRNTEltYWdlRWxlbWVudC5jcHAJKHJldmlzaW9uIDExMjIwNikKKysr IFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEltYWdlRWxlbWVudC5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTE1NCw3ICsxNTQsNyBAQCB2b2lkIEhUTUxJbWFnZUVsZW1lbnQ6OmF0dGFjaCgpCiB7CiAg ICAgSFRNTEVsZW1lbnQ6OmF0dGFjaCgpOwogCi0gICAgaWYgKHJlbmRlcmVyKCkgJiYgcmVuZGVy ZXIoKS0+aXNJbWFnZSgpICYmIG1faW1hZ2VMb2FkZXIuaGF2ZUZpcmVkQmVmb3JlTG9hZEV2ZW50 KCkpIHsKKyAgICBpZiAocmVuZGVyZXIoKSAmJiByZW5kZXJlcigpLT5pc0ltYWdlKCkgJiYgIW1f aW1hZ2VMb2FkZXIuaGFzUGVuZGluZ0JlZm9yZUxvYWRFdmVudCgpKSB7CiAgICAgICAgIFJlbmRl ckltYWdlKiByZW5kZXJJbWFnZSA9IHRvUmVuZGVySW1hZ2UocmVuZGVyZXIoKSk7CiAgICAgICAg IFJlbmRlckltYWdlUmVzb3VyY2UqIHJlbmRlckltYWdlUmVzb3VyY2UgPSByZW5kZXJJbWFnZS0+ aW1hZ2VSZXNvdXJjZSgpOwogICAgICAgICBpZiAocmVuZGVySW1hZ2VSZXNvdXJjZS0+aGFzSW1h Z2UoKSkKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEltYWdlRWxlbWVudC5oCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEltYWdlRWxlbWVudC5oCShyZXZpc2lv biAxMTIyMDYpCisrKyBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxJbWFnZUVsZW1lbnQuaAkod29y a2luZyBjb3B5KQpAQCAtNzIsOCArNzIsOSBAQCBwdWJsaWM6CiAKICAgICBib29sIGNvbXBsZXRl KCkgY29uc3Q7CiAKLSAgICBib29sIGhhdmVGaXJlZExvYWRFdmVudCgpIGNvbnN0IHsgcmV0dXJu IG1faW1hZ2VMb2FkZXIuaGF2ZUZpcmVkTG9hZEV2ZW50KCk7IH0KLSAgICBib29sIGhhc1BlbmRp bmdBY3Rpdml0eSgpIGNvbnN0IHsgcmV0dXJuICFtX2ltYWdlTG9hZGVyLmhhdmVGaXJlZExvYWRF dmVudCgpOyB9CisgICAgLy8gRklYTUU6IFdoeSBkbyB3ZSBoYXZlIHR3byBuYW1lcyBmb3IgdGhl IHNhbWUgdGhpbmc/CisgICAgYm9vbCBoYXNQZW5kaW5nTG9hZEV2ZW50KCkgY29uc3QgeyByZXR1 cm4gbV9pbWFnZUxvYWRlci5oYXNQZW5kaW5nTG9hZEV2ZW50KCk7IH0KKyAgICBib29sIGhhc1Bl bmRpbmdBY3Rpdml0eSgpIGNvbnN0IHsgcmV0dXJuIG1faW1hZ2VMb2FkZXIuaGFzUGVuZGluZ0xv YWRFdmVudCgpOyB9CiAKICAgICB2aXJ0dWFsIGJvb2wgY2FuQ29udGFpblJhbmdlRW5kUG9pbnQo KSBjb25zdCB7IHJldHVybiBmYWxzZTsgfQogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9odG1sL0lt YWdlSW5wdXRUeXBlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9odG1sL0ltYWdl SW5wdXRUeXBlLmNwcAkocmV2aXNpb24gMTEyMjA2KQorKysgU291cmNlL1dlYkNvcmUvaHRtbC9J bWFnZUlucHV0VHlwZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEzMCw3ICsxMzAsNyBAQCB2b2lk IEltYWdlSW5wdXRUeXBlOjphdHRhY2goKQogICAgIGlmICghcmVuZGVyZXIpCiAgICAgICAgIHJl dHVybjsKIAotICAgIGlmICghbV9pbWFnZUxvYWRlci0+aGF2ZUZpcmVkQmVmb3JlTG9hZEV2ZW50 KCkpCisgICAgaWYgKG1faW1hZ2VMb2FkZXItPmhhc1BlbmRpbmdCZWZvcmVMb2FkRXZlbnQoKSkK ICAgICAgICAgcmV0dXJuOwogCiAgICAgUmVuZGVySW1hZ2VSZXNvdXJjZSogaW1hZ2VSZXNvdXJj ZSA9IHJlbmRlcmVyLT5pbWFnZVJlc291cmNlKCk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9sb2Fk ZXIvSW1hZ2VMb2FkZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9J bWFnZUxvYWRlci5jcHAJKHJldmlzaW9uIDExMjIwNikKKysrIFNvdXJjZS9XZWJDb3JlL2xvYWRl ci9JbWFnZUxvYWRlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTg0LDkgKzg0LDkgQEAgc3RhdGlj IEltYWdlRXZlbnRTZW5kZXImIGVycm9yRXZlbnRTZW5kZQogSW1hZ2VMb2FkZXI6OkltYWdlTG9h ZGVyKEVsZW1lbnQqIGVsZW1lbnQpCiAgICAgOiBtX2VsZW1lbnQoZWxlbWVudCkKICAgICAsIG1f aW1hZ2UoMCkKLSAgICAsIG1fZmlyZWRCZWZvcmVMb2FkKHRydWUpCi0gICAgLCBtX2ZpcmVkTG9h ZCh0cnVlKQotICAgICwgbV9maXJlZEVycm9yKHRydWUpCisgICAgLCBtX2hhc1BlbmRpbmdCZWZv cmVMb2FkRXZlbnQoZmFsc2UpCisgICAgLCBtX2hhc1BlbmRpbmdMb2FkRXZlbnQoZmFsc2UpCisg ICAgLCBtX2hhc1BlbmRpbmdFcnJvckV2ZW50KGZhbHNlKQogICAgICwgbV9pbWFnZUNvbXBsZXRl KHRydWUpCiAgICAgLCBtX2xvYWRNYW51YWxseShmYWxzZSkKIHsKQEAgLTk3LDE2ICs5NywxNiBA QCBJbWFnZUxvYWRlcjo6fkltYWdlTG9hZGVyKCkKICAgICBpZiAobV9pbWFnZSkKICAgICAgICAg bV9pbWFnZS0+cmVtb3ZlQ2xpZW50KHRoaXMpOwogCi0gICAgQVNTRVJUKCFtX2ZpcmVkQmVmb3Jl TG9hZCB8fCAhYmVmb3JlTG9hZEV2ZW50U2VuZGVyKCkuaGFzUGVuZGluZ0V2ZW50cyh0aGlzKSk7 Ci0gICAgaWYgKCFtX2ZpcmVkQmVmb3JlTG9hZCkKKyAgICBBU1NFUlQobV9oYXNQZW5kaW5nQmVm b3JlTG9hZEV2ZW50IHx8ICFiZWZvcmVMb2FkRXZlbnRTZW5kZXIoKS5oYXNQZW5kaW5nRXZlbnRz KHRoaXMpKTsKKyAgICBpZiAobV9oYXNQZW5kaW5nQmVmb3JlTG9hZEV2ZW50KQogICAgICAgICBi ZWZvcmVMb2FkRXZlbnRTZW5kZXIoKS5jYW5jZWxFdmVudCh0aGlzKTsKIAotICAgIEFTU0VSVCgh bV9maXJlZExvYWQgfHwgIWxvYWRFdmVudFNlbmRlcigpLmhhc1BlbmRpbmdFdmVudHModGhpcykp OwotICAgIGlmICghbV9maXJlZExvYWQpCisgICAgQVNTRVJUKG1faGFzUGVuZGluZ0xvYWRFdmVu dCB8fCAhbG9hZEV2ZW50U2VuZGVyKCkuaGFzUGVuZGluZ0V2ZW50cyh0aGlzKSk7CisgICAgaWYg KG1faGFzUGVuZGluZ0xvYWRFdmVudCkKICAgICAgICAgbG9hZEV2ZW50U2VuZGVyKCkuY2FuY2Vs RXZlbnQodGhpcyk7CiAKLSAgICBBU1NFUlQoIW1fZmlyZWRFcnJvciB8fCAhZXJyb3JFdmVudFNl bmRlcigpLmhhc1BlbmRpbmdFdmVudHModGhpcykpOwotICAgIGlmICghbV9maXJlZEVycm9yKQor ICAgIEFTU0VSVChtX2hhc1BlbmRpbmdFcnJvckV2ZW50IHx8ICFlcnJvckV2ZW50U2VuZGVyKCku aGFzUGVuZGluZ0V2ZW50cyh0aGlzKSk7CisgICAgaWYgKG1faGFzUGVuZGluZ0Vycm9yRXZlbnQp CiAgICAgICAgIGVycm9yRXZlbnRTZW5kZXIoKS5jYW5jZWxFdmVudCh0aGlzKTsKIH0KIApAQCAt MTE2LDE3ICsxMTYsMTcgQEAgdm9pZCBJbWFnZUxvYWRlcjo6c2V0SW1hZ2UoQ2FjaGVkSW1hZ2Uq IAogICAgIENhY2hlZEltYWdlKiBvbGRJbWFnZSA9IG1faW1hZ2UuZ2V0KCk7CiAgICAgaWYgKG5l d0ltYWdlICE9IG9sZEltYWdlKSB7CiAgICAgICAgIG1faW1hZ2UgPSBuZXdJbWFnZTsKLSAgICAg ICAgaWYgKCFtX2ZpcmVkQmVmb3JlTG9hZCkgeworICAgICAgICBpZiAobV9oYXNQZW5kaW5nQmVm b3JlTG9hZEV2ZW50KSB7CiAgICAgICAgICAgICBiZWZvcmVMb2FkRXZlbnRTZW5kZXIoKS5jYW5j ZWxFdmVudCh0aGlzKTsKLSAgICAgICAgICAgIG1fZmlyZWRCZWZvcmVMb2FkID0gdHJ1ZTsKKyAg ICAgICAgICAgIG1faGFzUGVuZGluZ0JlZm9yZUxvYWRFdmVudCA9IGZhbHNlOwogICAgICAgICB9 Ci0gICAgICAgIGlmICghbV9maXJlZExvYWQpIHsKKyAgICAgICAgaWYgKG1faGFzUGVuZGluZ0xv YWRFdmVudCkgewogICAgICAgICAgICAgbG9hZEV2ZW50U2VuZGVyKCkuY2FuY2VsRXZlbnQodGhp cyk7Ci0gICAgICAgICAgICBtX2ZpcmVkTG9hZCA9IHRydWU7CisgICAgICAgICAgICBtX2hhc1Bl bmRpbmdMb2FkRXZlbnQgPSBmYWxzZTsKICAgICAgICAgfQotICAgICAgICBpZiAoIW1fZmlyZWRF cnJvcikgeworICAgICAgICBpZiAobV9oYXNQZW5kaW5nRXJyb3JFdmVudCkgewogICAgICAgICAg ICAgZXJyb3JFdmVudFNlbmRlcigpLmNhbmNlbEV2ZW50KHRoaXMpOwotICAgICAgICAgICAgbV9m aXJlZEVycm9yID0gdHJ1ZTsKKyAgICAgICAgICAgIG1faGFzUGVuZGluZ0Vycm9yRXZlbnQgPSBm YWxzZTsKICAgICAgICAgfQogICAgICAgICBtX2ltYWdlQ29tcGxldGUgPSB0cnVlOwogICAgICAg ICBpZiAobmV3SW1hZ2UpCkBAIC0xODYsMTYgKzE4NiwxNiBAQCB2b2lkIEltYWdlTG9hZGVyOjp1 cGRhdGVGcm9tRWxlbWVudCgpCiAgICAgCiAgICAgQ2FjaGVkSW1hZ2UqIG9sZEltYWdlID0gbV9p bWFnZS5nZXQoKTsKICAgICBpZiAobmV3SW1hZ2UgIT0gb2xkSW1hZ2UpIHsKLSAgICAgICAgaWYg KCFtX2ZpcmVkQmVmb3JlTG9hZCkKKyAgICAgICAgaWYgKG1faGFzUGVuZGluZ0JlZm9yZUxvYWRF dmVudCkKICAgICAgICAgICAgIGJlZm9yZUxvYWRFdmVudFNlbmRlcigpLmNhbmNlbEV2ZW50KHRo aXMpOwotICAgICAgICBpZiAoIW1fZmlyZWRMb2FkKQorICAgICAgICBpZiAobV9oYXNQZW5kaW5n TG9hZEV2ZW50KQogICAgICAgICAgICAgbG9hZEV2ZW50U2VuZGVyKCkuY2FuY2VsRXZlbnQodGhp cyk7Ci0gICAgICAgIGlmICghbV9maXJlZEVycm9yKQorICAgICAgICBpZiAobV9oYXNQZW5kaW5n RXJyb3JFdmVudCkKICAgICAgICAgICAgIGVycm9yRXZlbnRTZW5kZXIoKS5jYW5jZWxFdmVudCh0 aGlzKTsKIAogICAgICAgICBtX2ltYWdlID0gbmV3SW1hZ2U7Ci0gICAgICAgIG1fZmlyZWRCZWZv cmVMb2FkID0gIW5ld0ltYWdlOwotICAgICAgICBtX2ZpcmVkTG9hZCA9ICFuZXdJbWFnZTsKKyAg ICAgICAgbV9oYXNQZW5kaW5nQmVmb3JlTG9hZEV2ZW50ID0gbmV3SW1hZ2U7CisgICAgICAgIG1f aGFzUGVuZGluZ0xvYWRFdmVudCA9IG5ld0ltYWdlOwogICAgICAgICBtX2ltYWdlQ29tcGxldGUg PSAhbmV3SW1hZ2U7CiAKICAgICAgICAgaWYgKG5ld0ltYWdlKSB7CkBAIC0yMzAsMTAgKzIzMCwx MCBAQCB2b2lkIEltYWdlTG9hZGVyOjpub3RpZnlGaW5pc2hlZChDYWNoZWRSCiAgICAgQVNTRVJU KHJlc291cmNlID09IG1faW1hZ2UuZ2V0KCkpOwogCiAgICAgbV9pbWFnZUNvbXBsZXRlID0gdHJ1 ZTsKLSAgICBpZiAoaGF2ZUZpcmVkQmVmb3JlTG9hZEV2ZW50KCkpCisgICAgaWYgKCFoYXNQZW5k aW5nQmVmb3JlTG9hZEV2ZW50KCkpCiAgICAgICAgIHVwZGF0ZVJlbmRlcmVyKCk7CiAKLSAgICBp ZiAobV9maXJlZExvYWQpCisgICAgaWYgKCFtX2hhc1BlbmRpbmdMb2FkRXZlbnQpCiAgICAgICAg IHJldHVybjsKIAogICAgIGlmIChtX2VsZW1lbnQtPmZhc3RIYXNBdHRyaWJ1dGUoSFRNTE5hbWVz Ojpjcm9zc29yaWdpbkF0dHIpCkBAIC0yNDIsMTggKzI0MiwxOCBAQCB2b2lkIEltYWdlTG9hZGVy Ojpub3RpZnlGaW5pc2hlZChDYWNoZWRSCiAKICAgICAgICAgc2V0SW1hZ2UoMCk7CiAKLSAgICAg ICAgbV9maXJlZEVycm9yID0gZmFsc2U7CisgICAgICAgIG1faGFzUGVuZGluZ0Vycm9yRXZlbnQg PSB0cnVlOwogICAgICAgICBlcnJvckV2ZW50U2VuZGVyKCkuZGlzcGF0Y2hFdmVudFNvb24odGhp cyk7CiAKICAgICAgICAgREVGSU5FX1NUQVRJQ19MT0NBTChTdHJpbmcsIGNvbnNvbGVNZXNzYWdl LCAoIkNyb3NzLW9yaWdpbiBpbWFnZSBsb2FkIGRlbmllZCBieSBDcm9zcy1PcmlnaW4gUmVzb3Vy Y2UgU2hhcmluZyBwb2xpY3kuIikpOwogICAgICAgICBtX2VsZW1lbnQtPmRvY3VtZW50KCktPmFk ZENvbnNvbGVNZXNzYWdlKEpTTWVzc2FnZVNvdXJjZSwgTG9nTWVzc2FnZVR5cGUsIEVycm9yTWVz c2FnZUxldmVsLCBjb25zb2xlTWVzc2FnZSk7CiAKLSAgICAgICAgQVNTRVJUKG1fZmlyZWRMb2Fk KTsKKyAgICAgICAgQVNTRVJUKCFtX2hhc1BlbmRpbmdMb2FkRXZlbnQpOwogICAgICAgICByZXR1 cm47CiAgICAgfQogCiAgICAgaWYgKHJlc291cmNlLT53YXNDYW5jZWxlZCgpKSB7Ci0gICAgICAg IG1fZmlyZWRMb2FkID0gdHJ1ZTsKKyAgICAgICAgbV9oYXNQZW5kaW5nTG9hZEV2ZW50ID0gZmFs c2U7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKQEAgLTMxNCwxMyArMzE0LDEzIEBAIHZvaWQg SW1hZ2VMb2FkZXI6OmRpc3BhdGNoUGVuZGluZ0V2ZW50KEkKIAogdm9pZCBJbWFnZUxvYWRlcjo6 ZGlzcGF0Y2hQZW5kaW5nQmVmb3JlTG9hZEV2ZW50KCkKIHsKLSAgICBpZiAobV9maXJlZEJlZm9y ZUxvYWQpCisgICAgaWYgKCFtX2hhc1BlbmRpbmdCZWZvcmVMb2FkRXZlbnQpCiAgICAgICAgIHJl dHVybjsKICAgICBpZiAoIW1faW1hZ2UpCiAgICAgICAgIHJldHVybjsKICAgICBpZiAoIW1fZWxl bWVudC0+ZG9jdW1lbnQoKS0+YXR0YWNoZWQoKSkKICAgICAgICAgcmV0dXJuOwotICAgIG1fZmly ZWRCZWZvcmVMb2FkID0gdHJ1ZTsKKyAgICBtX2hhc1BlbmRpbmdCZWZvcmVMb2FkRXZlbnQgPSBm YWxzZTsKICAgICBpZiAobV9lbGVtZW50LT5kaXNwYXRjaEJlZm9yZUxvYWRFdmVudChtX2ltYWdl LT51cmwoKSkpIHsKICAgICAgICAgdXBkYXRlUmVuZGVyZXIoKTsKICAgICAgICAgcmV0dXJuOwpA QCAtMzMxLDcgKzMzMSw3IEBAIHZvaWQgSW1hZ2VMb2FkZXI6OmRpc3BhdGNoUGVuZGluZ0JlZm9y ZUwKICAgICB9CiAKICAgICBsb2FkRXZlbnRTZW5kZXIoKS5jYW5jZWxFdmVudCh0aGlzKTsKLSAg ICBtX2ZpcmVkTG9hZCA9IHRydWU7CisgICAgbV9oYXNQZW5kaW5nTG9hZEV2ZW50ID0gZmFsc2U7 CiAgICAgCiAgICAgaWYgKG1fZWxlbWVudC0+aGFzVGFnTmFtZShIVE1MTmFtZXM6Om9iamVjdFRh ZykpCiAgICAgICAgIHN0YXRpY19jYXN0PEhUTUxPYmplY3RFbGVtZW50Kj4obV9lbGVtZW50KS0+ cmVuZGVyRmFsbGJhY2tDb250ZW50KCk7CkBAIC0zMzksMjMgKzMzOSwyMyBAQCB2b2lkIEltYWdl TG9hZGVyOjpkaXNwYXRjaFBlbmRpbmdCZWZvcmVMCiAKIHZvaWQgSW1hZ2VMb2FkZXI6OmRpc3Bh dGNoUGVuZGluZ0xvYWRFdmVudCgpCiB7Ci0gICAgaWYgKG1fZmlyZWRMb2FkKQorICAgIGlmICgh bV9oYXNQZW5kaW5nTG9hZEV2ZW50KQogICAgICAgICByZXR1cm47CiAgICAgaWYgKCFtX2ltYWdl KQogICAgICAgICByZXR1cm47CiAgICAgaWYgKCFtX2VsZW1lbnQtPmRvY3VtZW50KCktPmF0dGFj aGVkKCkpCiAgICAgICAgIHJldHVybjsKLSAgICBtX2ZpcmVkTG9hZCA9IHRydWU7CisgICAgbV9o YXNQZW5kaW5nTG9hZEV2ZW50ID0gZmFsc2U7CiAgICAgZGlzcGF0Y2hMb2FkRXZlbnQoKTsKIH0K IAogdm9pZCBJbWFnZUxvYWRlcjo6ZGlzcGF0Y2hQZW5kaW5nRXJyb3JFdmVudCgpCiB7Ci0gICAg aWYgKG1fZmlyZWRFcnJvcikKKyAgICBpZiAoIW1faGFzUGVuZGluZ0Vycm9yRXZlbnQpCiAgICAg ICAgIHJldHVybjsKICAgICBpZiAoIW1fZWxlbWVudC0+ZG9jdW1lbnQoKS0+YXR0YWNoZWQoKSkK ICAgICAgICAgcmV0dXJuOwotICAgIG1fZmlyZWRFcnJvciA9IHRydWU7CisgICAgbV9oYXNQZW5k aW5nRXJyb3JFdmVudCA9IGZhbHNlOwogICAgIG1fZWxlbWVudC0+ZGlzcGF0Y2hFdmVudChFdmVu dDo6Y3JlYXRlKGV2ZW50TmFtZXMoKS5lcnJvckV2ZW50LCBmYWxzZSwgZmFsc2UpKTsKIH0KIApJ bmRleDogU291cmNlL1dlYkNvcmUvbG9hZGVyL0ltYWdlTG9hZGVyLmgKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYkNvcmUvbG9hZGVyL0ltYWdlTG9hZGVyLmgJKHJldmlzaW9uIDExMjIwNikKKysr IFNvdXJjZS9XZWJDb3JlL2xvYWRlci9JbWFnZUxvYWRlci5oCSh3b3JraW5nIGNvcHkpCkBAIC01 OSw4ICs1OSw4IEBAIHB1YmxpYzoKIAogICAgIHZvaWQgc2V0TG9hZE1hbnVhbGx5KGJvb2wgbG9h ZE1hbnVhbGx5KSB7IG1fbG9hZE1hbnVhbGx5ID0gbG9hZE1hbnVhbGx5OyB9CiAKLSAgICBib29s IGhhdmVGaXJlZEJlZm9yZUxvYWRFdmVudCgpIGNvbnN0IHsgcmV0dXJuIG1fZmlyZWRCZWZvcmVM b2FkOyB9Ci0gICAgYm9vbCBoYXZlRmlyZWRMb2FkRXZlbnQoKSBjb25zdCB7IHJldHVybiBtX2Zp cmVkTG9hZDsgfQorICAgIGJvb2wgaGFzUGVuZGluZ0JlZm9yZUxvYWRFdmVudCgpIGNvbnN0IHsg cmV0dXJuIG1faGFzUGVuZGluZ0JlZm9yZUxvYWRFdmVudDsgfQorICAgIGJvb2wgaGFzUGVuZGlu Z0xvYWRFdmVudCgpIGNvbnN0IHsgcmV0dXJuIG1faGFzUGVuZGluZ0xvYWRFdmVudDsgfQogCiAg ICAgdm9pZCBkaXNwYXRjaFBlbmRpbmdFdmVudChJbWFnZUV2ZW50U2VuZGVyKik7CiAKQEAgLTg1 LDkgKzg1LDkgQEAgcHJpdmF0ZToKICAgICBFbGVtZW50KiBtX2VsZW1lbnQ7CiAgICAgQ2FjaGVk UmVzb3VyY2VIYW5kbGU8Q2FjaGVkSW1hZ2U+IG1faW1hZ2U7CiAgICAgQXRvbWljU3RyaW5nIG1f ZmFpbGVkTG9hZFVSTDsKLSAgICBib29sIG1fZmlyZWRCZWZvcmVMb2FkIDogMTsKLSAgICBib29s IG1fZmlyZWRMb2FkIDogMTsKLSAgICBib29sIG1fZmlyZWRFcnJvciA6IDE7CisgICAgYm9vbCBt X2hhc1BlbmRpbmdCZWZvcmVMb2FkRXZlbnQgOiAxOworICAgIGJvb2wgbV9oYXNQZW5kaW5nTG9h ZEV2ZW50IDogMTsKKyAgICBib29sIG1faGFzUGVuZGluZ0Vycm9yRXZlbnQgOiAxOwogICAgIGJv b2wgbV9pbWFnZUNvbXBsZXRlIDogMTsKICAgICBib29sIG1fbG9hZE1hbnVhbGx5IDogMTsKIH07 CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9zdmcvU1ZHSW1hZ2VFbGVtZW50LmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViQ29yZS9zdmcvU1ZHSW1hZ2VFbGVtZW50LmNwcAkocmV2aXNpb24gMTEy MjA2KQorKysgU291cmNlL1dlYkNvcmUvc3ZnL1NWR0ltYWdlRWxlbWVudC5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTE5NCw3ICsxOTQsNyBAQCBSZW5kZXJPYmplY3QqIFNWR0ltYWdlRWxlbWVudDo6 Y3JlYXRlUmVuCiAKIGJvb2wgU1ZHSW1hZ2VFbGVtZW50OjpoYXZlTG9hZGVkUmVxdWlyZWRSZXNv dXJjZXMoKQogewotICAgIHJldHVybiAhZXh0ZXJuYWxSZXNvdXJjZXNSZXF1aXJlZEJhc2VWYWx1 ZSgpIHx8IG1faW1hZ2VMb2FkZXIuaGF2ZUZpcmVkTG9hZEV2ZW50KCk7CisgICAgcmV0dXJuICFl eHRlcm5hbFJlc291cmNlc1JlcXVpcmVkQmFzZVZhbHVlKCkgfHwgIW1faW1hZ2VMb2FkZXIuaGFz UGVuZGluZ0xvYWRFdmVudCgpOwogfQogCiB2b2lkIFNWR0ltYWdlRWxlbWVudDo6YXR0YWNoKCkK