127668 2014-01-26 19:26:01 -0800 Rename CachedImage::isImage() to isCachedImage() and add toCachedImage() 2014-02-13 03:51:52 -0800 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) Unspecified Unspecified RESOLVED WONTFIX P2 Normal --- 1 ddkilzer ddkilzer andersca beidson commit-queue japhet kling koivisto sam simon.fraser oldest_to_newest 972305 0 ddkilzer 2014-01-26 19:26:01 -0800 Rename CachedImage::isImage() to isCachedImage() and add toCachedImage() for type safety checking. See Bug 126761 Comment #13. 972312 1 222297 ddkilzer 2014-01-26 20:12:28 -0800 Created attachment 222297 Patch v1 972468 2 222297 darin 2014-01-27 10:51:38 -0800 Comment on attachment 222297 Patch v1 I know you got concerned about this because of RenderObject::isImage not meaning the RenderObject is a RenderImage, but I don’t see the analogy here. This new names don’t seem to be an improvement here. 972550 3 ddkilzer 2014-01-27 13:52:14 -0800 (In reply to comment #2) > (From update of attachment 222297 [details]) > I know you got concerned about this because of RenderObject::isImage not meaning the RenderObject is a RenderImage, but I don’t see the analogy here. This new names don’t seem to be an improvement here. Okay. 980223 4 222297 ossy 2014-02-13 03:51:52 -0800 Comment on attachment 222297 Patch v1 Cleared review? from attachment 222297 so that this bug does not appear in http://webkit.org/pending-review. If you would like this patch reviewed, please attach it to a new bug (or re-open this bug before marking it for review again). 222297 2014-01-26 20:12:28 -0800 2014-02-13 03:51:52 -0800 Patch v1 bug-127668-20140126201227.patch text/plain 12299 ddkilzer U3VidmVyc2lvbiBSZXZpc2lvbjogMTYyODIxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2Q3NGM3OWViNGIxMTI3 MGU1MjQ5YTRmMzBjMGVhZjRlYTM0YjExZS4uMjBjYTIzN2MxYjY5OGY1YWIzMDY0NGM3NTlkMjhl OWFhYjM5ZmI0OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ2IEBACisyMDE0LTAxLTI2ICBEYXZp ZCBLaWx6ZXIgIDxkZGtpbHplckBhcHBsZS5jb20+CisKKyAgICAgICAgUmVuYW1lIENhY2hlZElt YWdlOjppc0ltYWdlKCkgdG8gaXNDYWNoZWRJbWFnZSgpIGFuZCBhZGQgdG9DYWNoZWRJbWFnZSgp CisgICAgICAgIDxodHRwOi8vd2Via2l0Lm9yZy9iLzEyNzY2OD4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBbHNvIHJlbmFtZSBDYWNoZWRJbWFnZTo6 aXNNYW51YWwoKSB0byBpc0NhY2hlZEltYWdlTWFudWFsKCkgYW5kIGFkZAorICAgICAgICB0b0Nh Y2hlZEltYWdlTWFudWFsKCkuCisKKyAgICAgICAgKiBsb2FkZXIvRG9jdW1lbnRMb2FkZXIuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6YXJlQWxsTG9hZGVyc1BhZ2VDYWNoZUFjY2VwdGFibGUpOgor ICAgICAgICAqIGxvYWRlci9TdWJyZXNvdXJjZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpTdWJyZXNvdXJjZUxvYWRlcjo6ZGlkUmVjZWl2ZVJlc3BvbnNlKToKKyAgICAgICAgLSBDaGFu Z2UgdG9JbWFnZSgpIHRvIHRvQ2FjaGVkSW1hZ2UoKS4KKworICAgICAgICAqIGxvYWRlci9jYWNo ZS9DYWNoZWRJbWFnZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDYWNoZWRJbWFnZTo6c3dpdGNo Q2xpZW50c1RvUmV2YWxpZGF0ZWRSZXNvdXJjZSk6CisgICAgICAgIChXZWJDb3JlOjpDYWNoZWRJ bWFnZTo6cmVzdW1lQW5pbWF0aW5nSW1hZ2VzRm9yTG9hZGVyKToKKyAgICAgICAgLSBDaGFuZ2Ug dG9JbWFnZSgpIHRvIHRvQ2FjaGVkSW1hZ2UoKS4KKyAgICAgICAgLSBDaGFuZ2Ugc3RhdGljX2Nh c3Q8Q2FjaGVkSW1hZ2UqPigpIHRvIHRvQ2FjaGVkSW1hZ2UoKS4KKworICAgICAgICAqIGxvYWRl ci9jYWNoZS9DYWNoZWRJbWFnZS5oOgorICAgICAgICAoV2ViQ29yZTo6Q2FjaGVkSW1hZ2U6Omlz Q2FjaGVkSW1hZ2VNYW51YWwpOiBSZW5hbWUgZnJvbSBpc01hbnVhbCgpLgorICAgICAgICAoV2Vi Q29yZTo6Q2FjaGVkSW1hZ2U6OmlzQ2FjaGVkSW1hZ2UpOiBSZW5hbWUgZnJvbSBpc0ltYWdlKCku CisgICAgICAgIChXZWJDb3JlOjpDYWNoZWRJbWFnZTo6dG9DYWNoZWRJbWFnZSk6IEFkZC4KKyAg ICAgICAgKFdlYkNvcmU6OkNhY2hlZEltYWdlOjp0b0NhY2hlZEltYWdlTWFudWFsKTogQWRkLgor CisgICAgICAgICogbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNlLmg6CisgICAgICAgIChXZWJD b3JlOjpDYWNoZWRSZXNvdXJjZTo6aXNDYWNoZWRJbWFnZSk6IFJlbmFtZSBmcm9tIGlzSW1hZ2Uo KS4KKyAgICAgICAgKENBQ0hFRF9SRVNPVVJDRV9UWVBFX0NBU1RTKTogQWRkIG1hY3JvIGZvciBz dWJjbGFzc2VzLgorCisgICAgICAgICogbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNlTG9hZGVy LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNhY2hlZFJlc291cmNlTG9hZGVyOjpyZXF1ZXN0SW1h Z2UpOgorICAgICAgICAtIENoYW5nZSBzdGF0aWNfY2FzdDxDYWNoZWRJbWFnZSo+KCkgdG8gdG9D YWNoZWRJbWFnZSgpLgorCisgICAgICAgICogbG9hZGVyL2NhY2hlL01lbW9yeUNhY2hlLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6Ok1lbW9yeUNhY2hlOjpyZW1vdmVJbWFnZUZyb21DYWNoZSk6Cisg ICAgICAgIC0gQ2hhbmdlIHRvSW1hZ2UoKSB0byB0b0NhY2hlZEltYWdlKCkuCisgICAgICAgIC0g Q2hhbmdlIHN0YXRpY19jYXN0PENhY2hlZEltYWdlKj4oKSB0byB0b0NhY2hlZEltYWdlKCkuCisg ICAgICAgIC0gQ2hhbmdlIHN0YXRpY19jYXN0PENhY2hlZEltYWdlTWFudWFsKj4oKSB0bworICAg ICAgICAgIHRvQ2FjaGVkSW1hZ2VNYW51YWwodG9DYWNoZWRJbWFnZSgpKS4KKwogMjAxNC0wMS0y NiAgQmVuamFtaW4gUG91bGFpbiAgPGJlbmphbWluQHdlYmtpdC5vcmc+CiAKICAgICAgICAgTWFr ZSBET01TdHJpbmdNYXAgYSB0eXBlZGVmIG9mIERhdGFzZXRET01TdHJpbmdNYXAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5n ZUxvZwppbmRleCBhMDU3OTJjZmRhMzhmZTJjNjFlM2RiN2IwOTE5OTYxNzhiYWI2NDkwLi43MWI1 MThlMjQ1ZTUyYWI4YjhjNjdmNjE1NGVhZjcxZTFlNDI3ODdmIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L21hYy9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTcgQEAKKzIwMTQtMDEtMjYgIERhdmlkIEtpbHplciAgPGRka2lsemVyQGFwcGxl LmNvbT4KKworICAgICAgICBSZW5hbWUgQ2FjaGVkSW1hZ2U6OmlzSW1hZ2UoKSB0byBpc0NhY2hl ZEltYWdlKCkgYW5kIGFkZCB0b0NhY2hlZEltYWdlKCkKKyAgICAgICAgPGh0dHA6Ly93ZWJraXQu b3JnL2IvMTI3NjY4PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgICogTWlzYy9XZWJDYWNoZS5tbToKKyAgICAgICAgKCtbV2ViQ2FjaGUgaW1hZ2VGb3JV Ukw6XSk6CisgICAgICAgIC0gQ2hhbmdlIHVzZSBvZiBDYWNoZWRSZXNvdXJjZTo6dHlwZSgpIHRv IG1vcmUgaWRpb21hdGljCisgICAgICAgICAgQ2FjaGVkUmVzb3VyY2U6OmlzQ2FjaGVkSW1hZ2Uo KSBjaGVjay4KKyAgICAgICAgLSBDaGFuZ2Ugc3RhdGljX2Nhc3Q8V2ViQ29yZTo6Q2FjaGVkSW1h Z2UqPigpIHRvCisgICAgICAgICAgV2ViQ29yZTo6dG9DYWNoZWRJbWFnZSgpLgorCiAyMDE0LTAx LTI0ICBBbmR5IEVzdGVzICA8YWVzdGVzQGFwcGxlLmNvbT4KIAogICAgICAgICBbaU9TXSBVcHN0 cmVhbSBjaGFuZ2VzIGluIFRvb2xzL0R1bXBSZW5kZXJUcmVlCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVy L0RvY3VtZW50TG9hZGVyLmNwcAppbmRleCA4YWNlZTBhMmE1YmIxZjBhNDdjZDdmMmIzYjU2MGRl OTE5MDYzM2I0Li43YjZkNjU1OTgxMWM3ZmExZDZhZjMwMjc5OGRkZjUxZWZjYjU5MTZjIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudExvYWRlci5jcHAKQEAgLTExMSw3ICsxMTEsNyBA QCBzdGF0aWMgYm9vbCBhcmVBbGxMb2FkZXJzUGFnZUNhY2hlQWNjZXB0YWJsZShjb25zdCBSZXNv dXJjZUxvYWRlclNldCYgbG9hZGVycykKICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAg ICAgICAvLyBBbGwgbm9uLWltYWdlIGxvYWRzIHdpbGwgcHJldmVudCB0aGUgcGFnZSBmcm9tIGVu dGVyaW5nIHRoZSBQYWdlQ2FjaGUuCi0gICAgICAgIGlmICghY2FjaGVkUmVzb3VyY2UtPmlzSW1h Z2UoKSkKKyAgICAgICAgaWYgKCFjYWNoZWRSZXNvdXJjZS0+aXNDYWNoZWRJbWFnZSgpKQogICAg ICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0KICAgICByZXR1cm4gdHJ1ZTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9TdWJyZXNvdXJjZUxvYWRlci5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9sb2FkZXIvU3VicmVzb3VyY2VMb2FkZXIuY3BwCmluZGV4IDBmMTcyNjRlMDUzMDdh MjE0ZjUyNDBjMThiZWViN2IwZWU4YjI4ZGMuLjM0ZGIyOTcwM2ViZDI0YTQzN2RmZDNhOGUwNmU2 YmYwZWVhNGNmOWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9TdWJyZXNvdXJj ZUxvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL1N1YnJlc291cmNlTG9hZGVy LmNwcApAQCAtMjI0LDcgKzIyNCw3IEBAIHZvaWQgU3VicmVzb3VyY2VMb2FkZXI6OmRpZFJlY2Vp dmVSZXNwb25zZShjb25zdCBSZXNvdXJjZVJlc3BvbnNlJiByZXNwb25zZSkKIAogICAgICAgICAv LyBXZSBkb24ndCBjb3VudCBtdWx0aVBhcnRzIGluIGEgQ2FjaGVkUmVzb3VyY2VMb2FkZXIncyBy ZXF1ZXN0IGNvdW50CiAgICAgICAgIG1fcmVxdWVzdENvdW50VHJhY2tlci5jbGVhcigpOwotICAg ICAgICBpZiAoIW1fcmVzb3VyY2UtPmlzSW1hZ2UoKSkgeworICAgICAgICBpZiAoIW1fcmVzb3Vy Y2UtPmlzQ2FjaGVkSW1hZ2UoKSkgewogICAgICAgICAgICAgY2FuY2VsKCk7CiAgICAgICAgICAg ICByZXR1cm47CiAgICAgICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9j YWNoZS9DYWNoZWRJbWFnZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVk SW1hZ2UuY3BwCmluZGV4IDU1MjVmYjFmMzRlYTYyNjI1MTQ2YzExNTlmZTcxNzA2ZjMxYjE5ZTAu LjRhNmQ3NTA3MmRlNGUxZTdkNGFkMGNjYmQ4MWUwNzI3Mzk1Y2EyOTQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRJbWFnZS5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZEltYWdlLmNwcApAQCAtMTMzLDcgKzEzMyw3IEBAIHZv aWQgQ2FjaGVkSW1hZ2U6OmRpZFJlbW92ZUNsaWVudChDYWNoZWRSZXNvdXJjZUNsaWVudCogYykK IHZvaWQgQ2FjaGVkSW1hZ2U6OnN3aXRjaENsaWVudHNUb1JldmFsaWRhdGVkUmVzb3VyY2UoKQog ewogICAgIEFTU0VSVChyZXNvdXJjZVRvUmV2YWxpZGF0ZSgpKTsKLSAgICBBU1NFUlQocmVzb3Vy Y2VUb1JldmFsaWRhdGUoKS0+aXNJbWFnZSgpKTsKKyAgICBBU1NFUlQocmVzb3VyY2VUb1JldmFs aWRhdGUoKS0+aXNDYWNoZWRJbWFnZSgpKTsKICAgICAvLyBQZW5kaW5nIGNvbnRhaW5lciBzaXpl IHJlcXVlc3RzIG5lZWQgdG8gYmUgdHJhbnNmZXJyZWQgdG8gdGhlIHJldmFsaWRhdGVkIHJlc291 cmNlLgogICAgIGlmICghbV9wZW5kaW5nQ29udGFpbmVyU2l6ZVJlcXVlc3RzLmlzRW1wdHkoKSkg ewogICAgICAgICAvLyBBIGNvcHkgb2YgcGVuZGluZyBzaXplIHJlcXVlc3RzIGlzIG5lZWRlZCBh cyB0aGV5IGFyZSBkZWxldGVkIGR1cmluZyBDYWNoZWRSZXNvdXJjZTo6c3dpdGNoQ2xpZW50c1Rv UmV2YWxpZGF0ZVJlc291Y2UoKS4KQEAgLTE0MSw3ICsxNDEsNyBAQCB2b2lkIENhY2hlZEltYWdl Ojpzd2l0Y2hDbGllbnRzVG9SZXZhbGlkYXRlZFJlc291cmNlKCkKICAgICAgICAgZm9yIChDb250 YWluZXJTaXplUmVxdWVzdHM6Oml0ZXJhdG9yIGl0ID0gbV9wZW5kaW5nQ29udGFpbmVyU2l6ZVJl cXVlc3RzLmJlZ2luKCk7IGl0ICE9IG1fcGVuZGluZ0NvbnRhaW5lclNpemVSZXF1ZXN0cy5lbmQo KTsgKytpdCkKICAgICAgICAgICAgIHN3aXRjaENvbnRhaW5lclNpemVSZXF1ZXN0cy5zZXQoaXQt PmtleSwgaXQtPnZhbHVlKTsKICAgICAgICAgQ2FjaGVkUmVzb3VyY2U6OnN3aXRjaENsaWVudHNU b1JldmFsaWRhdGVkUmVzb3VyY2UoKTsKLSAgICAgICAgQ2FjaGVkSW1hZ2UqIHJldmFsaWRhdGVk Q2FjaGVkSW1hZ2UgPSBzdGF0aWNfY2FzdDxDYWNoZWRJbWFnZSo+KHJlc291cmNlVG9SZXZhbGlk YXRlKCkpOworICAgICAgICBDYWNoZWRJbWFnZSogcmV2YWxpZGF0ZWRDYWNoZWRJbWFnZSA9IHRv Q2FjaGVkSW1hZ2UocmVzb3VyY2VUb1JldmFsaWRhdGUoKSk7CiAgICAgICAgIGZvciAoQ29udGFp bmVyU2l6ZVJlcXVlc3RzOjppdGVyYXRvciBpdCA9IHN3aXRjaENvbnRhaW5lclNpemVSZXF1ZXN0 cy5iZWdpbigpOyBpdCAhPSBzd2l0Y2hDb250YWluZXJTaXplUmVxdWVzdHMuZW5kKCk7ICsraXQp CiAgICAgICAgICAgICByZXZhbGlkYXRlZENhY2hlZEltYWdlLT5zZXRDb250YWluZXJTaXplRm9y UmVuZGVyZXIoaXQtPmtleSwgaXQtPnZhbHVlLmZpcnN0LCBpdC0+dmFsdWUuc2Vjb25kKTsKICAg ICAgICAgcmV0dXJuOwpAQCAtNTQzLDkgKzU0Myw5IEBAIHZvaWQgQ2FjaGVkSW1hZ2U6OnJlc3Vt ZUFuaW1hdGluZ0ltYWdlc0ZvckxvYWRlcihDYWNoZWRSZXNvdXJjZUxvYWRlciogbG9hZGVyKQog CiAgICAgZm9yIChDYWNoZWRSZXNvdXJjZUxvYWRlcjo6RG9jdW1lbnRSZXNvdXJjZU1hcDo6Y29u c3RfaXRlcmF0b3IgaXQgPSByZXNvdXJjZXMuYmVnaW4oKSwgZW5kID0gcmVzb3VyY2VzLmVuZCgp OyBpdCAhPSBlbmQ7ICsraXQpIHsKICAgICAgICAgY29uc3QgQ2FjaGVkUmVzb3VyY2VIYW5kbGU8 Q2FjaGVkUmVzb3VyY2U+JiByZXNvdXJjZSA9IGl0LT52YWx1ZTsKLSAgICAgICAgaWYgKCFyZXNv dXJjZSB8fCAhcmVzb3VyY2UtPmlzSW1hZ2UoKSkKKyAgICAgICAgaWYgKCFyZXNvdXJjZSB8fCAh cmVzb3VyY2UtPmlzQ2FjaGVkSW1hZ2UoKSkKICAgICAgICAgICAgIGNvbnRpbnVlOwotICAgICAg ICBDYWNoZWRJbWFnZSogY2FjaGVkSW1hZ2UgPSBzdGF0aWNfY2FzdDxDYWNoZWRJbWFnZSo+KHJl c291cmNlLmdldCgpKTsKKyAgICAgICAgQ2FjaGVkSW1hZ2UqIGNhY2hlZEltYWdlID0gdG9DYWNo ZWRJbWFnZShyZXNvdXJjZS5nZXQoKSk7CiAgICAgICAgIGlmICghY2FjaGVkSW1hZ2UtPmhhc0lt YWdlKCkpCiAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgSW1hZ2UqIGltYWdlID0gY2Fj aGVkSW1hZ2UtPmltYWdlKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2Fj aGUvQ2FjaGVkSW1hZ2UuaCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRJbWFn ZS5oCmluZGV4IDEyYjc3Y2M0NmJhZGRiODE3MTJjZDE3MmI4ODgzYWE0ZTJjNjUyMjIuLjY5YjE4 Zjg1ZWFhODYwNGQ3MzUzMDI5Mjg0YTE3MTk0Y2RmMTY4OTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRJbWFnZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xv YWRlci9jYWNoZS9DYWNoZWRJbWFnZS5oCkBAIC04MSw3ICs4MSw3IEBAIHB1YmxpYzoKIAogI2lm IFVTRShDRikKICAgICAvLyBGSVhNRTogUmVtb3ZlIHRoZSBVU0UoQ0YpIG9uY2Ugd2UgbWFrZSBN ZW1vcnlDYWNoZTo6YWRkSW1hZ2VUb0NhY2hlKCkgcGxhdGZvcm0taW5kZXBlbmRlbnQuCi0gICAg dmlydHVhbCBib29sIGlzTWFudWFsKCkgY29uc3QgeyByZXR1cm4gZmFsc2U7IH0KKyAgICB2aXJ0 dWFsIGJvb2wgaXNDYWNoZWRJbWFnZU1hbnVhbCgpIGNvbnN0IHsgcmV0dXJuIGZhbHNlOyB9CiAj ZW5kaWYKIAogICAgIHN0YXRpYyB2b2lkIHJlc3VtZUFuaW1hdGluZ0ltYWdlc0ZvckxvYWRlcihD YWNoZWRSZXNvdXJjZUxvYWRlciopOwpAQCAtMTIyLDcgKzEyMiw3IEBAIHByaXZhdGU6CiAgICAg Ly8gRm9yIGNvbXBhdGliaWxpdHksIGltYWdlcyBrZWVwIGxvYWRpbmcgZXZlbiBpZiB0aGVyZSBh cmUgSFRUUCBlcnJvcnMuCiAgICAgdmlydHVhbCBib29sIHNob3VsZElnbm9yZUhUVFBTdGF0dXND b2RlRXJyb3JzKCkgY29uc3Qgb3ZlcnJpZGUgeyByZXR1cm4gdHJ1ZTsgfQogCi0gICAgdmlydHVh bCBib29sIGlzSW1hZ2UoKSBjb25zdCBvdmVycmlkZSB7IHJldHVybiB0cnVlOyB9CisgICAgdmly dHVhbCBib29sIGlzQ2FjaGVkSW1hZ2UoKSBjb25zdCBvdmVycmlkZSB7IHJldHVybiB0cnVlOyB9 CiAgICAgdmlydHVhbCBib29sIHN0aWxsTmVlZHNMb2FkKCkgY29uc3Qgb3ZlcnJpZGUgeyByZXR1 cm4gIWVycm9yT2NjdXJyZWQoKSAmJiBzdGF0dXMoKSA9PSBVbmtub3duICYmICFpc0xvYWRpbmco KTsgfQogCiAgICAgLy8gSW1hZ2VPYnNlcnZlcgpAQCAtMTU1LDEzICsxNTUsMTggQEAgcHVibGlj OgogICAgIENhY2hlZEltYWdlTWFudWFsKGNvbnN0IFVSTCYsIEltYWdlKik7CiAgICAgdm9pZCBh ZGRGYWtlQ2xpZW50KCkgeyBhZGRDbGllbnQobV9mYWtlQ2xpZW50LmdldCgpKTsgfQogICAgIHZv aWQgcmVtb3ZlRmFrZUNsaWVudCgpIHsgcmVtb3ZlQ2xpZW50KG1fZmFrZUNsaWVudC5nZXQoKSk7 IH0KLSAgICB2aXJ0dWFsIGJvb2wgaXNNYW51YWwoKSBjb25zdCBvdmVycmlkZSB7IHJldHVybiB0 cnVlOyB9CisgICAgdmlydHVhbCBib29sIGlzQ2FjaGVkSW1hZ2VNYW51YWwoKSBjb25zdCBvdmVy cmlkZSB7IHJldHVybiB0cnVlOyB9CiAgICAgdmlydHVhbCBib29sIG11c3RSZXZhbGlkYXRlRHVl VG9DYWNoZUhlYWRlcnMoQ2FjaGVQb2xpY3kpIGNvbnN0OwogcHJpdmF0ZToKICAgICBzdGQ6OnVu aXF1ZV9wdHI8Q2FjaGVkUmVzb3VyY2VDbGllbnQ+IG1fZmFrZUNsaWVudDsKIH07CiAjZW5kaWYK IAorQ0FDSEVEX1JFU09VUkNFX1RZUEVfQ0FTVFMoQ2FjaGVkSW1hZ2UsIENhY2hlZFJlc291cmNl KQorI2lmIFVTRShDRikKK0NBQ0hFRF9SRVNPVVJDRV9UWVBFX0NBU1RTKENhY2hlZEltYWdlTWFu dWFsLCBDYWNoZWRJbWFnZSkKKyNlbmRpZgorCiB9CiAKICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNlLmggYi9Tb3VyY2UvV2ViQ29y ZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2UuaAppbmRleCA4ZGU2OWNkYmYwOThhZWNlNTY5 NjZiMzE4NmJhZWE4ZGI1NmY3NmFjLi4xOWJkZmMzMDFiNGIzMTFhZTQ0MWZiZmMxYzI1MzVkNWNm ZTUwODg3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVz b3VyY2UuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2Uu aApAQCAtMTU1LDcgKzE1NSw3IEBAIHB1YmxpYzoKIAogICAgIFN1YnJlc291cmNlTG9hZGVyKiBs b2FkZXIoKSB7IHJldHVybiBtX2xvYWRlci5nZXQoKTsgfQogCi0gICAgdmlydHVhbCBib29sIGlz SW1hZ2UoKSBjb25zdCB7IHJldHVybiBmYWxzZTsgfQorICAgIHZpcnR1YWwgYm9vbCBpc0NhY2hl ZEltYWdlKCkgY29uc3QgeyByZXR1cm4gZmFsc2U7IH0KICAgICBib29sIGlnbm9yZUZvclJlcXVl c3RDb3VudCgpIGNvbnN0CiAgICAgewogICAgICAgICByZXR1cm4gdHlwZSgpID09IE1haW5SZXNv dXJjZQpAQCAtMzY4LDYgKzM2OCw5IEBAIHByaXZhdGU6CiAgICAgSGFzaFNldDxDYWNoZWRSZXNv dXJjZUhhbmRsZUJhc2UqPiBtX2hhbmRsZXNUb1JldmFsaWRhdGU7CiB9OwogCisjZGVmaW5lIENB Q0hFRF9SRVNPVVJDRV9UWVBFX0NBU1RTKFRvQ2xhc3NOYW1lLCBGcm9tQ2xhc3NOYW1lKSBcCisg ICAgVFlQRV9DQVNUU19CQVNFKFRvQ2xhc3NOYW1lLCBGcm9tQ2xhc3NOYW1lLCByZXNvdXJjZSwg cmVzb3VyY2UtPmlzIyNUb0NsYXNzTmFtZSgpLCByZXNvdXJjZS5pcyMjVG9DbGFzc05hbWUoKSkK KwogfQogCiAjZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9D YWNoZWRSZXNvdXJjZUxvYWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2Fj aGVkUmVzb3VyY2VMb2FkZXIuY3BwCmluZGV4IDFjNjU5MzdmNmZiYjM1NmIzYWJjMGM0ODQ5ZGUx OTkzNzk4ZWI2NGYuLjU1YTU1YzZiYTQ0ZjZiN2Y4YTkyYmMwNDA0YmU5MTc3NzcxMjIxYWQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZUxvYWRl ci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNlTG9h ZGVyLmNwcApAQCAtMTYwLDcgKzE2MCw3IEBAIENhY2hlZFJlc291cmNlSGFuZGxlPENhY2hlZElt YWdlPiBDYWNoZWRSZXNvdXJjZUxvYWRlcjo6cmVxdWVzdEltYWdlKENhY2hlZFJlc291CiAgICAg ICAgIH0KICAgICB9CiAgICAgcmVxdWVzdC5zZXREZWZlcihjbGllbnREZWZlcnNJbWFnZShyZXF1 ZXN0LnJlc291cmNlUmVxdWVzdCgpLnVybCgpKSA/IENhY2hlZFJlc291cmNlUmVxdWVzdDo6RGVm ZXJyZWRCeUNsaWVudCA6IENhY2hlZFJlc291cmNlUmVxdWVzdDo6Tm9EZWZlcik7Ci0gICAgcmV0 dXJuIHN0YXRpY19jYXN0PENhY2hlZEltYWdlKj4ocmVxdWVzdFJlc291cmNlKENhY2hlZFJlc291 cmNlOjpJbWFnZVJlc291cmNlLCByZXF1ZXN0KS5nZXQoKSk7CisgICAgcmV0dXJuIHRvQ2FjaGVk SW1hZ2UocmVxdWVzdFJlc291cmNlKENhY2hlZFJlc291cmNlOjpJbWFnZVJlc291cmNlLCByZXF1 ZXN0KS5nZXQoKSk7CiB9CiAKIENhY2hlZFJlc291cmNlSGFuZGxlPENhY2hlZEZvbnQ+IENhY2hl ZFJlc291cmNlTG9hZGVyOjpyZXF1ZXN0Rm9udChDYWNoZWRSZXNvdXJjZVJlcXVlc3QmIHJlcXVl c3QpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvTWVtb3J5Q2FjaGUu Y3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL01lbW9yeUNhY2hlLmNwcAppbmRleCA2 NTI0MjJjZjY0NzgyYmE1NjIzZDZiZWEzOGNmNDBiYTE1YmNjZmM4Li5kMmM0YjQxNjRiZDdjMDM1 ZTQ0Mzk0MGE2MGQ1Nzc4ZjY3YmY3NGRlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2Fk ZXIvY2FjaGUvTWVtb3J5Q2FjaGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNo ZS9NZW1vcnlDYWNoZS5jcHAKQEAgLTI1NSw3ICsyNTUsNyBAQCB2b2lkIE1lbW9yeUNhY2hlOjpy ZW1vdmVJbWFnZUZyb21DYWNoZShjb25zdCBVUkwmIHVybCwgY29uc3QgU3RyaW5nJiBjYWNoZVBh cnRpdAogICAgICAgICByZXR1cm47CiAKICAgICAvLyBBIHJlc291cmNlIGV4aXN0cyBhbmQgaXMg bm90IGEgbWFudWFsbHkgY2FjaGVkIGltYWdlLCBzbyBqdXN0IHJlbW92ZSBpdC4KLSAgICBpZiAo IXJlc291cmNlLT5pc0ltYWdlKCkgfHwgIXN0YXRpY19jYXN0PENhY2hlZEltYWdlKj4ocmVzb3Vy Y2UpLT5pc01hbnVhbCgpKSB7CisgICAgaWYgKCFyZXNvdXJjZS0+aXNDYWNoZWRJbWFnZSgpIHx8 ICF0b0NhY2hlZEltYWdlKHJlc291cmNlKS0+aXNDYWNoZWRJbWFnZU1hbnVhbCgpKSB7CiAgICAg ICAgIGV2aWN0KHJlc291cmNlKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KQEAgLTI2NSw3ICsy NjUsNyBAQCB2b2lkIE1lbW9yeUNhY2hlOjpyZW1vdmVJbWFnZUZyb21DYWNoZShjb25zdCBVUkwm IHVybCwgY29uc3QgU3RyaW5nJiBjYWNoZVBhcnRpdAogICAgIC8vIGRlYWQgcmVzb3VyY2VzIGFy ZSBwcnVuZWQuIFRoYXQgbWlnaHQgYmUgaW1tZWRpYXRlbHkgc2luY2UKICAgICAvLyByZW1vdmlu ZyB0aGUgbGFzdCBjbGllbnQgdHJpZ2dlcnMgYSBNZW1vcnlDYWNoZTo6cHJ1bmUsIHNvIHRoZQog ICAgIC8vIHJlc291cmNlIG1heSBiZSBkZWxldGVkIGFmdGVyIHRoaXMgY2FsbC4KLSAgICBzdGF0 aWNfY2FzdDxDYWNoZWRJbWFnZU1hbnVhbCo+KHJlc291cmNlKS0+cmVtb3ZlRmFrZUNsaWVudCgp OworICAgIHRvQ2FjaGVkSW1hZ2VNYW51YWwodG9DYWNoZWRJbWFnZShyZXNvdXJjZSkpLT5yZW1v dmVGYWtlQ2xpZW50KCk7CiB9CiAjZW5kaWYKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9t YWMvTWlzYy9XZWJDYWNoZS5tbSBiL1NvdXJjZS9XZWJLaXQvbWFjL01pc2MvV2ViQ2FjaGUubW0K aW5kZXggMThlNmMyMzY5ZGMyYjg3NWM0NGFiYzNjZjUxYmY1YWEzZWU2ZGU2OC4uMzgwNzE0Yzcz ZjA5ZjM4NjY3ZjQ3M2EyZDc3YjIzZDczMjJjYjZhMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9tYWMvTWlzYy9XZWJDYWNoZS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L21hYy9NaXNjL1dlYkNh Y2hlLm1tCkBAIC0yMzQsOSArMjM0LDkgQEAgKyAoQ0dJbWFnZVJlZilpbWFnZUZvclVSTDooTlNV UkwgKil1cmwKICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAgCiAgICAgV2ViQ29yZTo6Q2Fj aGVkUmVzb3VyY2UqIGNhY2hlZFJlc291cmNlID0gV2ViQ29yZTo6bWVtb3J5Q2FjaGUoKS0+cmVz b3VyY2VGb3JVUkwodXJsKTsKLSAgICBpZiAoIWNhY2hlZFJlc291cmNlIHx8IGNhY2hlZFJlc291 cmNlLT50eXBlKCkgIT0gV2ViQ29yZTo6Q2FjaGVkUmVzb3VyY2U6OkltYWdlUmVzb3VyY2UpCisg ICAgaWYgKCFjYWNoZWRSZXNvdXJjZSB8fCAhY2FjaGVkUmVzb3VyY2UtPmlzQ2FjaGVkSW1hZ2Uo KSkKICAgICAgICAgcmV0dXJuIG51bGxwdHI7Ci0gICAgV2ViQ29yZTo6Q2FjaGVkSW1hZ2UqIGNh Y2hlZEltYWdlID0gc3RhdGljX2Nhc3Q8V2ViQ29yZTo6Q2FjaGVkSW1hZ2UqPihjYWNoZWRSZXNv dXJjZSk7CisgICAgV2ViQ29yZTo6Q2FjaGVkSW1hZ2UqIGNhY2hlZEltYWdlID0gV2ViQ29yZTo6 dG9DYWNoZWRJbWFnZShjYWNoZWRSZXNvdXJjZSk7CiAgICAgaWYgKCFjYWNoZWRJbWFnZSB8fCAh Y2FjaGVkSW1hZ2UtPmhhc0ltYWdlKCkpCiAgICAgICAgIHJldHVybiBudWxscHRyOwogICAgIHJl dHVybiBjYWNoZWRJbWFnZS0+aW1hZ2UoKS0+Z2V0Q0dJbWFnZVJlZigpOwo=