107648 2013-01-23 01:46:42 -0800 Web Inspector: allow user to resize inspector window by dragging the toolbar 2013-01-24 05:41:14 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 dgozman dgozman aandrey abarth apavlov dglazkov fishd jamesr keishi loislo pfeldman pmuellr tkent+wkapi vsevik web-inspector-bugs webkit.review.bot yurys oldest_to_newest 814001 0 dgozman 2013-01-23 01:46:42 -0800 When user drags toolbar in docked to bottom mode, we should change the height of the inspector window. 814057 1 184189 dgozman 2013-01-23 03:08:40 -0800 Created attachment 184189 Patch 814061 2 webkit.review.bot 2013-01-23 03:10:42 -0800 Please wait for approval from abarth@webkit.org, dglazkov@chromium.org, fishd@chromium.org, jamesr@chromium.org or tkent@chromium.org before submitting, as this patch contains changes to the Chromium public API. See also https://trac.webkit.org/wiki/ChromiumWebKitAPI. 814093 3 184189 pfeldman 2013-01-23 04:15:57 -0800 Comment on attachment 184189 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=184189&action=review A couple of nits and it is good to land. > Source/WebCore/inspector/front-end/DockController.js:97 > + isDockedToBottom: function() { { should be on the next line > Source/WebCore/inspector/front-end/DockController.js:-125 > - WebInspector.toolbar.setDockedToBottom(this._dockSide === WebInspector.DockController.State.DockedToBottom); I like reversing this dependency. > Source/WebCore/inspector/front-end/Toolbar.js:124 > + this.element.lastHeight = window.innerHeight; Why storing this property on element? Store it on this with private field. 814100 4 184202 dgozman 2013-01-23 04:45:45 -0800 Created attachment 184202 Patch 814318 5 184202 webkit.review.bot 2013-01-23 10:24:07 -0800 Comment on attachment 184202 Patch Clearing flags on attachment: 184202 Committed r140543: <http://trac.webkit.org/changeset/140543> 814319 6 webkit.review.bot 2013-01-23 10:24:11 -0800 All reviewed patches have been landed. Closing bug. 815370 7 aandrey 2013-01-24 05:41:14 -0800 FYI. plz get used to run JSCompiler WebCore/inspector/compile-front-end.py from time to time: Source/WebCore/inspector/front-end/Toolbar.js:104: WARNING - inconsistent return type found : (boolean|null) required: boolean return WebInspector.dockController && WebInspector.dockController.isDockedToBottom(); 184189 2013-01-23 03:08:40 -0800 2013-01-23 04:45:36 -0800 Patch bug-107648-20130123150533.patch text/plain 6655 dgozman SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE0MDUzMSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBACisyMDEzLTAxLTIzICBEbWl0cnkg R296bWFuICA8ZGdvem1hbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3BlY3Rvcjog YmV0dGVyIGhhbmRsZSB0b29sYmFyIGRyYWdnaW5nIHRvIGNoYW5nZSBoZWlnaHQgb2YgaW5zcGVj dG9yIHdpbmRvdy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTEwNzY0OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIFRoaXMgZGlkIG5vdCB3b3JrIGJlZm9yZSB5b3UgY2xpY2sgZG9jayBidXR0b24gb25jZS4K KyAgICAgICAgQWxzbywgbGFzdCBkcmFnIHBvc2l0aW9uIHdhcyBub3QgcmVzcGVjdGVkLgorCisg ICAgICAgIE5vIG5ldyB0ZXN0cywgYmVjYXVzZSBvZiBwdXJlIGluc3BlY3RvciBVSSBjaGFuZ2Uu CisKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0RvY2tDb250cm9sbGVyLmpzOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLkRvY2tDb250cm9sbGVyLnByb3RvdHlwZS5pc0RvY2tlZFRvQm90 dG9tKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1Rvb2xiYXIuanM6CisgICAgICAg IChXZWJJbnNwZWN0b3IuVG9vbGJhci5wcm90b3R5cGUuX2lzRG9ja2VkVG9Cb3R0b20pOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLlRvb2xiYXIucHJvdG90eXBlLl90b29sYmFyRHJhZ1N0YXJ0KToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5Ub29sYmFyLnByb3RvdHlwZS5fdG9vbGJhckRyYWdFbmQp OgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRvb2xiYXIucHJvdG90eXBlLl90b29sYmFyRHJhZyk6 CisKIDIwMTMtMDEtMjMgIFRha2FzaGkgU2FrYW1vdG8gIDx0YXNha0Bnb29nbGUuY29tPgogCiAg ICAgICAgIFtSZWZhY3RvcmluZ10gUmVtb3ZlIGVsZW1lbnRQYXJlbnRTdHlsZSBmcm9tIFNlbGVj dG9yQ2hlY2tlckNvbnRleHQKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvRG9ja0NvbnRyb2xsZXIuanMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9Eb2NrQ29udHJvbGxlci5qcwkocmV2aXNpb24gMTQwNTI1KQorKysgU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Eb2NrQ29udHJvbGxlci5qcwkod29ya2lu ZyBjb3B5KQpAQCAtOTIsNiArOTIsMTMgQEAgV2ViSW5zcGVjdG9yLkRvY2tDb250cm9sbGVyLnBy b3RvdHlwZSA9CiAgICAgfSwKIAogICAgIC8qKgorICAgICAqIEByZXR1cm4ge2Jvb2xlYW59Cisg ICAgICovCisgICAgaXNEb2NrZWRUb0JvdHRvbTogZnVuY3Rpb24oKSB7CisgICAgICAgIHJldHVy biB0aGlzLl9kb2NrU2lkZSA9PSBXZWJJbnNwZWN0b3IuRG9ja0NvbnRyb2xsZXIuU3RhdGUuRG9j a2VkVG9Cb3R0b207CisgICAgfSwKKworICAgIC8qKgogICAgICAqIEBwYXJhbSB7Ym9vbGVhbn0g dW5hdmFpbGFibGUKICAgICAgKi8KICAgICBzZXREb2NraW5nVW5hdmFpbGFibGU6IGZ1bmN0aW9u KHVuYXZhaWxhYmxlKQpAQCAtMTIxLDggKzEyOCw2IEBAIFdlYkluc3BlY3Rvci5Eb2NrQ29udHJv bGxlci5wcm90b3R5cGUgPQogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIH0KIAotICAgICAg ICBpZiAoV2ViSW5zcGVjdG9yLnRvb2xiYXIpCi0gICAgICAgICAgICBXZWJJbnNwZWN0b3IudG9v bGJhci5zZXREb2NrZWRUb0JvdHRvbSh0aGlzLl9kb2NrU2lkZSA9PT0gV2ViSW5zcGVjdG9yLkRv Y2tDb250cm9sbGVyLlN0YXRlLkRvY2tlZFRvQm90dG9tKTsKICAgICAgICAgaWYgKFdlYkluc3Bl Y3Rvci5zZXR0aW5ncy5zaG93VG9vbGJhckljb25zLmdldCgpKQogICAgICAgICAgICAgZG9jdW1l bnQuYm9keS5hZGRTdHlsZUNsYXNzKCJzaG93LXRvb2xiYXItaWNvbnMiKTsKICAgICAgICAgZWxz ZQpJbmRleDogU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Ub29sYmFyLmpzCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVG9vbGJhci5q cwkocmV2aXNpb24gMTQwNTI1KQorKysgU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9Ub29sYmFyLmpzCSh3b3JraW5nIGNvcHkpCkBAIC05NywxMSArOTcsMTEgQEAgV2ViSW5zcGVj dG9yLlRvb2xiYXIucHJvdG90eXBlID0gewogICAgIH0sCiAKICAgICAvKioKLSAgICAgKiBAcGFy YW0ge2Jvb2xlYW59IGRvY2tlZFRvQm90dG9tCisgICAgICogQHJldHVybiB7Ym9vbGVhbn0KICAg ICAgKi8KLSAgICBzZXREb2NrZWRUb0JvdHRvbTogZnVuY3Rpb24oZG9ja2VkVG9Cb3R0b20pCisg ICAgX2lzRG9ja2VkVG9Cb3R0b206IGZ1bmN0aW9uKCkKICAgICB7Ci0gICAgICAgIHRoaXMuX2lz RG9ja2VkVG9Cb3R0b20gPSBkb2NrZWRUb0JvdHRvbTsKKyAgICAgICAgcmV0dXJuIFdlYkluc3Bl Y3Rvci5kb2NrQ29udHJvbGxlciAmJiBXZWJJbnNwZWN0b3IuZG9ja0NvbnRyb2xsZXIuaXNEb2Nr ZWRUb0JvdHRvbSgpOwogICAgIH0sCiAKICAgICAvKioKQEAgLTEwOSw3ICsxMDksNyBAQCBXZWJJ bnNwZWN0b3IuVG9vbGJhci5wcm90b3R5cGUgPSB7CiAgICAgICovCiAgICAgX3Rvb2xiYXJEcmFn U3RhcnQ6IGZ1bmN0aW9uKGV2ZW50KQogICAgIHsKLSAgICAgICAgaWYgKCghdGhpcy5faXNEb2Nr ZWRUb0JvdHRvbSAmJiBXZWJJbnNwZWN0b3IucGxhdGZvcm1GbGF2b3IoKSAhPT0gV2ViSW5zcGVj dG9yLlBsYXRmb3JtRmxhdm9yLk1hY0xlb3BhcmQgJiYgV2ViSW5zcGVjdG9yLnBsYXRmb3JtRmxh dm9yKCkgIT09IFdlYkluc3BlY3Rvci5QbGF0Zm9ybUZsYXZvci5NYWNTbm93TGVvcGFyZCkgfHwg V2ViSW5zcGVjdG9yLnBvcnQoKSA9PSAicXQiKQorICAgICAgICBpZiAoKCF0aGlzLl9pc0RvY2tl ZFRvQm90dG9tKCkgJiYgV2ViSW5zcGVjdG9yLnBsYXRmb3JtRmxhdm9yKCkgIT09IFdlYkluc3Bl Y3Rvci5QbGF0Zm9ybUZsYXZvci5NYWNMZW9wYXJkICYmIFdlYkluc3BlY3Rvci5wbGF0Zm9ybUZs YXZvcigpICE9PSBXZWJJbnNwZWN0b3IuUGxhdGZvcm1GbGF2b3IuTWFjU25vd0xlb3BhcmQpIHx8 IFdlYkluc3BlY3Rvci5wb3J0KCkgPT0gInF0IikKICAgICAgICAgICAgIHJldHVybiBmYWxzZTsK IAogICAgICAgICB2YXIgdGFyZ2V0ID0gZXZlbnQudGFyZ2V0OwpAQCAtMTIxLDE5ICsxMjEsMjUg QEAgV2ViSW5zcGVjdG9yLlRvb2xiYXIucHJvdG90eXBlID0gewogCiAgICAgICAgIHRoaXMuZWxl bWVudC5sYXN0U2NyZWVuWCA9IGV2ZW50LnNjcmVlblg7CiAgICAgICAgIHRoaXMuZWxlbWVudC5s YXN0U2NyZWVuWSA9IGV2ZW50LnNjcmVlblk7CisgICAgICAgIHRoaXMuZWxlbWVudC5sYXN0SGVp Z2h0ID0gd2luZG93LmlubmVySGVpZ2h0OwogICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICB9LAog CiAgICAgX3Rvb2xiYXJEcmFnRW5kOiBmdW5jdGlvbihldmVudCkKICAgICB7CisgICAgICAgIC8v IFdlIG1heSBub3QgZ2V0IHRoZSBkcmFnIGV2ZW50IGF0IHRoZSBlbmQuCisgICAgICAgIC8vIEFw cGx5IGxhc3QgY2hhbmdlcyBtYW51YWxseS4KKyAgICAgICAgdGhpcy5fdG9vbGJhckRyYWcoZXZl bnQpOwogICAgICAgICBkZWxldGUgdGhpcy5lbGVtZW50Lmxhc3RTY3JlZW5YOwogICAgICAgICBk ZWxldGUgdGhpcy5lbGVtZW50Lmxhc3RTY3JlZW5ZOworICAgICAgICBkZWxldGUgdGhpcy5lbGVt ZW50Lmxhc3RIZWlnaHQ7CiAgICAgfSwKIAogICAgIF90b29sYmFyRHJhZzogZnVuY3Rpb24oZXZl bnQpCiAgICAgewotICAgICAgICBpZiAodGhpcy5faXNEb2NrZWRUb0JvdHRvbSkgewotICAgICAg ICAgICAgdmFyIGhlaWdodCA9IHdpbmRvdy5pbm5lckhlaWdodCAtIChldmVudC5zY3JlZW5ZIC0g dGhpcy5lbGVtZW50Lmxhc3RTY3JlZW5ZKTsKKyAgICAgICAgaWYgKHRoaXMuX2lzRG9ja2VkVG9C b3R0b20oKSkgeworICAgICAgICAgICAgdmFyIGhlaWdodCA9IHRoaXMuZWxlbWVudC5sYXN0SGVp Z2h0IC0gKGV2ZW50LnNjcmVlblkgLSB0aGlzLmVsZW1lbnQubGFzdFNjcmVlblkpOworICAgICAg ICAgICAgdGhpcy5lbGVtZW50Lmxhc3RIZWlnaHQgPSBoZWlnaHQ7CiAKICAgICAgICAgICAgIElu c3BlY3RvckZyb250ZW5kSG9zdC5zZXRBdHRhY2hlZFdpbmRvd0hlaWdodChoZWlnaHQpOwogICAg ICAgICB9IGVsc2UgewpJbmRleDogU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE0 MDUzMSkKKysrIFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkp CkBAIC0xLDMgKzEsMTYgQEAKKzIwMTMtMDEtMjMgIERtaXRyeSBHb3ptYW4gIDxkZ296bWFuQGNo cm9taXVtLm9yZz4KKworICAgICAgICBBZGRlZCBjaGFuZ2VBdHRhY2hlZFdpbmRvd0hlaWdodCBt ZXRob2QgdG8gaW5zcGVjdG9yIGZyb250ZW5kIEFQSSwgd2hpY2gKKyAgICAgICAgYWxsb3dzIHRv IGNoYW5nZSBpbnNwZWN0b3Igd2luZG93IGhlaWdodCBmcm9tIGluc2lkZS4KKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwNzY0OAorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogcHVibGljL1dlYkRldlRvb2xz RnJvbnRlbmRDbGllbnQuaDoKKyAgICAgICAgKFdlYktpdDo6V2ViRGV2VG9vbHNGcm9udGVuZENs aWVudDo6Y2hhbmdlQXR0YWNoZWRXaW5kb3dIZWlnaHQpOgorICAgICAgICAqIHNyYy9JbnNwZWN0 b3JGcm9udGVuZENsaWVudEltcGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpJbnNwZWN0b3JGcm9u dGVuZENsaWVudEltcGw6OmNoYW5nZUF0dGFjaGVkV2luZG93SGVpZ2h0KToKKwogMjAxMy0wMS0y MiAgTWFyayBMYW0gIDxtYXJrLmxhbUBhcHBsZS5jb20+CiAKICAgICAgICAgQ2hhbmdlIHRoZSBT dXBwbGVtZW50YWJsZSBjbGFzcyB0byBub3QgdXNlIEF0b21pY1N0cmluZy4KSW5kZXg6IFNvdXJj ZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkRldlRvb2xzRnJvbnRlbmRDbGllbnQuaAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJEZXZUb29sc0Zyb250 ZW5kQ2xpZW50LmgJKHJldmlzaW9uIDE0MDUyNSkKKysrIFNvdXJjZS9XZWJLaXQvY2hyb21pdW0v cHVibGljL1dlYkRldlRvb2xzRnJvbnRlbmRDbGllbnQuaAkod29ya2luZyBjb3B5KQpAQCAtNDQs NiArNDQsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIHNlbmRNZXNzYWdlVG9CYWNrZW5k KGNvbnN0IFdlYlN0cmluZyYpIHsgfQogCiAgICAgdmlydHVhbCB2b2lkIGFjdGl2YXRlV2luZG93 KCkgeyB9CisgICAgdmlydHVhbCB2b2lkIGNoYW5nZUF0dGFjaGVkV2luZG93SGVpZ2h0KHVuc2ln bmVkIGhlaWdodCkgeyB9CiAgICAgdmlydHVhbCB2b2lkIGNsb3NlV2luZG93KCkgeyB9CiAgICAg dmlydHVhbCB2b2lkIHJlcXVlc3REb2NrV2luZG93KCkgeyB9CiAgICAgdmlydHVhbCB2b2lkIHJl cXVlc3RVbmRvY2tXaW5kb3coKSB7IH0KSW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3Jj L0luc3BlY3RvckZyb250ZW5kQ2xpZW50SW1wbC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YktpdC9jaHJvbWl1bS9zcmMvSW5zcGVjdG9yRnJvbnRlbmRDbGllbnRJbXBsLmNwcAkocmV2aXNp b24gMTQwNTI1KQorKysgU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvSW5zcGVjdG9yRnJvbnRl bmRDbGllbnRJbXBsLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTE0LDkgKzExNCw5IEBAIHZvaWQg SW5zcGVjdG9yRnJvbnRlbmRDbGllbnRJbXBsOjpyZXF1ZXMKICAgICBtX2NsaWVudC0+cmVxdWVz dFNldERvY2tTaWRlKHNpZGVTdHJpbmcpOwogfQogCi12b2lkIEluc3BlY3RvckZyb250ZW5kQ2xp ZW50SW1wbDo6Y2hhbmdlQXR0YWNoZWRXaW5kb3dIZWlnaHQodW5zaWduZWQpCit2b2lkIEluc3Bl Y3RvckZyb250ZW5kQ2xpZW50SW1wbDo6Y2hhbmdlQXR0YWNoZWRXaW5kb3dIZWlnaHQodW5zaWdu ZWQgaGVpZ2h0KQogewotICAgIC8vIERvIG5vdGhpbmc7CisgICAgbV9jbGllbnQtPmNoYW5nZUF0 dGFjaGVkV2luZG93SGVpZ2h0KGhlaWdodCk7CiB9CiAKIHZvaWQgSW5zcGVjdG9yRnJvbnRlbmRD bGllbnRJbXBsOjpvcGVuSW5OZXdUYWIoY29uc3QgU3RyaW5nJiB1cmwpCg== 184202 2013-01-23 04:45:45 -0800 2013-01-23 10:24:07 -0800 Patch bug-107648-20130123164238.patch text/plain 6878 dgozman SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE0MDUzMykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBACisyMDEzLTAxLTIzICBEbWl0cnkg R296bWFuICA8ZGdvem1hbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3BlY3Rvcjog YWxsb3cgdXNlciB0byByZXNpemUgaW5zcGVjdG9yIHdpbmRvdyBieSBkcmFnZ2luZyB0aGUgdG9v bGJhcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA3 NjQ4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhp cyBkaWQgbm90IHdvcmsgYmVmb3JlIHlvdSBjbGljayBkb2NrIGJ1dHRvbiBvbmNlLgorICAgICAg ICBBbHNvLCBsYXN0IGRyYWcgcG9zaXRpb24gd2FzIG5vdCByZXNwZWN0ZWQuCisKKyAgICAgICAg Tm8gbmV3IHRlc3RzLCBiZWNhdXNlIG9mIHB1cmUgaW5zcGVjdG9yIFVJIGNoYW5nZS4KKworICAg ICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvRG9ja0NvbnRyb2xsZXIuanM6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuRG9ja0NvbnRyb2xsZXIucHJvdG90eXBlLmlzRG9ja2VkVG9Cb3R0b20pOgor ICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvVG9vbGJhci5qczoKKyAgICAgICAgKFdlYklu c3BlY3Rvci5Ub29sYmFyLnByb3RvdHlwZS5faXNEb2NrZWRUb0JvdHRvbSk6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuVG9vbGJhci5wcm90b3R5cGUuX3Rvb2xiYXJEcmFnU3RhcnQpOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLlRvb2xiYXIucHJvdG90eXBlLl90b29sYmFyRHJhZ0VuZCk6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuVG9vbGJhci5wcm90b3R5cGUuX3Rvb2xiYXJEcmFnKToKKwogMjAx My0wMS0yMyAgQWRyaWFuIFBlcmV6IGRlIENhc3RybyAgPGFwZXJlekBpZ2FsaWEuY29tPgogCiAg ICAgICAgIFtHU3RyZWFtZXJdIEFkZCBPcHVzIE1JTUUgdHlwZSB0byB0aGUgbGlzdCBvZiBzdXBw b3J0ZWQgb25lcwpJbmRleDogU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Eb2Nr Q29udHJvbGxlci5qcwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL0RvY2tDb250cm9sbGVyLmpzCShyZXZpc2lvbiAxNDA1MzIpCisrKyBTb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RvY2tDb250cm9sbGVyLmpzCSh3b3JraW5nIGNvcHkp CkBAIC05Miw2ICs5MiwxNCBAQCBXZWJJbnNwZWN0b3IuRG9ja0NvbnRyb2xsZXIucHJvdG90eXBl ID0KICAgICB9LAogCiAgICAgLyoqCisgICAgICogQHJldHVybiB7Ym9vbGVhbn0KKyAgICAgKi8K KyAgICBpc0RvY2tlZFRvQm90dG9tOiBmdW5jdGlvbigpCisgICAgeworICAgICAgICByZXR1cm4g dGhpcy5fZG9ja1NpZGUgPT0gV2ViSW5zcGVjdG9yLkRvY2tDb250cm9sbGVyLlN0YXRlLkRvY2tl ZFRvQm90dG9tOworICAgIH0sCisKKyAgICAvKioKICAgICAgKiBAcGFyYW0ge2Jvb2xlYW59IHVu YXZhaWxhYmxlCiAgICAgICovCiAgICAgc2V0RG9ja2luZ1VuYXZhaWxhYmxlOiBmdW5jdGlvbih1 bmF2YWlsYWJsZSkKQEAgLTEyMSw4ICsxMjksNiBAQCBXZWJJbnNwZWN0b3IuRG9ja0NvbnRyb2xs ZXIucHJvdG90eXBlID0KICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9CiAKLSAgICAgICAg aWYgKFdlYkluc3BlY3Rvci50b29sYmFyKQotICAgICAgICAgICAgV2ViSW5zcGVjdG9yLnRvb2xi YXIuc2V0RG9ja2VkVG9Cb3R0b20odGhpcy5fZG9ja1NpZGUgPT09IFdlYkluc3BlY3Rvci5Eb2Nr Q29udHJvbGxlci5TdGF0ZS5Eb2NrZWRUb0JvdHRvbSk7CiAgICAgICAgIGlmIChXZWJJbnNwZWN0 b3Iuc2V0dGluZ3Muc2hvd1Rvb2xiYXJJY29ucy5nZXQoKSkKICAgICAgICAgICAgIGRvY3VtZW50 LmJvZHkuYWRkU3R5bGVDbGFzcygic2hvdy10b29sYmFyLWljb25zIik7CiAgICAgICAgIGVsc2UK QEAgLTE5OSw0ICsyMDUsNCBAQCBXZWJJbnNwZWN0b3IuRG9ja0NvbnRyb2xsZXIucHJvdG90eXBl ID0KIC8qKgogICogQHR5cGUgez9XZWJJbnNwZWN0b3IuRG9ja0NvbnRyb2xsZXJ9CiAgKi8KLVdl Ykluc3BlY3Rvci5kb2NrQ29udHJvbGxlciA9IG51bGw7ClwgTm8gbmV3bGluZSBhdCBlbmQgb2Yg ZmlsZQorV2ViSW5zcGVjdG9yLmRvY2tDb250cm9sbGVyID0gbnVsbDsKSW5kZXg6IFNvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVG9vbGJhci5qcwo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Rvb2xiYXIuanMJKHJldmlzaW9uIDE0MDUz MikKKysrIFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVG9vbGJhci5qcwkod29y a2luZyBjb3B5KQpAQCAtOTcsMTEgKzk3LDExIEBAIFdlYkluc3BlY3Rvci5Ub29sYmFyLnByb3Rv dHlwZSA9IHsKICAgICB9LAogCiAgICAgLyoqCi0gICAgICogQHBhcmFtIHtib29sZWFufSBkb2Nr ZWRUb0JvdHRvbQorICAgICAqIEByZXR1cm4ge2Jvb2xlYW59CiAgICAgICovCi0gICAgc2V0RG9j a2VkVG9Cb3R0b206IGZ1bmN0aW9uKGRvY2tlZFRvQm90dG9tKQorICAgIF9pc0RvY2tlZFRvQm90 dG9tOiBmdW5jdGlvbigpCiAgICAgewotICAgICAgICB0aGlzLl9pc0RvY2tlZFRvQm90dG9tID0g ZG9ja2VkVG9Cb3R0b207CisgICAgICAgIHJldHVybiBXZWJJbnNwZWN0b3IuZG9ja0NvbnRyb2xs ZXIgJiYgV2ViSW5zcGVjdG9yLmRvY2tDb250cm9sbGVyLmlzRG9ja2VkVG9Cb3R0b20oKTsKICAg ICB9LAogCiAgICAgLyoqCkBAIC0xMDksNyArMTA5LDcgQEAgV2ViSW5zcGVjdG9yLlRvb2xiYXIu cHJvdG90eXBlID0gewogICAgICAqLwogICAgIF90b29sYmFyRHJhZ1N0YXJ0OiBmdW5jdGlvbihl dmVudCkKICAgICB7Ci0gICAgICAgIGlmICgoIXRoaXMuX2lzRG9ja2VkVG9Cb3R0b20gJiYgV2Vi SW5zcGVjdG9yLnBsYXRmb3JtRmxhdm9yKCkgIT09IFdlYkluc3BlY3Rvci5QbGF0Zm9ybUZsYXZv ci5NYWNMZW9wYXJkICYmIFdlYkluc3BlY3Rvci5wbGF0Zm9ybUZsYXZvcigpICE9PSBXZWJJbnNw ZWN0b3IuUGxhdGZvcm1GbGF2b3IuTWFjU25vd0xlb3BhcmQpIHx8IFdlYkluc3BlY3Rvci5wb3J0 KCkgPT0gInF0IikKKyAgICAgICAgaWYgKCghdGhpcy5faXNEb2NrZWRUb0JvdHRvbSgpICYmIFdl Ykluc3BlY3Rvci5wbGF0Zm9ybUZsYXZvcigpICE9PSBXZWJJbnNwZWN0b3IuUGxhdGZvcm1GbGF2 b3IuTWFjTGVvcGFyZCAmJiBXZWJJbnNwZWN0b3IucGxhdGZvcm1GbGF2b3IoKSAhPT0gV2ViSW5z cGVjdG9yLlBsYXRmb3JtRmxhdm9yLk1hY1Nub3dMZW9wYXJkKSB8fCBXZWJJbnNwZWN0b3IucG9y dCgpID09ICJxdCIpCiAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICAgICAgdmFyIHRh cmdldCA9IGV2ZW50LnRhcmdldDsKQEAgLTEyMSwxOSArMTIxLDI1IEBAIFdlYkluc3BlY3Rvci5U b29sYmFyLnByb3RvdHlwZSA9IHsKIAogICAgICAgICB0aGlzLmVsZW1lbnQubGFzdFNjcmVlblgg PSBldmVudC5zY3JlZW5YOwogICAgICAgICB0aGlzLmVsZW1lbnQubGFzdFNjcmVlblkgPSBldmVu dC5zY3JlZW5ZOworICAgICAgICB0aGlzLl9sYXN0SGVpZ2h0RHVyaW5nRHJhZyA9IHdpbmRvdy5p bm5lckhlaWdodDsKICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgfSwKIAogICAgIF90b29sYmFy RHJhZ0VuZDogZnVuY3Rpb24oZXZlbnQpCiAgICAgeworICAgICAgICAvLyBXZSBtYXkgbm90IGdl dCB0aGUgZHJhZyBldmVudCBhdCB0aGUgZW5kLgorICAgICAgICAvLyBBcHBseSBsYXN0IGNoYW5n ZXMgbWFudWFsbHkuCisgICAgICAgIHRoaXMuX3Rvb2xiYXJEcmFnKGV2ZW50KTsKICAgICAgICAg ZGVsZXRlIHRoaXMuZWxlbWVudC5sYXN0U2NyZWVuWDsKICAgICAgICAgZGVsZXRlIHRoaXMuZWxl bWVudC5sYXN0U2NyZWVuWTsKKyAgICAgICAgZGVsZXRlIHRoaXMuX2xhc3RIZWlnaHREdXJpbmdE cmFnOwogICAgIH0sCiAKICAgICBfdG9vbGJhckRyYWc6IGZ1bmN0aW9uKGV2ZW50KQogICAgIHsK LSAgICAgICAgaWYgKHRoaXMuX2lzRG9ja2VkVG9Cb3R0b20pIHsKLSAgICAgICAgICAgIHZhciBo ZWlnaHQgPSB3aW5kb3cuaW5uZXJIZWlnaHQgLSAoZXZlbnQuc2NyZWVuWSAtIHRoaXMuZWxlbWVu dC5sYXN0U2NyZWVuWSk7CisgICAgICAgIGlmICh0aGlzLl9pc0RvY2tlZFRvQm90dG9tKCkpIHsK KyAgICAgICAgICAgIHZhciBoZWlnaHQgPSB0aGlzLl9sYXN0SGVpZ2h0RHVyaW5nRHJhZyAtIChl dmVudC5zY3JlZW5ZIC0gdGhpcy5lbGVtZW50Lmxhc3RTY3JlZW5ZKTsKKyAgICAgICAgICAgIHRo aXMuX2xhc3RIZWlnaHREdXJpbmdEcmFnID0gaGVpZ2h0OwogCiAgICAgICAgICAgICBJbnNwZWN0 b3JGcm9udGVuZEhvc3Quc2V0QXR0YWNoZWRXaW5kb3dIZWlnaHQoaGVpZ2h0KTsKICAgICAgICAg fSBlbHNlIHsKSW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCShyZXZpc2lvbiAxNDA1MzMp CisrKyBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAt MSwzICsxLDE2IEBACisyMDEzLTAxLTIzICBEbWl0cnkgR296bWFuICA8ZGdvem1hbkBjaHJvbWl1 bS5vcmc+CisKKyAgICAgICAgQWRkZWQgY2hhbmdlQXR0YWNoZWRXaW5kb3dIZWlnaHQgbWV0aG9k IHRvIGluc3BlY3RvciBmcm9udGVuZCBBUEksIHdoaWNoCisgICAgICAgIGFsbG93cyB0byBjaGFu Z2UgaW5zcGVjdG9yIHdpbmRvdyBoZWlnaHQgZnJvbSBpbnNpZGUuCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDc2NDgKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHB1YmxpYy9XZWJEZXZUb29sc0Zyb250 ZW5kQ2xpZW50Lmg6CisgICAgICAgIChXZWJLaXQ6OldlYkRldlRvb2xzRnJvbnRlbmRDbGllbnQ6 OmNoYW5nZUF0dGFjaGVkV2luZG93SGVpZ2h0KToKKyAgICAgICAgKiBzcmMvSW5zcGVjdG9yRnJv bnRlbmRDbGllbnRJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6SW5zcGVjdG9yRnJvbnRlbmRD bGllbnRJbXBsOjpjaGFuZ2VBdHRhY2hlZFdpbmRvd0hlaWdodCk6CisKIDIwMTMtMDEtMjIgIE1h cmsgTGFtICA8bWFyay5sYW1AYXBwbGUuY29tPgogCiAgICAgICAgIENoYW5nZSB0aGUgU3VwcGxl bWVudGFibGUgY2xhc3MgdG8gbm90IHVzZSBBdG9taWNTdHJpbmcuCkluZGV4OiBTb3VyY2UvV2Vi S2l0L2Nocm9taXVtL3B1YmxpYy9XZWJEZXZUb29sc0Zyb250ZW5kQ2xpZW50LmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViRGV2VG9vbHNGcm9udGVuZENs aWVudC5oCShyZXZpc2lvbiAxNDA1MzIpCisrKyBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1Ymxp Yy9XZWJEZXZUb29sc0Zyb250ZW5kQ2xpZW50LmgJKHdvcmtpbmcgY29weSkKQEAgLTQ0LDYgKzQ0 LDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCBzZW5kTWVzc2FnZVRvQmFja2VuZChjb25z dCBXZWJTdHJpbmcmKSB7IH0KIAogICAgIHZpcnR1YWwgdm9pZCBhY3RpdmF0ZVdpbmRvdygpIHsg fQorICAgIHZpcnR1YWwgdm9pZCBjaGFuZ2VBdHRhY2hlZFdpbmRvd0hlaWdodCh1bnNpZ25lZCBo ZWlnaHQpIHsgfQogICAgIHZpcnR1YWwgdm9pZCBjbG9zZVdpbmRvdygpIHsgfQogICAgIHZpcnR1 YWwgdm9pZCByZXF1ZXN0RG9ja1dpbmRvdygpIHsgfQogICAgIHZpcnR1YWwgdm9pZCByZXF1ZXN0 VW5kb2NrV2luZG93KCkgeyB9CkluZGV4OiBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9JbnNw ZWN0b3JGcm9udGVuZENsaWVudEltcGwuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQv Y2hyb21pdW0vc3JjL0luc3BlY3RvckZyb250ZW5kQ2xpZW50SW1wbC5jcHAJKHJldmlzaW9uIDE0 MDUzMikKKysrIFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL0luc3BlY3RvckZyb250ZW5kQ2xp ZW50SW1wbC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTExNCw5ICsxMTQsOSBAQCB2b2lkIEluc3Bl Y3RvckZyb250ZW5kQ2xpZW50SW1wbDo6cmVxdWVzCiAgICAgbV9jbGllbnQtPnJlcXVlc3RTZXRE b2NrU2lkZShzaWRlU3RyaW5nKTsKIH0KIAotdm9pZCBJbnNwZWN0b3JGcm9udGVuZENsaWVudElt cGw6OmNoYW5nZUF0dGFjaGVkV2luZG93SGVpZ2h0KHVuc2lnbmVkKQordm9pZCBJbnNwZWN0b3JG cm9udGVuZENsaWVudEltcGw6OmNoYW5nZUF0dGFjaGVkV2luZG93SGVpZ2h0KHVuc2lnbmVkIGhl aWdodCkKIHsKLSAgICAvLyBEbyBub3RoaW5nOworICAgIG1fY2xpZW50LT5jaGFuZ2VBdHRhY2hl ZFdpbmRvd0hlaWdodChoZWlnaHQpOwogfQogCiB2b2lkIEluc3BlY3RvckZyb250ZW5kQ2xpZW50 SW1wbDo6b3BlbkluTmV3VGFiKGNvbnN0IFN0cmluZyYgdXJsKQo=