76921 2012-01-24 09:34:51 -0800 [WK2] FindController should not assume that ports do not want to highlight text matches 2012-01-25 00:54:33 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 76070 1 svillar svillar andersca cgarcia darin svillar oldest_to_newest 541393 0 svillar 2012-01-24 09:34:51 -0800 WK2's FindController assumes that clients do not want to highlight text matches. That's most likely because Safari uses the ShowOverlay option to dim the contents of the web page and then it renders some highlight on the overlay rectangles. But other ports implementing the Find API (like GTK, see https://bugs.webkit.org/show_bug.cgi?id=76070) might want to keep WK1 behaviour, i.e., to let WebCore highlight all the matches found. 541396 1 123752 svillar 2012-01-24 09:39:37 -0800 Created attachment 123752 Patch 541413 2 123752 darin 2012-01-24 09:58:45 -0800 Comment on attachment 123752 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=123752&action=review > Source/WebKit2/WebProcess/WebPage/FindController.cpp:115 > +#if PLATFORM(MAC) > + bool shouldShowHighlight = false; > +#else > + bool shouldShowHighlight = options & FindOptionsShowHighlight; > +#endif What’s the reasoning behind this #if? 541414 3 darin 2012-01-24 09:59:03 -0800 Patch seems OK, but the PLATFORM(MAC) special case seems unneeded. 541439 4 svillar 2012-01-24 10:23:07 -0800 (In reply to comment #2) > (From update of attachment 123752 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=123752&action=review > > > Source/WebKit2/WebProcess/WebPage/FindController.cpp:115 > > +#if PLATFORM(MAC) > > + bool shouldShowHighlight = false; > > +#else > > + bool shouldShowHighlight = options & FindOptionsShowHighlight; > > +#endif > > What’s the reasoning behind this #if? Well as I said in the bug description, Safari does not need highlight at all, as it implements it using WK2's showOverlay and I guess some code in Safari that performs the nice animation and highlighting. I just used the #if to ensure that Safari keeps working even if, by mistake, the showHighlight option is used. It's obviously not required (I can get rid of it) if mac port just does not expose that find option and does not use it. 541442 5 darin 2012-01-24 10:25:24 -0800 (In reply to comment #4) > Well as I said in the bug description, Safari does not need highlight at all, as it implements it using WK2's showOverlay and I guess some code in Safari that performs the nice animation and highlighting. WebKit on Mac is not just for Safari. > I just used the #if to ensure that Safari keeps working even if, by mistake, the showHighlight option is used. OK. I don’t think that’s a realistic fear, so we can just not worry about it. > It's obviously not required (I can get rid of it) if mac port just does not expose that find option and does not use it. Lets leave it out. 541460 6 123765 svillar 2012-01-24 10:36:55 -0800 Created attachment 123765 Patch 541638 7 123765 darin 2012-01-24 13:45:40 -0800 Comment on attachment 123765 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=123765&action=review > Source/WebKit2/WebProcess/WebPage/FindController.cpp:111 > + bool shouldShowHighlight = options & FindOptionsShowHighlight; Why have this code here outside the if statement if this is used only when shouldShowOverlay is true? 542054 8 svillar 2012-01-25 00:47:42 -0800 (In reply to comment #7) > (From update of attachment 123765 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=123765&action=review > > > Source/WebKit2/WebProcess/WebPage/FindController.cpp:111 > > + bool shouldShowHighlight = options & FindOptionsShowHighlight; > > Why have this code here outside the if statement if this is used only when shouldShowOverlay is true? True, it's just that I messed it a bit because I was working in both this bug and https://bugs.webkit.org/show_bug.cgi?id=76522. If the latter is approved then the if will no longer exist, but anyway I agree that for this particular bug it makes no sense to have it outside the if scope. 542059 9 svillar 2012-01-25 00:54:33 -0800 Committed r105855: <http://trac.webkit.org/changeset/105855> 123752 2012-01-24 09:39:37 -0800 2012-01-24 10:36:48 -0800 Patch bug-76921-20120124183934.patch text/plain 4217 svillar U3VidmVyc2lvbiBSZXZpc2lvbjogMTA1NzE3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMWZhYWFlMTcxZGRhMzIx ODg5ZWRhY2Y0YTBmYWQ4MDVhNzc5YTgyMS4uNmZlMGZmMTZlOTRiNDVjM2YzMWI1ZmZkMmQ0ZGY0 M2NkZTU4OWYwYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEyLTAxLTI0ICBTZXJn aW8gVmlsbGFyIFNlbmluICA8c3ZpbGxhckBpZ2FsaWEuY29tPgorCisgICAgICAgIFtXSzJdIEZp bmRDb250cm9sbGVyIHNob3VsZCBub3QgYXNzdW1lIHRoYXQgcG9ydHMgZG8gbm90IHdhbnQgdG8g aGlnaGxpZ2h0IHRleHQgbWF0Y2hlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NzY5MjEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBGaW5kQ29udHJvbGxlciBtdXN0IG5vdCBoaWdobGlnaHQgdGV4dCBtYXRj aGVzIGZvciBNYWMgYnV0IG9iZXkKKyAgICAgICAgd2hhdCB0aGUgZmluZCBvcHRpb25zIHNwZWNp ZnkgZm9yIHRoZSBvdGhlciBwb3J0cy4KKworICAgICAgICAqIFNoYXJlZC9BUEkvYy9XS0ZpbmRP cHRpb25zLmg6CisgICAgICAgICogU2hhcmVkL0FQSS9jL1dLU2hhcmVkQVBJQ2FzdC5oOgorICAg ICAgICAoV2ViS2l0Ojp0b0ZpbmRPcHRpb25zKToKKyAgICAgICAgKiBTaGFyZWQvV2ViRmluZE9w dGlvbnMuaDoKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvRmluZENvbnRyb2xsZXIuY3Bw OgorICAgICAgICAoV2ViS2l0OjpGaW5kQ29udHJvbGxlcjo6ZmluZFN0cmluZyk6CisKIDIwMTIt MDEtMjQgIFplbm8gQWxiaXNzZXIgIDx6ZW5vQHdlYmtpdC5vcmc+CiAKICAgICAgICAgW1F0XVtX SzJdIEFwcGxpY2F0aW9uIFVSTCBzY2hlbWVzIGNhdXNlIGFzc2VydHMgd2hlbiB1c2luZyBkZWJ1 Zy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9BUEkvYy9XS0ZpbmRPcHRpb25z LmggYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvQVBJL2MvV0tGaW5kT3B0aW9ucy5oCmluZGV4IDMz MzAwMzVlMWY4MTE2ZDNhMTg2NjY3YjE0YzJkYmNmYmM5M2JmNzcuLjVjMWM4Y2UyMzU5NWU2MWYw ZjY0NjE5ZmQ1ZTAzNzEyYjk2OGQyMTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1NoYXJl ZC9BUEkvYy9XS0ZpbmRPcHRpb25zLmgKKysrIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL0FQSS9j L1dLRmluZE9wdGlvbnMuaApAQCAtMzcsNyArMzcsOCBAQCBlbnVtIHsKICAgICBrV0tGaW5kT3B0 aW9uc0JhY2t3YXJkcyA9IDEgPDwgMywKICAgICBrV0tGaW5kT3B0aW9uc1dyYXBBcm91bmQgPSAx IDw8IDQsCiAgICAga1dLRmluZE9wdGlvbnNTaG93T3ZlcmxheSA9IDEgPDwgNSwKLSAgICBrV0tG aW5kT3B0aW9uc1Nob3dGaW5kSW5kaWNhdG9yID0gMSA8PCA2CisgICAga1dLRmluZE9wdGlvbnNT aG93RmluZEluZGljYXRvciA9IDEgPDwgNiwKKyAgICBrV0tGaW5kT3B0aW9uc1Nob3dIaWdobGln aHQgPSAxIDw8IDcKIH07CiB0eXBlZGVmIHVpbnQzMl90IFdLRmluZE9wdGlvbnM7CiAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9BUEkvYy9XS1NoYXJlZEFQSUNhc3QuaCBiL1Nv dXJjZS9XZWJLaXQyL1NoYXJlZC9BUEkvYy9XS1NoYXJlZEFQSUNhc3QuaAppbmRleCBiZjcxY2Jh YTM2ZTkwYjhiNGZlNjE5NGEzYjliMjExMDFkYWU1YWI2Li41ZTRiZjY5ZmZiNjcyZGU5Y2U2ZGU0 ZGEwNjJlODgzN2RmMWVjMjFiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvQVBJ L2MvV0tTaGFyZWRBUElDYXN0LmgKKysrIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL0FQSS9jL1dL U2hhcmVkQVBJQ2FzdC5oCkBAIC02ODgsNiArNjg4LDggQEAgaW5saW5lIEZpbmRPcHRpb25zIHRv RmluZE9wdGlvbnMoV0tGaW5kT3B0aW9ucyB3a0ZpbmRPcHRpb25zKQogICAgICAgICBmaW5kT3B0 aW9ucyB8PSBGaW5kT3B0aW9uc1Nob3dPdmVybGF5OwogICAgIGlmICh3a0ZpbmRPcHRpb25zICYg a1dLRmluZE9wdGlvbnNTaG93RmluZEluZGljYXRvcikKICAgICAgICAgZmluZE9wdGlvbnMgfD0g RmluZE9wdGlvbnNTaG93RmluZEluZGljYXRvcjsKKyAgICBpZiAod2tGaW5kT3B0aW9ucyAmIGtX S0ZpbmRPcHRpb25zU2hvd0hpZ2hsaWdodCkKKyAgICAgICAgZmluZE9wdGlvbnMgfD0gRmluZE9w dGlvbnNTaG93SGlnaGxpZ2h0OwogCiAgICAgcmV0dXJuIHN0YXRpY19jYXN0PEZpbmRPcHRpb25z PihmaW5kT3B0aW9ucyk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2Vi RmluZE9wdGlvbnMuaCBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJGaW5kT3B0aW9ucy5oCmlu ZGV4IDljMmE4OTk2OTUxNWZlZjJhMDFlNTc1NDUwZWVhNGY5YzgzMGM4NzQuLjI3MmIzZDdkN2Fj ZTc0YTdhYWYzMWQ1YzFhYWM3MWE1NThiMTliYjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy L1NoYXJlZC9XZWJGaW5kT3B0aW9ucy5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJG aW5kT3B0aW9ucy5oCkBAIC0zNSw3ICszNSw4IEBAIGVudW0gRmluZE9wdGlvbnMgewogICAgIEZp bmRPcHRpb25zQmFja3dhcmRzID0gMSA8PCAzLAogICAgIEZpbmRPcHRpb25zV3JhcEFyb3VuZCA9 IDEgPDwgNCwKICAgICBGaW5kT3B0aW9uc1Nob3dPdmVybGF5ID0gMSA8PCA1LAotICAgIEZpbmRP cHRpb25zU2hvd0ZpbmRJbmRpY2F0b3IgPSAxIDw8IDYKKyAgICBGaW5kT3B0aW9uc1Nob3dGaW5k SW5kaWNhdG9yID0gMSA8PCA2LAorICAgIEZpbmRPcHRpb25zU2hvd0hpZ2hsaWdodCA9IDEgPDwg NwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvRmluZENvbnRyb2xsZXIuY3BwIGIvU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9XZWJQYWdlL0ZpbmRDb250cm9sbGVyLmNwcAppbmRleCA5YmRkODBiYjk4Y2Fh YTc1MDhiNDk2NDNjY2Q5MzlmYTU2YmIxOWQxLi43M2VlMjY3YWIyNWUwOTEwZDAwNmRjMWYzZmFm MTVlZTZjYjE2MzQ4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBh Z2UvRmluZENvbnRyb2xsZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2Vi UGFnZS9GaW5kQ29udHJvbGxlci5jcHAKQEAgLTEwOCwxMyArMTA4LDE4IEBAIHZvaWQgRmluZENv bnRyb2xsZXI6OmZpbmRTdHJpbmcoY29uc3QgU3RyaW5nJiBzdHJpbmcsIEZpbmRPcHRpb25zIG9w dGlvbnMsIHVuc2lnCiAKICAgICAgICAgbV93ZWJQYWdlLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdl UHJveHk6OkRpZEZhaWxUb0ZpbmRTdHJpbmcoc3RyaW5nKSk7CiAgICAgfSBlbHNlIHsKKyNpZiBQ TEFURk9STShNQUMpCisgICAgICAgIGJvb2wgc2hvdWxkU2hvd0hpZ2hsaWdodCA9IGZhbHNlOwor I2Vsc2UKKyAgICAgICAgYm9vbCBzaG91bGRTaG93SGlnaGxpZ2h0ID0gb3B0aW9ucyAmIEZpbmRP cHRpb25zU2hvd0hpZ2hsaWdodDsKKyNlbmRpZgogICAgICAgICBzaG91bGRTaG93T3ZlcmxheSA9 IG9wdGlvbnMgJiBGaW5kT3B0aW9uc1Nob3dPdmVybGF5OwogCiAgICAgICAgIGlmIChzaG91bGRT aG93T3ZlcmxheSkgewogICAgICAgICAgICAgaWYgKG1heE1hdGNoQ291bnQgPT0gbnVtZXJpY19s aW1pdHM8dW5zaWduZWQ+OjptYXgoKSkKICAgICAgICAgICAgICAgICAtLW1heE1hdGNoQ291bnQ7 CiAgICAgICAgICAgICAKLSAgICAgICAgICAgIHVuc2lnbmVkIG1hdGNoQ291bnQgPSBtX3dlYlBh Z2UtPmNvcmVQYWdlKCktPm1hcmtBbGxNYXRjaGVzRm9yVGV4dChzdHJpbmcsIGNvcmUob3B0aW9u cyksIGZhbHNlLCBtYXhNYXRjaENvdW50ICsgMSk7CisgICAgICAgICAgICB1bnNpZ25lZCBtYXRj aENvdW50ID0gbV93ZWJQYWdlLT5jb3JlUGFnZSgpLT5tYXJrQWxsTWF0Y2hlc0ZvclRleHQoc3Ry aW5nLCBjb3JlKG9wdGlvbnMpLCBzaG91bGRTaG93SGlnaGxpZ2h0LCBtYXhNYXRjaENvdW50ICsg MSk7CiAKICAgICAgICAgICAgIC8vIENoZWNrIGlmIHdlIGhhdmUgbW9yZSBtYXRjaGVzIHRoYW4g YWxsb3dlZC4KICAgICAgICAgICAgIGlmIChtYXRjaENvdW50ID4gbWF4TWF0Y2hDb3VudCkgewo= 123765 2012-01-24 10:36:55 -0800 2012-01-24 13:45:39 -0800 Patch bug-76921-20120124193653.patch text/plain 4293 svillar U3VidmVyc2lvbiBSZXZpc2lvbjogMTA1NzQ2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggOGViZmE2ZTczMjExNWUz YTlkNDA2ODE1ODFlNjlmYTdkMTkyOTQ3ZS4uODVhYjU2Mzc3MTk1YzFlNzJjMjdkZjZhYzhmNDhh NzgyNjA0NzRhNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIyIEBACiAyMDEyLTAxLTI0ICBTZXJn aW8gVmlsbGFyIFNlbmluICA8c3ZpbGxhckBpZ2FsaWEuY29tPgogCisgICAgICAgIFtXSzJdIEZp bmRDb250cm9sbGVyIHNob3VsZCBub3QgYXNzdW1lIHRoYXQgcG9ydHMgZG8gbm90IHdhbnQgdG8g aGlnaGxpZ2h0IHRleHQgbWF0Y2hlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NzY5MjEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBGaW5kQ29udHJvbGxlciBtdXN0IG9iZXkgdGhlIEZpbmRPcHRpb25zU2hv d0hpZ2hsaWdodCBmbGFnIGluc3RlYWQKKyAgICAgICAgb2YgYXNzdW1pbmcgdGhhdCBwb3J0cyBk byBub3Qgd2FudCB0byBoaWdobGlnaHQgc2VhcmNoIG1hdGNoZXMuCisKKyAgICAgICAgKiBTaGFy ZWQvQVBJL2MvV0tGaW5kT3B0aW9ucy5oOiBhZGRlZCBrV0tGaW5kT3B0aW9uc1Nob3dIaWdobGln aHQuCisgICAgICAgICogU2hhcmVkL0FQSS9jL1dLU2hhcmVkQVBJQ2FzdC5oOgorICAgICAgICAo V2ViS2l0Ojp0b0ZpbmRPcHRpb25zKTogRGl0dG8uCisgICAgICAgICogU2hhcmVkL1dlYkZpbmRP cHRpb25zLmg6IGFkZGVkIEZpbmRPcHRpb25zU2hvd0hpZ2hsaWdodC4KKyAgICAgICAgKiBXZWJQ cm9jZXNzL1dlYlBhZ2UvRmluZENvbnRyb2xsZXIuY3BwOgorICAgICAgICAoV2ViS2l0OjpGaW5k Q29udHJvbGxlcjo6ZmluZFN0cmluZyk6CisKKzIwMTItMDEtMjQgIFNlcmdpbyBWaWxsYXIgU2Vu aW4gIDxzdmlsbGFyQGlnYWxpYS5jb20+CisKICAgICAgICAgW1dLMl0gW0dUS10gVGVzdERvd25s b2FkcyBoaXR0aW5nIGFuIGFzc2VydGlvbiBpbiBEZWJ1ZyBidWlsZHMKICAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc2OTE1CiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQyL1NoYXJlZC9BUEkvYy9XS0ZpbmRPcHRpb25zLmggYi9Tb3VyY2UvV2ViS2l0 Mi9TaGFyZWQvQVBJL2MvV0tGaW5kT3B0aW9ucy5oCmluZGV4IDMzMzAwMzVlMWY4MTE2ZDNhMTg2 NjY3YjE0YzJkYmNmYmM5M2JmNzcuLjVjMWM4Y2UyMzU5NWU2MWYwZjY0NjE5ZmQ1ZTAzNzEyYjk2 OGQyMTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9BUEkvYy9XS0ZpbmRPcHRp b25zLmgKKysrIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL0FQSS9jL1dLRmluZE9wdGlvbnMuaApA QCAtMzcsNyArMzcsOCBAQCBlbnVtIHsKICAgICBrV0tGaW5kT3B0aW9uc0JhY2t3YXJkcyA9IDEg PDwgMywKICAgICBrV0tGaW5kT3B0aW9uc1dyYXBBcm91bmQgPSAxIDw8IDQsCiAgICAga1dLRmlu ZE9wdGlvbnNTaG93T3ZlcmxheSA9IDEgPDwgNSwKLSAgICBrV0tGaW5kT3B0aW9uc1Nob3dGaW5k SW5kaWNhdG9yID0gMSA8PCA2CisgICAga1dLRmluZE9wdGlvbnNTaG93RmluZEluZGljYXRvciA9 IDEgPDwgNiwKKyAgICBrV0tGaW5kT3B0aW9uc1Nob3dIaWdobGlnaHQgPSAxIDw8IDcKIH07CiB0 eXBlZGVmIHVpbnQzMl90IFdLRmluZE9wdGlvbnM7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQyL1NoYXJlZC9BUEkvYy9XS1NoYXJlZEFQSUNhc3QuaCBiL1NvdXJjZS9XZWJLaXQyL1NoYXJl ZC9BUEkvYy9XS1NoYXJlZEFQSUNhc3QuaAppbmRleCBiZjcxY2JhYTM2ZTkwYjhiNGZlNjE5NGEz YjliMjExMDFkYWU1YWI2Li41ZTRiZjY5ZmZiNjcyZGU5Y2U2ZGU0ZGEwNjJlODgzN2RmMWVjMjFi IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvQVBJL2MvV0tTaGFyZWRBUElDYXN0 LmgKKysrIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL0FQSS9jL1dLU2hhcmVkQVBJQ2FzdC5oCkBA IC02ODgsNiArNjg4LDggQEAgaW5saW5lIEZpbmRPcHRpb25zIHRvRmluZE9wdGlvbnMoV0tGaW5k T3B0aW9ucyB3a0ZpbmRPcHRpb25zKQogICAgICAgICBmaW5kT3B0aW9ucyB8PSBGaW5kT3B0aW9u c1Nob3dPdmVybGF5OwogICAgIGlmICh3a0ZpbmRPcHRpb25zICYga1dLRmluZE9wdGlvbnNTaG93 RmluZEluZGljYXRvcikKICAgICAgICAgZmluZE9wdGlvbnMgfD0gRmluZE9wdGlvbnNTaG93Rmlu ZEluZGljYXRvcjsKKyAgICBpZiAod2tGaW5kT3B0aW9ucyAmIGtXS0ZpbmRPcHRpb25zU2hvd0hp Z2hsaWdodCkKKyAgICAgICAgZmluZE9wdGlvbnMgfD0gRmluZE9wdGlvbnNTaG93SGlnaGxpZ2h0 OwogCiAgICAgcmV0dXJuIHN0YXRpY19jYXN0PEZpbmRPcHRpb25zPihmaW5kT3B0aW9ucyk7CiB9 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViRmluZE9wdGlvbnMuaCBiL1Nv dXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJGaW5kT3B0aW9ucy5oCmluZGV4IDljMmE4OTk2OTUxNWZl ZjJhMDFlNTc1NDUwZWVhNGY5YzgzMGM4NzQuLjI3MmIzZDdkN2FjZTc0YTdhYWYzMWQ1YzFhYWM3 MWE1NThiMTliYjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJGaW5kT3B0 aW9ucy5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJGaW5kT3B0aW9ucy5oCkBAIC0z NSw3ICszNSw4IEBAIGVudW0gRmluZE9wdGlvbnMgewogICAgIEZpbmRPcHRpb25zQmFja3dhcmRz ID0gMSA8PCAzLAogICAgIEZpbmRPcHRpb25zV3JhcEFyb3VuZCA9IDEgPDwgNCwKICAgICBGaW5k T3B0aW9uc1Nob3dPdmVybGF5ID0gMSA8PCA1LAotICAgIEZpbmRPcHRpb25zU2hvd0ZpbmRJbmRp Y2F0b3IgPSAxIDw8IDYKKyAgICBGaW5kT3B0aW9uc1Nob3dGaW5kSW5kaWNhdG9yID0gMSA8PCA2 LAorICAgIEZpbmRPcHRpb25zU2hvd0hpZ2hsaWdodCA9IDEgPDwgNwogfTsKIAogfSAvLyBuYW1l c3BhY2UgV2ViS2l0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBh Z2UvRmluZENvbnRyb2xsZXIuY3BwIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdl L0ZpbmRDb250cm9sbGVyLmNwcAppbmRleCA5YmRkODBiYjk4Y2FhYTc1MDhiNDk2NDNjY2Q5Mzlm YTU2YmIxOWQxLi5kYjA3ZDEyZTVjNmI5NzUyYTE5OGViMTYxZmRhODNiZmIxNDc1YzYyIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvRmluZENvbnRyb2xsZXIu Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9GaW5kQ29udHJvbGxl ci5jcHAKQEAgLTEwOCwxMyArMTA4LDE0IEBAIHZvaWQgRmluZENvbnRyb2xsZXI6OmZpbmRTdHJp bmcoY29uc3QgU3RyaW5nJiBzdHJpbmcsIEZpbmRPcHRpb25zIG9wdGlvbnMsIHVuc2lnCiAKICAg ICAgICAgbV93ZWJQYWdlLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRpZEZhaWxUb0Zp bmRTdHJpbmcoc3RyaW5nKSk7CiAgICAgfSBlbHNlIHsKKyAgICAgICAgYm9vbCBzaG91bGRTaG93 SGlnaGxpZ2h0ID0gb3B0aW9ucyAmIEZpbmRPcHRpb25zU2hvd0hpZ2hsaWdodDsKICAgICAgICAg c2hvdWxkU2hvd092ZXJsYXkgPSBvcHRpb25zICYgRmluZE9wdGlvbnNTaG93T3ZlcmxheTsKIAog ICAgICAgICBpZiAoc2hvdWxkU2hvd092ZXJsYXkpIHsKICAgICAgICAgICAgIGlmIChtYXhNYXRj aENvdW50ID09IG51bWVyaWNfbGltaXRzPHVuc2lnbmVkPjo6bWF4KCkpCiAgICAgICAgICAgICAg ICAgLS1tYXhNYXRjaENvdW50OwogICAgICAgICAgICAgCi0gICAgICAgICAgICB1bnNpZ25lZCBt YXRjaENvdW50ID0gbV93ZWJQYWdlLT5jb3JlUGFnZSgpLT5tYXJrQWxsTWF0Y2hlc0ZvclRleHQo c3RyaW5nLCBjb3JlKG9wdGlvbnMpLCBmYWxzZSwgbWF4TWF0Y2hDb3VudCArIDEpOworICAgICAg ICAgICAgdW5zaWduZWQgbWF0Y2hDb3VudCA9IG1fd2ViUGFnZS0+Y29yZVBhZ2UoKS0+bWFya0Fs bE1hdGNoZXNGb3JUZXh0KHN0cmluZywgY29yZShvcHRpb25zKSwgc2hvdWxkU2hvd0hpZ2hsaWdo dCwgbWF4TWF0Y2hDb3VudCArIDEpOwogCiAgICAgICAgICAgICAvLyBDaGVjayBpZiB3ZSBoYXZl IG1vcmUgbWF0Y2hlcyB0aGFuIGFsbG93ZWQuCiAgICAgICAgICAgICBpZiAobWF0Y2hDb3VudCA+ IG1heE1hdGNoQ291bnQpIHsK