135452 2014-07-30 22:59:00 -0700 REGRESSION: Search highlight is broken in RTL multicolumn content 2014-07-31 19:22:47 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 rniwa abucur abucur commit-queue esprehn+autocc glenn hyatt koivisto kondapallykalyan mihnea simon.fraser oldest_to_newest 1025916 0 235808 rniwa 2014-07-30 22:59:00 -0700 Created attachment 235808 test case Reproduction steps: 1. Open the attached file in the nightly build of WebKit 2. Find "hello" via Cmd+F. Expected result: "hello" is highlighted Actual result: The yellow highlight shows up on the left of "hello". 1025917 1 rniwa 2014-07-30 23:08:08 -0700 The problem here is that RenderMultiColumnFlowThread::mapFromFlowToRegion doesn't add the layer offset when computing the translation offset despite the fact RenderMultiColumnSet::columnTranslationForOffset returns an offset from the layer's top left corner. This is in contract to RenderLayer::collectFragments. It calls RenderMultiColumnSet::collectLayerFragments, which also returns an offset from the layer's top left corner, but it adds the layer offset so everything is fine there. 1025979 2 abucur 2014-07-31 08:37:37 -0700 I found the issue and I have a fix. Working on the patch ATM. 1026010 3 235829 abucur 2014-07-31 10:37:04 -0700 Created attachment 235829 Patch 1026047 4 235829 commit-queue 2014-07-31 12:51:08 -0700 Comment on attachment 235829 Patch Clearing flags on attachment: 235829 Committed r171882: <http://trac.webkit.org/changeset/171882> 1026048 5 commit-queue 2014-07-31 12:51:13 -0700 All reviewed patches have been landed. Closing bug. 1026099 6 simon.fraser 2014-07-31 15:42:02 -0700 <rdar://problem/17802531> 1026170 7 rniwa 2014-07-31 19:22:47 -0700 *** Bug 135453 has been marked as a duplicate of this bug. *** 235808 2014-07-30 22:59:00 -0700 2014-07-30 22:59:00 -0700 test case column-bug.html text/html 206 rniwa PCFET0NUWVBFIGh0bWw+CjxodG1sPgo8Ym9keT4KPGRpdiBkaXI9InJ0bCIgc3R5bGU9InBvc2l0 aW9uOmFic29sdXRlOyBsZWZ0OiAwOyB0b3A6IDBweDsgd2lkdGg6IDYwMHB4OyBoZWlnaHQ6IDYw cHg7CiAgICAtd2Via2l0LWNvbHVtbi1jb3VudDogMzsgZm9udC1zaXplOiA1MHB4OyI+CmhlbGxv Cjxicj4Kd29ybGQKPC9kaXY+CjwvYm9keT4KPC9odG1sPgo= 235829 2014-07-31 10:37:04 -0700 2014-07-31 12:51:08 -0700 Patch bug-135452-20140731203649.patch text/plain 11459 abucur U3VidmVyc2lvbiBSZXZpc2lvbjogMTcxODYyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjlkM2VlZmQ3NzdjNWRh NWJlM2NkMWUzMmM4NTllNGQ3ZTYzNDcwZC4uMzg2ZGExMmQyZWEwOTBhNmZkMTBiOTQ2YmYxN2Ey YjhjZDNhOWYwMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE0LTA3LTMxICBBbmRy ZWkgQnVjdXIgIDxhYnVjdXJAYWRvYmUuY29tPgorCisgICAgICAgIFJFR1JFU1NJT046IFNlYXJj aCBoaWdobGlnaHQgaXMgYnJva2VuIGluIFJUTCBtdWx0aWNvbHVtbiBjb250ZW50CisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzU0NTIKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgb2Zmc2V0cyBmb3Ig ZWxlbWVudHMgaW5zaWRlIFJUTCBtdWx0aS1jb2x1bW4gZWxlbWVudHMgYXJlIGluY29ycmVjdGx5 IGNvbXB1dGVkIGJlY2F1c2UKKyAgICAgICAgdGhlIGNvbHVtbnMgZG9uJ3QgY2FsY3VsYXRlIHRo ZWlyIGxlZnQgcG9zaXRpb24gYWNjb3JkaW5nIHRvIHRoZSB3cml0aW5nIGRpcmVjdGlvbi4KKwor ICAgICAgICBUaGUgcGF0Y2ggZXh0cmFjdHMgdGhlIGNvbHVtbiBwb3NpdGlvbiBjb21wdXRhdGlv biBpbiB0d28gaGVscGVyIGZ1bmN0aW9ucyAoZm9yIHRvcCBhbmQgbGVmdCkKKyAgICAgICAgc28g dGhleSBjYW4gYmUgdXNlZCB3aGVuIG5lZWRlZCBpbiBkaWZmZXJlbnQgcGFydHMgb2YgdGhlIGNv ZGUuIEluIG91ciBjYXNlLCB0aGUgfGNvbHVtbkxvZ2ljYWxMZWZ0fAorICAgICAgICBmdW5jdGlv biBzaG91bGQgYmUgdXNlZCBpbnNpZGUgfGNvbHVtblRyYW5zbGF0aW9uRm9yT2Zmc2V0fC4KKwor ICAgICAgICBUZXN0OiBmYXN0L211bHRpY29sL2NvbnRlbnQtYm91bmRpbmctYm94LXJ0bC5odG1s CisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTXVsdGlDb2x1bW5TZXQuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6UmVuZGVyTXVsdGlDb2x1bW5TZXQ6OmNvbHVtbkxvZ2ljYWxMZWZ0KTogUmV0 dXJuIHRoZSBsb2dpY2FsIGxlZnQgb2YgYSBjb2x1bW4gcmVsYXRpdmUgdG8gdGhlIHNldC4KKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlck11bHRpQ29sdW1uU2V0Ojpjb2x1bW5Mb2dpY2FsVG9wKTog UmV0dXJuIHRoZSBsb2dpY2FsIHRvcCBvZiBhIGNvbHVtbiByZWxhdGl2ZSB0byB0aGUgc2V0Lgor ICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTXVsdGlDb2x1bW5TZXQ6OmNvbHVtblJlY3RBdCk6IFNw bGl0IHRoZSBjb2RlIGJldHdlZW4gY29sdW1uTG9naWNhbExlZnQgYW5kIGNvbHVtbkxvZ2ljYWxU b3AuCisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJNdWx0aUNvbHVtblNldDo6Y29sbGVjdExheWVy RnJhZ21lbnRzKTogTWFrZSBjb2RlIGNsZWFyZXIgYnkgYWRkaW5nIGEgbmV3IGxpbmUuCisgICAg ICAgIChXZWJDb3JlOjpSZW5kZXJNdWx0aUNvbHVtblNldDo6Y29sdW1uVHJhbnNsYXRpb25Gb3JP ZmZzZXQpOiBVc2UgY29sdW1uTG9naWNhbExlZnQgaW5zdGVhZCBvZiBkdXBsaWNhdGluZyBsb2dp Yy4KKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTXVsdGlDb2x1bW5TZXQuaDoKKwogMjAxNC0w Ny0zMSAgV2Vuc29uIEhzaWVoICA8d2Vuc29uX2hzaWVoQGFwcGxlLmNvbT4KIAogICAgICAgICBS ZWZhY3RvciBFdmVudEhhbmRsZXIgdG8gY2FsbCBTY3JvbGxBbmltYXRvcjo6aGFuZGxlV2hlZWxF dmVudCBmb3Igb3ZlcmZsb3cgc2Nyb2xsaW5nCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyTXVsdGlDb2x1bW5TZXQuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlck11bHRpQ29sdW1uU2V0LmNwcAppbmRleCAzMGY5MjZkNGQ2ZjUwMmYxMDA1ODE5 YTRjNjI2MmJhMzhhZGUyOTVmLi4wYTRlZWIyN2YxZjBiMTI4NGRjNmRmYmQwMWJmM2JmYmUyMWIx MThmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTXVsdGlDb2x1 bW5TZXQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJNdWx0aUNvbHVt blNldC5jcHAKQEAgLTQ0NCwzMiArNDQ0LDUyIEBAIHVuc2lnbmVkIFJlbmRlck11bHRpQ29sdW1u U2V0Ojpjb2x1bW5Db3VudCgpIGNvbnN0CiAgICAgcmV0dXJuIGNvdW50OwogfQogCi1MYXlvdXRS ZWN0IFJlbmRlck11bHRpQ29sdW1uU2V0Ojpjb2x1bW5SZWN0QXQodW5zaWduZWQgaW5kZXgpIGNv bnN0CitMYXlvdXRVbml0IFJlbmRlck11bHRpQ29sdW1uU2V0Ojpjb2x1bW5Mb2dpY2FsTGVmdCh1 bnNpZ25lZCBpbmRleCkgY29uc3QKIHsKICAgICBMYXlvdXRVbml0IGNvbExvZ2ljYWxXaWR0aCA9 IGNvbXB1dGVkQ29sdW1uV2lkdGgoKTsKLSAgICBMYXlvdXRVbml0IGNvbExvZ2ljYWxIZWlnaHQg PSBjb21wdXRlZENvbHVtbkhlaWdodCgpOwotICAgIExheW91dFVuaXQgY29sTG9naWNhbFRvcCA9 IGJvcmRlckFuZFBhZGRpbmdCZWZvcmUoKTsKICAgICBMYXlvdXRVbml0IGNvbExvZ2ljYWxMZWZ0 ID0gYm9yZGVyQW5kUGFkZGluZ0xvZ2ljYWxMZWZ0KCk7CiAgICAgTGF5b3V0VW5pdCBjb2xHYXAg PSBjb2x1bW5HYXAoKTsKLSAgICAKKwogICAgIGJvb2wgcHJvZ3Jlc3Npb25SZXZlcnNlZCA9IG11 bHRpQ29sdW1uRmxvd1RocmVhZCgpLT5wcm9ncmVzc2lvbklzUmV2ZXJzZWQoKTsKICAgICBib29s IHByb2dyZXNzaW9uSW5saW5lID0gbXVsdGlDb2x1bW5GbG93VGhyZWFkKCktPnByb2dyZXNzaW9u SXNJbmxpbmUoKTsKLSAgICAKKwogICAgIGlmIChwcm9ncmVzc2lvbklubGluZSkgewogICAgICAg ICBpZiAoc3R5bGUoKS5pc0xlZnRUb1JpZ2h0RGlyZWN0aW9uKCkgXiBwcm9ncmVzc2lvblJldmVy c2VkKQogICAgICAgICAgICAgY29sTG9naWNhbExlZnQgKz0gaW5kZXggKiAoY29sTG9naWNhbFdp ZHRoICsgY29sR2FwKTsKICAgICAgICAgZWxzZQogICAgICAgICAgICAgY29sTG9naWNhbExlZnQg Kz0gY29udGVudExvZ2ljYWxXaWR0aCgpIC0gY29sTG9naWNhbFdpZHRoIC0gaW5kZXggKiAoY29s TG9naWNhbFdpZHRoICsgY29sR2FwKTsKLSAgICB9IGVsc2UgeworICAgIH0KKworICAgIHJldHVy biBjb2xMb2dpY2FsTGVmdDsKK30KKworTGF5b3V0VW5pdCBSZW5kZXJNdWx0aUNvbHVtblNldDo6 Y29sdW1uTG9naWNhbFRvcCh1bnNpZ25lZCBpbmRleCkgY29uc3QKK3sKKyAgICBMYXlvdXRVbml0 IGNvbExvZ2ljYWxIZWlnaHQgPSBjb21wdXRlZENvbHVtbkhlaWdodCgpOworICAgIExheW91dFVu aXQgY29sTG9naWNhbFRvcCA9IGJvcmRlckFuZFBhZGRpbmdCZWZvcmUoKTsKKyAgICBMYXlvdXRV bml0IGNvbEdhcCA9IGNvbHVtbkdhcCgpOworCisgICAgYm9vbCBwcm9ncmVzc2lvblJldmVyc2Vk ID0gbXVsdGlDb2x1bW5GbG93VGhyZWFkKCktPnByb2dyZXNzaW9uSXNSZXZlcnNlZCgpOworICAg IGJvb2wgcHJvZ3Jlc3Npb25JbmxpbmUgPSBtdWx0aUNvbHVtbkZsb3dUaHJlYWQoKS0+cHJvZ3Jl c3Npb25Jc0lubGluZSgpOworCisgICAgaWYgKCFwcm9ncmVzc2lvbklubGluZSkgewogICAgICAg ICBpZiAoIXByb2dyZXNzaW9uUmV2ZXJzZWQpCiAgICAgICAgICAgICBjb2xMb2dpY2FsVG9wICs9 IGluZGV4ICogKGNvbExvZ2ljYWxIZWlnaHQgKyBjb2xHYXApOwogICAgICAgICBlbHNlCiAgICAg ICAgICAgICBjb2xMb2dpY2FsVG9wICs9IGNvbnRlbnRMb2dpY2FsSGVpZ2h0KCkgLSBjb2xMb2dp Y2FsSGVpZ2h0IC0gaW5kZXggKiAoY29sTG9naWNhbEhlaWdodCArIGNvbEdhcCk7CiAgICAgfQot ICAgIAorCisgICAgcmV0dXJuIGNvbExvZ2ljYWxUb3A7Cit9CisKK0xheW91dFJlY3QgUmVuZGVy TXVsdGlDb2x1bW5TZXQ6OmNvbHVtblJlY3RBdCh1bnNpZ25lZCBpbmRleCkgY29uc3QKK3sKKyAg ICBMYXlvdXRVbml0IGNvbExvZ2ljYWxXaWR0aCA9IGNvbXB1dGVkQ29sdW1uV2lkdGgoKTsKKyAg ICBMYXlvdXRVbml0IGNvbExvZ2ljYWxIZWlnaHQgPSBjb21wdXRlZENvbHVtbkhlaWdodCgpOwor CiAgICAgaWYgKGlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkpCi0gICAgICAgIHJldHVybiBMYXlv dXRSZWN0KGNvbExvZ2ljYWxMZWZ0LCBjb2xMb2dpY2FsVG9wLCBjb2xMb2dpY2FsV2lkdGgsIGNv bExvZ2ljYWxIZWlnaHQpOwotICAgIHJldHVybiBMYXlvdXRSZWN0KGNvbExvZ2ljYWxUb3AsIGNv bExvZ2ljYWxMZWZ0LCBjb2xMb2dpY2FsSGVpZ2h0LCBjb2xMb2dpY2FsV2lkdGgpOworICAgICAg ICByZXR1cm4gTGF5b3V0UmVjdChjb2x1bW5Mb2dpY2FsTGVmdChpbmRleCksIGNvbHVtbkxvZ2lj YWxUb3AoaW5kZXgpLCBjb2xMb2dpY2FsV2lkdGgsIGNvbExvZ2ljYWxIZWlnaHQpOworICAgIHJl dHVybiBMYXlvdXRSZWN0KGNvbHVtbkxvZ2ljYWxUb3AoaW5kZXgpLCBjb2x1bW5Mb2dpY2FsTGVm dChpbmRleCksIGNvbExvZ2ljYWxIZWlnaHQsIGNvbExvZ2ljYWxXaWR0aCk7CiB9CiAKIHVuc2ln bmVkIFJlbmRlck11bHRpQ29sdW1uU2V0Ojpjb2x1bW5JbmRleEF0T2Zmc2V0KExheW91dFVuaXQg b2Zmc2V0LCBDb2x1bW5JbmRleENhbGN1bGF0aW9uTW9kZSBtb2RlKSBjb25zdApAQCAtNzY2LDYg Kzc4Niw3IEBAIHZvaWQgUmVuZGVyTXVsdGlDb2x1bW5TZXQ6OmNvbGxlY3RMYXllckZyYWdtZW50 cyhMYXllckZyYWdtZW50cyYgZnJhZ21lbnRzLCBjb25zCiAgICAgICAgICAgICAgICAgaW5saW5l T2Zmc2V0ICs9IGNvbnRlbnRMb2dpY2FsV2lkdGgoKSAtIGNvbExvZ2ljYWxXaWR0aDsKICAgICAg ICAgfQogICAgICAgICB0cmFuc2xhdGlvbk9mZnNldC5zZXRXaWR0aChpbmxpbmVPZmZzZXQpOwor CiAgICAgICAgIExheW91dFVuaXQgYmxvY2tPZmZzZXQgPSBpbml0aWFsQmxvY2tPZmZzZXQgKyBs b2dpY2FsVG9wKCkgLSBmbG93VGhyZWFkKCktPmxvZ2ljYWxUb3AoKSArIChpc0hvcml6b250YWxX cml0aW5nTW9kZSgpID8gLWZsb3dUaHJlYWRQb3J0aW9uLnkoKSA6IC1mbG93VGhyZWFkUG9ydGlv bi54KCkpOwogICAgICAgICBpZiAoIXByb2dyZXNzaW9uSXNJbmxpbmUpIHsKICAgICAgICAgICAg IGlmICghcHJvZ3Jlc3Npb25SZXZlcnNlZCkKQEAgLTgwNyw3ICs4MjgsNiBAQCBMYXlvdXRQb2lu dCBSZW5kZXJNdWx0aUNvbHVtblNldDo6Y29sdW1uVHJhbnNsYXRpb25Gb3JPZmZzZXQoY29uc3Qg TGF5b3V0VW5pdCYgbwogICAgIHVuc2lnbmVkIHN0YXJ0Q29sdW1uID0gY29sdW1uSW5kZXhBdE9m ZnNldChvZmZzZXQpOwogICAgIAogICAgIExheW91dFVuaXQgY29sR2FwID0gY29sdW1uR2FwKCk7 Ci0gICAgTGF5b3V0VW5pdCBjb2xMb2dpY2FsV2lkdGggPSBjb21wdXRlZENvbHVtbldpZHRoKCk7 CiAgICAgCiAgICAgTGF5b3V0UmVjdCBmbG93VGhyZWFkUG9ydGlvbiA9IGZsb3dUaHJlYWRQb3J0 aW9uUmVjdEF0KHN0YXJ0Q29sdW1uKTsKICAgICBMYXlvdXRQb2ludCB0cmFuc2xhdGlvbk9mZnNl dDsKQEAgLTgxNywxNSArODM3LDggQEAgTGF5b3V0UG9pbnQgUmVuZGVyTXVsdGlDb2x1bW5TZXQ6 OmNvbHVtblRyYW5zbGF0aW9uRm9yT2Zmc2V0KGNvbnN0IExheW91dFVuaXQmIG8KIAogICAgIExh eW91dFVuaXQgaW5pdGlhbEJsb2NrT2Zmc2V0ID0gaW5pdGlhbEJsb2NrT2Zmc2V0Rm9yUGFpbnRp bmcoKTsKICAgICAKLSAgICBMYXlvdXRVbml0IGlubGluZU9mZnNldCA9IHByb2dyZXNzaW9uSXNJ bmxpbmUgPyBzdGFydENvbHVtbiAqIChjb2xMb2dpY2FsV2lkdGggKyBjb2xHYXApIDogTGF5b3V0 VW5pdCgpOwotICAgIAotICAgIGJvb2wgbGVmdFRvUmlnaHQgPSBzdHlsZSgpLmlzTGVmdFRvUmln aHREaXJlY3Rpb24oKSBeIHByb2dyZXNzaW9uUmV2ZXJzZWQ7Ci0gICAgaWYgKCFsZWZ0VG9SaWdo dCkgewotICAgICAgICBpbmxpbmVPZmZzZXQgPSAtaW5saW5lT2Zmc2V0OwotICAgICAgICBpZiAo cHJvZ3Jlc3Npb25SZXZlcnNlZCkKLSAgICAgICAgICAgIGlubGluZU9mZnNldCArPSBjb250ZW50 TG9naWNhbFdpZHRoKCkgLSBjb2xMb2dpY2FsV2lkdGg7Ci0gICAgfQotICAgIHRyYW5zbGF0aW9u T2Zmc2V0LnNldFgoaW5saW5lT2Zmc2V0KTsKKyAgICB0cmFuc2xhdGlvbk9mZnNldC5zZXRYKGNv bHVtbkxvZ2ljYWxMZWZ0KHN0YXJ0Q29sdW1uKSk7CisKICAgICBMYXlvdXRVbml0IGJsb2NrT2Zm c2V0ID0gaW5pdGlhbEJsb2NrT2Zmc2V0IC0gKGlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkgPyBm bG93VGhyZWFkUG9ydGlvbi55KCkgOiBmbG93VGhyZWFkUG9ydGlvbi54KCkpOwogICAgIGlmICgh cHJvZ3Jlc3Npb25Jc0lubGluZSkgewogICAgICAgICBpZiAoIXByb2dyZXNzaW9uUmV2ZXJzZWQp CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTXVsdGlDb2x1bW5T ZXQuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJNdWx0aUNvbHVtblNldC5oCmlu ZGV4IGVhMDBjOGExNjI5N2I2ZGUwY2MyYTFkOWNiZGExMjljYWU0OGI0NDUuLmVmZWRiOTFmYmNj ZjE0YWY1MDYwNWVjMGNiZDA4OTVmNjcyZjE4MTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJNdWx0aUNvbHVtblNldC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJNdWx0aUNvbHVtblNldC5oCkBAIC0xNjAsNiArMTYwLDkgQEAgcHJpdmF0 ZToKICAgICBMYXlvdXRVbml0IGNhbGN1bGF0ZU1heENvbHVtbkhlaWdodCgpIGNvbnN0OwogICAg IExheW91dFVuaXQgY29sdW1uR2FwKCkgY29uc3Q7CiAKKyAgICBMYXlvdXRVbml0IGNvbHVtbkxv Z2ljYWxMZWZ0KHVuc2lnbmVkKSBjb25zdDsKKyAgICBMYXlvdXRVbml0IGNvbHVtbkxvZ2ljYWxU b3AodW5zaWduZWQpIGNvbnN0OworCiAgICAgTGF5b3V0UmVjdCBmbG93VGhyZWFkUG9ydGlvblJl Y3RBdCh1bnNpZ25lZCBpbmRleCkgY29uc3Q7CiAgICAgTGF5b3V0UmVjdCBmbG93VGhyZWFkUG9y dGlvbk92ZXJmbG93UmVjdChjb25zdCBMYXlvdXRSZWN0JiBmbG93VGhyZWFkUG9ydGlvbiwgdW5z aWduZWQgaW5kZXgsIHVuc2lnbmVkIGNvbENvdW50LCBMYXlvdXRVbml0IGNvbEdhcCk7CiAKZGlm ZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpp bmRleCA3YTc3YmEyMzQ5ODNmMTUwNWJhM2FjYzY0YmUwZGZkNjRjNTU2MjIxLi5lOGM4ZWM1YjYy MDI2OWJmMGY5Y2RkMDE3OTI1YzhkYmI2YjlhZmNlIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9D aGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIw MTQtMDctMzEgIEFuZHJlaSBCdWN1ciAgPGFidWN1ckBhZG9iZS5jb20+CisKKyAgICAgICAgUkVH UkVTU0lPTjogU2VhcmNoIGhpZ2hsaWdodCBpcyBicm9rZW4gaW4gUlRMIG11bHRpY29sdW1uIGNv bnRlbnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEz NTQ1MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEEg dGVzdCB0aGF0IHZlcmlmaWVzIHRoZSBib3VuZGluZyBib3hlcyBmb3IgY29udGVudCBpbnNpZGUg YSBSVEwgbXVsdGktY29sdW1uIGVsZW1lbnQgYXJlIGNvcnJlY3RseSBjb21wdXRlZDoKKyAgICAg ICAgLSBmb3Igc3RhdGljIGVsZW1lbnRzCisgICAgICAgIC0gZm9yIHJlbGF0aXZlIHBvc2l0aW9u ZWQgZWxlbWVudHMKKyAgICAgICAgLSBmb3IgYWJzb2x1dGVseSBwb3NpdGlvbmVkIGVsZW1lbnRz CisKKyAgICAgICAgKiBmYXN0L211bHRpY29sL2NvbnRlbnQtYm91bmRpbmctYm94LXJ0bC1leHBl Y3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGZhc3QvbXVsdGljb2wvY29udGVudC1ib3VuZGlu Zy1ib3gtcnRsLmh0bWw6IEFkZGVkLgorCiAyMDE0LTA3LTMxICBEYW4gQmVybnN0ZWluICA8bWl0 ekBhcHBsZS5jb20+CiAKICAgICAgICAgW1dLMl0gUmVncmVzc2lvbiB0ZXN0cyBjYW4ndCBsb2Fk IEhUVFBTIHBhZ2VzIHdpdGggTmV0d29ya1Byb2Nlc3MgZHVlIHRvIHNlbGYtc2lnbmVkIGNlcnRp ZmljYXRlCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L211bHRpY29sL2NvbnRlbnQtYm91 bmRpbmctYm94LXJ0bC1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9mYXN0L211bHRpY29sL2Nv bnRlbnQtYm91bmRpbmctYm94LXJ0bC1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQK aW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uYjcwNDA3NjA0 NzExMGRhMzJjMzcyYmQ0ODFhZGFmNTQzYTMwYWU2ZAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91 dFRlc3RzL2Zhc3QvbXVsdGljb2wvY29udGVudC1ib3VuZGluZy1ib3gtcnRsLWV4cGVjdGVkLnR4 dApAQCAtMCwwICsxLDIgQEAKK1Rlc3QgZm9yIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xMzU0NTIKK1BBU1MKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvbXVs dGljb2wvY29udGVudC1ib3VuZGluZy1ib3gtcnRsLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L211 bHRpY29sL2NvbnRlbnQtYm91bmRpbmctYm94LXJ0bC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0 CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmQ3YzE1YTVj MWFkODRlMjJiN2FlZWRiYTdhYzBmMDBjNjMzMmFlMDAKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlv dXRUZXN0cy9mYXN0L211bHRpY29sL2NvbnRlbnQtYm91bmRpbmctYm94LXJ0bC5odG1sCkBAIC0w LDAgKzEsNzEgQEAKKzwhRE9DVFlQRSBodG1sPgorPGh0bWw+Cis8aGVhZD4KKyAgICA8c3R5bGU+ CisgICAgICAgIGh0bWwsIGJvZHkgeworICAgICAgICAgICAgbWFyZ2luOiAwcHg7CisgICAgICAg ICAgICBwYWRkaW5nOiAwcHg7CisgICAgICAgIH0KKworICAgICAgICAucmVsYXRpdmUgeworICAg ICAgICAgICAgcG9zaXRpb246IHJlbGF0aXZlOworICAgICAgICB9CisKKyAgICAgICAgLmFic29s dXRlIHsKKyAgICAgICAgICAgIHBvc2l0aW9uOiBhYnNvbHV0ZTsKKyAgICAgICAgfQorCisgICAg ICAgICNtdWx0aWNvbCB7CisgICAgICAgICAgICBwb3NpdGlvbjogYWJzb2x1dGU7CisgICAgICAg ICAgICBsZWZ0OiAwOworICAgICAgICAgICAgdG9wOiAwcHg7CisgICAgICAgICAgICB3aWR0aDog NjAwcHg7CisgICAgICAgICAgICAtd2Via2l0LWNvbHVtbi1jb3VudDogMzsKKyAgICAgICAgICAg IGZvbnQtc2l6ZTogMzBweDsKKyAgICAgICAgICAgIGZvbnQtZmFtaWx5OiBBaGVtOworICAgICAg ICAgICAgLXdlYmtpdC1jb2x1bW4tZ2FwOiA1MHB4OworICAgICAgICB9CisgICAgPC9zdHlsZT4K KzwvaGVhZD4KKzxib2R5PgorICAgIDxkaXYgaWQ9Im11bHRpY29sIiBkaXI9InJ0bCI+CisgICAg ICAgIDxzcGFuIGNsYXNzPSJvdmVybGF5LXRhcmdldCI+Zmlyc3Q8L3NwYW4+IDxzcGFuIGNsYXNz PSJvdmVybGF5LXRhcmdldCByZWxhdGl2ZSI+c2Vjb25kPC9zcGFuPiA8c3BhbiBjbGFzcz0ib3Zl cmxheS10YXJnZXQiPnRoaXJkPC9zcGFuPjxicj4KKyAgICAgICAgPHNwYW4gY2xhc3M9Im92ZXJs YXktdGFyZ2V0Ij5mb3VydGg8L3NwYW4+IDxzcGFuIGNsYXNzPSJvdmVybGF5LXRhcmdldCI+Zmlm dGg8L3NwYW4+IDxzcGFuIGNsYXNzPSJvdmVybGF5LXRhcmdldCBhYnNvbHV0ZSI+c2l4dGg8L3Nw YW4+CisgICAgPC9kaXY+CisgICAgPHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiPgorICAg ICAgICBpZiAod2luZG93LnRlc3RSdW5uZXIpCisgICAgICAgICAgICB3aW5kb3cudGVzdFJ1bm5l ci5kdW1wQXNUZXh0KCk7CisKKyAgICAgICAgdmFyIGJveGVzID0gZG9jdW1lbnQuZ2V0RWxlbWVu dHNCeUNsYXNzTmFtZSgib3ZlcmxheS10YXJnZXQiKTsKKyAgICAgICAgdmFyIGV4cGVjdGVkUmVz dWx0cyA9IFt7InRvcCI6MCwibGVmdCI6NDUwLCJ3aWR0aCI6MTUwLCJoZWlnaHQiOjMwfSwKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICB7InRvcCI6MzAsImxlZnQiOjQyMCwid2lkdGgiOjE4 MCwiaGVpZ2h0IjozMH0sCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgeyJ0b3AiOjAsImxl ZnQiOjIzMy4zNDM3NSwid2lkdGgiOjE1MCwiaGVpZ2h0IjozMH0sCisgICAgICAgICAgICAgICAg ICAgICAgICAgICAgeyJ0b3AiOjMwLCJsZWZ0IjoyMDMuMzQzNzUsIndpZHRoIjoxODAsImhlaWdo dCI6MzB9LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgIHsidG9wIjowLCJsZWZ0IjoxNi42 ODc1LCJ3aWR0aCI6MTUwLCJoZWlnaHQiOjMwfSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICB7InRvcCI6MTUwLCJsZWZ0Ijo0NTAsIndpZHRoIjoxNTAsImhlaWdodCI6MzB9XTsKKworICAg ICAgICB2YXIgZXJyb3JTdHJpbmcgPSBudWxsOworICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8 IGJveGVzLmxlbmd0aDsgaSsrKSB7CisgICAgICAgICAgICB2YXIgYmJveCA9IGJveGVzW2ldLmdl dEJvdW5kaW5nQ2xpZW50UmVjdCgpOworICAgICAgICAgICAgYmJveE9iamVjdCA9IHsKKyAgICAg ICAgICAgICAgICB0b3A6IGJib3gudG9wLAorICAgICAgICAgICAgICAgIGxlZnQ6IGJib3gubGVm dCwKKyAgICAgICAgICAgICAgICB3aWR0aDogYmJveC53aWR0aCwKKyAgICAgICAgICAgICAgICBo ZWlnaHQ6IGJib3guaGVpZ2h0CisgICAgICAgICAgICB9CisgICAgICAgICAgICB2YXIgZXhwZWN0 ZWQgPSBleHBlY3RlZFJlc3VsdHNbaV07CisgICAgICAgICAgICBpZiAoKGJib3hPYmplY3QubGVm dCA9PT0gZXhwZWN0ZWQubGVmdCkgJiYgKGJib3hPYmplY3QudG9wID09PSBleHBlY3RlZC50b3Ap CisgICAgICAgICAgICAgICAgJiYgKGJib3hPYmplY3Qud2lkdGggPT09IGV4cGVjdGVkLndpZHRo KSAmJiAoYmJveE9iamVjdC5oZWlnaHQgPT09IGV4cGVjdGVkLmhlaWdodCkpCisgICAgICAgICAg ICAgICAgY29udGludWU7CisKKyAgICAgICAgICAgIGVycm9yU3RyaW5nID0gKGVycm9yU3RyaW5n IHx8ICIiKSArICJFeHBlY3RlZDogIiArIEpTT04uc3RyaW5naWZ5KGV4cGVjdGVkKSArICIgR290 OiAiICsgSlNPTi5zdHJpbmdpZnkoYmJveE9iamVjdCkgKyAiPGJyPiI7CisgICAgICAgIH0KKwor ICAgICAgICB2YXIgcHJlZml4ID0gIlRlc3QgZm9yIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xMzU0NTI8YnI+IjsKKyAgICAgICAgaWYgKGVycm9yU3RyaW5nKQorICAg ICAgICAgICAgZG9jdW1lbnQuYm9keS5pbm5lckhUTUwgPSBwcmVmaXggKyAiRkFJTDxicj4iICsg ZXJyb3JTdHJpbmc7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIGRvY3VtZW50LmJvZHkuaW5u ZXJIVE1MID0gcHJlZml4ICsgIlBBU1MiOworICAgIDwvc2NyaXB0PgorPC9ib2R5PgorPC9odG1s Pgo=