34356 2010-01-29 18:04:59 -0800 REGRESSION: Arrow keys do not scroll source view in Resources pane or Scripts pane 2010-02-26 14:27:57 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED InRadar, Regression P2 Normal --- 1 mrowe beidson adele beidson bweinstein darin joepeck keishi mitz mjs pfeldman pmuellr rik timothy oldest_to_newest 186035 0 mrowe 2010-01-29 18:04:59 -0800 For some reason the up and down arrow keys no longer scroll the source view in the Resources pane in r54084. It works correctly in a build of WebKit from earlier in the week. 186036 1 timothy 2010-01-29 18:06:57 -0800 Regression from the switch to canvas source view. 186057 2 mrowe 2010-01-29 18:43:34 -0800 <rdar://problem/7594367> 186505 3 timothy 2010-02-01 11:45:47 -0800 Fixed in http://trac.webkit.org/changeset/54133. https://bugs.webkit.org/show_bug.cgi?id=34400 186506 4 timothy 2010-02-01 11:49:38 -0800 I take it back, this was not fixed. 192728 5 adele 2010-02-22 17:47:23 -0800 What's the status of this? Was this just broken around the same time as the canvas change? 192763 6 timothy 2010-02-22 19:46:56 -0800 It was broken by canvas. Then remained gone because we no longer use an iframe. The iframe gave us this behaviour for free. 194161 7 beidson 2010-02-26 10:26:44 -0800 I'll take this one. Patch coming soon. 194193 8 49608 beidson 2010-02-26 12:02:03 -0800 Created attachment 49608 Simple fix. 194203 9 49608 pfeldman 2010-02-26 12:12:30 -0800 Comment on attachment 49608 Simple fix. > /* > - * Copyright (C) 2007, 2008 Apple Inc. All rights reserved. > + * Copyright (C) 2007, 2008, 2009, 2010 Apple Inc. All rights reserved. We would put just 2010 here, not sure about you folks thought. > this._containerContentElement.id = "resources-container-content"; > + this._containerContentElement.tabIndex = 0; > + this._containerContentElement.addEventListener("keydown", this._handleKeyDownForScroll.bind(this), false); You should put this code into the TextViewer.js. Otherwise Scripts panel is not affected with your changes. > > + _handleKeyDownForScroll: function(event) > + { I'd call it _handleKeyDown since it is registered for all keyboard events, not necessarily related to the scrolling. Also should be in TextViewer.js 194208 10 darin 2010-02-26 12:20:18 -0800 (In reply to comment #9) > > - * Copyright (C) 2007, 2008 Apple Inc. All rights reserved. > > + * Copyright (C) 2007, 2008, 2009, 2010 Apple Inc. All rights reserved. > > We would put just 2010 here, not sure about you folks thought. If there were changes published in 2009 and someone just forgot to add the year at that time, it's fine to add the year 2009 now. If there we indeed no significant changes in 2009, then yes, we should add only 2010. 194226 11 beidson 2010-02-26 12:48:00 -0800 (In reply to comment #10) > (In reply to comment #9) > > > - * Copyright (C) 2007, 2008 Apple Inc. All rights reserved. > > > + * Copyright (C) 2007, 2008, 2009, 2010 Apple Inc. All rights reserved. > > > > We would put just 2010 here, not sure about you folks thought. > > If there were changes published in 2009 and someone just forgot to add the year > at that time, it's fine to add the year 2009 now. If there we indeed no > significant changes in 2009, then yes, we should add only 2010. Yes, I'd already checked - Apple contributors made changes in 2009 and we'd just forgotten to add the date. 194228 12 beidson 2010-02-26 12:50:27 -0800 (In reply to comment #9) > > this._containerContentElement.id = "resources-container-content"; > > + this._containerContentElement.tabIndex = 0; > > + this._containerContentElement.addEventListener("keydown", this._handleKeyDownForScroll.bind(this), false); > > You should put this code into the TextViewer.js. Otherwise Scripts panel is not > affected with your changes. This bugzilla was only about the Resources panel. If you knew about a regression separate from this bug, you should've filed it or at least commented here! > > > > + _handleKeyDownForScroll: function(event) > > + { > > I'd call it _handleKeyDown since it is registered for all keyboard events, not > necessarily related to the scrolling. Done New patch coming... 194243 13 49626 beidson 2010-02-26 13:03:21 -0800 Created attachment 49626 Also patch TextViewer.js 194248 14 beidson 2010-02-26 13:06:36 -0800 Filed https://bugs.webkit.org/show_bug.cgi?id=35447 to track the lack of horizontal keyboard scrolling in the Text Viewer. We should either: A - Bring back the previous iframe behavior of "no horizontal scrollbars" or B - Make horizontal keyboard scrolling work. But that's a separate task. 194253 15 49626 pfeldman 2010-02-26 13:10:26 -0800 Comment on attachment 49626 Also patch TextViewer.js > =================================================================== > --- WebCore/inspector/front-end/AbstractTimelinePanel.js (revision 55293) > +++ WebCore/inspector/front-end/AbstractTimelinePanel.js (working copy) This file should not change. Changes to the TextViewer.js should be sufficient to cover all viewers' scrolling. > + var scrollLines = 0; > + if (event.keyCode === WebInspector.KeyboardShortcut.KeyCodes.Up) > + scrollLines = -1; > + else if (event.keyCode == WebInspector.KeyboardShortcut.KeyCodes.Down) > + scrollLines = 1; > + > + if (scrollLines) { > + event.preventDefault(); > + event.stopPropagation(); > + this.containerElement.scrollByLines(scrollLines); > + var scrollLines = 0; > + if (event.keyCode === WebInspector.KeyboardShortcut.KeyCodes.Up) > + scrollLines = -1; > + else if (event.keyCode == WebInspector.KeyboardShortcut.KeyCodes.Down) > + scrollLines = 1; This way Cmd + Up is going to be treated as one-line step. You should only consume Arrow events with no modifiers. Btw, what's going on to the Left / Right? Now that we don't wrap lines we might need to handle them as well. 194258 16 beidson 2010-02-26 13:17:08 -0800 (In reply to comment #15) > (From update of attachment 49626 [details]) > > =================================================================== > > --- WebCore/inspector/front-end/AbstractTimelinePanel.js (revision 55293) > > +++ WebCore/inspector/front-end/AbstractTimelinePanel.js (working copy) > > This file should not change. Changes to the TextViewer.js should be sufficient > to cover all viewers' scrolling. I'm pretty sure you're wrong about this... hitting you up on IRC to resolve this quicker. > Btw, what's going on to the Left / Right? Now that we don't wrap lines we might > need to handle them as well. I filed https://bugs.webkit.org/show_bug.cgi?id=35447 as a followup - it is independent from this task. 194286 17 49639 beidson 2010-02-26 14:15:41 -0800 Created attachment 49639 Okay, herewego 194289 18 beidson 2010-02-26 14:16:48 -0800 *** Bug 35447 has been marked as a duplicate of this bug. *** 194303 19 beidson 2010-02-26 14:27:57 -0800 Landed in http://trac.webkit.org/changeset/55313 File https://bugs.webkit.org/show_bug.cgi?id=35455 to track the Timeline panel, which I thought was a regression and part of this bug. 49608 2010-02-26 12:02:03 -0800 2010-02-26 13:03:21 -0800 Simple fix. patch.txt text/plain 2656 beidson SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1NTI5NikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTYgQEAKKzIwMTAtMDItMjYgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUu Y29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFy cm93IGtleXMgZG8gbm90IHNjcm9sbCBzb3VyY2UgdmlldyBpbiBSZXNvdXJjZXMgcGFuZQorICAg ICAgICA8cmRhcjovL3Byb2JsZW0vNzU5NDM2Nz4gYW5kIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0zNDM1NgorCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9B YnN0cmFjdFRpbWVsaW5lUGFuZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQWJzdHJhY3RU aW1lbGluZVBhbmVsLnByb3RvdHlwZS5jcmVhdGVJbnRlcmZhY2UpOiBNYWtlIHRoZSBjb250YWlu ZXIgY29udGVudCBlbGVtZW50CisgICAgICAgICAgZm9jdXNhYmxlIGFuZCBsaXN0ZW4gZm9yIHRo ZSBrZXlkb3duIGV2ZW50LgorICAgICAgICAoV2ViSW5zcGVjdG9yLkFic3RyYWN0VGltZWxpbmVQ YW5lbC5wcm90b3R5cGUuX2hhbmRsZUtleURvd25Gb3JTY3JvbGwpOiBJZiB0aGUga2V5IGV2ZW50 IHdhcyAiVXAiCisgICAgICAgICAgb3IgIkRvd24iLCBzY3JvbGwuCisKIDIwMTAtMDItMjYgIEFk YW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXJp biBBZGxlci4KSW5kZXg6IFdlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9BYnN0cmFjdFRpbWVs aW5lUGFuZWwuanMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0Fi c3RyYWN0VGltZWxpbmVQYW5lbC5qcwkocmV2aXNpb24gNTUyOTMpCisrKyBXZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvQWJzdHJhY3RUaW1lbGluZVBhbmVsLmpzCSh3b3JraW5nIGNvcHkpCkBA IC0xLDUgKzEsNSBAQAogLyoKLSAqIENvcHlyaWdodCAoQykgMjAwNywgMjAwOCBBcHBsZSBJbmMu ICBBbGwgcmlnaHRzIHJlc2VydmVkLgorICogQ29weXJpZ2h0IChDKSAyMDA3LCAyMDA4LCAyMDA5 LCAyMDEwIEFwcGxlIEluYy4gIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKiBDb3B5cmlnaHQgKEMp IDIwMDgsIDIwMDkgQW50aG9ueSBSaWNhdWQgPHJpa0B3ZWJraXQub3JnPgogICogQ29weXJpZ2h0 IChDKSAyMDA5IEdvb2dsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKgpAQCAtNzUsNiAr NzUsOCBAQCBXZWJJbnNwZWN0b3IuQWJzdHJhY3RUaW1lbGluZVBhbmVsLnByb3RvCiAKICAgICAg ICAgdGhpcy5fY29udGFpbmVyQ29udGVudEVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50 KCJkaXYiKTsKICAgICAgICAgdGhpcy5fY29udGFpbmVyQ29udGVudEVsZW1lbnQuaWQgPSAicmVz b3VyY2VzLWNvbnRhaW5lci1jb250ZW50IjsKKyAgICAgICAgdGhpcy5fY29udGFpbmVyQ29udGVu dEVsZW1lbnQudGFiSW5kZXggPSAwOworICAgICAgICB0aGlzLl9jb250YWluZXJDb250ZW50RWxl bWVudC5hZGRFdmVudExpc3RlbmVyKCJrZXlkb3duIiwgdGhpcy5faGFuZGxlS2V5RG93bkZvclNj cm9sbC5iaW5kKHRoaXMpLCBmYWxzZSk7CiAgICAgICAgIHRoaXMuY29udGFpbmVyRWxlbWVudC5h cHBlbmRDaGlsZCh0aGlzLl9jb250YWluZXJDb250ZW50RWxlbWVudCk7CiAKICAgICAgICAgdGhp cy5zdW1tYXJ5QmFyID0gbmV3IFdlYkluc3BlY3Rvci5TdW1tYXJ5QmFyKHRoaXMuY2F0ZWdvcmll cyk7CkBAIC0yMjEsNiArMjIzLDIxIEBAIFdlYkluc3BlY3Rvci5BYnN0cmFjdFRpbWVsaW5lUGFu ZWwucHJvdG8KICAgICAgICAgdGhpcy5fdGltZWxpbmVHcmlkLnNldFNjcm9sbEFuZERpdmlkZXJU b3Aoc2Nyb2xsVG9wLCBkaXZpZGVyc1RvcCk7CiAgICAgfSwKIAorICAgIF9oYW5kbGVLZXlEb3du Rm9yU2Nyb2xsOiBmdW5jdGlvbihldmVudCkKKyAgICB7CisgICAgICAgIHZhciBzY3JvbGxMaW5l cyA9IDA7CisgICAgICAgIGlmIChldmVudC5rZXlDb2RlID09PSBXZWJJbnNwZWN0b3IuS2V5Ym9h cmRTaG9ydGN1dC5LZXlDb2Rlcy5VcCkKKyAgICAgICAgICAgIHNjcm9sbExpbmVzID0gLTE7Cisg ICAgICAgIGVsc2UgaWYgKGV2ZW50LmtleUNvZGUgPT0gV2ViSW5zcGVjdG9yLktleWJvYXJkU2hv cnRjdXQuS2V5Q29kZXMuRG93bikKKyAgICAgICAgICAgIHNjcm9sbExpbmVzID0gMTsKKyAgICAg ICAgCisgICAgICAgIGlmIChzY3JvbGxMaW5lcykgeworICAgICAgICAgICAgZXZlbnQucHJldmVu dERlZmF1bHQoKTsKKyAgICAgICAgICAgIGV2ZW50LnN0b3BQcm9wYWdhdGlvbigpOworICAgICAg ICAgICAgdGhpcy5jb250YWluZXJFbGVtZW50LnNjcm9sbEJ5TGluZXMoc2Nyb2xsTGluZXMpOwor ICAgICAgICB9CisgICAgfSwKKyAgICAKICAgICBnZXQgbmVlZHNSZWZyZXNoKCkKICAgICB7CiAg ICAgICAgIHJldHVybiB0aGlzLl9uZWVkc1JlZnJlc2g7Cg== 49626 2010-02-26 13:03:21 -0800 2010-02-26 14:15:41 -0800 Also patch TextViewer.js patch.txt text/plain 4457 beidson SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1NTMwMikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjIgQEAKKzIwMTAtMDItMjYgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUu Y29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFy cm93IGtleXMgZG8gbm90IHNjcm9sbCBzb3VyY2UgdmlldyBpbiBSZXNvdXJjZXMgcGFuZSBvciB0 ZXh0IGVkaXRvciBpbiBTY3JpcHRzIHBhbmUuCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS83NTk0 MzY3PiBhbmQgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM0MzU2CisK KyAgICAgICAgSGFuZGxlIHZlcnRpY2FsIHNjcm9sbGluZyBpbiB0aGUgVGltZWxpbmVQYW5lbDoK KyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0Fic3RyYWN0VGltZWxpbmVQYW5lbC5qczoK KyAgICAgICAgKFdlYkluc3BlY3Rvci5BYnN0cmFjdFRpbWVsaW5lUGFuZWwucHJvdG90eXBlLmNy ZWF0ZUludGVyZmFjZSk6IE1ha2UgdGhlIGNvbnRhaW5lciBjb250ZW50IGVsZW1lbnQKKyAgICAg ICAgICBmb2N1c2FibGUgYW5kIGxpc3RlbiBmb3IgdGhlIGtleWRvd24gZXZlbnQuCisgICAgICAg IChXZWJJbnNwZWN0b3IuQWJzdHJhY3RUaW1lbGluZVBhbmVsLnByb3RvdHlwZS5faGFuZGxlS2V5 RG93bkZvclNjcm9sbCk6IElmIHRoZSBrZXkgZXZlbnQgd2FzICJVcCIKKyAgICAgICAgICBvciAi RG93biIsIHNjcm9sbC4KKworICAgICAgICBEaXR0byBmb3IgdGhlIFRleHRWaWV3ZXI6CisgICAg ICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9UZXh0Vmlld2VyLmpzOgorICAgICAgICAoV2ViSW5z cGVjdG9yLlRleHRWaWV3ZXIpOiBMaXN0ZW4gZm9yIHRoZSBrZXlkb3duIGV2ZW50LgorICAgICAg ICAoV2ViSW5zcGVjdG9yLlRleHRWaWV3ZXIucHJvdG90eXBlLl9oYW5kbGVLZXlEb3duKTogSWYg dGhlIGtleSBldmVudCB3YXMgIlVwIiBvciAiRG93biIsIHNjcm9sbC4KKwogMjAxMC0wMi0yNiAg TmljaG9sYXMgWW91bmcgIDxuaWNob2xhcy55b3VuZ0Bub2tpYS5jb20+CiAKICAgICAgICAgUmV2 aWV3ZWQgYnkgVG9yIEFybmUgVmVzdGLDuC4KSW5kZXg6IFdlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9BYnN0cmFjdFRpbWVsaW5lUGFuZWwuanMKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL0Fic3RyYWN0VGltZWxpbmVQYW5lbC5qcwkocmV2aXNpb24gNTUyOTMp CisrKyBXZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQWJzdHJhY3RUaW1lbGluZVBhbmVsLmpz CSh3b3JraW5nIGNvcHkpCkBAIC0xLDUgKzEsNSBAQAogLyoKLSAqIENvcHlyaWdodCAoQykgMjAw NywgMjAwOCBBcHBsZSBJbmMuICBBbGwgcmlnaHRzIHJlc2VydmVkLgorICogQ29weXJpZ2h0IChD KSAyMDA3LCAyMDA4LCAyMDA5LCAyMDEwIEFwcGxlIEluYy4gIEFsbCByaWdodHMgcmVzZXJ2ZWQu CiAgKiBDb3B5cmlnaHQgKEMpIDIwMDgsIDIwMDkgQW50aG9ueSBSaWNhdWQgPHJpa0B3ZWJraXQu b3JnPgogICogQ29weXJpZ2h0IChDKSAyMDA5IEdvb2dsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2 ZWQuCiAgKgpAQCAtNzUsNiArNzUsOCBAQCBXZWJJbnNwZWN0b3IuQWJzdHJhY3RUaW1lbGluZVBh bmVsLnByb3RvCiAKICAgICAgICAgdGhpcy5fY29udGFpbmVyQ29udGVudEVsZW1lbnQgPSBkb2N1 bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKICAgICAgICAgdGhpcy5fY29udGFpbmVyQ29udGVu dEVsZW1lbnQuaWQgPSAicmVzb3VyY2VzLWNvbnRhaW5lci1jb250ZW50IjsKKyAgICAgICAgdGhp cy5fY29udGFpbmVyQ29udGVudEVsZW1lbnQudGFiSW5kZXggPSAwOworICAgICAgICB0aGlzLl9j b250YWluZXJDb250ZW50RWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJrZXlkb3duIiwgdGhpcy5f aGFuZGxlS2V5RG93bi5iaW5kKHRoaXMpLCBmYWxzZSk7CiAgICAgICAgIHRoaXMuY29udGFpbmVy RWxlbWVudC5hcHBlbmRDaGlsZCh0aGlzLl9jb250YWluZXJDb250ZW50RWxlbWVudCk7CiAKICAg ICAgICAgdGhpcy5zdW1tYXJ5QmFyID0gbmV3IFdlYkluc3BlY3Rvci5TdW1tYXJ5QmFyKHRoaXMu Y2F0ZWdvcmllcyk7CkBAIC0yMjEsNiArMjIzLDIxIEBAIFdlYkluc3BlY3Rvci5BYnN0cmFjdFRp bWVsaW5lUGFuZWwucHJvdG8KICAgICAgICAgdGhpcy5fdGltZWxpbmVHcmlkLnNldFNjcm9sbEFu ZERpdmlkZXJUb3Aoc2Nyb2xsVG9wLCBkaXZpZGVyc1RvcCk7CiAgICAgfSwKIAorICAgIF9oYW5k bGVLZXlEb3duOiBmdW5jdGlvbihldmVudCkKKyAgICB7CisgICAgICAgIHZhciBzY3JvbGxMaW5l cyA9IDA7CisgICAgICAgIGlmIChldmVudC5rZXlDb2RlID09PSBXZWJJbnNwZWN0b3IuS2V5Ym9h cmRTaG9ydGN1dC5LZXlDb2Rlcy5VcCkKKyAgICAgICAgICAgIHNjcm9sbExpbmVzID0gLTE7Cisg ICAgICAgIGVsc2UgaWYgKGV2ZW50LmtleUNvZGUgPT0gV2ViSW5zcGVjdG9yLktleWJvYXJkU2hv cnRjdXQuS2V5Q29kZXMuRG93bikKKyAgICAgICAgICAgIHNjcm9sbExpbmVzID0gMTsKKyAgICAg ICAgCisgICAgICAgIGlmIChzY3JvbGxMaW5lcykgeworICAgICAgICAgICAgZXZlbnQucHJldmVu dERlZmF1bHQoKTsKKyAgICAgICAgICAgIGV2ZW50LnN0b3BQcm9wYWdhdGlvbigpOworICAgICAg ICAgICAgdGhpcy5jb250YWluZXJFbGVtZW50LnNjcm9sbEJ5TGluZXMoc2Nyb2xsTGluZXMpOwor ICAgICAgICB9CisgICAgfSwKKyAgICAKICAgICBnZXQgbmVlZHNSZWZyZXNoKCkKICAgICB7CiAg ICAgICAgIHJldHVybiB0aGlzLl9uZWVkc1JlZnJlc2g7CkluZGV4OiBXZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvVGV4dFZpZXdlci5qcwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvVGV4dFZpZXdlci5qcwkocmV2aXNpb24gNTUyOTMpCisrKyBXZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvVGV4dFZpZXdlci5qcwkod29ya2luZyBjb3B5KQpAQCAtMSw1ICsx LDYgQEAKIC8qCiAgKiBDb3B5cmlnaHQgKEMpIDIwMDkgR29vZ2xlIEluYy4gQWxsIHJpZ2h0cyBy ZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAxMCBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVz ZXJ2ZWQuCiAgKgogICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFy eSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CiAgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQg cHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMgYXJlCkBAIC0zOSw2ICs0MCw3 IEBAIFdlYkluc3BlY3Rvci5UZXh0Vmlld2VyID0gZnVuY3Rpb24odGV4dE0KICAgICB0aGlzLmVs ZW1lbnQudGFiSW5kZXggPSAwOwogCiAgICAgdGhpcy5lbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIo InNjcm9sbCIsIHRoaXMuX3Njcm9sbC5iaW5kKHRoaXMpLCBmYWxzZSk7CisgICAgdGhpcy5lbGVt ZW50LmFkZEV2ZW50TGlzdGVuZXIoImtleWRvd24iLCB0aGlzLl9oYW5kbGVLZXlEb3duLmJpbmQo dGhpcyksIGZhbHNlKTsKIAogICAgIHRoaXMuX3VybCA9IHVybDsKIApAQCAtMjAyLDYgKzIwNCwy MSBAQCBXZWJJbnNwZWN0b3IuVGV4dFZpZXdlci5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICAg ICAgdGhpcy5fcmVwYWludEFsbCgpOwogICAgICAgICB9LmJpbmQodGhpcyksIDUwKTsKICAgICB9 LAorICAgIAorICAgIF9oYW5kbGVLZXlEb3duOiBmdW5jdGlvbigpCisgICAgeworICAgICAgICB2 YXIgc2Nyb2xsTGluZXMgPSAwOworICAgICAgICBpZiAoZXZlbnQua2V5Q29kZSA9PT0gV2ViSW5z cGVjdG9yLktleWJvYXJkU2hvcnRjdXQuS2V5Q29kZXMuVXApCisgICAgICAgICAgICBzY3JvbGxM aW5lcyA9IC0xOworICAgICAgICBlbHNlIGlmIChldmVudC5rZXlDb2RlID09IFdlYkluc3BlY3Rv ci5LZXlib2FyZFNob3J0Y3V0LktleUNvZGVzLkRvd24pCisgICAgICAgICAgICBzY3JvbGxMaW5l cyA9IDE7CisgICAgICAgIAorICAgICAgICBpZiAoc2Nyb2xsTGluZXMpIHsKKyAgICAgICAgICAg IGV2ZW50LnByZXZlbnREZWZhdWx0KCk7CisgICAgICAgICAgICBldmVudC5zdG9wUHJvcGFnYXRp b24oKTsKKyAgICAgICAgICAgIHRoaXMuZWxlbWVudC5zY3JvbGxCeUxpbmVzKHNjcm9sbExpbmVz KTsKKyAgICAgICAgfQorICAgIH0sCiAKICAgICBiZWdpblVwZGF0ZXM6IGZ1bmN0aW9uKGVuYWJs ZWQpCiAgICAgewo= 49639 2010-02-26 14:15:41 -0800 2010-02-26 14:19:07 -0800 Okay, herewego patch.txt text/plain 2977 beidson SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1NTMwMikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTcgQEAKKzIwMTAtMDItMjYgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUu Y29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFy cm93IGtleXMgZG8gbm90IHNjcm9sbCBzb3VyY2UgdmlldyBpbiBSZXNvdXJjZXMgcGFuZSBvciBT Y3JpcHRzIHBhbmUuCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS83NTk0MzY3PiBhbmQgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM0MzU2CisKKyAgICAgICAgSGFuZGxl IHZlcnRpY2FsIHNjcm9sbGluZyBpbiB0aGUgVGV4dCBWaWV3ZXI6CisgICAgICAgICogaW5zcGVj dG9yL2Zyb250LWVuZC9UZXh0Vmlld2VyLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRleHRW aWV3ZXIpOiBMaXN0ZW4gZm9yIHRoZSBrZXlkb3duIGV2ZW50LgorICAgICAgICAoV2ViSW5zcGVj dG9yLlRleHRWaWV3ZXIucHJvdG90eXBlLl9oYW5kbGVLZXlEb3duKTogSWYgdGhlIGV2ZW50IGhh cyBubyBtb2RpZmllcnMgYW5kIHJlZmVycworICAgICAgICAgIHRvIGFuIGFycm93IGtleSwgc2Ny b2xsLiBUaGUgaG9yaXpvbnRhbCB2YWx1ZXMgd2VyZSByaXBwZWQgZnJvbSB0aGUgZGVmYXVsdCAi cGl4ZWxzIHBlciBzY3JvbGwgbGluZSIKKyAgICAgICAgICB2YWx1ZSBpbiBTY3JvbGxCYXIuaC4K KwogMjAxMC0wMi0yNiAgTmljaG9sYXMgWW91bmcgIDxuaWNob2xhcy55b3VuZ0Bub2tpYS5jb20+ CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgVG9yIEFybmUgVmVzdGLDuC4KSW5kZXg6IFdlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9UZXh0Vmlld2VyLmpzCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9UZXh0Vmlld2VyLmpzCShyZXZpc2lvbiA1NTI5MykKKysrIFdl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UZXh0Vmlld2VyLmpzCSh3b3JraW5nIGNvcHkpCkBA IC0xLDUgKzEsNiBAQAogLyoKICAqIENvcHlyaWdodCAoQykgMjAwOSBHb29nbGUgSW5jLiBBbGwg cmlnaHRzIHJlc2VydmVkLgorICogQ29weXJpZ2h0IChDKSAyMDEwIEFwcGxlIEluYy4gQWxsIHJp Z2h0cyByZXNlcnZlZC4KICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBh bmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNhdGlvbiwgYXJlIHBl cm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucyBhcmUKQEAgLTM5 LDYgKzQwLDcgQEAgV2ViSW5zcGVjdG9yLlRleHRWaWV3ZXIgPSBmdW5jdGlvbih0ZXh0TQogICAg IHRoaXMuZWxlbWVudC50YWJJbmRleCA9IDA7CiAKICAgICB0aGlzLmVsZW1lbnQuYWRkRXZlbnRM aXN0ZW5lcigic2Nyb2xsIiwgdGhpcy5fc2Nyb2xsLmJpbmQodGhpcyksIGZhbHNlKTsKKyAgICB0 aGlzLmVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigia2V5ZG93biIsIHRoaXMuX2hhbmRsZUtleURv d24uYmluZCh0aGlzKSwgZmFsc2UpOwogCiAgICAgdGhpcy5fdXJsID0gdXJsOwogCkBAIC0yMDIs NiArMjA0LDM3IEBAIFdlYkluc3BlY3Rvci5UZXh0Vmlld2VyLnByb3RvdHlwZSA9IHsKICAgICAg ICAgICAgICAgICB0aGlzLl9yZXBhaW50QWxsKCk7CiAgICAgICAgIH0uYmluZCh0aGlzKSwgNTAp OwogICAgIH0sCisgICAgCisgICAgX2hhbmRsZUtleURvd246IGZ1bmN0aW9uKCkKKyAgICB7Cisg ICAgICAgIGlmIChldmVudC5tZXRhS2V5IHx8IGV2ZW50LnNoaWZ0S2V5IHx8IGV2ZW50LmN0cmxL ZXkgfHwgZXZlbnQuYWx0S2V5KQorICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAKKyAgICAg ICAgdmFyIHNjcm9sbFZhbHVlID0gMDsKKyAgICAgICAgaWYgKGV2ZW50LmtleUNvZGUgPT09IFdl Ykluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0LktleUNvZGVzLlVwKQorICAgICAgICAgICAgc2Ny b2xsVmFsdWUgPSAtMTsKKyAgICAgICAgZWxzZSBpZiAoZXZlbnQua2V5Q29kZSA9PSBXZWJJbnNw ZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5LZXlDb2Rlcy5Eb3duKQorICAgICAgICAgICAgc2Nyb2xs VmFsdWUgPSAxOworICAgICAgICAKKyAgICAgICAgaWYgKHNjcm9sbFZhbHVlKSB7CisgICAgICAg ICAgICBldmVudC5wcmV2ZW50RGVmYXVsdCgpOworICAgICAgICAgICAgZXZlbnQuc3RvcFByb3Bh Z2F0aW9uKCk7CisgICAgICAgICAgICB0aGlzLmVsZW1lbnQuc2Nyb2xsQnlMaW5lcyhzY3JvbGxW YWx1ZSk7CisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KKyAgICAgICAgCisgICAgICAg IHNjcm9sbFZhbHVlID0gMDsKKyAgICAgICAgaWYgKGV2ZW50LmtleUNvZGUgPT09IFdlYkluc3Bl Y3Rvci5LZXlib2FyZFNob3J0Y3V0LktleUNvZGVzLkxlZnQpCisgICAgICAgICAgICBzY3JvbGxW YWx1ZSA9IC00MDsKKyAgICAgICAgZWxzZSBpZiAoZXZlbnQua2V5Q29kZSA9PSBXZWJJbnNwZWN0 b3IuS2V5Ym9hcmRTaG9ydGN1dC5LZXlDb2Rlcy5SaWdodCkKKyAgICAgICAgICAgIHNjcm9sbFZh bHVlID0gNDA7CisgICAgICAgIAorICAgICAgICBpZiAoc2Nyb2xsVmFsdWUpIHsKKyAgICAgICAg ICAgIGV2ZW50LnByZXZlbnREZWZhdWx0KCk7CisgICAgICAgICAgICBldmVudC5zdG9wUHJvcGFn YXRpb24oKTsKKyAgICAgICAgICAgIHRoaXMuZWxlbWVudC5zY3JvbGxMZWZ0ICs9IHNjcm9sbFZh bHVlOworICAgICAgICB9CisgICAgfSwKIAogICAgIGJlZ2luVXBkYXRlczogZnVuY3Rpb24oZW5h YmxlZCkKICAgICB7Cg==