90807 2012-07-09 11:39:40 -0700 WebSurroundingText layout tests should use the same code path as the rest of the feature 2012-07-10 09:37:20 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 leandrogracia leandrogracia abarth dglazkov fishd jamesr leandrogracia rniwa tkent tkent+wkapi webkit.review.bot oldest_to_newest 665026 0 leandrogracia 2012-07-09 11:39:40 -0700 Currently WebSurroundingText has a custom initialize method based on node offsets that is used only by the LayoutTestController. Instead of this we should make the tests work with coordinates and use the same code path as the rest of the feature. 665736 1 151455 leandrogracia 2012-07-10 07:11:43 -0700 Created attachment 151455 Patch 665740 2 151455 leandrogracia 2012-07-10 07:17:19 -0700 Comment on attachment 151455 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=151455&action=review > Source/WebKit/chromium/src/WebSurroundingText.cpp:43 > +void WebSurroundingText::initialize(const WebHitTestResult& hitTestResult, size_t maxLength) This method is currently in use by Chromium. However, we can switch to the new one and remove this with a 3-sided patch. > LayoutTests/platform/chromium/editing/surrounding-text/surrounding-text.html:-36 > - shouldBeEqualToString('surroundingText(\'<button>.</button>12345<p id="here">6789 12345</p>6789<button>.</button>\', 100, 5)', ''); Invalid offsets throw a JS exception in findOffsetCoordinates now. 665743 3 webkit.review.bot 2012-07-10 07:19:44 -0700 Please wait for approval from abarth@webkit.org, dglazkov@chromium.org, fishd@chromium.org, jamesr@chromium.org or tkent@chromium.org before submitting, as this patch contains changes to the Chromium public API. See also https://trac.webkit.org/wiki/ChromiumWebKitAPI. 665769 4 151455 abarth 2012-07-10 08:08:50 -0700 Comment on attachment 151455 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=151455&action=review >> Source/WebKit/chromium/src/WebSurroundingText.cpp:43 >> +void WebSurroundingText::initialize(const WebHitTestResult& hitTestResult, size_t maxLength) > > This method is currently in use by Chromium. However, we can switch to the new one and remove this with a 3-sided patch. If you like, you can add a FIXME comment to the public header to this effect. 665786 5 151455 webkit.review.bot 2012-07-10 09:01:44 -0700 Comment on attachment 151455 Patch Clearing flags on attachment: 151455 Committed r122225: <http://trac.webkit.org/changeset/122225> 665787 6 webkit.review.bot 2012-07-10 09:01:49 -0700 All reviewed patches have been landed. Closing bug. 665811 7 leandrogracia 2012-07-10 09:37:20 -0700 Committed r122230: <http://trac.webkit.org/changeset/122230> 151455 2012-07-10 07:11:43 -0700 2012-07-10 09:01:44 -0700 Patch bug-90807-20120710151141.patch text/plain 12935 leandrogracia U3VidmVyc2lvbiBSZXZpc2lvbjogMTIyMjExCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IDM2YjhkNTQ1MjI1Y2NiYWI2NGJkYjE1MDFhYjY2OWVkNzliOTZlNWMuLjk5YjliZmJlZGQyMThl ZDQ0NDI3NmQ3ZDdjMTFkMDQ0ODNiNWFlYTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTkgQEAKKzIwMTItMDctMDkgIExlYW5kcm8gR3JhY2lhIEdpbCAgPGxlYW5kcm9n cmFjaWFAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYlN1cnJvdW5kaW5nVGV4dCBsYXlvdXQg dGVzdHMgc2hvdWxkIHVzZSB0aGUgc2FtZSBjb2RlIHBhdGggYXMgdGhlIHJlc3Qgb2YgdGhlIGZl YXR1cmUuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05 MDgwNworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJl cGxhY2UgdGhlIG9mZnNldC1iYXNlZCBpbml0aWFsaXplIG1ldGhvZCB1c2VkIG9ubHkgYnkgTGF5 b3V0VGVzdENvbnRyb2xsZXIKKyAgICAgICAgd2l0aCBhIHBvaW50LWJhc2VkIHZlcnNpb24gdG8g Zm9sbG93IHRoZSBzYW1lIGNvZGUgcGF0aC4KKworICAgICAgICAqIHB1YmxpYy9XZWJTdXJyb3Vu ZGluZ1RleHQuaDoKKyAgICAgICAgKFdlYktpdCk6CisgICAgICAgIChXZWJTdXJyb3VuZGluZ1Rl eHQpOgorICAgICAgICAqIHNyYy9XZWJTdXJyb3VuZGluZ1RleHQuY3BwOgorICAgICAgICAoV2Vi S2l0OjpXZWJTdXJyb3VuZGluZ1RleHQ6OmluaXRpYWxpemUpOgorCiAyMDEyLTA3LTEwICBKb2No ZW4gRWlzaW5nZXIgIDxqb2NoZW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQu ICBSb2xsZWQgREVQUy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGlj L1dlYlN1cnJvdW5kaW5nVGV4dC5oIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2Vi U3Vycm91bmRpbmdUZXh0LmgKaW5kZXggZGQyYTNjNTI3NDNlMDU0NWMwMzU5NTQwMTMxYWUzZTM4 NTYxMmQ4MS4uOGUyOTI4ZmQzODMzMGY4NTZkMGUwNzZhMGU0YWYyOGE1NzVmZDU5ZCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViU3Vycm91bmRpbmdUZXh0LmgK KysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViU3Vycm91bmRpbmdUZXh0LmgK QEAgLTM3LDYgKzM3LDggQEAgY2xhc3MgU3Vycm91bmRpbmdUZXh0OwogbmFtZXNwYWNlIFdlYktp dCB7CiAKIGNsYXNzIFdlYkhpdFRlc3RSZXN1bHQ7CitjbGFzcyBXZWJOb2RlOworY2xhc3MgV2Vi UG9pbnQ7CiAKIGNsYXNzIFdlYlN1cnJvdW5kaW5nVGV4dCB7CiBwdWJsaWM6CkBAIC01MCw5ICs1 Miw5IEBAIHB1YmxpYzoKICAgICAvLyBUaGUgbWF4aW11bSBsZW5ndGggb2YgdGhlIGNvbnRlbnRz IHJldHJpZXZlZCBpcyBkZWZpbmVkIGJ5IG1heExlbmd0aC4KICAgICBXRUJLSVRfRVhQT1JUIHZv aWQgaW5pdGlhbGl6ZShjb25zdCBXZWJIaXRUZXN0UmVzdWx0Jiwgc2l6ZV90IG1heExlbmd0aCk7 CiAKLSAgICAvLyBJbml0aWFsaXplcyB0aGUgb2JqZWN0IGdvIGdldCB0aGUgc3Vycm91bmRpbmcg dGV4dCBjZW50ZXJlZCBpbiB0aGUgc2VsZWN0ZWQgb2Zmc2V0IG9mIHRoZSBnaXZlbiBub2RlLgor ICAgIC8vIEluaXRpYWxpemVzIHRoZSBvYmplY3QgdG8gZ2V0IHRoZSBzdXJyb3VuZGluZyB0ZXh0 IGNlbnRlcmVkIGluIHRoZSBwb3NpdGlvbiByZWxhdGl2ZSB0byBhIHByb3ZpZGVkIG5vZGUuCiAg ICAgLy8gVGhlIG1heGltdW0gbGVuZ3RoIG9mIHRoZSBjb250ZW50cyByZXRyaWV2ZWQgaXMgZGVm aW5lZCBieSBtYXhMZW5ndGguCi0gICAgV0VCS0lUX0VYUE9SVCB2b2lkIGluaXRpYWxpemUoV2Vi Tm9kZSB0ZXh0Tm9kZSwgc2l6ZV90IG9mZnNldCwgc2l6ZV90IG1heExlbmd0aCk7CisgICAgV0VC S0lUX0VYUE9SVCB2b2lkIGluaXRpYWxpemUoY29uc3QgV2ViTm9kZSYsIGNvbnN0IFdlYlBvaW50 Jiwgc2l6ZV90IG1heExlbmd0aCk7CiAKICAgICAvLyBTdXJyb3VuZGluZyB0ZXh0IGNvbnRlbnQg cmV0cmlldmVkLgogICAgIFdFQktJVF9FWFBPUlQgV2ViU3RyaW5nIHRleHRDb250ZW50KCkgY29u c3Q7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJTdXJyb3VuZGlu Z1RleHQuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViU3Vycm91bmRpbmdUZXh0 LmNwcAppbmRleCBhOWQxZDdlYzBiZmY4ZThhYWRhNmYyOTMxZjRiYzk4OGNkMzRiZDRhLi5mODgw Njc2YWVhZWFiOTRhYjhjNDRjZThlZjdmYzlmN2NjODA4ZjAzIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L2Nocm9taXVtL3NyYy9XZWJTdXJyb3VuZGluZ1RleHQuY3BwCisrKyBiL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vc3JjL1dlYlN1cnJvdW5kaW5nVGV4dC5jcHAKQEAgLTQwLDIyICs0MCwy MiBAQCB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIAogbmFtZXNwYWNlIFdlYktpdCB7CiAKLXZv aWQgV2ViU3Vycm91bmRpbmdUZXh0Ojppbml0aWFsaXplKGNvbnN0IFdlYkhpdFRlc3RSZXN1bHQm IGhpdFRlc3RJbmZvLCBzaXplX3QgbWF4TGVuZ3RoKQordm9pZCBXZWJTdXJyb3VuZGluZ1RleHQ6 OmluaXRpYWxpemUoY29uc3QgV2ViSGl0VGVzdFJlc3VsdCYgaGl0VGVzdFJlc3VsdCwgc2l6ZV90 IG1heExlbmd0aCkKIHsKLSAgICBOb2RlKiBub2RlID0gaGl0VGVzdEluZm8ubm9kZSgpLnVud3Jh cDxOb2RlPigpOworICAgIE5vZGUqIG5vZGUgPSBoaXRUZXN0UmVzdWx0Lm5vZGUoKS51bndyYXA8 Tm9kZT4oKTsKICAgICBpZiAoIW5vZGUgfHwgIW5vZGUtPnJlbmRlcmVyKCkpCiAgICAgICAgIHJl dHVybjsKIAotICAgIG1fcHJpdmF0ZS5yZXNldChuZXcgU3Vycm91bmRpbmdUZXh0KFZpc2libGVQ b3NpdGlvbihub2RlLT5yZW5kZXJlcigpLT5wb3NpdGlvbkZvclBvaW50KHN0YXRpY19jYXN0PElu dFBvaW50PihoaXRUZXN0SW5mby5sb2NhbFBvaW50KCkpKSksIG1heExlbmd0aCkpOworICAgIG1f cHJpdmF0ZS5yZXNldChuZXcgU3Vycm91bmRpbmdUZXh0KFZpc2libGVQb3NpdGlvbihub2RlLT5y ZW5kZXJlcigpLT5wb3NpdGlvbkZvclBvaW50KHN0YXRpY19jYXN0PEludFBvaW50PihoaXRUZXN0 UmVzdWx0LmxvY2FsUG9pbnQoKSkpKSwgbWF4TGVuZ3RoKSk7CiB9CiAKLXZvaWQgV2ViU3Vycm91 bmRpbmdUZXh0Ojppbml0aWFsaXplKFdlYk5vZGUgdGV4dE5vZGUsIHNpemVfdCBvZmZzZXQsIHNp emVfdCBtYXhMZW5ndGgpCit2b2lkIFdlYlN1cnJvdW5kaW5nVGV4dDo6aW5pdGlhbGl6ZShjb25z dCBXZWJOb2RlJiB3ZWJOb2RlLCBjb25zdCBXZWJQb2ludCYgbm9kZVBvaW50LCBzaXplX3QgbWF4 TGVuZ3RoKQogewotICAgIE5vZGUqIG5vZGUgPSB0ZXh0Tm9kZS51bndyYXA8Tm9kZT4oKTsKLSAg ICBpZiAoIW5vZGUgfHwgIW5vZGUtPmlzVGV4dE5vZGUoKSB8fCBvZmZzZXQgPj0gbm9kZS0+bm9k ZVZhbHVlKCkubGVuZ3RoKCkpCisgICAgY29uc3QgTm9kZSogbm9kZSA9IHdlYk5vZGUuY29uc3RV bndyYXA8Tm9kZT4oKTsKKyAgICBpZiAoIW5vZGUgfHwgIW5vZGUtPnJlbmRlcmVyKCkpCiAgICAg ICAgIHJldHVybjsKIAotICAgIG1fcHJpdmF0ZS5yZXNldChuZXcgU3Vycm91bmRpbmdUZXh0KFZp c2libGVQb3NpdGlvbihQb3NpdGlvbih0b1RleHQobm9kZSksIG9mZnNldCkucGFyZW50QW5jaG9y ZWRFcXVpdmFsZW50KCksIERPV05TVFJFQU0pLCBtYXhMZW5ndGgpKTsKKyAgICBtX3ByaXZhdGUu cmVzZXQobmV3IFN1cnJvdW5kaW5nVGV4dChub2RlLT5yZW5kZXJlcigpLT5wb3NpdGlvbkZvclBv aW50KHN0YXRpY19jYXN0PEludFBvaW50Pihub2RlUG9pbnQpKSwgbWF4TGVuZ3RoKSk7CiB9CiAK IFdlYlN0cmluZyBXZWJTdXJyb3VuZGluZ1RleHQ6OnRleHRDb250ZW50KCkgY29uc3QKZGlmZiAt LWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA3NzA1NTgxNGE3 Y2I4NGNmZDgwNzE0YWI2YzY1ZmQ4YmY4YzU2MzI2Li5lMjg5ZDBhYjgwNjUxZjRiNjMzYzQ1ZTQ4 ZTYwYmYxMTEwYjE5MmY4IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTItMDctMDkgIExlYW5kcm8gR3JhY2lhIEdp bCAgPGxlYW5kcm9ncmFjaWFAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYlN1cnJvdW5kaW5n VGV4dCBsYXlvdXQgdGVzdHMgc2hvdWxkIHVzZSB0aGUgc2FtZSBjb2RlIHBhdGggYXMgdGhlIHJl c3Qgb2YgdGhlIGZlYXR1cmUuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD05MDgwNworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIE1ha2UgdGhlIHRleHRTdXJyb3VuZGluZ05vZGUgbWV0aG9kIHRha2UgYSBwYWly IG9mIHBvaW50IGNvb3JkaW5hdGVzCisgICAgICAgIGluc3RlYWQgb2YgYSBub2RlIG9mZnNldC4K KworICAgICAgICAqIER1bXBSZW5kZXJUcmVlL2Nocm9taXVtL0xheW91dFRlc3RDb250cm9sbGVy LmNwcDoKKyAgICAgICAgKExheW91dFRlc3RDb250cm9sbGVyOjp0ZXh0U3Vycm91bmRpbmdOb2Rl KToKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9MYXlvdXRUZXN0Q29udHJvbGxl ci5oOgorICAgICAgICAoTGF5b3V0VGVzdENvbnRyb2xsZXIpOgorCiAyMDEyLTA3LTEwICBBZGFt IEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CiAKICAgICAgICAgTGF5b3V0VGVzdENvbnRyb2xs ZXIuZHVtcENvbmZpZ3VyYXRpb25Gb3JWaWV3cG9ydCBzaG91bGQgbW92ZSB0byBJbnRlcm5hbHMK ZGlmZiAtLWdpdCBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL0xheW91dFRlc3RDb250 cm9sbGVyLmNwcCBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL0xheW91dFRlc3RDb250 cm9sbGVyLmNwcAppbmRleCAyNThlNjgyY2ViZmRmMzg2MzNiMGZmYjc5MjYyNDI1ZDgyM2NkMTY1 Li45ZDIwMTNiODYwNzk0MWZkZGU5MjA3ZmY2NGVhNTc1OGI1NjllMTFhIDEwMDY0NAotLS0gYS9U b29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9MYXlvdXRUZXN0Q29udHJvbGxlci5jcHAKKysr IGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vTGF5b3V0VGVzdENvbnRyb2xsZXIuY3Bw CkBAIC0yMzQ5LDcgKzIzNDksNyBAQCB2b2lkIExheW91dFRlc3RDb250cm9sbGVyOjpzZXRQb2lu dGVyTG9ja1dpbGxGYWlsU3luY2hyb25vdXNseShjb25zdCBDcHBBcmd1bWVudAogdm9pZCBMYXlv dXRUZXN0Q29udHJvbGxlcjo6dGV4dFN1cnJvdW5kaW5nTm9kZShjb25zdCBDcHBBcmd1bWVudExp c3QmIGFyZ3VtZW50cywgQ3BwVmFyaWFudCogcmVzdWx0KQogewogICAgIHJlc3VsdC0+c2V0TnVs bCgpOwotICAgIGlmIChhcmd1bWVudHMuc2l6ZSgpIDwgMyB8fCAhYXJndW1lbnRzWzBdLmlzT2Jq ZWN0KCkgfHwgIWFyZ3VtZW50c1sxXS5pc051bWJlcigpIHx8ICFhcmd1bWVudHNbMl0uaXNOdW1i ZXIoKSkKKyAgICBpZiAoYXJndW1lbnRzLnNpemUoKSA8IDQgfHwgIWFyZ3VtZW50c1swXS5pc09i amVjdCgpIHx8ICFhcmd1bWVudHNbMV0uaXNOdW1iZXIoKSB8fCAhYXJndW1lbnRzWzJdLmlzTnVt YmVyKCkgfHwgIWFyZ3VtZW50c1szXS5pc051bWJlcigpKQogICAgICAgICByZXR1cm47CiAKICAg ICBXZWJOb2RlIG5vZGU7CkBAIC0yMzU5LDE0ICsyMzU5LDEzIEBAIHZvaWQgTGF5b3V0VGVzdENv bnRyb2xsZXI6OnRleHRTdXJyb3VuZGluZ05vZGUoY29uc3QgQ3BwQXJndW1lbnRMaXN0JiBhcmd1 bWVudHMsCiAgICAgaWYgKG5vZGUuaXNOdWxsKCkgfHwgIW5vZGUuaXNUZXh0Tm9kZSgpKQogICAg ICAgICByZXR1cm47CiAKLSAgICB1bnNpZ25lZCBvZmZzZXQgPSBhcmd1bWVudHNbMV0udG9JbnQz MigpOwotICAgIGlmIChvZmZzZXQgPj0gbm9kZS5ub2RlVmFsdWUoKS5sZW5ndGgoKSkgewotICAg ICAgICByZXN1bHQtPnNldChXZWJTdHJpbmcoKS51dGY4KCkpOwotICAgICAgICByZXR1cm47Ci0g ICAgfQorICAgIFdlYlBvaW50IHBvaW50KGFyZ3VtZW50c1sxXS50b0ludDMyKCksIGFyZ3VtZW50 c1syXS50b0ludDMyKCkpOworICAgIHVuc2lnbmVkIG1heExlbmd0aCA9IGFyZ3VtZW50c1szXS50 b0ludDMyKCk7CiAKICAgICBXZWJTdXJyb3VuZGluZ1RleHQgc3Vycm91bmRpbmdUZXh0OwotICAg IHVuc2lnbmVkIG1heExlbmd0aCA9IGFyZ3VtZW50c1syXS50b0ludDMyKCk7Ci0gICAgc3Vycm91 bmRpbmdUZXh0LmluaXRpYWxpemUobm9kZSwgb2Zmc2V0LCBtYXhMZW5ndGgpOworICAgIHN1cnJv dW5kaW5nVGV4dC5pbml0aWFsaXplKG5vZGUsIHBvaW50LCBtYXhMZW5ndGgpOworICAgIGlmIChz dXJyb3VuZGluZ1RleHQuaXNOdWxsKCkpCisgICAgICAgIHJldHVybjsKKwogICAgIHJlc3VsdC0+ c2V0KHN1cnJvdW5kaW5nVGV4dC50ZXh0Q29udGVudCgpLnV0ZjgoKSk7CiB9CmRpZmYgLS1naXQg YS9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9MYXlvdXRUZXN0Q29udHJvbGxlci5oIGIv VG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vTGF5b3V0VGVzdENvbnRyb2xsZXIuaAppbmRl eCA0MTMwZTkzZWEyNDBlNTkyM2Y3NmUzY2JjNTMzYTVhOTg5Y2FiY2JhLi4wOGM3MjQ0MTAxMGQ5 NWVmMGQxMjQ0MzNkNzE4YjU4MzMzYWZiZDA0IDEwMDY0NAotLS0gYS9Ub29scy9EdW1wUmVuZGVy VHJlZS9jaHJvbWl1bS9MYXlvdXRUZXN0Q29udHJvbGxlci5oCisrKyBiL1Rvb2xzL0R1bXBSZW5k ZXJUcmVlL2Nocm9taXVtL0xheW91dFRlc3RDb250cm9sbGVyLmgKQEAgLTQ1Nyw4ICs0NTcsOSBA QCBwdWJsaWM6CiAgICAgdm9pZCBzZXRCYWNraW5nU2NhbGVGYWN0b3IoY29uc3QgQ3BwQXJndW1l bnRMaXN0JiwgQ3BwVmFyaWFudCopOwogCiAgICAgLy8gUmV0cmlldmVzIHRoZSB0ZXh0IHN1cnJv dW5kaW5nIGEgcG9zaXRpb24gaW4gYSB0ZXh0IG5vZGUuCi0gICAgLy8gRXhwZWN0cyB0aGUgZmly c3QgYXJndW1lbnQgdG8gYmUgYSB0ZXh0IG5vZGUsIHRoZSBzZWNvbmQgdG8gYmUgYW4gb2Zmc2V0 Ci0gICAgLy8gaW4gdGhlIG5vZGUgY29udGVudHMgYW5kIHRoZSB0aGlyZCB0aGUgbWF4aW11bSB0 ZXh0IGxlbmd0aCB0byByZXRyaWV2ZS4KKyAgICAvLyBFeHBlY3RzIHRoZSBmaXJzdCBhcmd1bWVu dCB0byBiZSBhIHRleHQgbm9kZSwgdGhlIHNlY29uZCBhbmQgdGhpcmQgdG8gYmUKKyAgICAvLyBw b2ludCBjb29yZGluYXRlcyByZWxhdGl2ZSB0byB0aGUgbm9kZSBhbmQgdGhlIGZvdXJ0aCB0aGUg bWF4aW11bSB0ZXh0CisgICAgLy8gbGVuZ3RoIHRvIHJldHJpZXZlLgogICAgIHZvaWQgdGV4dFN1 cnJvdW5kaW5nTm9kZShjb25zdCBDcHBBcmd1bWVudExpc3QmLCBDcHBWYXJpYW50Kik7CiAKIHB1 YmxpYzoKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0No YW5nZUxvZwppbmRleCA1NzBkMTk3NDAzZTM1ZTdjNzhjM2UwYjhhOGVkZTFiOTMxMzJjMzZjLi5m MmMzN2ZkNzYzYjMwMGJhMmZhMmIxZjZjOTE4ZWMyMWJiMzBmZDFhIDEwMDY0NAotLS0gYS9MYXlv dXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEs MTYgQEAKKzIwMTItMDctMDkgIExlYW5kcm8gR3JhY2lhIEdpbCAgPGxlYW5kcm9ncmFjaWFAY2hy b21pdW0ub3JnPgorCisgICAgICAgIFdlYlN1cnJvdW5kaW5nVGV4dCBsYXlvdXQgdGVzdHMgc2hv dWxkIHVzZSB0aGUgc2FtZSBjb2RlIHBhdGggYXMgdGhlIHJlc3Qgb2YgdGhlIGZlYXR1cmUuCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MDgwNworCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1ha2UgdGhlIHRl eHRTdXJyb3VuZGluZ05vZGUgbWV0aG9kIHRha2UgYSBwYWlyIG9mIHBvaW50IGNvb3JkaW5hdGVz CisgICAgICAgIGluc3RlYWQgb2YgYSBub2RlIG9mZnNldC4KKworICAgICAgICAqIHBsYXRmb3Jt L2Nocm9taXVtL2VkaXRpbmcvc3Vycm91bmRpbmctdGV4dC9zdXJyb3VuZGluZy10ZXh0LWV4cGVj dGVkLnR4dDoKKyAgICAgICAgKiBwbGF0Zm9ybS9jaHJvbWl1bS9lZGl0aW5nL3N1cnJvdW5kaW5n LXRleHQvc3Vycm91bmRpbmctdGV4dC5odG1sOgorCiAyMDEyLTA3LTEwICBDc2FiYSBPc3p0cm9n b27DoWMgIDxvc3N5QHdlYmtpdC5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCBnYXJkZW5pbmcg YWZ0ZXIgcjEyMjIwNC4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL2Nocm9taXVt L2VkaXRpbmcvc3Vycm91bmRpbmctdGV4dC9zdXJyb3VuZGluZy10ZXh0LWV4cGVjdGVkLnR4dCBi L0xheW91dFRlc3RzL3BsYXRmb3JtL2Nocm9taXVtL2VkaXRpbmcvc3Vycm91bmRpbmctdGV4dC9z dXJyb3VuZGluZy10ZXh0LWV4cGVjdGVkLnR4dAppbmRleCA3NTFiMjQ1NGJkYmFmMWZhOGE2ZGY4 OTMzOWRkODVjOWNmMzA1NWQwLi40OGRhNjJjYWUzNmI4NTNjOGE1ZjJjZTRjMzBjOTIwOGVkMTlm ODllIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9jaHJvbWl1bS9lZGl0aW5nL3N1 cnJvdW5kaW5nLXRleHQvc3Vycm91bmRpbmctdGV4dC1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0 VGVzdHMvcGxhdGZvcm0vY2hyb21pdW0vZWRpdGluZy9zdXJyb3VuZGluZy10ZXh0L3N1cnJvdW5k aW5nLXRleHQtZXhwZWN0ZWQudHh0CkBAIC04LDcgKzgsNiBAQCBQQVNTIHN1cnJvdW5kaW5nVGV4 dCgnPGJ1dHRvbj4uPC9idXR0b24+MTIzNDU8cCBpZD0iaGVyZSI+Njc4OSAxMjM0NTwvcD42Nzg5 PGJ1dAogUEFTUyBzdXJyb3VuZGluZ1RleHQoJzxidXR0b24+LjwvYnV0dG9uPjEyMzQ1PHAgaWQ9 ImhlcmUiPjY3ODkgMTIzNDU8L3A+Njc4OTxidXR0b24+LjwvYnV0dG9uPicsIDUsIDApIGlzICIi CiBQQVNTIHN1cnJvdW5kaW5nVGV4dCgnPGJ1dHRvbj4uPC9idXR0b24+MTIzNDU8cCBpZD0iaGVy ZSI+Njc4OSAxMjM0NTwvcD42Nzg5PGJ1dHRvbj4uPC9idXR0b24+JywgNSwgMSkgaXMgIjEiCiBQ QVNTIHN1cnJvdW5kaW5nVGV4dCgnPGJ1dHRvbj4uPC9idXR0b24+MTIzNDU8cCBpZD0iaGVyZSI+ Njc4OSAxMjM0NTwvcD42Nzg5PGJ1dHRvbj4uPC9idXR0b24+JywgNiwgMikgaXMgIjEyIgotUEFT UyBzdXJyb3VuZGluZ1RleHQoJzxidXR0b24+LjwvYnV0dG9uPjEyMzQ1PHAgaWQ9ImhlcmUiPjY3 ODkgMTIzNDU8L3A+Njc4OTxidXR0b24+LjwvYnV0dG9uPicsIDEwMCwgNSkgaXMgIiIKIFBBU1Mg c3Vycm91bmRpbmdUZXh0KCc8c2VsZWN0Pi48L3NlbGVjdD48ZGl2PjU3dGggU3RyZWV0IGFuZCBM YWtlIFNob3JlIERyaXZlPC9kaXY+IDxzcGFuPkNoaWNhZ288L3NwYW4+IDxzcGFuIGlkPSJoZXJl Ij5JTDwvc3Bhbj4gPHNwYW4+NjA2Mzc8L3NwYW4+PHNlbGVjdD4uPC9zZWxlY3Q+JywgMCwgMTAw KSBpcyAiNTd0aCBTdHJlZXQgYW5kIExha2UgU2hvcmUgRHJpdmUgQ2hpY2FnbyBJTCA2MDYzNyIK IFBBU1Mgc3Vycm91bmRpbmdUZXh0KCc8ZmllbGRzZXQ+LjwvZmllbGRzZXQ+MTIzNDU8YnV0dG9u PmFiYzwvYnV0dG9uPjxwPjY3ODk8YnIgaWQ9ImhlcmUiLz4xMjM0NTwvcD42Nzg5PHRleHRhcmVh PmFiYzwvdGV4dGFyZWE+MDEyMzxmaWVsZHNldD4uPC9maWVsZHNldD4nLCAwLCAxMDApIGlzICI2 Nzg5IDEyMzQ1IDY3ODkiCiBQQVNTIHN1cnJvdW5kaW5nVGV4dCgnPGJ1dHRvbj4uPC9idXR0b24+ PGRpdiBpZD0iaGVyZSI+VGhpcyBpcyA8IS0tIGNvbW1lbnQgLS0hPmEgdGVzdCA8JyArICdzY3Jp cHQgbGFuZ3VhZ2U9ImphdmFzY3JpcHQiPjwnICsgJy9zY3JpcHQ+ZXhhbXBsZTxidXR0b24+Ljwv YnV0dG9uPicsIDAsIDEwMCkgaXMgIlRoaXMgaXMgYSB0ZXN0IGV4YW1wbGUiCmRpZmYgLS1naXQg YS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9jaHJvbWl1bS9lZGl0aW5nL3N1cnJvdW5kaW5nLXRleHQv c3Vycm91bmRpbmctdGV4dC5odG1sIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vY2hyb21pdW0vZWRp dGluZy9zdXJyb3VuZGluZy10ZXh0L3N1cnJvdW5kaW5nLXRleHQuaHRtbAppbmRleCAxZDI0MzJk MzJlYzRjMTg3MzVlYTQ5YTEzOTY5YzE3OGY4NmIzZmExLi45MDU0MDI0Y2MzOTcwYjgwNjkzNzFm YTJmYTk4NTlkYTlhZWJjNzkwIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9jaHJv bWl1bS9lZGl0aW5nL3N1cnJvdW5kaW5nLXRleHQvc3Vycm91bmRpbmctdGV4dC5odG1sCisrKyBi L0xheW91dFRlc3RzL3BsYXRmb3JtL2Nocm9taXVtL2VkaXRpbmcvc3Vycm91bmRpbmctdGV4dC9z dXJyb3VuZGluZy10ZXh0Lmh0bWwKQEAgLTksNiArOSwyMiBAQAogPHNjcmlwdD4KIGRlc2NyaXB0 aW9uKCdUZXN0IHRoZSBleHRyYWN0aW9uIG9mIHRoZSB0ZXh0IHN1cnJvdW5kaW5nIGFuIGVsZW1l bnQuJyk7CiAKK2Z1bmN0aW9uIGZpbmRPZmZzZXRDb29yZGluYXRlcyhub2RlLCBvZmZzZXQpIHsK KyAgICB2YXIgbm9kZVJhbmdlID0gZG9jdW1lbnQuY3JlYXRlUmFuZ2UoKTsKKyAgICBub2RlUmFu Z2Uuc2VsZWN0Tm9kZShub2RlKTsKKworICAgIHZhciBvZmZzZXRSYW5nZSA9IGRvY3VtZW50LmNy ZWF0ZVJhbmdlKCk7CisgICAgb2Zmc2V0UmFuZ2Uuc2V0U3RhcnQobm9kZSwgb2Zmc2V0KTsKKyAg ICBvZmZzZXRSYW5nZS5zZXRFbmQobm9kZSwgb2Zmc2V0ICsgMSk7CisKKyAgICB2YXIgbm9kZVJl Y3QgPSBub2RlUmFuZ2UuZ2V0Qm91bmRpbmdDbGllbnRSZWN0KCk7CisgICAgdmFyIG9mZnNldFJl Y3QgPSBvZmZzZXRSYW5nZS5nZXRCb3VuZGluZ0NsaWVudFJlY3QoKTsKKyAgICB2YXIgeCA9IChv ZmZzZXRSZWN0LmxlZnQgKyBvZmZzZXRSZWN0LnJpZ2h0KSAvIDIgLSBub2RlUmVjdC5sZWZ0Owor ICAgIHZhciB5ID0gKG9mZnNldFJlY3QudG9wICsgb2Zmc2V0UmVjdC5ib3R0b20pIC8gMiAtIG5v ZGVSZWN0LnRvcDsKKworICAgIHJldHVybiB7IHg6IHgsIHk6IHkgfTsKK30KKwogZnVuY3Rpb24g c3Vycm91bmRpbmdUZXh0KGh0bWwsIG9mZnNldCwgbWF4TGVuZ3RoKSB7CiAgICAgZG9jdW1lbnQu Z2V0RWxlbWVudEJ5SWQoJ3Rlc3QnKS5pbm5lckhUTUwgPSBodG1sOwogCkBAIC0yMCw3ICszNiw4 IEBAIGZ1bmN0aW9uIHN1cnJvdW5kaW5nVGV4dChodG1sLCBvZmZzZXQsIG1heExlbmd0aCkgewog ICAgIGlmIChub2RlID09IG51bGwpCiAgICAgICAgIHRocm93ICdObyBub2RlIGFmdGVyICJoZXJl IiBlbGVtZW50JzsKIAotICAgIHZhciB0ZXh0ID0gd2luZG93LnRlc3RSdW5uZXIudGV4dFN1cnJv dW5kaW5nTm9kZShub2RlLCBvZmZzZXQsIG1heExlbmd0aCk7CisgICAgdmFyIGNvb3JkcyA9IGZp bmRPZmZzZXRDb29yZGluYXRlcyhub2RlLCBvZmZzZXQpOworICAgIHZhciB0ZXh0ID0gd2luZG93 LnRlc3RSdW5uZXIudGV4dFN1cnJvdW5kaW5nTm9kZShub2RlLCBjb29yZHMueCwgY29vcmRzLnks IG1heExlbmd0aCk7CiAgICAgcmV0dXJuIHRleHQucmVwbGFjZSgvXHMrL2csICcgJykucmVwbGFj ZSgvXlxzKnxccyokL2csICcnKTsKIH0KIApAQCAtMzMsNyArNTAsNiBAQCBmdW5jdGlvbiBydW4o KSB7CiAgICAgc2hvdWxkQmVFcXVhbFRvU3RyaW5nKCdzdXJyb3VuZGluZ1RleHQoXCc8YnV0dG9u Pi48L2J1dHRvbj4xMjM0NTxwIGlkPSJoZXJlIj42Nzg5IDEyMzQ1PC9wPjY3ODk8YnV0dG9uPi48 L2J1dHRvbj5cJywgNSwgMCknLCAnJyk7CiAgICAgc2hvdWxkQmVFcXVhbFRvU3RyaW5nKCdzdXJy b3VuZGluZ1RleHQoXCc8YnV0dG9uPi48L2J1dHRvbj4xMjM0NTxwIGlkPSJoZXJlIj42Nzg5IDEy MzQ1PC9wPjY3ODk8YnV0dG9uPi48L2J1dHRvbj5cJywgNSwgMSknLCAnMScpOwogICAgIHNob3Vs ZEJlRXF1YWxUb1N0cmluZygnc3Vycm91bmRpbmdUZXh0KFwnPGJ1dHRvbj4uPC9idXR0b24+MTIz NDU8cCBpZD0iaGVyZSI+Njc4OSAxMjM0NTwvcD42Nzg5PGJ1dHRvbj4uPC9idXR0b24+XCcsIDYs IDIpJywgJzEyJyk7Ci0gICAgc2hvdWxkQmVFcXVhbFRvU3RyaW5nKCdzdXJyb3VuZGluZ1RleHQo XCc8YnV0dG9uPi48L2J1dHRvbj4xMjM0NTxwIGlkPSJoZXJlIj42Nzg5IDEyMzQ1PC9wPjY3ODk8 YnV0dG9uPi48L2J1dHRvbj5cJywgMTAwLCA1KScsICcnKTsKICAgICBzaG91bGRCZUVxdWFsVG9T dHJpbmcoJ3N1cnJvdW5kaW5nVGV4dChcJzxzZWxlY3Q+Ljwvc2VsZWN0PjxkaXY+NTd0aCBTdHJl ZXQgYW5kIExha2UgU2hvcmUgRHJpdmU8L2Rpdj4gPHNwYW4+Q2hpY2Fnbzwvc3Bhbj4gPHNwYW4g aWQ9ImhlcmUiPklMPC9zcGFuPiA8c3Bhbj42MDYzNzwvc3Bhbj48c2VsZWN0Pi48L3NlbGVjdD5c JywgMCwgMTAwKScsICc1N3RoIFN0cmVldCBhbmQgTGFrZSBTaG9yZSBEcml2ZSBDaGljYWdvIElM IDYwNjM3Jyk7CiAgICAgc2hvdWxkQmVFcXVhbFRvU3RyaW5nKCdzdXJyb3VuZGluZ1RleHQoXCc8 ZmllbGRzZXQ+LjwvZmllbGRzZXQ+MTIzNDU8YnV0dG9uPmFiYzwvYnV0dG9uPjxwPjY3ODk8YnIg aWQ9ImhlcmUiLz4xMjM0NTwvcD42Nzg5PHRleHRhcmVhPmFiYzwvdGV4dGFyZWE+MDEyMzxmaWVs ZHNldD4uPC9maWVsZHNldD5cJywgMCwgMTAwKScsICc2Nzg5IDEyMzQ1IDY3ODknKTsKICAgICBz aG91bGRCZUVxdWFsVG9TdHJpbmcoJ3N1cnJvdW5kaW5nVGV4dChcJzxidXR0b24+LjwvYnV0dG9u PjxkaXYgaWQ9ImhlcmUiPlRoaXMgaXMgPCEtLSBjb21tZW50IC0tIT5hIHRlc3QgPFwnICsgXCdz Y3JpcHQgbGFuZ3VhZ2U9ImphdmFzY3JpcHQiPjxcJyArIFwnL3NjcmlwdD5leGFtcGxlPGJ1dHRv bj4uPC9idXR0b24+XCcsIDAsIDEwMCknLCAnVGhpcyBpcyBhIHRlc3QgZXhhbXBsZScpOwo=