53359 2011-01-28 19:36:22 -0800 Web Inspector: Allow the console to persist on page refresh or navigation 2011-06-14 10:03:54 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Enhancement --- 58191 0 priyajeet.hora webkit-unassigned apavlov caseq loislo pfeldman priyajeet.hora sreeram webkit.review.bot yurys oldest_to_newest 341964 0 priyajeet.hora 2011-01-28 19:36:22 -0800 Right now the console clears out when a page navigation happens or page refreshes. Please add an option to enable persistent logs just like firebug does. Pretty much the same as one sees the "Preserve log on page navigation" on the network tab. 342629 1 yurys 2011-01-31 09:55:06 -0800 (In reply to comment #0) > Right now the console clears out when a page navigation happens or page refreshes. Please add an option to enable persistent logs just like firebug does. Pretty much the same as one sees the "Preserve log on page navigation" on the network tab. The main problem is that we cannot access JS objects from the page after navigation and if there are some references to them in the log records we wouldn't be able to expand such objects and the best we can do is to serialize the to strings right before navigation. 342754 2 priyajeet.hora 2011-01-31 12:39:50 -0800 Yeah a toString version would be fine. Atleast one would be able to see the simple console.log() statements that one can use for debugging with the console persisting. And perhaps if we have xhr logging enabled it can still be a link to point to it's corresponding counterpart on the net tab if it's persist option was enabled. But just the former part would be a good start. 417608 3 96495 sreeram 2011-06-08 15:32:43 -0700 Created attachment 96495 Patch 417622 4 sreeram 2011-06-08 15:45:34 -0700 (In reply to comment #3) > Created an attachment (id=96495) [details] > Patch Some notes on the above patch: 1. I've moved the "Preserve Log upon Navigation" button to global scope (so the setting is now shared by the Network and Console panels). There might be an expectation that this will also be honoured for other panels (Timeline? Resources?), but currently, it has no effect on them. 2. In the Timeline panel, there's already a similar looking button, which makes for ugly UI, since now both buttons are visible. I'd like to change the glyph of the preserve-log button to something else, but don't have good ideas (perhaps a padlock icon?). Any UI design help would be appreciated! 3. I've added a new "frameNavigated" message just so that the frontend can determine whether to request the backend to clear messages. Is there a way to query the WebInspector.preserveLog property directly from the backend? If so, we could get rid of this message altogether. 4. I couldn't see a simple way to trigger the frameNavigated message in the inspector/protocol/console-agent layout test, so it's currently "not checked". 5. I haven't added any new test for this setting, mainly because I didn't see an existing test covering the current network-panel-only preserveLog setting. Please advise if I should go ahead and add a test anyway (which should cover the usage of this setting by both the Network and Console panels). 417950 5 pfeldman 2011-06-09 05:03:28 -0700 > 1. I've moved the "Preserve Log upon Navigation" button to global scope (so the setting is now shared by the Network and Console panels). There might be an expectation that this will also be honoured for other panels (Timeline? Resources?), but currently, it has no effect on them. This is a bit confusing. > 2. In the Timeline panel, there's already a similar looking button, which makes for ugly UI, since now both buttons are visible. I'd like to change the glyph of the preserve-log button to something else, but don't have good ideas (perhaps a padlock icon?). Any UI design help would be appreciated! We don't have a dedicated designer, so you should do your best :) > 3. I've added a new "frameNavigated" message just so that the frontend can determine whether to request the backend to clear messages. Is there a way to query the WebInspector.preserveLog property directly from the backend? If so, we could get rid of this message altogether. I am not sure there is a need for this. There is a number of frameNavigated signals in the front-end already. We should always clear backend objects (as per Yury's comment above), but conditionally wipe them out on the front-end side. As a result, pre-navigation objects will be "dead" (non-expandable, not pointing to any page instances), but still visible in the UI. I'd suggest that you add a checkbox to the console context menu (the one next to the XHR logging toggle) in order not to mess with the UI challenges for now. I don't see anything wrong with the patch code-wise, but I'll r- it until we figure out the UI bit + object lifetime. 418022 6 sreeram 2011-06-09 07:59:30 -0700 (In reply to comment #5) > > 3. I've added a new "frameNavigated" message just so that the frontend can determine whether to request the backend to clear messages. Is there a way to query the WebInspector.preserveLog property directly from the backend? If so, we could get rid of this message altogether. > > I am not sure there is a need for this. There is a number of frameNavigated signals in the front-end already. We should always clear backend objects (as per Yury's comment above), but conditionally wipe them out on the front-end side. As a result, pre-navigation objects will be "dead" (non-expandable, not pointing to any page instances), but still visible in the UI. I don't know the implications of not clearing the backend objects. Could you explain why it's important to do so? On first glance, it seems to me to be reasonable to keep them around. Could stuff like "m_previousMessage" lead to problems if the backend and frontend have different lists of messages? To be clear, my current patch doesn't let you expand dead objects either, so it _appears_ to have no functional difference to clearing the backend objects, but then again, I'm totally new to this part of the code, and I don't know the logic involved. > I'd suggest that you add a checkbox to the console context menu (the one next to the XHR logging toggle) in order not to mess with the UI challenges for now. I don't see anything wrong with the patch code-wise, but I'll r- it until we figure out the UI bit + object lifetime. I can certainly implement this, but I'd strongly encourage you to consider a more uniform UI like in the current patch. It seems confusing to have two different ways of achieving the same functionality in two panels (especially if one is a button and the other tucked away in a context menu). If the icon is the only thing that's confusing, I can try my hand at adding something different. If it's also a matter of other panels not respecting the setting (yet), that should give us more impetus to add similar functionality to those panels as soon as possible. I think it would be fantastic to have all panels implement "preserve log" functionality. 418031 7 yurys 2011-06-09 08:24:37 -0700 (In reply to comment #6) > (In reply to comment #5) > > > 3. I've added a new "frameNavigated" message just so that the frontend can determine whether to request the backend to clear messages. Is there a way to query the WebInspector.preserveLog property directly from the backend? If so, we could get rid of this message altogether. > > > > I am not sure there is a need for this. There is a number of frameNavigated signals in the front-end already. We should always clear backend objects (as per Yury's comment above), but conditionally wipe them out on the front-end side. As a result, pre-navigation objects will be "dead" (non-expandable, not pointing to any page instances), but still visible in the UI. > > I don't know the implications of not clearing the backend objects. Could you explain why it's important to do so? On first glance, it seems to me to be reasonable to keep them around. Not clearing them may prevent garbage collection of potentially all JavaScript objects in the old document, we don't want such leaks. > Could stuff like "m_previousMessage" lead to problems if the backend and frontend have different lists of messages? > Yes, it could. m_previousMessage message from the old document may match a message in the new document. I agree with Pavel, we shouldn't try to preserve messages on the backend, keeping them in the frontend will be enough for reading their message text. Also, if some messages are preserved after navigation, we should probably mark navigation point in the console log. 418132 8 pfeldman 2011-06-09 11:26:51 -0700 > To be clear, my current patch doesn't let you expand dead objects either, so it _appears_ to have no functional difference to clearing the backend objects, but then again, I'm totally new to this part of the code, and I don't know the logic involved. We do, and we are suggesting that you clear the list! > I can certainly implement this, but I'd strongly encourage you to consider a more uniform UI like in the current patch. It seems confusing to have two different ways of achieving the same functionality in two panels (especially if one is a button and the other tucked away in a context menu). Console can be accessed not only as a panel, but as a drawer on any other panel as well (via pressing Esc). Preserving log does make sense both for Network panel and Console, but it does not make sense for the rest of the panels. So putting it everywhere will be confusing, especially on the Timeline, Profiler and Audit panels. > If the icon is the only thing that's confusing, I can try my hand at adding something different. If it's also a matter of other panels not respecting the setting (yet), that should give us more impetus to add similar functionality to those panels as soon as possible. I think it would be fantastic to have all panels implement "preserve log" functionality. I disagree here, I don't see how Elements or Resources can possibly "preserve log". The information they expose is state-driven, not log-driven. So no, the icon is not the only concern. My advice for you was that if you want to have this change landed in a foreseeable future, you should minimize the surface of the UI changes. Context menu seems like a good fit. 418406 9 96666 sreeram 2011-06-09 17:09:25 -0700 Created attachment 96666 Moves setting to context menu, clears backend messages 420228 10 sreeram 2011-06-13 22:55:29 -0700 (In reply to comment #9) > Created an attachment (id=96666) [details] > Moves setting to context menu, clears backend messages Reviewers, ping? 420348 11 96666 pfeldman 2011-06-14 05:48:12 -0700 Comment on attachment 96666 Moves setting to context menu, clears backend messages View in context: https://bugs.webkit.org/attachment.cgi?id=96666&action=review A couple of nits, otherwise looks good. > Source/WebCore/ChangeLog:13 > + No new tests. (OOPS!) I think it is possible to test this. Check out LayoutTests/inspector/console/console-log-toString-object.html on how to reload a page and dump console messages afterwards. function test() is executed within inspector context, so you should be able to set your preserve flag there prior to calling the reload. > Source/WebCore/inspector/front-end/ConsoleView.js:465 > + contextMenu.appendCheckboxItem(WebInspector.UIString(WebInspector.useLowerCaseMenuTitles() ? "Preserve log" : "Preserve Log"), preserveLogItemAction, WebInspector.settings.preserveConsoleLog); This string should be added to the WebCore/English.lproj/localizedStrings.js 420476 12 97129 sreeram 2011-06-14 09:19:43 -0700 Created attachment 97129 Added message to localizedStrings and a test 420518 13 97129 webkit.review.bot 2011-06-14 10:03:50 -0700 Comment on attachment 97129 Added message to localizedStrings and a test Clearing flags on attachment: 97129 Committed r88815: <http://trac.webkit.org/changeset/88815> 420519 14 webkit.review.bot 2011-06-14 10:03:54 -0700 All reviewed patches have been landed. Closing bug. 96495 2011-06-08 15:32:43 -0700 2011-06-09 17:09:20 -0700 Patch bug-53359-20110608153241.patch text/plain 13628 sreeram U3VidmVyc2lvbiBSZXZpc2lvbjogODgzOTUKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA4N2I4OTFiYmYzMTgyZmNhOWNiMTNh NWMxMTE0ZDk1ZGQ3ZDI1ZGIxLi5hMmM4YTMwMTBlNDM4NjYzNjYxMjlmZjkyMjZhMjg4YTYyNzhl NGU2IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTEtMDYtMDggIFNyZWVyYW0gUmFtYWNoYW5k cmFuICA8c3JlZXJhbUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogQWxsb3cgdGhlIGNvbnNvbGUgdG8g cGVyc2lzdCBvbiBwYWdlIHJlZnJlc2ggb3IgbmF2aWdhdGlvbgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTMzNTkKKworICAgICAgICBVcGRhdGVkIHRl c3QgZXhwZWN0YXRpb25zIHRvIGluY2x1ZGUgdGhlIG5ldyBmcmFtZU5hdmlnYXRlZCBtZXNzYWdl LgorCisgICAgICAgICogaW5zcGVjdG9yL3Byb3RvY29sL2NvbnNvbGUtYWdlbnQtZXhwZWN0ZWQu dHh0OgorCiAyMDExLTA2LTA4ICBNYXJrIFBpbGdyaW0gIDxwaWxncmltQGNocm9taXVtLm9yZz4K IAogICAgICAgICBSZXZpZXdlZCBieSBUb255IENoYW5nLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVz dHMvaW5zcGVjdG9yL3Byb3RvY29sL2NvbnNvbGUtYWdlbnQtZXhwZWN0ZWQudHh0IGIvTGF5b3V0 VGVzdHMvaW5zcGVjdG9yL3Byb3RvY29sL2NvbnNvbGUtYWdlbnQtZXhwZWN0ZWQudHh0CmluZGV4 IDg2ZmM4OGRiOTJmMTRiNzQwZmNmOTg5NjA3MWU5YmQ1ZGQ3NWQwYjEuLjhmOTdjYTQ5NzZiZmYy Yjc5NjdlMmUzZmNjYWMwY2I5ZTYxMmI2NDIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3Bl Y3Rvci9wcm90b2NvbC9jb25zb2xlLWFnZW50LWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0 cy9pbnNwZWN0b3IvcHJvdG9jb2wvY29uc29sZS1hZ2VudC1leHBlY3RlZC50eHQKQEAgLTE4MCw1 ICsxODAsNiBAQCBDb3ZlcmFnZSBmb3IgQ29uc29sZUFnZW50CiAgICAgbWVzc2FnZUFkZGVkIDog ImNoZWNrZWQiCiAgICAgbWVzc2FnZVJlcGVhdENvdW50VXBkYXRlZCA6ICJjaGVja2VkIgogICAg IG1lc3NhZ2VzQ2xlYXJlZCA6ICJjaGVja2VkIgorICAgIGZyYW1lTmF2aWdhdGVkIDogIm5vdCBj aGVja2VkIgogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWU4Zjg1MTU5YzVmZTZkYTk2Y2Y3YWUxNmNlM2Nm MDUwYmZhZWNmMC4uMDBlMjg5MDFjMmMyYjhkMTcyNGM3YjQ1MzBiZjcwNDA1YmNmNjJjYiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwpAQCAtMSwzICsxLDM4IEBACisyMDExLTA2LTA4ICBTcmVlcmFtIFJhbWFjaGFuZHJh biAgPHNyZWVyYW1AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IEFsbG93IHRoZSBjb25zb2xlIHRvIHBl cnNpc3Qgb24gcGFnZSByZWZyZXNoIG9yIG5hdmlnYXRpb24KKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUzMzU5CisKKyAgICAgICAgTW92ZWQgdGhlICJw cmVzZXJ2ZSBsb2ciIHNldHRpbmcgZnJvbSB0aGUgbmV0d29yayBwYW5lbCB0byBnbG9iYWwgc2Nv cGUuCisgICAgICAgIEl0J3Mgbm93IHNoYXJlZCBieSB0aGUgbmV0d29yayBhbmQgY29uc29sZSBw YW5lbHMuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yLmpzb246CisgICAgICAgICog aW5zcGVjdG9yL0luc3BlY3RvckNvbnNvbGVBZ2VudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJ bnNwZWN0b3JDb25zb2xlQWdlbnQ6OmZyYW1lTmF2aWdhdGVkKToKKyAgICAgICAgKiBpbnNwZWN0 b3IvSW5zcGVjdG9yQ29uc29sZUFnZW50Lmg6CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3Rv ckluc3RydW1lbnRhdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JJbnN0cnVt ZW50YXRpb246OmRpZENvbW1pdExvYWRJbXBsKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQt ZW5kL0NvbnNvbGVWaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvbnNvbGVWaWV3LnBy b3RvdHlwZS5fcmVnaXN0ZXJDb25zb2xlRG9tYWluRGlzcGF0Y2hlci5kaXNwYXRjaGVyLm1lc3Nh Z2VzQ2xlYXJlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ29uc29sZVZpZXcucHJvdG90eXBl Ll9yZWdpc3RlckNvbnNvbGVEb21haW5EaXNwYXRjaGVyLmRpc3BhdGNoZXIuZnJhbWVOYXZpZ2F0 ZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvbnNvbGVWaWV3LnByb3RvdHlwZS5fcmVnaXN0 ZXJDb25zb2xlRG9tYWluRGlzcGF0Y2hlcik6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVu ZC9OZXR3b3JrUGFuZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTmV0d29ya1BhbmVsLnBy b3RvdHlwZS5nZXQgc3RhdHVzQmFySXRlbXMpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk5ldHdv cmtQYW5lbC5wcm90b3R5cGUuX2NyZWF0ZVN0YXR1c2JhckJ1dHRvbnMpOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLk5ldHdvcmtQYW5lbC5wcm90b3R5cGUuY2xlYXIpOgorICAgICAgICAoV2ViSW5z cGVjdG9yLk5ldHdvcmtQYW5lbC5wcm90b3R5cGUuX2ZyYW1lTmF2aWdhdGVkKToKKyAgICAgICAg KiBpbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5jc3M6CisgICAgICAgICgjcHJlc2VydmUt bG9nLXN0YXR1cy1iYXItaXRlbSAuZ2x5cGgpOgorICAgICAgICAoI3ByZXNlcnZlLWxvZy1zdGF0 dXMtYmFyLWl0ZW0udG9nZ2xlZC1vbiAuZ2x5cGgpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9u dC1lbmQvaW5zcGVjdG9yLmh0bWw6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNw ZWN0b3IuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuZ2V0IHByZXNlcnZlTG9nKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5zZXQgcHJlc2VydmVMb2cpOgorICAgICAgICAoV2ViSW5zcGVjdG9y Ll9wcmVzZXJ2ZUxvZ0NsaWNrZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLnJlc2V0KToKKwog MjAxMS0wNi0wNiAgTmF0ZSBDaGFwaW4gIDxqYXBoZXRAY2hyb21pdW0ub3JnPgogCiAgICAgICAg IFJldmlld2VkIGJ5IEFkYW0gQmFydGguCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvSW5zcGVjdG9yLmpzb24gYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9y Lmpzb24KaW5kZXggOTUzMWRjNjk5NjQ1YjAxNDYwYTMzOWY5NTQyMDA1YjhkODVhODI1Mi4uNzk1 MzZjY2Q3NTZjNzFiOTFlYzA1ZWJkMzI1MTVkMDg4OTZhYWJkYSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5qc29uCisrKyBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9JbnNwZWN0b3IuanNvbgpAQCAtMzgzLDYgKzM4MywxMCBAQAogICAgICAgICAgICAg ewogICAgICAgICAgICAgICAgICJuYW1lIjogIm1lc3NhZ2VzQ2xlYXJlZCIsCiAgICAgICAgICAg ICAgICAgImRlc2NyaXB0aW9uIjogIklzc3VlZCB3aGVuIGNvbnNvbGUgaXMgY2xlYXJlZC4iCisg ICAgICAgICAgICB9LAorICAgICAgICAgICAgeworICAgICAgICAgICAgICAgICJuYW1lIjogImZy YW1lTmF2aWdhdGVkIiwKKyAgICAgICAgICAgICAgICAiZGVzY3JpcHRpb24iOiAiU2VudCB3aGVu IHRoZSBmcmFtZSBoYXMgY29tcGxldGVkIG5hdmlnYXRpb24uIgogICAgICAgICAgICAgfQogICAg ICAgICBdCiAgICAgfSwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNw ZWN0b3JDb25zb2xlQWdlbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rv ckNvbnNvbGVBZ2VudC5jcHAKaW5kZXggNzM4Mjk1ZDA2OTg4ZDIxZTg2NmU1NDM2YjdkYzVmYmZl NmM2M2YzYy4uMzYzOGY3OGFiZDg2ODA1ZDBlZDUyZWMwMjc0ZTM4ZGMxMTFhZGVmYSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnNvbGVBZ2VudC5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnNvbGVBZ2VudC5jcHAK QEAgLTEwNiwxMCArMTA2LDE2IEBAIHZvaWQgSW5zcGVjdG9yQ29uc29sZUFnZW50OjpjbGVhckNv bnNvbGVNZXNzYWdlcyhFcnJvclN0cmluZyopCiAgICAgICAgIG1fZnJvbnRlbmQtPm1lc3NhZ2Vz Q2xlYXJlZCgpOwogfQogCi12b2lkIEluc3BlY3RvckNvbnNvbGVBZ2VudDo6cmVzZXQoKQordm9p ZCBJbnNwZWN0b3JDb25zb2xlQWdlbnQ6OmZyYW1lTmF2aWdhdGVkKCkKIHsKLSAgICBFcnJvclN0 cmluZyBlcnJvcjsKLSAgICBjbGVhckNvbnNvbGVNZXNzYWdlcygmZXJyb3IpOworICAgIC8vIElm IHRoZXJlJ3MgYSBmcm9udGVuZCwgbGV0IGl0IGRlY2lkZSB3aGV0aGVyIHRvIGNsZWFyIG1lc3Nh Z2VzIChiYXNlZCBvbgorICAgIC8vIGl0cyBwcmVzZXJ2ZUxvZyBzZXR0aW5nKTsgaWYgdGhlcmUn cyBubyBmcm9udGVuZCwgY2xlYXIgbWVzc2FnZXMgYW55d2F5LgorICAgIGlmIChtX2Zyb250ZW5k KQorICAgICAgICBtX2Zyb250ZW5kLT5mcmFtZU5hdmlnYXRlZCgpOworICAgIGVsc2UgeworICAg ICAgICBFcnJvclN0cmluZyBlcnJvcjsKKyAgICAgICAgY2xlYXJDb25zb2xlTWVzc2FnZXMoJmVy cm9yKTsKKyAgICB9CiAgICAgbV90aW1lcy5jbGVhcigpOwogICAgIG1fY291bnRzLmNsZWFyKCk7 CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29uc29s ZUFnZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29uc29sZUFnZW50 LmgKaW5kZXggMDA5ZjFhMmU2MGZlYjFmNWNmYmQxODU2Zjg0MjE2YjFhZWM1ZTRmMS4uYzU0NDYz NjU2NDVlZWI5MTU3ZmYwNGUzNGM0YTljNmIzZmM1MDQzNyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnNvbGVBZ2VudC5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb25zb2xlQWdlbnQuaApAQCAtNjEsNyArNjEsNyBAQCBw dWJsaWM6CiAgICAgdm9pZCBlbmFibGUoRXJyb3JTdHJpbmcqLCBpbnQqIGNvbnNvbGVNZXNzYWdl RXhwaXJlQ291bnQpOwogICAgIHZvaWQgZGlzYWJsZShFcnJvclN0cmluZyopOwogICAgIHZvaWQg Y2xlYXJDb25zb2xlTWVzc2FnZXMoRXJyb3JTdHJpbmcqIGVycm9yKTsKLSAgICB2b2lkIHJlc2V0 KCk7CisgICAgdm9pZCBmcmFtZU5hdmlnYXRlZCgpOwogICAgIHZvaWQgc2V0RnJvbnRlbmQoSW5z cGVjdG9yRnJvbnRlbmQqKTsKICAgICB2b2lkIGNsZWFyRnJvbnRlbmQoKTsKIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvckluc3RydW1lbnRhdGlvbi5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uLmNwcApp bmRleCBkMDgwYTM0NDU2MGFjMjgwYzI2ZTE3MTI0MmFiZGM0YjM4YmY5NmI1Li4wYTllNTcwZmU3 YTQ3YTE1M2YzZTZkYmIzNDcyZDEzNDU5MzliNGQ0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uLmNwcApAQCAtNTc2LDcgKzU3 Niw3IEBAIHZvaWQgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpkaWRDb21taXRMb2FkSW1wbChJ bnN0cnVtZW50aW5nQWdlbnRzKiBpbnN0cnVtZW50CiAgICAgRnJhbWUqIG1haW5GcmFtZSA9IHBh Z2UtPm1haW5GcmFtZSgpOwogICAgIGlmIChsb2FkZXItPmZyYW1lKCkgPT0gbWFpbkZyYW1lKSB7 CiAgICAgICAgIGlmIChJbnNwZWN0b3JDb25zb2xlQWdlbnQqIGNvbnNvbGVBZ2VudCA9IGluc3Ry dW1lbnRpbmdBZ2VudHMtPmluc3BlY3RvckNvbnNvbGVBZ2VudCgpKQotICAgICAgICAgICAgY29u c29sZUFnZW50LT5yZXNldCgpOworICAgICAgICAgICAgY29uc29sZUFnZW50LT5mcmFtZU5hdmln YXRlZCgpOwogI2lmIEVOQUJMRShKQVZBU0NSSVBUX0RFQlVHR0VSKQogICAgICAgICBpZiAoSW5z cGVjdG9yRGVidWdnZXJBZ2VudCogZGVidWdnZXJBZ2VudCA9IGluc3RydW1lbnRpbmdBZ2VudHMt Pmluc3BlY3RvckRlYnVnZ2VyQWdlbnQoKSkgewogICAgICAgICAgICAgS1VSTCB1cmwgPSBpbnNw ZWN0b3JBZ2VudC0+aW5zcGVjdGVkVVJMV2l0aG91dEZyYWdtZW50KCk7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGVWaWV3LmpzIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db25zb2xlVmlldy5qcwppbmRleCBhZWRiY2Vm OTM4NzI1MDdlZDMwYTM5YzU5MTIyZGU3YWNjZTM0YTc4Li4zZDllZDA0Y2UzNDc2NDhlZTE3YmEz NTU5NDkzZDQwYWJmMTNiYTBhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL0NvbnNvbGVWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvQ29uc29sZVZpZXcuanMKQEAgLTE1MCw2ICsxNTAsMTIgQEAgV2ViSW5zcGVjdG9y LkNvbnNvbGVWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHsKICAgICAgICAgICAgICAg ICBjb25zb2xlLmNsZWFyTWVzc2FnZXMoKTsKICAgICAgICAgICAgIH0sCisKKyAgICAgICAgICAg IGZyYW1lTmF2aWdhdGVkOiBmdW5jdGlvbigpCisgICAgICAgICAgICB7CisgICAgICAgICAgICAg ICAgaWYgKCFXZWJJbnNwZWN0b3IucHJlc2VydmVMb2cpCisgICAgICAgICAgICAgICAgICAgIGNv bnNvbGUucmVxdWVzdENsZWFyTWVzc2FnZXMoKTsKKyAgICAgICAgICAgIH0sCiAgICAgICAgIH0K ICAgICAgICAgSW5zcGVjdG9yQmFja2VuZC5yZWdpc3RlckRvbWFpbkRpc3BhdGNoZXIoIkNvbnNv bGUiLCBkaXNwYXRjaGVyKTsKICAgICB9LApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9OZXR3b3JrUGFuZWwuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL05ldHdvcmtQYW5lbC5qcwppbmRleCAzOGYzMjExNDkxMGMyNGU4NWU1NDg4 MmE3ZmE4YjYyNjFjY2NkMTVhLi45YmU4YWIwZDcwZjJjNzBhN2MyN2E5NDgwYTgyYWE4ZDFmOTRi YjdkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdv cmtQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdv cmtQYW5lbC5qcwpAQCAtMTA1LDcgKzEwNSw3IEBAIFdlYkluc3BlY3Rvci5OZXR3b3JrUGFuZWwu cHJvdG90eXBlID0gewogCiAgICAgZ2V0IHN0YXR1c0Jhckl0ZW1zKCkKICAgICB7Ci0gICAgICAg IHJldHVybiBbdGhpcy5fbGFyZ2VyUmVzb3VyY2VzQnV0dG9uLmVsZW1lbnQsIHRoaXMuX3ByZXNl cnZlTG9nVG9nZ2xlLmVsZW1lbnQsIHRoaXMuX2NsZWFyQnV0dG9uLmVsZW1lbnQsIHRoaXMuX2Zp bHRlckJhckVsZW1lbnRdOworICAgICAgICByZXR1cm4gW3RoaXMuX2xhcmdlclJlc291cmNlc0J1 dHRvbi5lbGVtZW50LCB0aGlzLl9jbGVhckJ1dHRvbi5lbGVtZW50LCB0aGlzLl9maWx0ZXJCYXJF bGVtZW50XTsKICAgICB9LAogCiAgICAgaXNDYXRlZ29yeVZpc2libGU6IGZ1bmN0aW9uKGNhdGVn b3J5TmFtZSkKQEAgLTYwNyw5ICs2MDcsNiBAQCBXZWJJbnNwZWN0b3IuTmV0d29ya1BhbmVsLnBy b3RvdHlwZSA9IHsKIAogICAgIF9jcmVhdGVTdGF0dXNiYXJCdXR0b25zOiBmdW5jdGlvbigpCiAg ICAgewotICAgICAgICB0aGlzLl9wcmVzZXJ2ZUxvZ1RvZ2dsZSA9IG5ldyBXZWJJbnNwZWN0b3Iu U3RhdHVzQmFyQnV0dG9uKFdlYkluc3BlY3Rvci5VSVN0cmluZygiUHJlc2VydmUgTG9nIHVwb24g TmF2aWdhdGlvbiIpLCAicmVjb3JkLXByb2ZpbGUtc3RhdHVzLWJhci1pdGVtIik7Ci0gICAgICAg IHRoaXMuX3ByZXNlcnZlTG9nVG9nZ2xlLmFkZEV2ZW50TGlzdGVuZXIoImNsaWNrIiwgdGhpcy5f b25QcmVzZXJ2ZUxvZ0NsaWNrZWQuYmluZCh0aGlzKSwgZmFsc2UpOwotCiAgICAgICAgIHRoaXMu X2NsZWFyQnV0dG9uID0gbmV3IFdlYkluc3BlY3Rvci5TdGF0dXNCYXJCdXR0b24oV2ViSW5zcGVj dG9yLlVJU3RyaW5nKCJDbGVhciIpLCAiY2xlYXItc3RhdHVzLWJhci1pdGVtIik7CiAgICAgICAg IHRoaXMuX2NsZWFyQnV0dG9uLmFkZEV2ZW50TGlzdGVuZXIoImNsaWNrIiwgdGhpcy5fcmVzZXQu YmluZCh0aGlzKSwgZmFsc2UpOwogCkBAIC03MTcsMTEgKzcxNCw2IEBAIFdlYkluc3BlY3Rvci5O ZXR3b3JrUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICAgICAgdGhpcy5fZGF0YUdyaWQuc2Ny b2xsVG9MYXN0Um93KCk7CiAgICAgfSwKIAotICAgIF9vblByZXNlcnZlTG9nQ2xpY2tlZDogZnVu Y3Rpb24oZSkKLSAgICB7Ci0gICAgICAgIHRoaXMuX3ByZXNlcnZlTG9nVG9nZ2xlLnRvZ2dsZWQg PSAhdGhpcy5fcHJlc2VydmVMb2dUb2dnbGUudG9nZ2xlZDsKLSAgICB9LAotCiAgICAgX3Jlc2V0 OiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICB0aGlzLl9wb3BvdmVySGVscGVyLmhpZGVQb3B1 cCgpOwpAQCAtNzk1LDcgKzc4Nyw3IEBAIFdlYkluc3BlY3Rvci5OZXR3b3JrUGFuZWwucHJvdG90 eXBlID0gewogCiAgICAgY2xlYXI6IGZ1bmN0aW9uKCkKICAgICB7Ci0gICAgICAgIGlmICh0aGlz Ll9wcmVzZXJ2ZUxvZ1RvZ2dsZS50b2dnbGVkKQorICAgICAgICBpZiAoV2ViSW5zcGVjdG9yLnBy ZXNlcnZlTG9nKQogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB0aGlzLl9yZXNldCgpOwog ICAgIH0sCkBAIC04MDcsNyArNzk5LDcgQEAgV2ViSW5zcGVjdG9yLk5ldHdvcmtQYW5lbC5wcm90 b3R5cGUgPSB7CiAKICAgICAgICAgdmFyIGxvYWRlcklkID0gZXZlbnQuZGF0YS5sb2FkZXJJZDsK ICAgICAgICAgLy8gTWFpbiBmcmFtZSBjb21taXR0ZWQgbG9hZC4KLSAgICAgICAgaWYgKHRoaXMu X3ByZXNlcnZlTG9nVG9nZ2xlLnRvZ2dsZWQpCisgICAgICAgIGlmIChXZWJJbnNwZWN0b3IucHJl c2VydmVMb2cpCiAgICAgICAgICAgICByZXR1cm47CiAKICAgICAgICAgLy8gUHJlc2VydmUgcHJv dmlzaW9uYWwgbG9hZCByZXNvdXJjZXMuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5jc3MgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL2luc3BlY3Rvci5jc3MKaW5kZXggYmEzYmY2YjQ5OGIyNWRkZDFiZWU2NTc4YWQ0 MDdiNTRjYjZkZjIyMS4uNjRkZTVkNDAzN2QyNjZhY2FlN2QxNmVjMDRlYmIwYTU3YzI2MjA5OSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3Iu Y3NzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmNz cwpAQCAtNTUyLDYgKzU1MiwxNSBAQCBzZWxlY3Quc3RhdHVzLWJhci1pdGVtOmFjdGl2ZSB7CiAg ICAgLXdlYmtpdC1tYXNrLXBvc2l0aW9uOiAwIC00OHB4OwogfQogCisjcHJlc2VydmUtbG9nLXN0 YXR1cy1iYXItaXRlbSAuZ2x5cGggeworICAgIC13ZWJraXQtbWFzay1wb3NpdGlvbjogLTI4OHB4 IDA7Cit9CisKKyNwcmVzZXJ2ZS1sb2ctc3RhdHVzLWJhci1pdGVtLnRvZ2dsZWQtb24gLmdseXBo IHsKKyAgICAtd2Via2l0LW1hc2stcG9zaXRpb246IC0yODhweCAtMjRweDsKKyAgICBiYWNrZ3Jv dW5kLWNvbG9yOiByZ2IoMjE2LCAwLCAwKSAhaW1wb3J0YW50OworfQorCiBib2R5LmRldGFjaGVk ICNkb2NrLXN0YXR1cy1iYXItaXRlbSAuZ2x5cGggewogICAgIC13ZWJraXQtbWFzay1wb3NpdGlv bjogLTMycHggLTI0cHg7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL2luc3BlY3Rvci5odG1sIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9pbnNwZWN0b3IuaHRtbAppbmRleCAwZjM2NjAyNGMzMGYyZTdhNGU0Mjk4NTViYTA5YzBl MzA5YTNmOWU2Li43NWRlODNjZGQ3ZGI2YzEzMTBhN2YwMWQ5ZDAxZDMwMjZkMGViYTRiIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5odG1s CisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmh0bWwK QEAgLTE3OCw3ICsxNzgsNyBAQCBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhF IFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgogICAgIDwvZGl2PgogICAgIDxkaXYgaWQ9Im1h aW4iPgogICAgICAgICA8ZGl2IGlkPSJtYWluLXBhbmVscyIgc3BlbGxjaGVjaz0iZmFsc2UiPjwv ZGl2PgotICAgICAgICA8ZGl2IGlkPSJtYWluLXN0YXR1cy1iYXIiIGNsYXNzPSJzdGF0dXMtYmFy Ij48ZGl2IGlkPSJhbmNob3JlZC1zdGF0dXMtYmFyLWl0ZW1zIj48YnV0dG9uIGlkPSJkb2NrLXN0 YXR1cy1iYXItaXRlbSIgY2xhc3M9InN0YXR1cy1iYXItaXRlbSI+PGRpdiBjbGFzcz0iZ2x5cGgi PjwvZGl2PjxkaXYgY2xhc3M9ImdseXBoIHNoYWRvdyI+PC9kaXY+PC9idXR0b24+PGJ1dHRvbiBp ZD0iY29uc29sZS1zdGF0dXMtYmFyLWl0ZW0iIGNsYXNzPSJzdGF0dXMtYmFyLWl0ZW0iPjxkaXYg Y2xhc3M9ImdseXBoIj48L2Rpdj48ZGl2IGNsYXNzPSJnbHlwaCBzaGFkb3ciPjwvZGl2PjwvYnV0 dG9uPjxkaXYgaWQ9ImNvdW50ZXJzIj48ZGl2IGlkPSJlcnJvci13YXJuaW5nLWNvdW50IiBjbGFz cz0iaGlkZGVuIj48L2Rpdj48L2Rpdj48L2Rpdj48L2Rpdj4KKyAgICAgICAgPGRpdiBpZD0ibWFp bi1zdGF0dXMtYmFyIiBjbGFzcz0ic3RhdHVzLWJhciI+PGRpdiBpZD0iYW5jaG9yZWQtc3RhdHVz LWJhci1pdGVtcyI+PGJ1dHRvbiBpZD0iZG9jay1zdGF0dXMtYmFyLWl0ZW0iIGNsYXNzPSJzdGF0 dXMtYmFyLWl0ZW0iPjxkaXYgY2xhc3M9ImdseXBoIj48L2Rpdj48ZGl2IGNsYXNzPSJnbHlwaCBz aGFkb3ciPjwvZGl2PjwvYnV0dG9uPjxidXR0b24gaWQ9ImNvbnNvbGUtc3RhdHVzLWJhci1pdGVt IiBjbGFzcz0ic3RhdHVzLWJhci1pdGVtIj48ZGl2IGNsYXNzPSJnbHlwaCI+PC9kaXY+PGRpdiBj bGFzcz0iZ2x5cGggc2hhZG93Ij48L2Rpdj48L2J1dHRvbj48YnV0dG9uIGlkPSJwcmVzZXJ2ZS1s b2ctc3RhdHVzLWJhci1pdGVtIiBjbGFzcz0ic3RhdHVzLWJhci1pdGVtIj48ZGl2IGNsYXNzPSJn bHlwaCI+PC9kaXY+PGRpdiBjbGFzcz0iZ2x5cGggc2hhZG93Ij48L2Rpdj48L2J1dHRvbj48ZGl2 IGlkPSJjb3VudGVycyI+PGRpdiBpZD0iZXJyb3Itd2FybmluZy1jb3VudCIgY2xhc3M9ImhpZGRl biI+PC9kaXY+PC9kaXY+PC9kaXY+PC9kaXY+CiAgICAgPC9kaXY+CiAgICAgPGRpdiBpZD0iZHJh d2VyIj4KICAgICAgICAgPGRpdiBpZD0iY29uc29sZS12aWV3Ij48ZGl2IGlkPSJjb25zb2xlLW1l c3NhZ2VzIiBjbGFzcz0ibW9ub3NwYWNlIj48ZGl2IGlkPSJjb25zb2xlLXByb21wdCIgc3BlbGxj aGVjaz0iZmFsc2UiPjxicj48L2Rpdj48L2Rpdj48L2Rpdj4KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMKaW5kZXggY2ExY2M4Yjg2ZTVkZmRhMzlk MzRlODE0ZmViYzBkZmY2OTBlNTNjOS4uZWZlMjRiNmFiYjU0MjFlNGQ3YTRjODU5N2EwYjY5MGJh NmEyNjE0OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9p bnNwZWN0b3IuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNw ZWN0b3IuanMKQEAgLTIxMSw2ICsyMTEsMjUgQEAgdmFyIFdlYkluc3BlY3RvciA9IHsKICAgICAg ICAgICAgIFdlYkluc3BlY3Rvci5zZWFyY2hDb250cm9sbGVyLnVwZGF0ZVNlYXJjaExhYmVsKCk7 CiAgICAgfSwKIAorICAgIGdldCBwcmVzZXJ2ZUxvZygpCisgICAgeworICAgICAgICByZXR1cm4g dGhpcy5fcHJlc2VydmVMb2c7CisgICAgfSwKKworICAgIHNldCBwcmVzZXJ2ZUxvZyh4KQorICAg IHsKKyAgICAgICAgdGhpcy5fcHJlc2VydmVMb2cgPSB4OworICAgICAgICBpZiAoeCkKKyAgICAg ICAgICAgIHRoaXMuX3ByZXNlcnZlTG9nQnV0dG9uLmFkZFN0eWxlQ2xhc3MoInRvZ2dsZWQtb24i KTsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAgdGhpcy5fcHJlc2VydmVMb2dCdXR0b24ucmVt b3ZlU3R5bGVDbGFzcygidG9nZ2xlZC1vbiIpOworICAgIH0sCisKKyAgICBfcHJlc2VydmVMb2dD bGlja2VkOiBmdW5jdGlvbigpCisgICAgeworICAgICAgICB0aGlzLnByZXNlcnZlTG9nID0gIXRo aXMucHJlc2VydmVMb2c7CisgICAgfSwKKwogICAgIGdldCBlcnJvcnMoKQogICAgIHsKICAgICAg ICAgcmV0dXJuIHRoaXMuX2Vycm9ycyB8fCAwOwpAQCAtNDc4LDYgKzQ5NywxMSBAQCBXZWJJbnNw ZWN0b3IuZG9Mb2FkZWREb25lID0gZnVuY3Rpb24oKQogICAgIGVsc2UKICAgICAgICAgZG9ja1Rv Z2dsZUJ1dHRvbi50aXRsZSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiRG9jayB0byBtYWluIHdp bmRvdy4iKTsKIAorICAgIHRoaXMuX3ByZXNlcnZlTG9nID0gZmFsc2U7CisgICAgdGhpcy5fcHJl c2VydmVMb2dCdXR0b24gPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgicHJlc2VydmUtbG9nLXN0 YXR1cy1iYXItaXRlbSIpOworICAgIHRoaXMuX3ByZXNlcnZlTG9nQnV0dG9uLnRpdGxlID0gV2Vi SW5zcGVjdG9yLlVJU3RyaW5nKCJQcmVzZXJ2ZSBMb2cgdXBvbiBOYXZpZ2F0aW9uIik7CisgICAg dGhpcy5fcHJlc2VydmVMb2dCdXR0b24uYWRkRXZlbnRMaXN0ZW5lcigiY2xpY2siLCB0aGlzLl9w cmVzZXJ2ZUxvZ0NsaWNrZWQuYmluZCh0aGlzKSwgZmFsc2UpOworCiAgICAgdmFyIGVycm9yV2Fy bmluZ0NvdW50ID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoImVycm9yLXdhcm5pbmctY291bnQi KTsKICAgICBlcnJvcldhcm5pbmdDb3VudC5hZGRFdmVudExpc3RlbmVyKCJjbGljayIsIHRoaXMu c2hvd0NvbnNvbGUuYmluZCh0aGlzKSwgZmFsc2UpOwogICAgIHRoaXMuX3VwZGF0ZUVycm9yQW5k V2FybmluZ0NvdW50cygpOwpAQCAtOTgyLDcgKzEwMDYsOCBAQCBXZWJJbnNwZWN0b3IucmVzZXQg PSBmdW5jdGlvbigpCiAgICAgdGhpcy5yZXNvdXJjZXMgPSB7fTsKICAgICB0aGlzLmhpZ2hsaWdo dERPTU5vZGUoMCk7CiAKLSAgICB0aGlzLmNvbnNvbGUuY2xlYXJNZXNzYWdlcygpOworICAgIGlm ICghdGhpcy5wcmVzZXJ2ZUxvZykKKyAgICAgICAgdGhpcy5jb25zb2xlLmNsZWFyTWVzc2FnZXMo KTsKICAgICB0aGlzLmV4dGVuc2lvblNlcnZlci5ub3RpZnlJbnNwZWN0b3JSZXNldCgpOwogICAg IGlmICh0aGlzLndvcmtlck1hbmFnZXIpCiAgICAgICAgIHRoaXMud29ya2VyTWFuYWdlci5yZXNl dCgpOwo= 96666 2011-06-09 17:09:25 -0700 2011-06-14 09:19:38 -0700 Moves setting to context menu, clears backend messages bug-53359-20110609170924.patch text/plain 5749 sreeram U3VidmVyc2lvbiBSZXZpc2lvbjogODg0OTcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBkM2Y3NWIzN2VmNGY0NmI2 NzBiN2YzNzY2NWE4M2M5NzJmMTcwYjhlLi5lNTBlMzc2ZjNkNTU5MTMxMWEyNGEzY2FiNzk0ZWUx MWE4MWY2MmRjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjkgQEAKKzIwMTEtMDYtMDkgIFNyZWVy YW0gUmFtYWNoYW5kcmFuICA8c3JlZXJhbUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogQWxsb3cgdGhl IGNvbnNvbGUgdG8gcGVyc2lzdCBvbiBwYWdlIHJlZnJlc2ggb3IgbmF2aWdhdGlvbgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTMzNTkKKworICAgICAg ICBBZGRzIGEgY29udGV4dCBtZW51IGNoZWNrYm94IHRvIHByZXNlcnZlIHRoZSBjb25zb2xlIGxv ZyBhY3Jvc3MKKyAgICAgICAgbmF2aWdhdGlvbnMuIEhvd2V2ZXIsIHRoZSB1bmRlcmx5aW5nIG1l c3NhZ2VzIGFuZCBvYmplY3RzIGFyZSBhY3R1YWxseQorICAgICAgICBkZWxldGVkIGZyb20gdGhl IGJhY2tlbmQsIHNvIHRoZXkgYXJlIG5vdCBleHBhbmRhYmxlOyB0aGVpciBjb250aW51ZWQKKyAg ICAgICAgZGlzcGxheSBpbiB0aGUgY29uc29sZSBmcm9udGVuZCBpcyBtZXJlbHkgY29zbWV0aWMu CisKKyAgICAgICAgTm8gbmV3IHRlc3RzLiAoT09QUyEpCisKKyAgICAgICAgKiBpbnNwZWN0b3Iv ZnJvbnQtZW5kL0NvbnNvbGVWaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvbnNvbGVW aWV3LnByb3RvdHlwZS5fcmVnaXN0ZXJDb25zb2xlRG9tYWluRGlzcGF0Y2hlci5kaXNwYXRjaGVy Lm1lc3NhZ2VzQ2xlYXJlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ29uc29sZVZpZXcucHJv dG90eXBlLl9yZWdpc3RlckNvbnNvbGVEb21haW5EaXNwYXRjaGVyKToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5Db25zb2xlVmlldy5wcm90b3R5cGUucmVxdWVzdENsZWFyTWVzc2FnZXMpOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLkNvbnNvbGVWaWV3LnByb3RvdHlwZS5faGFuZGxlQ29udGV4dE1l bnVFdmVudC5tb25pdG9yaW5nWEhSSXRlbUFjdGlvbik6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu Q29uc29sZVZpZXcucHJvdG90eXBlLl9oYW5kbGVDb250ZXh0TWVudUV2ZW50LnByZXNlcnZlTG9n SXRlbUFjdGlvbik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ29uc29sZVZpZXcucHJvdG90eXBl Ll9oYW5kbGVDb250ZXh0TWVudUV2ZW50KToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5k L1NldHRpbmdzLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNldHRpbmdzKToKKyAgICAgICAg KiBpbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5yZXNldCk6CisKIDIwMTEtMDYtMDkgIEphbWVzIFJvYmluc29uICA8amFtZXNyQGNocm9taXVt Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBLZW5uZXRoIFJ1c3NlbGwuCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGVWaWV3LmpzIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db25zb2xlVmlldy5qcwppbmRleCBhZWRi Y2VmOTM4NzI1MDdlZDMwYTM5YzU5MTIyZGU3YWNjZTM0YTc4Li5kNTFhMTE3MTYwMDE2YjI3YzAw ZmQ3NWQzYTEwNjQwMjY2OTVhZjE5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL0NvbnNvbGVWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvQ29uc29sZVZpZXcuanMKQEAgLTE0OCw3ICsxNDgsOCBAQCBXZWJJbnNwZWN0 b3IuQ29uc29sZVZpZXcucHJvdG90eXBlID0gewogCiAgICAgICAgICAgICBtZXNzYWdlc0NsZWFy ZWQ6IGZ1bmN0aW9uKCkKICAgICAgICAgICAgIHsKLSAgICAgICAgICAgICAgICBjb25zb2xlLmNs ZWFyTWVzc2FnZXMoKTsKKyAgICAgICAgICAgICAgICBpZiAoIVdlYkluc3BlY3Rvci5zZXR0aW5n cy5wcmVzZXJ2ZUNvbnNvbGVMb2cpCisgICAgICAgICAgICAgICAgICAgIGNvbnNvbGUuY2xlYXJN ZXNzYWdlcygpOwogICAgICAgICAgICAgfSwKICAgICAgICAgfQogICAgICAgICBJbnNwZWN0b3JC YWNrZW5kLnJlZ2lzdGVyRG9tYWluRGlzcGF0Y2hlcigiQ29uc29sZSIsIGRpc3BhdGNoZXIpOwpA QCAtMzI3LDYgKzMyOCw3IEBAIFdlYkluc3BlY3Rvci5Db25zb2xlVmlldy5wcm90b3R5cGUgPSB7 CiAgICAgcmVxdWVzdENsZWFyTWVzc2FnZXM6IGZ1bmN0aW9uKCkKICAgICB7CiAgICAgICAgIENv bnNvbGVBZ2VudC5jbGVhckNvbnNvbGVNZXNzYWdlcygpOworICAgICAgICB0aGlzLmNsZWFyTWVz c2FnZXMoKTsKICAgICB9LAogCiAgICAgY2xlYXJNZXNzYWdlczogZnVuY3Rpb24oKQpAQCAtNDQ5 LDEyICs0NTEsMTkgQEAgV2ViSW5zcGVjdG9yLkNvbnNvbGVWaWV3LnByb3RvdHlwZSA9IHsKICAg ICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQogCi0gICAgICAgIHZhciBpdGVtQWN0aW9uID0g ZnVuY3Rpb24gKCkgeworICAgICAgICB2YXIgY29udGV4dE1lbnUgPSBuZXcgV2ViSW5zcGVjdG9y LkNvbnRleHRNZW51KCk7CisKKyAgICAgICAgdmFyIG1vbml0b3JpbmdYSFJJdGVtQWN0aW9uID0g ZnVuY3Rpb24gKCkgewogICAgICAgICAgICAgV2ViSW5zcGVjdG9yLnNldHRpbmdzLm1vbml0b3Jp bmdYSFJFbmFibGVkID0gIVdlYkluc3BlY3Rvci5zZXR0aW5ncy5tb25pdG9yaW5nWEhSRW5hYmxl ZDsKICAgICAgICAgICAgIENvbnNvbGVBZ2VudC5zZXRNb25pdG9yaW5nWEhSRW5hYmxlZChXZWJJ bnNwZWN0b3Iuc2V0dGluZ3MubW9uaXRvcmluZ1hIUkVuYWJsZWQpOwogICAgICAgICB9LmJpbmQo dGhpcyk7Ci0gICAgICAgIHZhciBjb250ZXh0TWVudSA9IG5ldyBXZWJJbnNwZWN0b3IuQ29udGV4 dE1lbnUoKTsKLSAgICAgICAgY29udGV4dE1lbnUuYXBwZW5kQ2hlY2tib3hJdGVtKFdlYkluc3Bl Y3Rvci5VSVN0cmluZyhXZWJJbnNwZWN0b3IudXNlTG93ZXJDYXNlTWVudVRpdGxlcygpID8gIlhN TEh0dHBSZXF1ZXN0IGxvZ2dpbmciIDogIlhNTEh0dHBSZXF1ZXN0IExvZ2dpbmciKSwgaXRlbUFj dGlvbiwgV2ViSW5zcGVjdG9yLnNldHRpbmdzLm1vbml0b3JpbmdYSFJFbmFibGVkKQorICAgICAg ICBjb250ZXh0TWVudS5hcHBlbmRDaGVja2JveEl0ZW0oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKFdl Ykluc3BlY3Rvci51c2VMb3dlckNhc2VNZW51VGl0bGVzKCkgPyAiWE1MSHR0cFJlcXVlc3QgbG9n Z2luZyIgOiAiWE1MSHR0cFJlcXVlc3QgTG9nZ2luZyIpLCBtb25pdG9yaW5nWEhSSXRlbUFjdGlv biwgV2ViSW5zcGVjdG9yLnNldHRpbmdzLm1vbml0b3JpbmdYSFJFbmFibGVkKTsKKworICAgICAg ICB2YXIgcHJlc2VydmVMb2dJdGVtQWN0aW9uID0gZnVuY3Rpb24gKCkgeworICAgICAgICAgICAg V2ViSW5zcGVjdG9yLnNldHRpbmdzLnByZXNlcnZlQ29uc29sZUxvZyA9ICFXZWJJbnNwZWN0b3Iu c2V0dGluZ3MucHJlc2VydmVDb25zb2xlTG9nOworICAgICAgICB9LmJpbmQodGhpcyk7CisgICAg ICAgIGNvbnRleHRNZW51LmFwcGVuZENoZWNrYm94SXRlbShXZWJJbnNwZWN0b3IuVUlTdHJpbmco V2ViSW5zcGVjdG9yLnVzZUxvd2VyQ2FzZU1lbnVUaXRsZXMoKSA/ICJQcmVzZXJ2ZSBsb2ciIDog IlByZXNlcnZlIExvZyIpLCBwcmVzZXJ2ZUxvZ0l0ZW1BY3Rpb24sIFdlYkluc3BlY3Rvci5zZXR0 aW5ncy5wcmVzZXJ2ZUNvbnNvbGVMb2cpOworCiAgICAgICAgIGNvbnRleHRNZW51LmFwcGVuZEl0 ZW0oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKFdlYkluc3BlY3Rvci51c2VMb3dlckNhc2VNZW51VGl0 bGVzKCkgPyAiQ2xlYXIgY29uc29sZSIgOiAiQ2xlYXIgQ29uc29sZSIpLCB0aGlzLnJlcXVlc3RD bGVhck1lc3NhZ2VzLmJpbmQodGhpcykpOwogICAgICAgICBjb250ZXh0TWVudS5zaG93KGV2ZW50 KTsKICAgICB9LApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9TZXR0aW5ncy5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2V0dGlu Z3MuanMKaW5kZXggNzMwMDYxYWIzY2IwMWQyYmNhZjgwOWMxY2UzMzViY2NhYTc0MTg2YS4uOTM5 NGI4ODgyMjFkMGJiOWM5YzM0MmM3Njk4YjZlYTZiM2E4MTNlZiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TZXR0aW5ncy5qcworKysgYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NldHRpbmdzLmpzCkBAIC02Niw2ICs2Niw3IEBAIFdl Ykluc3BlY3Rvci5TZXR0aW5ncyA9IGZ1bmN0aW9uKCkKICAgICB0aGlzLmluc3RhbGxBcHBsaWNh dGlvblNldHRpbmcoImxhc3RBY3RpdmVQYW5lbCIsICJlbGVtZW50cyIpOwogICAgIHRoaXMuaW5z dGFsbEFwcGxpY2F0aW9uU2V0dGluZygibGFzdFZpZXdlZFNjcmlwdEZpbGUiLCAiYXBwbGljYXRp b24iKTsKICAgICB0aGlzLmluc3RhbGxBcHBsaWNhdGlvblNldHRpbmcoIm1vbml0b3JpbmdYSFJF bmFibGVkIiwgZmFsc2UpOworICAgIHRoaXMuaW5zdGFsbEFwcGxpY2F0aW9uU2V0dGluZygicHJl c2VydmVDb25zb2xlTG9nIiwgZmFsc2UpOwogICAgIHRoaXMuaW5zdGFsbEFwcGxpY2F0aW9uU2V0 dGluZygicGF1c2VPbkV4Y2VwdGlvblN0YXRlU3RyaW5nIiwgV2ViSW5zcGVjdG9yLlNjcmlwdHNQ YW5lbC5QYXVzZU9uRXhjZXB0aW9uc1N0YXRlLkRvbnRQYXVzZU9uRXhjZXB0aW9ucyk7CiAgICAg dGhpcy5pbnN0YWxsQXBwbGljYXRpb25TZXR0aW5nKCJyZXNvdXJjZXNMYXJnZVJvd3MiLCB0cnVl KTsKICAgICB0aGlzLmluc3RhbGxBcHBsaWNhdGlvblNldHRpbmcoInJlc291cmNlc1NvcnRPcHRp b25zIiwge3RpbWVPcHRpb246ICJyZXNwb25zZVRpbWUiLCBzaXplT3B0aW9uOiAidHJhbnNmZXJT aXplIn0pOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9p bnNwZWN0b3IuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rv ci5qcwppbmRleCBjYTFjYzhiODZlNWRmZGEzOWQzNGU4MTRmZWJjMGRmZjY5MGU1M2M5Li5iYzY2 ZjUwZTBhYjU0YWZhMmM0ZjU5ZGY5YmFiOWI4NmE2MjNiYjRkIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcworKysgYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcwpAQCAtOTgyLDcgKzk4Miw4IEBA IFdlYkluc3BlY3Rvci5yZXNldCA9IGZ1bmN0aW9uKCkKICAgICB0aGlzLnJlc291cmNlcyA9IHt9 OwogICAgIHRoaXMuaGlnaGxpZ2h0RE9NTm9kZSgwKTsKIAotICAgIHRoaXMuY29uc29sZS5jbGVh ck1lc3NhZ2VzKCk7CisgICAgaWYgKCFXZWJJbnNwZWN0b3Iuc2V0dGluZ3MucHJlc2VydmVDb25z b2xlTG9nKQorICAgICAgICB0aGlzLmNvbnNvbGUuY2xlYXJNZXNzYWdlcygpOwogICAgIHRoaXMu ZXh0ZW5zaW9uU2VydmVyLm5vdGlmeUluc3BlY3RvclJlc2V0KCk7CiAgICAgaWYgKHRoaXMud29y a2VyTWFuYWdlcikKICAgICAgICAgdGhpcy53b3JrZXJNYW5hZ2VyLnJlc2V0KCk7Cg== 97129 2011-06-14 09:19:43 -0700 2011-06-14 10:03:49 -0700 Added message to localizedStrings and a test bug-53359-20110614091942.patch text/plain 8505 sreeram U3VidmVyc2lvbiBSZXZpc2lvbjogODg3OTkKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA4ZmE4NmMwZDJhNjUzOTYxNGYyOGQx ODVkNDI0YTJlYjFkNGViNjU1Li41NDQ5ZmUzMTQ1ZGI0Nzc4OTE2NGJiMTQwYzViMjNlNzI3NmVi NjNlIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTEtMDYtMTQgIFNyZWVyYW0gUmFtYWNoYW5k cmFuICA8c3JlZXJhbUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogQWxsb3cgdGhlIGNvbnNvbGUgdG8g cGVyc2lzdCBvbiBwYWdlIHJlZnJlc2ggb3IgbmF2aWdhdGlvbgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTMzNTkKKworICAgICAgICBUZXN0cyB0aGF0 IGNvbnNvbGUgbWVzc2FnZXMgYXJlIHByZXNlcnZlZCB1cG9uIG5hdmlnYXRpb24uCisKKyAgICAg ICAgKiBpbnNwZWN0b3IvY29uc29sZS9jb25zb2xlLXByZXNlcnZlLWxvZy1leHBlY3RlZC50eHQ6 IEFkZGVkLgorICAgICAgICAqIGluc3BlY3Rvci9jb25zb2xlL2NvbnNvbGUtcHJlc2VydmUtbG9n Lmh0bWw6IEFkZGVkLgorCiAyMDExLTA2LTE0ICBZYWVsIEFoYXJvbiAgPHlhZWwuYWhhcm9uQG5v a2lhLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBLZW50IFRhbXVyYS4KZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL2luc3BlY3Rvci9jb25zb2xlL2NvbnNvbGUtcHJlc2VydmUtbG9nLWV4cGVj dGVkLnR4dCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9jb25zb2xlL2NvbnNvbGUtcHJlc2VydmUt bG9nLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi41NjFkNjg1MjU1MDExYzE3OGFhOWJjMDFiZjAz MjQ3OTgwYWE2ZDk5Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2Nv bnNvbGUvY29uc29sZS1wcmVzZXJ2ZS1sb2ctZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsNSBAQAor VGVzdHMgdGhhdCB0aGUgY29uc29sZSBjYW4gcHJlc2VydmUgbG9nIG1lc3NhZ2VzIGFjcm9zcyBu YXZpZ2F0aW9ucy4gQnVnIDUzMzU5CisKK1BhZ2UgcmVsb2FkZWQuCitQQVNTCisKZGlmZiAtLWdp dCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9jb25zb2xlL2NvbnNvbGUtcHJlc2VydmUtbG9nLmh0 bWwgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvY29uc29sZS9jb25zb2xlLXByZXNlcnZlLWxvZy5o dG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAuLmY0NTc4NDc0NDFiZmQ1MWNjNzg3OTMzZGI5MTVlNzVkN2ZkNTNlMzYK LS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvY29uc29sZS9jb25zb2xl LXByZXNlcnZlLWxvZy5odG1sCkBAIC0wLDAgKzEsMjUgQEAKKzxodG1sPgorPGhlYWQ+Cis8c2Ny aXB0IHNyYz0iLi4vLi4vaHR0cC90ZXN0cy9pbnNwZWN0b3IvaW5zcGVjdG9yLXRlc3QuanMiPjwv c2NyaXB0PgorPHNjcmlwdCBzcmM9Ii4uLy4uL2h0dHAvdGVzdHMvaW5zcGVjdG9yL2NvbnNvbGUt dGVzdC5qcyI+PC9zY3JpcHQ+Cis8c2NyaXB0PgorZnVuY3Rpb24gdGVzdCgpCit7CisgICAgV2Vi SW5zcGVjdG9yLmNvbnNvbGUuYWRkTWVzc2FnZSgKKyAgICAgICAgV2ViSW5zcGVjdG9yLkNvbnNv bGVNZXNzYWdlLmNyZWF0ZVRleHRNZXNzYWdlKCJQQVNTIikpOworICAgIFdlYkluc3BlY3Rvci5z ZXR0aW5ncy5wcmVzZXJ2ZUNvbnNvbGVMb2cgPSB0cnVlOworICAgIEluc3BlY3RvclRlc3QucmVs b2FkUGFnZShmdW5jdGlvbigpIHsKKyAgICAgICAgSW5zcGVjdG9yVGVzdC5kdW1wQ29uc29sZU1l c3NhZ2VzKCk7CisgICAgICAgIFdlYkluc3BlY3Rvci5zZXR0aW5ncy5wcmVzZXJ2ZUNvbnNvbGVM b2cgPSBmYWxzZTsKKyAgICAgICAgSW5zcGVjdG9yVGVzdC5jb21wbGV0ZVRlc3QoKTsKKyAgICB9 KTsKK30KKzwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHkgb25sb2FkPSJydW5UZXN0KCkiPgorPHA+ CitUZXN0cyB0aGF0IHRoZSBjb25zb2xlIGNhbiBwcmVzZXJ2ZSBsb2cgbWVzc2FnZXMgYWNyb3Nz IG5hdmlnYXRpb25zLgorPGEgaHJlZj0iaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTUzMzU5Ij5CdWcgNTMzNTk8L2E+Cis8L3A+Cis8L2JvZHk+Cis8L2h0bWw+CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VM b2cKaW5kZXggMWM4MzE2NmMyYzM2NjI5ZDFlOThmNWI0YThjNzU4Yjc2OGM2MTNiMy4uZjk4OGQ2 NGM0MGEzYWJmYjQ5OTlkZDc5MGFkMjVmNjU2MDkzZWNmYSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsx LDMwIEBACisyMDExLTA2LTE0ICBTcmVlcmFtIFJhbWFjaGFuZHJhbiAgPHNyZWVyYW1AY2hyb21p dW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFdlYiBJbnNwZWN0b3I6IEFsbG93IHRoZSBjb25zb2xlIHRvIHBlcnNpc3Qgb24gcGFnZSByZWZy ZXNoIG9yIG5hdmlnYXRpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTUzMzU5CisKKyAgICAgICAgQWRkcyBhIGNvbnRleHQgbWVudSBjaGVja2JveCB0 byBwcmVzZXJ2ZSB0aGUgY29uc29sZSBsb2cgYWNyb3NzCisgICAgICAgIG5hdmlnYXRpb25zLiBI b3dldmVyLCB0aGUgdW5kZXJseWluZyBtZXNzYWdlcyBhbmQgb2JqZWN0cyBhcmUgYWN0dWFsbHkK KyAgICAgICAgZGVsZXRlZCBmcm9tIHRoZSBiYWNrZW5kLCBzbyB0aGV5IGFyZSBub3QgZXhwYW5k YWJsZTsgdGhlaXIgY29udGludWVkCisgICAgICAgIGRpc3BsYXkgaW4gdGhlIGNvbnNvbGUgZnJv bnRlbmQgaXMgbWVyZWx5IGNvc21ldGljLgorCisgICAgICAgIFRlc3Q6IGluc3BlY3Rvci9jb25z b2xlL2NvbnNvbGUtcHJlc2VydmUtbG9nLmh0bWwKKworICAgICAgICAqIEVuZ2xpc2gubHByb2ov bG9jYWxpemVkU3RyaW5ncy5qczoKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnNv bGVWaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvbnNvbGVWaWV3LnByb3RvdHlwZS5f cmVnaXN0ZXJDb25zb2xlRG9tYWluRGlzcGF0Y2hlci5kaXNwYXRjaGVyLm1lc3NhZ2VzQ2xlYXJl ZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ29uc29sZVZpZXcucHJvdG90eXBlLl9yZWdpc3Rl ckNvbnNvbGVEb21haW5EaXNwYXRjaGVyKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db25zb2xl Vmlldy5wcm90b3R5cGUucmVxdWVzdENsZWFyTWVzc2FnZXMpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLkNvbnNvbGVWaWV3LnByb3RvdHlwZS5faGFuZGxlQ29udGV4dE1lbnVFdmVudC5tb25pdG9y aW5nWEhSSXRlbUFjdGlvbik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ29uc29sZVZpZXcucHJv dG90eXBlLl9oYW5kbGVDb250ZXh0TWVudUV2ZW50LnByZXNlcnZlTG9nSXRlbUFjdGlvbik6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuQ29uc29sZVZpZXcucHJvdG90eXBlLl9oYW5kbGVDb250ZXh0 TWVudUV2ZW50KToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1NldHRpbmdzLmpzOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLlNldHRpbmdzKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJv bnQtZW5kL2luc3BlY3Rvci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5yZXNldCk6CisKIDIw MTEtMDYtMTQgIFRvbW15IFdpZGVuZmx5Y2h0ICA8dG9tbXl3QGdvb2dsZS5jb20+CiAKICAgICAg ICAgUmV2aWV3ZWQgYnkgVG9ueSBHZW50aWxjb3JlLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvRW5nbGlzaC5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzIGIvU291cmNlL1dlYkNvcmUvRW5n bGlzaC5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzCmluZGV4IDQ1YjYxOTMzNDdkYmE3NDg1MmVk Nzk0ZjMxZTE0MThiMjFhNzdiMGUuLmQwYjU0MmNiZGY5MTlmYjc5YzkyN2FhYmJjMmE2NmU1MzU3 MTM1M2UgMTAwNjQ0CkdJVCBiaW5hcnkgcGF0Y2gKZGVsdGEgOTMKemNtY2F+akN0TSg8XyRyUUN3 bmxmUFJAVjhIcmYxdyZ9N3ZNRHdDRGp3THBDOVZ1bjxQQjhEO2BzbGJyS2trNjNMCllwdWBYaFda TUY8NTw+dGBFfG1lQjhmeWtGMEV4TzZAYztrLQoKZGVsdGEgOQpRY21iUHRnODktaDxfJHJRMFRA e1g+SHEpJAoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv Q29uc29sZVZpZXcuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnNv bGVWaWV3LmpzCmluZGV4IGFlZGJjZWY5Mzg3MjUwN2VkMzBhMzljNTkxMjJkZTdhY2NlMzRhNzgu LmQ1MWExMTcxNjAwMTZiMjdjMDBmZDc1ZDNhMTA2NDAyNjY5NWFmMTkgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29uc29sZVZpZXcuanMKKysrIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db25zb2xlVmlldy5qcwpAQCAtMTQ4LDcg KzE0OCw4IEBAIFdlYkluc3BlY3Rvci5Db25zb2xlVmlldy5wcm90b3R5cGUgPSB7CiAKICAgICAg ICAgICAgIG1lc3NhZ2VzQ2xlYXJlZDogZnVuY3Rpb24oKQogICAgICAgICAgICAgewotICAgICAg ICAgICAgICAgIGNvbnNvbGUuY2xlYXJNZXNzYWdlcygpOworICAgICAgICAgICAgICAgIGlmICgh V2ViSW5zcGVjdG9yLnNldHRpbmdzLnByZXNlcnZlQ29uc29sZUxvZykKKyAgICAgICAgICAgICAg ICAgICAgY29uc29sZS5jbGVhck1lc3NhZ2VzKCk7CiAgICAgICAgICAgICB9LAogICAgICAgICB9 CiAgICAgICAgIEluc3BlY3RvckJhY2tlbmQucmVnaXN0ZXJEb21haW5EaXNwYXRjaGVyKCJDb25z b2xlIiwgZGlzcGF0Y2hlcik7CkBAIC0zMjcsNiArMzI4LDcgQEAgV2ViSW5zcGVjdG9yLkNvbnNv bGVWaWV3LnByb3RvdHlwZSA9IHsKICAgICByZXF1ZXN0Q2xlYXJNZXNzYWdlczogZnVuY3Rpb24o KQogICAgIHsKICAgICAgICAgQ29uc29sZUFnZW50LmNsZWFyQ29uc29sZU1lc3NhZ2VzKCk7Cisg ICAgICAgIHRoaXMuY2xlYXJNZXNzYWdlcygpOwogICAgIH0sCiAKICAgICBjbGVhck1lc3NhZ2Vz OiBmdW5jdGlvbigpCkBAIC00NDksMTIgKzQ1MSwxOSBAQCBXZWJJbnNwZWN0b3IuQ29uc29sZVZp ZXcucHJvdG90eXBlID0gewogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAKLSAgICAg ICAgdmFyIGl0ZW1BY3Rpb24gPSBmdW5jdGlvbiAoKSB7CisgICAgICAgIHZhciBjb250ZXh0TWVu dSA9IG5ldyBXZWJJbnNwZWN0b3IuQ29udGV4dE1lbnUoKTsKKworICAgICAgICB2YXIgbW9uaXRv cmluZ1hIUkl0ZW1BY3Rpb24gPSBmdW5jdGlvbiAoKSB7CiAgICAgICAgICAgICBXZWJJbnNwZWN0 b3Iuc2V0dGluZ3MubW9uaXRvcmluZ1hIUkVuYWJsZWQgPSAhV2ViSW5zcGVjdG9yLnNldHRpbmdz Lm1vbml0b3JpbmdYSFJFbmFibGVkOwogICAgICAgICAgICAgQ29uc29sZUFnZW50LnNldE1vbml0 b3JpbmdYSFJFbmFibGVkKFdlYkluc3BlY3Rvci5zZXR0aW5ncy5tb25pdG9yaW5nWEhSRW5hYmxl ZCk7CiAgICAgICAgIH0uYmluZCh0aGlzKTsKLSAgICAgICAgdmFyIGNvbnRleHRNZW51ID0gbmV3 IFdlYkluc3BlY3Rvci5Db250ZXh0TWVudSgpOwotICAgICAgICBjb250ZXh0TWVudS5hcHBlbmRD aGVja2JveEl0ZW0oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKFdlYkluc3BlY3Rvci51c2VMb3dlckNh c2VNZW51VGl0bGVzKCkgPyAiWE1MSHR0cFJlcXVlc3QgbG9nZ2luZyIgOiAiWE1MSHR0cFJlcXVl c3QgTG9nZ2luZyIpLCBpdGVtQWN0aW9uLCBXZWJJbnNwZWN0b3Iuc2V0dGluZ3MubW9uaXRvcmlu Z1hIUkVuYWJsZWQpCisgICAgICAgIGNvbnRleHRNZW51LmFwcGVuZENoZWNrYm94SXRlbShXZWJJ bnNwZWN0b3IuVUlTdHJpbmcoV2ViSW5zcGVjdG9yLnVzZUxvd2VyQ2FzZU1lbnVUaXRsZXMoKSA/ ICJYTUxIdHRwUmVxdWVzdCBsb2dnaW5nIiA6ICJYTUxIdHRwUmVxdWVzdCBMb2dnaW5nIiksIG1v bml0b3JpbmdYSFJJdGVtQWN0aW9uLCBXZWJJbnNwZWN0b3Iuc2V0dGluZ3MubW9uaXRvcmluZ1hI UkVuYWJsZWQpOworCisgICAgICAgIHZhciBwcmVzZXJ2ZUxvZ0l0ZW1BY3Rpb24gPSBmdW5jdGlv biAoKSB7CisgICAgICAgICAgICBXZWJJbnNwZWN0b3Iuc2V0dGluZ3MucHJlc2VydmVDb25zb2xl TG9nID0gIVdlYkluc3BlY3Rvci5zZXR0aW5ncy5wcmVzZXJ2ZUNvbnNvbGVMb2c7CisgICAgICAg IH0uYmluZCh0aGlzKTsKKyAgICAgICAgY29udGV4dE1lbnUuYXBwZW5kQ2hlY2tib3hJdGVtKFdl Ykluc3BlY3Rvci5VSVN0cmluZyhXZWJJbnNwZWN0b3IudXNlTG93ZXJDYXNlTWVudVRpdGxlcygp ID8gIlByZXNlcnZlIGxvZyIgOiAiUHJlc2VydmUgTG9nIiksIHByZXNlcnZlTG9nSXRlbUFjdGlv biwgV2ViSW5zcGVjdG9yLnNldHRpbmdzLnByZXNlcnZlQ29uc29sZUxvZyk7CisKICAgICAgICAg Y29udGV4dE1lbnUuYXBwZW5kSXRlbShXZWJJbnNwZWN0b3IuVUlTdHJpbmcoV2ViSW5zcGVjdG9y LnVzZUxvd2VyQ2FzZU1lbnVUaXRsZXMoKSA/ICJDbGVhciBjb25zb2xlIiA6ICJDbGVhciBDb25z b2xlIiksIHRoaXMucmVxdWVzdENsZWFyTWVzc2FnZXMuYmluZCh0aGlzKSk7CiAgICAgICAgIGNv bnRleHRNZW51LnNob3coZXZlbnQpOwogICAgIH0sCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NldHRpbmdzLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9TZXR0aW5ncy5qcwppbmRleCA3MzAwNjFhYjNjYjAxZDJiY2FmODA5YzFj ZTMzNWJjY2FhNzQxODZhLi45Mzk0Yjg4ODIyMWQwYmI5YzljMzQyYzc2OThiNmVhNmIzYTgxM2Vm IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NldHRpbmdz LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2V0dGluZ3MuanMK QEAgLTY2LDYgKzY2LDcgQEAgV2ViSW5zcGVjdG9yLlNldHRpbmdzID0gZnVuY3Rpb24oKQogICAg IHRoaXMuaW5zdGFsbEFwcGxpY2F0aW9uU2V0dGluZygibGFzdEFjdGl2ZVBhbmVsIiwgImVsZW1l bnRzIik7CiAgICAgdGhpcy5pbnN0YWxsQXBwbGljYXRpb25TZXR0aW5nKCJsYXN0Vmlld2VkU2Ny aXB0RmlsZSIsICJhcHBsaWNhdGlvbiIpOwogICAgIHRoaXMuaW5zdGFsbEFwcGxpY2F0aW9uU2V0 dGluZygibW9uaXRvcmluZ1hIUkVuYWJsZWQiLCBmYWxzZSk7CisgICAgdGhpcy5pbnN0YWxsQXBw bGljYXRpb25TZXR0aW5nKCJwcmVzZXJ2ZUNvbnNvbGVMb2ciLCBmYWxzZSk7CiAgICAgdGhpcy5p bnN0YWxsQXBwbGljYXRpb25TZXR0aW5nKCJwYXVzZU9uRXhjZXB0aW9uU3RhdGVTdHJpbmciLCBX ZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLlBhdXNlT25FeGNlcHRpb25zU3RhdGUuRG9udFBhdXNl T25FeGNlcHRpb25zKTsKICAgICB0aGlzLmluc3RhbGxBcHBsaWNhdGlvblNldHRpbmcoInJlc291 cmNlc0xhcmdlUm93cyIsIHRydWUpOwogICAgIHRoaXMuaW5zdGFsbEFwcGxpY2F0aW9uU2V0dGlu ZygicmVzb3VyY2VzU29ydE9wdGlvbnMiLCB7dGltZU9wdGlvbjogInJlc3BvbnNlVGltZSIsIHNp emVPcHRpb246ICJ0cmFuc2ZlclNpemUifSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzCmluZGV4IGNhMWNjOGI4NmU1ZGZkYTM5ZDM0ZTgxNGZl YmMwZGZmNjkwZTUzYzkuLmJjNjZmNTBlMGFiNTRhZmEyYzRmNTlkZjliYWI5Yjg2YTYyM2JiNGQg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9y LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpz CkBAIC05ODIsNyArOTgyLDggQEAgV2ViSW5zcGVjdG9yLnJlc2V0ID0gZnVuY3Rpb24oKQogICAg IHRoaXMucmVzb3VyY2VzID0ge307CiAgICAgdGhpcy5oaWdobGlnaHRET01Ob2RlKDApOwogCi0g ICAgdGhpcy5jb25zb2xlLmNsZWFyTWVzc2FnZXMoKTsKKyAgICBpZiAoIVdlYkluc3BlY3Rvci5z ZXR0aW5ncy5wcmVzZXJ2ZUNvbnNvbGVMb2cpCisgICAgICAgIHRoaXMuY29uc29sZS5jbGVhck1l c3NhZ2VzKCk7CiAgICAgdGhpcy5leHRlbnNpb25TZXJ2ZXIubm90aWZ5SW5zcGVjdG9yUmVzZXQo KTsKICAgICBpZiAodGhpcy53b3JrZXJNYW5hZ2VyKQogICAgICAgICB0aGlzLndvcmtlck1hbmFn ZXIucmVzZXQoKTsK