99205 2012-10-12 13:40:56 -0700 [BlackBerry] Only reallocate buffers that were allocated before suspending 2012-10-15 14:42:34 -0700 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jpetsovits jpetsovits mifenton rwlbuis tonikitoo webkit.review.bot oldest_to_newest 741163 0 jpetsovits 2012-10-12 13:40:56 -0700 When we call releaseBuffers(), not all of the backingstore tile buffers might have been allocated yet. Still we try to release all of them, which causes us to lazy-initialize the tile buffers so we can release them again. This is stupid and we should just ignore buffers that haven't been initialized yet. The patch below makes that change. 741264 1 168496 jpetsovits 2012-10-12 15:21:23 -0700 Created attachment 168496 Patch The ChangeLog diff is off because of other local changes. Please review just the contents, I'll fix the ChangeLog conflicts before getting it into the commit queue. Thanks\! 742210 2 168496 tonikitoo 2012-10-15 11:23:12 -0700 Comment on attachment 168496 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=168496&action=review > Source/WebKit/blackberry/WebKitSupport/BackingStoreTile.cpp:104 > + return static_cast<bool>(m_buffer); is return m_buffer enough? 742211 3 jpetsovits 2012-10-15 11:24:47 -0700 (In reply to comment #2) > is return m_buffer enough? Syntactically yes. I find it more explanatory with an explicit cast though. 742341 4 168765 jpetsovits 2012-10-15 13:08:03 -0700 Created attachment 168765 Patch Better diff for ChangeLog (as promised above), with Antonio in the reviewer line. Thanks. 742473 5 168765 webkit.review.bot 2012-10-15 14:42:30 -0700 Comment on attachment 168765 Patch Clearing flags on attachment: 168765 Committed r131364: <http://trac.webkit.org/changeset/131364> 742474 6 webkit.review.bot 2012-10-15 14:42:34 -0700 All reviewed patches have been landed. Closing bug. 168496 2012-10-12 15:21:23 -0700 2012-10-15 13:08:00 -0700 Patch bug-99205-20121012182016.patch text/plain 5456 jpetsovits U3VidmVyc2lvbiBSZXZpc2lvbjogMTMxMTk4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpp bmRleCBmM2I1ZmNkNDMwYzZiYmYwOTI4MzY0Nzg3NmNhY2RkNGU5Njg4ZWI2Li4wYWFkNjBhZGI2 OWUzNWM4MTZkNzIzNTlkZWZiYmYxODllNTEyOGZmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFu Z2VMb2cKQEAgLTEsNSArMSwzMCBAQAogMjAxMi0xMC0xMiAgSmFrb2IgUGV0c292aXRzICA8anBl dHNvdml0c0ByaW0uY29tPgogCisgICAgICAgIFtCbGFja0JlcnJ5XSBPbmx5IHJlYWxsb2NhdGUg YnVmZmVycyB0aGF0IHdlcmUgYWxsb2NhdGVkIGJlZm9yZSBzdXNwZW5kaW5nCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05OTIwNQorICAgICAgICBSSU0g UFIgOTkzOTUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBXaGVuIHdlIGNhbGwgcmVsZWFzZUJ1ZmZlcnMoKSwgbm90IGFsbCBvZiB0aGUgYmFja2luZ3N0 b3JlCisgICAgICAgIHRpbGUgYnVmZmVycyBtaWdodCBoYXZlIGJlZW4gYWxsb2NhdGVkIHlldC4g U3RpbGwgd2UgdHJ5CisgICAgICAgIHRvIHJlbGVhc2UgYWxsIG9mIHRoZW0sIHdoaWNoIGNhdXNl cyB1cyB0byBsYXp5LWluaXRpYWxpemUKKyAgICAgICAgdGhlIHRpbGUgYnVmZmVycyBzbyB3ZSBj YW4gcmVsZWFzZSB0aGVtIGFnYWluLgorCisgICAgICAgIFRoaXMgaXMgc3R1cGlkIGFuZCB3ZSBz aG91bGQganVzdCBpZ25vcmUgYnVmZmVycyB0aGF0CisgICAgICAgIGhhdmVuJ3QgYmVlbiBpbml0 aWFsaXplZCB5ZXQuIFRoaXMgcGF0Y2ggbWFrZXMgdGhhdCBjaGFuZ2UuCisKKyAgICAgICAgKiBX ZWJLaXRTdXBwb3J0L0JhY2tpbmdTdG9yZVRpbGUuY3BwOgorICAgICAgICAoQmxhY2tCZXJyeTo6 V2ViS2l0OjpUaWxlQnVmZmVyOjp3YXNOYXRpdmVCdWZmZXJDcmVhdGVkKToKKyAgICAgICAgKFdl YktpdCk6CisgICAgICAgICogV2ViS2l0U3VwcG9ydC9CYWNraW5nU3RvcmVUaWxlLmg6CisgICAg ICAgIChUaWxlQnVmZmVyKToKKyAgICAgICAgKiBXZWJLaXRTdXBwb3J0L1N1cmZhY2VQb29sLmNw cDoKKyAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6U3VyZmFjZVBvb2w6OmNyZWF0ZUJ1ZmZl cnMpOgorICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpTdXJmYWNlUG9vbDo6cmVsZWFzZUJ1 ZmZlcnMpOgorCisyMDEyLTEwLTEyICBKYWtvYiBQZXRzb3ZpdHMgIDxqcGV0c292aXRzQHJpbS5j b20+CisKICAgICAgICAgW0JsYWNrQmVycnldIEZldGNoIGJsaXQgcmVjdHMgZnJvbSBhIHZpZXdw b3J0IGFjY2Vzc29yCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD05ODU4MQogICAgICAgICBSSU0gUFIgMTczMjkyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L2JsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9CYWNraW5nU3RvcmVUaWxlLmNwcCBiL1NvdXJj ZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0L0JhY2tpbmdTdG9yZVRpbGUuY3BwCmlu ZGV4IGJlYmM4MjYxZTY2ODM1NGE0MzJiNGU1ODcwZjg4ZTE4OWVlNTRjNjkuLjVjY2NhZGIzM2Rl OWZlMmVjNmY3YWZhMWE3YWJiMmNjNmJjNTNkY2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv YmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0L0JhY2tpbmdTdG9yZVRpbGUuY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0L0JhY2tpbmdTdG9yZVRpbGUuY3BwCkBA IC05OSw2ICs5OSwxMSBAQCBQbGF0Zm9ybTo6R3JhcGhpY3M6OkJ1ZmZlciogVGlsZUJ1ZmZlcjo6 bmF0aXZlQnVmZmVyKCkgY29uc3QKICAgICByZXR1cm4gbV9idWZmZXI7CiB9CiAKK2Jvb2wgVGls ZUJ1ZmZlcjo6d2FzTmF0aXZlQnVmZmVyQ3JlYXRlZCgpIGNvbnN0Cit7CisgICAgcmV0dXJuIHN0 YXRpY19jYXN0PGJvb2w+KG1fYnVmZmVyKTsKK30KKwogCiBCYWNraW5nU3RvcmVUaWxlOjpCYWNr aW5nU3RvcmVUaWxlKGNvbnN0IFBsYXRmb3JtOjpJbnRTaXplJiBzaXplLCBCdWZmZXJpbmdNb2Rl IG1vZGUpCiAgICAgOiBtX2J1ZmZlcmluZ01vZGUobW9kZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvYmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0L0JhY2tpbmdTdG9yZVRpbGUuaCBiL1NvdXJj ZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0L0JhY2tpbmdTdG9yZVRpbGUuaAppbmRl eCBiNTFhMzE2M2I2N2M3MjhhY2M5NmUxNTJmYjA0NzUxMzJkZjAyNmVmLi45NTEzZTAyMGQ2MDNj YzA0MTQzZGI5MjRmYWM0ZmFlOWRjODFjNTliIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvV2ViS2l0U3VwcG9ydC9CYWNraW5nU3RvcmVUaWxlLmgKKysrIGIvU291cmNlL1dl YktpdC9ibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQvQmFja2luZ1N0b3JlVGlsZS5oCkBAIC04Niw2 ICs4Niw3IEBAIGNsYXNzIFRpbGVCdWZmZXIgewogICAgICAgICB2b2lkIHNldFNjYWxlKGRvdWJs ZSBzY2FsZSkgeyBtX3NjYWxlID0gc2NhbGU7IH07CiAKICAgICAgICAgUGxhdGZvcm06OkdyYXBo aWNzOjpCdWZmZXIqIG5hdGl2ZUJ1ZmZlcigpIGNvbnN0OworICAgICAgICBib29sIHdhc05hdGl2 ZUJ1ZmZlckNyZWF0ZWQoKSBjb25zdDsKIAogICAgICAgICBGZW5jZSogZmVuY2UoKSBjb25zdCB7 IHJldHVybiBtX2ZlbmNlLmdldCgpOyB9CiAgICAgICAgIHZvaWQgc2V0RmVuY2UoUGFzc1JlZlB0 cjxGZW5jZT4gZmVuY2UpIHsgbV9mZW5jZSA9IGZlbmNlOyB9CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L2JsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9TdXJmYWNlUG9vbC5jcHAgYi9Tb3VyY2Uv V2ViS2l0L2JsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9TdXJmYWNlUG9vbC5jcHAKaW5kZXggMGUw YzgzNDRiYzAyNWJkOWZmMDE5YmViOTRhNTZmNTIzYWQxYTQ1Mi4uZDhmYWFkNzJjMDAzOGI3ZTc5 ZThkMjUzOTU1MzQ3OWU0MWFhYWJlZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ibGFja2Jl cnJ5L1dlYktpdFN1cHBvcnQvU3VyZmFjZVBvb2wuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxh Y2tiZXJyeS9XZWJLaXRTdXBwb3J0L1N1cmZhY2VQb29sLmNwcApAQCAtMTYyLDEzICsxNjIsMTUg QEAgdm9pZCBTdXJmYWNlUG9vbDo6Y3JlYXRlQnVmZmVycygpCiAgICAgICAgIHJldHVybjsKIAog ICAgIC8vIENyZWF0ZSB0aGUgdGlsZSBwb29sLgotICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwg bV90aWxlUG9vbC5zaXplKCk7ICsraSkKLSAgICAgICAgUGxhdGZvcm06OkdyYXBoaWNzOjpjcmVh dGVQaXhtYXBCdWZmZXIobV90aWxlUG9vbFtpXS0+ZnJvbnRCdWZmZXIoKS0+bmF0aXZlQnVmZmVy KCkpOworICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgbV90aWxlUG9vbC5zaXplKCk7ICsraSkg eworICAgICAgICBpZiAobV90aWxlUG9vbFtpXS0+ZnJvbnRCdWZmZXIoKS0+d2FzTmF0aXZlQnVm ZmVyQ3JlYXRlZCgpKQorICAgICAgICAgICAgUGxhdGZvcm06OkdyYXBoaWNzOjpjcmVhdGVQaXht YXBCdWZmZXIobV90aWxlUG9vbFtpXS0+ZnJvbnRCdWZmZXIoKS0+bmF0aXZlQnVmZmVyKCkpOwor ICAgIH0KIAotICAgIGlmIChtX3Zpc2libGVUaWxlQnVmZmVyKQorICAgIGlmIChtX3Zpc2libGVU aWxlQnVmZmVyICYmIG1fdmlzaWJsZVRpbGVCdWZmZXItPmZyb250QnVmZmVyKCktPndhc05hdGl2 ZUJ1ZmZlckNyZWF0ZWQoKSkKICAgICAgICAgUGxhdGZvcm06OkdyYXBoaWNzOjpjcmVhdGVQaXht YXBCdWZmZXIobV92aXNpYmxlVGlsZUJ1ZmZlci0+ZnJvbnRCdWZmZXIoKS0+bmF0aXZlQnVmZmVy KCkpOwogCi0gICAgaWYgKGJhY2tCdWZmZXIoKSkKKyAgICBpZiAoYmFja0J1ZmZlcigpICYmIGJh Y2tCdWZmZXIoKS0+d2FzTmF0aXZlQnVmZmVyQ3JlYXRlZCgpKQogICAgICAgICBQbGF0Zm9ybTo6 R3JhcGhpY3M6OmNyZWF0ZVBpeG1hcEJ1ZmZlcihiYWNrQnVmZmVyKCktPm5hdGl2ZUJ1ZmZlcigp KTsKIAogICAgIG1fYnVmZmVyc1N1c3BlbmRlZCA9IGZhbHNlOwpAQCAtMTgzLDE5ICsxODUsMjEg QEAgdm9pZCBTdXJmYWNlUG9vbDo6cmVsZWFzZUJ1ZmZlcnMoKQogCiAgICAgLy8gUmVsZWFzZSB0 aGUgdGlsZSBwb29sLgogICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgbV90aWxlUG9vbC5zaXpl KCk7ICsraSkgeworICAgICAgICBpZiAoIW1fdGlsZVBvb2xbaV0tPmZyb250QnVmZmVyKCktPndh c05hdGl2ZUJ1ZmZlckNyZWF0ZWQoKSkKKyAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICBt X3RpbGVQb29sW2ldLT5mcm9udEJ1ZmZlcigpLT5jbGVhclJlbmRlcmVkUmVnaW9uKCk7CiAgICAg ICAgIC8vIENsZWFyIHRoZSBidWZmZXIgdG8gcHJldmVudCBhY2NpZGVudGFsIGxlYWthZ2Ugb2Yg KHBvc3NpYmx5IHNlbnNpdGl2ZSkgcGl4ZWwgZGF0YS4KICAgICAgICAgUGxhdGZvcm06OkdyYXBo aWNzOjpjbGVhckJ1ZmZlcihtX3RpbGVQb29sW2ldLT5mcm9udEJ1ZmZlcigpLT5uYXRpdmVCdWZm ZXIoKSwgMCwgMCwgMCwgMCk7CiAgICAgICAgIFBsYXRmb3JtOjpHcmFwaGljczo6ZGVzdHJveVBp eG1hcEJ1ZmZlcihtX3RpbGVQb29sW2ldLT5mcm9udEJ1ZmZlcigpLT5uYXRpdmVCdWZmZXIoKSk7 CiAgICAgfQogCi0gICAgaWYgKG1fdmlzaWJsZVRpbGVCdWZmZXIpIHsKKyAgICBpZiAobV92aXNp YmxlVGlsZUJ1ZmZlciAmJiBtX3Zpc2libGVUaWxlQnVmZmVyLT5mcm9udEJ1ZmZlcigpLT53YXNO YXRpdmVCdWZmZXJDcmVhdGVkKCkpIHsKICAgICAgICAgbV92aXNpYmxlVGlsZUJ1ZmZlci0+ZnJv bnRCdWZmZXIoKS0+Y2xlYXJSZW5kZXJlZFJlZ2lvbigpOwogICAgICAgICBQbGF0Zm9ybTo6R3Jh cGhpY3M6OmNsZWFyQnVmZmVyKG1fdmlzaWJsZVRpbGVCdWZmZXItPmZyb250QnVmZmVyKCktPm5h dGl2ZUJ1ZmZlcigpLCAwLCAwLCAwLCAwKTsKICAgICAgICAgUGxhdGZvcm06OkdyYXBoaWNzOjpk ZXN0cm95UGl4bWFwQnVmZmVyKG1fdmlzaWJsZVRpbGVCdWZmZXItPmZyb250QnVmZmVyKCktPm5h dGl2ZUJ1ZmZlcigpKTsKICAgICB9CiAKLSAgICBpZiAoYmFja0J1ZmZlcigpKSB7CisgICAgaWYg KGJhY2tCdWZmZXIoKSAmJiBiYWNrQnVmZmVyKCktPndhc05hdGl2ZUJ1ZmZlckNyZWF0ZWQoKSkg ewogICAgICAgICBiYWNrQnVmZmVyKCktPmNsZWFyUmVuZGVyZWRSZWdpb24oKTsKICAgICAgICAg UGxhdGZvcm06OkdyYXBoaWNzOjpjbGVhckJ1ZmZlcihiYWNrQnVmZmVyKCktPm5hdGl2ZUJ1ZmZl cigpLCAwLCAwLCAwLCAwKTsKICAgICAgICAgUGxhdGZvcm06OkdyYXBoaWNzOjpkZXN0cm95UGl4 bWFwQnVmZmVyKGJhY2tCdWZmZXIoKS0+bmF0aXZlQnVmZmVyKCkpOwo= 168765 2012-10-15 13:08:03 -0700 2012-10-15 14:42:30 -0700 Patch bug-99205-20121015160650.patch text/plain 5377 jpetsovits U3VidmVyc2lvbiBSZXZpc2lvbjogMTMxMzAxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpp bmRleCAwZWMyOTJkYTU1MzM1MGVmMDhkNjljNmJlMDE5Mjc3NmM5YzFiYjAwLi5mZmRlOTNjODAx MzU5ODI0YjgzYjIxNDM5MzJjNDJmNzEyY2VmMDcyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFu Z2VMb2cKQEAgLTEsMyArMSwyOCBAQAorMjAxMi0xMC0xNSAgSmFrb2IgUGV0c292aXRzICA8anBl dHNvdml0c0ByaW0uY29tPgorCisgICAgICAgIFtCbGFja0JlcnJ5XSBPbmx5IHJlYWxsb2NhdGUg YnVmZmVycyB0aGF0IHdlcmUgYWxsb2NhdGVkIGJlZm9yZSBzdXNwZW5kaW5nCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05OTIwNQorICAgICAgICBSSU0g UFIgOTkzOTUKKworICAgICAgICBSZXZpZXdlZCBieSBBbnRvbmlvIEdvbWVzLgorCisgICAgICAg IFdoZW4gd2UgY2FsbCByZWxlYXNlQnVmZmVycygpLCBub3QgYWxsIG9mIHRoZSBiYWNraW5nc3Rv cmUKKyAgICAgICAgdGlsZSBidWZmZXJzIG1pZ2h0IGhhdmUgYmVlbiBhbGxvY2F0ZWQgeWV0LiBT dGlsbCB3ZSB0cnkKKyAgICAgICAgdG8gcmVsZWFzZSBhbGwgb2YgdGhlbSwgd2hpY2ggY2F1c2Vz IHVzIHRvIGxhenktaW5pdGlhbGl6ZQorICAgICAgICB0aGUgdGlsZSBidWZmZXJzIHNvIHdlIGNh biByZWxlYXNlIHRoZW0gYWdhaW4uCisKKyAgICAgICAgVGhpcyBpcyBzdHVwaWQgYW5kIHdlIHNo b3VsZCBqdXN0IGlnbm9yZSBidWZmZXJzIHRoYXQKKyAgICAgICAgaGF2ZW4ndCBiZWVuIGluaXRp YWxpemVkIHlldC4gVGhpcyBwYXRjaCBtYWtlcyB0aGF0IGNoYW5nZS4KKworICAgICAgICAqIFdl YktpdFN1cHBvcnQvQmFja2luZ1N0b3JlVGlsZS5jcHA6CisgICAgICAgIChCbGFja0JlcnJ5OjpX ZWJLaXQ6OlRpbGVCdWZmZXI6Ondhc05hdGl2ZUJ1ZmZlckNyZWF0ZWQpOgorICAgICAgICAoV2Vi S2l0KToKKyAgICAgICAgKiBXZWJLaXRTdXBwb3J0L0JhY2tpbmdTdG9yZVRpbGUuaDoKKyAgICAg ICAgKFRpbGVCdWZmZXIpOgorICAgICAgICAqIFdlYktpdFN1cHBvcnQvU3VyZmFjZVBvb2wuY3Bw OgorICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpTdXJmYWNlUG9vbDo6Y3JlYXRlQnVmZmVy cyk6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OlN1cmZhY2VQb29sOjpyZWxlYXNlQnVm ZmVycyk6CisKIDIwMTItMTAtMTMgIEpha29iIFBldHNvdml0cyAgPGpwZXRzb3ZpdHNAcmltLmNv bT4KIAogICAgICAgICBbQmxhY2tCZXJyeV0gRmV0Y2ggYmxpdCByZWN0cyBmcm9tIGEgdmlld3Bv cnQgYWNjZXNzb3IKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJLaXRT dXBwb3J0L0JhY2tpbmdTdG9yZVRpbGUuY3BwIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dl YktpdFN1cHBvcnQvQmFja2luZ1N0b3JlVGlsZS5jcHAKaW5kZXggYmViYzgyNjFlNjY4MzU0YTQz MmI0ZTU4NzBmODhlMTg5ZWU1NGM2OS4uNWNjY2FkYjMzZGU5ZmUyZWM2ZjdhZmExYTdhYmIyY2M2 YmM1M2RjZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYktpdFN1cHBv cnQvQmFja2luZ1N0b3JlVGlsZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dl YktpdFN1cHBvcnQvQmFja2luZ1N0b3JlVGlsZS5jcHAKQEAgLTk5LDYgKzk5LDExIEBAIFBsYXRm b3JtOjpHcmFwaGljczo6QnVmZmVyKiBUaWxlQnVmZmVyOjpuYXRpdmVCdWZmZXIoKSBjb25zdAog ICAgIHJldHVybiBtX2J1ZmZlcjsKIH0KIAorYm9vbCBUaWxlQnVmZmVyOjp3YXNOYXRpdmVCdWZm ZXJDcmVhdGVkKCkgY29uc3QKK3sKKyAgICByZXR1cm4gc3RhdGljX2Nhc3Q8Ym9vbD4obV9idWZm ZXIpOworfQorCiAKIEJhY2tpbmdTdG9yZVRpbGU6OkJhY2tpbmdTdG9yZVRpbGUoY29uc3QgUGxh dGZvcm06OkludFNpemUmIHNpemUsIEJ1ZmZlcmluZ01vZGUgbW9kZSkKICAgICA6IG1fYnVmZmVy aW5nTW9kZShtb2RlKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYktp dFN1cHBvcnQvQmFja2luZ1N0b3JlVGlsZS5oIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dl YktpdFN1cHBvcnQvQmFja2luZ1N0b3JlVGlsZS5oCmluZGV4IGI1MWEzMTYzYjY3YzcyOGFjYzk2 ZTE1MmZiMDQ3NTEzMmRmMDI2ZWYuLjk1MTNlMDIwZDYwM2NjMDQxNDNkYjkyNGZhYzRmYWU5ZGM4 MWM1OWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0 L0JhY2tpbmdTdG9yZVRpbGUuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViS2l0 U3VwcG9ydC9CYWNraW5nU3RvcmVUaWxlLmgKQEAgLTg2LDYgKzg2LDcgQEAgY2xhc3MgVGlsZUJ1 ZmZlciB7CiAgICAgICAgIHZvaWQgc2V0U2NhbGUoZG91YmxlIHNjYWxlKSB7IG1fc2NhbGUgPSBz Y2FsZTsgfTsKIAogICAgICAgICBQbGF0Zm9ybTo6R3JhcGhpY3M6OkJ1ZmZlciogbmF0aXZlQnVm ZmVyKCkgY29uc3Q7CisgICAgICAgIGJvb2wgd2FzTmF0aXZlQnVmZmVyQ3JlYXRlZCgpIGNvbnN0 OwogCiAgICAgICAgIEZlbmNlKiBmZW5jZSgpIGNvbnN0IHsgcmV0dXJuIG1fZmVuY2UuZ2V0KCk7 IH0KICAgICAgICAgdm9pZCBzZXRGZW5jZShQYXNzUmVmUHRyPEZlbmNlPiBmZW5jZSkgeyBtX2Zl bmNlID0gZmVuY2U7IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJL aXRTdXBwb3J0L1N1cmZhY2VQb29sLmNwcCBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJL aXRTdXBwb3J0L1N1cmZhY2VQb29sLmNwcAppbmRleCAwZTBjODM0NGJjMDI1YmQ5ZmYwMTliZWI5 NGE1NmY1MjNhZDFhNDUyLi5kOGZhYWQ3MmMwMDM4YjdlNzllOGQyNTM5NTUzNDc5ZTQxYWFhYmVk IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9TdXJm YWNlUG9vbC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQv U3VyZmFjZVBvb2wuY3BwCkBAIC0xNjIsMTMgKzE2MiwxNSBAQCB2b2lkIFN1cmZhY2VQb29sOjpj cmVhdGVCdWZmZXJzKCkKICAgICAgICAgcmV0dXJuOwogCiAgICAgLy8gQ3JlYXRlIHRoZSB0aWxl IHBvb2wuCi0gICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBtX3RpbGVQb29sLnNpemUoKTsgKytp KQotICAgICAgICBQbGF0Zm9ybTo6R3JhcGhpY3M6OmNyZWF0ZVBpeG1hcEJ1ZmZlcihtX3RpbGVQ b29sW2ldLT5mcm9udEJ1ZmZlcigpLT5uYXRpdmVCdWZmZXIoKSk7CisgICAgZm9yIChzaXplX3Qg aSA9IDA7IGkgPCBtX3RpbGVQb29sLnNpemUoKTsgKytpKSB7CisgICAgICAgIGlmIChtX3RpbGVQ b29sW2ldLT5mcm9udEJ1ZmZlcigpLT53YXNOYXRpdmVCdWZmZXJDcmVhdGVkKCkpCisgICAgICAg ICAgICBQbGF0Zm9ybTo6R3JhcGhpY3M6OmNyZWF0ZVBpeG1hcEJ1ZmZlcihtX3RpbGVQb29sW2ld LT5mcm9udEJ1ZmZlcigpLT5uYXRpdmVCdWZmZXIoKSk7CisgICAgfQogCi0gICAgaWYgKG1fdmlz aWJsZVRpbGVCdWZmZXIpCisgICAgaWYgKG1fdmlzaWJsZVRpbGVCdWZmZXIgJiYgbV92aXNpYmxl VGlsZUJ1ZmZlci0+ZnJvbnRCdWZmZXIoKS0+d2FzTmF0aXZlQnVmZmVyQ3JlYXRlZCgpKQogICAg ICAgICBQbGF0Zm9ybTo6R3JhcGhpY3M6OmNyZWF0ZVBpeG1hcEJ1ZmZlcihtX3Zpc2libGVUaWxl QnVmZmVyLT5mcm9udEJ1ZmZlcigpLT5uYXRpdmVCdWZmZXIoKSk7CiAKLSAgICBpZiAoYmFja0J1 ZmZlcigpKQorICAgIGlmIChiYWNrQnVmZmVyKCkgJiYgYmFja0J1ZmZlcigpLT53YXNOYXRpdmVC dWZmZXJDcmVhdGVkKCkpCiAgICAgICAgIFBsYXRmb3JtOjpHcmFwaGljczo6Y3JlYXRlUGl4bWFw QnVmZmVyKGJhY2tCdWZmZXIoKS0+bmF0aXZlQnVmZmVyKCkpOwogCiAgICAgbV9idWZmZXJzU3Vz cGVuZGVkID0gZmFsc2U7CkBAIC0xODMsMTkgKzE4NSwyMSBAQCB2b2lkIFN1cmZhY2VQb29sOjpy ZWxlYXNlQnVmZmVycygpCiAKICAgICAvLyBSZWxlYXNlIHRoZSB0aWxlIHBvb2wuCiAgICAgZm9y IChzaXplX3QgaSA9IDA7IGkgPCBtX3RpbGVQb29sLnNpemUoKTsgKytpKSB7CisgICAgICAgIGlm ICghbV90aWxlUG9vbFtpXS0+ZnJvbnRCdWZmZXIoKS0+d2FzTmF0aXZlQnVmZmVyQ3JlYXRlZCgp KQorICAgICAgICAgICAgY29udGludWU7CiAgICAgICAgIG1fdGlsZVBvb2xbaV0tPmZyb250QnVm ZmVyKCktPmNsZWFyUmVuZGVyZWRSZWdpb24oKTsKICAgICAgICAgLy8gQ2xlYXIgdGhlIGJ1ZmZl ciB0byBwcmV2ZW50IGFjY2lkZW50YWwgbGVha2FnZSBvZiAocG9zc2libHkgc2Vuc2l0aXZlKSBw aXhlbCBkYXRhLgogICAgICAgICBQbGF0Zm9ybTo6R3JhcGhpY3M6OmNsZWFyQnVmZmVyKG1fdGls ZVBvb2xbaV0tPmZyb250QnVmZmVyKCktPm5hdGl2ZUJ1ZmZlcigpLCAwLCAwLCAwLCAwKTsKICAg ICAgICAgUGxhdGZvcm06OkdyYXBoaWNzOjpkZXN0cm95UGl4bWFwQnVmZmVyKG1fdGlsZVBvb2xb aV0tPmZyb250QnVmZmVyKCktPm5hdGl2ZUJ1ZmZlcigpKTsKICAgICB9CiAKLSAgICBpZiAobV92 aXNpYmxlVGlsZUJ1ZmZlcikgeworICAgIGlmIChtX3Zpc2libGVUaWxlQnVmZmVyICYmIG1fdmlz aWJsZVRpbGVCdWZmZXItPmZyb250QnVmZmVyKCktPndhc05hdGl2ZUJ1ZmZlckNyZWF0ZWQoKSkg ewogICAgICAgICBtX3Zpc2libGVUaWxlQnVmZmVyLT5mcm9udEJ1ZmZlcigpLT5jbGVhclJlbmRl cmVkUmVnaW9uKCk7CiAgICAgICAgIFBsYXRmb3JtOjpHcmFwaGljczo6Y2xlYXJCdWZmZXIobV92 aXNpYmxlVGlsZUJ1ZmZlci0+ZnJvbnRCdWZmZXIoKS0+bmF0aXZlQnVmZmVyKCksIDAsIDAsIDAs IDApOwogICAgICAgICBQbGF0Zm9ybTo6R3JhcGhpY3M6OmRlc3Ryb3lQaXhtYXBCdWZmZXIobV92 aXNpYmxlVGlsZUJ1ZmZlci0+ZnJvbnRCdWZmZXIoKS0+bmF0aXZlQnVmZmVyKCkpOwogICAgIH0K IAotICAgIGlmIChiYWNrQnVmZmVyKCkpIHsKKyAgICBpZiAoYmFja0J1ZmZlcigpICYmIGJhY2tC dWZmZXIoKS0+d2FzTmF0aXZlQnVmZmVyQ3JlYXRlZCgpKSB7CiAgICAgICAgIGJhY2tCdWZmZXIo KS0+Y2xlYXJSZW5kZXJlZFJlZ2lvbigpOwogICAgICAgICBQbGF0Zm9ybTo6R3JhcGhpY3M6OmNs ZWFyQnVmZmVyKGJhY2tCdWZmZXIoKS0+bmF0aXZlQnVmZmVyKCksIDAsIDAsIDAsIDApOwogICAg ICAgICBQbGF0Zm9ybTo6R3JhcGhpY3M6OmRlc3Ryb3lQaXhtYXBCdWZmZXIoYmFja0J1ZmZlcigp LT5uYXRpdmVCdWZmZXIoKSk7Cg==