127756 2014-01-27 19:45:54 -0800 Crash in RemoteLayerBackingStore::encode when m_frontBuffer is nullptr. 2014-01-30 12:52:55 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jeremyj-wk jeremyj-wk commit-queue eric.carlson simon.fraser thorton oldest_to_newest 972748 0 jeremyj-wk 2014-01-27 19:45:54 -0800 Crash in RemoteLayerBackingStore::encode when m_frontBuffer is nullptr. 972756 1 222399 jeremyj-wk 2014-01-27 20:09:53 -0800 Created attachment 222399 Patch 972765 2 222399 thorton 2014-01-27 20:37:20 -0800 Comment on attachment 222399 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=222399&action=review At the least, this seems likely to be an incomplete fix, because whatever is causing this seems like it would also cause a failure in the m_acceleratesDrawing branch. Do you know why it is that we are encoding a backing store that has never been painted? Is this a custom layer or something? > Source/WebKit2/Shared/mac/RemoteLayerBackingStore.mm:97 > + { These go on the previous line. 972766 3 222399 thorton 2014-01-27 20:37:32 -0800 Comment on attachment 222399 Patch did not mean to r+ 972776 4 222399 simon.fraser 2014-01-27 21:17:20 -0800 Comment on attachment 222399 Patch We need to know why this happens. 972796 5 jeremyj-wk 2014-01-27 23:12:18 -0800 This happens because, in the following code, previouslyDrewContents is true. RemoteLayerBackingStore::display() ... // If we previously were drawsContent=YES, and now are not, we need // to note that our backing store has been cleared. if (!m_layer->owner() || !m_layer->owner()->platformCALayerDrawsContent()) { bool previouslyDrewContents = hasFrontBuffer(); m_frontBuffer = nullptr; #if USE(IOSURFACE) m_frontSurface = nullptr; #endif return previouslyDrewContents; } 972810 6 jeremyj-wk 2014-01-27 23:57:37 -0800 This page has a <video> tag. m_layer->owner()->platformCALayerDrawsContent() is false because... void RenderLayerBacking::updateDrawsContent(bool isSimpleContainer) bool RenderLayerBacking::containsPaintedContent(bool isSimpleContainer) const ... #if ENABLE(VIDEO) if (renderer().isVideo() && toRenderVideo(renderer()).shouldDisplayVideo()) return m_owningLayer.hasBoxDecorationsOrBackground(); #endif 972812 7 jeremyj-wk 2014-01-28 00:03:09 -0800 To repro this problem: DebugUseWebKit2 = 1; WebKitAVFoundationEnabled = 1; WebKitVideoPluginProxyEnabled = 0; Visit a page with a <video> tag. 972848 8 222399 thorton 2014-01-28 01:58:59 -0800 Comment on attachment 222399 Patch OK, so it is a custom layer. We should totally avoid encoding the RemoteLayerBackingStore in this case; can you move this bool out to RemoteLayerTreeTransaction's encoder, and avoid encoding the backing store completely? 973191 9 222523 jeremyj-wk 2014-01-28 16:03:31 -0800 Created attachment 222523 Patch 973240 10 222523 thorton 2014-01-28 18:09:51 -0800 Comment on attachment 222523 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=222523&action=review > Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.mm:312 > + bool hasFrontBuffer{false}; please "bool hasFontBuffer = false;" 973241 11 thorton 2014-01-28 18:10:05 -0800 Much better! Thanks for fixing. 973527 12 222607 jeremyj-wk 2014-01-29 16:39:17 -0800 Created attachment 222607 Patch 973918 13 222607 commit-queue 2014-01-30 12:52:52 -0800 Comment on attachment 222607 Patch Clearing flags on attachment: 222607 Committed r163103: <http://trac.webkit.org/changeset/163103> 973919 14 commit-queue 2014-01-30 12:52:55 -0800 All reviewed patches have been landed. Closing bug. 222399 2014-01-27 20:09:53 -0800 2014-01-28 16:03:19 -0800 Patch bug-127756-20140127200952.patch text/plain 2349 jeremyj-wk U3VidmVyc2lvbiBSZXZpc2lvbjogMTYyODY1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNmFlMTc3OWVjYzFhMTY2 ODhiYzEyOTM2ODEwMDhiMTlhMjVlMDk3ZS4uZTE4NTg3MDQ4OTA1Y2Q0NzQ0ZWVlY2ZkNjhlMTBl MmZkYzJiMTcxZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDE0LTAxLTI3ICBKZXJl bXkgSm9uZXMgIDxqZXJlbXlqQGFwcGxlLmNvbT4KKworICAgICAgICBDcmFzaCBpbiBSZW1vdGVM YXllckJhY2tpbmdTdG9yZTo6ZW5jb2RlKCkgd2hlbiBtX2Zyb250QnVmZmVyIGlzIG51bGxwdHIu CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjc3NTYK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDaGVjayBt X2Zyb250QnVmZmVyIGZvciBudWxsIGJlZm9yZSBlbmNvZGluZy4KKworICAgICAgICAqIFNoYXJl ZC9tYWMvUmVtb3RlTGF5ZXJCYWNraW5nU3RvcmUubW06CisgICAgICAgIChSZW1vdGVMYXllckJh Y2tpbmdTdG9yZTo6ZW5jb2RlKToKKyAgICAgICAgKFJlbW90ZUxheWVyQmFja2luZ1N0b3JlOjpk ZWNvZGUpOgorCiAyMDE0LTAxLTI3ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5j b20+CiAKICAgICAgICAgVHdlYWsgdGhlIFdLV2ViVmlldyBhbmQgV0tXZWJWaWV3Q29uZmlndXJh dGlvbiBoZWFkZXJzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvbWFjL1JlbW90 ZUxheWVyQmFja2luZ1N0b3JlLm1tIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL21hYy9SZW1vdGVM YXllckJhY2tpbmdTdG9yZS5tbQppbmRleCA3ZGQ1MmI2MDk3MWQ1MWVmNjIzYTc3YTRiMDc3Mzcz ZDg1NDMwNTc4Li43NTY0ZjZmZDIxNDU3NWMwZGY1MTQ2YzRiYTYzZTU5NDY5NTkxZDZiIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvbWFjL1JlbW90ZUxheWVyQmFja2luZ1N0b3Jl Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9tYWMvUmVtb3RlTGF5ZXJCYWNraW5nU3Rv cmUubW0KQEAgLTkxLDkgKzkxLDE0IEBAIHZvaWQgUmVtb3RlTGF5ZXJCYWNraW5nU3RvcmU6OmVu Y29kZShJUEM6OkFyZ3VtZW50RW5jb2RlciYgZW5jb2RlcikgY29uc3QKICAgICBBU1NFUlQoIW1f YWNjZWxlcmF0ZXNEcmF3aW5nKTsKICNlbmRpZgogCi0gICAgU2hhcmVhYmxlQml0bWFwOjpIYW5k bGUgaGFuZGxlOwotICAgIG1fZnJvbnRCdWZmZXItPmNyZWF0ZUhhbmRsZShoYW5kbGUpOwotICAg IGVuY29kZXIgPDwgaGFuZGxlOworICAgIGJvb2wgaGFzRnJvbnRCdWZmZXJ7ISFtX2Zyb250QnVm ZmVyfTsKKyAgICBlbmNvZGVyIDw8IGhhc0Zyb250QnVmZmVyOworICAgIGlmIChoYXNGcm9udEJ1 ZmZlcikKKyAgICB7CisgICAgICAgIFNoYXJlYWJsZUJpdG1hcDo6SGFuZGxlIGhhbmRsZTsKKyAg ICAgICAgbV9mcm9udEJ1ZmZlci0+Y3JlYXRlSGFuZGxlKGhhbmRsZSk7CisgICAgICAgIGVuY29k ZXIgPDwgaGFuZGxlOworICAgIH0KIH0KIAogYm9vbCBSZW1vdGVMYXllckJhY2tpbmdTdG9yZTo6 ZGVjb2RlKElQQzo6QXJndW1lbnREZWNvZGVyJiBkZWNvZGVyLCBSZW1vdGVMYXllckJhY2tpbmdT dG9yZSYgcmVzdWx0KQpAQCAtMTIwLDEwICsxMjUsMTcgQEAgYm9vbCBSZW1vdGVMYXllckJhY2tp bmdTdG9yZTo6ZGVjb2RlKElQQzo6QXJndW1lbnREZWNvZGVyJiBkZWNvZGVyLCBSZW1vdGVMYXll ckIKICAgICBBU1NFUlQoIXJlc3VsdC5tX2FjY2VsZXJhdGVzRHJhd2luZyk7CiAjZW5kaWYKIAot ICAgIFNoYXJlYWJsZUJpdG1hcDo6SGFuZGxlIGhhbmRsZTsKLSAgICBpZiAoIWRlY29kZXIuZGVj b2RlKGhhbmRsZSkpCisgICAgYm9vbCBoYXNGcm9udEJ1ZmZlcntmYWxzZX07CisgICAgaWYgKCFk ZWNvZGVyLmRlY29kZShoYXNGcm9udEJ1ZmZlcikpCiAgICAgICAgIHJldHVybiBmYWxzZTsKLSAg ICByZXN1bHQubV9mcm9udEJ1ZmZlciA9IFNoYXJlYWJsZUJpdG1hcDo6Y3JlYXRlKGhhbmRsZSk7 CisgICAgCisgICAgaWYgKGhhc0Zyb250QnVmZmVyKQorICAgIHsKKyAgICAgICAgU2hhcmVhYmxl Qml0bWFwOjpIYW5kbGUgaGFuZGxlOworICAgICAgICBpZiAoIWRlY29kZXIuZGVjb2RlKGhhbmRs ZSkpCisgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgIHJlc3VsdC5tX2Zyb250QnVm ZmVyID0gU2hhcmVhYmxlQml0bWFwOjpjcmVhdGUoaGFuZGxlKTsKKyAgICB9CiAKICAgICByZXR1 cm4gdHJ1ZTsKIH0K 222523 2014-01-28 16:03:31 -0800 2014-01-29 16:39:15 -0800 Patch bug-127756-20140128160331.patch text/plain 3041 jeremyj-wk U3VidmVyc2lvbiBSZXZpc2lvbjogMTYyODY1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNmFlMTc3OWVjYzFhMTY2 ODhiYzEyOTM2ODEwMDhiMTlhMjVlMDk3ZS4uNmJiNzRmZTM2NGY2YTM4MmM3MzUxMDU2ZjQ5OTQy MzU1NzdhMjZmYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE0LTAxLTI4ICBKZXJl bXkgSm9uZXMgIDxqZXJlbXlqQGFwcGxlLmNvbT4KKworICAgICAgICBDcmFzaCBpbiBSZW1vdGVM YXllckJhY2tpbmdTdG9yZTo6ZW5jb2RlIHdoZW4gbV9mcm9udEJ1ZmZlciBpcyBudWxscHRyLgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI3NzU2CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRG9uJ3QgZW5j b2RlIFJlbW90ZUxheWVyQmFja2luZ1N0b3JlIHdoZW4gaXQgaGFzIG5vIGZyb250IGJ1ZmZlci4K KworICAgICAgICAqIFNoYXJlZC9tYWMvUmVtb3RlTGF5ZXJCYWNraW5nU3RvcmUuaDoKKyAgICAg ICAgKFdlYktpdDo6UmVtb3RlTGF5ZXJCYWNraW5nU3RvcmU6Omhhc0Zyb250QnVmZmVyKToKKyAg ICAgICAgKiBTaGFyZWQvbWFjL1JlbW90ZUxheWVyVHJlZVRyYW5zYWN0aW9uLm1tOgorICAgICAg ICAoV2ViS2l0OjpSZW1vdGVMYXllclRyZWVUcmFuc2FjdGlvbjo6TGF5ZXJQcm9wZXJ0aWVzOjpl bmNvZGUpOgorICAgICAgICAoV2ViS2l0OjpSZW1vdGVMYXllclRyZWVUcmFuc2FjdGlvbjo6TGF5 ZXJQcm9wZXJ0aWVzOjpkZWNvZGUpOgorCiAyMDE0LTAxLTI3ICBBbmRlcnMgQ2FybHNzb24gIDxh bmRlcnNjYUBhcHBsZS5jb20+CiAKICAgICAgICAgVHdlYWsgdGhlIFdLV2ViVmlldyBhbmQgV0tX ZWJWaWV3Q29uZmlndXJhdGlvbiBoZWFkZXJzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9T aGFyZWQvbWFjL1JlbW90ZUxheWVyQmFja2luZ1N0b3JlLmggYi9Tb3VyY2UvV2ViS2l0Mi9TaGFy ZWQvbWFjL1JlbW90ZUxheWVyQmFja2luZ1N0b3JlLmgKaW5kZXggNjlkZjdlNmEwODg2YjIxYmZh Y2VlMjYxMzljODFhMzg2ODliMzAwMC4uMjYyOTViNmQzNmMyYjg1MjU1ZWI1YzM4MTYyYjU0NTM1 OWNhMzJiMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvU2hhcmVkL21hYy9SZW1vdGVMYXll ckJhY2tpbmdTdG9yZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9tYWMvUmVtb3RlTGF5 ZXJCYWNraW5nU3RvcmUuaApAQCAtNzEsOCArNzEsNyBAQCBwdWJsaWM6CiAKICAgICB2b2lkIGVu dW1lcmF0ZVJlY3RzQmVpbmdEcmF3bihDR0NvbnRleHRSZWYsIHZvaWQgKF4pKENHUmVjdCkpOwog Ci1wcml2YXRlOgotICAgIGJvb2wgaGFzRnJvbnRCdWZmZXIoKQorICAgIGJvb2wgaGFzRnJvbnRC dWZmZXIoKSBjb25zdAogICAgIHsKICNpZiBVU0UoSU9TVVJGQUNFKQogICAgICAgICBpZiAobV9h Y2NlbGVyYXRlc0RyYXdpbmcpCkBAIC04MCw2ICs3OSw3IEBAIHByaXZhdGU6CiAjZW5kaWYKICAg ICAgICAgcmV0dXJuICEhbV9mcm9udEJ1ZmZlcjsKICAgICB9Citwcml2YXRlOgogCiAgICAgdm9p ZCBkcmF3SW5Db250ZXh0KFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dCYsIENHSW1hZ2VSZWYgZnJv bnRJbWFnZSk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9tYWMvUmVtb3Rl TGF5ZXJUcmVlVHJhbnNhY3Rpb24ubW0gYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvbWFjL1JlbW90 ZUxheWVyVHJlZVRyYW5zYWN0aW9uLm1tCmluZGV4IDUxOTdhYjM2NWEyMjU2OThlY2QyOGVlMmY0 MTZkOGRmZWEyNzc1YzYuLjI3Y2ZkOWViZThiMjI3OWViN2NkYjFiZWM0NjQyZGU2YTQxMTUyNzcg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9tYWMvUmVtb3RlTGF5ZXJUcmVlVHJh bnNhY3Rpb24ubW0KKysrIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL21hYy9SZW1vdGVMYXllclRy ZWVUcmFuc2FjdGlvbi5tbQpAQCAtMTY3LDggKzE2NywxMSBAQCB2b2lkIFJlbW90ZUxheWVyVHJl ZVRyYW5zYWN0aW9uOjpMYXllclByb3BlcnRpZXM6OmVuY29kZShJUEM6OkFyZ3VtZW50RW5jb2Rl ciYgZQogICAgIGlmIChjaGFuZ2VkUHJvcGVydGllcyAmIFRpbWVPZmZzZXRDaGFuZ2VkKQogICAg ICAgICBlbmNvZGVyIDw8IHRpbWVPZmZzZXQ7CiAKLSAgICBpZiAoY2hhbmdlZFByb3BlcnRpZXMg JiBCYWNraW5nU3RvcmVDaGFuZ2VkKQotICAgICAgICBlbmNvZGVyIDw8IGJhY2tpbmdTdG9yZTsK KyAgICBpZiAoY2hhbmdlZFByb3BlcnRpZXMgJiBCYWNraW5nU3RvcmVDaGFuZ2VkKSB7CisgICAg ICAgIGVuY29kZXIgPDwgYmFja2luZ1N0b3JlLmhhc0Zyb250QnVmZmVyKCk7CisgICAgICAgIGlm IChiYWNraW5nU3RvcmUuaGFzRnJvbnRCdWZmZXIoKSkKKyAgICAgICAgICAgIGVuY29kZXIgPDwg YmFja2luZ1N0b3JlOworICAgIH0KIAogICAgIGlmIChjaGFuZ2VkUHJvcGVydGllcyAmIEZpbHRl cnNDaGFuZ2VkKQogICAgICAgICBlbmNvZGVyIDw8IGZpbHRlcnM7CkBAIC0zMDYsNyArMzA5LDEw IEBAIGJvb2wgUmVtb3RlTGF5ZXJUcmVlVHJhbnNhY3Rpb246OkxheWVyUHJvcGVydGllczo6ZGVj b2RlKElQQzo6QXJndW1lbnREZWNvZGVyJiBkCiAgICAgfQogCiAgICAgaWYgKHJlc3VsdC5jaGFu Z2VkUHJvcGVydGllcyAmIEJhY2tpbmdTdG9yZUNoYW5nZWQpIHsKLSAgICAgICAgaWYgKCFkZWNv ZGVyLmRlY29kZShyZXN1bHQuYmFja2luZ1N0b3JlKSkKKyAgICAgICAgYm9vbCBoYXNGcm9udEJ1 ZmZlcntmYWxzZX07CisgICAgICAgIGlmICghZGVjb2Rlci5kZWNvZGUoaGFzRnJvbnRCdWZmZXIp KQorICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICBpZiAoaGFzRnJvbnRCdWZmZXIg JiYgIWRlY29kZXIuZGVjb2RlKHJlc3VsdC5iYWNraW5nU3RvcmUpKQogICAgICAgICAgICAgcmV0 dXJuIGZhbHNlOwogICAgIH0KIAo= 222607 2014-01-29 16:39:17 -0800 2014-01-30 12:52:52 -0800 Patch bug-127756-20140129163917.patch text/plain 3042 jeremyj-wk U3VidmVyc2lvbiBSZXZpc2lvbjogMTYyODY1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNmFlMTc3OWVjYzFhMTY2 ODhiYzEyOTM2ODEwMDhiMTlhMjVlMDk3ZS4uNmJiNzRmZTM2NGY2YTM4MmM3MzUxMDU2ZjQ5OTQy MzU1NzdhMjZmYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE0LTAxLTI4ICBKZXJl bXkgSm9uZXMgIDxqZXJlbXlqQGFwcGxlLmNvbT4KKworICAgICAgICBDcmFzaCBpbiBSZW1vdGVM YXllckJhY2tpbmdTdG9yZTo6ZW5jb2RlIHdoZW4gbV9mcm9udEJ1ZmZlciBpcyBudWxscHRyLgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI3NzU2CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRG9uJ3QgZW5j b2RlIFJlbW90ZUxheWVyQmFja2luZ1N0b3JlIHdoZW4gaXQgaGFzIG5vIGZyb250IGJ1ZmZlci4K KworICAgICAgICAqIFNoYXJlZC9tYWMvUmVtb3RlTGF5ZXJCYWNraW5nU3RvcmUuaDoKKyAgICAg ICAgKFdlYktpdDo6UmVtb3RlTGF5ZXJCYWNraW5nU3RvcmU6Omhhc0Zyb250QnVmZmVyKToKKyAg ICAgICAgKiBTaGFyZWQvbWFjL1JlbW90ZUxheWVyVHJlZVRyYW5zYWN0aW9uLm1tOgorICAgICAg ICAoV2ViS2l0OjpSZW1vdGVMYXllclRyZWVUcmFuc2FjdGlvbjo6TGF5ZXJQcm9wZXJ0aWVzOjpl bmNvZGUpOgorICAgICAgICAoV2ViS2l0OjpSZW1vdGVMYXllclRyZWVUcmFuc2FjdGlvbjo6TGF5 ZXJQcm9wZXJ0aWVzOjpkZWNvZGUpOgorCiAyMDE0LTAxLTI3ICBBbmRlcnMgQ2FybHNzb24gIDxh bmRlcnNjYUBhcHBsZS5jb20+CiAKICAgICAgICAgVHdlYWsgdGhlIFdLV2ViVmlldyBhbmQgV0tX ZWJWaWV3Q29uZmlndXJhdGlvbiBoZWFkZXJzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9T aGFyZWQvbWFjL1JlbW90ZUxheWVyQmFja2luZ1N0b3JlLmggYi9Tb3VyY2UvV2ViS2l0Mi9TaGFy ZWQvbWFjL1JlbW90ZUxheWVyQmFja2luZ1N0b3JlLmgKaW5kZXggNjlkZjdlNmEwODg2YjIxYmZh Y2VlMjYxMzljODFhMzg2ODliMzAwMC4uMjYyOTViNmQzNmMyYjg1MjU1ZWI1YzM4MTYyYjU0NTM1 OWNhMzJiMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvU2hhcmVkL21hYy9SZW1vdGVMYXll ckJhY2tpbmdTdG9yZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9tYWMvUmVtb3RlTGF5 ZXJCYWNraW5nU3RvcmUuaApAQCAtNzEsOCArNzEsNyBAQCBwdWJsaWM6CiAKICAgICB2b2lkIGVu dW1lcmF0ZVJlY3RzQmVpbmdEcmF3bihDR0NvbnRleHRSZWYsIHZvaWQgKF4pKENHUmVjdCkpOwog Ci1wcml2YXRlOgotICAgIGJvb2wgaGFzRnJvbnRCdWZmZXIoKQorICAgIGJvb2wgaGFzRnJvbnRC dWZmZXIoKSBjb25zdAogICAgIHsKICNpZiBVU0UoSU9TVVJGQUNFKQogICAgICAgICBpZiAobV9h Y2NlbGVyYXRlc0RyYXdpbmcpCkBAIC04MCw2ICs3OSw3IEBAIHByaXZhdGU6CiAjZW5kaWYKICAg ICAgICAgcmV0dXJuICEhbV9mcm9udEJ1ZmZlcjsKICAgICB9Citwcml2YXRlOgogCiAgICAgdm9p ZCBkcmF3SW5Db250ZXh0KFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dCYsIENHSW1hZ2VSZWYgZnJv bnRJbWFnZSk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9tYWMvUmVtb3Rl TGF5ZXJUcmVlVHJhbnNhY3Rpb24ubW0gYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvbWFjL1JlbW90 ZUxheWVyVHJlZVRyYW5zYWN0aW9uLm1tCmluZGV4IDUxOTdhYjM2NWEyMjU2OThlY2QyOGVlMmY0 MTZkOGRmZWEyNzc1YzYuLjI3NjlhYjhmM2FhMDA0NmNmMWQ5ZGI0ZjQ3ZDc1ZmQ4MWM2ZWM5MzIg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9tYWMvUmVtb3RlTGF5ZXJUcmVlVHJh bnNhY3Rpb24ubW0KKysrIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL21hYy9SZW1vdGVMYXllclRy ZWVUcmFuc2FjdGlvbi5tbQpAQCAtMTY3LDggKzE2NywxMSBAQCB2b2lkIFJlbW90ZUxheWVyVHJl ZVRyYW5zYWN0aW9uOjpMYXllclByb3BlcnRpZXM6OmVuY29kZShJUEM6OkFyZ3VtZW50RW5jb2Rl ciYgZQogICAgIGlmIChjaGFuZ2VkUHJvcGVydGllcyAmIFRpbWVPZmZzZXRDaGFuZ2VkKQogICAg ICAgICBlbmNvZGVyIDw8IHRpbWVPZmZzZXQ7CiAKLSAgICBpZiAoY2hhbmdlZFByb3BlcnRpZXMg JiBCYWNraW5nU3RvcmVDaGFuZ2VkKQotICAgICAgICBlbmNvZGVyIDw8IGJhY2tpbmdTdG9yZTsK KyAgICBpZiAoY2hhbmdlZFByb3BlcnRpZXMgJiBCYWNraW5nU3RvcmVDaGFuZ2VkKSB7CisgICAg ICAgIGVuY29kZXIgPDwgYmFja2luZ1N0b3JlLmhhc0Zyb250QnVmZmVyKCk7CisgICAgICAgIGlm IChiYWNraW5nU3RvcmUuaGFzRnJvbnRCdWZmZXIoKSkKKyAgICAgICAgICAgIGVuY29kZXIgPDwg YmFja2luZ1N0b3JlOworICAgIH0KIAogICAgIGlmIChjaGFuZ2VkUHJvcGVydGllcyAmIEZpbHRl cnNDaGFuZ2VkKQogICAgICAgICBlbmNvZGVyIDw8IGZpbHRlcnM7CkBAIC0zMDYsNyArMzA5LDEw IEBAIGJvb2wgUmVtb3RlTGF5ZXJUcmVlVHJhbnNhY3Rpb246OkxheWVyUHJvcGVydGllczo6ZGVj b2RlKElQQzo6QXJndW1lbnREZWNvZGVyJiBkCiAgICAgfQogCiAgICAgaWYgKHJlc3VsdC5jaGFu Z2VkUHJvcGVydGllcyAmIEJhY2tpbmdTdG9yZUNoYW5nZWQpIHsKLSAgICAgICAgaWYgKCFkZWNv ZGVyLmRlY29kZShyZXN1bHQuYmFja2luZ1N0b3JlKSkKKyAgICAgICAgYm9vbCBoYXNGcm9udEJ1 ZmZlciA9IGZhbHNlOworICAgICAgICBpZiAoIWRlY29kZXIuZGVjb2RlKGhhc0Zyb250QnVmZmVy KSkKKyAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgaWYgKGhhc0Zyb250QnVmZmVy ICYmICFkZWNvZGVyLmRlY29kZShyZXN1bHQuYmFja2luZ1N0b3JlKSkKICAgICAgICAgICAgIHJl dHVybiBmYWxzZTsKICAgICB9CiAK