96402 2012-09-11 09:56:29 -0700 [Chromium] Fix cases where find-in-page doesn't send a final update 2012-09-17 11:35:49 -0700 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 96573 96622 1 leandrogracia leandrogracia abarth jamesr tkent webkit.review.bot oldest_to_newest 717302 0 leandrogracia 2012-09-11 09:56:29 -0700 The current WebFrameImpl code has a few cases where it never sends the final find-in-page update to the embedder. This is because there are some cases where an early out prevents reportFindInPageMatchCount to be called. Furthermore, these early outs enforce a non-null size of the view which causes problems with offscreen WebViews that might be used by some external tests. Also, we have a buggy clean-up of the active match when stopping the current find "session". With the current code we'd need two StopFinding calls, one keeping the selection and another one cleaning it in order to reset the active match. This clean-up should unconditionally happen when calling StopFinding, and it should not affect the current behaviour as it will continue finding from the current selection if any. 717397 1 163405 leandrogracia 2012-09-11 11:12:25 -0700 Created attachment 163405 Patch 717403 2 163405 abarth 2012-09-11 11:14:13 -0700 Comment on attachment 163405 Patch @leandrogracia: Looks like you uploaded the wrong patch. 718498 3 leandrogracia 2012-09-12 10:32:51 -0700 (In reply to comment #2) > (From update of attachment 163405 [details]) > @leandrogracia: Looks like you uploaded the wrong patch. Oops, looks like I had some git issues in my local branch. Sorry, uploading the right patch. 718502 4 163653 leandrogracia 2012-09-12 10:38:07 -0700 Created attachment 163653 Patch 718554 5 163653 abarth 2012-09-12 11:49:24 -0700 Comment on attachment 163653 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=163653&action=review > Source/WebKit/chromium/ChangeLog:8 > + Fix some issues in the WebKit implementation that prevented to send a final > + reportFindInPageMatchCount message. Also, fix a buggy reset of the active match > + when calling the stopFinding method. Can we add tests for these issues? Perhaps in webkit_unit_tests? 718593 6 leandrogracia 2012-09-12 12:21:18 -0700 (In reply to comment #5) > (From update of attachment 163653 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=163653&action=review > > > Source/WebKit/chromium/ChangeLog:8 > > + Fix some issues in the WebKit implementation that prevented to send a final > > + reportFindInPageMatchCount message. Also, fix a buggy reset of the active match > > + when calling the stopFinding method. > > Can we add tests for these issues? Perhaps in webkit_unit_tests? I found this problem when using find-in-page with 0x0 views in test code. However, since there's no reason this shouldn't work regardless of the size, I'm removing the hasVisibleContent check. Consequently, if I write a test it won't hit that condition any more. Still, if for some reason we have no frame or no view we still want to ensure a reply back. Do you know how I could hit these conditions in a test? 718612 7 163653 abarth 2012-09-12 12:33:14 -0700 Comment on attachment 163653 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=163653&action=review >>> Source/WebKit/chromium/ChangeLog:8 >>> + when calling the stopFinding method. >> >> Can we add tests for these issues? Perhaps in webkit_unit_tests? > > I found this problem when using find-in-page with 0x0 views in test code. However, since there's no reason this shouldn't work regardless of the size, I'm removing the hasVisibleContent check. Consequently, if I write a test it won't hit that condition any more. > > Still, if for some reason we have no frame or no view we still want to ensure a reply back. Do you know how I could hit these conditions in a test? Those cases occur with detached frames. I'm not sure how we can make a detached frame in a unit test... We have trouble testing these cases because we tend to only keep detached frames alive for a given call stack. In LayoutTests, we typically do it by running inline script in a child frame that removes its frame from its parent using a DOM API like removeChild. To get that working in a unit test, you'd need to them call a function that let you execute unit testing code synchronously. I think its ok to land this patch without a test. It's going to be a pretty fragile case to write a test for. 718635 8 163653 webkit.review.bot 2012-09-12 13:02:03 -0700 Comment on attachment 163653 Patch Clearing flags on attachment: 163653 Committed r128351: <http://trac.webkit.org/changeset/128351> 718636 9 webkit.review.bot 2012-09-12 13:02:07 -0700 All reviewed patches have been landed. Closing bug. 718836 10 jamesr 2012-09-12 15:55:15 -0700 This broke many (all?) of the find in page unit tests on the linux tests canary. See http://build.chromium.org/p/chromium.webkit/builders/Linux%20Tests/builds/23664 718844 11 jamesr 2012-09-12 16:02:48 -0700 These broke on the mac canary as well - I suspect it's cross platform. Example failure logs: FindInPageControllerTest.ActivateLinkNavigatesPage: Killed (timed out). FindInPageControllerTest.FindInPageEndState: chrome/browser/ui/find_bar/find_bar_host_browsertest.cc:504: Failure Value of: result.c_str() Actual: "{nothing focused}" Expected: "link1" FindInPageControllerTest.FindInPageFrames: chrome/browser/ui/find_bar/find_bar_host_browsertest.cc:216: Failure Value of: FindInPageWchar(tab, L"go", kFwd, kIgnoreCase, &ordinal) Actual: 0 Expected: 11 chrome/browser/ui/find_bar/find_bar_host_browsertest.cc:219: Failure Value of: FindInPageWchar(tab, L"goo", kFwd, kIgnoreCase, &ordinal) Actual: 0 Expected: 4 chrome/browser/ui/find_bar/find_bar_host_browsertest.cc:220: Failure Value of: ordinal Actual: 0 Expected: 1 718898 12 leandrogracia 2012-09-12 17:11:58 -0700 (In reply to comment #11) > These broke on the mac canary as well - I suspect it's cross platform. Example failure logs: > > > FindInPageControllerTest.ActivateLinkNavigatesPage: > Killed (timed out). > > FindInPageControllerTest.FindInPageEndState: > chrome/browser/ui/find_bar/find_bar_host_browsertest.cc:504: Failure > Value of: result.c_str() > Actual: "{nothing focused}" > Expected: "link1" > > FindInPageControllerTest.FindInPageFrames: > chrome/browser/ui/find_bar/find_bar_host_browsertest.cc:216: Failure > Value of: FindInPageWchar(tab, L"go", kFwd, kIgnoreCase, &ordinal) > Actual: 0 > Expected: 11 > chrome/browser/ui/find_bar/find_bar_host_browsertest.cc:219: Failure > Value of: FindInPageWchar(tab, L"goo", kFwd, kIgnoreCase, &ordinal) > Actual: 0 > Expected: 4 > chrome/browser/ui/find_bar/find_bar_host_browsertest.cc:220: Failure > Value of: ordinal > Actual: 0 > Expected: 1 Looks like the change in the clean-up of the active match actually changed the behaviour and broke the tests. I'll be leaving out that part of the patch. The rest should still be fine. 718941 13 163752 leandrogracia 2012-09-12 18:01:56 -0700 Created attachment 163752 Patch 719099 14 163752 abarth 2012-09-12 23:38:50 -0700 Comment on attachment 163752 Patch ok 719119 15 163752 webkit.review.bot 2012-09-12 23:58:51 -0700 Comment on attachment 163752 Patch Clearing flags on attachment: 163752 Committed r128409: <http://trac.webkit.org/changeset/128409> 719120 16 webkit.review.bot 2012-09-12 23:58:55 -0700 All reviewed patches have been landed. Closing bug. 719208 17 tkent 2012-09-13 01:25:43 -0700 It seems this broken browser_tests. http://chromegw.corp.google.com/i/chromium.webkit/builders/Linux%20Tests/builds/23673 http://chromegw.corp.google.com/i/chromium.webkit/builders/Mac10.6%20Tests/builds/13423 I'll roll this out. 719217 18 webkit.review.bot 2012-09-13 01:29:38 -0700 Re-opened since this is blocked by 96622 719262 19 leandrogracia 2012-09-13 02:18:06 -0700 (In reply to comment #18) > Re-opened since this is blocked by 96622 Oh, not again... I'm starting to suspect there is a problem with the tests themselves. I tried to run them before, but my build had some kind of issue that made them fail with and without my patch. I'll try to figure out what's happening before bothering again. Sorry for any inconveniences. 721741 20 164354 leandrogracia 2012-09-17 01:05:19 -0700 Created attachment 164354 Patch 721749 21 164356 leandrogracia 2012-09-17 01:39:57 -0700 Created attachment 164356 Patch 721751 22 leandrogracia 2012-09-17 01:40:47 -0700 (In reply to comment #19) > (In reply to comment #18) > > Re-opened since this is blocked by 96622 > > Oh, not again... I'm starting to suspect there is a problem with the tests themselves. I tried to run them before, but my build had some kind of issue that made them fail with and without my patch. > > I'll try to figure out what's happening before bothering again. Sorry for any inconveniences. Found the issue with the previous failing patches. While conceptually correct, they were opening the door to a very subtle issue. There is a variable called m_framesScopingCount that keeps how many frames are scoping their string matches and makes updates final when its value is 0, as we have no frames pending to finish. It happens that before resetting (starting a new find request) this variable will be 0 for the first frame because it hasn't yet counted itself. Consequently, the previous patches were sending final updates when they didn't have to scope on the first frame regardless of the existence of valid results in other frames. We need to make sure that when starting a new find any other frames had a chance to reset (last argument in scopeStringMatches) so they can include themselves in m_framesScopingCount if required. To do this now any shouldScopeMatches failure when resetting will post a later call to itself, very much in the same way as reset works. This new call then fires the update, which will be final only if no other frames have pending scopes. I've checked that all Chromium's FindInPageControllerTest browser tests pass after this patch. 721846 23 164378 leandrogracia 2012-09-17 06:19:54 -0700 Created attachment 164378 Patch 721852 24 leandrogracia 2012-09-17 06:22:29 -0700 (In reply to comment #23) > Created an attachment (id=164378) [details] > Patch This should be cleaner now as it shares the reset and finishing code with the rest of scopeStringMatches. The base functionality is still the same as in the previous patch. I've also confirmed this to pass all the Chromium's FindInPageControllerTest browser tests. 721861 25 164382 leandrogracia 2012-09-17 06:28:18 -0700 Created attachment 164382 Patch 721866 26 leandrogracia 2012-09-17 06:30:02 -0700 (In reply to comment #25) > Created an attachment (id=164382) [details] > Patch Minor fix: as cancelPendingScopingEffort is called unconditionally from Chromium, the m_lastFindRequestCompletedWithNoMatches flag should be reset only if the current scoping work was not completed. Tested again with Chromium's find-in-page browser tests. 722102 27 164382 abarth 2012-09-17 11:27:52 -0700 Comment on attachment 164382 Patch Unfortunately, we don't really have someone who understands find-in-page deeply to review these patches. What you've written above seems reasonable to me, and I'm going to rs=me this patch. 722108 28 164382 webkit.review.bot 2012-09-17 11:35:44 -0700 Comment on attachment 164382 Patch Clearing flags on attachment: 164382 Committed r128784: <http://trac.webkit.org/changeset/128784> 722109 29 webkit.review.bot 2012-09-17 11:35:49 -0700 All reviewed patches have been landed. Closing bug. 163405 2012-09-11 11:12:25 -0700 2012-09-12 10:38:02 -0700 Patch bug-96402-20120911191200.patch text/plain 1372 leandrogracia U3VidmVyc2lvbiBSZXZpc2lvbjogMTI4MTkzCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggZGFkYjM3Y2JhNmI1MjkyNDMwZjA0 YWJkZjVjZDcwY2QzNGExYzM0NC4uNzA1MjA5MDdkZjIxNGZlMWVhZmRmNDlhMGYwMzQ1NDM0ZWQ4 MjQyNiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3Rz L0NoYW5nZUxvZwpAQCAtMSwzICsxLDkgQEAKKzIwMTItMDktMTEgIENzYWJhIE9zenRyb2dvbsOh YyAgPG9zc3lAd2Via2l0Lm9yZz4KKworICAgICAgICBbUXRdW1dLMl0gVW5yZXZpZXdlZCBnYXJk ZW5pbmcsIHNraXAgbmV3IGZhaWxpbmcgdGVzdHMgdG8gcGFpbnQgdGhlIGJvdCBncmVlbi4KKwor ICAgICAgICAqIHBsYXRmb3JtL3F0LTUuMC13azIvU2tpcHBlZDoKKwogMjAxMi0wOS0xMSAgU2hl cmlmZiBCb3QgIDx3ZWJraXQucmV2aWV3LmJvdEBnbWFpbC5jb20+CiAKICAgICAgICAgVW5yZXZp ZXdlZCwgcm9sbGluZyBvdXQgcjEyODE3NS4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRm b3JtL3F0LTUuMC13azIvU2tpcHBlZCBiL0xheW91dFRlc3RzL3BsYXRmb3JtL3F0LTUuMC13azIv U2tpcHBlZAppbmRleCBjZjkyNDUyYWNhNDQ0NDQ4MDJmY2NmZjYwZDBkNjIwYzM2MmVjZTA2Li5j NWNlNjZmMWRmZDZmNDNjMTZkODBjZWExNmIyMTJjMWY1YjYzMjFjIDEwMDY0NAotLS0gYS9MYXlv dXRUZXN0cy9wbGF0Zm9ybS9xdC01LjAtd2syL1NraXBwZWQKKysrIGIvTGF5b3V0VGVzdHMvcGxh dGZvcm0vcXQtNS4wLXdrMi9Ta2lwcGVkCkBAIC00OTMsMyArNDkzLDExIEBAIGh0dHAvdGVzdHMv c2VjdXJpdHkvY3Jvc3Mtb3JpZ2luLXBsdWdpbi5odG1sCiAKICMgRU5BQkxFKE9WRVJGTE9XX1ND Uk9MTElORykgaXMgZGlzYWJsZWQgKG5vdCBlbmFibGVkKQogY29tcG9zaXRpbmcvb3ZlcmZsb3cv b3ZlcmZsb3ctYXV0by13aXRoLXRvdWNoLXRvZ2dsZS5odG1sCisKKyMgW1F0XVtXSzJdIFJFR1JF U1NJT04ocjEyODE2OSk6IEl0IG1hZGUgZmFzdC9ldmVudHMvZGlzcGF0Y2gtbWVzc2FnZS1zdHJp bmctZGF0YS5odG1sIHRpbWVvdXQKKyMgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTk2Mzk2CitmYXN0L2V2ZW50cy9kaXNwYXRjaC1tZXNzYWdlLXN0cmluZy1kYXRhLmh0 bWwKKworIyBbUXRdW1dLMl0gZmFzdC9zcGF0aWFsLW5hdmlnYXRpb24vc25hdi1tZWRpYS1lbGVt ZW50cy5odG1sIHRpbWVvdXRzCisjIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD05NjM5NworZmFzdC9zcGF0aWFsLW5hdmlnYXRpb24vc25hdi1tZWRpYS1lbGVtZW50cy5o dG1sCg== 163653 2012-09-12 10:38:07 -0700 2012-09-12 18:01:51 -0700 Patch bug-96402-20120912183740.patch text/plain 3782 leandrogracia U3VidmVyc2lvbiBSZXZpc2lvbjogMTI4MzI1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IDA3M2NiYmM1M2ZlODVlYTRjYzk2ZTcwZDA4NGJlMmEwOTdmZGI5NzYuLjA0NjIyMDExYTRkMGE1 ZTdjZWI2NjA5YjdiYzBhNDVhNDNjMjY4NjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjAgQEAKKzIwMTItMDktMTEgIExlYW5kcm8gR3JhY2lhIEdpbCAgPGxlYW5kcm9n cmFjaWFAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtDaHJvbWl1bV0gRml4IGNhc2VzIHdoZXJl IGZpbmQtaW4tcGFnZSBkb2Vzbid0IHNlbmQgYSBmaW5hbCB1cGRhdGUKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk2NDAyCisKKyAgICAgICAgRml4IHNv bWUgaXNzdWVzIGluIHRoZSBXZWJLaXQgaW1wbGVtZW50YXRpb24gdGhhdCBwcmV2ZW50ZWQgdG8g c2VuZCBhIGZpbmFsCisgICAgICAgIHJlcG9ydEZpbmRJblBhZ2VNYXRjaENvdW50IG1lc3NhZ2Uu IEFsc28sIGZpeCBhIGJ1Z2d5IHJlc2V0IG9mIHRoZSBhY3RpdmUgbWF0Y2gKKyAgICAgICAgd2hl biBjYWxsaW5nIHRoZSBzdG9wRmluZGluZyBtZXRob2QuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBzcmMvV2ViRnJhbWVJbXBsLmNwcDoKKyAgICAg ICAgKFdlYktpdDo6V2ViRnJhbWVJbXBsOjpzY29wZVN0cmluZ01hdGNoZXMpOgorICAgICAgICAo V2ViS2l0OjpXZWJGcmFtZUltcGw6OmNhbmNlbFBlbmRpbmdTY29waW5nRWZmb3J0KToKKyAgICAg ICAgKFdlYktpdDo6V2ViRnJhbWVJbXBsOjpzZXRGaW5kRW5kc3RhdGVGb2N1c0FuZFNlbGVjdGlv bik6CisgICAgICAgIChXZWJLaXQ6OldlYkZyYW1lSW1wbDo6c2hvdWxkU2NvcGVNYXRjaGVzKToK KwogMjAxMi0wOS0xMiAgSWx5YSBUaWtob25vdnNreSAgPGxvaXNsb0BjaHJvbWl1bS5vcmc+CiAK ICAgICAgICAgV2ViIEluc3BlY3RvcjogTk1JIG1vdmUgU3RyaW5nKiBpbnN0cnVtZW50YXRpb24g dG8gd3RmLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViRnJhbWVJ bXBsLmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkZyYW1lSW1wbC5jcHAKaW5k ZXggMWQxODdmMDllMDAwZjU5MzNmMzA0OTEwMGViMDgzMjMyYmMyMGI0Ny4uNTc1ZGRkMmIyMmUy ZDM0MzRhZWMwNzg4ZWY4NDY1Y2E1YjkyYTY2MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9j aHJvbWl1bS9zcmMvV2ViRnJhbWVJbXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L3NyYy9XZWJGcmFtZUltcGwuY3BwCkBAIC0xNzc5LDggKzE3NzksMTAgQEAgdm9pZCBXZWJGcmFt ZUltcGw6OnNjb3BlU3RyaW5nTWF0Y2hlcyhpbnQgaWRlbnRpZmllciwKICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgV2ViRmluZE9wdGlvbnMmIG9wdGlvbnMsCiAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJvb2wgcmVzZXQpCiB7Ci0gICAg aWYgKCFzaG91bGRTY29wZU1hdGNoZXMoc2VhcmNoVGV4dCkpCisgICAgaWYgKCFzaG91bGRTY29w ZU1hdGNoZXMoc2VhcmNoVGV4dCkpIHsKKyAgICAgICAgaW5jcmVhc2VNYXRjaENvdW50KDAsIGlk ZW50aWZpZXIpOwogICAgICAgICByZXR1cm47CisgICAgfQogCiAgICAgV2ViRnJhbWVJbXBsKiBt YWluRnJhbWVJbXBsID0gdmlld0ltcGwoKS0+bWFpbkZyYW1lSW1wbCgpOwogCkBAIC0xOTU3LDYg KzE5NTksMTQgQEAgdm9pZCBXZWJGcmFtZUltcGw6OmNhbmNlbFBlbmRpbmdTY29waW5nRWZmb3J0 KCkKICAgICBkZWxldGVBbGxWYWx1ZXMobV9kZWZlcnJlZFNjb3BpbmdXb3JrKTsKICAgICBtX2Rl ZmVycmVkU2NvcGluZ1dvcmsuY2xlYXIoKTsKIAorICAgIC8vIENsZWFyIHRoZSBhY3RpdmUgbWF0 Y2gsIGZvciB0d28gcmVhc29uczoKKyAgICAvLyBXZSBqdXN0IGZpbmlzaGVkIHRoZSBmaW5kICdz ZXNzaW9uJyBhbmQgd2UgZG9uJ3Qgd2FudCBmdXR1cmUgKHBvdGVudGlhbGx5CisgICAgLy8gdW5y ZWxhdGVkKSBmaW5kICdzZXNzaW9ucycgb3BlcmF0aW9ucyB0byBzdGFydCBhdCB0aGUgc2FtZSBw bGFjZS4KKyAgICAvLyBUaGUgV2ViRnJhbWVJbXBsIGNvdWxkIGdldCByZXVzZWQgYW5kIHRoZSBt X2FjdGl2ZU1hdGNoIGNvdWxkIGVuZCB1cCBwb2ludGluZworICAgIC8vIHRvIGEgZG9jdW1lbnQg dGhhdCBpcyBubyBsb25nZXIgdmFsaWQuIEtlZXBpbmcgYW4gaW52YWxpZCByZWZlcmVuY2UgYXJv dW5kCisgICAgLy8gaXMganVzdCBhc2tpbmcgZm9yIHRyb3VibGUuCisgICAgbV9hY3RpdmVNYXRj aCA9IDA7CisKICAgICBtX2FjdGl2ZU1hdGNoSW5kZXhJbkN1cnJlbnRGcmFtZSA9IC0xOwogfQog CkBAIC0yNTIyLDE0ICsyNTMyLDYgQEAgdm9pZCBXZWJGcmFtZUltcGw6OnNldEZpbmRFbmRzdGF0 ZUZvY3VzQW5kU2VsZWN0aW9uKCkKICAgICAgICAgLy8gYSBsaW5rIGZvY3VzZWQsIHdoaWNoIGlz IHdlaXJkKS4KICAgICAgICAgZnJhbWUoKS0+c2VsZWN0aW9uKCktPnNldFNlbGVjdGlvbihtX2Fj dGl2ZU1hdGNoLmdldCgpKTsKICAgICAgICAgZnJhbWUoKS0+ZG9jdW1lbnQoKS0+c2V0Rm9jdXNl ZE5vZGUoMCk7Ci0KLSAgICAgICAgLy8gRmluYWxseSBjbGVhciB0aGUgYWN0aXZlIG1hdGNoLCBm b3IgdHdvIHJlYXNvbnM6Ci0gICAgICAgIC8vIFdlIGp1c3QgZmluaXNoZWQgdGhlIGZpbmQgJ3Nl c3Npb24nIGFuZCB3ZSBkb24ndCB3YW50IGZ1dHVyZSAocG90ZW50aWFsbHkKLSAgICAgICAgLy8g dW5yZWxhdGVkKSBmaW5kICdzZXNzaW9ucycgb3BlcmF0aW9ucyB0byBzdGFydCBhdCB0aGUgc2Ft ZSBwbGFjZS4KLSAgICAgICAgLy8gVGhlIFdlYkZyYW1lSW1wbCBjb3VsZCBnZXQgcmV1c2VkIGFu ZCB0aGUgbV9hY3RpdmVNYXRjaCBjb3VsZCBlbmQgdXAgcG9pbnRpbmcKLSAgICAgICAgLy8gdG8g YSBkb2N1bWVudCB0aGF0IGlzIG5vIGxvbmdlciB2YWxpZC4gS2VlcGluZyBhbiBpbnZhbGlkIHJl ZmVyZW5jZSBhcm91bmQKLSAgICAgICAgLy8gaXMganVzdCBhc2tpbmcgZm9yIHRyb3VibGUuCi0g ICAgICAgIG1fYWN0aXZlTWF0Y2ggPSAwOwogICAgIH0KIH0KIApAQCAtMjYxMiw5ICsyNjE0LDkg QEAgaW50IFdlYkZyYW1lSW1wbDo6b3JkaW5hbE9mRmlyc3RNYXRjaEZvckZyYW1lKFdlYkZyYW1l SW1wbCogZnJhbWUpIGNvbnN0CiAKIGJvb2wgV2ViRnJhbWVJbXBsOjpzaG91bGRTY29wZU1hdGNo ZXMoY29uc3QgU3RyaW5nJiBzZWFyY2hUZXh0KQogewotICAgIC8vIERvbid0IHNjb3BlIGlmIHdl IGNhbid0IGZpbmQgYSBmcmFtZSBvciBhIHZpZXcgb3IgaWYgdGhlIGZyYW1lIGlzIG5vdCB2aXNp YmxlLgorICAgIC8vIERvbid0IHNjb3BlIGlmIHdlIGNhbid0IGZpbmQgYSBmcmFtZSBvciBhIHZp ZXcuCiAgICAgLy8gVGhlIHVzZXIgbWF5IGhhdmUgY2xvc2VkIHRoZSB0YWIvYXBwbGljYXRpb24s IHNvIGFib3J0LgotICAgIGlmICghZnJhbWUoKSB8fCAhZnJhbWUoKS0+dmlldygpIHx8ICFoYXNW aXNpYmxlQ29udGVudCgpKQorICAgIGlmICghZnJhbWUoKSB8fCAhZnJhbWUoKS0+dmlldygpKQog ICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICBBU1NFUlQoZnJhbWUoKS0+ZG9jdW1lbnQoKSAm JiBmcmFtZSgpLT52aWV3KCkpOwo= 163752 2012-09-12 18:01:56 -0700 2012-09-17 01:05:13 -0700 Patch bug-96402-20120913020129.patch text/plain 2204 leandrogracia U3VidmVyc2lvbiBSZXZpc2lvbjogMTI4MzI1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IDA3M2NiYmM1M2ZlODVlYTRjYzk2ZTcwZDA4NGJlMmEwOTdmZGI5NzYuLjg3MDRiZDA3Y2ZlM2Fk Mzk2OTE5ZThjYTA5NTNhNmUxMGE5ZWJlYTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTcgQEAKKzIwMTItMDktMTIgIExlYW5kcm8gR3JhY2lhIEdpbCAgPGxlYW5kcm9n cmFjaWFAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtDaHJvbWl1bV0gRml4IGNhc2VzIHdoZXJl IGZpbmQtaW4tcGFnZSBkb2Vzbid0IHNlbmQgYSBmaW5hbCB1cGRhdGUKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk2NDAyCisKKyAgICAgICAgRml4IHNv bWUgaXNzdWVzIGluIHRoZSBXZWJLaXQgaW1wbGVtZW50YXRpb24gdGhhdCBwcmV2ZW50ZWQgdG8g c2VuZCBhIGZpbmFsCisgICAgICAgIHJlcG9ydEZpbmRJblBhZ2VNYXRjaENvdW50IG1lc3NhZ2Uu CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBzcmMv V2ViRnJhbWVJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViRnJhbWVJbXBsOjpzY29wZVN0 cmluZ01hdGNoZXMpOgorICAgICAgICAoV2ViS2l0OjpXZWJGcmFtZUltcGw6OnNob3VsZFNjb3Bl TWF0Y2hlcyk6CisKIDIwMTItMDktMTIgIElseWEgVGlraG9ub3Zza3kgIDxsb2lzbG9AY2hyb21p dW0ub3JnPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IE5NSSBtb3ZlIFN0cmluZyogaW5zdHJ1 bWVudGF0aW9uIHRvIHd0Zi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3Jj L1dlYkZyYW1lSW1wbC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJGcmFtZUlt cGwuY3BwCmluZGV4IDFkMTg3ZjA5ZTAwMGY1OTMzZjMwNDkxMDBlYjA4MzIzMmJjMjBiNDcuLjAz ZGYwNGEzMzhhMDY3YTcwMDgwMzhkZmE3NTQ5NDY3MzBlMDQwZGMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkZyYW1lSW1wbC5jcHAKKysrIGIvU291cmNlL1dlYktp dC9jaHJvbWl1bS9zcmMvV2ViRnJhbWVJbXBsLmNwcApAQCAtMTc3OSw4ICsxNzc5LDEwIEBAIHZv aWQgV2ViRnJhbWVJbXBsOjpzY29wZVN0cmluZ01hdGNoZXMoaW50IGlkZW50aWZpZXIsCiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IFdlYkZpbmRPcHRpb25zJiBv cHRpb25zLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBib29sIHJlc2V0 KQogewotICAgIGlmICghc2hvdWxkU2NvcGVNYXRjaGVzKHNlYXJjaFRleHQpKQorICAgIGlmICgh c2hvdWxkU2NvcGVNYXRjaGVzKHNlYXJjaFRleHQpKSB7CisgICAgICAgIGluY3JlYXNlTWF0Y2hD b3VudCgwLCBpZGVudGlmaWVyKTsKICAgICAgICAgcmV0dXJuOworICAgIH0KIAogICAgIFdlYkZy YW1lSW1wbCogbWFpbkZyYW1lSW1wbCA9IHZpZXdJbXBsKCktPm1haW5GcmFtZUltcGwoKTsKIApA QCAtMjYxMiw5ICsyNjE0LDkgQEAgaW50IFdlYkZyYW1lSW1wbDo6b3JkaW5hbE9mRmlyc3RNYXRj aEZvckZyYW1lKFdlYkZyYW1lSW1wbCogZnJhbWUpIGNvbnN0CiAKIGJvb2wgV2ViRnJhbWVJbXBs OjpzaG91bGRTY29wZU1hdGNoZXMoY29uc3QgU3RyaW5nJiBzZWFyY2hUZXh0KQogewotICAgIC8v IERvbid0IHNjb3BlIGlmIHdlIGNhbid0IGZpbmQgYSBmcmFtZSBvciBhIHZpZXcgb3IgaWYgdGhl IGZyYW1lIGlzIG5vdCB2aXNpYmxlLgorICAgIC8vIERvbid0IHNjb3BlIGlmIHdlIGNhbid0IGZp bmQgYSBmcmFtZSBvciBhIHZpZXcuCiAgICAgLy8gVGhlIHVzZXIgbWF5IGhhdmUgY2xvc2VkIHRo ZSB0YWIvYXBwbGljYXRpb24sIHNvIGFib3J0LgotICAgIGlmICghZnJhbWUoKSB8fCAhZnJhbWUo KS0+dmlldygpIHx8ICFoYXNWaXNpYmxlQ29udGVudCgpKQorICAgIGlmICghZnJhbWUoKSB8fCAh ZnJhbWUoKS0+dmlldygpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICBBU1NFUlQoZnJh bWUoKS0+ZG9jdW1lbnQoKSAmJiBmcmFtZSgpLT52aWV3KCkpOwo= 164354 2012-09-17 01:05:19 -0700 2012-09-17 01:39:52 -0700 Patch bug-96402-20120917090447.patch text/plain 2960 leandrogracia U3VidmVyc2lvbiBSZXZpc2lvbjogMTI4NjI2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IGRmNjA1MWZiMzhlYTE2MmY4ZmExZDZkYTA4YjUzZmJjMTFjNDU4NzYuLmE2OTBhOGQwNDVhNzgx MDA3MjYwMjgxMTA1ODY0M2VmNDc2ODEyZmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTcgQEAKKzIwMTItMDktMTcgIExlYW5kcm8gR3JhY2lhIEdpbCAgPGxlYW5kcm9n cmFjaWFAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtDaHJvbWl1bV0gRml4IGNhc2VzIHdoZXJl IGZpbmQtaW4tcGFnZSBkb2Vzbid0IHNlbmQgYSBmaW5hbCB1cGRhdGUKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk2NDAyCisKKyAgICAgICAgRml4IHNv bWUgaXNzdWVzIGluIHRoZSBXZWJLaXQgaW1wbGVtZW50YXRpb24gdGhhdCBwcmV2ZW50ZWQgdG8g c2VuZCBhIGZpbmFsCisgICAgICAgIHJlcG9ydEZpbmRJblBhZ2VNYXRjaENvdW50IG1lc3NhZ2Uu CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBzcmMv V2ViRnJhbWVJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViRnJhbWVJbXBsOjpzY29wZVN0 cmluZ01hdGNoZXMpOgorICAgICAgICAoV2ViS2l0OjpXZWJGcmFtZUltcGw6OnNob3VsZFNjb3Bl TWF0Y2hlcyk6CisKIDIwMTItMDktMTQgIEtlaXNoaSBIYXR0b3JpICA8a2Vpc2hpQHdlYmtpdC5v cmc+CiAKICAgICAgICAgTWFrZSB0aW1lIGlucHV0IGxhbmcgYXR0cmlidXRlIGF3YXJlIGZvciB0 ZXN0aW5nCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJGcmFtZUlt cGwuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViRnJhbWVJbXBsLmNwcAppbmRl eCBlYjAyMzUxZGFhYzE1MzIxNWVmMjJiNGM3MDI1YzdmZjgzZGFhNWVlLi5mOTNlNzJkNjQyNzM1 ODA1Y2QyYjMwMWQzMDA4Y2E5ZmVmNTNhNWRkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL3NyYy9XZWJGcmFtZUltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0v c3JjL1dlYkZyYW1lSW1wbC5jcHAKQEAgLTE3NzksMTEgKzE3NzksMjYgQEAgdm9pZCBXZWJGcmFt ZUltcGw6OnNjb3BlU3RyaW5nTWF0Y2hlcyhpbnQgaWRlbnRpZmllciwKICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgV2ViRmluZE9wdGlvbnMmIG9wdGlvbnMsCiAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJvb2wgcmVzZXQpCiB7Ci0gICAg aWYgKCFzaG91bGRTY29wZU1hdGNoZXMoc2VhcmNoVGV4dCkpCi0gICAgICAgIHJldHVybjsKLQog ICAgIFdlYkZyYW1lSW1wbCogbWFpbkZyYW1lSW1wbCA9IHZpZXdJbXBsKCktPm1haW5GcmFtZUlt cGwoKTsKIAorICAgIGlmICghc2hvdWxkU2NvcGVNYXRjaGVzKHNlYXJjaFRleHQpKSB7CisgICAg ICAgIGlmIChyZXNldCkgeworICAgICAgICAgICAgLy8gRGVmZXIgdGhlIGZpbmFsIHVwZGF0ZS4g VGhpcyBpcyBkb25lIGluIG9yZGVyIHRvIHByZXZlbnQgc2VuZGluZyBhIGZpbmFsIG1lc3NhZ2Ug YmFzZWQgb25seSBvbiB0aGUKKyAgICAgICAgICAgIC8vIHJlc3VsdHMgb2YgdGhlIGZpcnN0IGZy YW1lIHNpbmNlIG1fZnJhbWVzU2NvcGluZ0NvdW50IHdpbGwgYmUgMCBhcyBvdGhlciBmcmFtZXMg aGF2ZSB5ZXQgdG8gcmVzZXQuCisgICAgICAgICAgICBzY29wZVN0cmluZ01hdGNoZXNTb29uKAor ICAgICAgICAgICAgICAgIGlkZW50aWZpZXIsCisgICAgICAgICAgICAgICAgc2VhcmNoVGV4dCwK KyAgICAgICAgICAgICAgICBvcHRpb25zLAorICAgICAgICAgICAgICAgIGZhbHNlKTsKKyAgICAg ICAgfSBlbHNlIHsKKyAgICAgICAgICAgIC8vIE5vdyB0aGF0IG90aGVyIGZyYW1lcyAoaWYgYW55 KSBoYXZlIGJlZW4gcmVzZXQgZm9yIHRoaXMgc2VhcmNoLCB0cmlnZ2VyIHRoZSBmaW5hbCB1cGRh dGUuCisgICAgICAgICAgICBpZiAoIW1haW5GcmFtZUltcGwtPm1fZnJhbWVzU2NvcGluZ0NvdW50 KQorICAgICAgICAgICAgICAgIG1haW5GcmFtZUltcGwtPmluY3JlYXNlTWF0Y2hDb3VudCgwLCBp ZGVudGlmaWVyKTsKKyAgICAgICAgfQorCisgICAgICAgIHJldHVybjsKKyAgICB9CisKICAgICBp ZiAocmVzZXQpIHsKICAgICAgICAgLy8gVGhpcyBpcyBhIGJyYW5kIG5ldyBzZWFyY2gsIHNvIHdl IG5lZWQgdG8gcmVzZXQgZXZlcnl0aGluZy4KICAgICAgICAgLy8gU2NvcGluZyBpcyBqdXN0IGFi b3V0IHRvIGJlZ2luLgpAQCAtMjYxMiw5ICsyNjI3LDkgQEAgaW50IFdlYkZyYW1lSW1wbDo6b3Jk aW5hbE9mRmlyc3RNYXRjaEZvckZyYW1lKFdlYkZyYW1lSW1wbCogZnJhbWUpIGNvbnN0CiAKIGJv b2wgV2ViRnJhbWVJbXBsOjpzaG91bGRTY29wZU1hdGNoZXMoY29uc3QgU3RyaW5nJiBzZWFyY2hU ZXh0KQogewotICAgIC8vIERvbid0IHNjb3BlIGlmIHdlIGNhbid0IGZpbmQgYSBmcmFtZSBvciBh IHZpZXcgb3IgaWYgdGhlIGZyYW1lIGlzIG5vdCB2aXNpYmxlLgorICAgIC8vIERvbid0IHNjb3Bl IGlmIHdlIGNhbid0IGZpbmQgYSBmcmFtZSBvciBhIHZpZXcuCiAgICAgLy8gVGhlIHVzZXIgbWF5 IGhhdmUgY2xvc2VkIHRoZSB0YWIvYXBwbGljYXRpb24sIHNvIGFib3J0LgotICAgIGlmICghZnJh bWUoKSB8fCAhZnJhbWUoKS0+dmlldygpIHx8ICFoYXNWaXNpYmxlQ29udGVudCgpKQorICAgIGlm ICghZnJhbWUoKSB8fCAhZnJhbWUoKS0+dmlldygpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAK ICAgICBBU1NFUlQoZnJhbWUoKS0+ZG9jdW1lbnQoKSAmJiBmcmFtZSgpLT52aWV3KCkpOwo= 164356 2012-09-17 01:39:57 -0700 2012-09-17 06:19:49 -0700 Patch bug-96402-20120917093925.patch text/plain 3241 leandrogracia U3VidmVyc2lvbiBSZXZpc2lvbjogMTI4NjI2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IGRmNjA1MWZiMzhlYTE2MmY4ZmExZDZkYTA4YjUzZmJjMTFjNDU4NzYuLmE2OTBhOGQwNDVhNzgx MDA3MjYwMjgxMTA1ODY0M2VmNDc2ODEyZmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTcgQEAKKzIwMTItMDktMTcgIExlYW5kcm8gR3JhY2lhIEdpbCAgPGxlYW5kcm9n cmFjaWFAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtDaHJvbWl1bV0gRml4IGNhc2VzIHdoZXJl IGZpbmQtaW4tcGFnZSBkb2Vzbid0IHNlbmQgYSBmaW5hbCB1cGRhdGUKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk2NDAyCisKKyAgICAgICAgRml4IHNv bWUgaXNzdWVzIGluIHRoZSBXZWJLaXQgaW1wbGVtZW50YXRpb24gdGhhdCBwcmV2ZW50ZWQgdG8g c2VuZCBhIGZpbmFsCisgICAgICAgIHJlcG9ydEZpbmRJblBhZ2VNYXRjaENvdW50IG1lc3NhZ2Uu CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBzcmMv V2ViRnJhbWVJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViRnJhbWVJbXBsOjpzY29wZVN0 cmluZ01hdGNoZXMpOgorICAgICAgICAoV2ViS2l0OjpXZWJGcmFtZUltcGw6OnNob3VsZFNjb3Bl TWF0Y2hlcyk6CisKIDIwMTItMDktMTQgIEtlaXNoaSBIYXR0b3JpICA8a2Vpc2hpQHdlYmtpdC5v cmc+CiAKICAgICAgICAgTWFrZSB0aW1lIGlucHV0IGxhbmcgYXR0cmlidXRlIGF3YXJlIGZvciB0 ZXN0aW5nCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJGcmFtZUlt cGwuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViRnJhbWVJbXBsLmNwcAppbmRl eCBlYjAyMzUxZGFhYzE1MzIxNWVmMjJiNGM3MDI1YzdmZjgzZGFhNWVlLi4zNjM4ZmU4ZDJlY2Nm YmQ1MzM2Nzk4MzlmNGI5YjYzNTlmNDNmYzg1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL3NyYy9XZWJGcmFtZUltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0v c3JjL1dlYkZyYW1lSW1wbC5jcHAKQEAgLTE3NzksMTEgKzE3NzksMzAgQEAgdm9pZCBXZWJGcmFt ZUltcGw6OnNjb3BlU3RyaW5nTWF0Y2hlcyhpbnQgaWRlbnRpZmllciwKICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgV2ViRmluZE9wdGlvbnMmIG9wdGlvbnMsCiAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJvb2wgcmVzZXQpCiB7Ci0gICAg aWYgKCFzaG91bGRTY29wZU1hdGNoZXMoc2VhcmNoVGV4dCkpCi0gICAgICAgIHJldHVybjsKLQog ICAgIFdlYkZyYW1lSW1wbCogbWFpbkZyYW1lSW1wbCA9IHZpZXdJbXBsKCktPm1haW5GcmFtZUlt cGwoKTsKIAorICAgIGlmICghc2hvdWxkU2NvcGVNYXRjaGVzKHNlYXJjaFRleHQpKSB7CisgICAg ICAgIGlmIChyZXNldCkgeworICAgICAgICAgICAgLy8gRGVmZXIgdGhlIGZpbmFsIHVwZGF0ZS4g VGhpcyBpcyBkb25lIGluIG9yZGVyIHRvIHByZXZlbnQgc2VuZGluZyBhIGZpbmFsIG1lc3NhZ2Ug YmFzZWQgb25seSBvbiB0aGUKKyAgICAgICAgICAgIC8vIHJlc3VsdHMgb2YgdGhlIGZpcnN0IGZy YW1lIHNpbmNlIG1fZnJhbWVzU2NvcGluZ0NvdW50IHdpbGwgYmUgMCBhcyBvdGhlciBmcmFtZXMg aGF2ZSB5ZXQgdG8gcmVzZXQuCisgICAgICAgICAgICAvLyBUaGUgdmFsdWUgb2YgbV9mcmFtZXNT Y29waW5nQ291bnQgaXMgaW5jcmVhc2VkIGhlcmUgdG8gcHJldmVudCBtdWx0aXBsZSBmcmFtZXMg c2VuZGluZyB0aGUgc2FtZSBmaW5hbCB1cGRhdGUuCisgICAgICAgICAgICBtYWluRnJhbWVJbXBs LT5tX2ZyYW1lc1Njb3BpbmdDb3VudCsrOworICAgICAgICAgICAgc2NvcGVTdHJpbmdNYXRjaGVz U29vbigKKyAgICAgICAgICAgICAgICBpZGVudGlmaWVyLAorICAgICAgICAgICAgICAgIHNlYXJj aFRleHQsCisgICAgICAgICAgICAgICAgb3B0aW9ucywKKyAgICAgICAgICAgICAgICBmYWxzZSk7 CisgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICAvLyBOb3cgdGhhdCBvdGhlciBmcmFtZXMg KGlmIGFueSkgaGF2ZSBiZWVuIHJlc2V0IGZvciB0aGlzIHNlYXJjaCwKKyAgICAgICAgICAgIC8v IHRyaWdnZXIgdGhlIGZpbmFsIHVwZGF0ZSBpZiB0aGVyZSdzIG5vIHBlbmRpbmcgc2NvcGluZyB3 b3JrLgorICAgICAgICAgICAgbWFpbkZyYW1lSW1wbC0+bV9mcmFtZXNTY29waW5nQ291bnQtLTsK KyAgICAgICAgICAgIGlmICghbWFpbkZyYW1lSW1wbC0+bV9mcmFtZXNTY29waW5nQ291bnQpCisg ICAgICAgICAgICAgICAgbWFpbkZyYW1lSW1wbC0+aW5jcmVhc2VNYXRjaENvdW50KDAsIGlkZW50 aWZpZXIpOworICAgICAgICB9CisKKyAgICAgICAgcmV0dXJuOworICAgIH0KKwogICAgIGlmIChy ZXNldCkgewogICAgICAgICAvLyBUaGlzIGlzIGEgYnJhbmQgbmV3IHNlYXJjaCwgc28gd2UgbmVl ZCB0byByZXNldCBldmVyeXRoaW5nLgogICAgICAgICAvLyBTY29waW5nIGlzIGp1c3QgYWJvdXQg dG8gYmVnaW4uCkBAIC0yNjEyLDkgKzI2MzEsOSBAQCBpbnQgV2ViRnJhbWVJbXBsOjpvcmRpbmFs T2ZGaXJzdE1hdGNoRm9yRnJhbWUoV2ViRnJhbWVJbXBsKiBmcmFtZSkgY29uc3QKIAogYm9vbCBX ZWJGcmFtZUltcGw6OnNob3VsZFNjb3BlTWF0Y2hlcyhjb25zdCBTdHJpbmcmIHNlYXJjaFRleHQp CiB7Ci0gICAgLy8gRG9uJ3Qgc2NvcGUgaWYgd2UgY2FuJ3QgZmluZCBhIGZyYW1lIG9yIGEgdmll dyBvciBpZiB0aGUgZnJhbWUgaXMgbm90IHZpc2libGUuCisgICAgLy8gRG9uJ3Qgc2NvcGUgaWYg d2UgY2FuJ3QgZmluZCBhIGZyYW1lIG9yIGEgdmlldy4KICAgICAvLyBUaGUgdXNlciBtYXkgaGF2 ZSBjbG9zZWQgdGhlIHRhYi9hcHBsaWNhdGlvbiwgc28gYWJvcnQuCi0gICAgaWYgKCFmcmFtZSgp IHx8ICFmcmFtZSgpLT52aWV3KCkgfHwgIWhhc1Zpc2libGVDb250ZW50KCkpCisgICAgaWYgKCFm cmFtZSgpIHx8ICFmcmFtZSgpLT52aWV3KCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAg IEFTU0VSVChmcmFtZSgpLT5kb2N1bWVudCgpICYmIGZyYW1lKCktPnZpZXcoKSk7Cg== 164378 2012-09-17 06:19:54 -0700 2012-09-17 06:28:13 -0700 Patch bug-96402-20120917141922.patch text/plain 6636 leandrogracia U3VidmVyc2lvbiBSZXZpc2lvbjogMTI4NzM1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IDViZjczNGFkMzNmOTRiNDQ3YmQ2NTdiY2EyZDU0YmQyOWY5ZGU5NWIuLmZiM2VkYjA4ODc3ODli OWQ5NzYyMTM3MDU4OTQ2MjBhODE4OGM5Y2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjIgQEAKKzIwMTItMDktMTcgIExlYW5kcm8gR3JhY2lhIEdpbCAgPGxlYW5kcm9n cmFjaWFAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtDaHJvbWl1bV0gRml4IGNhc2VzIHdoZXJl IGZpbmQtaW4tcGFnZSBkb2Vzbid0IHNlbmQgYSBmaW5hbCB1cGRhdGUKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk2NDAyCisKKyAgICAgICAgRml4IHNv bWUgaXNzdWVzIGluIHRoZSBXZWJLaXQgaW1wbGVtZW50YXRpb24gdGhhdCBwcmV2ZW50ZWQgdG8g c2VuZCBhIGZpbmFsCisgICAgICAgIHJlcG9ydEZpbmRJblBhZ2VNYXRjaENvdW50IG1lc3NhZ2Uu CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBzcmMv V2ViRnJhbWVJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViRnJhbWVJbXBsOjpzY29wZVN0 cmluZ01hdGNoZXMpOgorICAgICAgICAoV2ViS2l0KToKKyAgICAgICAgKFdlYktpdDo6V2ViRnJh bWVJbXBsOjpmaW5pc2hDdXJyZW50U2NvcGluZ0VmZm9ydCk6CisgICAgICAgIChXZWJLaXQ6Oldl YkZyYW1lSW1wbDo6Y2FuY2VsUGVuZGluZ1Njb3BpbmdFZmZvcnQpOgorICAgICAgICAoV2ViS2l0 OjpXZWJGcmFtZUltcGw6OldlYkZyYW1lSW1wbCk6CisgICAgICAgIChXZWJLaXQ6OldlYkZyYW1l SW1wbDo6c2hvdWxkU2NvcGVNYXRjaGVzKToKKyAgICAgICAgKiBzcmMvV2ViRnJhbWVJbXBsLmg6 CisKIDIwMTItMDktMTUgIFl1cnkgU2VtaWtoYXRza3kgIDx5dXJ5c0BjaHJvbWl1bS5vcmc+CiAK ICAgICAgICAgV2ViIEluc3BlY3RvcjogYXV0b21hdGljYWxseSBkZXRlY3QgaWYgY2xhc3MgaGFz IHJlcG9ydE1lbW9yeVVzYWdlIG1ldGhvZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJv bWl1bS9zcmMvV2ViRnJhbWVJbXBsLmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dl YkZyYW1lSW1wbC5jcHAKaW5kZXggZWIwMjM1MWRhYWMxNTMyMTVlZjIyYjRjNzAyNWM3ZmY4M2Rh YTVlZS4uNjMwN2UwYzI2ZDIxN2UzZmI5M2NmMmEwYjU5ZWI1MDY4MmZiZTdmMyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViRnJhbWVJbXBsLmNwcAorKysgYi9Tb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJGcmFtZUltcGwuY3BwCkBAIC0xNzc5LDE3ICsxNzc5 LDE1IEBAIHZvaWQgV2ViRnJhbWVJbXBsOjpzY29wZVN0cmluZ01hdGNoZXMoaW50IGlkZW50aWZp ZXIsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IFdlYkZpbmRP cHRpb25zJiBvcHRpb25zLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBi b29sIHJlc2V0KQogewotICAgIGlmICghc2hvdWxkU2NvcGVNYXRjaGVzKHNlYXJjaFRleHQpKQot ICAgICAgICByZXR1cm47Ci0KICAgICBXZWJGcmFtZUltcGwqIG1haW5GcmFtZUltcGwgPSB2aWV3 SW1wbCgpLT5tYWluRnJhbWVJbXBsKCk7CiAKICAgICBpZiAocmVzZXQpIHsKICAgICAgICAgLy8g VGhpcyBpcyBhIGJyYW5kIG5ldyBzZWFyY2gsIHNvIHdlIG5lZWQgdG8gcmVzZXQgZXZlcnl0aGlu Zy4KICAgICAgICAgLy8gU2NvcGluZyBpcyBqdXN0IGFib3V0IHRvIGJlZ2luLgogICAgICAgICBt X3Njb3BpbmdDb21wbGV0ZSA9IGZhbHNlOworCiAgICAgICAgIC8vIENsZWFyIGhpZ2hsaWdodGlu ZyBmb3IgdGhpcyBmcmFtZS4KLSAgICAgICAgaWYgKGZyYW1lKCktPmVkaXRvcigpLT5tYXJrZWRU ZXh0TWF0Y2hlc0FyZUhpZ2hsaWdodGVkKCkpCisgICAgICAgIGlmIChmcmFtZSgpICYmIGZyYW1l KCktPmVkaXRvcigpLT5tYXJrZWRUZXh0TWF0Y2hlc0FyZUhpZ2hsaWdodGVkKCkpCiAgICAgICAg ICAgICBmcmFtZSgpLT5wYWdlKCktPnVubWFya0FsbFRleHRNYXRjaGVzKCk7CiAKICAgICAgICAg Ly8gQ2xlYXIgdGhlIHRpY2ttYXJrcyBhbmQgcmVzdWx0cyBjYWNoZS4KQEAgLTE4MTIsNiArMTgx MCwxNCBAQCB2b2lkIFdlYkZyYW1lSW1wbDo6c2NvcGVTdHJpbmdNYXRjaGVzKGludCBpZGVudGlm aWVyLAogICAgICAgICByZXR1cm47CiAgICAgfQogCisgICAgaWYgKCFzaG91bGRTY29wZU1hdGNo ZXMoc2VhcmNoVGV4dCkpIHsKKyAgICAgICAgLy8gTm90ZSB0aGF0IHdlIHdhbnQgdG8gZGVmZXIg dGhlIGZpbmFsIHVwZGF0ZSB3aGVuIHJlc2V0dGluZyBldmVuIGlmIHNob3VsZFNjb3BlTWF0Y2hl cyByZXR1cm5zIGZhbHNlLgorICAgICAgICAvLyBUaGlzIGlzIGRvbmUgaW4gb3JkZXIgdG8gcHJl dmVudCBzZW5kaW5nIGEgZmluYWwgbWVzc2FnZSBiYXNlZCBvbmx5IG9uIHRoZSByZXN1bHRzIG9m IHRoZSBmaXJzdCBmcmFtZQorICAgICAgICAvLyBzaW5jZSBtX2ZyYW1lc1Njb3BpbmdDb3VudCB3 b3VsZCBiZSAwIGFzIG90aGVyIGZyYW1lcyBoYXZlIHlldCB0byByZXNldC4KKyAgICAgICAgZmlu aXNoQ3VycmVudFNjb3BpbmdFZmZvcnQoaWRlbnRpZmllcik7CisgICAgICAgIHJldHVybjsKKyAg ICB9CisKICAgICBSZWZQdHI8UmFuZ2U+IHNlYXJjaFJhbmdlKHJhbmdlT2ZDb250ZW50cyhmcmFt ZSgpLT5kb2N1bWVudCgpKSk7CiAKICAgICBOb2RlKiBvcmlnaW5hbEVuZENvbnRhaW5lciA9IHNl YXJjaFJhbmdlLT5lbmRDb250YWluZXIoKTsKQEAgLTE5MzgsMTAgKzE5NDQsMTggQEAgdm9pZCBX ZWJGcmFtZUltcGw6OnNjb3BlU3RyaW5nTWF0Y2hlcyhpbnQgaWRlbnRpZmllciwKICAgICAgICAg cmV0dXJuOyAvLyBEb25lIGZvciBub3csIHJlc3VtZSB3b3JrIGxhdGVyLgogICAgIH0KIAorICAg IGZpbmlzaEN1cnJlbnRTY29waW5nRWZmb3J0KGlkZW50aWZpZXIpOworfQorCit2b2lkIFdlYkZy YW1lSW1wbDo6ZmluaXNoQ3VycmVudFNjb3BpbmdFZmZvcnQoaW50IGlkZW50aWZpZXIpCit7Cisg ICAgV2ViRnJhbWVJbXBsKiBtYWluRnJhbWVJbXBsID0gdmlld0ltcGwoKS0+bWFpbkZyYW1lSW1w bCgpOworCiAgICAgLy8gVGhpcyBmcmFtZSBoYXMgbm8gZnVydGhlciBzY29waW5nIGxlZnQsIHNv IGl0IGlzIGRvbmUuIE90aGVyIGZyYW1lcyBtaWdodCwKICAgICAvLyBvZiBjb3Vyc2UsIGNvbnRp bnVlIHRvIHNjb3BlIG1hdGNoZXMuCiAgICAgbV9zY29waW5nQ29tcGxldGUgPSB0cnVlOwogICAg IG1haW5GcmFtZUltcGwtPm1fZnJhbWVzU2NvcGluZ0NvdW50LS07CisgICAgbV9sYXN0RmluZFJl cXVlc3RDb21wbGV0ZWRXaXRoTm9NYXRjaGVzID0gIW1fbGFzdE1hdGNoQ291bnQ7CiAKICAgICAv LyBJZiB0aGlzIGlzIHRoZSBsYXN0IGZyYW1lIHRvIGZpbmlzaCBzY29waW5nIHdlIG5lZWQgdG8g dHJpZ2dlciB0aGUgZmluYWwKICAgICAvLyB1cGRhdGUgdG8gYmUgc2VudC4KQEAgLTE5NTgsNiAr MTk3Miw3IEBAIHZvaWQgV2ViRnJhbWVJbXBsOjpjYW5jZWxQZW5kaW5nU2NvcGluZ0VmZm9ydCgp CiAgICAgbV9kZWZlcnJlZFNjb3BpbmdXb3JrLmNsZWFyKCk7CiAKICAgICBtX2FjdGl2ZU1hdGNo SW5kZXhJbkN1cnJlbnRGcmFtZSA9IC0xOworICAgIG1fbGFzdEZpbmRSZXF1ZXN0Q29tcGxldGVk V2l0aE5vTWF0Y2hlcyA9IGZhbHNlOwogfQogCiB2b2lkIFdlYkZyYW1lSW1wbDo6aW5jcmVhc2VN YXRjaENvdW50KGludCBjb3VudCwgaW50IGlkZW50aWZpZXIpCkBAIC0yMzMwLDYgKzIzNDUsNyBA QCBXZWJGcmFtZUltcGw6OldlYkZyYW1lSW1wbChXZWJGcmFtZUNsaWVudCogY2xpZW50KQogICAg ICwgbV90b3RhbE1hdGNoQ291bnQoLTEpCiAgICAgLCBtX2ZyYW1lc1Njb3BpbmdDb3VudCgtMSkK ICAgICAsIG1fc2NvcGluZ0NvbXBsZXRlKGZhbHNlKQorICAgICwgbV9sYXN0RmluZFJlcXVlc3RD b21wbGV0ZWRXaXRoTm9NYXRjaGVzKGZhbHNlKQogICAgICwgbV9uZXh0SW52YWxpZGF0ZUFmdGVy KDApCiAgICAgLCBtX2ZpbmRNYXRjaE1hcmtlcnNWZXJzaW9uKDApCiAgICAgLCBtX2ZpbmRNYXRj aFJlY3RzQXJlVmFsaWQoZmFsc2UpCkBAIC0yNjEyLDkgKzI2MjgsOSBAQCBpbnQgV2ViRnJhbWVJ bXBsOjpvcmRpbmFsT2ZGaXJzdE1hdGNoRm9yRnJhbWUoV2ViRnJhbWVJbXBsKiBmcmFtZSkgY29u c3QKIAogYm9vbCBXZWJGcmFtZUltcGw6OnNob3VsZFNjb3BlTWF0Y2hlcyhjb25zdCBTdHJpbmcm IHNlYXJjaFRleHQpCiB7Ci0gICAgLy8gRG9uJ3Qgc2NvcGUgaWYgd2UgY2FuJ3QgZmluZCBhIGZy YW1lIG9yIGEgdmlldyBvciBpZiB0aGUgZnJhbWUgaXMgbm90IHZpc2libGUuCisgICAgLy8gRG9u J3Qgc2NvcGUgaWYgd2UgY2FuJ3QgZmluZCBhIGZyYW1lIG9yIGEgdmlldy4KICAgICAvLyBUaGUg dXNlciBtYXkgaGF2ZSBjbG9zZWQgdGhlIHRhYi9hcHBsaWNhdGlvbiwgc28gYWJvcnQuCi0gICAg aWYgKCFmcmFtZSgpIHx8ICFmcmFtZSgpLT52aWV3KCkgfHwgIWhhc1Zpc2libGVDb250ZW50KCkp CisgICAgaWYgKCFmcmFtZSgpIHx8ICFmcmFtZSgpLT52aWV3KCkpCiAgICAgICAgIHJldHVybiBm YWxzZTsKIAogICAgIEFTU0VSVChmcmFtZSgpLT5kb2N1bWVudCgpICYmIGZyYW1lKCktPnZpZXco KSk7CkBAIC0yNjIyLDcgKzI2MzgsNyBAQCBib29sIFdlYkZyYW1lSW1wbDo6c2hvdWxkU2NvcGVN YXRjaGVzKGNvbnN0IFN0cmluZyYgc2VhcmNoVGV4dCkKICAgICAvLyBJZiB0aGUgZnJhbWUgY29t cGxldGVkIHRoZSBzY29waW5nIG9wZXJhdGlvbiBhbmQgZm91bmQgMCBtYXRjaGVzIHRoZSBsYXN0 CiAgICAgLy8gdGltZSBpdCB3YXMgc2VhcmNoZWQsIHRoZW4gd2UgZG9uJ3QgaGF2ZSB0byBzZWFy Y2ggaXQgYWdhaW4gaWYgdGhlIHVzZXIgaXMKICAgICAvLyBqdXN0IGFkZGluZyB0byB0aGUgc2Vh cmNoIHN0cmluZyBvciBzZW5kaW5nIHRoZSBzYW1lIHNlYXJjaCBzdHJpbmcgYWdhaW4uCi0gICAg aWYgKG1fc2NvcGluZ0NvbXBsZXRlICYmICFtX2xhc3RTZWFyY2hTdHJpbmcuaXNFbXB0eSgpICYm ICFtX2xhc3RNYXRjaENvdW50KSB7CisgICAgaWYgKG1fbGFzdEZpbmRSZXF1ZXN0Q29tcGxldGVk V2l0aE5vTWF0Y2hlcyAmJiAhbV9sYXN0U2VhcmNoU3RyaW5nLmlzRW1wdHkoKSkgewogICAgICAg ICAvLyBDaGVjayB0byBzZWUgaWYgdGhlIHNlYXJjaCBzdHJpbmcgcHJlZml4ZXMgbWF0Y2guCiAg ICAgICAgIFN0cmluZyBwcmV2aW91c1NlYXJjaFByZWZpeCA9CiAgICAgICAgICAgICBzZWFyY2hU ZXh0LnN1YnN0cmluZygwLCBtX2xhc3RTZWFyY2hTdHJpbmcubGVuZ3RoKCkpOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViRnJhbWVJbXBsLmggYi9Tb3VyY2UvV2Vi S2l0L2Nocm9taXVtL3NyYy9XZWJGcmFtZUltcGwuaAppbmRleCBlNTljOTMyYzU5MmIwNDJhMDdk ZGZhMzRlN2QzZGY5MWM5OTU4ZTllLi41ODUyNWQ3MDEzM2E4ZWUwZTIyN2Q4YjY3YzZlMWYwZjkz YTk2MWQyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJGcmFtZUlt cGwuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJGcmFtZUltcGwuaApAQCAt Mzg1LDYgKzM4NSw5IEBAIHByaXZhdGU6CiAgICAgLy8gd2FzIHNlYXJjaGVkLgogICAgIGJvb2wg c2hvdWxkU2NvcGVNYXRjaGVzKGNvbnN0IFdURjo6U3RyaW5nJiBzZWFyY2hUZXh0KTsKIAorICAg IC8vIEZpbmlzaGVzIHRoZSBjdXJyZW50IHNjb3BpbmcgZWZmb3J0IGFuZCB0cmlnZ2VycyBhbnkg dXBkYXRlcyBpZiBhcHByb3ByaWF0ZS4KKyAgICB2b2lkIGZpbmlzaEN1cnJlbnRTY29waW5nRWZm b3J0KGludCBpZGVudGlmaWVyKTsKKwogICAgIC8vIFF1ZXVlIHVwIGEgZGVmZXJyZWQgY2FsbCB0 byBzY29wZVN0cmluZ01hdGNoZXMuCiAgICAgdm9pZCBzY29wZVN0cmluZ01hdGNoZXNTb29uKAog ICAgICAgICBpbnQgaWRlbnRpZmllciwgY29uc3QgV2ViU3RyaW5nJiBzZWFyY2hUZXh0LCBjb25z dCBXZWJGaW5kT3B0aW9ucyYsCkBAIC00NTYsNiArNDU5LDEwIEBAIHByaXZhdGU6CiAgICAgLy8g aW50ZXJydXB0IGl0IGJlZm9yZSBpdCBjb21wbGV0ZXMgYnkgc3VibWl0dGluZyBhIG5ldyBzZWFy Y2gpLgogICAgIGJvb2wgbV9zY29waW5nQ29tcGxldGU7CiAKKyAgICAvLyBLZWVwcyB0cmFjayBv ZiB3aGV0aGVyIHRoZSBsYXN0IGZpbmQgcmVxdWVzdCBjb21wbGV0ZWQgaXRzIHNjb3BpbmcgZWZm b3J0CisgICAgLy8gd2l0aG91dCBmaW5kaW5nIGFueSBtYXRjaGVzIGluIHRoaXMgZnJhbWUuCisg ICAgYm9vbCBtX2xhc3RGaW5kUmVxdWVzdENvbXBsZXRlZFdpdGhOb01hdGNoZXM7CisKICAgICAv LyBLZWVwcyB0cmFjayBvZiB3aGVuIHRoZSBzY29waW5nIGVmZm9ydCBzaG91bGQgbmV4dCBpbnZh bGlkYXRlIHRoZSBzY3JvbGxiYXIKICAgICAvLyBhbmQgdGhlIGZyYW1lIGFyZWEuCiAgICAgaW50 IG1fbmV4dEludmFsaWRhdGVBZnRlcjsK 164382 2012-09-17 06:28:18 -0700 2012-09-17 11:35:44 -0700 Patch bug-96402-20120917142746.patch text/plain 6671 leandrogracia U3VidmVyc2lvbiBSZXZpc2lvbjogMTI4NzM1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IDViZjczNGFkMzNmOTRiNDQ3YmQ2NTdiY2EyZDU0YmQyOWY5ZGU5NWIuLmZiM2VkYjA4ODc3ODli OWQ5NzYyMTM3MDU4OTQ2MjBhODE4OGM5Y2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjIgQEAKKzIwMTItMDktMTcgIExlYW5kcm8gR3JhY2lhIEdpbCAgPGxlYW5kcm9n cmFjaWFAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtDaHJvbWl1bV0gRml4IGNhc2VzIHdoZXJl IGZpbmQtaW4tcGFnZSBkb2Vzbid0IHNlbmQgYSBmaW5hbCB1cGRhdGUKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk2NDAyCisKKyAgICAgICAgRml4IHNv bWUgaXNzdWVzIGluIHRoZSBXZWJLaXQgaW1wbGVtZW50YXRpb24gdGhhdCBwcmV2ZW50ZWQgdG8g c2VuZCBhIGZpbmFsCisgICAgICAgIHJlcG9ydEZpbmRJblBhZ2VNYXRjaENvdW50IG1lc3NhZ2Uu CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBzcmMv V2ViRnJhbWVJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViRnJhbWVJbXBsOjpzY29wZVN0 cmluZ01hdGNoZXMpOgorICAgICAgICAoV2ViS2l0KToKKyAgICAgICAgKFdlYktpdDo6V2ViRnJh bWVJbXBsOjpmaW5pc2hDdXJyZW50U2NvcGluZ0VmZm9ydCk6CisgICAgICAgIChXZWJLaXQ6Oldl YkZyYW1lSW1wbDo6Y2FuY2VsUGVuZGluZ1Njb3BpbmdFZmZvcnQpOgorICAgICAgICAoV2ViS2l0 OjpXZWJGcmFtZUltcGw6OldlYkZyYW1lSW1wbCk6CisgICAgICAgIChXZWJLaXQ6OldlYkZyYW1l SW1wbDo6c2hvdWxkU2NvcGVNYXRjaGVzKToKKyAgICAgICAgKiBzcmMvV2ViRnJhbWVJbXBsLmg6 CisKIDIwMTItMDktMTUgIFl1cnkgU2VtaWtoYXRza3kgIDx5dXJ5c0BjaHJvbWl1bS5vcmc+CiAK ICAgICAgICAgV2ViIEluc3BlY3RvcjogYXV0b21hdGljYWxseSBkZXRlY3QgaWYgY2xhc3MgaGFz IHJlcG9ydE1lbW9yeVVzYWdlIG1ldGhvZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJv bWl1bS9zcmMvV2ViRnJhbWVJbXBsLmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dl YkZyYW1lSW1wbC5jcHAKaW5kZXggZWIwMjM1MWRhYWMxNTMyMTVlZjIyYjRjNzAyNWM3ZmY4M2Rh YTVlZS4uN2JiMGVmZWVhM2JmOGNmYTc0Yzg0MDRmNWVmMzhlODEwODc1MjRjYyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViRnJhbWVJbXBsLmNwcAorKysgYi9Tb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJGcmFtZUltcGwuY3BwCkBAIC0xNzc5LDE3ICsxNzc5 LDE1IEBAIHZvaWQgV2ViRnJhbWVJbXBsOjpzY29wZVN0cmluZ01hdGNoZXMoaW50IGlkZW50aWZp ZXIsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IFdlYkZpbmRP cHRpb25zJiBvcHRpb25zLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBi b29sIHJlc2V0KQogewotICAgIGlmICghc2hvdWxkU2NvcGVNYXRjaGVzKHNlYXJjaFRleHQpKQot ICAgICAgICByZXR1cm47Ci0KICAgICBXZWJGcmFtZUltcGwqIG1haW5GcmFtZUltcGwgPSB2aWV3 SW1wbCgpLT5tYWluRnJhbWVJbXBsKCk7CiAKICAgICBpZiAocmVzZXQpIHsKICAgICAgICAgLy8g VGhpcyBpcyBhIGJyYW5kIG5ldyBzZWFyY2gsIHNvIHdlIG5lZWQgdG8gcmVzZXQgZXZlcnl0aGlu Zy4KICAgICAgICAgLy8gU2NvcGluZyBpcyBqdXN0IGFib3V0IHRvIGJlZ2luLgogICAgICAgICBt X3Njb3BpbmdDb21wbGV0ZSA9IGZhbHNlOworCiAgICAgICAgIC8vIENsZWFyIGhpZ2hsaWdodGlu ZyBmb3IgdGhpcyBmcmFtZS4KLSAgICAgICAgaWYgKGZyYW1lKCktPmVkaXRvcigpLT5tYXJrZWRU ZXh0TWF0Y2hlc0FyZUhpZ2hsaWdodGVkKCkpCisgICAgICAgIGlmIChmcmFtZSgpICYmIGZyYW1l KCktPmVkaXRvcigpLT5tYXJrZWRUZXh0TWF0Y2hlc0FyZUhpZ2hsaWdodGVkKCkpCiAgICAgICAg ICAgICBmcmFtZSgpLT5wYWdlKCktPnVubWFya0FsbFRleHRNYXRjaGVzKCk7CiAKICAgICAgICAg Ly8gQ2xlYXIgdGhlIHRpY2ttYXJrcyBhbmQgcmVzdWx0cyBjYWNoZS4KQEAgLTE4MTIsNiArMTgx MCwxNCBAQCB2b2lkIFdlYkZyYW1lSW1wbDo6c2NvcGVTdHJpbmdNYXRjaGVzKGludCBpZGVudGlm aWVyLAogICAgICAgICByZXR1cm47CiAgICAgfQogCisgICAgaWYgKCFzaG91bGRTY29wZU1hdGNo ZXMoc2VhcmNoVGV4dCkpIHsKKyAgICAgICAgLy8gTm90ZSB0aGF0IHdlIHdhbnQgdG8gZGVmZXIg dGhlIGZpbmFsIHVwZGF0ZSB3aGVuIHJlc2V0dGluZyBldmVuIGlmIHNob3VsZFNjb3BlTWF0Y2hl cyByZXR1cm5zIGZhbHNlLgorICAgICAgICAvLyBUaGlzIGlzIGRvbmUgaW4gb3JkZXIgdG8gcHJl dmVudCBzZW5kaW5nIGEgZmluYWwgbWVzc2FnZSBiYXNlZCBvbmx5IG9uIHRoZSByZXN1bHRzIG9m IHRoZSBmaXJzdCBmcmFtZQorICAgICAgICAvLyBzaW5jZSBtX2ZyYW1lc1Njb3BpbmdDb3VudCB3 b3VsZCBiZSAwIGFzIG90aGVyIGZyYW1lcyBoYXZlIHlldCB0byByZXNldC4KKyAgICAgICAgZmlu aXNoQ3VycmVudFNjb3BpbmdFZmZvcnQoaWRlbnRpZmllcik7CisgICAgICAgIHJldHVybjsKKyAg ICB9CisKICAgICBSZWZQdHI8UmFuZ2U+IHNlYXJjaFJhbmdlKHJhbmdlT2ZDb250ZW50cyhmcmFt ZSgpLT5kb2N1bWVudCgpKSk7CiAKICAgICBOb2RlKiBvcmlnaW5hbEVuZENvbnRhaW5lciA9IHNl YXJjaFJhbmdlLT5lbmRDb250YWluZXIoKTsKQEAgLTE5MzgsMTAgKzE5NDQsMTggQEAgdm9pZCBX ZWJGcmFtZUltcGw6OnNjb3BlU3RyaW5nTWF0Y2hlcyhpbnQgaWRlbnRpZmllciwKICAgICAgICAg cmV0dXJuOyAvLyBEb25lIGZvciBub3csIHJlc3VtZSB3b3JrIGxhdGVyLgogICAgIH0KIAorICAg IGZpbmlzaEN1cnJlbnRTY29waW5nRWZmb3J0KGlkZW50aWZpZXIpOworfQorCit2b2lkIFdlYkZy YW1lSW1wbDo6ZmluaXNoQ3VycmVudFNjb3BpbmdFZmZvcnQoaW50IGlkZW50aWZpZXIpCit7Cisg ICAgV2ViRnJhbWVJbXBsKiBtYWluRnJhbWVJbXBsID0gdmlld0ltcGwoKS0+bWFpbkZyYW1lSW1w bCgpOworCiAgICAgLy8gVGhpcyBmcmFtZSBoYXMgbm8gZnVydGhlciBzY29waW5nIGxlZnQsIHNv IGl0IGlzIGRvbmUuIE90aGVyIGZyYW1lcyBtaWdodCwKICAgICAvLyBvZiBjb3Vyc2UsIGNvbnRp bnVlIHRvIHNjb3BlIG1hdGNoZXMuCiAgICAgbV9zY29waW5nQ29tcGxldGUgPSB0cnVlOwogICAg IG1haW5GcmFtZUltcGwtPm1fZnJhbWVzU2NvcGluZ0NvdW50LS07CisgICAgbV9sYXN0RmluZFJl cXVlc3RDb21wbGV0ZWRXaXRoTm9NYXRjaGVzID0gIW1fbGFzdE1hdGNoQ291bnQ7CiAKICAgICAv LyBJZiB0aGlzIGlzIHRoZSBsYXN0IGZyYW1lIHRvIGZpbmlzaCBzY29waW5nIHdlIG5lZWQgdG8g dHJpZ2dlciB0aGUgZmluYWwKICAgICAvLyB1cGRhdGUgdG8gYmUgc2VudC4KQEAgLTE5NTgsNiAr MTk3Miw5IEBAIHZvaWQgV2ViRnJhbWVJbXBsOjpjYW5jZWxQZW5kaW5nU2NvcGluZ0VmZm9ydCgp CiAgICAgbV9kZWZlcnJlZFNjb3BpbmdXb3JrLmNsZWFyKCk7CiAKICAgICBtX2FjdGl2ZU1hdGNo SW5kZXhJbkN1cnJlbnRGcmFtZSA9IC0xOworCisgICAgaWYgKCFtX3Njb3BpbmdDb21wbGV0ZSkK KyAgICAgICAgbV9sYXN0RmluZFJlcXVlc3RDb21wbGV0ZWRXaXRoTm9NYXRjaGVzID0gZmFsc2U7 CiB9CiAKIHZvaWQgV2ViRnJhbWVJbXBsOjppbmNyZWFzZU1hdGNoQ291bnQoaW50IGNvdW50LCBp bnQgaWRlbnRpZmllcikKQEAgLTIzMzAsNiArMjM0Nyw3IEBAIFdlYkZyYW1lSW1wbDo6V2ViRnJh bWVJbXBsKFdlYkZyYW1lQ2xpZW50KiBjbGllbnQpCiAgICAgLCBtX3RvdGFsTWF0Y2hDb3VudCgt MSkKICAgICAsIG1fZnJhbWVzU2NvcGluZ0NvdW50KC0xKQogICAgICwgbV9zY29waW5nQ29tcGxl dGUoZmFsc2UpCisgICAgLCBtX2xhc3RGaW5kUmVxdWVzdENvbXBsZXRlZFdpdGhOb01hdGNoZXMo ZmFsc2UpCiAgICAgLCBtX25leHRJbnZhbGlkYXRlQWZ0ZXIoMCkKICAgICAsIG1fZmluZE1hdGNo TWFya2Vyc1ZlcnNpb24oMCkKICAgICAsIG1fZmluZE1hdGNoUmVjdHNBcmVWYWxpZChmYWxzZSkK QEAgLTI2MTIsOSArMjYzMCw5IEBAIGludCBXZWJGcmFtZUltcGw6Om9yZGluYWxPZkZpcnN0TWF0 Y2hGb3JGcmFtZShXZWJGcmFtZUltcGwqIGZyYW1lKSBjb25zdAogCiBib29sIFdlYkZyYW1lSW1w bDo6c2hvdWxkU2NvcGVNYXRjaGVzKGNvbnN0IFN0cmluZyYgc2VhcmNoVGV4dCkKIHsKLSAgICAv LyBEb24ndCBzY29wZSBpZiB3ZSBjYW4ndCBmaW5kIGEgZnJhbWUgb3IgYSB2aWV3IG9yIGlmIHRo ZSBmcmFtZSBpcyBub3QgdmlzaWJsZS4KKyAgICAvLyBEb24ndCBzY29wZSBpZiB3ZSBjYW4ndCBm aW5kIGEgZnJhbWUgb3IgYSB2aWV3LgogICAgIC8vIFRoZSB1c2VyIG1heSBoYXZlIGNsb3NlZCB0 aGUgdGFiL2FwcGxpY2F0aW9uLCBzbyBhYm9ydC4KLSAgICBpZiAoIWZyYW1lKCkgfHwgIWZyYW1l KCktPnZpZXcoKSB8fCAhaGFzVmlzaWJsZUNvbnRlbnQoKSkKKyAgICBpZiAoIWZyYW1lKCkgfHwg IWZyYW1lKCktPnZpZXcoKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgQVNTRVJUKGZy YW1lKCktPmRvY3VtZW50KCkgJiYgZnJhbWUoKS0+dmlldygpKTsKQEAgLTI2MjIsNyArMjY0MCw3 IEBAIGJvb2wgV2ViRnJhbWVJbXBsOjpzaG91bGRTY29wZU1hdGNoZXMoY29uc3QgU3RyaW5nJiBz ZWFyY2hUZXh0KQogICAgIC8vIElmIHRoZSBmcmFtZSBjb21wbGV0ZWQgdGhlIHNjb3Bpbmcgb3Bl cmF0aW9uIGFuZCBmb3VuZCAwIG1hdGNoZXMgdGhlIGxhc3QKICAgICAvLyB0aW1lIGl0IHdhcyBz ZWFyY2hlZCwgdGhlbiB3ZSBkb24ndCBoYXZlIHRvIHNlYXJjaCBpdCBhZ2FpbiBpZiB0aGUgdXNl ciBpcwogICAgIC8vIGp1c3QgYWRkaW5nIHRvIHRoZSBzZWFyY2ggc3RyaW5nIG9yIHNlbmRpbmcg dGhlIHNhbWUgc2VhcmNoIHN0cmluZyBhZ2Fpbi4KLSAgICBpZiAobV9zY29waW5nQ29tcGxldGUg JiYgIW1fbGFzdFNlYXJjaFN0cmluZy5pc0VtcHR5KCkgJiYgIW1fbGFzdE1hdGNoQ291bnQpIHsK KyAgICBpZiAobV9sYXN0RmluZFJlcXVlc3RDb21wbGV0ZWRXaXRoTm9NYXRjaGVzICYmICFtX2xh c3RTZWFyY2hTdHJpbmcuaXNFbXB0eSgpKSB7CiAgICAgICAgIC8vIENoZWNrIHRvIHNlZSBpZiB0 aGUgc2VhcmNoIHN0cmluZyBwcmVmaXhlcyBtYXRjaC4KICAgICAgICAgU3RyaW5nIHByZXZpb3Vz U2VhcmNoUHJlZml4ID0KICAgICAgICAgICAgIHNlYXJjaFRleHQuc3Vic3RyaW5nKDAsIG1fbGFz dFNlYXJjaFN0cmluZy5sZW5ndGgoKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9t aXVtL3NyYy9XZWJGcmFtZUltcGwuaCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkZy YW1lSW1wbC5oCmluZGV4IGU1OWM5MzJjNTkyYjA0MmEwN2RkZmEzNGU3ZDNkZjkxYzk5NThlOWUu LjU4NTI1ZDcwMTMzYThlZTBlMjI3ZDhiNjdjNmUxZjBmOTNhOTYxZDIgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkZyYW1lSW1wbC5oCisrKyBiL1NvdXJjZS9XZWJL aXQvY2hyb21pdW0vc3JjL1dlYkZyYW1lSW1wbC5oCkBAIC0zODUsNiArMzg1LDkgQEAgcHJpdmF0 ZToKICAgICAvLyB3YXMgc2VhcmNoZWQuCiAgICAgYm9vbCBzaG91bGRTY29wZU1hdGNoZXMoY29u c3QgV1RGOjpTdHJpbmcmIHNlYXJjaFRleHQpOwogCisgICAgLy8gRmluaXNoZXMgdGhlIGN1cnJl bnQgc2NvcGluZyBlZmZvcnQgYW5kIHRyaWdnZXJzIGFueSB1cGRhdGVzIGlmIGFwcHJvcHJpYXRl LgorICAgIHZvaWQgZmluaXNoQ3VycmVudFNjb3BpbmdFZmZvcnQoaW50IGlkZW50aWZpZXIpOwor CiAgICAgLy8gUXVldWUgdXAgYSBkZWZlcnJlZCBjYWxsIHRvIHNjb3BlU3RyaW5nTWF0Y2hlcy4K ICAgICB2b2lkIHNjb3BlU3RyaW5nTWF0Y2hlc1Nvb24oCiAgICAgICAgIGludCBpZGVudGlmaWVy LCBjb25zdCBXZWJTdHJpbmcmIHNlYXJjaFRleHQsIGNvbnN0IFdlYkZpbmRPcHRpb25zJiwKQEAg LTQ1Niw2ICs0NTksMTAgQEAgcHJpdmF0ZToKICAgICAvLyBpbnRlcnJ1cHQgaXQgYmVmb3JlIGl0 IGNvbXBsZXRlcyBieSBzdWJtaXR0aW5nIGEgbmV3IHNlYXJjaCkuCiAgICAgYm9vbCBtX3Njb3Bp bmdDb21wbGV0ZTsKIAorICAgIC8vIEtlZXBzIHRyYWNrIG9mIHdoZXRoZXIgdGhlIGxhc3QgZmlu ZCByZXF1ZXN0IGNvbXBsZXRlZCBpdHMgc2NvcGluZyBlZmZvcnQKKyAgICAvLyB3aXRob3V0IGZp bmRpbmcgYW55IG1hdGNoZXMgaW4gdGhpcyBmcmFtZS4KKyAgICBib29sIG1fbGFzdEZpbmRSZXF1 ZXN0Q29tcGxldGVkV2l0aE5vTWF0Y2hlczsKKwogICAgIC8vIEtlZXBzIHRyYWNrIG9mIHdoZW4g dGhlIHNjb3BpbmcgZWZmb3J0IHNob3VsZCBuZXh0IGludmFsaWRhdGUgdGhlIHNjcm9sbGJhcgog ICAgIC8vIGFuZCB0aGUgZnJhbWUgYXJlYS4KICAgICBpbnQgbV9uZXh0SW52YWxpZGF0ZUFmdGVy Owo=