89797 2012-06-22 17:10:28 -0700 [chromium] Add the workaround of IOSurface-related corruption during readback on Mac OS X. 2012-06-26 11:01:50 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Mac OS X 10.6 RESOLVED FIXED P2 Normal --- 0 mazda webkit-unassigned cc-bugs jamesr kbr simon.fraser webkit.review.bot oldest_to_newest 655944 0 mazda 2012-06-22 17:10:28 -0700 In https://bugs.webkit.org/show_bug.cgi?id=79735, a workaround of IOSurface-related corruption during readback was added for Mac OS X 10.7. While looking into the thumbnail corruption in Chromium (http://code.google.com/p/chromium/issues/detail?id=132000), it turned out this work around is needed for 10.6.8 as well. 655972 1 149149 mazda 2012-06-22 18:15:47 -0700 Created attachment 149149 Patch 656000 2 149149 jamesr 2012-06-22 19:30:27 -0700 Comment on attachment 149149 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=149149&action=review > Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp:1368 > + // On Mac OS X 10.6.8+, calling glReadPixels against an FBO whose color attachment is an do we know that this is broke from 1.6.7 -> 1.6.8? Should we just do this unconditionally on mac? 656169 3 149149 kbr 2012-06-23 23:15:11 -0700 Comment on attachment 149149 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=149149&action=review >> Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp:1368 >> + // On Mac OS X 10.6.8+, calling glReadPixels against an FBO whose color attachment is an > > do we know that this is broke from 1.6.7 -> 1.6.8? Should we just do this unconditionally on mac? I doubt that that is known for sure. Agree, we should just do this on all OS versions now -- it's OK to leave the function needsIOSurfaceReadbackWorkaround, but let's just make it unconditionally return true (IOSurfaces were introduced in 10.6, so it looks like we need the workaround all the time for now, unless we can confirm the issue was fixed in 10.8). 656839 4 149354 mazda 2012-06-25 14:05:57 -0700 Created attachment 149354 Patch 656841 5 149354 jamesr 2012-06-25 14:06:46 -0700 Comment on attachment 149354 Patch R=me 657108 6 149354 webkit.review.bot 2012-06-25 18:17:32 -0700 Comment on attachment 149354 Patch Rejecting attachment 149354 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 2 Last 500 characters of output: t/git/webkit-commit-queue/Source/WebKit/chromium/v8 --revision 11844 --non-interactive --force --accept theirs-conflict --ignore-externals' in '/mnt/git/webkit-commit-queue/Source/WebKit/chromium' 47>At revision 11844. ________ running '/usr/bin/python tools/clang/scripts/update.py --mac-only' in '/mnt/git/webkit-commit-queue/Source/WebKit/chromium' ________ running '/usr/bin/python gyp_webkit' in '/mnt/git/webkit-commit-queue/Source/WebKit/chromium' Updating webkit projects from gyp files... Full output: http://queues.webkit.org/results/13093297 657117 7 jamesr 2012-06-25 18:20:52 -0700 Oh, I probably gave you merge conflicts with http://trac.webkit.org/changeset/121204. Would you mind rebasing your patch and re-uploading? 657129 8 149418 mazda 2012-06-25 18:29:42 -0700 Created attachment 149418 Patch 657135 9 mazda 2012-06-25 18:35:40 -0700 (In reply to comment #7) > Oh, I probably gave you merge conflicts with http://trac.webkit.org/changeset/121204. Would you mind rebasing your patch and re-uploading? Resolved the conflict and uploaded a new patch. Could you set commit-queue flag again if it looks good? 657726 10 149418 webkit.review.bot 2012-06-26 10:57:07 -0700 Comment on attachment 149418 Patch Clearing flags on attachment: 149418 Committed r121267: <http://trac.webkit.org/changeset/121267> 657728 11 webkit.review.bot 2012-06-26 10:57:28 -0700 All reviewed patches have been landed. Closing bug. 657732 12 simon.fraser 2012-06-26 10:59:11 -0700 Did you file a radar on the IOSurface issue? What's the radar number? 657736 13 jamesr 2012-06-26 11:01:50 -0700 (In reply to comment #12) > Did you file a radar on the IOSurface issue? What's the radar number? From the inline comment: "http://crbug.com/99393. <rdar://problem/10949687>" 149149 2012-06-22 18:15:47 -0700 2012-06-25 14:05:50 -0700 Patch bug-89797-20120622181546.patch text/plain 2657 mazda U3VidmVyc2lvbiBSZXZpc2lvbjogMTIxMDc3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWJmOGI4NTdjZDU2YjVh YmJkNTdhM2M5NmEyNTk5MDM2N2I0YzdlZC4uZmQyMmYxMGExNmMxMmIyODhmMTM5ZTNhMjlmMjIx MTBkZDcwM2ZkNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEyLTA2LTIyICBZYXN1 aGlybyBNYXRzdWRhICA8bWF6ZGFAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtjaHJvbWl1bV0g QWRkIHRoZSB3b3JrYXJvdW5kIG9mIElPU3VyZmFjZS1yZWxhdGVkIGNvcnJ1cHRpb24gZHVyaW5n IHJlYWRiYWNrIGZvciBNYWMgT1MgWCAxMC42LjgKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTg5Nzk3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLiBUaGlzIHBhdGNoIGRvZXNuJ3QgY2hh bmdlIGJlaGF2aW9yLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5 ZXJSZW5kZXJlckNocm9taXVtLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheWVyUmVuZGVyZXJD aHJvbWl1bTo6Z2V0RnJhbWVidWZmZXJQaXhlbHMpOgorCiAyMDEyLTA2LTIyICBKYW1lcyBSb2Jp bnNvbiAgPGphbWVzckBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW2Nocm9taXVtXSBMYXllclJl bmRlcmVyQ2hyb21pdW0gaXMgbm90IGdldHRpbmcgdmlzaWJpbGl0eSBtZXNzYWdlcyBpbiBzaW5n bGUgdGhyZWFkZWQgY29tcG9zaXRpbmcgbW9kZS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVyUmVuZGVyZXJDaHJvbWl1bS5jcHAgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllclJlbmRlcmVyQ2hy b21pdW0uY3BwCmluZGV4IDU5NWNhZTJlOTI4OTNiYTA3NTNiM2M3NDRiMGNiZWIyY2U2OTg2MDku LjgxZjQ0MTEyZWVlZDExM2FhZTE3NDkxNGUyZDU2ZjQzY2QxZWZlZTMgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVyUmVuZGVyZXJDaHJv bWl1bS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0v TGF5ZXJSZW5kZXJlckNocm9taXVtLmNwcApAQCAtMTMxLDcgKzEzMSw3IEBAIGJvb2wgY29udGV4 dFN1cHBvcnRzQWNjZWxlcmF0ZWRQYWludGluZyhHcmFwaGljc0NvbnRleHQzRCogY29udGV4dCkK ICAgICByZXR1cm4gdHJ1ZTsKIH0KIAotYm9vbCBuZWVkc0xpb25JT1N1cmZhY2VSZWFkYmFja1dv cmthcm91bmQoKQorYm9vbCBuZWVkc0lPU3VyZmFjZVJlYWRiYWNrV29ya2Fyb3VuZCgpCiB7CiAj aWYgT1MoREFSV0lOKQogICAgIHN0YXRpYyBTSW50MzIgc3lzdGVtVmVyc2lvbiA9IDA7CkBAIC0x NDAsNyArMTQwLDcgQEAgYm9vbCBuZWVkc0xpb25JT1N1cmZhY2VSZWFkYmFja1dvcmthcm91bmQo KQogICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0KIAotICAgIHJldHVybiBzeXN0ZW1W ZXJzaW9uID49IDB4MTA3MDsKKyAgICByZXR1cm4gc3lzdGVtVmVyc2lvbiA+PSAweDEwNjg7CiAj ZWxzZQogICAgIHJldHVybiBmYWxzZTsKICNlbmRpZgpAQCAtMTM1OCwxNCArMTM1OCwxNCBAQCB2 b2lkIExheWVyUmVuZGVyZXJDaHJvbWl1bTo6Z2V0RnJhbWVidWZmZXJQaXhlbHModm9pZCAqcGl4 ZWxzLCBjb25zdCBJbnRSZWN0JiByZQogCiAgICAgbWFrZUNvbnRleHRDdXJyZW50KCk7CiAKLSAg ICBib29sIGRvV29ya2Fyb3VuZCA9IG5lZWRzTGlvbklPU3VyZmFjZVJlYWRiYWNrV29ya2Fyb3Vu ZCgpOworICAgIGJvb2wgZG9Xb3JrYXJvdW5kID0gbmVlZHNJT1N1cmZhY2VSZWFkYmFja1dvcmth cm91bmQoKTsKIAogICAgIFBsYXRmb3JtM0RPYmplY3QgdGVtcG9yYXJ5VGV4dHVyZSA9IE51bGxQ bGF0Zm9ybTNET2JqZWN0OwogICAgIFBsYXRmb3JtM0RPYmplY3QgdGVtcG9yYXJ5RkJPID0gTnVs bFBsYXRmb3JtM0RPYmplY3Q7CiAgICAgR3JhcGhpY3NDb250ZXh0M0QqIGNvbnRleHQgPSBtX2Nv bnRleHQuZ2V0KCk7CiAKICAgICBpZiAoZG9Xb3JrYXJvdW5kKSB7Ci0gICAgICAgIC8vIE9uIE1h YyBPUyBYIDEwLjcsIGNhbGxpbmcgZ2xSZWFkUGl4ZWxzIGFnYWluc3QgYW4gRkJPIHdob3NlIGNv bG9yIGF0dGFjaG1lbnQgaXMgYW4KKyAgICAgICAgLy8gT24gTWFjIE9TIFggMTAuNi44KywgY2Fs bGluZyBnbFJlYWRQaXhlbHMgYWdhaW5zdCBhbiBGQk8gd2hvc2UgY29sb3IgYXR0YWNobWVudCBp cyBhbgogICAgICAgICAvLyBJT1N1cmZhY2UtYmFja2VkIHRleHR1cmUgY2F1c2VzIGNvcnJ1cHRp b24gb2YgZnV0dXJlIGdsUmVhZFBpeGVscyBjYWxscywgZXZlbiB0aG9zZSBvbgogICAgICAgICAv LyBkaWZmZXJlbnQgT3BlbkdMIGNvbnRleHRzLiBJdCBpcyBiZWxpZXZlZCB0aGF0IHRoaXMgaXMg dGhlIHJvb3QgY2F1c2Ugb2YgdG9wIGNyYXNoZXIKICAgICAgICAgLy8gaHR0cDovL2NyYnVnLmNv bS85OTM5My4gPHJkYXI6Ly9wcm9ibGVtLzEwOTQ5Njg3Pgo= 149354 2012-06-25 14:05:57 -0700 2012-06-25 18:29:37 -0700 Patch bug-89797-20120625140556.patch text/plain 2621 mazda U3VidmVyc2lvbiBSZXZpc2lvbjogMTIxMTU4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjNmMTUxNDlhOWQ4ODVl OTgxYTBkMDBkNTRjNTI2NGM4YWE5YTEzNC4uYmY5NjAyMzk5ZTcxYzQ0MzU5MWJkNTkwODdlZjIw Mzk3NDkyN2VlYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEyLTA2LTIyICBZYXN1 aGlybyBNYXRzdWRhICA8bWF6ZGFAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtjaHJvbWl1bV0g QWRkIHRoZSB3b3JrYXJvdW5kIG9mIElPU3VyZmFjZS1yZWxhdGVkIGNvcnJ1cHRpb24gZHVyaW5n IHJlYWRiYWNrIG9uIE1hYyBPUyBYLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9ODk3OTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBObyBuZXcgdGVzdHMuIFRoaXMgcGF0Y2ggZG9lc24ndCBjaGFuZ2UgYmVo YXZpb3IuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllclJlbmRl cmVyQ2hyb21pdW0uY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5ZXJSZW5kZXJlckNocm9taXVt OjpnZXRGcmFtZWJ1ZmZlclBpeGVscyk6CisKIDIwMTItMDYtMjUgIFBhdmVsIEZlbGRtYW4gIDxw ZmVsZG1hbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogdG9nZ2xpbmcg c3R5bGUgc2hvdWxkIG5vdCBzdGFydCBwcm9wZXJ0eSBlZGl0IGZpcnN0LgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJSZW5kZXJlckNo cm9taXVtLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xh eWVyUmVuZGVyZXJDaHJvbWl1bS5jcHAKaW5kZXggNTk1Y2FlMmU5Mjg5M2JhMDc1M2IzYzc0NGIw Y2JlYjJjZTY5ODYwOS4uZGY4NjNhNjBhMzNlNTczYTc4NDAwYzA4MzNjNjE3MjJjMGI1MDc1NiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5 ZXJSZW5kZXJlckNocm9taXVtLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9jaHJvbWl1bS9MYXllclJlbmRlcmVyQ2hyb21pdW0uY3BwCkBAIC0xMzEsMTYgKzEzMSwx MCBAQCBib29sIGNvbnRleHRTdXBwb3J0c0FjY2VsZXJhdGVkUGFpbnRpbmcoR3JhcGhpY3NDb250 ZXh0M0QqIGNvbnRleHQpCiAgICAgcmV0dXJuIHRydWU7CiB9CiAKLWJvb2wgbmVlZHNMaW9uSU9T dXJmYWNlUmVhZGJhY2tXb3JrYXJvdW5kKCkKK2Jvb2wgbmVlZHNJT1N1cmZhY2VSZWFkYmFja1dv cmthcm91bmQoKQogewogI2lmIE9TKERBUldJTikKLSAgICBzdGF0aWMgU0ludDMyIHN5c3RlbVZl cnNpb24gPSAwOwotICAgIGlmICghc3lzdGVtVmVyc2lvbikgewotICAgICAgICBpZiAoR2VzdGFs dChnZXN0YWx0U3lzdGVtVmVyc2lvbiwgJnN5c3RlbVZlcnNpb24pICE9IG5vRXJyKQotICAgICAg ICAgICAgcmV0dXJuIGZhbHNlOwotICAgIH0KLQotICAgIHJldHVybiBzeXN0ZW1WZXJzaW9uID49 IDB4MTA3MDsKKyAgICByZXR1cm4gdHJ1ZTsKICNlbHNlCiAgICAgcmV0dXJuIGZhbHNlOwogI2Vu ZGlmCkBAIC0xMzU4LDE0ICsxMzUyLDE0IEBAIHZvaWQgTGF5ZXJSZW5kZXJlckNocm9taXVtOjpn ZXRGcmFtZWJ1ZmZlclBpeGVscyh2b2lkICpwaXhlbHMsIGNvbnN0IEludFJlY3QmIHJlCiAKICAg ICBtYWtlQ29udGV4dEN1cnJlbnQoKTsKIAotICAgIGJvb2wgZG9Xb3JrYXJvdW5kID0gbmVlZHNM aW9uSU9TdXJmYWNlUmVhZGJhY2tXb3JrYXJvdW5kKCk7CisgICAgYm9vbCBkb1dvcmthcm91bmQg PSBuZWVkc0lPU3VyZmFjZVJlYWRiYWNrV29ya2Fyb3VuZCgpOwogCiAgICAgUGxhdGZvcm0zRE9i amVjdCB0ZW1wb3JhcnlUZXh0dXJlID0gTnVsbFBsYXRmb3JtM0RPYmplY3Q7CiAgICAgUGxhdGZv cm0zRE9iamVjdCB0ZW1wb3JhcnlGQk8gPSBOdWxsUGxhdGZvcm0zRE9iamVjdDsKICAgICBHcmFw aGljc0NvbnRleHQzRCogY29udGV4dCA9IG1fY29udGV4dC5nZXQoKTsKIAogICAgIGlmIChkb1dv cmthcm91bmQpIHsKLSAgICAgICAgLy8gT24gTWFjIE9TIFggMTAuNywgY2FsbGluZyBnbFJlYWRQ aXhlbHMgYWdhaW5zdCBhbiBGQk8gd2hvc2UgY29sb3IgYXR0YWNobWVudCBpcyBhbgorICAgICAg ICAvLyBPbiBNYWMgT1MgWCwgY2FsbGluZyBnbFJlYWRQaXhlbHMgYWdhaW5zdCBhbiBGQk8gd2hv c2UgY29sb3IgYXR0YWNobWVudCBpcyBhbgogICAgICAgICAvLyBJT1N1cmZhY2UtYmFja2VkIHRl eHR1cmUgY2F1c2VzIGNvcnJ1cHRpb24gb2YgZnV0dXJlIGdsUmVhZFBpeGVscyBjYWxscywgZXZl biB0aG9zZSBvbgogICAgICAgICAvLyBkaWZmZXJlbnQgT3BlbkdMIGNvbnRleHRzLiBJdCBpcyBi ZWxpZXZlZCB0aGF0IHRoaXMgaXMgdGhlIHJvb3QgY2F1c2Ugb2YgdG9wIGNyYXNoZXIKICAgICAg ICAgLy8gaHR0cDovL2NyYnVnLmNvbS85OTM5My4gPHJkYXI6Ly9wcm9ibGVtLzEwOTQ5Njg3Pgo= 149418 2012-06-25 18:29:42 -0700 2012-06-26 10:57:06 -0700 Patch bug-89797-20120625182942.patch text/plain 2564 mazda U3VidmVyc2lvbiBSZXZpc2lvbjogMTIxMjA2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDNiMDJhNTE3MGY5YjAz ODcxMDQ4MjM3Y2I4N2Q2YTZjODFkMjg2OC4uNDk5OTA2YWU4MDc1Y2I3YTI1MjdmM2E0NTZkNWVh MDM3M2I2ZWFiNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEyLTA2LTIyICBZYXN1 aGlybyBNYXRzdWRhICA8bWF6ZGFAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtjaHJvbWl1bV0g QWRkIHRoZSB3b3JrYXJvdW5kIG9mIElPU3VyZmFjZS1yZWxhdGVkIGNvcnJ1cHRpb24gZHVyaW5n IHJlYWRiYWNrIG9uIE1hYyBPUyBYLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9ODk3OTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBObyBuZXcgdGVzdHMuIFRoaXMgcGF0Y2ggZG9lc24ndCBjaGFuZ2UgYmVo YXZpb3IuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllclJlbmRl cmVyQ2hyb21pdW0uY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5ZXJSZW5kZXJlckNocm9taXVt OjpnZXRGcmFtZWJ1ZmZlclBpeGVscyk6CisKIDIwMTItMDYtMjUgIEpheSBDaXZlbGxpICA8amNp dmVsbGlAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIEZpeCBwcm9ncmVzcyBsb2FkIHJlcG9ydGlu ZyBmb3IgTUhUTUwgZG9jdW1lbnRzLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJSZW5kZXJlckNocm9taXVtLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVyUmVuZGVyZXJDaHJvbWl1bS5j cHAKaW5kZXggMjYyNGMwZTkxMDI3NzViOGQzNTIzODIzYWIwNjhiMWIxMmNkOGM0Yy4uY2EyZDE5 MDJhNjdkZTg1YmRlNTI1YjYyYTU1Y2FkZmZhNzBhNWI3NyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJSZW5kZXJlckNocm9taXVtLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllclJl bmRlcmVyQ2hyb21pdW0uY3BwCkBAIC0xMTUsMTYgKzExNSwxMCBAQCBzdGF0aWMgV2ViVHJhbnNm b3JtYXRpb25NYXRyaXggc2NyZWVuTWF0cml4KGludCB4LCBpbnQgeSwgaW50IHdpZHRoLCBpbnQg aGVpZ2h0KQogICAgIHJldHVybiBzY3JlZW47CiB9CiAKLWJvb2wgbmVlZHNMaW9uSU9TdXJmYWNl UmVhZGJhY2tXb3JrYXJvdW5kKCkKK2Jvb2wgbmVlZHNJT1N1cmZhY2VSZWFkYmFja1dvcmthcm91 bmQoKQogewogI2lmIE9TKERBUldJTikKLSAgICBzdGF0aWMgU0ludDMyIHN5c3RlbVZlcnNpb24g PSAwOwotICAgIGlmICghc3lzdGVtVmVyc2lvbikgewotICAgICAgICBpZiAoR2VzdGFsdChnZXN0 YWx0U3lzdGVtVmVyc2lvbiwgJnN5c3RlbVZlcnNpb24pICE9IG5vRXJyKQotICAgICAgICAgICAg cmV0dXJuIGZhbHNlOwotICAgIH0KLQotICAgIHJldHVybiBzeXN0ZW1WZXJzaW9uID49IDB4MTA3 MDsKKyAgICByZXR1cm4gdHJ1ZTsKICNlbHNlCiAgICAgcmV0dXJuIGZhbHNlOwogI2VuZGlmCkBA IC0xMjYwLDEzICsxMjU0LDEzIEBAIHZvaWQgTGF5ZXJSZW5kZXJlckNocm9taXVtOjpnZXRGcmFt ZWJ1ZmZlclBpeGVscyh2b2lkICpwaXhlbHMsIGNvbnN0IEludFJlY3QmIHJlCiAKICAgICBtYWtl Q29udGV4dEN1cnJlbnQoKTsKIAotICAgIGJvb2wgZG9Xb3JrYXJvdW5kID0gbmVlZHNMaW9uSU9T dXJmYWNlUmVhZGJhY2tXb3JrYXJvdW5kKCk7CisgICAgYm9vbCBkb1dvcmthcm91bmQgPSBuZWVk c0lPU3VyZmFjZVJlYWRiYWNrV29ya2Fyb3VuZCgpOwogCiAgICAgUGxhdGZvcm0zRE9iamVjdCB0 ZW1wb3JhcnlUZXh0dXJlID0gTnVsbFBsYXRmb3JtM0RPYmplY3Q7CiAgICAgUGxhdGZvcm0zRE9i amVjdCB0ZW1wb3JhcnlGQk8gPSBOdWxsUGxhdGZvcm0zRE9iamVjdDsKIAogICAgIGlmIChkb1dv cmthcm91bmQpIHsKLSAgICAgICAgLy8gT24gTWFjIE9TIFggMTAuNywgY2FsbGluZyBnbFJlYWRQ aXhlbHMgYWdhaW5zdCBhbiBGQk8gd2hvc2UgY29sb3IgYXR0YWNobWVudCBpcyBhbgorICAgICAg ICAvLyBPbiBNYWMgT1MgWCwgY2FsbGluZyBnbFJlYWRQaXhlbHMgYWdhaW5zdCBhbiBGQk8gd2hv c2UgY29sb3IgYXR0YWNobWVudCBpcyBhbgogICAgICAgICAvLyBJT1N1cmZhY2UtYmFja2VkIHRl eHR1cmUgY2F1c2VzIGNvcnJ1cHRpb24gb2YgZnV0dXJlIGdsUmVhZFBpeGVscyBjYWxscywgZXZl biB0aG9zZSBvbgogICAgICAgICAvLyBkaWZmZXJlbnQgT3BlbkdMIGNvbnRleHRzLiBJdCBpcyBi ZWxpZXZlZCB0aGF0IHRoaXMgaXMgdGhlIHJvb3QgY2F1c2Ugb2YgdG9wIGNyYXNoZXIKICAgICAg ICAgLy8gaHR0cDovL2NyYnVnLmNvbS85OTM5My4gPHJkYXI6Ly9wcm9ibGVtLzEwOTQ5Njg3Pgo=