68638 2011-09-22 10:52:39 -0700 [CSSRegions] Make RenderFlowThread track if it has variable width regions 2011-09-22 11:11:31 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 hyatt hyatt aroben oldest_to_newest 471698 0 hyatt 2011-09-22 10:52:39 -0700 Make RenderFlowThread track if it has variable width regions. This will be relevant for speed as we begin adding code to shrink lines and do custom painting of blocks, etc. 471701 1 108359 hyatt 2011-09-22 10:54:15 -0700 Created attachment 108359 Patch 471705 2 108361 hyatt 2011-09-22 10:55:15 -0700 Created attachment 108361 Patch 471710 3 108361 mitz 2011-09-22 10:58:31 -0700 Comment on attachment 108361 Patch r=me I think the naming can be improved, “variable widths” seems like the width can change, maybe you can use “nonUniformLogicalWidth” or flip it and call it “regionsHaveUniformLogicalWidth”. 471711 4 108361 aroben 2011-09-22 10:59:17 -0700 Comment on attachment 108361 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=108361&action=review > Source/WebCore/rendering/RenderFlowThread.cpp:308 > + m_hasValidRegions = false; > + LayoutUnit previousRegionLogicalWidth = 0; Seems like you need to set m_regionsHaveVariableLogicalWidth to false here, too. Otherwise once it goes true it will never become false again! > Source/WebCore/rendering/RenderFlowThread.h:108 > + bool regionsHaveVariableLogicalWidth() const { return m_regionsHaveVariableLogicalWidth; } Seems like this isn't needed yet, but maybe you intend to use it in the future? 471715 5 hyatt 2011-09-22 11:02:27 -0700 (In reply to comment #4) > Seems like you need to set m_regionsHaveVariableLogicalWidth to false here, too. Otherwise once it goes true it will never become false again! > Nice catch! Wouldn't be a correctness issue, but would be a performance one! 471723 6 hyatt 2011-09-22 11:11:31 -0700 Fixed in r95740. 108359 2011-09-22 10:54:15 -0700 2011-09-22 10:55:15 -0700 Patch patch.txt text/plain 3950 hyatt SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDk1NzM3KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTggQEAKKzIwMTEtMDktMjIgIERhdmlkIEh5 YXR0ICA8aHlhdHRAYXBwbGUuY29tPgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD02ODYzOAorICAgICAgICAKKyAgICAgICAgTWFrZSBSZW5kZXJGbG93 VGhyZWFkIGNhY2hlIHdoZXRoZXIgb3Igbm90IGl0IGhhcyByZWdpb25zIG9mIHZhcnlpbmcgd2lk dGhzLiBUaGlzIHdpbGwKKyAgICAgICAgYmUgcmVsZXZhbnQgZm9yIHBlcmZvcm1hbmNlIGFzIHdl IGJlZ2luIGFkZGluZyBjb2RlIHRvIGRvIGN1c3RvbSBibG9jayBwYWludGluZyBhbmQKKyAgICAg ICAgbGF5b3V0IGJhc2VkIG9mZiByZWdpb25zIG5vdCBoYXZpbmcgdGhlIHNhbWUgd2lkdGguCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiByZW5kZXJp bmcvUmVuZGVyRmxvd1RocmVhZC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJGbG93VGhy ZWFkOjpSZW5kZXJGbG93VGhyZWFkKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZsb3dUaHJl YWQ6OmxheW91dCk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckZsb3dUaHJlYWQuaDoKKwog MjAxMS0wOS0yMiAgVGltIEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KIAogICAg ICAgICBVbnJldmlld2VkIGJ1aWxkIGZpeCAoZml4ZXMgd2FybmluZyBhYm91dCB0b28gbWFueSBw YXJlbnMpLgpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsb3dUaHJlYWQu Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbG93VGhy ZWFkLmNwcAkocmV2aXNpb24gOTU3MjQpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyRmxvd1RocmVhZC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ3LDYgKzQ3LDcgQEAgUmVuZGVy Rmxvd1RocmVhZDo6UmVuZGVyRmxvd1RocmVhZChOb2RlKgogICAgICwgbV9mbG93VGhyZWFkKGZs b3dUaHJlYWQpCiAgICAgLCBtX2hhc1ZhbGlkUmVnaW9ucyhmYWxzZSkKICAgICAsIG1fcmVnaW9u c0ludmFsaWRhdGVkKGZhbHNlKQorICAgICwgbV9yZWdpb25zSGF2ZVZhcmlhYmxlTG9naWNhbFdp ZHRoKGZhbHNlKQogICAgICwgbV9yZWdpb25GaXR0aW5nRGlzYWJsZUNvdW50KDApCiB7CiAgICAg c2V0SXNBbm9ueW1vdXMoZmFsc2UpOwpAQCAtMzAzLDYgKzMwNCw4IEBAIHZvaWQgUmVuZGVyRmxv d1RocmVhZDo6bGF5b3V0KCkKICAgICBib29sIHJlZ2lvbnNDaGFuZ2VkID0gbV9yZWdpb25zSW52 YWxpZGF0ZWQgJiYgbV9ldmVySGFkTGF5b3V0OwogICAgIGlmIChtX3JlZ2lvbnNJbnZhbGlkYXRl ZCkgewogICAgICAgICBtX3JlZ2lvbnNJbnZhbGlkYXRlZCA9IGZhbHNlOworICAgICAgICBtX2hh c1ZhbGlkUmVnaW9ucyA9IGZhbHNlOworICAgICAgICB1bnNpZ25lZCBwcmV2aW91c1JlZ2lvbkxv Z2ljYWxXaWR0aCA9IDA7CiAgICAgICAgIGlmIChoYXNSZWdpb25zKCkpIHsKICAgICAgICAgICAg IGludCBsb2dpY2FsSGVpZ2h0ID0gMDsKICAgICAgICAgICAgIGZvciAoUmVuZGVyUmVnaW9uTGlz dDo6aXRlcmF0b3IgaXRlciA9IG1fcmVnaW9uTGlzdC5iZWdpbigpOyBpdGVyICE9IG1fcmVnaW9u TGlzdC5lbmQoKTsgKytpdGVyKSB7CkBAIC0zMTMsMTcgKzMxNiwyNiBAQCB2b2lkIFJlbmRlckZs b3dUaHJlYWQ6OmxheW91dCgpCiAKICAgICAgICAgICAgICAgICBBU1NFUlQoIXJlZ2lvbi0+bmVl ZHNMYXlvdXQoKSk7CiAgICAgICAgICAgICAgICAgCi0gICAgICAgICAgICAgICAgbV9oYXNWYWxp ZFJlZ2lvbnMgPSB0cnVlOworICAgICAgICAgICAgICAgIHVuc2lnbmVkIHJlZ2lvbkxvZ2ljYWxX aWR0aDsKIAogICAgICAgICAgICAgICAgIEludFJlY3QgcmVnaW9uUmVjdDsKICAgICAgICAgICAg ICAgICBpZiAoaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSkgewogICAgICAgICAgICAgICAgICAg ICByZWdpb25SZWN0ID0gSW50UmVjdCgwLCBsb2dpY2FsSGVpZ2h0LCByZWdpb24tPmNvbnRlbnRX aWR0aCgpLCByZWdpb24tPmNvbnRlbnRIZWlnaHQoKSk7CiAgICAgICAgICAgICAgICAgICAgIGxv Z2ljYWxIZWlnaHQgKz0gcmVnaW9uUmVjdC5oZWlnaHQoKTsKKyAgICAgICAgICAgICAgICAgICAg cmVnaW9uTG9naWNhbFdpZHRoID0gcmVnaW9uLT5jb250ZW50V2lkdGgoKTsKICAgICAgICAgICAg ICAgICB9IGVsc2UgewogICAgICAgICAgICAgICAgICAgICByZWdpb25SZWN0ID0gSW50UmVjdChs b2dpY2FsSGVpZ2h0LCAwLCByZWdpb24tPmNvbnRlbnRXaWR0aCgpLCByZWdpb24tPmNvbnRlbnRI ZWlnaHQoKSk7CiAgICAgICAgICAgICAgICAgICAgIGxvZ2ljYWxIZWlnaHQgKz0gcmVnaW9uUmVj dC53aWR0aCgpOworICAgICAgICAgICAgICAgICAgICByZWdpb25Mb2dpY2FsV2lkdGggPSByZWdp b24tPmNvbnRlbnRIZWlnaHQoKTsKICAgICAgICAgICAgICAgICB9CiAKKyAgICAgICAgICAgICAg ICBpZiAoIW1faGFzVmFsaWRSZWdpb25zKQorICAgICAgICAgICAgICAgICAgICBtX2hhc1ZhbGlk UmVnaW9ucyA9IHRydWU7CisgICAgICAgICAgICAgICAgZWxzZSBpZiAoIW1fcmVnaW9uc0hhdmVW YXJpYWJsZUxvZ2ljYWxXaWR0aCAmJiBwcmV2aW91c1JlZ2lvbkxvZ2ljYWxXaWR0aCAhPSByZWdp b25Mb2dpY2FsV2lkdGgpCisgICAgICAgICAgICAgICAgICAgIG1fcmVnaW9uc0hhdmVWYXJpYWJs ZUxvZ2ljYWxXaWR0aCA9IHRydWU7CisKKyAgICAgICAgICAgICAgICBwcmV2aW91c1JlZ2lvbkxv Z2ljYWxXaWR0aCA9IHJlZ2lvbkxvZ2ljYWxXaWR0aDsKKwogICAgICAgICAgICAgICAgIHJlZ2lv bi0+c2V0UmVnaW9uUmVjdChyZWdpb25SZWN0KTsKICAgICAgICAgICAgIH0KICAgICAgICAgfQpJ bmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsb3dUaHJlYWQuaAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxvd1RocmVhZC5oCShyZXZp c2lvbiA5NTcyNCkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbG93VGhyZWFk LmgJKHdvcmtpbmcgY29weSkKQEAgLTEwNSw2ICsxMDUsOCBAQCBwdWJsaWM6CiAgICAgdm9pZCBk aXNhYmxlUmVnaW9uRml0dGluZygpIHsgbV9yZWdpb25GaXR0aW5nRGlzYWJsZUNvdW50Kys7IH0K ICAgICB2b2lkIGVuYWJsZVJlZ2lvbkZpdHRpbmcoKSB7IEFTU0VSVChtX3JlZ2lvbkZpdHRpbmdE aXNhYmxlQ291bnQgPiAwKTsgbV9yZWdpb25GaXR0aW5nRGlzYWJsZUNvdW50LS07IH0KIAorICAg IGJvb2wgcmVnaW9uc0hhdmVWYXJpYWJsZUxvZ2ljYWxXaWR0aCgpIGNvbnN0IHsgcmV0dXJuIG1f cmVnaW9uc0hhdmVWYXJpYWJsZUxvZ2ljYWxXaWR0aDsgfQorICAgIAogICAgIFJlbmRlclJlZ2lv biogbWFwRnJvbUZsb3dUb1JlZ2lvbihUcmFuc2Zvcm1TdGF0ZSYpIGNvbnN0OwogCiBwcml2YXRl OgpAQCAtMTM3LDYgKzEzOSw3IEBAIHByaXZhdGU6CiAKICAgICBib29sIG1faGFzVmFsaWRSZWdp b25zOwogICAgIGJvb2wgbV9yZWdpb25zSW52YWxpZGF0ZWQ7CisgICAgYm9vbCBtX3JlZ2lvbnNI YXZlVmFyaWFibGVMb2dpY2FsV2lkdGg7CiAgICAgdW5zaWduZWQgbV9yZWdpb25GaXR0aW5nRGlz YWJsZUNvdW50OwogfTsKIAo= 108361 2011-09-22 10:55:15 -0700 2011-09-22 10:59:17 -0700 Patch patch.txt text/plain 3954 hyatt SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDk1NzM3KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTggQEAKKzIwMTEtMDktMjIgIERhdmlkIEh5 YXR0ICA8aHlhdHRAYXBwbGUuY29tPgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD02ODYzOAorICAgICAgICAKKyAgICAgICAgTWFrZSBSZW5kZXJGbG93 VGhyZWFkIGNhY2hlIHdoZXRoZXIgb3Igbm90IGl0IGhhcyByZWdpb25zIG9mIHZhcnlpbmcgd2lk dGhzLiBUaGlzIHdpbGwKKyAgICAgICAgYmUgcmVsZXZhbnQgZm9yIHBlcmZvcm1hbmNlIGFzIHdl IGJlZ2luIGFkZGluZyBjb2RlIHRvIGRvIGN1c3RvbSBibG9jayBwYWludGluZyBhbmQKKyAgICAg ICAgbGF5b3V0IGJhc2VkIG9mZiByZWdpb25zIG5vdCBoYXZpbmcgdGhlIHNhbWUgd2lkdGguCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiByZW5kZXJp bmcvUmVuZGVyRmxvd1RocmVhZC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJGbG93VGhy ZWFkOjpSZW5kZXJGbG93VGhyZWFkKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZsb3dUaHJl YWQ6OmxheW91dCk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckZsb3dUaHJlYWQuaDoKKwog MjAxMS0wOS0yMiAgVGltIEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KIAogICAg ICAgICBVbnJldmlld2VkIGJ1aWxkIGZpeCAoZml4ZXMgd2FybmluZyBhYm91dCB0b28gbWFueSBw YXJlbnMpLgpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsb3dUaHJlYWQu Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbG93VGhy ZWFkLmNwcAkocmV2aXNpb24gOTU3MjQpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyRmxvd1RocmVhZC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ3LDYgKzQ3LDcgQEAgUmVuZGVy Rmxvd1RocmVhZDo6UmVuZGVyRmxvd1RocmVhZChOb2RlKgogICAgICwgbV9mbG93VGhyZWFkKGZs b3dUaHJlYWQpCiAgICAgLCBtX2hhc1ZhbGlkUmVnaW9ucyhmYWxzZSkKICAgICAsIG1fcmVnaW9u c0ludmFsaWRhdGVkKGZhbHNlKQorICAgICwgbV9yZWdpb25zSGF2ZVZhcmlhYmxlTG9naWNhbFdp ZHRoKGZhbHNlKQogICAgICwgbV9yZWdpb25GaXR0aW5nRGlzYWJsZUNvdW50KDApCiB7CiAgICAg c2V0SXNBbm9ueW1vdXMoZmFsc2UpOwpAQCAtMzAzLDYgKzMwNCw4IEBAIHZvaWQgUmVuZGVyRmxv d1RocmVhZDo6bGF5b3V0KCkKICAgICBib29sIHJlZ2lvbnNDaGFuZ2VkID0gbV9yZWdpb25zSW52 YWxpZGF0ZWQgJiYgbV9ldmVySGFkTGF5b3V0OwogICAgIGlmIChtX3JlZ2lvbnNJbnZhbGlkYXRl ZCkgewogICAgICAgICBtX3JlZ2lvbnNJbnZhbGlkYXRlZCA9IGZhbHNlOworICAgICAgICBtX2hh c1ZhbGlkUmVnaW9ucyA9IGZhbHNlOworICAgICAgICBMYXlvdXRVbml0IHByZXZpb3VzUmVnaW9u TG9naWNhbFdpZHRoID0gMDsKICAgICAgICAgaWYgKGhhc1JlZ2lvbnMoKSkgewogICAgICAgICAg ICAgaW50IGxvZ2ljYWxIZWlnaHQgPSAwOwogICAgICAgICAgICAgZm9yIChSZW5kZXJSZWdpb25M aXN0OjppdGVyYXRvciBpdGVyID0gbV9yZWdpb25MaXN0LmJlZ2luKCk7IGl0ZXIgIT0gbV9yZWdp b25MaXN0LmVuZCgpOyArK2l0ZXIpIHsKQEAgLTMxMywxNyArMzE2LDI2IEBAIHZvaWQgUmVuZGVy Rmxvd1RocmVhZDo6bGF5b3V0KCkKIAogICAgICAgICAgICAgICAgIEFTU0VSVCghcmVnaW9uLT5u ZWVkc0xheW91dCgpKTsKICAgICAgICAgICAgICAgICAKLSAgICAgICAgICAgICAgICBtX2hhc1Zh bGlkUmVnaW9ucyA9IHRydWU7CisgICAgICAgICAgICAgICAgTGF5b3V0VW5pdCByZWdpb25Mb2dp Y2FsV2lkdGg7CiAKICAgICAgICAgICAgICAgICBJbnRSZWN0IHJlZ2lvblJlY3Q7CiAgICAgICAg ICAgICAgICAgaWYgKGlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkpIHsKICAgICAgICAgICAgICAg ICAgICAgcmVnaW9uUmVjdCA9IEludFJlY3QoMCwgbG9naWNhbEhlaWdodCwgcmVnaW9uLT5jb250 ZW50V2lkdGgoKSwgcmVnaW9uLT5jb250ZW50SGVpZ2h0KCkpOwogICAgICAgICAgICAgICAgICAg ICBsb2dpY2FsSGVpZ2h0ICs9IHJlZ2lvblJlY3QuaGVpZ2h0KCk7CisgICAgICAgICAgICAgICAg ICAgIHJlZ2lvbkxvZ2ljYWxXaWR0aCA9IHJlZ2lvbi0+Y29udGVudFdpZHRoKCk7CiAgICAgICAg ICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgICAgICAgICAgcmVnaW9uUmVjdCA9IEludFJl Y3QobG9naWNhbEhlaWdodCwgMCwgcmVnaW9uLT5jb250ZW50V2lkdGgoKSwgcmVnaW9uLT5jb250 ZW50SGVpZ2h0KCkpOwogICAgICAgICAgICAgICAgICAgICBsb2dpY2FsSGVpZ2h0ICs9IHJlZ2lv blJlY3Qud2lkdGgoKTsKKyAgICAgICAgICAgICAgICAgICAgcmVnaW9uTG9naWNhbFdpZHRoID0g cmVnaW9uLT5jb250ZW50SGVpZ2h0KCk7CiAgICAgICAgICAgICAgICAgfQogCisgICAgICAgICAg ICAgICAgaWYgKCFtX2hhc1ZhbGlkUmVnaW9ucykKKyAgICAgICAgICAgICAgICAgICAgbV9oYXNW YWxpZFJlZ2lvbnMgPSB0cnVlOworICAgICAgICAgICAgICAgIGVsc2UgaWYgKCFtX3JlZ2lvbnNI YXZlVmFyaWFibGVMb2dpY2FsV2lkdGggJiYgcHJldmlvdXNSZWdpb25Mb2dpY2FsV2lkdGggIT0g cmVnaW9uTG9naWNhbFdpZHRoKQorICAgICAgICAgICAgICAgICAgICBtX3JlZ2lvbnNIYXZlVmFy aWFibGVMb2dpY2FsV2lkdGggPSB0cnVlOworCisgICAgICAgICAgICAgICAgcHJldmlvdXNSZWdp b25Mb2dpY2FsV2lkdGggPSByZWdpb25Mb2dpY2FsV2lkdGg7CisKICAgICAgICAgICAgICAgICBy ZWdpb24tPnNldFJlZ2lvblJlY3QocmVnaW9uUmVjdCk7CiAgICAgICAgICAgICB9CiAgICAgICAg IH0KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbG93VGhyZWFkLmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsb3dUaHJlYWQuaAko cmV2aXNpb24gOTU3MjQpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxvd1Ro cmVhZC5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMDUsNiArMTA1LDggQEAgcHVibGljOgogICAgIHZv aWQgZGlzYWJsZVJlZ2lvbkZpdHRpbmcoKSB7IG1fcmVnaW9uRml0dGluZ0Rpc2FibGVDb3VudCsr OyB9CiAgICAgdm9pZCBlbmFibGVSZWdpb25GaXR0aW5nKCkgeyBBU1NFUlQobV9yZWdpb25GaXR0 aW5nRGlzYWJsZUNvdW50ID4gMCk7IG1fcmVnaW9uRml0dGluZ0Rpc2FibGVDb3VudC0tOyB9CiAK KyAgICBib29sIHJlZ2lvbnNIYXZlVmFyaWFibGVMb2dpY2FsV2lkdGgoKSBjb25zdCB7IHJldHVy biBtX3JlZ2lvbnNIYXZlVmFyaWFibGVMb2dpY2FsV2lkdGg7IH0KKyAgICAKICAgICBSZW5kZXJS ZWdpb24qIG1hcEZyb21GbG93VG9SZWdpb24oVHJhbnNmb3JtU3RhdGUmKSBjb25zdDsKIAogcHJp dmF0ZToKQEAgLTEzNyw2ICsxMzksNyBAQCBwcml2YXRlOgogCiAgICAgYm9vbCBtX2hhc1ZhbGlk UmVnaW9uczsKICAgICBib29sIG1fcmVnaW9uc0ludmFsaWRhdGVkOworICAgIGJvb2wgbV9yZWdp b25zSGF2ZVZhcmlhYmxlTG9naWNhbFdpZHRoOwogICAgIHVuc2lnbmVkIG1fcmVnaW9uRml0dGlu Z0Rpc2FibGVDb3VudDsKIH07CiAK