39139 2010-05-14 14:51:38 -0700 Pages that use hardware acceleration don't repaint after waking computer from sleep 2010-05-17 08:06:16 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) PC Windows XP RESOLVED FIXED http://webkit.org/blog-files/3d-transforms/poster-circle.html InRadar, PlatformOnly P2 Normal --- 39159 1 aroben aroben cmarrin enrica eric simon.fraser oldest_to_newest 226012 0 aroben 2010-05-14 14:51:38 -0700 To reproduce: 1. Go to <http://webkit.org/blog-files/3d-transforms/poster-circle.html> 2. Put your computer to sleep 3. Wake the computer back up The page never repaints (until you navigate somewhere else, or reload). The problem is that WKCACFLayerRenderer doesn't respond to lost devices correctly. See <http://msdn.microsoft.com/en-us/library/bb174714(v=VS.85).aspx>. 226014 1 aroben 2010-05-14 14:52:02 -0700 <rdar://problem/7986906> 226235 2 56151 aroben 2010-05-15 06:18:15 -0700 Created attachment 56151 Periodically try to reset a lost IDirect3DDevice9 until we succeed 226247 3 56151 sullivan 2010-05-15 07:34:25 -0700 Comment on attachment 56151 Periodically try to reset a lost IDirect3DDevice9 until we succeed > - resetDevice(); > + resetDevice(ChangedWindowSize); Is it worth asserting that this call returns true? r+ 226431 4 eric 2010-05-16 00:37:26 -0700 Attachment 56151 was posted by a committer and has review+, assigning to Adam Roben for commit. 226765 5 aroben 2010-05-17 07:58:00 -0700 (In reply to comment #3) > (From update of attachment 56151 [details]) > > - resetDevice(); > > + resetDevice(ChangedWindowSize); > > Is it worth asserting that this call returns true? No. Resetting might fail at this point (e.g., if the device became lost sometime since the last time we rendered), so we can't assert that it doesn't. But we don't need to worry here whether it failed or not; if it did fail, we'll try to reset again before we next render. I'll add a comment about this. Thanks for the review! 226768 6 aroben 2010-05-17 08:06:16 -0700 Committed r59610: <http://trac.webkit.org/changeset/59610> 56151 2010-05-15 06:18:15 -0700 2010-05-15 07:34:25 -0700 Periodically try to reset a lost IDirect3DDevice9 until we succeed bug-39139-20100515091814.patch text/plain 13415 aroben ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NGMzOTU5MmZiNmZmMTM0ODQxZTNhYmYzNGQ5NjNmZjIyZWFhYTVmYi4uNThjOTQyMGFkMTBjYzdi MmZhMDZjMDNjMjNhY2VlYzg1MzNkM2JjOCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsNSArMSw1NSBAQAogMjAxMC0wNS0xNSAgQWRh bSBSb2JlbiAgPGFyb2JlbkBhcHBsZS5jb20+CiAKKyAgICAgICAgUGVyaW9kaWNhbGx5IHRyeSB0 byByZXNldCBhIGxvc3QgSURpcmVjdDNERGV2aWNlOSB1bnRpbCB3ZSBzdWNjZWVkCisKKyAgICAg ICAgVGhpcyBpcyBob3cgTVNETiBzYXlzIHdlIG11c3QgcmVzcG9uZCB0byBhIGxvc3QgZGV2aWNl IChzZWUKKyAgICAgICAgPGh0dHA6Ly9tc2RuLm1pY3Jvc29mdC5jb20vZW4tdXMvbGlicmFyeS9i YjE3NDcxNCh2PVZTLjg1KS5hc3B4PikuCisKKyAgICAgICAgT25seSB0ZXN0YWJsZSBieSBhIG1h bnVhbCB0ZXN0LCB1bmZvcnR1bmF0ZWx5LgorCisgICAgICAgIEZpeGVzIDxyZGFyOi8vcHJvYmxl bS83OTg2OTA2PiA8aHR0cDovL3dlYmtpdC5vcmcvYi8zOTEzOT4gUGFnZXMgdGhhdAorICAgICAg ICB1c2UgaGFyZHdhcmUgYWNjZWxlcmF0aW9uIGRvbid0IHJlcGFpbnQgYWZ0ZXIgd2FraW5nIGNv bXB1dGVyIGZyb20KKyAgICAgICAgc2xlZXAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIG1hbnVhbC10ZXN0cy9uby1yZXBhaW50LWFmdGVyLXdha2Ut ZnJvbS1zbGVlcC5odG1sOiBBZGRlZC4gVGhpcyBpcworICAgICAgICB0aGUgUG9zdGVyIENpcmNs ZSBkZW1vIGZyb20gd2Via2l0Lm9yZy9ibG9nLCBidXQgd2l0aCBpbnN0cnVjdGlvbnMgZm9yCisg ICAgICAgIHB1dHRpbmcgdGhlIGNvbXB1dGVyIHRvIHNsZWVwIGFuZCB3YWtpbmcgaXQgdXAgYWdh aW4uCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy93aW4vV0tDQUNGTGF5ZXJSZW5kZXJl ci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpXS0NBQ0ZMYXllclJlbmRlcmVyOjpXS0NBQ0ZMYXll clJlbmRlcmVyKTogSW5pdGlhbGl6ZSBuZXcKKyAgICAgICAgbWVtYmVyIHRoYXQgdGVsbHMgdXMg d2hldGhlciB3ZSBuZWVkIHRvIHRyeSB0byByZXNldCB0aGUgZGV2aWNlIGJlZm9yZQorICAgICAg ICByZW5kZXJpbmcuCisgICAgICAgIChXZWJDb3JlOjpXS0NBQ0ZMYXllclJlbmRlcmVyOjpyZXNp emUpOiBDaGFuZ2VkIHRvIHRlbGwgcmVzZXREZXZpY2UKKyAgICAgICAgdGhlIHJlYXNvbiB3aHkg dGhlIGRldmljZSBuZWVkcyB0byBiZSByZXNldCAod2hpY2ggaXMgYmVjYXVzZSB0aGUKKyAgICAg ICAgd2luZG93J3Mgc2l6ZSBoYXMgY2hhbmdlZCkuCisgICAgICAgIChXZWJDb3JlOjpXS0NBQ0ZM YXllclJlbmRlcmVyOjpyZW5kZXIpOiBCZWZvcmUgd2UgZG8gYW55dGhpbmcgZWxzZSwKKyAgICAg ICAgY2hlY2sgaWYgd2UgbmVlZCB0byByZXNldCB0aGUgZGV2aWNlIGJlZm9yZSByZW5kZXJpbmcu IElmIHdlIGRvLCB0cnkKKyAgICAgICAgdG8gcmVzZXQgaXQuIElmIHRoYXQgZmFpbHMsIGJhaWwg b3V0IGFuZCBzZXQgYSB0aW1lciB0byB0cnkgYWdhaW4KKyAgICAgICAgbGF0ZXIuIElmIHdlIGRp c2NvdmVyIHRoYXQgdGhlIGRldmljZSBpcyBsb3N0IHdoZW4gY2FsbGluZworICAgICAgICBJRGly ZWN0M0REZXZpY2U5OjpQcmVzZW50IGFuZCByZXNldHRpbmcgdGhlIGRldmljZSBmYWlscywgYmFp bCBvdXQgYW5kCisgICAgICAgIHNldCBhIHRpbWVyIHRvIHRyeSBhZ2FpbiBsYXRlci4KKyAgICAg ICAgKFdlYkNvcmU6OldLQ0FDRkxheWVyUmVuZGVyZXI6OnJlc2V0RGV2aWNlKTogQ2hhbmdlZCB0 byByZXR1cm4gYQorICAgICAgICBib29sZWFuIGluZGljYXRpbmcgd2hldGhlciByZXNldHRpbmcg c3VjY2VlZGVkIG9yIG5vdC4gQWRkZWQgYQorICAgICAgICBSZXNldFJlYXNvbiBwYXJhbWV0ZXIg c28gY2FsbGVycyBjYW4gc3BlY2lmeSB3aGV5IHRoZSBkZXZpY2UgbmVlZHMgdG8KKyAgICAgICAg YmUgcmVzZXQuIEJlZm9yZSB0cnlpbmcgdG8gZG8gYW55dGhpbmcsIHdlIGNhbGwKKyAgICAgICAg SURpcmVjdDNERGV2aWNlOTo6VGVzdENvb3BlcmF0aXZlTGV2ZWwgdG8gZmluZCBvdXQgd2hldGhl ciB0aGUgZGV2aWNlCisgICAgICAgIGNhbiBiZSByZXNldCBjdXJyZW50bHkuIElmIGl0IGNhbid0 LCB3ZSBzZXQgYSBmbGFnIHRvIHRlbGwgb3Vyc2VsdmVzCisgICAgICAgIHRoYXQgdGhlIGRldmlj ZSBtdXN0IGJlIHJlc2V0IGJlZm9yZSB3ZSBuZXh0IHJlbmRlciwgYW5kIGluZGljYXRlIHRvCisg ICAgICAgIHRoZSBjYWxsZXIgdGhhdCB0aGUgcmVzZXQgZmFpbGVkLiBJZiB3ZSB0aG91Z2h0IHRo ZSBkZXZpY2Ugd2FzIGxvc3QKKyAgICAgICAgYnV0IGl0IHR1cm5zIG91dCBub3QgdG8gYmUsIHdl IGRvbid0IGhhdmUgdG8gZG8gYW55dGhpbmcgYW5kIGNhbiB0ZWxsCisgICAgICAgIHRoZSBjYWxs ZXIgdGhhdCB0aGUgcmVzZXQgc3VjY2VlZGVkLiBPdGhlcndpc2Ugd2UgZ28gYWhlYWQgYW5kIHJl c2V0CisgICAgICAgIHRoZSBkZXZpY2UgYXMgYmVmb3JlLCBhbmQgaW5kaWNhdGUgdG8gdGhlIGNh bGxlciB0aGF0IHRoZSByZXNldAorICAgICAgICBzdWNjZWVkZWQuCisKKyAgICAgICAgKiBwbGF0 Zm9ybS9ncmFwaGljcy93aW4vV0tDQUNGTGF5ZXJSZW5kZXJlci5oOiBDaGFuZ2VkIHJlc2V0RGV2 aWNlIHRvCisgICAgICAgIHJldHVybiBhIGJvb2xlYW4gYW5kIHRha2UgYSBSZXNldFJlYXNvbiBw YXJhbWV0ZXIuIEFkZGVkIGEgY29tbWVudAorICAgICAgICBhYm91dCB3aGVuIGFuZCB3aHkgdGhp cyBmdW5jdGlvbiBzaG91bGQgYmUgY2FsbGVkLiBBbmQgYWRkZWQKKyAgICAgICAgbV9tdXN0UmVz ZXRMb3N0RGV2aWNlQmVmb3JlUmVuZGVyaW5nLgorCisyMDEwLTA1LTE1ICBBZGFtIFJvYmVuICA8 YXJvYmVuQGFwcGxlLmNvbT4KKwogICAgICAgICBDYWxsIENBUmVuZGVyT0dMUHVyZ2Ugd2hlbmV2 ZXIgd2UgY2FsbCBJRGlyZWN0M0REZXZpY2U5OjpSZXNldAogCiAgICAgICAgIE1TRE4gc2F5cyB0 aGF0IGFsbCByZXNvdXJlcyBhbGxvY2F0ZWQgd2l0aCBEM0RQT09MX0RFRkFVTFQgbXVzdCBiZQpk aWZmIC0tZ2l0IGEvV2ViQ29yZS9tYW51YWwtdGVzdHMvbm8tcmVwYWludC1hZnRlci13YWtlLWZy b20tc2xlZXAuaHRtbCBiL1dlYkNvcmUvbWFudWFsLXRlc3RzL25vLXJlcGFpbnQtYWZ0ZXItd2Fr ZS1mcm9tLXNsZWVwLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMGMwZjE2MTUzNTQ4ZGY1ZjIyOGFiYzE3ZGIy Y2JmMDBjMDliMTc5YwotLS0gL2Rldi9udWxsCisrKyBiL1dlYkNvcmUvbWFudWFsLXRlc3RzL25v LXJlcGFpbnQtYWZ0ZXItd2FrZS1mcm9tLXNsZWVwLmh0bWwKQEAgLTAsMCArMSwxODMgQEAKKzwh RE9DVFlQRSBIVE1MIFBVQkxJQyAiLS8vVzNDLy9EVEQgSFRNTCA0LjAxIFN0cmljdC8vRU4iCisg ICJodHRwOi8vd3d3LnczLm9yZy9UUi9odG1sNC9zdHJpY3QuZHRkIj4KKzxodG1sPgorICA8aGVh ZD4KKyAgICA8dGl0bGU+VGVzdCBmb3IgQnVnIDM5MTM5PC90aXRsZT4KKyAgICA8bWV0YSBodHRw LWVxdWl2PSJDb250ZW50LVR5cGUiIGNvbnRlbnQ9InRleHQvaHRtbDsgY2hhcnNldD11dGYtOCI+ CisgICAgPG1ldGEgbmFtZT0idmlld3BvcnQiIGNvbnRlbnQ9ImluaXRpYWwtc2NhbGU9MC42MCwg bWluaW11bS1zY2FsZT0wLjYwLCBtYXhpbXVtLXNjYWxlPTAuNjAiPgorICAgIDxzdHlsZSB0eXBl PSJ0ZXh0L2NzcyI+CisKKyAgICAgIGJvZHkgeworICAgICAgICBmb250LWZhbWlseTogJ0x1Y2lk YSBHcmFuZGUnLCBWZXJkYW5hLCBBcmlhbDsKKyAgICAgICAgZm9udC1zaXplOiAxMnB4OworICAg ICAgfQorCisgICAgICAjc3RhZ2UgeworICAgICAgICBtYXJnaW46IDE1MHB4IGF1dG87CisgICAg ICAgIHdpZHRoOiA2MDBweDsKKyAgICAgICAgaGVpZ2h0OiA0MDBweDsKKyAgICAgICAgLyoKKyAg ICAgICAgCisgICAgICAgIFNldHRpbmcgdGhlIHBlcnNwZWN0aXZlIG9mIHRoZSBjb250ZW50cyBv ZiB0aGUgc3RhZ2UKKyAgICAgICAgYnV0IG5vdCB0aGUgc3RhZ2UgaXRzZWxmCisgICAgICAgIAor ICAgICAgICAqLworICAgICAgICAtd2Via2l0LXBlcnNwZWN0aXZlOiA4MDA7CisgICAgICB9CisK KyAgICAgICNyb3RhdGUgeworICAgICAgICBtYXJnaW46IDAgYXV0bzsKKyAgICAgICAgd2lkdGg6 IDYwMHB4OworICAgICAgICBoZWlnaHQ6IDQwMHB4OworICAgICAgICAvKiBFbnN1cmUgdGhhdCB3 ZSdyZSBpbiAzRCBzcGFjZSAqLworICAgICAgICAtd2Via2l0LXRyYW5zZm9ybS1zdHlsZTogcHJl c2VydmUtM2Q7CisgICAgICAgIC8qCisgICAgICAgIE1ha2UgdGhlIHdob2xlIHNldCBvZiByb3dz IHVzZSB0aGUgeC1heGlzIHNwaW4gYW5pbWF0aW9uCisgICAgICAgIGZvciBhIGR1cmF0aW9uIG9m IDcgc2Vjb25kcywgcnVubmluZyBpbmZpbml0ZWx5IGFuZCBsaW5lYXJseQorICAgICAgICAqLwor ICAgICAgICAtd2Via2l0LWFuaW1hdGlvbi1uYW1lOiB4LXNwaW47CisgICAgICAgIC13ZWJraXQt YW5pbWF0aW9uLWR1cmF0aW9uOiA3czsKKyAgICAgICAgLXdlYmtpdC1hbmltYXRpb24taXRlcmF0 aW9uLWNvdW50OiBpbmZpbml0ZTsKKyAgICAgICAgLXdlYmtpdC1hbmltYXRpb24tdGltaW5nLWZ1 bmN0aW9uOiBsaW5lYXI7CisgICAgICB9CisKKyAgICAgIC5yaW5nIHsKKyAgICAgICAgbWFyZ2lu OiAwIGF1dG87CisgICAgICAgIGhlaWdodDogMTEwcHg7CisgICAgICAgIHdpZHRoOiA2MDBweDsK KyAgICAgICAgLXdlYmtpdC10cmFuc2Zvcm0tc3R5bGU6IHByZXNlcnZlLTNkOworICAgICAgICAt d2Via2l0LWFuaW1hdGlvbi1pdGVyYXRpb24tY291bnQ6IGluZmluaXRlOworICAgICAgICAtd2Vi a2l0LWFuaW1hdGlvbi10aW1pbmctZnVuY3Rpb246IGxpbmVhcjsKKyAgICAgIH0KKyAgICAgIAor ICAgICAgLnJpbmcgPiA6bnRoLWNoaWxkKG9kZCkgeworICAgICAgICBiYWNrZ3JvdW5kLWNvbG9y OiAjOTk1QzdGOworICAgICAgfQorCisgICAgICAucmluZyA+IDpudGgtY2hpbGQoZXZlbikgewor ICAgICAgICBiYWNrZ3JvdW5kLWNvbG9yOiAjODM1QTk5OworICAgICAgfQorCisgICAgICAucG9z dGVyIHsKKyAgICAgICAgcG9zaXRpb246IGFic29sdXRlOworICAgICAgICBsZWZ0OiAyNTBweDsK KyAgICAgICAgd2lkdGg6IDEwMHB4OworICAgICAgICBoZWlnaHQ6IDEwMHB4OworICAgICAgICBv cGFjaXR5OiAwLjc7CisgICAgICAgIGNvbG9yOiByZ2JhKDAsMCwwLDAuOSk7CisgICAgICAgIC13 ZWJraXQtYm9yZGVyLXJhZGl1czogMTBweDsKKyAgICAgIH0KKyAgICAgIAorICAgICAgLnBvc3Rl ciA+IHAgeworICAgICAgICBmb250LWZhbWlseTogJ0dlb3JnaWEnLCBzZXJpZjsKKyAgICAgICAg Zm9udC1zaXplOiAzNnB4OworICAgICAgICBmb250LXdlaWdodDogYm9sZDsKKyAgICAgICAgdGV4 dC1hbGlnbjogY2VudGVyOworICAgICAgICBtYXJnaW4tdG9wOiAyOHB4OworICAgICAgfQorCisg ICAgICAvKgorICAgICAgU2V0IHVwIGVhY2ggcm93IHRvIGhhdmUgYSBkaWZmZXJlbnQgYW5pbWF0 aW9uIGR1cmF0aW9uCisgICAgICBhbmQgYWx0ZXJuYXRpbmcgeS1heGlzIHJvdGF0aW9uIGRpcmVj dGlvbnMuCisgICAgICAqLworICAgICAgI3JpbmctMSB7CisgICAgICAgIC13ZWJraXQtYW5pbWF0 aW9uLW5hbWU6IHktc3BpbjsKKyAgICAgICAgLXdlYmtpdC1hbmltYXRpb24tZHVyYXRpb246IDVz OworICAgICAgfQorCisgICAgICAjcmluZy0yIHsKKyAgICAgICAgLXdlYmtpdC1hbmltYXRpb24t bmFtZTogYmFjay15LXNwaW47CisgICAgICAgIC13ZWJraXQtYW5pbWF0aW9uLWR1cmF0aW9uOiA0 czsKKyAgICAgIH0KKworICAgICAgI3JpbmctMyB7CisgICAgICAgIC13ZWJraXQtYW5pbWF0aW9u LW5hbWU6IHktc3BpbjsKKyAgICAgICAgLXdlYmtpdC1hbmltYXRpb24tZHVyYXRpb246IDNzOwor ICAgICAgfQorCisgICAgICAvKgorCisgICAgICBIZXJlIHdlIGRlZmluZSBlYWNoIG9mIHRoZSB0 aHJlZSBpbmRpdmlkdWFsIGFuaW1hdGlvbnMgdGhhdAorICAgICAgd2Ugd2lsbCBiZSB1c2luZyB0 byBoYXZlIG91ciAzRCByb3RhdGlvbiBlZmZlY3QuIFRoZSBmaXJzdAorICAgICAgYW5pbWF0aW9u IHdpbGwgcGVyZm9ybSBhIGZ1bGwgcm90YXRpb24gb24gdGhlIHgtYXhpcywgd2UnbGwKKyAgICAg IHVzZSB0aGF0IG9uIHRoZSB3aG9sZSBzZXQgb2Ygb2JqZWN0cy4gVGhlIHNlY29uZCBhbmQgdGhp cmQKKyAgICAgIGFuaW1hdGlvbnMgd2lsbCBwZXJmb3JtIGEgZnVsbCByb3RhdGlvbiBvbiB0aGUg eS1heGlzIGluCisgICAgICBvcHBvc2l0ZSBkaXJlY3Rpb25zLCBhbHRlcm5hdGluZyBkaXJlY3Rp b25zIGJldHdlZW4gcm93cy4KKyAgICAKKyAgICAgIE5vdGUgdGhhdCB5b3UgY3VycmVudGx5IGhh dmUgdG8gc3BlY2lmeSBhbiBpbnRlcm1lZGlhdGUgc3RlcAorICAgICAgZm9yIHJvdGF0aW9ucyBl dmVuIHdoZW4geW91IGFyZSB1c2luZyBpbmRpdmlkdWFsIHRyYW5zZm9ybWF0aW9uCisgICAgICBj b25zdHJ1Y3RzLgorCisgICAgICAqLworICAgICAgQC13ZWJraXQta2V5ZnJhbWVzIHgtc3BpbiB7 CisgICAgICAgIDAlICAgIHsgLXdlYmtpdC10cmFuc2Zvcm06IHJvdGF0ZVgoMGRlZyk7IH0KKyAg ICAgICAgNTAlICAgeyAtd2Via2l0LXRyYW5zZm9ybTogcm90YXRlWCgxODBkZWcpOyB9CisgICAg ICAgIDEwMCUgIHsgLXdlYmtpdC10cmFuc2Zvcm06IHJvdGF0ZVgoMzYwZGVnKTsgfQorICAgICAg fQorCisgICAgICBALXdlYmtpdC1rZXlmcmFtZXMgeS1zcGluIHsKKyAgICAgICAgMCUgICAgeyAt d2Via2l0LXRyYW5zZm9ybTogcm90YXRlWSgwZGVnKTsgfQorICAgICAgICA1MCUgICB7IC13ZWJr aXQtdHJhbnNmb3JtOiByb3RhdGVZKDE4MGRlZyk7IH0KKyAgICAgICAgMTAwJSAgeyAtd2Via2l0 LXRyYW5zZm9ybTogcm90YXRlWSgzNjBkZWcpOyB9CisgICAgICB9CisKKyAgICAgIEAtd2Via2l0 LWtleWZyYW1lcyBiYWNrLXktc3BpbiB7CisgICAgICAgIDAlICAgIHsgLXdlYmtpdC10cmFuc2Zv cm06IHJvdGF0ZVkoMzYwZGVnKTsgfQorICAgICAgICA1MCUgICB7IC13ZWJraXQtdHJhbnNmb3Jt OiByb3RhdGVZKDE4MGRlZyk7IH0KKyAgICAgICAgMTAwJSAgeyAtd2Via2l0LXRyYW5zZm9ybTog cm90YXRlWSgwZGVnKTsgfQorICAgICAgfQorICAgIDwvc3R5bGU+CisKKyAgICA8c2NyaXB0IHR5 cGU9InRleHQvamF2YXNjcmlwdCI+CisKKyAgICAgIGNvbnN0IFBPU1RFUlNfUEVSX1JPVyA9IDEy OworICAgICAgY29uc3QgUklOR19SQURJVVMgPSAyMDA7CisKKyAgICAgIGZ1bmN0aW9uIHNldHVw X3Bvc3RlcnMgKHJvdykKKyAgICAgIHsKKyAgICAgICAgdmFyIHBvc3RlckFuZ2xlID0gMzYwIC8g UE9TVEVSU19QRVJfUk9XOworICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IFBPU1RFUlNfUEVS X1JPVzsgaSArKykgeworICAgICAgICAgIHZhciBwb3N0ZXIgPSBkb2N1bWVudC5jcmVhdGVFbGVt ZW50KCdkaXYnKTsKKyAgICAgICAgICBwb3N0ZXIuY2xhc3NOYW1lID0gJ3Bvc3Rlcic7CisgICAg ICAgICAgLy8gY29tcHV0ZSBhbmQgYXNzaWduIHRoZSB0cmFuc2Zvcm0gZm9yIHRoaXMgcG9zdGVy CisgICAgICAgICAgdmFyIHRyYW5zZm9ybSA9ICdyb3RhdGVZKCcgKyAocG9zdGVyQW5nbGUgKiBp KSArICdkZWcpIHRyYW5zbGF0ZVooJyArIFJJTkdfUkFESVVTICsgJ3B4KSc7CisgICAgICAgICAg cG9zdGVyLnN0eWxlLndlYmtpdFRyYW5zZm9ybSA9IHRyYW5zZm9ybTsKKyAgICAgICAgICAvLyBz ZXR1cCB0aGUgbnVtYmVyIHRvIHNob3cgaW5zaWRlIHRoZSBwb3N0ZXIKKyAgICAgICAgICB2YXIg Y29udGVudCA9IHBvc3Rlci5hcHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVFbGVtZW50KCdwJykp OworICAgICAgICAgIGNvbnRlbnQudGV4dENvbnRlbnQgPSBpOworICAgICAgICAgIC8vIGFkZCB0 aGUgcG9zdGVyIHRvIHRoZSByb3cKKyAgICAgICAgICByb3cuYXBwZW5kQ2hpbGQocG9zdGVyKTsK KyAgICAgICAgfQorCisgICAgICB9CisKKyAgICAgIGZ1bmN0aW9uIGluaXQgKCkKKyAgICAgIHsK KyAgICAgICAgc2V0dXBfcG9zdGVycyhkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgncmluZy0xJykp OworICAgICAgICBzZXR1cF9wb3N0ZXJzKGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCdyaW5nLTIn KSk7CisgICAgICAgIHNldHVwX3Bvc3RlcnMoZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ3Jpbmct MycpKTsKKyAgICAgIH0KKworICAgICAgLy8gY2FsbCBpbml0IG9uY2UgdGhlIGRvY3VtZW50IGlz IGZ1bGx5IGxvYWRlZAorICAgICAgd2luZG93LmFkZEV2ZW50TGlzdGVuZXIoJ2xvYWQnLCBpbml0 LCBmYWxzZSk7CisKKyAgICA8L3NjcmlwdD4KKyAgPC9oZWFkPgorICAKKyAgPGJvZHk+CisKKyAg ICA8cD5UaGlzIGlzIGEgdGVzdCBmb3IgPGEgaHJlZj0iaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTM5MTM5Ij5CdWcgMzkxMzk6IFBhZ2VzCisgICAgdGhhdCB1c2UgaGFy ZHdhcmUgYWNjZWxlcmF0aW9uIGRvbid0IHJlcGFpbnQgYWZ0ZXIgd2FraW5nIGNvbXB1dGVyIGZy b20gc2xlZXA8L2E+LiBUbyB0ZXN0LCBwdXQKKyAgICB5b3VyIGNvbXB1dGVyIHRvIHNsZWVwIChv ciAiU3RhbmRieSIsIGFzIFdpbmRvd3MgY2FsbHMgaXQpLiBXaGVuIHlvdSB3YWtlIHlvdXIgY29t cHV0ZXIgdXAsIHRoZQorICAgIGFuaW1hdGlvbiBiZWxvdyBzaG91bGQgc3RpbGwgYmUgcnVubmlu Zy48L3A+CisgICAgPGRpdiBpZD0ic3RhZ2UiPgorICAgICAgPGRpdiBpZD0icm90YXRlIj4KKyAg ICAgICAgPGRpdiBpZD0icmluZy0xIiBjbGFzcz0icmluZyI+PC9kaXY+CisgICAgICAgIDxkaXYg aWQ9InJpbmctMiIgY2xhc3M9InJpbmciPjwvZGl2PgorICAgICAgICA8ZGl2IGlkPSJyaW5nLTMi IGNsYXNzPSJyaW5nIj48L2Rpdj4KKyAgICAgIDwvZGl2PgorICAgIDwvZGl2PgorCisgIDwvYm9k eT4KKyAgCis8L2h0bWw+CmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dp bi9XS0NBQ0ZMYXllclJlbmRlcmVyLmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2lu L1dLQ0FDRkxheWVyUmVuZGVyZXIuY3BwCmluZGV4IDEzYmI4YjhjMmY4NTVkZmYxYzBlMzliZTg3 YzQxZmVkZTdhMGM5OTYuLjAzOGY0ZGI3YThmNDA1ZWQ3ODgwNjBhMzJiZWRjMjk1OThkOTJkMmUg MTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL1dLQ0FDRkxheWVyUmVu ZGVyZXIuY3BwCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL1dLQ0FDRkxheWVy UmVuZGVyZXIuY3BwCkBAIC0yMzEsNiArMjMxLDcgQEAgV0tDQUNGTGF5ZXJSZW5kZXJlcjo6V0tD QUNGTGF5ZXJSZW5kZXJlcigpCiAgICAgLCBtX3Njcm9sbFBvc2l0aW9uKDAsIDApCiAgICAgLCBt X3Njcm9sbFNpemUoMSwgMSkKICAgICAsIG1fYmFja2luZ1N0b3JlRGlydHkoZmFsc2UpCisgICAg LCBtX211c3RSZXNldExvc3REZXZpY2VCZWZvcmVSZW5kZXJpbmcoZmFsc2UpCiB7CiAjaWZuZGVm IE5ERUJVRwogICAgIGNoYXIqIHByaW50VHJlZUZsYWcgPSBnZXRlbnYoIkNBX1BSSU5UX1RSRUUi KTsKQEAgLTQyMiw3ICs0MjMsNyBAQCB2b2lkIFdLQ0FDRkxheWVyUmVuZGVyZXI6OnJlc2l6ZSgp CiAgICAgaWYgKCFtX2QzZERldmljZSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgcmVzZXREZXZp Y2UoKTsKKyAgICByZXNldERldmljZShDaGFuZ2VkV2luZG93U2l6ZSk7CiAKICAgICBpZiAobV9y b290TGF5ZXIpIHsKICAgICAgICAgbV9yb290TGF5ZXItPnNldEZyYW1lKGJvdW5kcygpKTsKQEAg LTQ5MSw2ICs0OTIsMTIgQEAgdm9pZCBXS0NBQ0ZMYXllclJlbmRlcmVyOjpyZW5kZXIoY29uc3Qg VmVjdG9yPENHUmVjdD4mIGRpcnR5UmVjdHMpCiB7CiAgICAgQVNTRVJUKG1fZDNkRGV2aWNlKTsK IAorICAgIGlmIChtX211c3RSZXNldExvc3REZXZpY2VCZWZvcmVSZW5kZXJpbmcgJiYgIXJlc2V0 RGV2aWNlKExvc3REZXZpY2UpKSB7CisgICAgICAgIC8vIFdlIGNhbid0IHJlc2V0IHRoZSBkZXZp Y2UgcmlnaHQgbm93LiBUcnkgYWdhaW4gc29vbi4KKyAgICAgICAgcmVuZGVyU29vbigpOworICAg ICAgICByZXR1cm47CisgICAgfQorCiAgICAgLy8gRmx1c2ggdGhlIHJvb3QgbGF5ZXIgdG8gdGhl IHJlbmRlciB0cmVlLgogICAgIFdLQ0FDRkNvbnRleHRGbHVzaGVyOjpzaGFyZWQoKS5mbHVzaEFs bENvbnRleHRzKCk7CiAKQEAgLTU0Nyw5ICs1NTQsMTIgQEAgdm9pZCBXS0NBQ0ZMYXllclJlbmRl cmVyOjpyZW5kZXIoY29uc3QgVmVjdG9yPENHUmVjdD4mIGRpcnR5UmVjdHMpCiAgICAgICAgIGVy ciA9IG1fZDNkRGV2aWNlLT5QcmVzZW50KDAsIDAsIDAsIDApOwogCiAgICAgICAgIGlmIChlcnIg PT0gRDNERVJSX0RFVklDRUxPU1QpIHsKLSAgICAgICAgICAgIC8vIExvc3QgZGV2aWNlIHNpdHVh dGlvbi4KLSAgICAgICAgICAgIHJlc2V0RGV2aWNlKCk7CiAgICAgICAgICAgICBDQVJlbmRlclVw ZGF0ZUFkZFJlY3QodSwgJmJvdW5kcyk7CisgICAgICAgICAgICBpZiAoIXJlc2V0RGV2aWNlKExv c3REZXZpY2UpKSB7CisgICAgICAgICAgICAgICAgLy8gV2UgY2FuJ3QgcmVzZXQgdGhlIGRldmlj ZSByaWdodCBub3cuIFRyeSBhZ2FpbiBzb29uLgorICAgICAgICAgICAgICAgIHJlbmRlclNvb24o KTsKKyAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICB9CiAgICAgICAgIH0KICAg ICB9IHdoaWxlIChlcnIgPT0gRDNERVJSX0RFVklDRUxPU1QpOwogCkBAIC01OTIsOSArNjAyLDI3 IEBAIHZvaWQgV0tDQUNGTGF5ZXJSZW5kZXJlcjo6aW5pdEQzREdlb21ldHJ5KCkKICAgICBtX2Qz ZERldmljZS0+U2V0VHJhbnNmb3JtKEQzRFRTX1BST0pFQ1RJT04sICZwcm9qZWN0aW9uKTsKIH0K IAotdm9pZCBXS0NBQ0ZMYXllclJlbmRlcmVyOjpyZXNldERldmljZSgpCitib29sIFdLQ0FDRkxh eWVyUmVuZGVyZXI6OnJlc2V0RGV2aWNlKFJlc2V0UmVhc29uIHJlYXNvbikKIHsKICAgICBBU1NF UlQobV9kM2REZXZpY2UpOworICAgIEFTU0VSVChtX3JlbmRlckNvbnRleHQpOworCisgICAgSFJF U1VMVCBociA9IG1fZDNkRGV2aWNlLT5UZXN0Q29vcGVyYXRpdmVMZXZlbCgpOworCisgICAgaWYg KGhyID09IEQzREVSUl9ERVZJQ0VMT1NUIHx8IGhyID09IEQzREVSUl9EUklWRVJJTlRFUk5BTEVS Uk9SKSB7CisgICAgICAgIC8vIFRoZSBkZXZpY2UgY2Fubm90IGJlIHJlc2V0IGF0IHRoaXMgdGlt ZS4gVHJ5IGFnYWluIHNvb24uCisgICAgICAgIG1fbXVzdFJlc2V0TG9zdERldmljZUJlZm9yZVJl bmRlcmluZyA9IHRydWU7CisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICB9CisKKyAgICBtX211 c3RSZXNldExvc3REZXZpY2VCZWZvcmVSZW5kZXJpbmcgPSBmYWxzZTsKKworICAgIGlmIChyZWFz b24gPT0gTG9zdERldmljZSAmJiBociA9PSBEM0RfT0spIHsKKyAgICAgICAgLy8gVGhlIGRldmlj ZSB3YXNuJ3QgbG9zdCBhZnRlciBhbGwuCisgICAgICAgIHJldHVybiB0cnVlOworICAgIH0KKwor ICAgIC8vIFdlIGNhbiByZXNldCB0aGUgZGV2aWNlLgogCiAgICAgLy8gV2UgaGF2ZSB0byBwdXJn ZSB0aGUgQ0FSZW5kZXJPR0xDb250ZXh0IHdoZW5ldmVyIHdlIHJlc2V0IHRoZSBJRGlyZWN0M0RE ZXZpY2U5IGluIG9yZGVyIHRvCiAgICAgLy8gZGVzdHJveSBhbnkgRDNEUE9PTF9ERUZBVUxUIHJl c291cmNlcyB0aGF0IENvcmUgQW5pbWF0aW9uIGhhcyBhbGxvY2F0ZWQgKGUuZy4sIHRleHR1cmVz IHVzZWQKQEAgLTYwMiw4ICs2MzAsMTUgQEAgdm9pZCBXS0NBQ0ZMYXllclJlbmRlcmVyOjpyZXNl dERldmljZSgpCiAgICAgQ0FSZW5kZXJPR0xQdXJnZShtX3JlbmRlcmVyKTsKIAogICAgIEQzRFBS RVNFTlRfUEFSQU1FVEVSUyBwYXJhbWV0ZXJzID0gaW5pdGlhbFByZXNlbnRhdGlvblBhcmFtZXRl cnMoKTsKLSAgICBtX2QzZERldmljZS0+UmVzZXQoJnBhcmFtZXRlcnMpOworICAgIGhyID0gbV9k M2REZXZpY2UtPlJlc2V0KCZwYXJhbWV0ZXJzKTsKKworICAgIC8vIFRlc3RDb29wZXJhdGl2ZUxl dmVsIHRvbGQgdXMgdGhlIGRldmljZSBtYXkgYmUgcmVzZXQgbm93LCBzbyB3ZSBzaG91bGQKKyAg ICAvLyBub3QgYmUgdG9sZCBoZXJlIHRoYXQgdGhlIGRldmljZSBpcyBsb3N0LgorICAgIEFTU0VS VChociAhPSBEM0RFUlJfREVWSUNFTE9TVCk7CisKICAgICBpbml0RDNER2VvbWV0cnkoKTsKKwor ICAgIHJldHVybiB0cnVlOwogfQogCiB9CmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL3dpbi9XS0NBQ0ZMYXllclJlbmRlcmVyLmggYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL3dpbi9XS0NBQ0ZMYXllclJlbmRlcmVyLmgKaW5kZXggYjcwODQ2NDk4ZmJlZjg0ZWE5MjE2 ZDJlNDNhMTcyMzA0M2E0MDZkYS4uMjU5YzUyZjJiNTcyMjA2MzU4MWI5YmQ0ZmM5N2Q1Y2FjMDY1 NWU3MCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vV0tDQUNGTGF5 ZXJSZW5kZXJlci5oCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL1dLQ0FDRkxh eWVyUmVuZGVyZXIuaApAQCAtODQsNyArODQsMTIgQEAgcHJpdmF0ZToKICAgICBDR1JlY3QgYm91 bmRzKCkgY29uc3Q7CiAKICAgICB2b2lkIGluaXREM0RHZW9tZXRyeSgpOwotICAgIHZvaWQgcmVz ZXREZXZpY2UoKTsKKworICAgIC8vIENhbGwgdGhpcyB3aGVuIHRoZSBkZXZpY2Ugd2luZG93IGhh cyBjaGFuZ2VkIHNpemUgb3Igd2hlbiBJRGlyZWN0M0REZXZpY2U5OjpQcmVzZW50IHJldHVybnMK KyAgICAvLyBEM0RFUlJfREVWSUNFTE9TVC4gUmV0dXJucyB0cnVlIGlmIHRoZSBkZXZpY2Ugd2Fz IHJlY292ZXJlZCwgZmFsc2UgaWYgcmVuZGVyaW5nIG11c3QgYmUKKyAgICAvLyBhYm9ydGVkIGFu ZCByZWF0dGVtcHRlZCBzb29uLgorICAgIGVudW0gUmVzZXRSZWFzb24geyBDaGFuZ2VkV2luZG93 U2l6ZSwgTG9zdERldmljZSB9OworICAgIGJvb2wgcmVzZXREZXZpY2UoUmVzZXRSZWFzb24pOwog CiAgICAgdm9pZCByZW5kZXIoY29uc3QgVmVjdG9yPENHUmVjdD4mIGRpcnR5UmVjdHMgPSBWZWN0 b3I8Q0dSZWN0PigpKTsKICAgICB2b2lkIHBhaW50KCk7CkBAIC0xMDQsNiArMTA5LDcgQEAgcHJp dmF0ZToKICAgICBJbnRQb2ludCBtX3Njcm9sbFBvc2l0aW9uOwogICAgIEludFNpemUgbV9zY3Jv bGxTaXplOwogICAgIGJvb2wgbV9iYWNraW5nU3RvcmVEaXJ0eTsKKyAgICBib29sIG1fbXVzdFJl c2V0TG9zdERldmljZUJlZm9yZVJlbmRlcmluZzsKICNpZm5kZWYgTkRFQlVHCiAgICAgYm9vbCBt X3ByaW50VHJlZTsKICNlbmRpZgo=