188838 2018-08-22 04:49:03 -0700 [CoordGraphics] Remove the 'previous backing store' logic 2018-10-09 12:24:27 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=188693 InRadar P2 Normal --- 1 zan webkit-unassigned cadubentzen cmarcelo commit-queue ews-watchlist kondapallykalyan luiz magomez mcatanzaro noam webkit-bug-importer oldest_to_newest 1452578 0 zan 2018-08-22 04:49:03 -0700 In CoordinatedGraphicsLayer, the current backing store is sometimes kept around after it's removed, in order to keep the tile data contained there alive for the near future. I think this is a remnant from the cross-process CoordinatedGraphics usage that's not obsolete. The previous backing store management should thus probably be possible to remove. This report originates from bug #188693. 1455183 1 magomez 2018-08-30 01:09:23 -0700 I always wondered what was the previous backingStore about and whether we could remove it, but never had time to check it. I'll add this to my list. 1466044 2 351516 cadubentzen 2018-10-03 06:59:45 -0700 Created attachment 351516 Patch 1466339 3 351516 magomez 2018-10-04 00:33:32 -0700 Comment on attachment 351516 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=351516&action=review > Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp:872 > m_pendingContentsScaleAdjustment = false; You changed the logic here. m_pendingContentsScaleAdjustment must always be set to false if it was true, not only when the three conditions are met. 1466352 4 cadubentzen 2018-10-04 05:51:58 -0700 (In reply to Miguel Gomez from comment #3) > Comment on attachment 351516 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=351516&action=review > > > Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp:872 > > m_pendingContentsScaleAdjustment = false; > > You changed the logic here. m_pendingContentsScaleAdjustment must always be > set to false if it was true, not only when the three conditions are met. True. Thanks for the review! 1466353 5 351594 cadubentzen 2018-10-04 05:53:10 -0700 Created attachment 351594 Patch 1467512 6 351594 commit-queue 2018-10-09 12:23:29 -0700 Comment on attachment 351594 Patch Clearing flags on attachment: 351594 Committed r236974: <https://trac.webkit.org/changeset/236974> 1467513 7 commit-queue 2018-10-09 12:23:31 -0700 All reviewed patches have been landed. Closing bug. 1467514 8 webkit-bug-importer 2018-10-09 12:24:27 -0700 <rdar://problem/45135211> 351516 2018-10-03 06:59:45 -0700 2018-10-04 05:53:05 -0700 Patch bug-188838-20181003155943.patch text/plain 5351 cadubentzen U3VidmVyc2lvbiBSZXZpc2lvbjogMjM2NzkzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjljMGRmZTE2Nzg5ZDZh ZTUzZjZkYzdiYjhkM2IzMTIzNGQyNTk0OS4uMTIyZjczNzA3MThiMDAyM2ZlMTMyN2MzMTkxOGQy ZDgyMmQxN2FkMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE4LTEwLTAzICBDYXJs b3MgRWR1YXJkbyBSYW1hbGhvICA8Y2FkdWJlbnR6ZW5AZ21haWwuY29tPgorCisgICAgICAgIFtD b29yZEdyYXBoaWNzXSBSZW1vdmUgdGhlICdwcmV2aW91cyBiYWNraW5nIHN0b3JlJyBsb2dpYwor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg4ODM4CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVtb3ZlIHBy ZXZpb3VzQmFja2luZ1N0b3JlIGZyb20gTGF5ZXJTdGF0ZSwgc2luY2UgaXQncyBub3QgbmVlZGVk IGFueW1vcmUuCisgICAgICAgIFdoZW4gdGhlcmUgaXMgc2NhbGUgYWRqdXN0bWVudCwgd2Ugbm93 IHNpbXBseSBkaXNjYXJkIG1haW5CYWNraW5nU3RvcmUgYW5kCisgICAgICAgIHJlY3JlYXRlIGEg bmV3IG9uZS4KKworICAgICAgICBObyBuZXcgdGVzdHMgcmVxdWlyZWQuCisKKyAgICAgICAgKiBw bGF0Zm9ybS9ncmFwaGljcy9uaWNvc2lhL3RleG1hcC9OaWNvc2lhQmFja2luZ1N0b3JlVGV4dHVy ZU1hcHBlckltcGwuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvY29vcmRp bmF0ZWQvQ29vcmRpbmF0ZWRHcmFwaGljc0xheWVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNv b3JkaW5hdGVkR3JhcGhpY3NMYXllcjo6Zmx1c2hDb21wb3NpdGluZ1N0YXRlRm9yVGhpc0xheWVy T25seSk6CisgICAgICAgIChXZWJDb3JlOjpDb29yZGluYXRlZEdyYXBoaWNzTGF5ZXI6OnVwZGF0 ZUNvbnRlbnRCdWZmZXJzKToKKyAgICAgICAgKFdlYkNvcmU6OkNvb3JkaW5hdGVkR3JhcGhpY3NM YXllcjo6cHVyZ2VCYWNraW5nU3RvcmVzKToKKwogMjAxOC0xMC0wMyAgWW91ZW5uIEZhYmxldCAg PHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgRW5hYmxlIEgyNjQgc2ltdWxjYXN0CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9uaWNvc2lhL3RleG1hcC9O aWNvc2lhQmFja2luZ1N0b3JlVGV4dHVyZU1hcHBlckltcGwuaCBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL25pY29zaWEvdGV4bWFwL05pY29zaWFCYWNraW5nU3RvcmVUZXh0dXJl TWFwcGVySW1wbC5oCmluZGV4IDE2ZTExNDUxODU1OTZjYzFkNGY4YzYzODg2YzRmMmEyYjFjNzc4 MWEuLmVhZDQ5Nzc2ZTUwYTIzY2ZkNTAxNGE3ZTk2NDMwYjNkZTEyNGRiMGEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL25pY29zaWEvdGV4bWFwL05pY29zaWFC YWNraW5nU3RvcmVUZXh0dXJlTWFwcGVySW1wbC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL25pY29zaWEvdGV4bWFwL05pY29zaWFCYWNraW5nU3RvcmVUZXh0dXJlTWFw cGVySW1wbC5oCkBAIC04NSw3ICs4NSw2IEBAIHB1YmxpYzoKICAgICAgICAgTGF5ZXJTdGF0ZSYg b3BlcmF0b3I9KExheWVyU3RhdGUmJikgPSBkZWxldGU7CiAKICAgICAgICAgc3RkOjp1bmlxdWVf cHRyPFdlYkNvcmU6OlRpbGVkQmFja2luZ1N0b3JlPiBtYWluQmFja2luZ1N0b3JlOwotICAgICAg ICBzdGQ6OnVuaXF1ZV9wdHI8V2ViQ29yZTo6VGlsZWRCYWNraW5nU3RvcmU+IHByZXZpb3VzQmFj a2luZ1N0b3JlOwogCiAgICAgICAgIFRpbGVVcGRhdGUgdXBkYXRlOwogICAgICAgICBib29sIGlz Rmx1c2hpbmcgeyBmYWxzZSB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvdGV4bWFwL2Nvb3JkaW5hdGVkL0Nvb3JkaW5hdGVkR3JhcGhpY3NMYXllci5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvY29vcmRpbmF0ZWQvQ29v cmRpbmF0ZWRHcmFwaGljc0xheWVyLmNwcAppbmRleCBmMjVjN2I4YTJiMzk5YjhkYzczMDdmNzRi YjQzOTQ4NmUwZDgzY2UxLi5kNjgxZmQyYjdmMTczNDZlZjMzMGExZDc1ZTMzMTRjNDAzOGIzMzNm IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvY29v cmRpbmF0ZWQvQ29vcmRpbmF0ZWRHcmFwaGljc0xheWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvY29vcmRpbmF0ZWQvQ29vcmRpbmF0ZWRHcmFwaGlj c0xheWVyLmNwcApAQCAtNjQ3LDcgKzY0Nyw2IEBAIHZvaWQgQ29vcmRpbmF0ZWRHcmFwaGljc0xh eWVyOjpmbHVzaENvbXBvc2l0aW5nU3RhdGVGb3JUaGlzTGF5ZXJPbmx5KCkKICAgICAgICAgYXV0 byYgbGF5ZXJTdGF0ZSA9IGRvd25jYXN0PE5pY29zaWE6OkJhY2tpbmdTdG9yZVRleHR1cmVNYXBw ZXJJbXBsPihtX25pY29zaWEuYmFja2luZ1N0b3JlLT5pbXBsKCkpLmxheWVyU3RhdGUoKTsKICAg ICAgICAgbGF5ZXJTdGF0ZS5pc1B1cmdpbmcgPSB0cnVlOwogICAgICAgICBsYXllclN0YXRlLm1h aW5CYWNraW5nU3RvcmUgPSBudWxscHRyOwotICAgICAgICBsYXllclN0YXRlLnByZXZpb3VzQmFj a2luZ1N0b3JlID0gbnVsbHB0cjsKIAogICAgICAgICBtX25pY29zaWEuYmFja2luZ1N0b3JlID0g bnVsbHB0cjsKICAgICAgICAgbV9uaWNvc2lhLmRlbHRhLmJhY2tpbmdTdG9yZUNoYW5nZWQgPSB0 cnVlOwpAQCAtODY2LDE5ICs4NjUsMTAgQEAgdm9pZCBDb29yZGluYXRlZEdyYXBoaWNzTGF5ZXI6 OnVwZGF0ZUNvbnRlbnRCdWZmZXJzKCkKICAgICAgICAgICAgIGxheWVyU3RhdGUuaXNGbHVzaGlu ZyA9IGZhbHNlOwogICAgICAgICB9OwogCi0gICAgLy8gQWRkcmVzcyB0aGUgY29udGVudCBzY2Fs ZSBhZGp1c3RtZW50LgotICAgIC8vIEZJWE1FOiB0aGUgcHJldmlvdXNCYWNraW5nU3RvcmUgbG9n aWMgaXMgbGlrZWx5IHBvc3NpYmxlIHRvIHJlbW92ZS4KLSAgICAvLyBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg4NjkzCi0gICAgaWYgKG1fcGVuZGluZ0NvbnRlbnRz U2NhbGVBZGp1c3RtZW50KSB7Ci0gICAgICAgIGlmIChsYXllclN0YXRlLm1haW5CYWNraW5nU3Rv cmUgJiYgbGF5ZXJTdGF0ZS5tYWluQmFja2luZ1N0b3JlLT5jb250ZW50c1NjYWxlKCkgIT0gZWZm ZWN0aXZlQ29udGVudHNTY2FsZSgpKSB7Ci0gICAgICAgICAgICAvLyBCZXR3ZWVuIGNyZWF0aW5n IHRoZSBuZXcgYmFja2luZyBzdG9yZSBhbmQgcGFpbnRpbmcgdGhlIGNvbnRlbnQsIHdlIGRvIG5v dAotICAgICAgICAgICAgLy8gd2FudCB0byBkcm9wIHRoZSBwcmV2aW91cyBvbmUgYXMgdGhhdCBt aWdodCByZXN1bHQgaW4gYnJpZWZseSBzZWVpbmcgZmxpY2tlcmluZwotICAgICAgICAgICAgLy8g YXMgdGhlIG9sZCB0aWxlcyBtYXkgYmUgZHJvcHBlZCBiZWZvcmUgc29tZXRoaW5nIHJlcGxhY2Vz IHRoZW0uCi0gICAgICAgICAgICBsYXllclN0YXRlLnByZXZpb3VzQmFja2luZ1N0b3JlID0gV1RG TW92ZShsYXllclN0YXRlLm1haW5CYWNraW5nU3RvcmUpOwotCi0gICAgICAgICAgICAvLyBObyBy ZWFzb24gdG8gc2F2ZSB0aGUgcHJldmlvdXMgYmFja2luZyBzdG9yZSBmb3Igbm9uLXZpc2libGUg YXJlYXMuCi0gICAgICAgICAgICBsYXllclN0YXRlLnByZXZpb3VzQmFja2luZ1N0b3JlLT5yZW1v dmVBbGxOb25WaXNpYmxlVGlsZXModHJhbnNmb3JtZWRWaXNpYmxlUmVjdCgpLCBJbnRSZWN0KDAs IDAsIHNpemUoKS53aWR0aCgpLCBzaXplKCkuaGVpZ2h0KCkpKTsKLSAgICAgICAgfQorICAgIGlm IChtX3BlbmRpbmdDb250ZW50c1NjYWxlQWRqdXN0bWVudAorICAgICAgICAmJiBsYXllclN0YXRl Lm1haW5CYWNraW5nU3RvcmUgJiYgbGF5ZXJTdGF0ZS5tYWluQmFja2luZ1N0b3JlLT5jb250ZW50 c1NjYWxlKCkgIT0gZWZmZWN0aXZlQ29udGVudHNTY2FsZSgpKSB7CisgICAgICAgIC8vIERpc2Nh cmQgdGhlIFRpbGVkQmFja2luZ1N0b3JlIG9iamVjdCB0byByZWNvbnN0cnVjdCBpdCB3aXRoIG5l dyBjb250ZW50IHNjYWxlLgorICAgICAgICBsYXllclN0YXRlLm1haW5CYWNraW5nU3RvcmUgPSBu dWxscHRyOwogICAgICAgICBtX3BlbmRpbmdDb250ZW50c1NjYWxlQWRqdXN0bWVudCA9IGZhbHNl OwogICAgIH0KIApAQCAtOTQzLDEyICs5MzMsNiBAQCB2b2lkIENvb3JkaW5hdGVkR3JhcGhpY3NM YXllcjo6dXBkYXRlQ29udGVudEJ1ZmZlcnMoKQogICAgICAgICAgICAgZGlkVXBkYXRlVGlsZUJ1 ZmZlcnMoKTsKICAgICB9CiAKLSAgICAvLyBUaGUgcHJldmlvdXMgYmFja2luZyBzdG9yZSBpcyBr ZXB0IGFyb3VuZCB0byBhdm9pZCBmbGlja2VyaW5nIGJldHdlZW4KLSAgICAvLyByZW1vdmluZyB0 aGUgZXhpc3RpbmcgdGlsZXMgYW5kIHBhaW50aW5nIHRoZSBuZXcgb25lcy4gVGhlIGZpcnN0IHRp bWUKLSAgICAvLyB0aGUgdmlzaWJsZVJlY3QgaXMgZnVsbCBwYWludGVkIHdlIHJlbW92ZSB0aGUg cHJldmlvdXMgYmFja2luZyBzdG9yZS4KLSAgICBpZiAobGF5ZXJTdGF0ZS5wcmV2aW91c0JhY2tp bmdTdG9yZSAmJiBsYXllclN0YXRlLm1haW5CYWNraW5nU3RvcmUtPnZpc2libGVBcmVhSXNDb3Zl cmVkKCkpCi0gICAgICAgIGxheWVyU3RhdGUucHJldmlvdXNCYWNraW5nU3RvcmUgPSBudWxscHRy OwotCiAgICAgLy8gUmVxdWVzdCBhIHNlY29uZCB1cGRhdGUgaW1tZWRpYXRlbHkgaWYgc29tZSB0 aWxlcyBhcmUgc3RpbGwgcGVuZGluZyBjcmVhdGlvbi4KICAgICBpZiAobGF5ZXJTdGF0ZS5oYXNQ ZW5kaW5nVGlsZUNyZWF0aW9uKSB7CiAgICAgICAgIHNldE5lZWRzVmlzaWJsZVJlY3RBZGp1c3Rt ZW50KCk7CkBAIC05NjcsNyArOTUxLDYgQEAgdm9pZCBDb29yZGluYXRlZEdyYXBoaWNzTGF5ZXI6 OnB1cmdlQmFja2luZ1N0b3JlcygpCiAgICAgICAgIGF1dG8mIGxheWVyU3RhdGUgPSBkb3duY2Fz dDxOaWNvc2lhOjpCYWNraW5nU3RvcmVUZXh0dXJlTWFwcGVySW1wbD4obV9uaWNvc2lhLmJhY2tp bmdTdG9yZS0+aW1wbCgpKS5sYXllclN0YXRlKCk7CiAgICAgICAgIGxheWVyU3RhdGUuaXNQdXJn aW5nID0gdHJ1ZTsKICAgICAgICAgbGF5ZXJTdGF0ZS5tYWluQmFja2luZ1N0b3JlID0gbnVsbHB0 cjsKLSAgICAgICAgbGF5ZXJTdGF0ZS5wcmV2aW91c0JhY2tpbmdTdG9yZSA9IG51bGxwdHI7CiAK ICAgICAgICAgbV9uaWNvc2lhLmJhY2tpbmdTdG9yZSA9IG51bGxwdHI7CiAgICAgfQo= 351594 2018-10-04 05:53:10 -0700 2018-10-09 12:23:29 -0700 Patch bug-188838-20181004145308.patch text/plain 5152 cadubentzen U3VidmVyc2lvbiBSZXZpc2lvbjogMjM2NzkzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjljMGRmZTE2Nzg5ZDZh ZTUzZjZkYzdiYjhkM2IzMTIzNGQyNTk0OS4uMTIyZjczNzA3MThiMDAyM2ZlMTMyN2MzMTkxOGQy ZDgyMmQxN2FkMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE4LTEwLTAzICBDYXJs b3MgRWR1YXJkbyBSYW1hbGhvICA8Y2FkdWJlbnR6ZW5AZ21haWwuY29tPgorCisgICAgICAgIFtD b29yZEdyYXBoaWNzXSBSZW1vdmUgdGhlICdwcmV2aW91cyBiYWNraW5nIHN0b3JlJyBsb2dpYwor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg4ODM4CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVtb3ZlIHBy ZXZpb3VzQmFja2luZ1N0b3JlIGZyb20gTGF5ZXJTdGF0ZSwgc2luY2UgaXQncyBub3QgbmVlZGVk IGFueW1vcmUuCisgICAgICAgIFdoZW4gdGhlcmUgaXMgc2NhbGUgYWRqdXN0bWVudCwgd2Ugbm93 IHNpbXBseSBkaXNjYXJkIG1haW5CYWNraW5nU3RvcmUgYW5kCisgICAgICAgIHJlY3JlYXRlIGEg bmV3IG9uZS4KKworICAgICAgICBObyBuZXcgdGVzdHMgcmVxdWlyZWQuCisKKyAgICAgICAgKiBw bGF0Zm9ybS9ncmFwaGljcy9uaWNvc2lhL3RleG1hcC9OaWNvc2lhQmFja2luZ1N0b3JlVGV4dHVy ZU1hcHBlckltcGwuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvY29vcmRp bmF0ZWQvQ29vcmRpbmF0ZWRHcmFwaGljc0xheWVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNv b3JkaW5hdGVkR3JhcGhpY3NMYXllcjo6Zmx1c2hDb21wb3NpdGluZ1N0YXRlRm9yVGhpc0xheWVy T25seSk6CisgICAgICAgIChXZWJDb3JlOjpDb29yZGluYXRlZEdyYXBoaWNzTGF5ZXI6OnVwZGF0 ZUNvbnRlbnRCdWZmZXJzKToKKyAgICAgICAgKFdlYkNvcmU6OkNvb3JkaW5hdGVkR3JhcGhpY3NM YXllcjo6cHVyZ2VCYWNraW5nU3RvcmVzKToKKwogMjAxOC0xMC0wMyAgWW91ZW5uIEZhYmxldCAg PHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgRW5hYmxlIEgyNjQgc2ltdWxjYXN0CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9uaWNvc2lhL3RleG1hcC9O aWNvc2lhQmFja2luZ1N0b3JlVGV4dHVyZU1hcHBlckltcGwuaCBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL25pY29zaWEvdGV4bWFwL05pY29zaWFCYWNraW5nU3RvcmVUZXh0dXJl TWFwcGVySW1wbC5oCmluZGV4IDE2ZTExNDUxODU1OTZjYzFkNGY4YzYzODg2YzRmMmEyYjFjNzc4 MWEuLmVhZDQ5Nzc2ZTUwYTIzY2ZkNTAxNGE3ZTk2NDMwYjNkZTEyNGRiMGEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL25pY29zaWEvdGV4bWFwL05pY29zaWFC YWNraW5nU3RvcmVUZXh0dXJlTWFwcGVySW1wbC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL25pY29zaWEvdGV4bWFwL05pY29zaWFCYWNraW5nU3RvcmVUZXh0dXJlTWFw cGVySW1wbC5oCkBAIC04NSw3ICs4NSw2IEBAIHB1YmxpYzoKICAgICAgICAgTGF5ZXJTdGF0ZSYg b3BlcmF0b3I9KExheWVyU3RhdGUmJikgPSBkZWxldGU7CiAKICAgICAgICAgc3RkOjp1bmlxdWVf cHRyPFdlYkNvcmU6OlRpbGVkQmFja2luZ1N0b3JlPiBtYWluQmFja2luZ1N0b3JlOwotICAgICAg ICBzdGQ6OnVuaXF1ZV9wdHI8V2ViQ29yZTo6VGlsZWRCYWNraW5nU3RvcmU+IHByZXZpb3VzQmFj a2luZ1N0b3JlOwogCiAgICAgICAgIFRpbGVVcGRhdGUgdXBkYXRlOwogICAgICAgICBib29sIGlz Rmx1c2hpbmcgeyBmYWxzZSB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvdGV4bWFwL2Nvb3JkaW5hdGVkL0Nvb3JkaW5hdGVkR3JhcGhpY3NMYXllci5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvY29vcmRpbmF0ZWQvQ29v cmRpbmF0ZWRHcmFwaGljc0xheWVyLmNwcAppbmRleCBmMjVjN2I4YTJiMzk5YjhkYzczMDdmNzRi YjQzOTQ4NmUwZDgzY2UxLi41YzhjZjM1NTUxN2ZjNTIxOWYyMTkxYTEyM2VkN2YxOTJlOWRiZWYy IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvY29v cmRpbmF0ZWQvQ29vcmRpbmF0ZWRHcmFwaGljc0xheWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvY29vcmRpbmF0ZWQvQ29vcmRpbmF0ZWRHcmFwaGlj c0xheWVyLmNwcApAQCAtNjQ3LDcgKzY0Nyw2IEBAIHZvaWQgQ29vcmRpbmF0ZWRHcmFwaGljc0xh eWVyOjpmbHVzaENvbXBvc2l0aW5nU3RhdGVGb3JUaGlzTGF5ZXJPbmx5KCkKICAgICAgICAgYXV0 byYgbGF5ZXJTdGF0ZSA9IGRvd25jYXN0PE5pY29zaWE6OkJhY2tpbmdTdG9yZVRleHR1cmVNYXBw ZXJJbXBsPihtX25pY29zaWEuYmFja2luZ1N0b3JlLT5pbXBsKCkpLmxheWVyU3RhdGUoKTsKICAg ICAgICAgbGF5ZXJTdGF0ZS5pc1B1cmdpbmcgPSB0cnVlOwogICAgICAgICBsYXllclN0YXRlLm1h aW5CYWNraW5nU3RvcmUgPSBudWxscHRyOwotICAgICAgICBsYXllclN0YXRlLnByZXZpb3VzQmFj a2luZ1N0b3JlID0gbnVsbHB0cjsKIAogICAgICAgICBtX25pY29zaWEuYmFja2luZ1N0b3JlID0g bnVsbHB0cjsKICAgICAgICAgbV9uaWNvc2lhLmRlbHRhLmJhY2tpbmdTdG9yZUNoYW5nZWQgPSB0 cnVlOwpAQCAtODY3LDE3ICs4NjYsMTAgQEAgdm9pZCBDb29yZGluYXRlZEdyYXBoaWNzTGF5ZXI6 OnVwZGF0ZUNvbnRlbnRCdWZmZXJzKCkKICAgICAgICAgfTsKIAogICAgIC8vIEFkZHJlc3MgdGhl IGNvbnRlbnQgc2NhbGUgYWRqdXN0bWVudC4KLSAgICAvLyBGSVhNRTogdGhlIHByZXZpb3VzQmFj a2luZ1N0b3JlIGxvZ2ljIGlzIGxpa2VseSBwb3NzaWJsZSB0byByZW1vdmUuCi0gICAgLy8gaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4ODY5MwogICAgIGlmIChtX3Bl bmRpbmdDb250ZW50c1NjYWxlQWRqdXN0bWVudCkgewogICAgICAgICBpZiAobGF5ZXJTdGF0ZS5t YWluQmFja2luZ1N0b3JlICYmIGxheWVyU3RhdGUubWFpbkJhY2tpbmdTdG9yZS0+Y29udGVudHNT Y2FsZSgpICE9IGVmZmVjdGl2ZUNvbnRlbnRzU2NhbGUoKSkgewotICAgICAgICAgICAgLy8gQmV0 d2VlbiBjcmVhdGluZyB0aGUgbmV3IGJhY2tpbmcgc3RvcmUgYW5kIHBhaW50aW5nIHRoZSBjb250 ZW50LCB3ZSBkbyBub3QKLSAgICAgICAgICAgIC8vIHdhbnQgdG8gZHJvcCB0aGUgcHJldmlvdXMg b25lIGFzIHRoYXQgbWlnaHQgcmVzdWx0IGluIGJyaWVmbHkgc2VlaW5nIGZsaWNrZXJpbmcKLSAg ICAgICAgICAgIC8vIGFzIHRoZSBvbGQgdGlsZXMgbWF5IGJlIGRyb3BwZWQgYmVmb3JlIHNvbWV0 aGluZyByZXBsYWNlcyB0aGVtLgotICAgICAgICAgICAgbGF5ZXJTdGF0ZS5wcmV2aW91c0JhY2tp bmdTdG9yZSA9IFdURk1vdmUobGF5ZXJTdGF0ZS5tYWluQmFja2luZ1N0b3JlKTsKLQotICAgICAg ICAgICAgLy8gTm8gcmVhc29uIHRvIHNhdmUgdGhlIHByZXZpb3VzIGJhY2tpbmcgc3RvcmUgZm9y IG5vbi12aXNpYmxlIGFyZWFzLgotICAgICAgICAgICAgbGF5ZXJTdGF0ZS5wcmV2aW91c0JhY2tp bmdTdG9yZS0+cmVtb3ZlQWxsTm9uVmlzaWJsZVRpbGVzKHRyYW5zZm9ybWVkVmlzaWJsZVJlY3Qo KSwgSW50UmVjdCgwLCAwLCBzaXplKCkud2lkdGgoKSwgc2l6ZSgpLmhlaWdodCgpKSk7CisgICAg ICAgICAgICAvLyBEaXNjYXJkIHRoZSBUaWxlZEJhY2tpbmdTdG9yZSBvYmplY3QgdG8gcmVjb25z dHJ1Y3QgaXQgd2l0aCBuZXcgY29udGVudCBzY2FsZS4KKyAgICAgICAgICAgIGxheWVyU3RhdGUu bWFpbkJhY2tpbmdTdG9yZSA9IG51bGxwdHI7CiAgICAgICAgIH0KICAgICAgICAgbV9wZW5kaW5n Q29udGVudHNTY2FsZUFkanVzdG1lbnQgPSBmYWxzZTsKICAgICB9CkBAIC05NDMsMTIgKzkzNSw2 IEBAIHZvaWQgQ29vcmRpbmF0ZWRHcmFwaGljc0xheWVyOjp1cGRhdGVDb250ZW50QnVmZmVycygp CiAgICAgICAgICAgICBkaWRVcGRhdGVUaWxlQnVmZmVycygpOwogICAgIH0KIAotICAgIC8vIFRo ZSBwcmV2aW91cyBiYWNraW5nIHN0b3JlIGlzIGtlcHQgYXJvdW5kIHRvIGF2b2lkIGZsaWNrZXJp bmcgYmV0d2VlbgotICAgIC8vIHJlbW92aW5nIHRoZSBleGlzdGluZyB0aWxlcyBhbmQgcGFpbnRp bmcgdGhlIG5ldyBvbmVzLiBUaGUgZmlyc3QgdGltZQotICAgIC8vIHRoZSB2aXNpYmxlUmVjdCBp cyBmdWxsIHBhaW50ZWQgd2UgcmVtb3ZlIHRoZSBwcmV2aW91cyBiYWNraW5nIHN0b3JlLgotICAg IGlmIChsYXllclN0YXRlLnByZXZpb3VzQmFja2luZ1N0b3JlICYmIGxheWVyU3RhdGUubWFpbkJh Y2tpbmdTdG9yZS0+dmlzaWJsZUFyZWFJc0NvdmVyZWQoKSkKLSAgICAgICAgbGF5ZXJTdGF0ZS5w cmV2aW91c0JhY2tpbmdTdG9yZSA9IG51bGxwdHI7Ci0KICAgICAvLyBSZXF1ZXN0IGEgc2Vjb25k IHVwZGF0ZSBpbW1lZGlhdGVseSBpZiBzb21lIHRpbGVzIGFyZSBzdGlsbCBwZW5kaW5nIGNyZWF0 aW9uLgogICAgIGlmIChsYXllclN0YXRlLmhhc1BlbmRpbmdUaWxlQ3JlYXRpb24pIHsKICAgICAg ICAgc2V0TmVlZHNWaXNpYmxlUmVjdEFkanVzdG1lbnQoKTsKQEAgLTk2Nyw3ICs5NTMsNiBAQCB2 b2lkIENvb3JkaW5hdGVkR3JhcGhpY3NMYXllcjo6cHVyZ2VCYWNraW5nU3RvcmVzKCkKICAgICAg ICAgYXV0byYgbGF5ZXJTdGF0ZSA9IGRvd25jYXN0PE5pY29zaWE6OkJhY2tpbmdTdG9yZVRleHR1 cmVNYXBwZXJJbXBsPihtX25pY29zaWEuYmFja2luZ1N0b3JlLT5pbXBsKCkpLmxheWVyU3RhdGUo KTsKICAgICAgICAgbGF5ZXJTdGF0ZS5pc1B1cmdpbmcgPSB0cnVlOwogICAgICAgICBsYXllclN0 YXRlLm1haW5CYWNraW5nU3RvcmUgPSBudWxscHRyOwotICAgICAgICBsYXllclN0YXRlLnByZXZp b3VzQmFja2luZ1N0b3JlID0gbnVsbHB0cjsKIAogICAgICAgICBtX25pY29zaWEuYmFja2luZ1N0 b3JlID0gbnVsbHB0cjsKICAgICB9Cg==