113563 2013-03-29 02:40:53 -0700 Web Inspector: ability to use AnchorBox as an anchor for Popover 2013-03-29 05:40:00 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 lushnikov lushnikov apavlov keishi loislo pfeldman pmuellr vsevik web-inspector-bugs webkit.review.bot yurys oldest_to_newest 866044 0 lushnikov 2013-03-29 02:40:53 -0700 Ability to use AnchorBox instead of Element as an anchor for Popover. 866045 1 195711 lushnikov 2013-03-29 02:43:31 -0700 Created attachment 195711 Patch 866053 2 195711 eustas 2013-03-29 02:55:54 -0700 Comment on attachment 195711 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=195711&action=review > Source/WebCore/inspector/front-end/Popover.js:56 > + * @param {Element|AnchorBox} anchor Vsevolod wont accept this annotation =( 866058 3 195711 lushnikov 2013-03-29 03:11:27 -0700 Comment on attachment 195711 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=195711&action=review >> Source/WebCore/inspector/front-end/Popover.js:56 >> + * @param {Element|AnchorBox} anchor > > Vsevolod wont accept this annotation =( How about a bet? :) 866075 4 195711 loislo 2013-03-29 04:28:08 -0700 Comment on attachment 195711 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=195711&action=review >>> Source/WebCore/inspector/front-end/Popover.js:56 >>> + * @param {Element|AnchorBox} anchor >> >> Vsevolod wont accept this annotation =( > > How about a bet? :) You can move anchorElement.boxInWindow(window); call to the topmost functions like show and showView and implement another top level method showForBox In that case you will have better api. 866080 5 195711 pfeldman 2013-03-29 04:46:18 -0700 Comment on attachment 195711 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=195711&action=review > Source/WebCore/inspector/front-end/Popover.js:159 > + var anchorBox = anchorElement.constructor === AnchorBox ? anchorElement : anchorElement.boxInWindow(window); Please use instanceof 866083 6 195724 lushnikov 2013-03-29 05:03:17 -0700 Created attachment 195724 Patch 866097 7 195724 webkit.review.bot 2013-03-29 05:39:56 -0700 Comment on attachment 195724 Patch Clearing flags on attachment: 195724 Committed r147209: <http://trac.webkit.org/changeset/147209> 866098 8 webkit.review.bot 2013-03-29 05:40:00 -0700 All reviewed patches have been landed. Closing bug. 195711 2013-03-29 02:43:31 -0700 2013-03-29 05:03:12 -0700 Patch bug-113563-20130329134327.patch text/plain 4093 lushnikov U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ3MjAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODE5ZTk0MWI1NzRjOTZj MjBmMThmNmZmODI2OTcxYTRiZmIxMzhiZS4uMzk2OGZhNTE5YWU1YWE2ZWZhOWQzZTY1Zjk2ZDVm YmJlOWU1NTg1NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEzLTAzLTI5ICBBbmRy ZXkgTHVzaG5pa292ICA8bHVzaG5pa292QGNocm9taXVtLm9yZz4KKworICAgICAgICBXZWIgSW5z cGVjdG9yOiBhYmlsaXR5IHRvIHVzZSBBbmNob3JCb3ggYXMgYW4gYW5jaG9yIGZvciBQb3BvdmVy CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTM1NjMK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyBuZXcg dGVzdDogbm8gY2hhbmdlIGluIGJlaGF2aW91ci4KKworICAgICAgICAtIEFiaWxpdHkgdG8gcGFz cyBBbmNob3JCb3ggaW5zdGVhZCBvZiBFbGVtZW50IGZvciBwb3BvdmVyIGFuY2hvci4KKworICAg ICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvUG9wb3Zlci5qczoKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5Qb3BvdmVyLnByb3RvdHlwZS5fcG9zaXRpb25FbGVtZW50KToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5Qb3BvdmVySGVscGVyLnByb3RvdHlwZS5fZXZlbnRJbkhvdmVyRWxlbWVudCk6CisK IDIwMTMtMDMtMjkgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBS RUdSRVNTSU9OKHIxNDMxMDIpOiBJZ25vcmUgdGFibGUgY2VsbCdzIGhlaWdodCBhdHRyaWJ1dGUg d2hlbiBjaGVja2luZyBpZiBjb250YWluaW5nIGJsb2NrIGhhcyBhdXRvIGhlaWdodC4KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUG9wb3Zlci5qcyBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUG9wb3Zlci5qcwppbmRleCA1NWYwOGI0 ZjNhNDFmZTNmZjU1YzJiZDcwZGQyNTBhNmYzNjgwZDE5Li4yODI1YjQ4MDViODkyYjRiYmJhZjRk NmRhOTg0YzU5YzAyOGNjMzBlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL1BvcG92ZXIuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9Qb3BvdmVyLmpzCkBAIC01Myw3ICs1Myw3IEBAIFdlYkluc3BlY3Rvci5Qb3BvdmVyID0g ZnVuY3Rpb24ocG9wb3ZlckhlbHBlcikKIFdlYkluc3BlY3Rvci5Qb3BvdmVyLnByb3RvdHlwZSA9 IHsKICAgICAvKioKICAgICAgKiBAcGFyYW0ge0VsZW1lbnR9IGVsZW1lbnQKLSAgICAgKiBAcGFy YW0ge0VsZW1lbnR9IGFuY2hvcgorICAgICAqIEBwYXJhbSB7RWxlbWVudHxBbmNob3JCb3h9IGFu Y2hvcgogICAgICAqIEBwYXJhbSB7P251bWJlcj19IHByZWZlcnJlZFdpZHRoCiAgICAgICogQHBh cmFtIHs/bnVtYmVyPX0gcHJlZmVycmVkSGVpZ2h0CiAgICAgICogQHBhcmFtIHs/V2ViSW5zcGVj dG9yLlBvcG92ZXIuT3JpZW50YXRpb249fSBhcnJvd0RpcmVjdGlvbgpAQCAtNjUsNyArNjUsNyBA QCBXZWJJbnNwZWN0b3IuUG9wb3Zlci5wcm90b3R5cGUgPSB7CiAKICAgICAvKioKICAgICAgKiBA cGFyYW0ge1dlYkluc3BlY3Rvci5WaWV3fSB2aWV3Ci0gICAgICogQHBhcmFtIHtFbGVtZW50fSBh bmNob3IKKyAgICAgKiBAcGFyYW0ge0VsZW1lbnR8QW5jaG9yQm94fSBhbmNob3IKICAgICAgKiBA cGFyYW0gez9udW1iZXI9fSBwcmVmZXJyZWRXaWR0aAogICAgICAqIEBwYXJhbSB7P251bWJlcj19 IHByZWZlcnJlZEhlaWdodAogICAgICAqLwpAQCAtNzcsNyArNzcsNyBAQCBXZWJJbnNwZWN0b3Iu UG9wb3Zlci5wcm90b3R5cGUgPSB7CiAgICAgLyoqCiAgICAgICogQHBhcmFtIHtXZWJJbnNwZWN0 b3IuVmlldz99IHZpZXcKICAgICAgKiBAcGFyYW0ge0VsZW1lbnR9IGNvbnRlbnRFbGVtZW50Ci0g ICAgICogQHBhcmFtIHtFbGVtZW50fSBhbmNob3IKKyAgICAgKiBAcGFyYW0ge0VsZW1lbnR8QW5j aG9yQm94fSBhbmNob3IKICAgICAgKiBAcGFyYW0gez9udW1iZXI9fSBwcmVmZXJyZWRXaWR0aAog ICAgICAqIEBwYXJhbSB7P251bWJlcj19IHByZWZlcnJlZEhlaWdodAogICAgICAqIEBwYXJhbSB7 P1dlYkluc3BlY3Rvci5Qb3BvdmVyLk9yaWVudGF0aW9uPX0gYXJyb3dEaXJlY3Rpb24KQEAgLTEz Nyw2ICsxMzcsMTIgQEAgV2ViSW5zcGVjdG9yLlBvcG92ZXIucHJvdG90eXBlID0gewogICAgICAg ICB0aGlzLl9jb250ZW50RGl2LmFkZFN0eWxlQ2xhc3MoImZpeGVkLWhlaWdodCIpOwogICAgIH0s CiAKKyAgICAvKioKKyAgICAgKiBAcGFyYW0ge0VsZW1lbnR8QW5jaG9yQm94fSBhbmNob3JFbGVt ZW50CisgICAgICogQHBhcmFtIHtudW1iZXJ9IHByZWZlcnJlZFdpZHRoCisgICAgICogQHBhcmFt IHtudW1iZXJ9IHByZWZlcnJlZEhlaWdodAorICAgICAqIEBwYXJhbSB7P1dlYkluc3BlY3Rvci5Q b3BvdmVyLk9yaWVudGF0aW9uPX0gYXJyb3dEaXJlY3Rpb24KKyAgICAgKi8KICAgICBfcG9zaXRp b25FbGVtZW50OiBmdW5jdGlvbihhbmNob3JFbGVtZW50LCBwcmVmZXJyZWRXaWR0aCwgcHJlZmVy cmVkSGVpZ2h0LCBhcnJvd0RpcmVjdGlvbikKICAgICB7CiAgICAgICAgIGNvbnN0IGJvcmRlcldp ZHRoID0gMjU7CkBAIC0xNTAsNyArMTU2LDcgQEAgV2ViSW5zcGVjdG9yLlBvcG92ZXIucHJvdG90 eXBlID0gewogICAgICAgICBjb25zdCB0b3RhbFdpZHRoID0gd2luZG93LmlubmVyV2lkdGg7CiAg ICAgICAgIGNvbnN0IHRvdGFsSGVpZ2h0ID0gd2luZG93LmlubmVySGVpZ2h0OwogCi0gICAgICAg IHZhciBhbmNob3JCb3ggPSBhbmNob3JFbGVtZW50LmJveEluV2luZG93KHdpbmRvdyk7CisgICAg ICAgIHZhciBhbmNob3JCb3ggPSBhbmNob3JFbGVtZW50LmNvbnN0cnVjdG9yID09PSBBbmNob3JC b3ggPyBhbmNob3JFbGVtZW50IDogYW5jaG9yRWxlbWVudC5ib3hJbldpbmRvdyh3aW5kb3cpOwog ICAgICAgICB2YXIgbmV3RWxlbWVudFBvc2l0aW9uID0geyB4OiAwLCB5OiAwLCB3aWR0aDogcHJl ZmVycmVkV2lkdGggKyBzY3JvbGxlcldpZHRoLCBoZWlnaHQ6IHByZWZlcnJlZEhlaWdodCB9Owog CiAgICAgICAgIHZhciB2ZXJ0aWNhbEFsaWdubWVudDsKQEAgLTIyMCw3ICsyMjYsNyBAQCBXZWJJ bnNwZWN0b3IuUG9wb3Zlci5wcm90b3R5cGUgPSB7CiAvKioKICAqIEBjb25zdHJ1Y3RvcgogICog QHBhcmFtIHtFbGVtZW50fSBwYW5lbEVsZW1lbnQKLSAqIEBwYXJhbSB7ZnVuY3Rpb24oRWxlbWVu dCwgRXZlbnQpOkVsZW1lbnR8dW5kZWZpbmVkfSBnZXRBbmNob3IKKyAqIEBwYXJhbSB7ZnVuY3Rp b24oRWxlbWVudCwgRXZlbnQpOihFbGVtZW50fEFuY2hvckJveCl8dW5kZWZpbmVkfSBnZXRBbmNo b3IKICAqIEBwYXJhbSB7ZnVuY3Rpb24oRWxlbWVudCwgV2ViSW5zcGVjdG9yLlBvcG92ZXIpOnVu ZGVmaW5lZH0gc2hvd1BvcG92ZXIKICAqIEBwYXJhbSB7ZnVuY3Rpb24oKT19IG9uSGlkZQogICog QHBhcmFtIHtib29sZWFuPX0gZGlzYWJsZU9uQ2xpY2sKQEAgLTI1Miw3ICsyNTgsNyBAQCBXZWJJ bnNwZWN0b3IuUG9wb3ZlckhlbHBlci5wcm90b3R5cGUgPSB7CiAgICAgewogICAgICAgICBpZiAo IXRoaXMuX2hvdmVyRWxlbWVudCkKICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICAgICAg dmFyIGJveCA9IHRoaXMuX2hvdmVyRWxlbWVudC5ib3hJbldpbmRvdygpOworICAgICAgICB2YXIg Ym94ID0gdGhpcy5faG92ZXJFbGVtZW50LmNvbnN0cnVjdG9yID09PSBBbmNob3JCb3ggPyB0aGlz Ll9ob3ZlckVsZW1lbnQgOiB0aGlzLl9ob3ZlckVsZW1lbnQuYm94SW5XaW5kb3coKTsKICAgICAg ICAgcmV0dXJuIChib3gueCA8PSBldmVudC5jbGllbnRYICYmIGV2ZW50LmNsaWVudFggPD0gYm94 LnggKyBib3gud2lkdGggJiYKICAgICAgICAgICAgIGJveC55IDw9IGV2ZW50LmNsaWVudFkgJiYg ZXZlbnQuY2xpZW50WSA8PSBib3gueSArIGJveC5oZWlnaHQpOwogICAgIH0sCg== 195724 2013-03-29 05:03:17 -0700 2013-03-29 05:39:56 -0700 Patch bug-113563-20130329160314.patch text/plain 4083 lushnikov U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ3MjAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODE5ZTk0MWI1NzRjOTZj MjBmMThmNmZmODI2OTcxYTRiZmIxMzhiZS4uMzk2OGZhNTE5YWU1YWE2ZWZhOWQzZTY1Zjk2ZDVm YmJlOWU1NTg1NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEzLTAzLTI5ICBBbmRy ZXkgTHVzaG5pa292ICA8bHVzaG5pa292QGNocm9taXVtLm9yZz4KKworICAgICAgICBXZWIgSW5z cGVjdG9yOiBhYmlsaXR5IHRvIHVzZSBBbmNob3JCb3ggYXMgYW4gYW5jaG9yIGZvciBQb3BvdmVy CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTM1NjMK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyBuZXcg dGVzdDogbm8gY2hhbmdlIGluIGJlaGF2aW91ci4KKworICAgICAgICAtIEFiaWxpdHkgdG8gcGFz cyBBbmNob3JCb3ggaW5zdGVhZCBvZiBFbGVtZW50IGZvciBwb3BvdmVyIGFuY2hvci4KKworICAg ICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvUG9wb3Zlci5qczoKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5Qb3BvdmVyLnByb3RvdHlwZS5fcG9zaXRpb25FbGVtZW50KToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5Qb3BvdmVySGVscGVyLnByb3RvdHlwZS5fZXZlbnRJbkhvdmVyRWxlbWVudCk6CisK IDIwMTMtMDMtMjkgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBS RUdSRVNTSU9OKHIxNDMxMDIpOiBJZ25vcmUgdGFibGUgY2VsbCdzIGhlaWdodCBhdHRyaWJ1dGUg d2hlbiBjaGVja2luZyBpZiBjb250YWluaW5nIGJsb2NrIGhhcyBhdXRvIGhlaWdodC4KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUG9wb3Zlci5qcyBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUG9wb3Zlci5qcwppbmRleCA1NWYwOGI0 ZjNhNDFmZTNmZjU1YzJiZDcwZGQyNTBhNmYzNjgwZDE5Li41ZGJlY2I5OTU4NTIxMTNhZjZjYzVl NmI2MWM4ZTMzOTY2ZjQ0YTI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL1BvcG92ZXIuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9Qb3BvdmVyLmpzCkBAIC01Myw3ICs1Myw3IEBAIFdlYkluc3BlY3Rvci5Qb3BvdmVyID0g ZnVuY3Rpb24ocG9wb3ZlckhlbHBlcikKIFdlYkluc3BlY3Rvci5Qb3BvdmVyLnByb3RvdHlwZSA9 IHsKICAgICAvKioKICAgICAgKiBAcGFyYW0ge0VsZW1lbnR9IGVsZW1lbnQKLSAgICAgKiBAcGFy YW0ge0VsZW1lbnR9IGFuY2hvcgorICAgICAqIEBwYXJhbSB7RWxlbWVudHxBbmNob3JCb3h9IGFu Y2hvcgogICAgICAqIEBwYXJhbSB7P251bWJlcj19IHByZWZlcnJlZFdpZHRoCiAgICAgICogQHBh cmFtIHs/bnVtYmVyPX0gcHJlZmVycmVkSGVpZ2h0CiAgICAgICogQHBhcmFtIHs/V2ViSW5zcGVj dG9yLlBvcG92ZXIuT3JpZW50YXRpb249fSBhcnJvd0RpcmVjdGlvbgpAQCAtNjUsNyArNjUsNyBA QCBXZWJJbnNwZWN0b3IuUG9wb3Zlci5wcm90b3R5cGUgPSB7CiAKICAgICAvKioKICAgICAgKiBA cGFyYW0ge1dlYkluc3BlY3Rvci5WaWV3fSB2aWV3Ci0gICAgICogQHBhcmFtIHtFbGVtZW50fSBh bmNob3IKKyAgICAgKiBAcGFyYW0ge0VsZW1lbnR8QW5jaG9yQm94fSBhbmNob3IKICAgICAgKiBA cGFyYW0gez9udW1iZXI9fSBwcmVmZXJyZWRXaWR0aAogICAgICAqIEBwYXJhbSB7P251bWJlcj19 IHByZWZlcnJlZEhlaWdodAogICAgICAqLwpAQCAtNzcsNyArNzcsNyBAQCBXZWJJbnNwZWN0b3Iu UG9wb3Zlci5wcm90b3R5cGUgPSB7CiAgICAgLyoqCiAgICAgICogQHBhcmFtIHtXZWJJbnNwZWN0 b3IuVmlldz99IHZpZXcKICAgICAgKiBAcGFyYW0ge0VsZW1lbnR9IGNvbnRlbnRFbGVtZW50Ci0g ICAgICogQHBhcmFtIHtFbGVtZW50fSBhbmNob3IKKyAgICAgKiBAcGFyYW0ge0VsZW1lbnR8QW5j aG9yQm94fSBhbmNob3IKICAgICAgKiBAcGFyYW0gez9udW1iZXI9fSBwcmVmZXJyZWRXaWR0aAog ICAgICAqIEBwYXJhbSB7P251bWJlcj19IHByZWZlcnJlZEhlaWdodAogICAgICAqIEBwYXJhbSB7 P1dlYkluc3BlY3Rvci5Qb3BvdmVyLk9yaWVudGF0aW9uPX0gYXJyb3dEaXJlY3Rpb24KQEAgLTEz Nyw2ICsxMzcsMTIgQEAgV2ViSW5zcGVjdG9yLlBvcG92ZXIucHJvdG90eXBlID0gewogICAgICAg ICB0aGlzLl9jb250ZW50RGl2LmFkZFN0eWxlQ2xhc3MoImZpeGVkLWhlaWdodCIpOwogICAgIH0s CiAKKyAgICAvKioKKyAgICAgKiBAcGFyYW0ge0VsZW1lbnR8QW5jaG9yQm94fSBhbmNob3JFbGVt ZW50CisgICAgICogQHBhcmFtIHtudW1iZXJ9IHByZWZlcnJlZFdpZHRoCisgICAgICogQHBhcmFt IHtudW1iZXJ9IHByZWZlcnJlZEhlaWdodAorICAgICAqIEBwYXJhbSB7P1dlYkluc3BlY3Rvci5Q b3BvdmVyLk9yaWVudGF0aW9uPX0gYXJyb3dEaXJlY3Rpb24KKyAgICAgKi8KICAgICBfcG9zaXRp b25FbGVtZW50OiBmdW5jdGlvbihhbmNob3JFbGVtZW50LCBwcmVmZXJyZWRXaWR0aCwgcHJlZmVy cmVkSGVpZ2h0LCBhcnJvd0RpcmVjdGlvbikKICAgICB7CiAgICAgICAgIGNvbnN0IGJvcmRlcldp ZHRoID0gMjU7CkBAIC0xNTAsNyArMTU2LDcgQEAgV2ViSW5zcGVjdG9yLlBvcG92ZXIucHJvdG90 eXBlID0gewogICAgICAgICBjb25zdCB0b3RhbFdpZHRoID0gd2luZG93LmlubmVyV2lkdGg7CiAg ICAgICAgIGNvbnN0IHRvdGFsSGVpZ2h0ID0gd2luZG93LmlubmVySGVpZ2h0OwogCi0gICAgICAg IHZhciBhbmNob3JCb3ggPSBhbmNob3JFbGVtZW50LmJveEluV2luZG93KHdpbmRvdyk7CisgICAg ICAgIHZhciBhbmNob3JCb3ggPSBhbmNob3JFbGVtZW50IGluc3RhbmNlb2YgQW5jaG9yQm94ID8g YW5jaG9yRWxlbWVudCA6IGFuY2hvckVsZW1lbnQuYm94SW5XaW5kb3cod2luZG93KTsKICAgICAg ICAgdmFyIG5ld0VsZW1lbnRQb3NpdGlvbiA9IHsgeDogMCwgeTogMCwgd2lkdGg6IHByZWZlcnJl ZFdpZHRoICsgc2Nyb2xsZXJXaWR0aCwgaGVpZ2h0OiBwcmVmZXJyZWRIZWlnaHQgfTsKIAogICAg ICAgICB2YXIgdmVydGljYWxBbGlnbm1lbnQ7CkBAIC0yMjAsNyArMjI2LDcgQEAgV2ViSW5zcGVj dG9yLlBvcG92ZXIucHJvdG90eXBlID0gewogLyoqCiAgKiBAY29uc3RydWN0b3IKICAqIEBwYXJh bSB7RWxlbWVudH0gcGFuZWxFbGVtZW50Ci0gKiBAcGFyYW0ge2Z1bmN0aW9uKEVsZW1lbnQsIEV2 ZW50KTpFbGVtZW50fHVuZGVmaW5lZH0gZ2V0QW5jaG9yCisgKiBAcGFyYW0ge2Z1bmN0aW9uKEVs ZW1lbnQsIEV2ZW50KTooRWxlbWVudHxBbmNob3JCb3gpfHVuZGVmaW5lZH0gZ2V0QW5jaG9yCiAg KiBAcGFyYW0ge2Z1bmN0aW9uKEVsZW1lbnQsIFdlYkluc3BlY3Rvci5Qb3BvdmVyKTp1bmRlZmlu ZWR9IHNob3dQb3BvdmVyCiAgKiBAcGFyYW0ge2Z1bmN0aW9uKCk9fSBvbkhpZGUKICAqIEBwYXJh bSB7Ym9vbGVhbj19IGRpc2FibGVPbkNsaWNrCkBAIC0yNTIsNyArMjU4LDcgQEAgV2ViSW5zcGVj dG9yLlBvcG92ZXJIZWxwZXIucHJvdG90eXBlID0gewogICAgIHsKICAgICAgICAgaWYgKCF0aGlz Ll9ob3ZlckVsZW1lbnQpCiAgICAgICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgICAgIHZhciBi b3ggPSB0aGlzLl9ob3ZlckVsZW1lbnQuYm94SW5XaW5kb3coKTsKKyAgICAgICAgdmFyIGJveCA9 IHRoaXMuX2hvdmVyRWxlbWVudCBpbnN0YW5jZW9mIEFuY2hvckJveCA/IHRoaXMuX2hvdmVyRWxl bWVudCA6IHRoaXMuX2hvdmVyRWxlbWVudC5ib3hJbldpbmRvdygpOwogICAgICAgICByZXR1cm4g KGJveC54IDw9IGV2ZW50LmNsaWVudFggJiYgZXZlbnQuY2xpZW50WCA8PSBib3gueCArIGJveC53 aWR0aCAmJgogICAgICAgICAgICAgYm94LnkgPD0gZXZlbnQuY2xpZW50WSAmJiBldmVudC5jbGll bnRZIDw9IGJveC55ICsgYm94LmhlaWdodCk7CiAgICAgfSwK