79591 2012-02-25 18:36:43 -0800 Avoid doing 2 hash lookups if we override RenderBox's logical width / height 2012-02-27 15:09:56 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 jchaffraix jchaffraix benjamin tonikitoo webkit.review.bot oldest_to_newest 565069 0 jchaffraix 2012-02-25 18:36:43 -0800 Currently all RenderBoxes are calling clearOverrideSize. However a RenderBox could have an override size in only 3 cases: * if it's a child of a RenderDeprecatedFlexibleBox * if it's a child of a RenderFlexibleBox * if it's a RenderTableCell That would remove 2 hash lookups from RenderBox::willBeDestroyed. 565075 1 128899 jchaffraix 2012-02-25 18:49:09 -0800 Created attachment 128899 Proposed refactoring. 565079 2 128899 benjamin 2012-02-25 19:09:37 -0800 Comment on attachment 128899 Proposed refactoring. View in context: https://bugs.webkit.org/attachment.cgi?id=128899&action=review r~ from me :-D > Source/WebCore/rendering/RenderBox.cpp:-251 > - clearOverrideSize(); > - I am not convinced by this change. You are spreading complexity to avoid one very simple call. Could you find if this has any impact? > Source/WebCore/rendering/RenderBox.cpp:802 > - if (hasOverrideHeight()) > + if (gOverrideHeightMap) > gOverrideHeightMap->remove(this); > - if (hasOverrideWidth()) > + if (gOverrideWidthMap) > gOverrideWidthMap->remove(this); This looks good. 565128 3 128899 benjamin 2012-02-26 00:17:17 -0800 Comment on attachment 128899 Proposed refactoring. Let's r- until you benchmark it. 565907 4 jchaffraix 2012-02-27 12:54:25 -0800 > Let's r- until you benchmark it. Thanks for doubting my change. I tested on html5-full-renderer and it looks like it regressed a bit the benchmark (around 1%, small but significant). It looks like the branches we introduced were killing us and / or my assumption about the use of RenderDeprecatedFlexibleBox or RenderFlexibleBox were wrong. I will re-purpose the bug to center around the good part and put a new patch for review. 565918 5 jchaffraix 2012-02-27 13:17:50 -0800 Re-purposing the bug on the part that is safe. 565921 6 129089 jchaffraix 2012-02-27 13:22:53 -0800 Created attachment 129089 Smaller, better change. No change on html5-full-render.html this time. 565949 7 benjamin 2012-02-27 13:57:44 -0800 Damn review thief! ;) 565952 8 tonikitoo 2012-02-27 14:01:16 -0800 (In reply to comment #7) > Damn review thief! ;) :'( ... <:o) 566006 9 129089 webkit.review.bot 2012-02-27 15:09:51 -0800 Comment on attachment 129089 Smaller, better change. No change on html5-full-render.html this time. Clearing flags on attachment: 129089 Committed r109028: <http://trac.webkit.org/changeset/109028> 566008 10 webkit.review.bot 2012-02-27 15:09:56 -0800 All reviewed patches have been landed. Closing bug. 128899 2012-02-25 18:49:09 -0800 2012-02-27 13:22:50 -0800 Proposed refactoring. bug-79591-20120225184908.patch text/plain 6767 jchaffraix U3VidmVyc2lvbiBSZXZpc2lvbjogMTA4OTAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTQ3Y2I1MzNiYzE5ZDlj NmY5YTQ3MmM3MjRmNzc5NmYzYzJkNjcyNS4uMzZlNTljMDI5OGFiM2RjM2I1NjViZjkwYzk0ODVk ZWNiYmM0Yjc4OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ3IEBACisyMDEyLTAyLTI1ICBKdWxp ZW4gQ2hhZmZyYWl4ICA8amNoYWZmcmFpeEB3ZWJraXQub3JnPgorCisgICAgICAgIEF2b2lkIGNh bGxpbmcgY2xlYXJPdmVycmlkZVNpemUgb24gUmVuZGVyQm94J2VzIHRoYXQgY2FuJ3QgaGF2ZSBh biBvdmVycmlkZSBzaXplCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD03OTU5MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFJlZmFjdG9yaW5nIG9ubHkuCisKKyAgICAgICAgVGhlIG92ZXJyaWRlIHNpemUgbWFw cyBhcmUgb25seSB1c2VkIGluIHRoZSBmb2xsb3dpbmcgY29udGV4dDoKKyAgICAgICAgLSBpZiBh IFJlbmRlckJveCBpcyBhIGNoaWxkIG9mIGEgUmVuZGVyRmxleGlibGVCb3ggb3IgYSBSZW5kZXJE ZXByZWNhdGVkRmxleGlibGVCb3gKKyAgICAgICAgLSBpZiB0aGUgUmVuZGVyQm94IGlzIGEgUmVu ZGVyVGFibGVDZWxsLgorCisgICAgICAgIEhvd2V2ZXIgd2Ugd291bGQgdHJ5IHRvIGNsZWFyIHRo ZSBtYXBzIGZvciBhbGwgUmVuZGVyQm94ZXMuIFRoaXMgcGF0Y2ggbW92ZXMgdGhlIGNhbGwgdG8K KyAgICAgICAgY2xlYXJPdmVycmlkZVNpemUgdG8gdGhlIHJpZ2h0IGNhc2VzOgorICAgICAgICAt IGF0IGNoaWxkIHJlbW92YWwgdGltZSBmb3IgdGhlIGZpcnN0IGNvbnRleHQgKHdoaWNoIGlzIGNh bGxlZCBmcm9tIFJlbmRlck9iamVjdDo6d2lsbEJlRGVzdHJveWVkCisgICAgICAgIHNvIHdlIGNh bid0IGZvcmdldCB0byBjbGVhciB0aGUgZW50cnkpLgorICAgICAgICAtIGF0IGRlc3RydWN0aW9u IHRpbWUgZm9yIFJlbmRlclRhYmxlQ2VsbC4KKworICAgICAgICBUaGlzIHNob3VsZCBzYXZlIDIg SGFzaE1hcCBsb29rdXBzIGZvciBtb3N0IFJlbmRlckJveCBkZXN0cnVjdGlvbi4KKworICAgICAg ICAqIHJlbmRlcmluZy9SZW5kZXJCb3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94 Ojp3aWxsQmVEZXN0cm95ZWQpOgorICAgICAgICBSZW1vdmVkIHRoZSBjYWxsIHRvIGNsZWFyT3Zl cnJpZGVTaXplIGFuZCBhZGRlZCBzb21lIEFTU0VSVCB0aGF0CisgICAgICAgIHdlIGhhdmUgcHJv cGVybHkgY2xlYXJlZCB0aGUgbWFwIGF0IGRlc3RydWN0aW9uIHRpbWUuCisKKyAgICAgICAgKFdl YkNvcmU6OlJlbmRlckJveDo6Y2xlYXJPdmVycmlkZVNpemUpOgorICAgICAgICBBdm9pZCBkb2lu ZyAyIGhhc2ggbG9va3VwcyBoZXJlIGJ5IGNhbGxpbmcgZGlyZWN0bHkgcmVtb3ZlIGlmIHdlIGhh dmUKKyAgICAgICAgYWxsb2NhdGVkIHRoZSBhc3NvY2lhdGVkIG1hcHMuCisKKyAgICAgICAgKiBy ZW5kZXJpbmcvUmVuZGVyRGVwcmVjYXRlZEZsZXhpYmxlQm94LmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OlJlbmRlckRlcHJlY2F0ZWRGbGV4aWJsZUJveDo6cmVtb3ZlQ2hpbGQpOgorICAgICAgICAq IHJlbmRlcmluZy9SZW5kZXJEZXByZWNhdGVkRmxleGlibGVCb3guaDoKKyAgICAgICAgKFJlbmRl ckRlcHJlY2F0ZWRGbGV4aWJsZUJveCk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckZsZXhp YmxlQm94LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94OjpyZW1vdmVD aGlsZCk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94Lmg6CisgICAgICAg IChSZW5kZXJGbGV4aWJsZUJveCk6CisgICAgICAgIE92ZXJyaWRlIHJlbW92ZUNoaWxkIGFuZCBj YWxsIGNsZWFyT3ZlcnJpZGVTaXplIGZvciBib3hlcy4KKworICAgICAgICAqIHJlbmRlcmluZy9S ZW5kZXJUYWJsZUNlbGwuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGFibGVDZWxsOjp3 aWxsQmVEZXN0cm95ZWQpOgorICAgICAgICBOb3cgY2FsbCBjbGVhck92ZXJyaWRlU2l6ZSBoZXJl LgorCiAyMDEyLTAyLTI1ICBBbmRyZWFzIEtsaW5nICA8YXdlc29tZWtsaW5nQGFwcGxlLmNvbT4K IAogICAgICAgICBIVE1MVGFibGVFbGVtZW50OiBBdm9pZCBDU1NQYXJzZXIgaW4gY3JlYXRlU2hh cmVkQ2VsbFN0eWxlKCkuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyQm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCmluZGV4 IGQ0MzllNzg4NzUzMDQ3OWZlNzFiYTM3NTljYjhiN2Q3NWZkZjI0OWMuLjU1NTMyYTJjZGVjMTJl ZTZmNjg1MWE0YjE5Y2U1MzY2NTAyMWNkZTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJCb3guY3BwCkBAIC0yNDcsOCArMjQ3LDYgQEAgdm9pZCBSZW5kZXJCb3g6OmNsZWFyUmVuZGVy Qm94UmVnaW9uSW5mbygpCiAKIHZvaWQgUmVuZGVyQm94Ojp3aWxsQmVEZXN0cm95ZWQoKQogewot ICAgIGNsZWFyT3ZlcnJpZGVTaXplKCk7Ci0KICAgICBSZW5kZXJTdHlsZSogc3R5bGVUb1VzZSA9 IHN0eWxlKCk7CiAgICAgaWYgKHN0eWxlVG9Vc2UgJiYgKHN0eWxlVG9Vc2UtPmxvZ2ljYWxIZWln aHQoKS5pc1BlcmNlbnQoKSB8fCBzdHlsZVRvVXNlLT5sb2dpY2FsTWluSGVpZ2h0KCkuaXNQZXJj ZW50KCkgfHwgc3R5bGVUb1VzZS0+bG9naWNhbE1heEhlaWdodCgpLmlzUGVyY2VudCgpKSkKICAg ICAgICAgUmVuZGVyQmxvY2s6OnJlbW92ZVBlcmNlbnRIZWlnaHREZXNjZW5kYW50KHRoaXMpOwpA QCAtMjY0LDYgKzI2Miw5IEBAIHZvaWQgUmVuZGVyQm94Ojp3aWxsQmVEZXN0cm95ZWQoKQogICAg IEFTU0VSVCghUmVuZGVyQmxvY2s6Omhhc1BlcmNlbnRIZWlnaHREZXNjZW5kYW50KHRoaXMpKTsK IAogICAgIFJlbmRlckJveE1vZGVsT2JqZWN0Ojp3aWxsQmVEZXN0cm95ZWQoKTsKKworICAgIEFT U0VSVCghaGFzT3ZlcnJpZGVIZWlnaHQoKSk7CisgICAgQVNTRVJUKCFoYXNPdmVycmlkZVdpZHRo KCkpOwogfQogCiB2b2lkIFJlbmRlckJveDo6cmVtb3ZlRmxvYXRpbmdPclBvc2l0aW9uZWRDaGls ZEZyb21CbG9ja0xpc3RzKCkKQEAgLTc5NSw5ICs3OTYsOSBAQCB2b2lkIFJlbmRlckJveDo6c2V0 T3ZlcnJpZGVXaWR0aChMYXlvdXRVbml0IHdpZHRoKQogCiB2b2lkIFJlbmRlckJveDo6Y2xlYXJP dmVycmlkZVNpemUoKQogewotICAgIGlmIChoYXNPdmVycmlkZUhlaWdodCgpKQorICAgIGlmIChn T3ZlcnJpZGVIZWlnaHRNYXApCiAgICAgICAgIGdPdmVycmlkZUhlaWdodE1hcC0+cmVtb3ZlKHRo aXMpOwotICAgIGlmIChoYXNPdmVycmlkZVdpZHRoKCkpCisgICAgaWYgKGdPdmVycmlkZVdpZHRo TWFwKQogICAgICAgICBnT3ZlcnJpZGVXaWR0aE1hcC0+cmVtb3ZlKHRoaXMpOwogfQogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRGVwcmVjYXRlZEZsZXhpYmxl Qm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJEZXByZWNhdGVkRmxleGli bGVCb3guY3BwCmluZGV4IDRlODhkNWM2YjRmYzIwYmY3NjAxNTEwNDA3ZmUwZTk2YzU1NTc1NWQu Ljk0M2QzMzMzYjk1YTk0NjE4MDY0YWI2N2E0NTYyYzc3YTg0YTc5YmMgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJEZXByZWNhdGVkRmxleGlibGVCb3guY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJEZXByZWNhdGVkRmxleGlibGVCb3gu Y3BwCkBAIC0xMjksNiArMTI5LDE0IEBAIFJlbmRlckRlcHJlY2F0ZWRGbGV4aWJsZUJveDo6flJl bmRlckRlcHJlY2F0ZWRGbGV4aWJsZUJveCgpCiB7CiB9CiAKK3ZvaWQgUmVuZGVyRGVwcmVjYXRl ZEZsZXhpYmxlQm94OjpyZW1vdmVDaGlsZChSZW5kZXJPYmplY3QqIGNoaWxkKQoreworICAgIGlm IChjaGlsZC0+aXNCb3goKSkKKyAgICAgICAgdG9SZW5kZXJCb3goY2hpbGQpLT5jbGVhck92ZXJy aWRlU2l6ZSgpOworCisgICAgUmVuZGVyQmxvY2s6OnJlbW92ZUNoaWxkKGNoaWxkKTsKK30KKwog c3RhdGljIExheW91dFVuaXQgbWFyZ2luV2lkdGhGb3JDaGlsZChSZW5kZXJCb3gqIGNoaWxkKQog ewogICAgIC8vIEEgbWFyZ2luIGJhc2ljYWxseSBoYXMgdGhyZWUgdHlwZXM6IGZpeGVkLCBwZXJj ZW50YWdlLCBhbmQgYXV0byAodmFyaWFibGUpLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckRlcHJlY2F0ZWRGbGV4aWJsZUJveC5oIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckRlcHJlY2F0ZWRGbGV4aWJsZUJveC5oCmluZGV4IDEwMWJlZGJlMzQx Nzk5OWZjNjA2Njg2ZTZlNTc2MDY4ZWM4M2M4MjYuLjU4NDAwZGQ1ZjMwNzliMzNhZjZiMDczMmMx NTAyOGU2MzgzZjYxNmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJEZXByZWNhdGVkRmxleGlibGVCb3guaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyRGVwcmVjYXRlZEZsZXhpYmxlQm94LmgKQEAgLTU0LDYgKzU0LDggQEAgcHVibGljOgog ICAgIHZvaWQgcGxhY2VDaGlsZChSZW5kZXJCb3gqIGNoaWxkLCBjb25zdCBMYXlvdXRQb2ludCYg bG9jYXRpb24pOwogCiBwcm90ZWN0ZWQ6CisgICAgdmlydHVhbCB2b2lkIHJlbW92ZUNoaWxkKFJl bmRlck9iamVjdCopIE9WRVJSSURFOworCiAgICAgTGF5b3V0VW5pdCBhbGxvd2VkQ2hpbGRGbGV4 KFJlbmRlckJveCogY2hpbGQsIGJvb2wgZXhwYW5kaW5nLCB1bnNpZ25lZCBncm91cCk7CiAKICAg ICBib29sIGhhc011bHRpcGxlTGluZXMoKSBjb25zdCB7IHJldHVybiBzdHlsZSgpLT5ib3hMaW5l cygpID09IE1VTFRJUExFOyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyRmxleGlibGVCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZs ZXhpYmxlQm94LmNwcAppbmRleCA2ZDBiNzYxMTM0NTI0ZmM4NmFjODdhMjQ0Y2M5MjEyZjAxOGM3 ZTlkLi5hY2QwYWVjNmUxMTU0MzJhYjg3NTc3YjE3OTA1MWYwMDA2ZGNlMGYxIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAKQEAgLTEwOSw2ICsx MDksMTQgQEAgUmVuZGVyRmxleGlibGVCb3g6On5SZW5kZXJGbGV4aWJsZUJveCgpCiB7CiB9CiAK K3ZvaWQgUmVuZGVyRmxleGlibGVCb3g6OnJlbW92ZUNoaWxkKFJlbmRlck9iamVjdCogY2hpbGQp Cit7CisgICAgaWYgKGNoaWxkLT5pc0JveCgpKQorICAgICAgICB0b1JlbmRlckJveChjaGlsZCkt PmNsZWFyT3ZlcnJpZGVTaXplKCk7CisKKyAgICBSZW5kZXJCbG9jazo6cmVtb3ZlQ2hpbGQoY2hp bGQpOworfQorCiBjb25zdCBjaGFyKiBSZW5kZXJGbGV4aWJsZUJveDo6cmVuZGVyTmFtZSgpIGNv bnN0CiB7CiAgICAgcmV0dXJuICJSZW5kZXJGbGV4aWJsZUJveCI7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guaCBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5oCmluZGV4IGNhNWQ1OGE0YzQ1YzUxNjI4M2Rh YzBkNGUxMGVhM2Y3OGY2ZWY2MDEuLjgwNmJhNzcyZGQzNDhkODQ3YjlhODg0YzNhNTNjYWM0M2U0 ZmQzMWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJs ZUJveC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5o CkBAIC00OSw2ICs0OSw4IEBAIHB1YmxpYzoKICAgICBib29sIGlzSG9yaXpvbnRhbEZsb3coKSBj b25zdDsKIAogcHJpdmF0ZToKKyAgICB2aXJ0dWFsIHZvaWQgcmVtb3ZlQ2hpbGQoUmVuZGVyT2Jq ZWN0KikgT1ZFUlJJREU7CisKICAgICBzdHJ1Y3QgRmxleE9yZGVySGFzaFRyYWl0czsKICAgICB0 eXBlZGVmIEhhc2hTZXQ8aW50LCBEZWZhdWx0SGFzaDxpbnQ+OjpIYXNoLCBGbGV4T3JkZXJIYXNo VHJhaXRzPiBGbGV4T3JkZXJIYXNoU2V0OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyVGFibGVDZWxsLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJUYWJsZUNlbGwuY3BwCmluZGV4IGU5OTU0ZDJiODdjOWU2NzRlZGI1MDJjOWM2NWNjMDEz NDA0ZmI4OTYuLmQwZjRkYTJiMjZkMGM1MDFlYTQyOWNmZGEyZDc3MjU4NmM4NjM2YzggMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJsZUNlbGwuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJsZUNlbGwuY3BwCkBAIC01Niw2ICs1 Niw4IEBAIHZvaWQgUmVuZGVyVGFibGVDZWxsOjp3aWxsQmVEZXN0cm95ZWQoKQogewogICAgIFJl bmRlclRhYmxlU2VjdGlvbiogcmVjYWxjU2VjdGlvbiA9IHBhcmVudCgpID8gc2VjdGlvbigpIDog MDsKIAorICAgIGNsZWFyT3ZlcnJpZGVTaXplKCk7CisKICAgICBSZW5kZXJCbG9jazo6d2lsbEJl RGVzdHJveWVkKCk7CiAKICAgICBpZiAocmVjYWxjU2VjdGlvbikgewo= 129089 2012-02-27 13:22:53 -0800 2012-02-27 15:09:51 -0800 Smaller, better change. No change on html5-full-render.html this time. bug-79591-20120227132252.patch text/plain 1524 jchaffraix U3VidmVyc2lvbiBSZXZpc2lvbjogMTA4OTIxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTQwZTBkNTNiNmFlYmE0 MzkxMmJmMzhhMWNkMGJlNGM3NjAyODEzOC4uYzg2NTVhYWU2NzAyMWIxMGNlZjQwMDYwODZmZjdl ODk3YmJlMjlkZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEyLTAyLTI3ICBKdWxp ZW4gQ2hhZmZyYWl4ICA8amNoYWZmcmFpeEB3ZWJraXQub3JnPgorCisgICAgICAgIEF2b2lkIGRv aW5nIDIgaGFzaCBsb29rdXBzIGlmIHdlIG92ZXJyaWRlIFJlbmRlckJveCdzIGxvZ2ljYWwgd2lk dGggLyBoZWlnaHQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTc5NTkxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgUmVmYWN0b3Jpbmcgb25seS4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCb3guY3Bw OgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94OjpjbGVhck92ZXJyaWRlU2l6ZSk6CisgICAg ICAgIEluc3RlYWQgb2YgZG9pbmcgb25lIGhhc2ggbG9va3VwIGFzIHBhcnQgb2YgaGFzT3ZlcnJp ZGV7SGVpZ2h0fFdpZHRofSwgbGV0J3MKKyAgICAgICAganVzdCBkaXJlY3RseSBjYWxsIEhhc2hN YXA6OnJlbW92ZSB0aGF0IHdpbGwgZG8gdGhlIGxvb2t1cCBpbnN0ZWFkLgorCiAyMDEyLTAyLTI1 ICBBbmRyZWFzIEtsaW5nICA8YXdlc29tZWtsaW5nQGFwcGxlLmNvbT4KIAogICAgICAgICBBbGxv dyBtYXRjaGVkIHByb3BlcnR5IGNhY2hlIGZvciBlbGVtZW50cyB3aXRoIGFkZGl0aW9uYWwgYXR0 cmlidXRlIHN0eWxlLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcAppbmRleCBk NDM5ZTc4ODc1MzA0NzlmZTcxYmEzNzU5Y2I4YjdkNzVmZGYyNDljLi44NGM3YTVjZTg3OWExMjc5 NGRkZDg3YjM1NDBlZmM1YTI4MTJiM2JkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyQm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy Qm94LmNwcApAQCAtNzk1LDkgKzc5NSw5IEBAIHZvaWQgUmVuZGVyQm94OjpzZXRPdmVycmlkZVdp ZHRoKExheW91dFVuaXQgd2lkdGgpCiAKIHZvaWQgUmVuZGVyQm94OjpjbGVhck92ZXJyaWRlU2l6 ZSgpCiB7Ci0gICAgaWYgKGhhc092ZXJyaWRlSGVpZ2h0KCkpCisgICAgaWYgKGdPdmVycmlkZUhl aWdodE1hcCkKICAgICAgICAgZ092ZXJyaWRlSGVpZ2h0TWFwLT5yZW1vdmUodGhpcyk7Ci0gICAg aWYgKGhhc092ZXJyaWRlV2lkdGgoKSkKKyAgICBpZiAoZ092ZXJyaWRlV2lkdGhNYXApCiAgICAg ICAgIGdPdmVycmlkZVdpZHRoTWFwLT5yZW1vdmUodGhpcyk7CiB9CiAK