47030 2010-10-01 17:10:27 -0700 Clean up resources when LayerRenderer changes 2010-10-06 08:18:08 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 0 vrk webkit-unassigned hclam jamesr vangelis oldest_to_newest 288589 0 vrk 2010-10-01 17:10:27 -0700 Clean up resources when LayerRenderer changes 288591 1 69545 vrk 2010-10-01 17:14:01 -0700 Created attachment 69545 Patch 289712 2 69545 vangelis 2010-10-05 10:18:20 -0700 Comment on attachment 69545 Patch Looks fine although it will collide with : https://bugs.webkit.org/show_bug.cgi?id=46765 Should we merge the two into a single checkin? 289714 3 hclam 2010-10-05 10:20:30 -0700 I'd let her checkin first and I'll merge later. 289904 4 69545 jamesr 2010-10-05 14:50:23 -0700 Comment on attachment 69545 Patch This is copy-paste from ContentLayerChromium so we should move this logic up to the base class. Specifically, add a virtual cleanupResources() function to LayerChromium and have LayerChromium::setLayerRenderer() invoke it. 290018 5 69875 vrk 2010-10-05 18:17:13 -0700 Created attachment 69875 Patch 290022 6 vrk 2010-10-05 18:22:08 -0700 (In reply to comment #3) > I'd let her checkin first and I'll merge later. Alpha actually already committed his linked patch (http://trac.webkit.org/changeset/69163), so my patch here has been modified (slightly) to fit with the current code. (In reply to comment #4) > (From update of attachment 69545 [details]) > This is copy-paste from ContentLayerChromium so we should move this logic up to the base class. Specifically, add a virtual cleanupResources() function to LayerChromium and have LayerChromium::setLayerRenderer() invoke it. Thanks for the tip! I added this and updated the related files. Take another look? 290026 7 69875 jamesr 2010-10-05 18:24:10 -0700 Comment on attachment 69875 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=69875&action=review R=me. Please kill the extra ; in the header - you can either do that while landing, or upload another patch and I'll r+/cq+ > WebCore/platform/graphics/chromium/LayerChromium.h:208 > + virtual void cleanupResources() { }; no semicolon needed here 290031 8 vrk 2010-10-05 18:43:36 -0700 (In reply to comment #7) > > WebCore/platform/graphics/chromium/LayerChromium.h:208 > > + virtual void cleanupResources() { }; > > no semicolon needed here Removed. Thanks so much for reviewing, James! Committed by Alpha here: http://trac.webkit.org/changeset/69166 290310 9 69875 vangelis 2010-10-06 08:18:08 -0700 Comment on attachment 69875 Patch Sorry I'm late to this. I like the idea of making cleanupResources a virtual. How about calling it from the LayerChromium destructor as well instead of having to call it from each derived class destructor? 69545 2010-10-01 17:14:01 -0700 2010-10-05 18:17:10 -0700 Patch bug-47030-20101001171400.patch text/plain 2889 vrk ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NDFlMzc4NDgzZDJiNWU4ODJlNzAyNmJmNDM1MDdjOTFmOTVjOGJkYi4uNTg4NWNmM2QwMjAzN2Nj OTJiZGYxNzQyYTdmMDMwMDcxZDI5NjEyMyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxMC0xMC0wMSAgVmlj dG9yaWEgS2lyc3QgIDx2cmtAZ29vZ2xlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBWaWRlb0xheWVyQ2hyb21pdW0gcmVsZWFzZXMgb2xkIHJl c291cmNlcyBpZiB0aGUgTGF5ZXJSZW5kZXJlciBjaGFuZ2VzLgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDcwMzAKKworICAgICAgICAqIHBsYXRmb3Jt L2dyYXBoaWNzL2Nocm9taXVtL1ZpZGVvTGF5ZXJDaHJvbWl1bS5jcHA6CisgICAgICAgIChXZWJD b3JlOjpWaWRlb0xheWVyQ2hyb21pdW06On5WaWRlb0xheWVyQ2hyb21pdW0pOgorICAgICAgICAo V2ViQ29yZTo6VmlkZW9MYXllckNocm9taXVtOjpzZXRMYXllclJlbmRlcmVyKToKKyAgICAgICAg KFdlYkNvcmU6OlZpZGVvTGF5ZXJDaHJvbWl1bTo6Y2xlYW51cFJlc291cmNlcyk6CisgICAgICAg ICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vVmlkZW9MYXllckNocm9taXVtLmg6CisKIDIw MTAtMTAtMDEgIERhbiBCZXJuc3RlaW4gIDxtaXR6QGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZp ZXdlZCBieSBBZGVsZSBQZXRlcnNvbi4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvY2hyb21pdW0vVmlkZW9MYXllckNocm9taXVtLmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvY2hyb21pdW0vVmlkZW9MYXllckNocm9taXVtLmNwcAppbmRleCAyNjY0MWE5YmY5 ZTkxMzE1YzgzMzhmYzJlZGI2NTUyOTVjMGJiMTMzLi4xZWJhOWY3N2ZlN2JkNGQ4ODljNmM2Yjgw NTUwNzViOTljNjM3NzU3IDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2No cm9taXVtL1ZpZGVvTGF5ZXJDaHJvbWl1bS5jcHAKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9jaHJvbWl1bS9WaWRlb0xheWVyQ2hyb21pdW0uY3BwCkBAIC0xODUsNiArMTg1LDIxIEBA IFZpZGVvTGF5ZXJDaHJvbWl1bTo6VmlkZW9MYXllckNocm9taXVtKEdyYXBoaWNzTGF5ZXJDaHJv bWl1bSogb3duZXIsIFZpZGVvRnJhbWVQCiAKIFZpZGVvTGF5ZXJDaHJvbWl1bTo6flZpZGVvTGF5 ZXJDaHJvbWl1bSgpCiB7CisgICAgY2xlYW51cFJlc291cmNlcygpOworfQorCit2b2lkIFZpZGVv TGF5ZXJDaHJvbWl1bTo6c2V0TGF5ZXJSZW5kZXJlcihMYXllclJlbmRlcmVyQ2hyb21pdW0qIHJl bmRlcmVyKQoreworICAgIC8vIElmIHdlJ3JlIGNoYW5naW5nIGxheWVyIHJlbmRlcmVycyB0aGVu IHdlIG5lZWQgdG8gZnJlZSB1cCBhbnkgcmVzb3VyY2VzCisgICAgLy8gYWxsb2NhdGVkIGJ5IHRo ZSBvbGQgcmVuZGVyZXIuCisgICAgaWYgKGxheWVyUmVuZGVyZXIoKSAmJiBsYXllclJlbmRlcmVy KCkgIT0gcmVuZGVyZXIpCisgICAgICAgIGNsZWFudXBSZXNvdXJjZXMoKTsKKworICAgIExheWVy Q2hyb21pdW06OnNldExheWVyUmVuZGVyZXIocmVuZGVyZXIpOworfQorCit2b2lkIFZpZGVvTGF5 ZXJDaHJvbWl1bTo6Y2xlYW51cFJlc291cmNlcygpCit7CiAgICAgR3JhcGhpY3NDb250ZXh0M0Qq IGNvbnRleHQgPSBsYXllclJlbmRlcmVyQ29udGV4dCgpOwogICAgIGZvciAodW5zaWduZWQgcGxh bmUgPSAwOyBwbGFuZSA8IFZpZGVvRnJhbWVDaHJvbWl1bTo6bWF4UGxhbmVzOyBwbGFuZSsrKSB7 CiAgICAgICAgIGlmIChtX3RleHR1cmVzW3BsYW5lXSkKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vVmlkZW9MYXllckNocm9taXVtLmggYi9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL1ZpZGVvTGF5ZXJDaHJvbWl1bS5oCmluZGV4IDYyMGQx YTcyYjkxMjUzYzkyNWE3MWRkNmI0NDgwY2E0ODAxYjMxY2YuLjc1MTZmZGE0NDlhODE4N2Q5ZDA1 ODU2YWZlZGQ2OTczMGU1ZDllYzYgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY2hyb21pdW0vVmlkZW9MYXllckNocm9taXVtLmgKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9jaHJvbWl1bS9WaWRlb0xheWVyQ2hyb21pdW0uaApAQCAtNDgsNiArNDgsNyBAQCBw dWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIHVwZGF0ZUNvbnRlbnRzKCk7CiAgICAgdmlydHVhbCBi b29sIGRyYXdzQ29udGVudCgpIHsgcmV0dXJuIHRydWU7IH0KICAgICB2aXJ0dWFsIHZvaWQgZHJh dygpOworICAgIHZpcnR1YWwgdm9pZCBzZXRMYXllclJlbmRlcmVyKExheWVyUmVuZGVyZXJDaHJv bWl1bSopOwogCiAgICAgY2xhc3MgU2hhcmVkVmFsdWVzIHsKICAgICBwdWJsaWM6CkBAIC04Nyw2 ICs4OCw4IEBAIHB1YmxpYzoKIAogcHJpdmF0ZToKICAgICBWaWRlb0xheWVyQ2hyb21pdW0oR3Jh cGhpY3NMYXllckNocm9taXVtKiBvd25lciwgVmlkZW9GcmFtZVByb3ZpZGVyKik7CisgICAgdm9p ZCBjbGVhbnVwUmVzb3VyY2VzKCk7CisKICAgICBzdGF0aWMgdW5zaWduZWQgZGV0ZXJtaW5lVGV4 dHVyZUZvcm1hdChWaWRlb0ZyYW1lQ2hyb21pdW0qKTsKICAgICBib29sIGFsbG9jYXRlVGV4dHVy ZXNJZk5lZWRlZChHcmFwaGljc0NvbnRleHQzRCosIFZpZGVvRnJhbWVDaHJvbWl1bSosIHVuc2ln bmVkIHRleHR1cmVGb3JtYXQpOwogICAgIHZvaWQgdXBkYXRlWVVWQ29udGVudHMoR3JhcGhpY3ND b250ZXh0M0QqLCBjb25zdCBWaWRlb0ZyYW1lQ2hyb21pdW0qKTsK 69875 2010-10-05 18:17:13 -0700 2010-10-06 08:18:08 -0700 Patch bug-47030-20101005181711.patch text/plain 6529 vrk ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NTNkYzJkYTQxMjdlZTI4MDBkZWY1NTZjZjE4ZDUyZDZhYjcwMTY4MS4uMzJiMzc5M2ViYzZmNTIz NGUyNWY1MDU2MWQ3Mjk4MWRlMWUxNjRmZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNiBAQAorMjAxMC0xMC0wNSAgVmlj dG9yaWEgS2lyc3QgIDx2cmtAZ29vZ2xlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBWaWRlb0xheWVyQ2hyb21pdW0gcmVsZWFzZXMgb2xkIHJl c291cmNlcyBpZiB0aGUgTGF5ZXJSZW5kZXJlciBjaGFuZ2VzLgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDcwMzAKKworICAgICAgICBSZWZhY3RvcmVk IExheWVyQ2hyb21pdW0gdG8gaGF2ZSBhIHZpcnR1YWwgY2xlYW51cFJlc291cmNlcygpIG1ldGhv ZAorICAgICAgICB0aGF0IHdpbGwgcmVsZWFzZSB0ZXh0dXJlcy9vdGhlciBjb250ZXh0LWRlcGVu ZGVudCByZXNvdXJjZXMgd2hlbiBhCisgICAgICAgIExheWVyUmVuZGVyZXIgY2hhbmdlcy4gQ29u dGVudExheWVyQ2hyb21pdW0gYW5kIFZpZGVvTGF5ZXJDaHJvbWl1bSBub3cKKyAgICAgICAgb3Zl cnJpZGUgdGhpcyBtZXRob2QgdG8gcGVyZm9ybSBjbGVhbnVwLgorCisgICAgICAgICogcGxhdGZv cm0vZ3JhcGhpY3MvY2hyb21pdW0vQ29udGVudExheWVyQ2hyb21pdW0uY3BwOgorICAgICAgICAq IHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0NvbnRlbnRMYXllckNocm9taXVtLmg6CisgICAg ICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJDaHJvbWl1bS5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpMYXllckNocm9taXVtOjpzZXRMYXllclJlbmRlcmVyKToKKyAgICAgICAg KiBwbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllckNocm9taXVtLmg6CisgICAgICAgIChX ZWJDb3JlOjpMYXllckNocm9taXVtOjpjbGVhbnVwUmVzb3VyY2VzKToKKyAgICAgICAgKiBwbGF0 Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9WaWRlb0xheWVyQ2hyb21pdW0uY3BwOgorICAgICAgICAo V2ViQ29yZTo6VmlkZW9MYXllckNocm9taXVtOjp+VmlkZW9MYXllckNocm9taXVtKToKKyAgICAg ICAgKFdlYkNvcmU6OlZpZGVvTGF5ZXJDaHJvbWl1bTo6Y2xlYW51cFJlc291cmNlcyk6CisgICAg ICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vVmlkZW9MYXllckNocm9taXVtLmg6CisK IDIwMTAtMDktMjkgIEFscGhhIExhbSAgPGhjbGFtQGNocm9taXVtLm9yZz4KIAogICAgICAgICBS ZXZpZXdlZCBieSBKYW1lcyBSb2JpbnNvbi4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvY2hyb21pdW0vQ29udGVudExheWVyQ2hyb21pdW0uY3BwIGIvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9Db250ZW50TGF5ZXJDaHJvbWl1bS5jcHAKaW5kZXggOGRk YTRkNmM1ZWVmODczMmFmZDdlN2U0ZTIxYjcyYjgxZDE5NmMyNC4uNjM1ZTZkOGY1Y2ExYmVmOTUz MzUyNTBlZDZjMDUzZWI3NTVjZmFmZCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9jaHJvbWl1bS9Db250ZW50TGF5ZXJDaHJvbWl1bS5jcHAKKysrIGIvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9Db250ZW50TGF5ZXJDaHJvbWl1bS5jcHAKQEAgLTEyOSwx NiArMTI5LDYgQEAgQ29udGVudExheWVyQ2hyb21pdW06On5Db250ZW50TGF5ZXJDaHJvbWl1bSgp CiAgICAgY2xlYW51cFJlc291cmNlcygpOwogfQogCi12b2lkIENvbnRlbnRMYXllckNocm9taXVt OjpzZXRMYXllclJlbmRlcmVyKExheWVyUmVuZGVyZXJDaHJvbWl1bSogcmVuZGVyZXIpCi17Ci0g ICAgLy8gSWYgd2UncmUgY2hhbmdpbmcgbGF5ZXIgcmVuZGVyZXJzIHRoZW4gd2UgbmVlZCB0byBm cmVlIHVwIGFueSByZXNvdXJjZXMKLSAgICAvLyBhbGxvY2F0ZWQgYnkgdGhlIG9sZCByZW5kZXJl ci4KLSAgICBpZiAobGF5ZXJSZW5kZXJlcigpICYmIGxheWVyUmVuZGVyZXIoKSAhPSByZW5kZXJl cikKLSAgICAgICAgY2xlYW51cFJlc291cmNlcygpOwotCi0gICAgTGF5ZXJDaHJvbWl1bTo6c2V0 TGF5ZXJSZW5kZXJlcihyZW5kZXJlcik7Ci19Ci0KIHZvaWQgQ29udGVudExheWVyQ2hyb21pdW06 OmNsZWFudXBSZXNvdXJjZXMoKQogewogICAgIGlmIChsYXllclJlbmRlcmVyKCkpIHsKZGlmZiAt LWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vQ29udGVudExheWVyQ2hy b21pdW0uaCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vQ29udGVudExheWVy Q2hyb21pdW0uaAppbmRleCA0MTJiYTA2YzY0YmY1OGUyNGE2NGEwNDIyMDJhNWVkMzRlZDk0MmY2 Li43ZjMwMmZjZWE1NjNjOTIwZTI5MjE1MWMyZDU1YzA3OWE0NDMxNjg0IDEwMDY0NAotLS0gYS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0NvbnRlbnRMYXllckNocm9taXVtLmgK KysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9Db250ZW50TGF5ZXJDaHJv bWl1bS5oCkBAIC00OSw3ICs0OSw2IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgdXBkYXRl Q29udGVudHMoKTsKICAgICB2aXJ0dWFsIHZvaWQgZHJhdygpOwogICAgIHZpcnR1YWwgYm9vbCBk cmF3c0NvbnRlbnQoKSB7IHJldHVybiBtX293bmVyICYmIG1fb3duZXItPmRyYXdzQ29udGVudCgp OyB9Ci0gICAgdmlydHVhbCB2b2lkIHNldExheWVyUmVuZGVyZXIoTGF5ZXJSZW5kZXJlckNocm9t aXVtKik7CiAKICAgICAvLyBTdG9yZXMgdmFsdWVzIHRoYXQgYXJlIHNoYXJlZCBiZXR3ZWVuIGlu c3RhbmNlcyBvZiB0aGlzIGNsYXNzIHRoYXQgYXJlCiAgICAgLy8gYXNzb2NpYXRlZCB3aXRoIHRo ZSBzYW1lIExheWVyUmVuZGVyZXJDaHJvbWl1bSAoYW5kIGhlbmNlIHRoZSBzYW1lIEdMCkBAIC04 MCw3ICs3OSw3IEBAIHByb3RlY3RlZDoKICAgICB2b2lkIHVwZGF0ZVRleHR1cmVSZWN0KHZvaWQq IHBpeGVscywgY29uc3QgSW50U2l6ZSYgYml0bWFwU2l6ZSwgY29uc3QgSW50U2l6ZSYgcmVxdWly ZWRUZXh0dXJlU2l6ZSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IEludFJlY3Qm IHVwZGF0ZVJlY3QsIHVuc2lnbmVkIHRleHR1cmVJZCk7CiAKLSAgICB2b2lkIGNsZWFudXBSZXNv dXJjZXMoKTsKKyAgICB2aXJ0dWFsIHZvaWQgY2xlYW51cFJlc291cmNlcygpOwogCiAgICAgdW5z aWduZWQgbV9jb250ZW50c1RleHR1cmU7CiAgICAgSW50U2l6ZSBtX2FsbG9jYXRlZFRleHR1cmVT aXplOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXll ckNocm9taXVtLmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJD aHJvbWl1bS5jcHAKaW5kZXggNWRiYTU4ZDkzZmNkN2M3MWI5M2ViMDBlYjY1ZmY1MDA0ZDI1Mjkz Ny4uYTFmNzYxMTViMmU0OTJmZDZhZWM2MjVhMjFiY2IyOWFlZGI5MTE5OSAxMDA2NDQKLS0tIGEv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllckNocm9taXVtLmNwcAorKysg Yi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVyQ2hyb21pdW0uY3BwCkBA IC0xNzQsNiArMTc0LDExIEBAIExheWVyQ2hyb21pdW06On5MYXllckNocm9taXVtKCkKIAogdm9p ZCBMYXllckNocm9taXVtOjpzZXRMYXllclJlbmRlcmVyKExheWVyUmVuZGVyZXJDaHJvbWl1bSog cmVuZGVyZXIpCiB7CisgICAgLy8gSWYgd2UncmUgY2hhbmdpbmcgbGF5ZXIgcmVuZGVyZXJzIHRo ZW4gd2UgbmVlZCB0byBmcmVlIHVwIGFueSByZXNvdXJjZXMKKyAgICAvLyBhbGxvY2F0ZWQgYnkg dGhlIG9sZCByZW5kZXJlci4KKyAgICBpZiAobGF5ZXJSZW5kZXJlcigpICYmIGxheWVyUmVuZGVy ZXIoKSAhPSByZW5kZXJlcikKKyAgICAgICAgY2xlYW51cFJlc291cmNlcygpOworCiAgICAgbV9s YXllclJlbmRlcmVyID0gcmVuZGVyZXI7CiB9CiAKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJDaHJvbWl1bS5oIGIvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9jaHJvbWl1bS9MYXllckNocm9taXVtLmgKaW5kZXggMGE2NjMxOGVlNDA3YWM5Njcx YTRjN2QxMDBmNWM1M2VkYTQ4YTE1Mi4uNWYxNzU2YzZkZTYwZDNmZGY2MTVmMjAzYTNlODA0NTY2 OWU0ZTQwZiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9M YXllckNocm9taXVtLmgKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9M YXllckNocm9taXVtLmgKQEAgLTIwMiw2ICsyMDIsMTEgQEAgcHJvdGVjdGVkOgogICAgIEdyYXBo aWNzTGF5ZXJDaHJvbWl1bSogbV9vd25lcjsKICAgICBMYXllckNocm9taXVtKEdyYXBoaWNzTGF5 ZXJDaHJvbWl1bSogb3duZXIpOwogCisgICAgLy8gVGhpcyBpcyBjYWxsZWQgdG8gY2xlYW4gdXAg cmVzb3VyY2VzIGJlaW5nIGhlbGQgaW4gdGhlIHNhbWUgY29udGV4dCBhcworICAgIC8vIGxheWVy UmVuZGVyZXJDb250ZXh0KCkuIFN1YmNsYXNzZXMgc2hvdWxkIG92ZXJyaWRlIHRoaXMgbWV0aG9k IGlmIHRoZXkKKyAgICAvLyBob2xkIGNvbnRleHQtZGVwZW5kZW50IHJlc291cmNlcyBzdWNoIGFz IHRleHR1cmVzLgorICAgIHZpcnR1YWwgdm9pZCBjbGVhbnVwUmVzb3VyY2VzKCkgeyB9OworCiAg ICAgTGF5ZXJSZW5kZXJlckNocm9taXVtKiBsYXllclJlbmRlcmVyKCkgY29uc3QgeyByZXR1cm4g bV9sYXllclJlbmRlcmVyLmdldCgpOyB9CiAgICAgR3JhcGhpY3NDb250ZXh0M0QqIGxheWVyUmVu ZGVyZXJDb250ZXh0KCkgY29uc3Q7CiAKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvY2hyb21pdW0vVmlkZW9MYXllckNocm9taXVtLmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvY2hyb21pdW0vVmlkZW9MYXllckNocm9taXVtLmNwcAppbmRleCA4NzgxMDg0ZDI5 YWIzNjA1MWFjM2VlMzE5ZTZiODMzODM2MmQ3ZmE0Li4wMWI0ZDZlODE5Y2I3MWIwZWNmYWI2NjRj M2M2ZGM3ZjZhYTUxNjRlIDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2No cm9taXVtL1ZpZGVvTGF5ZXJDaHJvbWl1bS5jcHAKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9jaHJvbWl1bS9WaWRlb0xheWVyQ2hyb21pdW0uY3BwCkBAIC0xODIsOCArMTgyLDEyIEBA IFZpZGVvTGF5ZXJDaHJvbWl1bTo6VmlkZW9MYXllckNocm9taXVtKEdyYXBoaWNzTGF5ZXJDaHJv bWl1bSogb3duZXIsIFZpZGVvRnJhbWVQCiAKIFZpZGVvTGF5ZXJDaHJvbWl1bTo6flZpZGVvTGF5 ZXJDaHJvbWl1bSgpCiB7Ci0gICAgcmVsZWFzZUN1cnJlbnRGcmFtZSgpOworICAgIGNsZWFudXBS ZXNvdXJjZXMoKTsKK30KIAordm9pZCBWaWRlb0xheWVyQ2hyb21pdW06OmNsZWFudXBSZXNvdXJj ZXMoKQoreworICAgIHJlbGVhc2VDdXJyZW50RnJhbWUoKTsKICAgICBBU1NFUlQobGF5ZXJSZW5k ZXJlcigpKTsKICAgICBHcmFwaGljc0NvbnRleHQzRCogY29udGV4dCA9IGxheWVyUmVuZGVyZXJD b250ZXh0KCk7CiAgICAgZm9yICh1bnNpZ25lZCBwbGFuZSA9IDA7IHBsYW5lIDwgVmlkZW9GcmFt ZUNocm9taXVtOjptYXhQbGFuZXM7IHBsYW5lKyspIHsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vVmlkZW9MYXllckNocm9taXVtLmggYi9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL1ZpZGVvTGF5ZXJDaHJvbWl1bS5oCmluZGV4IDkyYjZm YzI4ZjNmYjZhMzI0OTJiYTcyODg5ZGZhMDlkODNiOTRiYzMuLjA1YjY1NzhlMTJhMzVkY2ZjNDYz ZjI4ZTgwMGQ1NmZlZDExNzRlM2UgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY2hyb21pdW0vVmlkZW9MYXllckNocm9taXVtLmgKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9jaHJvbWl1bS9WaWRlb0xheWVyQ2hyb21pdW0uaApAQCAtODksOCArODksMTIgQEAg cHVibGljOgogICAgICAgICBib29sIG1faW5pdGlhbGl6ZWQ7CiAgICAgfTsKIAorcHJvdGVjdGVk OgorICAgIHZpcnR1YWwgdm9pZCBjbGVhbnVwUmVzb3VyY2VzKCk7CisKIHByaXZhdGU6CiAgICAg VmlkZW9MYXllckNocm9taXVtKEdyYXBoaWNzTGF5ZXJDaHJvbWl1bSogb3duZXIsIFZpZGVvRnJh bWVQcm92aWRlciopOworCiAgICAgc3RhdGljIHVuc2lnbmVkIGRldGVybWluZVRleHR1cmVGb3Jt YXQoVmlkZW9GcmFtZUNocm9taXVtKik7CiAgICAgYm9vbCBhbGxvY2F0ZVRleHR1cmVzSWZOZWVk ZWQoR3JhcGhpY3NDb250ZXh0M0QqLCBWaWRlb0ZyYW1lQ2hyb21pdW0qLCB1bnNpZ25lZCB0ZXh0 dXJlRm9ybWF0KTsKICAgICB2b2lkIHVwZGF0ZVlVVkNvbnRlbnRzKEdyYXBoaWNzQ29udGV4dDNE KiwgY29uc3QgVmlkZW9GcmFtZUNocm9taXVtKik7Cg==