115981 2013-05-12 00:49:42 -0700 toDataURL can return an empty image in some cases 2013-05-13 14:30:12 -0700 1 1 1 Unclassified WebKit Canvas 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 dino dino graouts jonlee simon.fraser thorton oldest_to_newest 887909 0 dino 2013-05-12 00:49:42 -0700 In some accelerated rendering cases, toDataURL can produce an empty image on canvas elements, especially if that canvas element is not on-screen. <rdar://problem/13760256> 887910 1 201482 dino 2013-05-12 00:53:57 -0700 Created attachment 201482 Patch 887911 2 201482 darin 2013-05-12 01:20:48 -0700 Comment on attachment 201482 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=201482&action=review > Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp:453 > + CGContextFlush(context()->platformContext()); > +#if !PLATFORM(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED == 1070 > + m_data.m_lastFlushTime = currentTimeMS(); > +#endif Could we make this share code with the ImageBuffer::context flush? Or is that not worth it? 887937 3 201482 dino 2013-05-12 08:23:24 -0700 Comment on attachment 201482 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=201482&action=review >> Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp:453 >> +#endif > > Could we make this share code with the ImageBuffer::context flush? Or is that not worth it? There were a bunch of places which called flush in this manner. I did consider gathering them all so that we didn't have the ugly #if spewing across the whole file. I'll take another look before committing. 888521 4 201632 dino 2013-05-13 14:11:37 -0700 Created attachment 201632 Patch for landing 888527 5 dino 2013-05-13 14:30:12 -0700 Committed r150040: <http://trac.webkit.org/changeset/150040> 201482 2013-05-12 00:53:57 -0700 2013-05-13 14:11:34 -0700 Patch bug-115981-20130512005257.patch text/plain 3948 dino U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ5ODkxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWY5NTM4ODYzM2M4OTFm ZWYzNWI1OGEyODQ3NWFlYWVkOWM5ZDc4Yi4uNGUyM2RlY2VkMTVlODg5NjhjYmU0MDA3MTBhMTU5 MjI3MjhkMjNhZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEzLTA1LTEyICBEZWFu IEphY2tzb24gIDxkaW5vQGFwcGxlLmNvbT4KKworICAgICAgICB0b0RhdGFVUkwgY2FuIHJldHVy biBhbiBlbXB0eSBpbWFnZSBpbiBzb21lIGNhc2VzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTU5ODEKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzEz NzYwMjU2PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IEluIHNvbWUgYWNjZWxlcmF0ZWQgcmVuZGVyaW5nIGNhc2VzLCBjYWxsaW5nIHRvRGF0YVVSTCBv bgorICAgICAgICBhbiBvZmYtc2NyZWVuIGNhbnZhcyBwcm9kdWNlZCBhbiBlbXB0eSBpbWFnZS4g VGhlIHNvbHV0aW9uCisgICAgICAgIHdhcyB0byBmb3JjZSBhIENHQ29udGV4dEZsdXNoIGJlZm9y ZSBleHRyYWN0aW5nIHRoZSBkYXRhCisgICAgICAgIGZvciBpbWFnZSBnZW5lcmF0aW9uLgorCisg ICAgICAgIFRlc3Q6IGZhc3QvY2FudmFzL3RvRGF0YVVSTC1ub3QtZW1wdHkuaHRtbAorCisgICAg ICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2cvSW1hZ2VCdWZmZXJDRy5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpJbWFnZUJ1ZmZlcjo6dG9EYXRhVVJMKTogRmx1c2ggdGhlIENHIGNvbnRleHQuCisK IDIwMTMtMDUtMTAgIERlYW4gSmFja3NvbiAgPGRpbm9AYXBwbGUuY29tPgogCiAgICAgICAgIElu Y2x1ZGUgdGFiIGNoYXJhY3RlciBhcyBhIHdvcmQgZW5kIGZvciBrZXJuaW5nCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jZy9JbWFnZUJ1ZmZlckNHLmNwcCBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NnL0ltYWdlQnVmZmVyQ0cuY3BwCmlu ZGV4IGFkODk2MTRiOGNmNzI4MTEyMWVjZWJmNDU1Mzk3NzYyOGM0ZjBkNWIuLjZiMjI3ODEwNDAy YzVlMTZlNGE4ZGVmNDdlN2VmNGRhNmZhNDQwNWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2NnL0ltYWdlQnVmZmVyQ0cuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NnL0ltYWdlQnVmZmVyQ0cuY3BwCkBAIC00NDYsNiArNDQ2 LDEzIEBAIFN0cmluZyBJbWFnZUJ1ZmZlcjo6dG9EYXRhVVJMKGNvbnN0IFN0cmluZyYgbWltZVR5 cGUsIGNvbnN0IGRvdWJsZSogcXVhbGl0eSwgQ29vCiB7CiAgICAgQVNTRVJUKE1JTUVUeXBlUmVn aXN0cnk6OmlzU3VwcG9ydGVkSW1hZ2VNSU1FVHlwZUZvckVuY29kaW5nKG1pbWVUeXBlKSk7CiAK KyAgICBpZiAobV9jb250ZXh0LT5pc0FjY2VsZXJhdGVkQ29udGV4dCgpKSB7CisgICAgICAgIENH Q29udGV4dEZsdXNoKGNvbnRleHQoKS0+cGxhdGZvcm1Db250ZXh0KCkpOworI2lmICFQTEFURk9S TShJT1MpICYmIF9fTUFDX09TX1hfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPT0gMTA3MAorICAgICAg ICBtX2RhdGEubV9sYXN0Rmx1c2hUaW1lID0gY3VycmVudFRpbWVNUygpOworI2VuZGlmCisgICAg fQorICAgIAogICAgIFJldGFpblB0cjxDRlN0cmluZ1JlZj4gdXRpID0gdXRpRnJvbU1JTUVUeXBl KG1pbWVUeXBlKTsKICAgICBBU1NFUlQodXRpKTsKIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IGE2Y2NkMGNhMjAwOTZiZmEz MjkxM2YzMDc3MTRhMzlkN2UwNGVkNzguLjg3NGU2MDg1ZjViZTViYTUyMTQ4YzA1NTFjNjljODQ2 YjdlYTNkYjMgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRU ZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxMy0wNS0xMiAgRGVhbiBKYWNrc29u ICA8ZGlub0BhcHBsZS5jb20+CisKKyAgICAgICAgdG9EYXRhVVJMIGNhbiByZXR1cm4gYW4gZW1w dHkgaW1hZ2UgaW4gc29tZSBjYXNlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTE1OTgxCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xMzc2MDI1Nj4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNYWtlIHN1 cmUgdGhhdCBhIGNhbnZhcyB3aXRoIGNvbnRlbnQgaXMgbm90IHRoZSBzYW1lIGFzIG9uZQorICAg ICAgICB3aXRob3V0IGNvbnRlbnQuCisKKyAgICAgICAgKiBmYXN0L2NhbnZhcy90b0RhdGFVUkwt bm90LWVtcHR5LWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogZmFzdC9jYW52YXMvdG9E YXRhVVJMLW5vdC1lbXB0eS5odG1sOiBBZGRlZC4KKwogMjAxMy0wNS0xMCAgRGVhbiBKYWNrc29u ICA8ZGlub0BhcHBsZS5jb20+CiAKICAgICAgICAgSW5jbHVkZSB0YWIgY2hhcmFjdGVyIGFzIGEg d29yZCBlbmQgZm9yIGtlcm5pbmcKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvY2FudmFz L3RvRGF0YVVSTC1ub3QtZW1wdHktZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZmFzdC9jYW52 YXMvdG9EYXRhVVJMLW5vdC1lbXB0eS1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQK aW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uN2VmMjJlOWE0 MzFhZDAyNzI3MTNiNzFmZGM4Nzk0MDE2YzhlZjEyZgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91 dFRlc3RzL2Zhc3QvY2FudmFzL3RvRGF0YVVSTC1ub3QtZW1wdHktZXhwZWN0ZWQudHh0CkBAIC0w LDAgKzEgQEAKK1BBU1MKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvY2FudmFzL3RvRGF0 YVVSTC1ub3QtZW1wdHkuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvY2FudmFzL3RvRGF0YVVSTC1u b3QtZW1wdHkuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5iOTI3NDNkMzQyNzdlNzA0NTVhMWJhN2ZhZDQxMTg5 ZDI0YzQ1OTI2Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9jYW52YXMvdG9E YXRhVVJMLW5vdC1lbXB0eS5odG1sCkBAIC0wLDAgKzEsMjYgQEAKKzxzY3JpcHQ+CitpZiAod2lu ZG93LnRlc3RSdW5uZXIpCisgICAgdGVzdFJ1bm5lci5kdW1wQXNUZXh0KCk7CisKK3dpbmRvdy5h ZGRFdmVudExpc3RlbmVyKCJET01Db250ZW50TG9hZGVkIiwgZnVuY3Rpb24oKSB7CisgICAgdmFy IGNhbnZhcyA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImNhbnZhcyIpOworICAgIGNhbnZhcy53 aWR0aCA9IDEwMDsKKyAgICBjYW52YXMuaGVpZ2h0ID0gMTAwOworCisgICAgdmFyIGN0eCA9IGNh bnZhcy5nZXRDb250ZXh0KCIyZCIpOworICAgIGN0eC5maWxsU3R5bGUgPSAicmVkIjsKKyAgICBj dHguZmlsbFJlY3QoMCwgMCwgMTAwLCAxMDApOworCisgICAgdmFyIGRhdGExID0gY2FudmFzLnRv RGF0YVVSTCgpOworCisgICAgY2FudmFzID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiY2FudmFz Iik7CisgICAgY2FudmFzLndpZHRoID0gMTAwOworICAgIGNhbnZhcy5oZWlnaHQgPSAxMDA7CisK KyAgICBjdHggPSBjYW52YXMuZ2V0Q29udGV4dCgiMmQiKTsKKworICAgIHZhciBkYXRhMiA9IGNh bnZhcy50b0RhdGFVUkwoKTsKKworICAgIGRvY3VtZW50LmJvZHkuYXBwZW5kQ2hpbGQoZG9jdW1l bnQuY3JlYXRlVGV4dE5vZGUoKGRhdGExID09IGRhdGEyKSA/ICJGQUlMIiA6ICJQQVNTIikpOwor fSk7Cis8L3NjcmlwdD4K 201632 2013-05-13 14:11:37 -0700 2013-05-13 14:20:33 -0700 Patch for landing bug-115981-20130513141035.patch text/plain 7655 dino U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ5ODkxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWY5NTM4ODYzM2M4OTFm ZWYzNWI1OGEyODQ3NWFlYWVkOWM5ZDc4Yi4uMDAwYjFiMzY5MmVlM2E5M2UxODliODkxYjEyZmQ3 ZDZhODUyY2ZiMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDEzLTA1LTEzICBEZWFu IEphY2tzb24gIDxkaW5vQGFwcGxlLmNvbT4KKworICAgICAgICB0b0RhdGFVUkwgY2FuIHJldHVy biBhbiBlbXB0eSBpbWFnZSBpbiBzb21lIGNhc2VzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTU5ODEKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzEz NzYwMjU2PgorCisgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgorCisgICAgICAgIElu IHNvbWUgYWNjZWxlcmF0ZWQgcmVuZGVyaW5nIGNhc2VzLCBjYWxsaW5nIHRvRGF0YVVSTCBvbgor ICAgICAgICBhbiBvZmYtc2NyZWVuIGNhbnZhcyBwcm9kdWNlZCBhbiBlbXB0eSBpbWFnZS4gVGhl IHNvbHV0aW9uCisgICAgICAgIHdhcyB0byBmb3JjZSBhIENHQ29udGV4dEZsdXNoIGJlZm9yZSBl eHRyYWN0aW5nIHRoZSBkYXRhCisgICAgICAgIGZvciBpbWFnZSBnZW5lcmF0aW9uLgorCisgICAg ICAgIFdoaWxlIGhlcmUsIEkgY29sbGVjdGVkIHRoZSBmbHVzaGluZyBjb2RlIGZyb20gb3RoZXIg bWV0aG9kcworICAgICAgICBpbnRvIGEgc2luZ2xlIHBsYWNlLiBBbHNvIHdlIHdlcmUgZ2V0dGlu ZyBpbnRvIGEgc2l0dWF0aW9uIHdoZXJlCisgICAgICAgIHdlIGNhbGxlZCBmbHVzaCB0d28gdGlt ZXMgaW4gYSByb3cuCisKKyAgICAgICAgVGVzdDogZmFzdC9jYW52YXMvdG9EYXRhVVJMLW5vdC1l bXB0eS5odG1sCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9JbWFnZUJ1ZmZlci5oOgor ICAgICAgICAoSW1hZ2VCdWZmZXIpOiBEZWZpbmUgdHdvIG5ldyBtZXRob2RzIGZsdXNoQ29udGV4 dCBhbmQgZmx1c2hDb250ZXh0SWZOZWNlc3NhcnkuCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhp Y3MvY2cvSW1hZ2VCdWZmZXJDRy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbWFnZUJ1ZmZlcjo6 Y29udGV4dCk6IENhbGwgZmx1c2hDb250ZXh0SWZOZWNlc3NhcnkuCisgICAgICAgIChXZWJDb3Jl OjpJbWFnZUJ1ZmZlcjo6Zmx1c2hDb250ZXh0SWZOZWNlc3NhcnkpOiBNb3ZlZCB0aGUgMTAuNyBj b2RlIGluIGhlcmUuCisgICAgICAgIChXZWJDb3JlOjpJbWFnZUJ1ZmZlcjo6Zmx1c2hDb250ZXh0 KTogQ2FsbHMgQ0dDb250ZXh0Rmx1c2guCisgICAgICAgIChXZWJDb3JlOjpJbWFnZUJ1ZmZlcjo6 Z2V0VW5tdWx0aXBsaWVkSW1hZ2VEYXRhKTogQ2FsbCBuZXcgaGVscGVyLgorICAgICAgICAoV2Vi Q29yZTo6SW1hZ2VCdWZmZXI6OmdldFByZW11bHRpcGxpZWRJbWFnZURhdGEpOiBDYWxsIG5ldyBo ZWxwZXIuCisgICAgICAgIChXZWJDb3JlOjpJbWFnZUJ1ZmZlcjo6dG9EYXRhVVJMKTogRmx1c2gg dGhlIENHIGNvbnRleHQuCisKIDIwMTMtMDUtMTAgIERlYW4gSmFja3NvbiAgPGRpbm9AYXBwbGUu Y29tPgogCiAgICAgICAgIEluY2x1ZGUgdGFiIGNoYXJhY3RlciBhcyBhIHdvcmQgZW5kIGZvciBr ZXJuaW5nCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9JbWFn ZUJ1ZmZlci5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvSW1hZ2VCdWZmZXIu aAppbmRleCBhNzM4NmFlYzQwNjRiOTYyYWM2MmJkYjYwZWNjOTRiNTZmYjUwOTEwLi44NzFkN2Mw NTU1MGU5ODU5ZDBjMWFmYTc2MzQ4YjE1MDU1NjcxOGI0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9JbWFnZUJ1ZmZlci5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL0ltYWdlQnVmZmVyLmgKQEAgLTEzMSw2ICsxMzEsOCBAQCBuYW1l c3BhY2UgV2ViQ29yZSB7CiAgICAgcHJpdmF0ZToKICNpZiBVU0UoQ0cpCiAgICAgICAgIFBhc3NO YXRpdmVJbWFnZVB0ciBjb3B5TmF0aXZlSW1hZ2UoQmFja2luZ1N0b3JlQ29weSA9IENvcHlCYWNr aW5nU3RvcmUpIGNvbnN0OworICAgICAgICB2b2lkIGZsdXNoQ29udGV4dCgpIGNvbnN0OworICAg ICAgICB2b2lkIGZsdXNoQ29udGV4dElmTmVjZXNzYXJ5KCkgY29uc3Q7CiAjZW5kaWYKICAgICAg ICAgdm9pZCBjbGlwKEdyYXBoaWNzQ29udGV4dCosIGNvbnN0IEZsb2F0UmVjdCYpIGNvbnN0Owog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jZy9JbWFnZUJ1 ZmZlckNHLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NnL0ltYWdlQnVm ZmVyQ0cuY3BwCmluZGV4IGFkODk2MTRiOGNmNzI4MTEyMWVjZWJmNDU1Mzk3NzYyOGM0ZjBkNWIu LmFkZDVkMjcyM2IzZjZhODYzYTBmNmIzOGRkM2Y0NjE0MTRhYzVlYTEgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NnL0ltYWdlQnVmZmVyQ0cuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NnL0ltYWdlQnVmZmVyQ0cuY3BwCkBA IC0xOTUsMjAgKzE5NSwzMSBAQCBJbWFnZUJ1ZmZlcjo6fkltYWdlQnVmZmVyKCkKIEdyYXBoaWNz Q29udGV4dCogSW1hZ2VCdWZmZXI6OmNvbnRleHQoKSBjb25zdAogewogI2lmICFQTEFURk9STShJ T1MpICYmIF9fTUFDX09TX1hfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPT0gMTA3MAorICAgIGZsdXNo Q29udGV4dElmTmVjZXNzYXJ5KCk7CisjZW5kaWYKKyAgICByZXR1cm4gbV9jb250ZXh0LmdldCgp OworfQorCit2b2lkIEltYWdlQnVmZmVyOjpmbHVzaENvbnRleHRJZk5lY2Vzc2FyeSgpIGNvbnN0 Cit7CisjaWYgIVBMQVRGT1JNKElPUykgJiYgX19NQUNfT1NfWF9WRVJTSU9OX01JTl9SRVFVSVJF RCA9PSAxMDcwCiAgICAgLy8gRm9yY2UgYSBmbHVzaCBpZiBsYXN0IGZsdXNoIHdhcyBtb3JlIHRo YW4gMjBtcyBhZ28KICAgICBpZiAobV9jb250ZXh0LT5pc0FjY2VsZXJhdGVkQ29udGV4dCgpKSB7 CiAgICAgICAgIGRvdWJsZSBlbGFwc2VkVGltZSA9IGN1cnJlbnRUaW1lTVMoKSAtIG1fZGF0YS5t X2xhc3RGbHVzaFRpbWU7CiAgICAgICAgIGRvdWJsZSBtYXhGbHVzaEludGVydmFsID0gMjA7IC8v IGluIG1zCiAKLSAgICAgICAgaWYgKGVsYXBzZWRUaW1lID4gbWF4Rmx1c2hJbnRlcnZhbCkgewot ICAgICAgICAgICAgQ0dDb250ZXh0UmVmIGNvbnRleHQgPSBtX2NvbnRleHQtPnBsYXRmb3JtQ29u dGV4dCgpOwotICAgICAgICAgICAgQ0dDb250ZXh0Rmx1c2goY29udGV4dCk7Ci0gICAgICAgICAg ICBtX2RhdGEubV9sYXN0Rmx1c2hUaW1lID0gY3VycmVudFRpbWVNUygpOwotICAgICAgICB9Cisg ICAgICAgIGlmIChlbGFwc2VkVGltZSA+IG1heEZsdXNoSW50ZXJ2YWwpCisgICAgICAgICAgICBm bHVzaENvbnRleHQoKTsKICAgICB9CiAjZW5kaWYKK30KIAotICAgIHJldHVybiBtX2NvbnRleHQu Z2V0KCk7Cit2b2lkIEltYWdlQnVmZmVyOjpmbHVzaENvbnRleHQoKSBjb25zdAoreworICAgIENH Q29udGV4dEZsdXNoKG1fY29udGV4dC0+cGxhdGZvcm1Db250ZXh0KCkpOworI2lmICFQTEFURk9S TShJT1MpICYmIF9fTUFDX09TX1hfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPT0gMTA3MAorICAgIG1f ZGF0YS5tX2xhc3RGbHVzaFRpbWUgPSBjdXJyZW50VGltZU1TKCk7CisjZW5kaWYKIH0KIAogUGFz c1JlZlB0cjxJbWFnZT4gSW1hZ2VCdWZmZXI6OmNvcHlJbWFnZShCYWNraW5nU3RvcmVDb3B5IGNv cHlCZWhhdmlvciwgU2NhbGVCZWhhdmlvciBzY2FsZUJlaGF2aW9yKSBjb25zdApAQCAtMzEyLDIz ICszMjMsMTcgQEAgdm9pZCBJbWFnZUJ1ZmZlcjo6Y2xpcChHcmFwaGljc0NvbnRleHQqIGNvbnRl eHRUb0NsaXAsIGNvbnN0IEZsb2F0UmVjdCYgcmVjdCkgY28KIAogUGFzc1JlZlB0cjxVaW50OENs YW1wZWRBcnJheT4gSW1hZ2VCdWZmZXI6OmdldFVubXVsdGlwbGllZEltYWdlRGF0YShjb25zdCBJ bnRSZWN0JiByZWN0LCBDb29yZGluYXRlU3lzdGVtIGNvb3JkaW5hdGVTeXN0ZW0pIGNvbnN0CiB7 Ci0gICAgaWYgKG1fY29udGV4dC0+aXNBY2NlbGVyYXRlZENvbnRleHQoKSkgewotICAgICAgICBD R0NvbnRleHRGbHVzaChjb250ZXh0KCktPnBsYXRmb3JtQ29udGV4dCgpKTsKLSNpZiAhUExBVEZP Uk0oSU9TKSAmJiBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEID09IDEwNzAKLSAgICAg ICAgbV9kYXRhLm1fbGFzdEZsdXNoVGltZSA9IGN1cnJlbnRUaW1lTVMoKTsKLSNlbmRpZgotICAg IH0KKyAgICBpZiAobV9jb250ZXh0LT5pc0FjY2VsZXJhdGVkQ29udGV4dCgpKQorICAgICAgICBm bHVzaENvbnRleHQoKTsKKwogICAgIHJldHVybiBtX2RhdGEuZ2V0RGF0YShyZWN0LCBpbnRlcm5h bFNpemUoKSwgbV9jb250ZXh0LT5pc0FjY2VsZXJhdGVkQ29udGV4dCgpLCB0cnVlLCBjb29yZGlu YXRlU3lzdGVtID09IExvZ2ljYWxDb29yZGluYXRlU3lzdGVtID8gbV9yZXNvbHV0aW9uU2NhbGUg OiAxKTsKIH0KIAogUGFzc1JlZlB0cjxVaW50OENsYW1wZWRBcnJheT4gSW1hZ2VCdWZmZXI6Omdl dFByZW11bHRpcGxpZWRJbWFnZURhdGEoY29uc3QgSW50UmVjdCYgcmVjdCwgQ29vcmRpbmF0ZVN5 c3RlbSBjb29yZGluYXRlU3lzdGVtKSBjb25zdAogewotICAgIGlmIChtX2NvbnRleHQtPmlzQWNj ZWxlcmF0ZWRDb250ZXh0KCkpIHsKLSAgICAgICAgQ0dDb250ZXh0Rmx1c2goY29udGV4dCgpLT5w bGF0Zm9ybUNvbnRleHQoKSk7Ci0jaWYgIVBMQVRGT1JNKElPUykgJiYgX19NQUNfT1NfWF9WRVJT SU9OX01JTl9SRVFVSVJFRCA9PSAxMDcwCi0gICAgICAgIG1fZGF0YS5tX2xhc3RGbHVzaFRpbWUg PSBjdXJyZW50VGltZU1TKCk7Ci0jZW5kaWYKLSAgICB9CisgICAgaWYgKG1fY29udGV4dC0+aXNB Y2NlbGVyYXRlZENvbnRleHQoKSkKKyAgICAgICAgZmx1c2hDb250ZXh0KCk7CisKICAgICByZXR1 cm4gbV9kYXRhLmdldERhdGEocmVjdCwgaW50ZXJuYWxTaXplKCksIG1fY29udGV4dC0+aXNBY2Nl bGVyYXRlZENvbnRleHQoKSwgZmFsc2UsIGNvb3JkaW5hdGVTeXN0ZW0gPT0gTG9naWNhbENvb3Jk aW5hdGVTeXN0ZW0gPyBtX3Jlc29sdXRpb25TY2FsZSA6IDEpOwogfQogCkBAIC00NDYsNiArNDUx LDkgQEAgU3RyaW5nIEltYWdlQnVmZmVyOjp0b0RhdGFVUkwoY29uc3QgU3RyaW5nJiBtaW1lVHlw ZSwgY29uc3QgZG91YmxlKiBxdWFsaXR5LCBDb28KIHsKICAgICBBU1NFUlQoTUlNRVR5cGVSZWdp c3RyeTo6aXNTdXBwb3J0ZWRJbWFnZU1JTUVUeXBlRm9yRW5jb2RpbmcobWltZVR5cGUpKTsKIAor ICAgIGlmIChtX2NvbnRleHQtPmlzQWNjZWxlcmF0ZWRDb250ZXh0KCkpCisgICAgICAgIGZsdXNo Q29udGV4dCgpOworCiAgICAgUmV0YWluUHRyPENGU3RyaW5nUmVmPiB1dGkgPSB1dGlGcm9tTUlN RVR5cGUobWltZVR5cGUpOwogICAgIEFTU0VSVCh1dGkpOwogCmRpZmYgLS1naXQgYS9MYXlvdXRU ZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggYTZjY2QwY2EyMDA5 NmJmYTMyOTEzZjMwNzcxNGEzOWQ3ZTA0ZWQ3OC4uODE4NjU3ZTVjODdkZWQ4ZThmMTE0NzE0YWY4 NTEwYjliMTFiM2RlNiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xh eW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEzLTA1LTEzICBEZWFuIEph Y2tzb24gIDxkaW5vQGFwcGxlLmNvbT4KKworICAgICAgICB0b0RhdGFVUkwgY2FuIHJldHVybiBh biBlbXB0eSBpbWFnZSBpbiBzb21lIGNhc2VzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMTU5ODEKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzEzNzYw MjU2PgorCisgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgorCisgICAgICAgIE1ha2Ug c3VyZSB0aGF0IGEgY2FudmFzIHdpdGggY29udGVudCBpcyBub3QgdGhlIHNhbWUgYXMgb25lCisg ICAgICAgIHdpdGhvdXQgY29udGVudC4KKworICAgICAgICAqIGZhc3QvY2FudmFzL3RvRGF0YVVS TC1ub3QtZW1wdHktZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L2NhbnZhcy90 b0RhdGFVUkwtbm90LWVtcHR5Lmh0bWw6IEFkZGVkLgorCiAyMDEzLTA1LTEwICBEZWFuIEphY2tz b24gIDxkaW5vQGFwcGxlLmNvbT4KIAogICAgICAgICBJbmNsdWRlIHRhYiBjaGFyYWN0ZXIgYXMg YSB3b3JkIGVuZCBmb3Iga2VybmluZwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9jYW52 YXMvdG9EYXRhVVJMLW5vdC1lbXB0eS1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9mYXN0L2Nh bnZhcy90b0RhdGFVUkwtbm90LWVtcHR5LWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0 NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi43ZWYyMmU5 YTQzMWFkMDI3MjcxM2I3MWZkYzg3OTQwMTZjOGVmMTJmCi0tLSAvZGV2L251bGwKKysrIGIvTGF5 b3V0VGVzdHMvZmFzdC9jYW52YXMvdG9EYXRhVVJMLW5vdC1lbXB0eS1leHBlY3RlZC50eHQKQEAg LTAsMCArMSBAQAorUEFTUwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9jYW52YXMvdG9E YXRhVVJMLW5vdC1lbXB0eS5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9jYW52YXMvdG9EYXRhVVJM LW5vdC1lbXB0eS5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmI5Mjc0M2QzNDI3N2U3MDQ1NWExYmE3ZmFkNDEx ODlkMjRjNDU5MjYKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2NhbnZhcy90 b0RhdGFVUkwtbm90LWVtcHR5Lmh0bWwKQEAgLTAsMCArMSwyNiBAQAorPHNjcmlwdD4KK2lmICh3 aW5kb3cudGVzdFJ1bm5lcikKKyAgICB0ZXN0UnVubmVyLmR1bXBBc1RleHQoKTsKKword2luZG93 LmFkZEV2ZW50TGlzdGVuZXIoIkRPTUNvbnRlbnRMb2FkZWQiLCBmdW5jdGlvbigpIHsKKyAgICB2 YXIgY2FudmFzID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiY2FudmFzIik7CisgICAgY2FudmFz LndpZHRoID0gMTAwOworICAgIGNhbnZhcy5oZWlnaHQgPSAxMDA7CisKKyAgICB2YXIgY3R4ID0g Y2FudmFzLmdldENvbnRleHQoIjJkIik7CisgICAgY3R4LmZpbGxTdHlsZSA9ICJyZWQiOworICAg IGN0eC5maWxsUmVjdCgwLCAwLCAxMDAsIDEwMCk7CisKKyAgICB2YXIgZGF0YTEgPSBjYW52YXMu dG9EYXRhVVJMKCk7CisKKyAgICBjYW52YXMgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJjYW52 YXMiKTsKKyAgICBjYW52YXMud2lkdGggPSAxMDA7CisgICAgY2FudmFzLmhlaWdodCA9IDEwMDsK KworICAgIGN0eCA9IGNhbnZhcy5nZXRDb250ZXh0KCIyZCIpOworCisgICAgdmFyIGRhdGEyID0g Y2FudmFzLnRvRGF0YVVSTCgpOworCisgICAgZG9jdW1lbnQuYm9keS5hcHBlbmRDaGlsZChkb2N1 bWVudC5jcmVhdGVUZXh0Tm9kZSgoZGF0YTEgPT0gZGF0YTIpID8gIkZBSUwiIDogIlBBU1MiKSk7 Cit9KTsKKzwvc2NyaXB0Pgo=