101591 2012-11-08 04:58:34 -0800 Web Inspector: Ctrl+a in the network panel should select resource content, not the entire panel 2012-11-09 01:20:35 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 lushnikov lushnikov aandrey apavlov keishi loislo pfeldman pmuellr vsevik web-inspector-bugs webkit.review.bot yurys oldest_to_newest 761665 0 lushnikov 2012-11-08 04:58:34 -0800 downstream: http://code.google.com/p/chromium/issues/detail?id=73644 ability to copy clean response content to clipboard as it was in chrome 8. Actually, in "Resources" tab I can hit ctrl+a to copy content of css/js/html. But same operation in network tab(if we need xhr content) works not the same - it's selects content + line numbers + rows, so we get lots of unnecessary stuff in clipboard and it's problem to just paste output to text editor to inspect that was wrong. 761675 1 173019 lushnikov 2012-11-08 05:11:48 -0800 Created attachment 173019 Patch 761694 2 aandrey 2012-11-08 05:42:21 -0800 I believe this can be done with pure CSS using -webkit-user-select: none; on the sidebar elements. I just played quickly with DevTools opened on DevTools, and it seemed working for me without any JS code. 761695 3 173019 apavlov 2012-11-08 05:47:26 -0800 Comment on attachment 173019 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=173019&action=review > Source/WebCore/ChangeLog:3 > + Web Inspector: Ctrl+a in the network panel should select resource content, not the entire panel Capital 'A' > Source/WebCore/ChangeLog:8 > + Intercepts Ctrl-a event in DefaultTextEditor to select resource content Intercepts -> Intercept (i.e. "what we do by this patch"). Also, 'a' should be consistently capitalized across the patch, as is usual with the shortcuts notation (see the Shortcuts help screen). > Source/WebCore/ChangeLog:12 > + (WebInspector.DefaultTextEditor.prototype._handleKeyDown): intercept Ctrl-A even for readonly fields Comments should be sentence-capitalized ("Intercept...") > Source/WebCore/inspector/front-end/DefaultTextEditor.js:1492 > + window.getSelection().addRange(range); You should probably invoke window.getSelection().removeAllRanges(); before this line, so that an existing selection will not interfere with your override. > Source/WebCore/inspector/front-end/KeyboardShortcut.js:179 > +WebInspector.KeyboardShortcut.SELECT_ALL = WebInspector.KeyboardShortcut.makeKey("a", WebInspector.KeyboardShortcut.Modifiers.CtrlOrMeta); Constants are camel-cased in WebKit: "...SelectAll" 761697 4 173019 vsevik 2012-11-08 05:51:46 -0800 Comment on attachment 173019 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=173019&action=review > Source/WebCore/inspector/front-end/DefaultTextEditor.js:412 > + var handleSelectAll = this._mainPanel.handleSelectAll.bind(this._mainPanel); inline? > Source/WebCore/inspector/front-end/KeyboardShortcut.js:179 > +WebInspector.KeyboardShortcut.SELECT_ALL = WebInspector.KeyboardShortcut.makeKey("a", WebInspector.KeyboardShortcut.Modifiers.CtrlOrMeta); SelectAll per webkit constants naming convention. 761701 5 173019 vsevik 2012-11-08 05:55:24 -0800 Comment on attachment 173019 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=173019&action=review >> Source/WebCore/inspector/front-end/DefaultTextEditor.js:1492 >> + window.getSelection().addRange(range); > > You should probably invoke > window.getSelection().removeAllRanges(); > before this line, so that an existing selection will not interfere with your override. You'd better do this.setSelection() instead. 761718 6 173019 apavlov 2012-11-08 06:12:18 -0800 Comment on attachment 173019 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=173019&action=review >> Source/WebCore/inspector/front-end/DefaultTextEditor.js:412 >> + var handleSelectAll = this._mainPanel.handleSelectAll.bind(this._mainPanel); > > inline? I though about this as well but handleUndo is not reused either, so I figured this might be good for consistency. >>> Source/WebCore/inspector/front-end/DefaultTextEditor.js:1492 >>> + window.getSelection().addRange(range); >> >> You should probably invoke >> window.getSelection().removeAllRanges(); >> before this line, so that an existing selection will not interfere with your override. > > You'd better do this.setSelection() instead. That's right, I missed the fact that this is an editor. 761795 7 vsevik 2012-11-08 07:45:28 -0800 (In reply to comment #6) > (From update of attachment 173019 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=173019&action=review > > >> Source/WebCore/inspector/front-end/DefaultTextEditor.js:412 > >> + var handleSelectAll = this._mainPanel.handleSelectAll.bind(this._mainPanel); > > > > inline? > > I though about this as well but handleUndo is not reused either, so I figured this might be good for consistency. Let's inline all of them for consistency then! :) 762634 8 173019 lushnikov 2012-11-08 23:50:50 -0800 Comment on attachment 173019 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=173019&action=review >> Source/WebCore/ChangeLog:3 >> + Web Inspector: Ctrl+a in the network panel should select resource content, not the entire panel > > Capital 'A' fixed >> Source/WebCore/ChangeLog:8 >> + Intercepts Ctrl-a event in DefaultTextEditor to select resource content > > Intercepts -> Intercept (i.e. "what we do by this patch"). > > Also, 'a' should be consistently capitalized across the patch, as is usual with the shortcuts notation (see the Shortcuts help screen). fixed >> Source/WebCore/ChangeLog:12 >> + (WebInspector.DefaultTextEditor.prototype._handleKeyDown): intercept Ctrl-A even for readonly fields > > Comments should be sentence-capitalized ("Intercept...") fixed >>>> Source/WebCore/inspector/front-end/DefaultTextEditor.js:412 >>>> + var handleSelectAll = this._mainPanel.handleSelectAll.bind(this._mainPanel); >>> >>> inline? >> >> I though about this as well but handleUndo is not reused either, so I figured this might be good for consistency. > > Let's inline all of them for consistency then! :) But, handleRedo is reused; are you guys ok if I inline two out of three? >>> Source/WebCore/inspector/front-end/KeyboardShortcut.js:179 >>> +WebInspector.KeyboardShortcut.SELECT_ALL = WebInspector.KeyboardShortcut.makeKey("a", WebInspector.KeyboardShortcut.Modifiers.CtrlOrMeta); >> >> Constants are camel-cased in WebKit: "...SelectAll" > > SelectAll per webkit constants naming convention. fixed 762636 9 173019 apavlov 2012-11-08 23:59:15 -0800 Comment on attachment 173019 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=173019&action=review >>>>> Source/WebCore/inspector/front-end/DefaultTextEditor.js:412 >>>>> + var handleSelectAll = this._mainPanel.handleSelectAll.bind(this._mainPanel); >>>> >>>> inline? >>> >>> I though about this as well but handleUndo is not reused either, so I figured this might be good for consistency. >> >> Let's inline all of them for consistency then! :) > > But, handleRedo is reused; are you guys ok if I inline two out of three? Sure. We discussed this point with Seva yesterday :) 762647 10 173223 lushnikov 2012-11-09 00:17:26 -0800 Created attachment 173223 Patch 762657 11 173223 vsevik 2012-11-09 00:30:09 -0800 Comment on attachment 173223 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=173223&action=review > Source/WebCore/ChangeLog:14 > + * inspector/front-end/KeyboardShortcut.js: Added SELECT_ALL constant for Ctrl+A combination SelectAll > Source/WebCore/inspector/front-end/DefaultTextEditor.js:412 > this._shortcuts[WebInspector.KeyboardShortcut.makeKey("z", modifiers.Shift | modifiers.CtrlOrMeta)] = handleRedo; I would group together all the code dealing with redo here. > Source/WebCore/inspector/front-end/DefaultTextEditor.js:433 > + if (this.readOnly() && shortcutKey !== WebInspector.KeyboardShortcut.SelectAll) This is odd. We would need to add such a check for each shortcut supported in read only mode that we add. I'd rather move readOnly check to handlers. 762671 12 173223 lushnikov 2012-11-09 00:49:55 -0800 Comment on attachment 173223 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=173223&action=review >> Source/WebCore/ChangeLog:14 >> + * inspector/front-end/KeyboardShortcut.js: Added SELECT_ALL constant for Ctrl+A combination > > SelectAll fixed >> Source/WebCore/inspector/front-end/DefaultTextEditor.js:412 >> this._shortcuts[WebInspector.KeyboardShortcut.makeKey("z", modifiers.Shift | modifiers.CtrlOrMeta)] = handleRedo; > > I would group together all the code dealing with redo here. fixed! >> Source/WebCore/inspector/front-end/DefaultTextEditor.js:433 >> + if (this.readOnly() && shortcutKey !== WebInspector.KeyboardShortcut.SelectAll) > > This is odd. We would need to add such a check for each shortcut supported in read only mode that we add. > I'd rather move readOnly check to handlers. ok, fixed that. 762672 13 173230 lushnikov 2012-11-09 00:50:14 -0800 Created attachment 173230 Patch 762693 14 173230 webkit.review.bot 2012-11-09 01:20:31 -0800 Comment on attachment 173230 Patch Clearing flags on attachment: 173230 Committed r134030: <http://trac.webkit.org/changeset/134030> 762694 15 webkit.review.bot 2012-11-09 01:20:35 -0800 All reviewed patches have been landed. Closing bug. 173019 2012-11-08 05:11:48 -0800 2012-11-09 00:17:20 -0800 Patch bug-101591-20121108170957.patch text/plain 3774 lushnikov U3VidmVyc2lvbiBSZXZpc2lvbjogMTMzODU3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzYxN2NmOWM5ZDdiMWUz Y2EyNTNkZTExMGZlM2JjMjBjNGUwNjczZi4uY2EwY2UyMGQ0MjY0ODFmMmVlMDUzY2U5N2E4OTdm YTI3YzQzNGQ3NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEyLTExLTA4ICBBbmRy ZXkgTHVzaG5pa292ICA8bHVzaG5pa292QGdvb2dsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3Bl Y3RvcjogQ3RybCthIGluIHRoZSBuZXR3b3JrIHBhbmVsIHNob3VsZCBzZWxlY3QgcmVzb3VyY2Ug Y29udGVudCwgbm90IHRoZSBlbnRpcmUgcGFuZWwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMTU5MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEludGVyY2VwdHMgQ3RybC1hIGV2ZW50IGluIERlZmF1bHRU ZXh0RWRpdG9yIHRvIHNlbGVjdCByZXNvdXJjZSBjb250ZW50CisKKyAgICAgICAgKiBpbnNwZWN0 b3IvZnJvbnQtZW5kL0RlZmF1bHRUZXh0RWRpdG9yLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9y LkRlZmF1bHRUZXh0RWRpdG9yLnByb3RvdHlwZS5fcmVnaXN0ZXJTaG9ydGN1dHMpOiBBZGRlZCBD dHJsLUEKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EZWZhdWx0VGV4dEVkaXRvci5wcm90b3R5cGUu X2hhbmRsZUtleURvd24pOiBpbnRlcmNlcHQgQ3RybC1BIGV2ZW4gZm9yIHJlYWRvbmx5IGZpZWxk cworICAgICAgICAoV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JNYWluUGFuZWwucHJvdG90eXBlLmhh bmRsZVNlbGVjdEFsbCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9LZXlib2FyZFNo b3J0Y3V0LmpzOiBBZGRlZCBTRUxFQ1RfQUxMIGNvbnN0YW50IGZvciBDdHJsLUEgY29tYmluYXRp b24KKwogMjAxMi0xMS0wNyAgVnNldm9sb2QgVmxhc292ICA8dnNldmlrQGNocm9taXVtLm9yZz4K IAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBjb25zb2xlIGVycm9yIGFmdGVyIGluc3BlY3Rpbmcg SW5kZXhlZERCCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L0RlZmF1bHRUZXh0RWRpdG9yLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9EZWZhdWx0VGV4dEVkaXRvci5qcwppbmRleCBkMjY5YmMyNzYyZDY2ZmM3ZjA5NmZmNGQyYTYy ODhhMTgxMjAxZDg4Li5kZjBkNTAzNDkxZDY1YzY1YTMwOTE0ODA1YjUwMTY1NGQ0OTJhOGM0IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RlZmF1bHRUZXh0 RWRpdG9yLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGVmYXVs dFRleHRFZGl0b3IuanMKQEAgLTQwOSw4ICs0MDksMTAgQEAgV2ViSW5zcGVjdG9yLkRlZmF1bHRU ZXh0RWRpdG9yLnByb3RvdHlwZSA9IHsKIAogICAgICAgICB2YXIgaGFuZGxlVW5kbyA9IHRoaXMu X21haW5QYW5lbC5oYW5kbGVVbmRvUmVkby5iaW5kKHRoaXMuX21haW5QYW5lbCwgZmFsc2UpOwog ICAgICAgICB2YXIgaGFuZGxlUmVkbyA9IHRoaXMuX21haW5QYW5lbC5oYW5kbGVVbmRvUmVkby5i aW5kKHRoaXMuX21haW5QYW5lbCwgdHJ1ZSk7CisgICAgICAgIHZhciBoYW5kbGVTZWxlY3RBbGwg PSB0aGlzLl9tYWluUGFuZWwuaGFuZGxlU2VsZWN0QWxsLmJpbmQodGhpcy5fbWFpblBhbmVsKTsK ICAgICAgICAgdGhpcy5fc2hvcnRjdXRzW1dlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0Lm1h a2VLZXkoInoiLCBtb2RpZmllcnMuQ3RybE9yTWV0YSldID0gaGFuZGxlVW5kbzsKICAgICAgICAg dGhpcy5fc2hvcnRjdXRzW1dlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0Lm1ha2VLZXkoInoi LCBtb2RpZmllcnMuU2hpZnQgfCBtb2RpZmllcnMuQ3RybE9yTWV0YSldID0gaGFuZGxlUmVkbzsK KyAgICAgICAgdGhpcy5fc2hvcnRjdXRzW1dlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0LlNF TEVDVF9BTExdID0gaGFuZGxlU2VsZWN0QWxsOwogICAgICAgICBpZiAoIVdlYkluc3BlY3Rvci5p c01hYygpKQogICAgICAgICAgICAgdGhpcy5fc2hvcnRjdXRzW1dlYkluc3BlY3Rvci5LZXlib2Fy ZFNob3J0Y3V0Lm1ha2VLZXkoInkiLCBtb2RpZmllcnMuQ3RybE9yTWV0YSldID0gaGFuZGxlUmVk bzsKIApAQCAtNDIyLDEwICs0MjQsMTEgQEAgV2ViSW5zcGVjdG9yLkRlZmF1bHRUZXh0RWRpdG9y LnByb3RvdHlwZSA9IHsKIAogICAgIF9oYW5kbGVLZXlEb3duOiBmdW5jdGlvbihlKQogICAgIHsK LSAgICAgICAgaWYgKHRoaXMucmVhZE9ubHkoKSkKKyAgICAgICAgdmFyIHNob3J0Y3V0S2V5ID0g V2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQubWFrZUtleUZyb21FdmVudChlKTsKKworICAg ICAgICBpZiAodGhpcy5yZWFkT25seSgpICYmIHNob3J0Y3V0S2V5ICE9PSBXZWJJbnNwZWN0b3Iu S2V5Ym9hcmRTaG9ydGN1dC5TRUxFQ1RfQUxMKQogICAgICAgICAgICAgcmV0dXJuOwogCi0gICAg ICAgIHZhciBzaG9ydGN1dEtleSA9IFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0Lm1ha2VL ZXlGcm9tRXZlbnQoZSk7CiAgICAgICAgIHZhciBoYW5kbGVyID0gdGhpcy5fc2hvcnRjdXRzW3No b3J0Y3V0S2V5XTsKICAgICAgICAgaWYgKGhhbmRsZXIgJiYgaGFuZGxlcigpKQogICAgICAgICAg ICAgZS5jb25zdW1lKHRydWUpOwpAQCAtMTQ4Miw2ICsxNDg1LDE1IEBAIFdlYkluc3BlY3Rvci5U ZXh0RWRpdG9yTWFpblBhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgcmV0dXJuIHRydWU7CiAg ICAgfSwKIAorICAgIGhhbmRsZVNlbGVjdEFsbDogZnVuY3Rpb24oKSB7CisgICAgICAgIHZhciBy YW5nZSA9IGRvY3VtZW50LmNyZWF0ZVJhbmdlKCk7CisKKyAgICAgICAgcmFuZ2Uuc2VsZWN0Tm9k ZSh0aGlzLl9jb250YWluZXIpOworICAgICAgICB3aW5kb3cuZ2V0U2VsZWN0aW9uKCkuYWRkUmFu Z2UocmFuZ2UpOworCisgICAgICAgIHJldHVybiB0cnVlOworICAgIH0sCisKICAgICAvKioKICAg ICAgKiBAcGFyYW0ge2Jvb2xlYW59IHNoaWZ0S2V5CiAgICAgICovCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0tleWJvYXJkU2hvcnRjdXQuanMgYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0tleWJvYXJkU2hvcnRjdXQuanMKaW5kZXgg MzA1ZDliMTA1ZmUwZmNlM2QxNDA1NjBlMjE4NzZjOGMxZTc1ZTI5Ni4uMGU1Y2IzMDIyODQyNWM4 MjZlMWNhY2Y5NWIwY2NhMTIwZTc1ZWZhZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9LZXlib2FyZFNob3J0Y3V0LmpzCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvS2V5Ym9hcmRTaG9ydGN1dC5qcwpAQCAtMTc1LDMgKzE3NSw1 IEBAIFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0Ll9tb2RpZmllcnNUb1N0cmluZyA9IGZ1 bmN0aW9uKG1vZGlmaWVycykKIAogICAgIHJldHVybiByZXM7CiB9OworCitXZWJJbnNwZWN0b3Iu S2V5Ym9hcmRTaG9ydGN1dC5TRUxFQ1RfQUxMID0gV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRj dXQubWFrZUtleSgiYSIsIFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0Lk1vZGlmaWVycy5D dHJsT3JNZXRhKTsK 173223 2012-11-09 00:17:26 -0800 2012-11-09 00:50:10 -0800 Patch bug-101591-20121109121534.patch text/plain 3974 lushnikov U3VidmVyc2lvbiBSZXZpc2lvbjogMTMzODU3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzYxN2NmOWM5ZDdiMWUz Y2EyNTNkZTExMGZlM2JjMjBjNGUwNjczZi4uZmM3M2EyZDI2NDE1Yjk0YTBiYTM3OWYyZjJmMjMz ZmMwZjliOWNjNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEyLTExLTA4ICBBbmRy ZXkgTHVzaG5pa292ICA8bHVzaG5pa292QGdvb2dsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3Bl Y3RvcjogQ3RybCtBIGluIHRoZSBuZXR3b3JrIHBhbmVsIHNob3VsZCBzZWxlY3QgcmVzb3VyY2Ug Y29udGVudCwgbm90IHRoZSBlbnRpcmUgcGFuZWwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMTU5MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEludGVyY2VwdCBDdHJsK0EgZXZlbnQgaW4gRGVmYXVsdFRl eHRFZGl0b3IgdG8gc2VsZWN0IHJlc291cmNlIGNvbnRlbnQKKworICAgICAgICAqIGluc3BlY3Rv ci9mcm9udC1lbmQvRGVmYXVsdFRleHRFZGl0b3IuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu RGVmYXVsdFRleHRFZGl0b3IucHJvdG90eXBlLl9yZWdpc3RlclNob3J0Y3V0cyk6IEFkZGVkIEN0 cmwrQQorICAgICAgICAoV2ViSW5zcGVjdG9yLkRlZmF1bHRUZXh0RWRpdG9yLnByb3RvdHlwZS5f aGFuZGxlS2V5RG93bik6IEludGVyY2VwdCBDdHJsK0EgZXZlbiBmb3IgcmVhZG9ubHkgZmllbGRz CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGV4dEVkaXRvck1haW5QYW5lbC5wcm90b3R5cGUuaGFu ZGxlU2VsZWN0QWxsKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0tleWJvYXJkU2hv cnRjdXQuanM6IEFkZGVkIFNFTEVDVF9BTEwgY29uc3RhbnQgZm9yIEN0cmwrQSBjb21iaW5hdGlv bgorCiAyMDEyLTExLTA3ICBWc2V2b2xvZCBWbGFzb3YgIDx2c2V2aWtAY2hyb21pdW0ub3JnPgog CiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IGNvbnNvbGUgZXJyb3IgYWZ0ZXIgaW5zcGVjdGluZyBJ bmRleGVkREIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv RGVmYXVsdFRleHRFZGl0b3IuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L0RlZmF1bHRUZXh0RWRpdG9yLmpzCmluZGV4IGQyNjliYzI3NjJkNjZmYzdmMDk2ZmY0ZDJhNjI4 OGExODEyMDFkODguLmU3MzBhZDYyNWFjMjZiMjllOWZjNDcwNzkzZmExMTg3NmI2YTllZmMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGVmYXVsdFRleHRF ZGl0b3IuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZWZhdWx0 VGV4dEVkaXRvci5qcwpAQCAtNDA3LDEwICs0MDcsMTAgQEAgV2ViSW5zcGVjdG9yLkRlZmF1bHRU ZXh0RWRpdG9yLnByb3RvdHlwZSA9IHsKICAgICAgICAgdmFyIGhhbmRsZUVudGVyS2V5ID0gdGhp cy5fbWFpblBhbmVsLmhhbmRsZUVudGVyS2V5LmJpbmQodGhpcy5fbWFpblBhbmVsKTsKICAgICAg ICAgdGhpcy5fc2hvcnRjdXRzW1dlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0Lm1ha2VLZXko a2V5cy5FbnRlci5jb2RlLCBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5Nb2RpZmllcnMu Tm9uZSldID0gaGFuZGxlRW50ZXJLZXk7CiAKLSAgICAgICAgdmFyIGhhbmRsZVVuZG8gPSB0aGlz Ll9tYWluUGFuZWwuaGFuZGxlVW5kb1JlZG8uYmluZCh0aGlzLl9tYWluUGFuZWwsIGZhbHNlKTsK ICAgICAgICAgdmFyIGhhbmRsZVJlZG8gPSB0aGlzLl9tYWluUGFuZWwuaGFuZGxlVW5kb1JlZG8u YmluZCh0aGlzLl9tYWluUGFuZWwsIHRydWUpOwotICAgICAgICB0aGlzLl9zaG9ydGN1dHNbV2Vi SW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQubWFrZUtleSgieiIsIG1vZGlmaWVycy5DdHJsT3JN ZXRhKV0gPSBoYW5kbGVVbmRvOworICAgICAgICB0aGlzLl9zaG9ydGN1dHNbV2ViSW5zcGVjdG9y LktleWJvYXJkU2hvcnRjdXQubWFrZUtleSgieiIsIG1vZGlmaWVycy5DdHJsT3JNZXRhKV0gPSB0 aGlzLl9tYWluUGFuZWwuaGFuZGxlVW5kb1JlZG8uYmluZCh0aGlzLl9tYWluUGFuZWwsIGZhbHNl KTsKICAgICAgICAgdGhpcy5fc2hvcnRjdXRzW1dlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0 Lm1ha2VLZXkoInoiLCBtb2RpZmllcnMuU2hpZnQgfCBtb2RpZmllcnMuQ3RybE9yTWV0YSldID0g aGFuZGxlUmVkbzsKKyAgICAgICAgdGhpcy5fc2hvcnRjdXRzW1dlYkluc3BlY3Rvci5LZXlib2Fy ZFNob3J0Y3V0LlNlbGVjdEFsbF0gPSB0aGlzLl9oYW5kbGVTZWxlY3RBbGwuYmluZCh0aGlzKTsK ICAgICAgICAgaWYgKCFXZWJJbnNwZWN0b3IuaXNNYWMoKSkKICAgICAgICAgICAgIHRoaXMuX3No b3J0Y3V0c1tXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5tYWtlS2V5KCJ5IiwgbW9kaWZp ZXJzLkN0cmxPck1ldGEpXSA9IGhhbmRsZVJlZG87CiAKQEAgLTQyMCwxMiArNDIwLDE5IEBAIFdl Ykluc3BlY3Rvci5EZWZhdWx0VGV4dEVkaXRvci5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMu X3Nob3J0Y3V0c1tXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5tYWtlS2V5KGtleXMuVGFi LmNvZGUsIG1vZGlmaWVycy5TaGlmdCldID0gaGFuZGxlU2hpZnRUYWJLZXk7CiAgICAgfSwKIAor ICAgIF9oYW5kbGVTZWxlY3RBbGw6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIHRoaXMuc2V0 U2VsZWN0aW9uKHRoaXMuX3RleHRNb2RlbC5yYW5nZSgpKTsKKyAgICAgICAgcmV0dXJuIHRydWU7 CisgICAgfSwKKwogICAgIF9oYW5kbGVLZXlEb3duOiBmdW5jdGlvbihlKQogICAgIHsKLSAgICAg ICAgaWYgKHRoaXMucmVhZE9ubHkoKSkKKyAgICAgICAgdmFyIHNob3J0Y3V0S2V5ID0gV2ViSW5z cGVjdG9yLktleWJvYXJkU2hvcnRjdXQubWFrZUtleUZyb21FdmVudChlKTsKKworICAgICAgICBp ZiAodGhpcy5yZWFkT25seSgpICYmIHNob3J0Y3V0S2V5ICE9PSBXZWJJbnNwZWN0b3IuS2V5Ym9h cmRTaG9ydGN1dC5TZWxlY3RBbGwpCiAgICAgICAgICAgICByZXR1cm47CiAKLSAgICAgICAgdmFy IHNob3J0Y3V0S2V5ID0gV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQubWFrZUtleUZyb21F dmVudChlKTsKICAgICAgICAgdmFyIGhhbmRsZXIgPSB0aGlzLl9zaG9ydGN1dHNbc2hvcnRjdXRL ZXldOwogICAgICAgICBpZiAoaGFuZGxlciAmJiBoYW5kbGVyKCkpCiAgICAgICAgICAgICBlLmNv bnN1bWUodHJ1ZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL0tleWJvYXJkU2hvcnRjdXQuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL0tleWJvYXJkU2hvcnRjdXQuanMKaW5kZXggMzA1ZDliMTA1ZmUwZmNlM2QxNDA1NjBlMjE4 NzZjOGMxZTc1ZTI5Ni4uNGM0MmQ5MmExY2YzYjg3MjlmMThiNTZkMGNjOWE0YjQxODM0OWVmNSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9LZXlib2FyZFNo b3J0Y3V0LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvS2V5Ym9h cmRTaG9ydGN1dC5qcwpAQCAtMTc1LDMgKzE3NSw1IEBAIFdlYkluc3BlY3Rvci5LZXlib2FyZFNo b3J0Y3V0Ll9tb2RpZmllcnNUb1N0cmluZyA9IGZ1bmN0aW9uKG1vZGlmaWVycykKIAogICAgIHJl dHVybiByZXM7CiB9OworCitXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5TZWxlY3RBbGwg PSBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5tYWtlS2V5KCJhIiwgV2ViSW5zcGVjdG9y LktleWJvYXJkU2hvcnRjdXQuTW9kaWZpZXJzLkN0cmxPck1ldGEpOwo= 173230 2012-11-09 00:50:14 -0800 2012-11-09 01:20:31 -0800 Patch bug-101591-20121109124822.patch text/plain 4552 lushnikov U3VidmVyc2lvbiBSZXZpc2lvbjogMTMzODU3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzYxN2NmOWM5ZDdiMWUz Y2EyNTNkZTExMGZlM2JjMjBjNGUwNjczZi4uYmQyNmIyNmQ2MWQ4N2YxNTE5NjIyNjQxMzU3YjVh NWNiOGYxNDNiOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEyLTExLTA4ICBBbmRy ZXkgTHVzaG5pa292ICA8bHVzaG5pa292QGdvb2dsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3Bl Y3RvcjogQ3RybCtBIGluIHRoZSBuZXR3b3JrIHBhbmVsIHNob3VsZCBzZWxlY3QgcmVzb3VyY2Ug Y29udGVudCwgbm90IHRoZSBlbnRpcmUgcGFuZWwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMTU5MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEludGVyY2VwdCBDdHJsK0EgZXZlbnQgaW4gRGVmYXVsdFRl eHRFZGl0b3IgdG8gc2VsZWN0IHJlc291cmNlIGNvbnRlbnQKKworICAgICAgICAqIGluc3BlY3Rv ci9mcm9udC1lbmQvRGVmYXVsdFRleHRFZGl0b3IuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu RGVmYXVsdFRleHRFZGl0b3IucHJvdG90eXBlLl9yZWdpc3RlclNob3J0Y3V0cyk6IEFkZGVkIEN0 cmwrQQorICAgICAgICAoV2ViSW5zcGVjdG9yLkRlZmF1bHRUZXh0RWRpdG9yLnByb3RvdHlwZS5f aGFuZGxlS2V5RG93bik6IEludGVyY2VwdCBDdHJsK0EgZXZlbiBmb3IgcmVhZG9ubHkgZmllbGRz CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGV4dEVkaXRvck1haW5QYW5lbC5wcm90b3R5cGUuaGFu ZGxlU2VsZWN0QWxsKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0tleWJvYXJkU2hv cnRjdXQuanM6IEFkZGVkIFNlbGVjdEFsbCBjb25zdGFudCBmb3IgQ3RybCtBIGNvbWJpbmF0aW9u CisKIDIwMTItMTEtMDcgIFZzZXZvbG9kIFZsYXNvdiAgPHZzZXZpa0BjaHJvbWl1bS5vcmc+CiAK ICAgICAgICAgV2ViIEluc3BlY3RvcjogY29uc29sZSBlcnJvciBhZnRlciBpbnNwZWN0aW5nIElu ZGV4ZWREQgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9E ZWZhdWx0VGV4dEVkaXRvci5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv RGVmYXVsdFRleHRFZGl0b3IuanMKaW5kZXggZDI2OWJjMjc2MmQ2NmZjN2YwOTZmZjRkMmE2Mjg4 YTE4MTIwMWQ4OC4uNWM2ODAxZThjZDVjZGYwZGY1ZjA3NjYwZTE5ZWY5ZDdlYWM3MTUwYSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZWZhdWx0VGV4dEVk aXRvci5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RlZmF1bHRU ZXh0RWRpdG9yLmpzCkBAIC00MDcsOSArNDA3LDEwIEBAIFdlYkluc3BlY3Rvci5EZWZhdWx0VGV4 dEVkaXRvci5wcm90b3R5cGUgPSB7CiAgICAgICAgIHZhciBoYW5kbGVFbnRlcktleSA9IHRoaXMu X21haW5QYW5lbC5oYW5kbGVFbnRlcktleS5iaW5kKHRoaXMuX21haW5QYW5lbCk7CiAgICAgICAg IHRoaXMuX3Nob3J0Y3V0c1tXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5tYWtlS2V5KGtl eXMuRW50ZXIuY29kZSwgV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQuTW9kaWZpZXJzLk5v bmUpXSA9IGhhbmRsZUVudGVyS2V5OwogCi0gICAgICAgIHZhciBoYW5kbGVVbmRvID0gdGhpcy5f bWFpblBhbmVsLmhhbmRsZVVuZG9SZWRvLmJpbmQodGhpcy5fbWFpblBhbmVsLCBmYWxzZSk7Cisg ICAgICAgIHRoaXMuX3Nob3J0Y3V0c1tXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5tYWtl S2V5KCJ6IiwgbW9kaWZpZXJzLkN0cmxPck1ldGEpXSA9IHRoaXMuX21haW5QYW5lbC5oYW5kbGVV bmRvUmVkby5iaW5kKHRoaXMuX21haW5QYW5lbCwgZmFsc2UpOworICAgICAgICB0aGlzLl9zaG9y dGN1dHNbV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQuU2VsZWN0QWxsXSA9IHRoaXMuX2hh bmRsZVNlbGVjdEFsbC5iaW5kKHRoaXMpOworCiAgICAgICAgIHZhciBoYW5kbGVSZWRvID0gdGhp cy5fbWFpblBhbmVsLmhhbmRsZVVuZG9SZWRvLmJpbmQodGhpcy5fbWFpblBhbmVsLCB0cnVlKTsK LSAgICAgICAgdGhpcy5fc2hvcnRjdXRzW1dlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0Lm1h a2VLZXkoInoiLCBtb2RpZmllcnMuQ3RybE9yTWV0YSldID0gaGFuZGxlVW5kbzsKICAgICAgICAg dGhpcy5fc2hvcnRjdXRzW1dlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0Lm1ha2VLZXkoInoi LCBtb2RpZmllcnMuU2hpZnQgfCBtb2RpZmllcnMuQ3RybE9yTWV0YSldID0gaGFuZGxlUmVkbzsK ICAgICAgICAgaWYgKCFXZWJJbnNwZWN0b3IuaXNNYWMoKSkKICAgICAgICAgICAgIHRoaXMuX3No b3J0Y3V0c1tXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5tYWtlS2V5KCJ5IiwgbW9kaWZp ZXJzLkN0cmxPck1ldGEpXSA9IGhhbmRsZVJlZG87CkBAIC00MjAsMTIgKzQyMSwxNiBAQCBXZWJJ bnNwZWN0b3IuRGVmYXVsdFRleHRFZGl0b3IucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLl9z aG9ydGN1dHNbV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQubWFrZUtleShrZXlzLlRhYi5j b2RlLCBtb2RpZmllcnMuU2hpZnQpXSA9IGhhbmRsZVNoaWZ0VGFiS2V5OwogICAgIH0sCiAKLSAg ICBfaGFuZGxlS2V5RG93bjogZnVuY3Rpb24oZSkKKyAgICBfaGFuZGxlU2VsZWN0QWxsOiBmdW5j dGlvbigpCiAgICAgewotICAgICAgICBpZiAodGhpcy5yZWFkT25seSgpKQotICAgICAgICAgICAg cmV0dXJuOworICAgICAgICB0aGlzLnNldFNlbGVjdGlvbih0aGlzLl90ZXh0TW9kZWwucmFuZ2Uo KSk7CisgICAgICAgIHJldHVybiB0cnVlOworICAgIH0sCiAKKyAgICBfaGFuZGxlS2V5RG93bjog ZnVuY3Rpb24oZSkKKyAgICB7CiAgICAgICAgIHZhciBzaG9ydGN1dEtleSA9IFdlYkluc3BlY3Rv ci5LZXlib2FyZFNob3J0Y3V0Lm1ha2VLZXlGcm9tRXZlbnQoZSk7CisKICAgICAgICAgdmFyIGhh bmRsZXIgPSB0aGlzLl9zaG9ydGN1dHNbc2hvcnRjdXRLZXldOwogICAgICAgICBpZiAoaGFuZGxl ciAmJiBoYW5kbGVyKCkpCiAgICAgICAgICAgICBlLmNvbnN1bWUodHJ1ZSk7CkBAIC0xNDU2LDYg KzE0NjEsOSBAQCBXZWJJbnNwZWN0b3IuVGV4dEVkaXRvck1haW5QYW5lbC5wcm90b3R5cGUgPSB7 CiAgICAgICovCiAgICAgaGFuZGxlVW5kb1JlZG86IGZ1bmN0aW9uKHJlZG8pCiAgICAgeworICAg ICAgICBpZiAodGhpcy5yZWFkT25seSgpKQorICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworCiAg ICAgICAgIGlmICh0aGlzLl9kaXJ0eUxpbmVzKQogICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwog CkBAIC0xNDg3LDYgKzE0OTUsOSBAQCBXZWJJbnNwZWN0b3IuVGV4dEVkaXRvck1haW5QYW5lbC5w cm90b3R5cGUgPSB7CiAgICAgICovCiAgICAgaGFuZGxlVGFiS2V5UHJlc3M6IGZ1bmN0aW9uKHNo aWZ0S2V5KQogICAgIHsKKyAgICAgICAgaWYgKHRoaXMucmVhZE9ubHkoKSkKKyAgICAgICAgICAg IHJldHVybiBmYWxzZTsKKwogICAgICAgICBpZiAodGhpcy5fZGlydHlMaW5lcykKICAgICAgICAg ICAgIHJldHVybiBmYWxzZTsKIApAQCAtMTU5Miw2ICsxNjAzLDkgQEAgV2ViSW5zcGVjdG9yLlRl eHRFZGl0b3JNYWluUGFuZWwucHJvdG90eXBlID0gewogCiAgICAgaGFuZGxlRW50ZXJLZXk6IGZ1 bmN0aW9uKCkKICAgICB7CisgICAgICAgIGlmICh0aGlzLnJlYWRPbmx5KCkpCisgICAgICAgICAg ICByZXR1cm4gZmFsc2U7CisKICAgICAgICAgaWYgKHRoaXMuX2RpcnR5TGluZXMpCiAgICAgICAg ICAgICByZXR1cm4gZmFsc2U7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvS2V5Ym9hcmRTaG9ydGN1dC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvS2V5Ym9hcmRTaG9ydGN1dC5qcwppbmRleCAzMDVkOWIxMDVmZTBmY2UzZDE0 MDU2MGUyMTg3NmM4YzFlNzVlMjk2Li40YzQyZDkyYTFjZjNiODcyOWYxOGI1NmQwY2M5YTRiNDE4 MzQ5ZWY1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0tl eWJvYXJkU2hvcnRjdXQuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9LZXlib2FyZFNob3J0Y3V0LmpzCkBAIC0xNzUsMyArMTc1LDUgQEAgV2ViSW5zcGVjdG9yLktl eWJvYXJkU2hvcnRjdXQuX21vZGlmaWVyc1RvU3RyaW5nID0gZnVuY3Rpb24obW9kaWZpZXJzKQog CiAgICAgcmV0dXJuIHJlczsKIH07CisKK1dlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0LlNl bGVjdEFsbCA9IFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0Lm1ha2VLZXkoImEiLCBXZWJJ bnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5Nb2RpZmllcnMuQ3RybE9yTWV0YSk7Cg==