86919 2012-05-18 16:10:40 -0700 Don't force rendering in finishAllRendering 2012-05-21 15:57:11 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 piman piman cc-bugs danakj enne jamesr jbates levin+threading nduca vollick webkit.review.bot oldest_to_newest 628214 0 piman 2012-05-18 16:10:40 -0700 Don't force rendering in finishAllRendering 628227 1 142816 piman 2012-05-18 16:19:07 -0700 Created attachment 142816 Patch 628240 2 webkit.review.bot 2012-05-18 16:30:35 -0700 Attachment 142816 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCor..." exit_code: 1 Source/WebCore/ChangeLog:8: You should remove the 'No new tests' and either add and list tests, or explain why no new tests were possible. [changelog/nonewtests] [5] Total errors found: 1 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 628241 3 142816 danakj 2012-05-18 16:32:46 -0700 Comment on attachment 142816 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=142816&action=review > Source/WebCore/ChangeLog:7 > + Can you explain why here? 628291 4 142816 jamesr 2012-05-18 17:38:46 -0700 Comment on attachment 142816 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=142816&action=review Yes! >> Source/WebCore/ChangeLog:8 >> + No new tests. (OOPS!) > > You should remove the 'No new tests' and either add and list tests, or explain why no new tests were possible. [changelog/nonewtests] [5] You'll have to do this - might be simple enough to write a CCLayerTreeHostTest that hits this case. 628322 5 142840 piman 2012-05-18 18:18:01 -0700 Created attachment 142840 Patch 628609 6 142840 nduca 2012-05-20 12:12:07 -0700 Comment on attachment 142840 Patch We need to reconcile this with why this existed in the first place before we just go fixing the bug. This was added way back very specifically to prevent flash prevention when switching modes on Windows and OSX. You should check with @jbates to see if this will regress us in some way. EVen better, you could talk with John and figure out how to remove this flow entirely, since the only reason it exists is for flashes. I'm sure updateRect unification fixes this, as does a lot of the recent transport stuff. Let me know, but I'd like to understand the plan before we just remove this. 629233 7 piman 2012-05-21 10:20:08 -0700 +jbates. As discussed, this only affects the thread, which we're not shipping on any platform where we don't have forced compositing, so this will not introduce any flash on any platform we ship. I'm happy to remove the finish altogether if we can, but otherwise we need a way to fix this correctness issue (using a texture after it's been destroyed) 629322 8 enne 2012-05-21 11:45:46 -0700 (In reply to comment #7) > +jbates. > > As discussed, this only affects the thread, which we're not shipping on any platform where we don't have forced compositing, so this will not introduce any flash on any platform we ship. If you do land this, please add a blocking bug for http://crbug.com/128385 to fix the flash so that threaded compositing is not turned on for other platforms that may not have force compositing mode on. 629537 9 nduca 2012-05-21 14:55:41 -0700 Thanks Antoine for studying this. I know it was a pain to do. This seems sane to me, given the constraints. 629549 10 142840 jamesr 2012-05-21 15:01:48 -0700 Comment on attachment 142840 Patch Yeah, I'm not sure whether we really have a flash in threaded mode or not but I think it's safer to assume that we don't until proven otherwise. The finishAllRendering() call was added well before we got threaded mode up and running. 629654 11 142840 webkit.review.bot 2012-05-21 15:57:05 -0700 Comment on attachment 142840 Patch Clearing flags on attachment: 142840 Committed r117825: <http://trac.webkit.org/changeset/117825> 629655 12 webkit.review.bot 2012-05-21 15:57:11 -0700 All reviewed patches have been landed. Closing bug. 142816 2012-05-18 16:19:07 -0700 2012-05-18 18:17:58 -0700 Patch bug-86919-20120518161906.patch text/plain 2922 piman U3VidmVyc2lvbiBSZXZpc2lvbjogMTE3NjQ4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODNkN2QzNmE3YWUyOTk0 MzQxNjYzNzAwNzI2OWVmZWE5Zjc2MzA3My4uNTVkZTAwOGNhNGYzZGU4MmEyYTg1N2VlMzc4YTdm OTgzMmE1M2IzOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEyLTA1LTE4ICBBbnRv aW5lIExhYm91ciAgPHBpbWFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBEb24ndCBmb3JjZSBy ZW5kZXJpbmcgaW4gZmluaXNoQWxsUmVuZGVyaW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NjkxOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cy4gKE9PUFMhKQorCisgICAgICAgICog cGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NUaHJlYWRQcm94eS5jcHA6CisgICAgICAg IChXZWJDb3JlOjpDQ1RocmVhZFByb3h5OjpDQ1RocmVhZFByb3h5KToKKyAgICAgICAgKFdlYkNv cmU6OkNDVGhyZWFkUHJveHk6OmZpbmlzaEFsbFJlbmRlcmluZ09uSW1wbFRocmVhZCk6CisgICAg ICAgIChXZWJDb3JlOjpDQ1RocmVhZFByb3h5OjpzY2hlZHVsZWRBY3Rpb25EcmF3QW5kU3dhcElu dGVybmFsKToKKwogMjAxMi0wNC0yNyAgRmlsaXAgUGl6bG8gIDxmcGl6bG9AYXBwbGUuY29tPgog CiAgICAgICAgIERGRyBzaG91bGQgaGF2ZSBjb250cm9sIGZsb3cgZ3JhcGggc2ltcGxpZmljYXRp b24KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVt L2NjL0NDVGhyZWFkUHJveHkuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Y2hyb21pdW0vY2MvQ0NUaHJlYWRQcm94eS5jcHAKaW5kZXggN2E2YWJjNGQ4YTU4Y2UwMmNjODEx MTllMjcwMDJiY2UxZmU3OTdjOS4uNjJkYzAyMzJmN2ZjNThmYTQ0ODM4OTQxOWU4NTA4YjI1NTI1 MzdjNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21p dW0vY2MvQ0NUaHJlYWRQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvY2hyb21pdW0vY2MvQ0NUaHJlYWRQcm94eS5jcHAKQEAgLTgxLDcgKzgxLDYgQEAgQ0NU aHJlYWRQcm94eTo6Q0NUaHJlYWRQcm94eShDQ0xheWVyVHJlZUhvc3QqIGxheWVyVHJlZUhvc3Qp CiAgICAgLCBtX21haW5UaHJlYWRQcm94eShDQ1Njb3BlZFRocmVhZFByb3h5OjpjcmVhdGUoQ0NQ cm94eTo6bWFpblRocmVhZCgpKSkKICAgICAsIG1fYmVnaW5GcmFtZUNvbXBsZXRpb25FdmVudE9u SW1wbFRocmVhZCgwKQogICAgICwgbV9yZWFkYmFja1JlcXVlc3RPbkltcGxUaHJlYWQoMCkKLSAg ICAsIG1fZmluaXNoQWxsUmVuZGVyaW5nQ29tcGxldGlvbkV2ZW50T25JbXBsVGhyZWFkKDApCiAg ICAgLCBtX2NvbW1pdENvbXBsZXRpb25FdmVudE9uSW1wbFRocmVhZCgwKQogICAgICwgbV90ZXh0 dXJlQWNxdWlzaXRpb25Db21wbGV0aW9uRXZlbnRPbkltcGxUaHJlYWQoMCkKICAgICAsIG1fbmV4 dEZyYW1lSXNOZXdseUNvbW1pdHRlZEZyYW1lT25JbXBsVGhyZWFkKGZhbHNlKQpAQCAtNDMxLDEw ICs0MzAsOCBAQCB2b2lkIENDVGhyZWFkUHJveHk6OmZpbmlzaEFsbFJlbmRlcmluZ09uSW1wbFRo cmVhZChDQ0NvbXBsZXRpb25FdmVudCogY29tcGxldGlvbgogewogICAgIFRSQUNFX0VWRU5UKCJD Q1RocmVhZFByb3h5OjpmaW5pc2hBbGxSZW5kZXJpbmdPbkltcGxUaHJlYWQiLCB0aGlzLCAwKTsK ICAgICBBU1NFUlQoaXNJbXBsVGhyZWFkKCkpOwotICAgIEFTU0VSVCghbV9maW5pc2hBbGxSZW5k ZXJpbmdDb21wbGV0aW9uRXZlbnRPbkltcGxUaHJlYWQpOwotICAgIG1fZmluaXNoQWxsUmVuZGVy aW5nQ29tcGxldGlvbkV2ZW50T25JbXBsVGhyZWFkID0gY29tcGxldGlvbjsKLQotICAgIG1fc2No ZWR1bGVyT25JbXBsVGhyZWFkLT5zZXROZWVkc0ZvcmNlZFJlZHJhdygpOworICAgIG1fbGF5ZXJU cmVlSG9zdEltcGwtPmZpbmlzaEFsbFJlbmRlcmluZygpOworICAgIGNvbXBsZXRpb24tPnNpZ25h bCgpOwogfQogCiB2b2lkIENDVGhyZWFkUHJveHk6OmZvcmNlQmVnaW5GcmFtZU9uSW1wbFRocmVh ZChDQ0NvbXBsZXRpb25FdmVudCogY29tcGxldGlvbikKQEAgLTY2NSwxMyArNjYyLDYgQEAgQ0NT Y2hlZHVsZWRBY3Rpb25EcmF3QW5kU3dhcFJlc3VsdCBDQ1RocmVhZFByb3h5OjpzY2hlZHVsZWRB Y3Rpb25EcmF3QW5kU3dhcEludGUKICAgICBpZiAoZHJhd0ZyYW1lKQogICAgICAgICByZXN1bHQu ZGlkU3dhcCA9IG1fbGF5ZXJUcmVlSG9zdEltcGwtPnN3YXBCdWZmZXJzKCk7CiAKLSAgICAvLyBQ cm9jZXNzIGFueSBmaW5pc2ggcmVxdWVzdAotICAgIGlmIChtX2ZpbmlzaEFsbFJlbmRlcmluZ0Nv bXBsZXRpb25FdmVudE9uSW1wbFRocmVhZCkgewotICAgICAgICBtX2xheWVyVHJlZUhvc3RJbXBs LT5maW5pc2hBbGxSZW5kZXJpbmcoKTsKLSAgICAgICAgbV9maW5pc2hBbGxSZW5kZXJpbmdDb21w bGV0aW9uRXZlbnRPbkltcGxUaHJlYWQtPnNpZ25hbCgpOwotICAgICAgICBtX2ZpbmlzaEFsbFJl bmRlcmluZ0NvbXBsZXRpb25FdmVudE9uSW1wbFRocmVhZCA9IDA7Ci0gICAgfQotCiAgICAgLy8g VGVsbCB0aGUgbWFpbiB0aHJlYWQgdGhhdCB0aGUgdGhlIG5ld2x5LWNvbW1pdGVkIGZyYW1lIHdh cyBkcmF3bi4KICAgICBpZiAobV9uZXh0RnJhbWVJc05ld2x5Q29tbWl0dGVkRnJhbWVPbkltcGxU aHJlYWQpIHsKICAgICAgICAgbV9uZXh0RnJhbWVJc05ld2x5Q29tbWl0dGVkRnJhbWVPbkltcGxU aHJlYWQgPSBmYWxzZTsK 142840 2012-05-18 18:18:01 -0700 2012-05-21 15:57:05 -0700 Patch bug-86919-20120518181800.patch text/plain 7617 piman U3VidmVyc2lvbiBSZXZpc2lvbjogMTE3NjQ4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODNkN2QzNmE3YWUyOTk0 MzQxNjYzNzAwNzI2OWVmZWE5Zjc2MzA3My4uODlhYTA3ZDQ3NDI1MjMzMDM2MTg4ZDcxM2Y4ZGJh NTIzNzIzZWFmMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEyLTA1LTE4ICBBbnRv aW5lIExhYm91ciAgPHBpbWFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBEb24ndCBmb3JjZSBy ZW5kZXJpbmcgaW4gZmluaXNoQWxsUmVuZGVyaW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NjkxOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEFmdGVyIHdlIGFjcXVpcmUgdGhlIHRleHR1cmUgbGF5ZXJz IG9uIHRoZSBtYWluIHRocmVhZCwgd2UgY2FuJ3QgZHJhdy4KKyAgICAgICAgSW4gcGFydGljdWxh ciBpZiB3ZSBkZXN0cm95ZWQgdGhlIHRleHR1cmUgaWRzIHVzZWQgcHJldmlvdXNseSBieQorICAg ICAgICBUZXh0dXJlTGF5ZXJDaHJvbWl1bSwgZHJhd2luZyBiZWZvcmUgYSBjb21taXQgd291bGQg Y2F1c2UgYQorICAgICAgICBiaW5kLWFmdGVyLWRlc3Ryb3kuCisKKyAgICAgICAgVGVzdGVkIGJ5 IENDTGF5ZXJUcmVlSG9zdFRlc3RGaW5pc2hBbGxSZW5kZXJpbmcuCisKKyAgICAgICAgKiBwbGF0 Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ1RocmVhZFByb3h5LmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkNDVGhyZWFkUHJveHk6OkNDVGhyZWFkUHJveHkpOgorICAgICAgICAoV2ViQ29yZTo6 Q0NUaHJlYWRQcm94eTo6ZmluaXNoQWxsUmVuZGVyaW5nT25JbXBsVGhyZWFkKToKKyAgICAgICAg KFdlYkNvcmU6OkNDVGhyZWFkUHJveHk6OnNjaGVkdWxlZEFjdGlvbkRyYXdBbmRTd2FwSW50ZXJu YWwpOgorCiAyMDEyLTA0LTI3ICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CiAKICAg ICAgICAgREZHIHNob3VsZCBoYXZlIGNvbnRyb2wgZmxvdyBncmFwaCBzaW1wbGlmaWNhdGlvbgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2Mv Q0NUaHJlYWRQcm94eS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJv bWl1bS9jYy9DQ1RocmVhZFByb3h5LmNwcAppbmRleCA3YTZhYmM0ZDhhNThjZTAyY2M4MTExOWUy NzAwMmJjZTFmZTc5N2M5Li42MmRjMDIzMmY3ZmM1OGZhNDQ4Mzg5NDE5ZTg1MDhiMjU1MjUzN2M1 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9j Yy9DQ1RocmVhZFByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9jaHJvbWl1bS9jYy9DQ1RocmVhZFByb3h5LmNwcApAQCAtODEsNyArODEsNiBAQCBDQ1RocmVh ZFByb3h5OjpDQ1RocmVhZFByb3h5KENDTGF5ZXJUcmVlSG9zdCogbGF5ZXJUcmVlSG9zdCkKICAg ICAsIG1fbWFpblRocmVhZFByb3h5KENDU2NvcGVkVGhyZWFkUHJveHk6OmNyZWF0ZShDQ1Byb3h5 OjptYWluVGhyZWFkKCkpKQogICAgICwgbV9iZWdpbkZyYW1lQ29tcGxldGlvbkV2ZW50T25JbXBs VGhyZWFkKDApCiAgICAgLCBtX3JlYWRiYWNrUmVxdWVzdE9uSW1wbFRocmVhZCgwKQotICAgICwg bV9maW5pc2hBbGxSZW5kZXJpbmdDb21wbGV0aW9uRXZlbnRPbkltcGxUaHJlYWQoMCkKICAgICAs IG1fY29tbWl0Q29tcGxldGlvbkV2ZW50T25JbXBsVGhyZWFkKDApCiAgICAgLCBtX3RleHR1cmVB Y3F1aXNpdGlvbkNvbXBsZXRpb25FdmVudE9uSW1wbFRocmVhZCgwKQogICAgICwgbV9uZXh0RnJh bWVJc05ld2x5Q29tbWl0dGVkRnJhbWVPbkltcGxUaHJlYWQoZmFsc2UpCkBAIC00MzEsMTAgKzQz MCw4IEBAIHZvaWQgQ0NUaHJlYWRQcm94eTo6ZmluaXNoQWxsUmVuZGVyaW5nT25JbXBsVGhyZWFk KENDQ29tcGxldGlvbkV2ZW50KiBjb21wbGV0aW9uCiB7CiAgICAgVFJBQ0VfRVZFTlQoIkNDVGhy ZWFkUHJveHk6OmZpbmlzaEFsbFJlbmRlcmluZ09uSW1wbFRocmVhZCIsIHRoaXMsIDApOwogICAg IEFTU0VSVChpc0ltcGxUaHJlYWQoKSk7Ci0gICAgQVNTRVJUKCFtX2ZpbmlzaEFsbFJlbmRlcmlu Z0NvbXBsZXRpb25FdmVudE9uSW1wbFRocmVhZCk7Ci0gICAgbV9maW5pc2hBbGxSZW5kZXJpbmdD b21wbGV0aW9uRXZlbnRPbkltcGxUaHJlYWQgPSBjb21wbGV0aW9uOwotCi0gICAgbV9zY2hlZHVs ZXJPbkltcGxUaHJlYWQtPnNldE5lZWRzRm9yY2VkUmVkcmF3KCk7CisgICAgbV9sYXllclRyZWVI b3N0SW1wbC0+ZmluaXNoQWxsUmVuZGVyaW5nKCk7CisgICAgY29tcGxldGlvbi0+c2lnbmFsKCk7 CiB9CiAKIHZvaWQgQ0NUaHJlYWRQcm94eTo6Zm9yY2VCZWdpbkZyYW1lT25JbXBsVGhyZWFkKEND Q29tcGxldGlvbkV2ZW50KiBjb21wbGV0aW9uKQpAQCAtNjY1LDEzICs2NjIsNiBAQCBDQ1NjaGVk dWxlZEFjdGlvbkRyYXdBbmRTd2FwUmVzdWx0IENDVGhyZWFkUHJveHk6OnNjaGVkdWxlZEFjdGlv bkRyYXdBbmRTd2FwSW50ZQogICAgIGlmIChkcmF3RnJhbWUpCiAgICAgICAgIHJlc3VsdC5kaWRT d2FwID0gbV9sYXllclRyZWVIb3N0SW1wbC0+c3dhcEJ1ZmZlcnMoKTsKIAotICAgIC8vIFByb2Nl c3MgYW55IGZpbmlzaCByZXF1ZXN0Ci0gICAgaWYgKG1fZmluaXNoQWxsUmVuZGVyaW5nQ29tcGxl dGlvbkV2ZW50T25JbXBsVGhyZWFkKSB7Ci0gICAgICAgIG1fbGF5ZXJUcmVlSG9zdEltcGwtPmZp bmlzaEFsbFJlbmRlcmluZygpOwotICAgICAgICBtX2ZpbmlzaEFsbFJlbmRlcmluZ0NvbXBsZXRp b25FdmVudE9uSW1wbFRocmVhZC0+c2lnbmFsKCk7Ci0gICAgICAgIG1fZmluaXNoQWxsUmVuZGVy aW5nQ29tcGxldGlvbkV2ZW50T25JbXBsVGhyZWFkID0gMDsKLSAgICB9Ci0KICAgICAvLyBUZWxs IHRoZSBtYWluIHRocmVhZCB0aGF0IHRoZSB0aGUgbmV3bHktY29tbWl0ZWQgZnJhbWUgd2FzIGRy YXduLgogICAgIGlmIChtX25leHRGcmFtZUlzTmV3bHlDb21taXR0ZWRGcmFtZU9uSW1wbFRocmVh ZCkgewogICAgICAgICBtX25leHRGcmFtZUlzTmV3bHlDb21taXR0ZWRGcmFtZU9uSW1wbFRocmVh ZCA9IGZhbHNlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9DQ0xh eWVyVHJlZUhvc3RUZXN0LmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvQ0NMYXll clRyZWVIb3N0VGVzdC5jcHAKaW5kZXggY2IyNzAzZWRlM2ExMDFhYzI2NzVlYWQzMGI4NWZlM2Ni MTM1MTcxMy4uNTkzZGRmMDQ1NzExYTEwMzEwYTVkNWE3NGRiMzlmNmQwNmYyZjYyYyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9DQ0xheWVyVHJlZUhvc3RUZXN0LmNw cAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL0NDTGF5ZXJUcmVlSG9zdFRlc3Qu Y3BwCkBAIC00OSw4ICs0OSwxMCBAQAogI2luY2x1ZGUgPGdtb2NrL2dtb2NrLmg+CiAjaW5jbHVk ZSA8Z3Rlc3QvZ3Rlc3QuaD4KICNpbmNsdWRlIDxwdWJsaWMvUGxhdGZvcm0uaD4KKyNpbmNsdWRl IDx3dGYvTG9ja2VyLmg+CiAjaW5jbHVkZSA8d3RmL01haW5UaHJlYWQuaD4KICNpbmNsdWRlIDx3 dGYvUGFzc1JlZlB0ci5oPgorI2luY2x1ZGUgPHd0Zi9UaHJlYWRpbmdQcmltaXRpdmVzLmg+CiAj aW5jbHVkZSA8d3RmL1ZlY3Rvci5oPgogCiB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKQEAgLTgw LDYgKzgyLDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCBsYXlvdXQoKSB7IH0KICAgICB2 aXJ0dWFsIHZvaWQgZGlkUmVjcmVhdGVDb250ZXh0KGJvb2wgc3VjY2VkZWQpIHsgfQogICAgIHZp cnR1YWwgdm9pZCBkaWRDb21taXRBbmREcmF3RnJhbWUoKSB7IH0KKyAgICB2aXJ0dWFsIHZvaWQg c2NoZWR1bGVDb21wb3NpdGUoKSB7IH0KIAogICAgIC8vIEltcGxlbWVudGF0aW9uIG9mIENDTGF5 ZXJBbmltYXRpb25EZWxlZ2F0ZQogICAgIHZpcnR1YWwgdm9pZCBub3RpZnlBbmltYXRpb25TdGFy dGVkKGRvdWJsZSB0aW1lKSB7IH0KQEAgLTI4NCw2ICsyODcsNyBAQCBwdWJsaWM6CiAKICAgICB2 aXJ0dWFsIHZvaWQgc2NoZWR1bGVDb21wb3NpdGUoKSBPVkVSUklERQogICAgIHsKKyAgICAgICAg bV90ZXN0SG9va3MtPnNjaGVkdWxlQ29tcG9zaXRlKCk7CiAgICAgfQogCiBwcml2YXRlOgpAQCAt MzY4LDEwICszNzIsMTkgQEAgcHJvdGVjdGVkOgogICAgICAgICA6IG1fYmVnaW5uaW5nKGZhbHNl KQogICAgICAgICAsIG1fZW5kV2hlbkJlZ2luUmV0dXJucyhmYWxzZSkKICAgICAgICAgLCBtX3Rp bWVkT3V0KGZhbHNlKQotICAgICAgICAsIG1fZmluaXNoZWQoZmFsc2UpIHsgfQorICAgICAgICAs IG1fZmluaXNoZWQoZmFsc2UpCisgICAgICAgICwgbV9zY2hlZHVsZWQoZmFsc2UpIHsgfQogCiAg ICAgdm9pZCBkb0JlZ2luVGVzdCgpOwogCisgICAgdmlydHVhbCB2b2lkIHNjaGVkdWxlQ29tcG9z aXRlKCkKKyAgICB7CisgICAgICAgIGlmIChtX3NjaGVkdWxlZCB8fCBtX2ZpbmlzaGVkKQorICAg ICAgICAgICAgcmV0dXJuOworICAgICAgICBtX3NjaGVkdWxlZCA9IHRydWU7CisgICAgICAgIGNh bGxPbk1haW5UaHJlYWQoJkNDTGF5ZXJUcmVlSG9zdFRlc3Q6OmRpc3BhdGNoQ29tcG9zaXRlLCB0 aGlzKTsKKyAgICB9CisKICAgICBzdGF0aWMgdm9pZCBvbkVuZFRlc3Qodm9pZCogc2VsZikKICAg ICB7CiAgICAgICAgIEFTU0VSVChpc01haW5UaHJlYWQoKSk7CkBAIC00ODgsNiArNTAxLDE0IEBA IHByb3RlY3RlZDoKICAgICAgICAgICAgIHRlc3QtPm1fbGF5ZXJUcmVlSG9zdC0+c2V0VmlzaWJs ZShmYWxzZSk7CiAgICAgfQogCisgICAgc3RhdGljIHZvaWQgZGlzcGF0Y2hDb21wb3NpdGUodm9p ZCogc2VsZikKKyAgICB7CisgICAgICAgIENDTGF5ZXJUcmVlSG9zdFRlc3QqIHRlc3QgPSBzdGF0 aWNfY2FzdDxDQ0xheWVyVHJlZUhvc3RUZXN0Kj4oc2VsZik7CisgICAgICAgIHRlc3QtPm1fc2No ZWR1bGVkID0gZmFsc2U7CisgICAgICAgIGlmICh0ZXN0LT5tX2xheWVyVHJlZUhvc3QgJiYgIXRl c3QtPm1fZmluaXNoZWQpCisgICAgICAgICAgICB0ZXN0LT5tX2xheWVyVHJlZUhvc3QtPmNvbXBv c2l0ZSgpOworICAgIH0KKwogICAgIGNsYXNzIFRpbWVvdXRUYXNrIDogcHVibGljIFdlYlRocmVh ZDo6VGFzayB7CiAgICAgcHVibGljOgogICAgICAgICBleHBsaWNpdCBUaW1lb3V0VGFzayhDQ0xh eWVyVHJlZUhvc3RUZXN0KiB0ZXN0KQpAQCAtNTc2LDYgKzU5Nyw3IEBAIHByaXZhdGU6CiAgICAg Ym9vbCBtX2VuZFdoZW5CZWdpblJldHVybnM7CiAgICAgYm9vbCBtX3RpbWVkT3V0OwogICAgIGJv b2wgbV9maW5pc2hlZDsKKyAgICBib29sIG1fc2NoZWR1bGVkOwogCiAgICAgT3duUHRyPFdlYlRo cmVhZD4gbV93ZWJUaHJlYWQ7CiAgICAgUmVmUHRyPENDU2NvcGVkVGhyZWFkUHJveHk+IG1fbWFp blRocmVhZFByb3h5OwpAQCAtMTIxNSw3ICsxMjM3LDEwIEBAIHB1YmxpYzoKIAogICAgIHZpcnR1 YWwgdm9pZCBhbmltYXRlTGF5ZXJzKENDTGF5ZXJUcmVlSG9zdEltcGwqIGxheWVyVHJlZUhvc3RJ bXBsLCBkb3VibGUgbW9ub3RvbmljVGltZSkKICAgICB7Ci0gICAgICAgIGNvbnN0IENDRmxvYXRB bmltYXRpb25DdXJ2ZSogY3VydmUgPSBtX2xheWVyVHJlZUhvc3QtPnJvb3RMYXllcigpLT5sYXll ckFuaW1hdGlvbkNvbnRyb2xsZXIoKS0+Z2V0QWN0aXZlQW5pbWF0aW9uKDAsIENDQWN0aXZlQW5p bWF0aW9uOjpPcGFjaXR5KS0+Y3VydmUoKS0+dG9GbG9hdEFuaW1hdGlvbkN1cnZlKCk7CisgICAg ICAgIGNvbnN0IENDQWN0aXZlQW5pbWF0aW9uKiBhbmltYXRpb24gPSBtX2xheWVyVHJlZUhvc3Qt PnJvb3RMYXllcigpLT5sYXllckFuaW1hdGlvbkNvbnRyb2xsZXIoKS0+Z2V0QWN0aXZlQW5pbWF0 aW9uKDAsIENDQWN0aXZlQW5pbWF0aW9uOjpPcGFjaXR5KTsKKyAgICAgICAgaWYgKCFhbmltYXRp b24pCisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIGNvbnN0IENDRmxvYXRBbmltYXRpb25D dXJ2ZSogY3VydmUgPSBhbmltYXRpb24tPmN1cnZlKCktPnRvRmxvYXRBbmltYXRpb25DdXJ2ZSgp OwogICAgICAgICBmbG9hdCBzdGFydE9wYWNpdHkgPSBjdXJ2ZS0+Z2V0VmFsdWUoMCk7CiAgICAg ICAgIGZsb2F0IGVuZE9wYWNpdHkgPSBjdXJ2ZS0+Z2V0VmFsdWUoY3VydmUtPmR1cmF0aW9uKCkp OwogICAgICAgICBmbG9hdCBsaW5lYXJseUludGVycG9sYXRlZE9wYWNpdHkgPSAwLjI1ICogZW5k T3BhY2l0eSArIDAuNzUgKiBzdGFydE9wYWNpdHk7CkBAIC0yNjQ0LDQgKzI2NjksNTUgQEAgVEVT VF9GKENDTGF5ZXJUcmVlSG9zdFRlc3RGcmFjdGlvbmFsU2Nyb2xsLCBydW5NdWx0aVRocmVhZCkK ICAgICBydW5UZXN0VGhyZWFkZWQoKTsKIH0KIAorY2xhc3MgQ0NMYXllclRyZWVIb3N0VGVzdEZp bmlzaEFsbFJlbmRlcmluZyA6IHB1YmxpYyBDQ0xheWVyVHJlZUhvc3RUZXN0IHsKK3B1YmxpYzoK KyAgICBDQ0xheWVyVHJlZUhvc3RUZXN0RmluaXNoQWxsUmVuZGVyaW5nKCkKKyAgICAgICAgOiBt X29uY2UoZmFsc2UpCisgICAgICAgICwgbV9tdXRleCgpCisgICAgICAgICwgbV9kcmF3Q291bnQo MCkKKyAgICB7CisgICAgfQorCisgICAgdmlydHVhbCB2b2lkIGJlZ2luVGVzdCgpCisgICAgewor ICAgICAgICBtX2xheWVyVHJlZUhvc3QtPnNldE5lZWRzUmVkcmF3KCk7CisgICAgfQorCisgICAg dmlydHVhbCB2b2lkIGRpZENvbW1pdEFuZERyYXdGcmFtZSgpCisgICAgeworICAgICAgICBpZiAo bV9vbmNlKQorICAgICAgICAgICAgcmV0dXJuOworICAgICAgICBtX29uY2UgPSB0cnVlOworICAg ICAgICBtX2xheWVyVHJlZUhvc3QtPnNldE5lZWRzUmVkcmF3KCk7CisgICAgICAgIG1fbGF5ZXJU cmVlSG9zdC0+YWNxdWlyZUxheWVyVGV4dHVyZXMoKTsKKyAgICAgICAgeworICAgICAgICAgICAg TG9ja2VyPE11dGV4PiBsb2NrKG1fbXV0ZXgpOworICAgICAgICAgICAgbV9kcmF3Q291bnQgPSAw OworICAgICAgICB9CisgICAgICAgIG1fbGF5ZXJUcmVlSG9zdC0+ZmluaXNoQWxsUmVuZGVyaW5n KCk7CisgICAgICAgIHsKKyAgICAgICAgICAgIExvY2tlcjxNdXRleD4gbG9jayhtX211dGV4KTsK KyAgICAgICAgICAgIEVYUEVDVF9FUSgwLCBtX2RyYXdDb3VudCk7CisgICAgICAgIH0KKyAgICAg ICAgZW5kVGVzdCgpOworICAgIH0KKworICAgIHZpcnR1YWwgdm9pZCBkcmF3TGF5ZXJzT25DQ1Ro cmVhZChDQ0xheWVyVHJlZUhvc3RJbXBsKiBpbXBsKQorICAgIHsKKyAgICAgICAgTG9ja2VyPE11 dGV4PiBsb2NrKG1fbXV0ZXgpOworICAgICAgICArK21fZHJhd0NvdW50OworICAgIH0KKworICAg IHZpcnR1YWwgdm9pZCBhZnRlclRlc3QoKQorICAgIHsKKyAgICB9Citwcml2YXRlOgorCisgICAg Ym9vbCBtX29uY2U7CisgICAgTXV0ZXggbV9tdXRleDsKKyAgICBpbnQgbV9kcmF3Q291bnQ7Cit9 OworCitTSU5HTEVfQU5EX01VTFRJX1RIUkVBRF9URVNUX0YoQ0NMYXllclRyZWVIb3N0VGVzdEZp bmlzaEFsbFJlbmRlcmluZykKKwogfSAvLyBuYW1lc3BhY2UK