69234 2011-10-02 20:55:47 -0700 Web Inspector: Factor out object properties popup 2011-10-04 09:18:26 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 61179 1 mnaganov mnaganov apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 476751 0 mnaganov 2011-10-02 20:55:47 -0700 The yellow onhover popup that is used in the debugger can be reused. Per pfeldman's comment to issue 61179, extracting it as a separate class. https://bugs.webkit.org/show_bug.cgi?id=61179#c15 476752 1 109434 mnaganov 2011-10-02 21:01:36 -0700 Created attachment 109434 Patch 476846 2 109434 pfeldman 2011-10-03 02:05:58 -0700 Comment on attachment 109434 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=109434&action=review > Source/WebCore/inspector/front-end/ObjectPropertiesSection.js:45 > + onPropertiesReceived: function(properties) Client should override updateProperties instead. > Source/WebCore/inspector/front-end/Popover.js:296 > + panelElement.addEventListener("scroll", this.hidePopover.bind(this), true); You should only react on the scroll events in the path to the root, right? > Source/WebCore/inspector/front-end/Popover.js:327 > + var section = new WebInspector.ObjectPropertiesSection(result); Popover.js should not depend on ObjectPropertiesSection.js since it breaks partial front-end compilability. > Source/WebCore/inspector/front-end/SourceFrame.js:-654 > - this._popoverHelper.hidePopover(); Why did this change? 477249 3 mnaganov 2011-10-03 14:38:46 -0700 (In reply to comment #2) > (From update of attachment 109434 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=109434&action=review > > > Source/WebCore/inspector/front-end/ObjectPropertiesSection.js:45 > > + onPropertiesReceived: function(properties) > > Client should override updateProperties instead. > Done. > > Source/WebCore/inspector/front-end/Popover.js:296 > > + panelElement.addEventListener("scroll", this.hidePopover.bind(this), true); > > You should only react on the scroll events in the path to the root, right? > You mean the bubbling phase? No. If scrolling is handled in the bubbling phase then what happens -- first, the page is scrolled, with the popup is left on its position, then the event is dispatched, and only then popup hides -- not pretty. I moved this code from SourceFrame.js:295, 645-650. > > Source/WebCore/inspector/front-end/Popover.js:327 > > + var section = new WebInspector.ObjectPropertiesSection(result); > > Popover.js should not depend on ObjectPropertiesSection.js since it breaks partial front-end compilability. > Extracted into a separate file. > > Source/WebCore/inspector/front-end/SourceFrame.js:-654 > > - this._popoverHelper.hidePopover(); > > Why did this change? Because PopoverHelper also handles this event and does the same (disableOnClick is true): _mouseDown: function(event) { if (this._disableOnClick) this.hidePopover(); 477254 4 109532 mnaganov 2011-10-03 14:46:19 -0700 Created attachment 109532 Comments addressed 477532 5 109532 pfeldman 2011-10-04 04:16:37 -0700 Comment on attachment 109532 Comments addressed View in context: https://bugs.webkit.org/attachment.cgi?id=109532&action=review r- for .js + i need to apply this change. it is not clear to me whether this regresses anything :( > Source/WebCore/WebCore.vcproj/WebCore.vcproj:69384 > + RelativePath="..\inspector\front-end\ObjectPopoverHelper.js.js" .js.js -> .js > Source/WebCore/inspector/front-end/SourceFrame.js:-653 > - if (this._popoverHelper) I'll need to apply the change to check whether something regresses. 477594 6 109532 pfeldman 2011-10-04 07:42:37 -0700 Comment on attachment 109532 Comments addressed View in context: https://bugs.webkit.org/attachment.cgi?id=109532&action=review > Source/WebCore/inspector/front-end/ObjectPopoverHelper.js:39 > + _showObjectPopover: function(element, popover) Btw, this nesting looks ugly. Could you extract the method below and call a bound one? 477599 7 109532 pfeldman 2011-10-04 07:47:03 -0700 Comment on attachment 109532 Comments addressed Please extract method and fix vcproj. 477630 8 mnaganov 2011-10-04 09:04:37 -0700 (In reply to comment #7) > (From update of attachment 109532 [details]) > Please extract method and fix vcproj. OK. Comments addressed, will land. 477634 9 mnaganov 2011-10-04 09:18:26 -0700 Manually committed http://trac.webkit.org/changeset/96599 2011-10-04 Mikhail Naganov <mnaganov@chromium.org> Web Inspector: Factor out object properties popup. https://bugs.webkit.org/show_bug.cgi?id=69234 Also, for HTML elements, show a non-empty id value in the element name. Reviewed by Pavel Feldman. * WebCore.gypi: * WebCore.vcproj/WebCore.vcproj: * inspector/front-end/ObjectPopoverHelper.js: Added. * inspector/front-end/SourceFrame.js: Extracted from here. (WebInspector.SourceFrame.prototype._initializeTextViewer): (WebInspector.SourceFrame.prototype._mouseDown): (WebInspector.SourceFrame.prototype._onShowPopover.showObjectPopover): (WebInspector.SourceFrame.prototype._onShowPopover): * inspector/front-end/WebKit.qrc: * inspector/front-end/inspector.html: 109434 2011-10-02 21:01:36 -0700 2011-10-03 14:46:19 -0700 Patch patch-69234 text/plain 9637 mnaganov ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA0YjllYzliLi4zZWM3N2MzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYg QEAKKzIwMTEtMTAtMDIgIE1pa2hhaWwgTmFnYW5vdiAgPG1uYWdhbm92QGNocm9taXVtLm9yZz4K KworICAgICAgICBXZWIgSW5zcGVjdG9yOiBGYWN0b3Igb3V0IG9iamVjdCBwcm9wZXJ0aWVzIHBv cHVwLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Njky MzQKKworICAgICAgICBBbHNvLCBmb3IgSFRNTCBlbGVtZW50cywgc2hvdyBhIG5vbi1lbXB0eSBp ZCB2YWx1ZSBpbiB0aGUgZWxlbWVudCBuYW1lLgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9PYmplY3RQcm9wZXJ0 aWVzU2VjdGlvbi5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5PYmplY3RQcm9wZXJ0aWVzU2Vj dGlvbi5wcm90b3R5cGUub25Qcm9wZXJ0aWVzUmVjZWl2ZWQpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLk9iamVjdFByb3BlcnRpZXNTZWN0aW9uLnByb3RvdHlwZS51cGRhdGUuY2FsbGJhY2spOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLk9iamVjdFByb3BlcnRpZXNTZWN0aW9uLnByb3RvdHlwZS51 cGRhdGUpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvUG9wb3Zlci5qczogQ29kZSBl eHRyYWN0ZWQgaW50byBPYmplY3RQb3BvdmVySGVscGVyLgorICAgICAgICAoV2ViSW5zcGVjdG9y Lk9iamVjdFBvcG92ZXJIZWxwZXIpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk9iamVjdFBvcG92 ZXJIZWxwZXIucHJvdG90eXBlLl9zaG93T2JqZWN0UG9wb3Zlci5zaG93T2JqZWN0UG9wb3Zlci5l bHNlLnNlY3Rpb24ub25Qcm9wZXJ0aWVzUmVjZWl2ZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9y Lk9iamVjdFBvcG92ZXJIZWxwZXIucHJvdG90eXBlLl9zaG93T2JqZWN0UG9wb3Zlcik6CisgICAg ICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VGcmFtZS5qczogRnJvbSBoZXJlLgorICAg ICAgICAoV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnByb3RvdHlwZS5faW5pdGlhbGl6ZVRleHRW aWV3ZXIpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnByb3RvdHlwZS5fbW91 c2VEb3duKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZS5wcm90b3R5cGUuX29u U2hvd1BvcG92ZXIuc2hvd09iamVjdFBvcG92ZXIpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNv dXJjZUZyYW1lLnByb3RvdHlwZS5fb25TaG93UG9wb3Zlcik6CisKIDIwMTEtMDktMzAgIFBhdmVs IEZlbGRtYW4gIDxwZmVsZG1hbkBnb29nbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6 IFtjaHJvbWl1bV0gZXhwb3NlIGluc3BlY3RvciBwcm90b2NvbCB2ZXJzaW9uIHRvIHRoZSBlbWJl ZGRlci4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvT2Jq ZWN0UHJvcGVydGllc1NlY3Rpb24uanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL09iamVjdFByb3BlcnRpZXNTZWN0aW9uLmpzCmluZGV4IDk2MjZjNzYuLmU4NjI1ZWIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvT2JqZWN0UHJvcGVy dGllc1NlY3Rpb24uanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9P YmplY3RQcm9wZXJ0aWVzU2VjdGlvbi5qcwpAQCAtNDIsNiArNDIsMTAgQEAgV2ViSW5zcGVjdG9y Lk9iamVjdFByb3BlcnRpZXNTZWN0aW9uLnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy51cGRh dGUoKTsKICAgICB9LAogCisgICAgb25Qcm9wZXJ0aWVzUmVjZWl2ZWQ6IGZ1bmN0aW9uKHByb3Bl cnRpZXMpCisgICAgeworICAgIH0sCisKICAgICB1cGRhdGU6IGZ1bmN0aW9uKCkKICAgICB7CiAg ICAgICAgIHZhciBzZWxmID0gdGhpczsKQEAgLTQ5LDYgKzUzLDcgQEAgV2ViSW5zcGVjdG9yLk9i amVjdFByb3BlcnRpZXNTZWN0aW9uLnByb3RvdHlwZSA9IHsKICAgICAgICAgewogICAgICAgICAg ICAgaWYgKCFwcm9wZXJ0aWVzKQogICAgICAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgICAg IHNlbGYub25Qcm9wZXJ0aWVzUmVjZWl2ZWQocHJvcGVydGllcyk7CiAgICAgICAgICAgICBzZWxm LnVwZGF0ZVByb3BlcnRpZXMocHJvcGVydGllcyk7CiAgICAgICAgIH0KICAgICAgICAgaWYgKHRo aXMuaWdub3JlSGFzT3duUHJvcGVydHkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL1BvcG92ZXIuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL1BvcG92ZXIuanMKaW5kZXggMTIxY2JlOC4uODgxOTg5YSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Qb3BvdmVyLmpzCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUG9wb3Zlci5qcwpAQCAtMjg4LDMgKzI4OCw2OCBA QCBXZWJJbnNwZWN0b3IuUG9wb3ZlckhlbHBlci5wcm90b3R5cGUgPSB7CiAgICAgICAgIH0KICAg ICB9CiB9CisKK1dlYkluc3BlY3Rvci5PYmplY3RQb3BvdmVySGVscGVyID0gZnVuY3Rpb24ocGFu ZWxFbGVtZW50LCBnZXRBbmNob3IsIHF1ZXJ5T2JqZWN0LCBvbkhpZGUsIGRpc2FibGVPbkNsaWNr KQoreworICAgIFdlYkluc3BlY3Rvci5Qb3BvdmVySGVscGVyLmNhbGwodGhpcywgcGFuZWxFbGVt ZW50LCBnZXRBbmNob3IsIHRoaXMuX3Nob3dPYmplY3RQb3BvdmVyLmJpbmQodGhpcyksIG9uSGlk ZSwgZGlzYWJsZU9uQ2xpY2spOworICAgIHRoaXMuX3F1ZXJ5T2JqZWN0ID0gcXVlcnlPYmplY3Q7 CisgICAgcGFuZWxFbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoInNjcm9sbCIsIHRoaXMuaGlkZVBv cG92ZXIuYmluZCh0aGlzKSwgdHJ1ZSk7Cit9OworCitXZWJJbnNwZWN0b3IuT2JqZWN0UG9wb3Zl ckhlbHBlci5wcm90b3R5cGUgPSB7CisgICAgX3Nob3dPYmplY3RQb3BvdmVyOiBmdW5jdGlvbihl bGVtZW50LCBwb3BvdmVyKQorICAgIHsKKyAgICAgICAgZnVuY3Rpb24gc2hvd09iamVjdFBvcG92 ZXIocmVzdWx0LCB3YXNUaHJvd24pCisgICAgICAgIHsKKyAgICAgICAgICAgIGlmIChwb3BvdmVy LmRpc3Bvc2VkKQorICAgICAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgICAgIGlmICh3YXNU aHJvd24pIHsKKyAgICAgICAgICAgICAgICB0aGlzLmhpZGVQb3BvdmVyKCk7CisgICAgICAgICAg ICAgICAgcmV0dXJuOworICAgICAgICAgICAgfQorICAgICAgICAgICAgdmFyIHBvcG92ZXJDb250 ZW50RWxlbWVudCA9IG51bGw7CisgICAgICAgICAgICBpZiAocmVzdWx0LnR5cGUgIT09ICJvYmpl Y3QiKSB7CisgICAgICAgICAgICAgICAgcG9wb3ZlckNvbnRlbnRFbGVtZW50ID0gZG9jdW1lbnQu Y3JlYXRlRWxlbWVudCgic3BhbiIpOworICAgICAgICAgICAgICAgIHBvcG92ZXJDb250ZW50RWxl bWVudC5jbGFzc05hbWUgPSAibW9ub3NwYWNlIGNvbnNvbGUtZm9ybWF0dGVkLSIgKyByZXN1bHQu dHlwZTsKKyAgICAgICAgICAgICAgICBwb3BvdmVyQ29udGVudEVsZW1lbnQuc3R5bGUud2hpdGVT cGFjZSA9ICJwcmUiOworICAgICAgICAgICAgICAgIHBvcG92ZXJDb250ZW50RWxlbWVudC50ZXh0 Q29udGVudCA9IHJlc3VsdC5kZXNjcmlwdGlvbjsKKyAgICAgICAgICAgICAgICBpZiAocmVzdWx0 LnR5cGUgPT09ICJzdHJpbmciKQorICAgICAgICAgICAgICAgICAgICBwb3BvdmVyQ29udGVudEVs ZW1lbnQudGV4dENvbnRlbnQgPSAiXCIiICsgcG9wb3ZlckNvbnRlbnRFbGVtZW50LnRleHRDb250 ZW50ICsgIlwiIjsKKyAgICAgICAgICAgICAgICBwb3BvdmVyLnNob3cocG9wb3ZlckNvbnRlbnRF bGVtZW50LCBlbGVtZW50KTsKKyAgICAgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICAgICAg cG9wb3ZlckNvbnRlbnRFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7CisK KyAgICAgICAgICAgICAgICB2YXIgdGl0bGVFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVu dCgiZGl2Iik7CisgICAgICAgICAgICAgICAgdGl0bGVFbGVtZW50LmNsYXNzTmFtZSA9ICJzb3Vy Y2UtZnJhbWUtcG9wb3Zlci10aXRsZSBtb25vc3BhY2UiOworICAgICAgICAgICAgICAgIHRpdGxl RWxlbWVudC50ZXh0Q29udGVudCA9IHJlc3VsdC5kZXNjcmlwdGlvbjsKKyAgICAgICAgICAgICAg ICBwb3BvdmVyQ29udGVudEVsZW1lbnQuYXBwZW5kQ2hpbGQodGl0bGVFbGVtZW50KTsKKworICAg ICAgICAgICAgICAgIHZhciBzZWN0aW9uID0gbmV3IFdlYkluc3BlY3Rvci5PYmplY3RQcm9wZXJ0 aWVzU2VjdGlvbihyZXN1bHQpOworICAgICAgICAgICAgICAgIC8vIEZvciBIVE1MIERPTSB3cmFw cGVycywgYXBwZW5kICIjaWQiIHRvIHRpdGxlLCBpZiBub3QgZW1wdHkuCisgICAgICAgICAgICAg ICAgaWYgKHJlc3VsdC5kZXNjcmlwdGlvbi5zdWJzdHIoMCwgNCkgPT09ICJIVE1MIikgeworICAg ICAgICAgICAgICAgICAgICBzZWN0aW9uLm9uUHJvcGVydGllc1JlY2VpdmVkID0gZnVuY3Rpb24o cHJvcGVydGllcykKKyAgICAgICAgICAgICAgICAgICAgeworICAgICAgICAgICAgICAgICAgICAg ICAgZm9yICh2YXIgaSA9IDA7IGkgPCBwcm9wZXJ0aWVzLmxlbmd0aDsgKytpKSB7CisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgaWYgKHByb3BlcnRpZXNbaV0ubmFtZSA9PT0gImlkIikgewor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpZiAocHJvcGVydGllc1tpXS52YWx1ZS5k ZXNjcmlwdGlvbikKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHRpdGxlRWxl bWVudC50ZXh0Q29udGVudCArPSAiIyIgKyBwcm9wZXJ0aWVzW2ldLnZhbHVlLmRlc2NyaXB0aW9u OworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAg ICAgICAgIH07CisgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgIHNlY3Rpb24uZXhw YW5kZWQgPSB0cnVlOworICAgICAgICAgICAgICAgIHNlY3Rpb24uZWxlbWVudC5hZGRTdHlsZUNs YXNzKCJzb3VyY2UtZnJhbWUtcG9wb3Zlci10cmVlIik7CisgICAgICAgICAgICAgICAgc2VjdGlv bi5oZWFkZXJFbGVtZW50LmFkZFN0eWxlQ2xhc3MoImhpZGRlbiIpOworICAgICAgICAgICAgICAg IHBvcG92ZXJDb250ZW50RWxlbWVudC5hcHBlbmRDaGlsZChzZWN0aW9uLmVsZW1lbnQpOworCisg ICAgICAgICAgICAgICAgY29uc3QgcG9wb3ZlcldpZHRoID0gMzAwOworICAgICAgICAgICAgICAg IGNvbnN0IHBvcG92ZXJIZWlnaHQgPSAyNTA7CisgICAgICAgICAgICAgICAgcG9wb3Zlci5zaG93 KHBvcG92ZXJDb250ZW50RWxlbWVudCwgZWxlbWVudCwgcG9wb3ZlcldpZHRoLCBwb3BvdmVySGVp Z2h0KTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgfQorICAgICAgICB0aGlzLl9xdWVyeU9iamVj dChlbGVtZW50LCBzaG93T2JqZWN0UG9wb3Zlci5iaW5kKHRoaXMpKTsKKyAgICB9Cit9CisKK1dl Ykluc3BlY3Rvci5PYmplY3RQb3BvdmVySGVscGVyLnByb3RvdHlwZS5fX3Byb3RvX18gPSBXZWJJ bnNwZWN0b3IuUG9wb3ZlckhlbHBlci5wcm90b3R5cGU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZUZyYW1lLmpzIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VGcmFtZS5qcwppbmRleCAwN2IxOTExLi45ODAxZWE0 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZUZy YW1lLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU291cmNlRnJh bWUuanMKQEAgLTI4OSwxMCArMjg5LDkgQEAgV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnByb3Rv dHlwZSA9IHsKIAogICAgICAgICB2YXIgZWxlbWVudCA9IHRoaXMuX3RleHRWaWV3ZXIuZWxlbWVu dDsKICAgICAgICAgaWYgKHRoaXMuX2RlbGVnYXRlLmRlYnVnZ2luZ1N1cHBvcnRlZCgpKSB7Ci0g ICAgICAgICAgICB0aGlzLl9wb3BvdmVySGVscGVyID0gbmV3IFdlYkluc3BlY3Rvci5Qb3BvdmVy SGVscGVyKGVsZW1lbnQsCisgICAgICAgICAgICB0aGlzLl9wb3BvdmVySGVscGVyID0gbmV3IFdl Ykluc3BlY3Rvci5PYmplY3RQb3BvdmVySGVscGVyKGVsZW1lbnQsCiAgICAgICAgICAgICAgICAg dGhpcy5fZ2V0UG9wb3ZlckFuY2hvci5iaW5kKHRoaXMpLCB0aGlzLl9vblNob3dQb3BvdmVyLmJp bmQodGhpcyksIHRoaXMuX29uSGlkZVBvcG92ZXIuYmluZCh0aGlzKSwgdHJ1ZSk7CiAgICAgICAg ICAgICBlbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoIm1vdXNlZG93biIsIHRoaXMuX21vdXNlRG93 bi5iaW5kKHRoaXMpLCB0cnVlKTsKLSAgICAgICAgICAgIGVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5l cigic2Nyb2xsIiwgdGhpcy5fc2Nyb2xsLmJpbmQodGhpcyksIHRydWUpOwogICAgICAgICB9CiAK ICAgICAgICAgdGhpcy5fdGV4dFZpZXdlci5iZWdpblVwZGF0ZXMoKTsKQEAgLTY0MiwxNiArNjQx LDggQEAgV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnByb3RvdHlwZSA9IHsKICAgICAgICAgcmV0 dXJuIHRoaXMuX2RlbGVnYXRlLnN1Z2dlc3RlZEZpbGVOYW1lKCk7CiAgICAgfSwKIAotICAgIF9z Y3JvbGw6IGZ1bmN0aW9uKGV2ZW50KQotICAgIHsKLSAgICAgICAgaWYgKHRoaXMuX3BvcG92ZXJI ZWxwZXIpCi0gICAgICAgICAgICB0aGlzLl9wb3BvdmVySGVscGVyLmhpZGVQb3BvdmVyKCk7Ci0g ICAgfSwKLQogICAgIF9tb3VzZURvd246IGZ1bmN0aW9uKGV2ZW50KQogICAgIHsKLSAgICAgICAg aWYgKHRoaXMuX3BvcG92ZXJIZWxwZXIpCi0gICAgICAgICAgICB0aGlzLl9wb3BvdmVySGVscGVy LmhpZGVQb3BvdmVyKCk7CiAgICAgICAgIGlmIChldmVudC5idXR0b24gIT0gMCB8fCBldmVudC5h bHRLZXkgfHwgZXZlbnQuY3RybEtleSB8fCBldmVudC5tZXRhS2V5KQogICAgICAgICAgICAgcmV0 dXJuOwogICAgICAgICB2YXIgdGFyZ2V0ID0gZXZlbnQudGFyZ2V0LmVuY2xvc2luZ05vZGVPclNl bGZXaXRoQ2xhc3MoIndlYmtpdC1saW5lLW51bWJlciIpOwpAQCAtNzMwLDcgKzcyMSw3IEBAIFdl Ykluc3BlY3Rvci5Tb3VyY2VGcmFtZS5wcm90b3R5cGUgPSB7CiAgICAgICAgIHJldHVybiBjb250 YWluZXI7CiAgICAgfSwKIAotICAgIF9vblNob3dQb3BvdmVyOiBmdW5jdGlvbihlbGVtZW50LCBw b3BvdmVyKQorICAgIF9vblNob3dQb3BvdmVyOiBmdW5jdGlvbihlbGVtZW50LCBzaG93Q2FsbGJh Y2spCiAgICAgewogICAgICAgICBpZiAoIXRoaXMuX3RleHRWaWV3ZXIucmVhZE9ubHkpIHsKICAg ICAgICAgICAgIHRoaXMuX3BvcG92ZXJIZWxwZXIuaGlkZVBvcG92ZXIoKTsKQEAgLTc0MCwzOSAr NzMxLDExIEBAIFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZS5wcm90b3R5cGUgPSB7CiAKICAgICAg ICAgZnVuY3Rpb24gc2hvd09iamVjdFBvcG92ZXIocmVzdWx0LCB3YXNUaHJvd24pCiAgICAgICAg IHsKLSAgICAgICAgICAgIGlmIChwb3BvdmVyLmRpc3Bvc2VkKQotICAgICAgICAgICAgICAgIHJl dHVybjsKLSAgICAgICAgICAgIGlmICh3YXNUaHJvd24gfHwgIXRoaXMuX2RlbGVnYXRlLmRlYnVn Z2VyUGF1c2VkKCkpIHsKKyAgICAgICAgICAgIGlmICghdGhpcy5fZGVsZWdhdGUuZGVidWdnZXJQ YXVzZWQoKSkgewogICAgICAgICAgICAgICAgIHRoaXMuX3BvcG92ZXJIZWxwZXIuaGlkZVBvcG92 ZXIoKTsKICAgICAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgICAgICB9Ci0gICAgICAgICAg ICB2YXIgcG9wb3ZlckNvbnRlbnRFbGVtZW50ID0gbnVsbDsKLSAgICAgICAgICAgIGlmIChyZXN1 bHQudHlwZSAhPT0gIm9iamVjdCIpIHsKLSAgICAgICAgICAgICAgICBwb3BvdmVyQ29udGVudEVs ZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJzcGFuIik7Ci0gICAgICAgICAgICAgICAg cG9wb3ZlckNvbnRlbnRFbGVtZW50LmNsYXNzTmFtZSA9ICJtb25vc3BhY2UgY29uc29sZS1mb3Jt YXR0ZWQtIiArIHJlc3VsdC50eXBlOwotICAgICAgICAgICAgICAgIHBvcG92ZXJDb250ZW50RWxl bWVudC5zdHlsZS53aGl0ZVNwYWNlID0gInByZSI7Ci0gICAgICAgICAgICAgICAgcG9wb3ZlckNv bnRlbnRFbGVtZW50LnRleHRDb250ZW50ID0gcmVzdWx0LmRlc2NyaXB0aW9uOwotICAgICAgICAg ICAgICAgIGlmIChyZXN1bHQudHlwZSA9PT0gInN0cmluZyIpCi0gICAgICAgICAgICAgICAgICAg IHBvcG92ZXJDb250ZW50RWxlbWVudC50ZXh0Q29udGVudCA9ICJcIiIgKyBwb3BvdmVyQ29udGVu dEVsZW1lbnQudGV4dENvbnRlbnQgKyAiXCIiOwotICAgICAgICAgICAgICAgIHBvcG92ZXIuc2hv dyhwb3BvdmVyQ29udGVudEVsZW1lbnQsIGVsZW1lbnQpOwotICAgICAgICAgICAgfSBlbHNlIHsK LSAgICAgICAgICAgICAgICB2YXIgcG9wb3ZlckNvbnRlbnRFbGVtZW50ID0gZG9jdW1lbnQuY3Jl YXRlRWxlbWVudCgiZGl2Iik7Ci0KLSAgICAgICAgICAgICAgICB2YXIgdGl0bGVFbGVtZW50ID0g ZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7Ci0gICAgICAgICAgICAgICAgdGl0bGVFbGVt ZW50LmNsYXNzTmFtZSA9ICJzb3VyY2UtZnJhbWUtcG9wb3Zlci10aXRsZSBtb25vc3BhY2UiOwot ICAgICAgICAgICAgICAgIHRpdGxlRWxlbWVudC50ZXh0Q29udGVudCA9IHJlc3VsdC5kZXNjcmlw dGlvbjsKLSAgICAgICAgICAgICAgICBwb3BvdmVyQ29udGVudEVsZW1lbnQuYXBwZW5kQ2hpbGQo dGl0bGVFbGVtZW50KTsKLQotICAgICAgICAgICAgICAgIHZhciBzZWN0aW9uID0gbmV3IFdlYklu c3BlY3Rvci5PYmplY3RQcm9wZXJ0aWVzU2VjdGlvbihyZXN1bHQpOwotICAgICAgICAgICAgICAg IHNlY3Rpb24uZXhwYW5kZWQgPSB0cnVlOwotICAgICAgICAgICAgICAgIHNlY3Rpb24uZWxlbWVu dC5hZGRTdHlsZUNsYXNzKCJzb3VyY2UtZnJhbWUtcG9wb3Zlci10cmVlIik7Ci0gICAgICAgICAg ICAgICAgc2VjdGlvbi5oZWFkZXJFbGVtZW50LmFkZFN0eWxlQ2xhc3MoImhpZGRlbiIpOwotICAg ICAgICAgICAgICAgIHBvcG92ZXJDb250ZW50RWxlbWVudC5hcHBlbmRDaGlsZChzZWN0aW9uLmVs ZW1lbnQpOwotCi0gICAgICAgICAgICAgICAgY29uc3QgcG9wb3ZlcldpZHRoID0gMzAwOwotICAg ICAgICAgICAgICAgIGNvbnN0IHBvcG92ZXJIZWlnaHQgPSAyNTA7Ci0gICAgICAgICAgICAgICAg cG9wb3Zlci5zaG93KHBvcG92ZXJDb250ZW50RWxlbWVudCwgZWxlbWVudCwgcG9wb3ZlcldpZHRo LCBwb3BvdmVySGVpZ2h0KTsKLSAgICAgICAgICAgIH0KKyAgICAgICAgICAgIHNob3dDYWxsYmFj ayhyZXN1bHQsIHdhc1Rocm93bik7CiAgICAgICAgICAgICB0aGlzLl9oaWdobGlnaHRFbGVtZW50 LmFkZFN0eWxlQ2xhc3MoInNvdXJjZS1mcmFtZS1ldmFsLWV4cHJlc3Npb24iKTsKICAgICAgICAg fQogCg== 109532 2011-10-03 14:46:19 -0700 2011-10-04 07:47:03 -0700 Comments addressed patch-69234 text/plain 12646 mnaganov ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA0YjllYzliLi5jMTQyZTdiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMg QEAKKzIwMTEtMTAtMDMgIE1pa2hhaWwgTmFnYW5vdiAgPG1uYWdhbm92QGNocm9taXVtLm9yZz4K KworICAgICAgICBXZWIgSW5zcGVjdG9yOiBGYWN0b3Igb3V0IG9iamVjdCBwcm9wZXJ0aWVzIHBv cHVwLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Njky MzQKKworICAgICAgICBBbHNvLCBmb3IgSFRNTCBlbGVtZW50cywgc2hvdyBhIG5vbi1lbXB0eSBp ZCB2YWx1ZSBpbiB0aGUgZWxlbWVudCBuYW1lLgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgICogV2ViQ29yZS5neXBpOgorICAgICAgICAqIFdlYkNvcmUu dmNwcm9qL1dlYkNvcmUudmNwcm9qOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvT2Jq ZWN0UG9wb3ZlckhlbHBlci5qczogQWRkZWQuCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVu ZC9Tb3VyY2VGcmFtZS5qczogRXh0cmFjdGVkIGZyb20gaGVyZS4KKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5Tb3VyY2VGcmFtZS5wcm90b3R5cGUuX2luaXRpYWxpemVUZXh0Vmlld2VyKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZS5wcm90b3R5cGUuX21vdXNlRG93bik6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuU291cmNlRnJhbWUucHJvdG90eXBlLl9vblNob3dQb3BvdmVyLnNo b3dPYmplY3RQb3BvdmVyKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZS5wcm90 b3R5cGUuX29uU2hvd1BvcG92ZXIpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvV2Vi S2l0LnFyYzoKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5odG1sOgor CiAyMDExLTA5LTMwICBQYXZlbCBGZWxkbWFuICA8cGZlbGRtYW5AZ29vZ2xlLmNvbT4KIAogICAg ICAgICBXZWIgSW5zcGVjdG9yOiBbY2hyb21pdW1dIGV4cG9zZSBpbnNwZWN0b3IgcHJvdG9jb2wg dmVyc2lvbiB0byB0aGUgZW1iZWRkZXIuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9XZWJD b3JlLmd5cGkgYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmd5cGkKaW5kZXggZmEzZjkxMi4uOGZm NjM4YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5neXBpCisrKyBiL1NvdXJj ZS9XZWJDb3JlL1dlYkNvcmUuZ3lwaQpAQCAtNjI3Myw2ICs2MjczLDcgQEAKICAgICAgICAgICAg ICdpbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtMb2cuanMnLAogICAgICAgICAgICAgJ2luc3Bl Y3Rvci9mcm9udC1lbmQvTmV0d29ya1BhbmVsLmpzJywKICAgICAgICAgICAgICdpbnNwZWN0b3Iv ZnJvbnQtZW5kL09iamVjdC5qcycsCisgICAgICAgICAgICAnaW5zcGVjdG9yL2Zyb250LWVuZC9P YmplY3RQb3BvdmVySGVscGVyLmpzJywKICAgICAgICAgICAgICdpbnNwZWN0b3IvZnJvbnQtZW5k L09iamVjdFByb3BlcnRpZXNTZWN0aW9uLmpzJywKICAgICAgICAgICAgICdpbnNwZWN0b3IvZnJv bnQtZW5kL1BhbmVsLmpzJywKICAgICAgICAgICAgICdpbnNwZWN0b3IvZnJvbnQtZW5kL1BhbmVs RW5hYmxlclZpZXcuanMnLApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS52Y3By b2ovV2ViQ29yZS52Y3Byb2ogYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnZjcHJvai9XZWJDb3Jl LnZjcHJvagppbmRleCBmZTlmYmY1Li43OGMwZTgyIDEwMDc1NQotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9XZWJDb3JlLnZjcHJvai9XZWJDb3JlLnZjcHJvagorKysgYi9Tb3VyY2UvV2ViQ29yZS9XZWJD b3JlLnZjcHJvai9XZWJDb3JlLnZjcHJvagpAQCAtNjkzODEsNiArNjkzODEsMTAgQEAKIAkJCQkJ PgogCQkJCTwvRmlsZT4KIAkJCQk8RmlsZQorCQkJCQlSZWxhdGl2ZVBhdGg9Ii4uXGluc3BlY3Rv clxmcm9udC1lbmRcT2JqZWN0UG9wb3ZlckhlbHBlci5qcy5qcyIKKwkJCQkJPgorCQkJCTwvRmls ZT4KKwkJCQk8RmlsZQogCQkJCQlSZWxhdGl2ZVBhdGg9Ii4uXGluc3BlY3Rvclxmcm9udC1lbmRc T2JqZWN0UHJvcGVydGllc1NlY3Rpb24uanMiCiAJCQkJCT4KIAkJCQk8L0ZpbGU+CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL09iamVjdFBvcG92ZXJIZWxw ZXIuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL09iamVjdFBvcG92ZXJI ZWxwZXIuanMKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMmM1ZDBhMwotLS0g L2Rldi9udWxsCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvT2JqZWN0 UG9wb3ZlckhlbHBlci5qcwpAQCAtMCwwICsxLDk2IEBACisvKgorICogQ29weXJpZ2h0IChDKSAy MDExIEdvb2dsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKgorICogUmVkaXN0cmlidXRp b24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0Cisg KiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5n IGNvbmRpdGlvbnMgYXJlCisgKiBtZXQ6CisgKgorICogICAgICogUmVkaXN0cmlidXRpb25zIG9m IHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqIG5vdGljZSwg dGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KKyAq ICAgICAqIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUg YWJvdmUKKyAqIGNvcHlyaWdodCBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0 aGUgZm9sbG93aW5nIGRpc2NsYWltZXIKKyAqIGluIHRoZSBkb2N1bWVudGF0aW9uIGFuZC9vciBv dGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUKKyAqIGRpc3RyaWJ1dGlvbi4KKyAqICAg ICAqIE5laXRoZXIgdGhlIG5hbWUgb2YgR29vZ2xlIEluYy4gbm9yIHRoZSBuYW1lcyBvZiBpdHMK KyAqIGNvbnRyaWJ1dG9ycyBtYXkgYmUgdXNlZCB0byBlbmRvcnNlIG9yIHByb21vdGUgcHJvZHVj dHMgZGVyaXZlZCBmcm9tCisgKiB0aGlzIHNvZnR3YXJlIHdpdGhvdXQgc3BlY2lmaWMgcHJpb3Ig d3JpdHRlbiBwZXJtaXNzaW9uLgorICoKKyAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkg VEhFIENPUFlSSUdIVCBIT0xERVJTIEFORCBDT05UUklCVVRPUlMKKyAqICJBUyBJUyIgQU5EIEFO WSBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UCisgKiBM SU1JVEVEIFRPLCBUSEUgSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQg RklUTkVTUyBGT1IKKyAqIEEgUEFSVElDVUxBUiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiBJTiBO TyBFVkVOVCBTSEFMTCBUSEUgQ09QWVJJR0hUCisgKiBPV05FUiBPUiBDT05UUklCVVRPUlMgQkUg TElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwKKyAqIFNQRUNJQUws IEVYRU1QTEFSWSwgT1IgQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QK KyAqIExJTUlURUQgVE8sIFBST0NVUkVNRU5UIE9GIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklD RVM7IExPU1MgT0YgVVNFLAorICogREFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5FU1MgSU5URVJS VVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZCisgKiBUSEVPUlkgT0YgTElBQklMSVRZ LCBXSEVUSEVSIElOIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUCisgKiAoSU5D TFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKSBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9G IFRIRSBVU0UKKyAqIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9T U0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCisgKi8KKworV2ViSW5zcGVjdG9yLk9iamVjdFBvcG92 ZXJIZWxwZXIgPSBmdW5jdGlvbihwYW5lbEVsZW1lbnQsIGdldEFuY2hvciwgcXVlcnlPYmplY3Qs IG9uSGlkZSwgZGlzYWJsZU9uQ2xpY2spCit7CisgICAgV2ViSW5zcGVjdG9yLlBvcG92ZXJIZWxw ZXIuY2FsbCh0aGlzLCBwYW5lbEVsZW1lbnQsIGdldEFuY2hvciwgdGhpcy5fc2hvd09iamVjdFBv cG92ZXIuYmluZCh0aGlzKSwgb25IaWRlLCBkaXNhYmxlT25DbGljayk7CisgICAgdGhpcy5fcXVl cnlPYmplY3QgPSBxdWVyeU9iamVjdDsKKyAgICBwYW5lbEVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5l cigic2Nyb2xsIiwgdGhpcy5oaWRlUG9wb3Zlci5iaW5kKHRoaXMpLCB0cnVlKTsKK307CisKK1dl Ykluc3BlY3Rvci5PYmplY3RQb3BvdmVySGVscGVyLnByb3RvdHlwZSA9IHsKKyAgICBfc2hvd09i amVjdFBvcG92ZXI6IGZ1bmN0aW9uKGVsZW1lbnQsIHBvcG92ZXIpCisgICAgeworICAgICAgICBm dW5jdGlvbiBzaG93T2JqZWN0UG9wb3ZlcihyZXN1bHQsIHdhc1Rocm93bikKKyAgICAgICAgewor ICAgICAgICAgICAgaWYgKHBvcG92ZXIuZGlzcG9zZWQpCisgICAgICAgICAgICAgICAgcmV0dXJu OworICAgICAgICAgICAgaWYgKHdhc1Rocm93bikgeworICAgICAgICAgICAgICAgIHRoaXMuaGlk ZVBvcG92ZXIoKTsKKyAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICB9CisgICAg ICAgICAgICB2YXIgcG9wb3ZlckNvbnRlbnRFbGVtZW50ID0gbnVsbDsKKyAgICAgICAgICAgIGlm IChyZXN1bHQudHlwZSAhPT0gIm9iamVjdCIpIHsKKyAgICAgICAgICAgICAgICBwb3BvdmVyQ29u dGVudEVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJzcGFuIik7CisgICAgICAgICAg ICAgICAgcG9wb3ZlckNvbnRlbnRFbGVtZW50LmNsYXNzTmFtZSA9ICJtb25vc3BhY2UgY29uc29s ZS1mb3JtYXR0ZWQtIiArIHJlc3VsdC50eXBlOworICAgICAgICAgICAgICAgIHBvcG92ZXJDb250 ZW50RWxlbWVudC5zdHlsZS53aGl0ZVNwYWNlID0gInByZSI7CisgICAgICAgICAgICAgICAgcG9w b3ZlckNvbnRlbnRFbGVtZW50LnRleHRDb250ZW50ID0gcmVzdWx0LmRlc2NyaXB0aW9uOworICAg ICAgICAgICAgICAgIGlmIChyZXN1bHQudHlwZSA9PT0gInN0cmluZyIpCisgICAgICAgICAgICAg ICAgICAgIHBvcG92ZXJDb250ZW50RWxlbWVudC50ZXh0Q29udGVudCA9ICJcIiIgKyBwb3BvdmVy Q29udGVudEVsZW1lbnQudGV4dENvbnRlbnQgKyAiXCIiOworICAgICAgICAgICAgICAgIHBvcG92 ZXIuc2hvdyhwb3BvdmVyQ29udGVudEVsZW1lbnQsIGVsZW1lbnQpOworICAgICAgICAgICAgfSBl bHNlIHsKKyAgICAgICAgICAgICAgICBwb3BvdmVyQ29udGVudEVsZW1lbnQgPSBkb2N1bWVudC5j cmVhdGVFbGVtZW50KCJkaXYiKTsKKworICAgICAgICAgICAgICAgIHZhciB0aXRsZUVsZW1lbnQg PSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKKyAgICAgICAgICAgICAgICB0aXRsZUVs ZW1lbnQuY2xhc3NOYW1lID0gInNvdXJjZS1mcmFtZS1wb3BvdmVyLXRpdGxlIG1vbm9zcGFjZSI7 CisgICAgICAgICAgICAgICAgdGl0bGVFbGVtZW50LnRleHRDb250ZW50ID0gcmVzdWx0LmRlc2Ny aXB0aW9uOworICAgICAgICAgICAgICAgIHBvcG92ZXJDb250ZW50RWxlbWVudC5hcHBlbmRDaGls ZCh0aXRsZUVsZW1lbnQpOworCisgICAgICAgICAgICAgICAgdmFyIHNlY3Rpb24gPSBuZXcgV2Vi SW5zcGVjdG9yLk9iamVjdFByb3BlcnRpZXNTZWN0aW9uKHJlc3VsdCk7CisgICAgICAgICAgICAg ICAgLy8gRm9yIEhUTUwgRE9NIHdyYXBwZXJzLCBhcHBlbmQgIiNpZCIgdG8gdGl0bGUsIGlmIG5v dCBlbXB0eS4KKyAgICAgICAgICAgICAgICBpZiAocmVzdWx0LmRlc2NyaXB0aW9uLnN1YnN0cigw LCA0KSA9PT0gIkhUTUwiKSB7CisgICAgICAgICAgICAgICAgICAgIHZhciBvbGRVcGRhdGVQcm9w ZXJ0aWVzID0gc2VjdGlvbi51cGRhdGVQcm9wZXJ0aWVzOworICAgICAgICAgICAgICAgICAgICBz ZWN0aW9uLnVwZGF0ZVByb3BlcnRpZXMgPSBmdW5jdGlvbihwcm9wZXJ0aWVzLCByb290VHJlZUVs ZW1lbnRDb25zdHJ1Y3Rvciwgcm9vdFByb3BlcnR5Q29tcGFyZXIpCisgICAgICAgICAgICAgICAg ICAgIHsKKyAgICAgICAgICAgICAgICAgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgcHJvcGVy dGllcy5sZW5ndGg7ICsraSkgeworICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlmIChwcm9w ZXJ0aWVzW2ldLm5hbWUgPT09ICJpZCIpIHsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgaWYgKHByb3BlcnRpZXNbaV0udmFsdWUuZGVzY3JpcHRpb24pCisgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICB0aXRsZUVsZW1lbnQudGV4dENvbnRlbnQgKz0gIiMiICsgcHJv cGVydGllc1tpXS52YWx1ZS5kZXNjcmlwdGlvbjsKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgYnJlYWs7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAg ICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgICAgICAgICAgb2xkVXBkYXRlUHJvcGVydGll cy5jYWxsKHRoaXMsIHByb3BlcnRpZXMsIHJvb3RUcmVlRWxlbWVudENvbnN0cnVjdG9yLCByb290 UHJvcGVydHlDb21wYXJlcik7IAorICAgICAgICAgICAgICAgICAgICB9OworICAgICAgICAgICAg ICAgIH0KKyAgICAgICAgICAgICAgICBzZWN0aW9uLmV4cGFuZGVkID0gdHJ1ZTsKKyAgICAgICAg ICAgICAgICBzZWN0aW9uLmVsZW1lbnQuYWRkU3R5bGVDbGFzcygic291cmNlLWZyYW1lLXBvcG92 ZXItdHJlZSIpOworICAgICAgICAgICAgICAgIHNlY3Rpb24uaGVhZGVyRWxlbWVudC5hZGRTdHls ZUNsYXNzKCJoaWRkZW4iKTsKKyAgICAgICAgICAgICAgICBwb3BvdmVyQ29udGVudEVsZW1lbnQu YXBwZW5kQ2hpbGQoc2VjdGlvbi5lbGVtZW50KTsKKworICAgICAgICAgICAgICAgIGNvbnN0IHBv cG92ZXJXaWR0aCA9IDMwMDsKKyAgICAgICAgICAgICAgICBjb25zdCBwb3BvdmVySGVpZ2h0ID0g MjUwOworICAgICAgICAgICAgICAgIHBvcG92ZXIuc2hvdyhwb3BvdmVyQ29udGVudEVsZW1lbnQs IGVsZW1lbnQsIHBvcG92ZXJXaWR0aCwgcG9wb3ZlckhlaWdodCk7CisgICAgICAgICAgICB9Cisg ICAgICAgIH0KKyAgICAgICAgdGhpcy5fcXVlcnlPYmplY3QoZWxlbWVudCwgc2hvd09iamVjdFBv cG92ZXIuYmluZCh0aGlzKSk7CisgICAgfQorfQorCitXZWJJbnNwZWN0b3IuT2JqZWN0UG9wb3Zl ckhlbHBlci5wcm90b3R5cGUuX19wcm90b19fID0gV2ViSW5zcGVjdG9yLlBvcG92ZXJIZWxwZXIu cHJvdG90eXBlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9Tb3VyY2VGcmFtZS5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU291 cmNlRnJhbWUuanMKaW5kZXggMDdiMTkxMS4uOTgwMWVhNCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VGcmFtZS5qcworKysgYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZUZyYW1lLmpzCkBAIC0yODksMTAgKzI4OSw5 IEBAIFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZS5wcm90b3R5cGUgPSB7CiAKICAgICAgICAgdmFy IGVsZW1lbnQgPSB0aGlzLl90ZXh0Vmlld2VyLmVsZW1lbnQ7CiAgICAgICAgIGlmICh0aGlzLl9k ZWxlZ2F0ZS5kZWJ1Z2dpbmdTdXBwb3J0ZWQoKSkgewotICAgICAgICAgICAgdGhpcy5fcG9wb3Zl ckhlbHBlciA9IG5ldyBXZWJJbnNwZWN0b3IuUG9wb3ZlckhlbHBlcihlbGVtZW50LAorICAgICAg ICAgICAgdGhpcy5fcG9wb3ZlckhlbHBlciA9IG5ldyBXZWJJbnNwZWN0b3IuT2JqZWN0UG9wb3Zl ckhlbHBlcihlbGVtZW50LAogICAgICAgICAgICAgICAgIHRoaXMuX2dldFBvcG92ZXJBbmNob3Iu YmluZCh0aGlzKSwgdGhpcy5fb25TaG93UG9wb3Zlci5iaW5kKHRoaXMpLCB0aGlzLl9vbkhpZGVQ b3BvdmVyLmJpbmQodGhpcyksIHRydWUpOwogICAgICAgICAgICAgZWxlbWVudC5hZGRFdmVudExp c3RlbmVyKCJtb3VzZWRvd24iLCB0aGlzLl9tb3VzZURvd24uYmluZCh0aGlzKSwgdHJ1ZSk7Ci0g ICAgICAgICAgICBlbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoInNjcm9sbCIsIHRoaXMuX3Njcm9s bC5iaW5kKHRoaXMpLCB0cnVlKTsKICAgICAgICAgfQogCiAgICAgICAgIHRoaXMuX3RleHRWaWV3 ZXIuYmVnaW5VcGRhdGVzKCk7CkBAIC02NDIsMTYgKzY0MSw4IEBAIFdlYkluc3BlY3Rvci5Tb3Vy Y2VGcmFtZS5wcm90b3R5cGUgPSB7CiAgICAgICAgIHJldHVybiB0aGlzLl9kZWxlZ2F0ZS5zdWdn ZXN0ZWRGaWxlTmFtZSgpOwogICAgIH0sCiAKLSAgICBfc2Nyb2xsOiBmdW5jdGlvbihldmVudCkK LSAgICB7Ci0gICAgICAgIGlmICh0aGlzLl9wb3BvdmVySGVscGVyKQotICAgICAgICAgICAgdGhp cy5fcG9wb3ZlckhlbHBlci5oaWRlUG9wb3ZlcigpOwotICAgIH0sCi0KICAgICBfbW91c2VEb3du OiBmdW5jdGlvbihldmVudCkKICAgICB7Ci0gICAgICAgIGlmICh0aGlzLl9wb3BvdmVySGVscGVy KQotICAgICAgICAgICAgdGhpcy5fcG9wb3ZlckhlbHBlci5oaWRlUG9wb3ZlcigpOwogICAgICAg ICBpZiAoZXZlbnQuYnV0dG9uICE9IDAgfHwgZXZlbnQuYWx0S2V5IHx8IGV2ZW50LmN0cmxLZXkg fHwgZXZlbnQubWV0YUtleSkKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgdmFyIHRhcmdl dCA9IGV2ZW50LnRhcmdldC5lbmNsb3NpbmdOb2RlT3JTZWxmV2l0aENsYXNzKCJ3ZWJraXQtbGlu ZS1udW1iZXIiKTsKQEAgLTczMCw3ICs3MjEsNyBAQCBXZWJJbnNwZWN0b3IuU291cmNlRnJhbWUu cHJvdG90eXBlID0gewogICAgICAgICByZXR1cm4gY29udGFpbmVyOwogICAgIH0sCiAKLSAgICBf b25TaG93UG9wb3ZlcjogZnVuY3Rpb24oZWxlbWVudCwgcG9wb3ZlcikKKyAgICBfb25TaG93UG9w b3ZlcjogZnVuY3Rpb24oZWxlbWVudCwgc2hvd0NhbGxiYWNrKQogICAgIHsKICAgICAgICAgaWYg KCF0aGlzLl90ZXh0Vmlld2VyLnJlYWRPbmx5KSB7CiAgICAgICAgICAgICB0aGlzLl9wb3BvdmVy SGVscGVyLmhpZGVQb3BvdmVyKCk7CkBAIC03NDAsMzkgKzczMSwxMSBAQCBXZWJJbnNwZWN0b3Iu U291cmNlRnJhbWUucHJvdG90eXBlID0gewogCiAgICAgICAgIGZ1bmN0aW9uIHNob3dPYmplY3RQ b3BvdmVyKHJlc3VsdCwgd2FzVGhyb3duKQogICAgICAgICB7Ci0gICAgICAgICAgICBpZiAocG9w b3Zlci5kaXNwb3NlZCkKLSAgICAgICAgICAgICAgICByZXR1cm47Ci0gICAgICAgICAgICBpZiAo d2FzVGhyb3duIHx8ICF0aGlzLl9kZWxlZ2F0ZS5kZWJ1Z2dlclBhdXNlZCgpKSB7CisgICAgICAg ICAgICBpZiAoIXRoaXMuX2RlbGVnYXRlLmRlYnVnZ2VyUGF1c2VkKCkpIHsKICAgICAgICAgICAg ICAgICB0aGlzLl9wb3BvdmVySGVscGVyLmhpZGVQb3BvdmVyKCk7CiAgICAgICAgICAgICAgICAg cmV0dXJuOwogICAgICAgICAgICAgfQotICAgICAgICAgICAgdmFyIHBvcG92ZXJDb250ZW50RWxl bWVudCA9IG51bGw7Ci0gICAgICAgICAgICBpZiAocmVzdWx0LnR5cGUgIT09ICJvYmplY3QiKSB7 Ci0gICAgICAgICAgICAgICAgcG9wb3ZlckNvbnRlbnRFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRl RWxlbWVudCgic3BhbiIpOwotICAgICAgICAgICAgICAgIHBvcG92ZXJDb250ZW50RWxlbWVudC5j bGFzc05hbWUgPSAibW9ub3NwYWNlIGNvbnNvbGUtZm9ybWF0dGVkLSIgKyByZXN1bHQudHlwZTsK LSAgICAgICAgICAgICAgICBwb3BvdmVyQ29udGVudEVsZW1lbnQuc3R5bGUud2hpdGVTcGFjZSA9 ICJwcmUiOwotICAgICAgICAgICAgICAgIHBvcG92ZXJDb250ZW50RWxlbWVudC50ZXh0Q29udGVu dCA9IHJlc3VsdC5kZXNjcmlwdGlvbjsKLSAgICAgICAgICAgICAgICBpZiAocmVzdWx0LnR5cGUg PT09ICJzdHJpbmciKQotICAgICAgICAgICAgICAgICAgICBwb3BvdmVyQ29udGVudEVsZW1lbnQu dGV4dENvbnRlbnQgPSAiXCIiICsgcG9wb3ZlckNvbnRlbnRFbGVtZW50LnRleHRDb250ZW50ICsg IlwiIjsKLSAgICAgICAgICAgICAgICBwb3BvdmVyLnNob3cocG9wb3ZlckNvbnRlbnRFbGVtZW50 LCBlbGVtZW50KTsKLSAgICAgICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICAgICAgdmFyIHBv cG92ZXJDb250ZW50RWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOwotCi0g ICAgICAgICAgICAgICAgdmFyIHRpdGxlRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQo ImRpdiIpOwotICAgICAgICAgICAgICAgIHRpdGxlRWxlbWVudC5jbGFzc05hbWUgPSAic291cmNl LWZyYW1lLXBvcG92ZXItdGl0bGUgbW9ub3NwYWNlIjsKLSAgICAgICAgICAgICAgICB0aXRsZUVs ZW1lbnQudGV4dENvbnRlbnQgPSByZXN1bHQuZGVzY3JpcHRpb247Ci0gICAgICAgICAgICAgICAg cG9wb3ZlckNvbnRlbnRFbGVtZW50LmFwcGVuZENoaWxkKHRpdGxlRWxlbWVudCk7Ci0KLSAgICAg ICAgICAgICAgICB2YXIgc2VjdGlvbiA9IG5ldyBXZWJJbnNwZWN0b3IuT2JqZWN0UHJvcGVydGll c1NlY3Rpb24ocmVzdWx0KTsKLSAgICAgICAgICAgICAgICBzZWN0aW9uLmV4cGFuZGVkID0gdHJ1 ZTsKLSAgICAgICAgICAgICAgICBzZWN0aW9uLmVsZW1lbnQuYWRkU3R5bGVDbGFzcygic291cmNl LWZyYW1lLXBvcG92ZXItdHJlZSIpOwotICAgICAgICAgICAgICAgIHNlY3Rpb24uaGVhZGVyRWxl bWVudC5hZGRTdHlsZUNsYXNzKCJoaWRkZW4iKTsKLSAgICAgICAgICAgICAgICBwb3BvdmVyQ29u dGVudEVsZW1lbnQuYXBwZW5kQ2hpbGQoc2VjdGlvbi5lbGVtZW50KTsKLQotICAgICAgICAgICAg ICAgIGNvbnN0IHBvcG92ZXJXaWR0aCA9IDMwMDsKLSAgICAgICAgICAgICAgICBjb25zdCBwb3Bv dmVySGVpZ2h0ID0gMjUwOwotICAgICAgICAgICAgICAgIHBvcG92ZXIuc2hvdyhwb3BvdmVyQ29u dGVudEVsZW1lbnQsIGVsZW1lbnQsIHBvcG92ZXJXaWR0aCwgcG9wb3ZlckhlaWdodCk7Ci0gICAg ICAgICAgICB9CisgICAgICAgICAgICBzaG93Q2FsbGJhY2socmVzdWx0LCB3YXNUaHJvd24pOwog ICAgICAgICAgICAgdGhpcy5faGlnaGxpZ2h0RWxlbWVudC5hZGRTdHlsZUNsYXNzKCJzb3VyY2Ut ZnJhbWUtZXZhbC1leHByZXNzaW9uIik7CiAgICAgICAgIH0KIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9XZWJLaXQucXJjIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9XZWJLaXQucXJjCmluZGV4IDUyYWM5MzQuLjk1YzUyOTMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvV2ViS2l0LnFyYwor KysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1dlYktpdC5xcmMKQEAgLTc1 LDYgKzc1LDcgQEAKICAgICA8ZmlsZT5OZXR3b3JrTWFuYWdlci5qczwvZmlsZT4KICAgICA8Zmls ZT5OZXR3b3JrUGFuZWwuanM8L2ZpbGU+CiAgICAgPGZpbGU+T2JqZWN0LmpzPC9maWxlPgorICAg IDxmaWxlPk9iamVjdFBvcG92ZXJIZWxwZXIuanM8L2ZpbGU+CiAgICAgPGZpbGU+T2JqZWN0UHJv cGVydGllc1NlY3Rpb24uanM8L2ZpbGU+CiAgICAgPGZpbGU+UGFuZWwuanM8L2ZpbGU+CiAgICAg PGZpbGU+UGFuZWxFbmFibGVyVmlldy5qczwvZmlsZT4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmh0bWwgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5odG1sCmluZGV4IGM3NTg3ZWIuLjg5NDQyYmIg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9y Lmh0bWwKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3Iu aHRtbApAQCAtODgsNiArODgsNyBAQCBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0Yg VEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgogICAgIDxzY3JpcHQgdHlwZT0idGV4dC9q YXZhc2NyaXB0IiBzcmM9IlByb3BlcnRpZXNTZWN0aW9uLmpzIj48L3NjcmlwdD4KICAgICA8c2Ny aXB0IHR5cGU9InRleHQvamF2YXNjcmlwdCIgc3JjPSJSZW1vdGVPYmplY3QuanMiPjwvc2NyaXB0 PgogICAgIDxzY3JpcHQgdHlwZT0idGV4dC9qYXZhc2NyaXB0IiBzcmM9Ik9iamVjdFByb3BlcnRp ZXNTZWN0aW9uLmpzIj48L3NjcmlwdD4KKyAgICA8c2NyaXB0IHR5cGU9InRleHQvamF2YXNjcmlw dCIgc3JjPSJPYmplY3RQb3BvdmVySGVscGVyLmpzIj48L3NjcmlwdD4KICAgICA8c2NyaXB0IHR5 cGU9InRleHQvamF2YXNjcmlwdCIgc3JjPSJCcmVha3BvaW50c1NpZGViYXJQYW5lLmpzIj48L3Nj cmlwdD4KICAgICA8c2NyaXB0IHR5cGU9InRleHQvamF2YXNjcmlwdCIgc3JjPSJET01CcmVha3Bv aW50c1NpZGViYXJQYW5lLmpzIj48L3NjcmlwdD4KICAgICA8c2NyaXB0IHR5cGU9InRleHQvamF2 YXNjcmlwdCIgc3JjPSJDYWxsU3RhY2tTaWRlYmFyUGFuZS5qcyI+PC9zY3JpcHQ+Cg==