70695 2011-10-23 08:13:16 -0700 Web Inspector: make DataGrid a view 2011-10-24 02:24:32 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 pfeldman pfeldman apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 489025 0 pfeldman 2011-10-23 08:13:16 -0700 Patch to follow. 489026 1 112112 pfeldman 2011-10-23 08:17:31 -0700 Created attachment 112112 Patch 489217 2 112112 yurys 2011-10-24 01:35:20 -0700 Comment on attachment 112112 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=112112&action=review > Source/WebCore/inspector/front-end/DatabaseQueryView.js:173 > + _appendViewQueryResult: function(query, view) Why not annotate parameters here? 489239 3 pfeldman 2011-10-24 02:24:32 -0700 Committed r98225: <http://trac.webkit.org/changeset/98225> 112112 2011-10-23 08:17:31 -0700 2011-10-24 01:35:20 -0700 Patch bug-70695-20111023191727.patch text/plain 22340 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogOTgyMDEKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAyNjZiNzIzZWQwZjIzNzhk ZTA4YmZhMGIyNjM1NTdhMmI0NDNhY2QwLi5mNzI5ZjE3YzAwZTkzNjc2ZWU3ZmYyM2Y2YWQ3MzA5 MTA3NTExNzVkIDEwMDc1NQotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDQgQEAKKzIwMTEtMTAtMjMgIFBhdmVs IEZlbGRtYW4gIDxwZmVsZG1hbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogbWFrZSBEYXRhR3JpZCBhIHZpZXcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTcwNjk1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0FwcGxpY2F0aW9uQ2FjaGVJdGVt c1ZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQXBwbGljYXRpb25DYWNoZUl0ZW1zVmll dy5wcm90b3R5cGUuX2NyZWF0ZURhdGFHcmlkKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQt ZW5kL0Nvb2tpZUl0ZW1zVmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db29raWVJdGVt c1ZpZXcucHJvdG90eXBlLl91cGRhdGVXaXRoQ29va2llcyk6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuU2ltcGxlQ29va2llc1RhYmxlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TaW1wbGVDb29r aWVzVGFibGUucHJvdG90eXBlLnNldENvb2tpZXMpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9u dC1lbmQvQ29va2llc1RhYmxlLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvb2tpZXNUYWJs ZSk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9ET01TdG9yYWdlSXRlbXNWaWV3Lmpz OgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRPTVN0b3JhZ2VJdGVtc1ZpZXcucHJvdG90eXBlLl9z aG93RE9NU3RvcmFnZUVudHJpZXMpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvRGF0 YUdyaWQuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGF0YUdyaWQpOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLkRhdGFHcmlkLnByb3RvdHlwZS5vblJlc2l6ZSk6CisgICAgICAgICogaW5zcGVj dG9yL2Zyb250LWVuZC9EYXRhYmFzZVF1ZXJ5Vmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5EYXRhYmFzZVF1ZXJ5Vmlldy5wcm90b3R5cGUuX3F1ZXJ5RmluaXNoZWQpOgorICAgICAgICAo V2ViSW5zcGVjdG9yLkRhdGFiYXNlUXVlcnlWaWV3LnByb3RvdHlwZS5fcXVlcnlFcnJvcik6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuRGF0YWJhc2VRdWVyeVZpZXcucHJvdG90eXBlLl9hcHBlbmRW aWV3UXVlcnlSZXN1bHQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRhdGFiYXNlUXVlcnlWaWV3 LnByb3RvdHlwZS5fYXBwZW5kRXJyb3JRdWVyeVJlc3VsdCk6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuRGF0YWJhc2VRdWVyeVZpZXcucHJvdG90eXBlLl9hcHBlbmRRdWVyeVJlc3VsdCk6CisgICAg ICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9EYXRhYmFzZVRhYmxlVmlldy5qczoKKyAgICAgICAg KFdlYkluc3BlY3Rvci5EYXRhYmFzZVRhYmxlVmlldy5wcm90b3R5cGUuX3F1ZXJ5RmluaXNoZWQp OgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvRGV0YWlsZWRIZWFwc2hvdFZpZXcuanM6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGV0YWlsZWRIZWFwc2hvdFZpZXcucHJvdG90eXBlLndh c1Nob3duLnByb2ZpbGVDYWxsYmFjazIpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRldGFpbGVk SGVhcHNob3RWaWV3LnByb3RvdHlwZS53YXNTaG93bik6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu RGV0YWlsZWRIZWFwc2hvdFZpZXcucHJvdG90eXBlLm9uUmVzaXplKToKKyAgICAgICAgKiBpbnNw ZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtQYW5lbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5O ZXR3b3JrTG9nVmlldy5wcm90b3R5cGUub25SZXNpemUpOgorICAgICAgICAoV2ViSW5zcGVjdG9y Lk5ldHdvcmtMb2dWaWV3LnByb3RvdHlwZS5fY3JlYXRlVGFibGUpOgorICAgICAgICAqIGluc3Bl Y3Rvci9mcm9udC1lbmQvUHJvZmlsZVZpZXcuanM6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250 LWVuZC9SZXNvdXJjZUNvb2tpZXNWaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291 cmNlQ29va2llc1ZpZXcucHJvdG90eXBlLl9idWlsZENvb2tpZXNUYWJsZSk6CisgICAgICAgICog aW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZVZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuUmVzb3VyY2VWaWV3KToKKwogMjAxMS0xMC0yMiAgR2VvZmZyZXkgR2FyZW4gIDxnZ2FyZW5A YXBwbGUuY29tPgogCiAgICAgICAgIFNlcGFyYXRlZCBzdHJpbmcgbGlmZXRpbWUgYml0cyBmcm9t IGNoYXJhY3RlciBidWZmZXIgc3RhdGUgYml0cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9BcHBsaWNhdGlvbkNhY2hlSXRlbXNWaWV3LmpzIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9BcHBsaWNhdGlvbkNhY2hlSXRlbXNWaWV3Lmpz CmluZGV4IGM5ZDZlZGFjZTMzM2NmYjMwZmFjYjEyYjNjY2Q2YzNkNmU5MjAwMGUuLjliMzk4ZTQ0 NGYyOWIxM2FhMzlkZjZhYzNmNjkwOWRhOGVmZmYwNjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQXBwbGljYXRpb25DYWNoZUl0ZW1zVmlldy5qcworKysg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0FwcGxpY2F0aW9uQ2FjaGVJdGVt c1ZpZXcuanMKQEAgLTIwMCw5ICsyMDAsOCBAQCBXZWJJbnNwZWN0b3IuQXBwbGljYXRpb25DYWNo ZUl0ZW1zVmlldy5wcm90b3R5cGUgPSB7CiAgICAgICAgIGNvbHVtbnNbMl0uYWxpZ25lZCA9ICJy aWdodCI7CiAgICAgICAgIGNvbHVtbnNbMl0uc29ydGFibGUgPSB0cnVlOwogICAgICAgICB0aGlz Ll9kYXRhR3JpZCA9IG5ldyBXZWJJbnNwZWN0b3IuRGF0YUdyaWQoY29sdW1ucyk7Ci0gICAgICAg IHRoaXMuZWxlbWVudC5hcHBlbmRDaGlsZCh0aGlzLl9kYXRhR3JpZC5lbGVtZW50KTsKKyAgICAg ICAgdGhpcy5fZGF0YUdyaWQuc2hvdyh0aGlzLmVsZW1lbnQpOwogICAgICAgICB0aGlzLl9kYXRh R3JpZC5hZGRFdmVudExpc3RlbmVyKCJzb3J0aW5nIGNoYW5nZWQiLCB0aGlzLl9wb3B1bGF0ZURh dGFHcmlkLCB0aGlzKTsKLSAgICAgICAgdGhpcy5fZGF0YUdyaWQudXBkYXRlV2lkdGhzKCk7CiAg ICAgfSwKIAogICAgIF9wb3B1bGF0ZURhdGFHcmlkOiBmdW5jdGlvbigpCkBAIC0yNTEsMTIgKzI1 MCw2IEBAIFdlYkluc3BlY3Rvci5BcHBsaWNhdGlvbkNhY2hlSXRlbXNWaWV3LnByb3RvdHlwZSA9 IHsKICAgICAgICAgICAgIHRoaXMuX2RhdGFHcmlkLmNoaWxkcmVuWzBdLnNlbGVjdGVkID0gdHJ1 ZTsKICAgICB9LAogCi0gICAgb25SZXNpemU6IGZ1bmN0aW9uKCkKLSAgICB7Ci0gICAgICAgIGlm ICh0aGlzLl9kYXRhR3JpZCkKLSAgICAgICAgICAgIHRoaXMuX2RhdGFHcmlkLnVwZGF0ZVdpZHRo cygpOwotICAgIH0sCi0KICAgICBfZGVsZXRlQnV0dG9uQ2xpY2tlZDogZnVuY3Rpb24oZXZlbnQp CiAgICAgewogICAgICAgICBpZiAoIXRoaXMuX2RhdGFHcmlkIHx8ICF0aGlzLl9kYXRhR3JpZC5z ZWxlY3RlZE5vZGUpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL0Nvb2tpZUl0ZW1zVmlldy5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvQ29va2llSXRlbXNWaWV3LmpzCmluZGV4IDQ4YWEyOTM0MTY5ZmM2NjdlN2Y1NjI1NjEyM2Fk YzJjNjUxZjdhYTAuLmUyZDRiMTlkYmE1OTQxZDBkYmFkZTE4MGJlMmY1M2QyMWFmNThlYzUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29va2llSXRlbXNW aWV3LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29va2llSXRl bXNWaWV3LmpzCkBAIC02OSwxMiArNjksNiBAQCBXZWJJbnNwZWN0b3IuQ29va2llSXRlbXNWaWV3 LnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5fZGVsZXRlQnV0dG9uLnZpc2libGUgPSBmYWxz ZTsKICAgICB9LAogCi0gICAgb25SZXNpemU6IGZ1bmN0aW9uKCkKLSAgICB7Ci0gICAgICAgIGlm ICh0aGlzLl9jb29raWVzVGFibGUpCi0gICAgICAgICAgICB0aGlzLl9jb29raWVzVGFibGUudXBk YXRlV2lkdGhzKCk7Ci0gICAgfSwKLQogICAgIF91cGRhdGU6IGZ1bmN0aW9uKCkKICAgICB7CiAg ICAgICAgIFdlYkluc3BlY3Rvci5Db29raWVzLmdldENvb2tpZXNBc3luYyh0aGlzLl91cGRhdGVX aXRoQ29va2llcy5iaW5kKHRoaXMpKTsKQEAgLTg5LDI0ICs4MywyMSBAQCBXZWJJbnNwZWN0b3Iu Q29va2llSXRlbXNWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHRoaXMuX2VtcHR5Vmll dy5zaG93KHRoaXMuZWxlbWVudCk7CiAgICAgICAgICAgICB0aGlzLl9kZWxldGVCdXR0b24udmlz aWJsZSA9IGZhbHNlOwogICAgICAgICAgICAgaWYgKHRoaXMuX2Nvb2tpZXNUYWJsZSkKLSAgICAg ICAgICAgICAgICB0aGlzLl9jb29raWVzVGFibGUuZWxlbWVudC5hZGRTdHlsZUNsYXNzKCJoaWRk ZW4iKTsKKyAgICAgICAgICAgICAgICB0aGlzLl9jb29raWVzVGFibGUuZGV0YWNoKCk7CiAgICAg ICAgICAgICByZXR1cm47CiAgICAgICAgIH0KIAotICAgICAgICBpZiAoIXRoaXMuX2Nvb2tpZXNU YWJsZSkgeworICAgICAgICBpZiAoIXRoaXMuX2Nvb2tpZXNUYWJsZSkKICAgICAgICAgICAgIHRo aXMuX2Nvb2tpZXNUYWJsZSA9IGlzQWR2YW5jZWQgPyBuZXcgV2ViSW5zcGVjdG9yLkNvb2tpZXNU YWJsZSh0aGlzLl9jb29raWVEb21haW4sIGZhbHNlLCB0aGlzLl9kZWxldGVDb29raWUuYmluZCh0 aGlzKSwgdGhpcy5fdXBkYXRlLmJpbmQodGhpcykpIDogbmV3IFdlYkluc3BlY3Rvci5TaW1wbGVD b29raWVzVGFibGUoKTsKLSAgICAgICAgICAgIHRoaXMuZWxlbWVudC5hcHBlbmRDaGlsZCh0aGlz Ll9jb29raWVzVGFibGUuZWxlbWVudCk7Ci0gICAgICAgIH0KIAogICAgICAgICB0aGlzLl9jb29r aWVzVGFibGUuc2V0Q29va2llcyh0aGlzLl9jb29raWVzKTsKLSAgICAgICAgdGhpcy5fY29va2ll c1RhYmxlLmVsZW1lbnQucmVtb3ZlU3R5bGVDbGFzcygiaGlkZGVuIik7CiAgICAgICAgIHRoaXMu X2VtcHR5Vmlldy5kZXRhY2goKTsKKyAgICAgICAgdGhpcy5fY29va2llc1RhYmxlLnNob3codGhp cy5lbGVtZW50KTsKICAgICAgICAgaWYgKGlzQWR2YW5jZWQpIHsKICAgICAgICAgICAgIHRoaXMu X3RyZWVFbGVtZW50LnN1YnRpdGxlID0gU3RyaW5nLnNwcmludGYoV2ViSW5zcGVjdG9yLlVJU3Ry aW5nKCIlZCBjb29raWVzICglcykiKSwgdGhpcy5fY29va2llcy5sZW5ndGgsCiAgICAgICAgICAg ICAgICAgTnVtYmVyLmJ5dGVzVG9TdHJpbmcodGhpcy5fdG90YWxTaXplKSk7CiAgICAgICAgICAg ICB0aGlzLl9kZWxldGVCdXR0b24udmlzaWJsZSA9IHRydWU7CiAgICAgICAgIH0KLSAgICAgICAg dGhpcy5fY29va2llc1RhYmxlLnVwZGF0ZVdpZHRocygpOwogICAgIH0sCiAKICAgICBfZmlsdGVy Q29va2llc0ZvckRvbWFpbjogZnVuY3Rpb24oYWxsQ29va2llcykKQEAgLTE3MSwxMCArMTYyLDEy IEBAIFdlYkluc3BlY3Rvci5Db29raWVJdGVtc1ZpZXcucHJvdG90eXBlLl9fcHJvdG9fXyA9IFdl Ykluc3BlY3Rvci5WaWV3LnByb3RvdHlwZTsKIAogLyoqCiAgKiBAY29uc3RydWN0b3IKKyAqIEBl eHRlbmRzIHtXZWJJbnNwZWN0b3IuVmlld30KICAqLwogV2ViSW5zcGVjdG9yLlNpbXBsZUNvb2tp ZXNUYWJsZSA9IGZ1bmN0aW9uKCkKIHsKLSAgICB0aGlzLmVsZW1lbnQgPSBkb2N1bWVudC5jcmVh dGVFbGVtZW50KCJkaXYiKTsKKyAgICBXZWJJbnNwZWN0b3IuVmlldy5jYWxsKHRoaXMpOworCiAg ICAgdmFyIGNvbHVtbnMgPSB7fTsKICAgICBjb2x1bW5zWzBdID0ge307CiAgICAgY29sdW1uc1sx XSA9IHt9OwpAQCAtMTgzLDggKzE3Niw3IEBAIFdlYkluc3BlY3Rvci5TaW1wbGVDb29raWVzVGFi bGUgPSBmdW5jdGlvbigpCiAKICAgICB0aGlzLl9kYXRhR3JpZCA9IG5ldyBXZWJJbnNwZWN0b3Iu RGF0YUdyaWQoY29sdW1ucyk7CiAgICAgdGhpcy5fZGF0YUdyaWQuYXV0b1NpemVDb2x1bW5zKDIw LCA4MCk7Ci0gICAgdGhpcy5lbGVtZW50LmFwcGVuZENoaWxkKHRoaXMuX2RhdGFHcmlkLmVsZW1l bnQpOwotICAgIHRoaXMuX2RhdGFHcmlkLnVwZGF0ZVdpZHRocygpOworICAgIHRoaXMuX2RhdGFH cmlkLnNob3codGhpcy5lbGVtZW50KTsKIH0KIAogV2ViSW5zcGVjdG9yLlNpbXBsZUNvb2tpZXNU YWJsZS5wcm90b3R5cGUgPSB7CkBAIC0yMDUsMTUgKzE5NywxMCBAQCBXZWJJbnNwZWN0b3IuU2lt cGxlQ29va2llc1RhYmxlLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHRoaXMuX2RhdGFHcmlk LmFwcGVuZENoaWxkKG5vZGUpOwogICAgICAgICB9CiAgICAgICAgIHRoaXMuX2RhdGFHcmlkLmNo aWxkcmVuWzBdLnNlbGVjdGVkID0gdHJ1ZTsKLSAgICB9LAotCi0gICAgb25SZXNpemU6IGZ1bmN0 aW9uKCkKLSAgICB7Ci0gICAgICAgIGlmICh0aGlzLl9kYXRhR3JpZCkKLSAgICAgICAgICAgIHRo aXMuX2RhdGFHcmlkLnVwZGF0ZVdpZHRocygpOwogICAgIH0KIH0KIAorV2ViSW5zcGVjdG9yLlNp bXBsZUNvb2tpZXNUYWJsZS5wcm90b3R5cGUuX19wcm90b19fID0gV2ViSW5zcGVjdG9yLlZpZXcu cHJvdG90eXBlOwogCiBXZWJJbnNwZWN0b3IuQ29va2llcyA9IHt9CiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29va2llc1RhYmxlLmpzIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db29raWVzVGFibGUuanMKaW5kZXggNzFmZGJm NzY5ZGMyZWZjNTkwYTUyMmI0YmVjYjAwNDFlOTVjYTI3NC4uNjFmODA0ZTJjYzllNzRiMGI3NDZh ZjI4ZDRiZTdmOTI2MmJiMGI4OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9Db29raWVzVGFibGUuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9Db29raWVzVGFibGUuanMKQEAgLTMwLDExICszMCwxNSBAQAogCiAvKioKICAq IEBjb25zdHJ1Y3RvcgorICogQGV4dGVuZHMge1dlYkluc3BlY3Rvci5WaWV3fQogICogQHBhcmFt IHtmdW5jdGlvbihQYWdlQWdlbnQuQ29va2llKT19IGRlbGV0ZUNhbGxiYWNrCiAgKiBAcGFyYW0g e2Z1bmN0aW9uKCk9fSByZWZyZXNoQ2FsbGJhY2sKICAqLwogV2ViSW5zcGVjdG9yLkNvb2tpZXNU YWJsZSA9IGZ1bmN0aW9uKGNvb2tpZURvbWFpbiwgZXhwYW5kYWJsZSwgZGVsZXRlQ2FsbGJhY2ss IHJlZnJlc2hDYWxsYmFjaykKIHsKKyAgICBXZWJJbnNwZWN0b3IuVmlldy5jYWxsKHRoaXMpOwor ICAgIHRoaXMuZWxlbWVudC5jbGFzc05hbWUgPSAiZmlsbCI7CisKICAgICB0aGlzLl9jb29raWVE b21haW4gPSBjb29raWVEb21haW47CiAKICAgICB2YXIgY29sdW1ucyA9IHsgMDoge30sIDE6IHt9 LCAyOiB7fSwgMzoge30sIDQ6IHt9LCA1OiB7fSwgNjoge30sIDc6IHt9IH07CkBAIC03MSw3ICs3 NSw3IEBAIFdlYkluc3BlY3Rvci5Db29raWVzVGFibGUgPSBmdW5jdGlvbihjb29raWVEb21haW4s IGV4cGFuZGFibGUsIGRlbGV0ZUNhbGxiYWNrLCByCiAgICAgdGhpcy5fZGF0YUdyaWQuYWRkRXZl bnRMaXN0ZW5lcigic29ydGluZyBjaGFuZ2VkIiwgdGhpcy5fcmVidWlsZFRhYmxlLCB0aGlzKTsK ICAgICB0aGlzLl9kYXRhR3JpZC5yZWZyZXNoQ2FsbGJhY2sgPSByZWZyZXNoQ2FsbGJhY2s7CiAK LSAgICB0aGlzLmVsZW1lbnQgPSB0aGlzLl9kYXRhR3JpZC5lbGVtZW50OworICAgIHRoaXMuX2Rh dGFHcmlkLnNob3codGhpcy5lbGVtZW50KTsKICAgICB0aGlzLl9kYXRhID0gW107CiB9CiAKQEAg LTIxMSwzICsyMTUsNSBAQCBXZWJJbnNwZWN0b3IuQ29va2llc1RhYmxlLnByb3RvdHlwZSA9IHsK ICAgICAgICAgZGVsZXRlQ2FsbGJhY2sobm9kZS5jb29raWUpOwogICAgIH0KIH0KKworV2ViSW5z cGVjdG9yLkNvb2tpZXNUYWJsZS5wcm90b3R5cGUuX19wcm90b19fID0gV2ViSW5zcGVjdG9yLlZp ZXcucHJvdG90eXBlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9ET01TdG9yYWdlSXRlbXNWaWV3LmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9ET01TdG9yYWdlSXRlbXNWaWV3LmpzCmluZGV4IGI4Njk0ZjdjMzk0Mjk1YmZmNjY5 NTM4MDgzZDJhZDVhMDI5ZDdiOTMuLmM1ZWE2N2I4ZmZkZmRiZTM3NGYwZTkwZGMwMzBiNTJjYTg3 MDQ1NTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRE9N U3RvcmFnZUl0ZW1zVmlldy5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL0RPTVN0b3JhZ2VJdGVtc1ZpZXcuanMKQEAgLTcyLDE3ICs3MiwxMSBAQCBXZWJJbnNwZWN0 b3IuRE9NU3RvcmFnZUl0ZW1zVmlldy5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICByZXR1cm47 CiAKICAgICAgICAgdGhpcy5fZGF0YUdyaWQgPSB0aGlzLl9kYXRhR3JpZEZvckRPTVN0b3JhZ2VF bnRyaWVzKGVudHJpZXMpOwotICAgICAgICB0aGlzLmVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5f ZGF0YUdyaWQuZWxlbWVudCk7CisgICAgICAgIHRoaXMuX2RhdGFHcmlkLnNob3codGhpcy5lbGVt ZW50KTsKICAgICAgICAgdGhpcy5fZGF0YUdyaWQuYXV0b1NpemVDb2x1bW5zKDEwKTsKICAgICAg ICAgdGhpcy5kZWxldGVCdXR0b24udmlzaWJsZSA9IHRydWU7CiAgICAgfSwKIAotICAgIG9uUmVz aXplOiBmdW5jdGlvbigpCi0gICAgewotICAgICAgICBpZiAodGhpcy5fZGF0YUdyaWQpCi0gICAg ICAgICAgICB0aGlzLl9kYXRhR3JpZC51cGRhdGVXaWR0aHMoKTsKLSAgICB9LAotCiAgICAgX2Rh dGFHcmlkRm9yRE9NU3RvcmFnZUVudHJpZXM6IGZ1bmN0aW9uKGVudHJpZXMpCiAgICAgewogICAg ICAgICB2YXIgY29sdW1ucyA9IHt9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9EYXRhR3JpZC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvRGF0YUdyaWQuanMKaW5kZXggYmMzZGNlN2M1OTZmYzgxNmI4NWVlY2EyNDI2NjRmYmM5 MWJhODhkZC4uY2ViNGI2NDVhZGNkMmVjYjE0NzAwYThmZjA2M2RiZGE4YjYyMGExZSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EYXRhR3JpZC5qcworKysg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RhdGFHcmlkLmpzCkBAIC0yNSwx MyArMjUsMTQgQEAKIAogLyoqCiAgKiBAY29uc3RydWN0b3IKLSAqIEBleHRlbmRzIHtXZWJJbnNw ZWN0b3IuT2JqZWN0fQorICogQGV4dGVuZHMge1dlYkluc3BlY3Rvci5WaWV3fQogICogQHBhcmFt IHtmdW5jdGlvbihXZWJJbnNwZWN0b3IuRGF0YUdyaWROb2RlLCBudW1iZXIsIHN0cmluZywgc3Ry aW5nKT19IGVkaXRDYWxsYmFjawogICogQHBhcmFtIHtmdW5jdGlvbihXZWJJbnNwZWN0b3IuRGF0 YUdyaWROb2RlKT19IGRlbGV0ZUNhbGxiYWNrCiAgKi8KIFdlYkluc3BlY3Rvci5EYXRhR3JpZCA9 IGZ1bmN0aW9uKGNvbHVtbnMsIGVkaXRDYWxsYmFjaywgZGVsZXRlQ2FsbGJhY2spCiB7Ci0gICAg dGhpcy5lbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7CisgICAgV2ViSW5z cGVjdG9yLlZpZXcuY2FsbCh0aGlzKTsKKwogICAgIHRoaXMuZWxlbWVudC5jbGFzc05hbWUgPSAi ZGF0YS1ncmlkIjsKICAgICB0aGlzLmVsZW1lbnQudGFiSW5kZXggPSAwOwogICAgIHRoaXMuZWxl bWVudC5hZGRFdmVudExpc3RlbmVyKCJrZXlkb3duIiwgdGhpcy5fa2V5RG93bi5iaW5kKHRoaXMp LCBmYWxzZSk7CkBAIC00ODYsNiArNDg3LDExIEBAIFdlYkluc3BlY3Rvci5EYXRhR3JpZC5wcm90 b3R5cGUgPSB7CiAgICAgICAgIHJldHVybiByZXN1bHQ7CiAgICAgfSwKIAorICAgIG9uUmVzaXpl OiBmdW5jdGlvbigpCisgICAgeworICAgICAgICB0aGlzLnVwZGF0ZVdpZHRocygpOworICAgIH0s CisKICAgICAvLyBVcGRhdGVzIHRoZSB3aWR0aHMgb2YgdGhlIHRhYmxlLCBpbmNsdWRpbmcgdGhl IHBvc2l0aW9ucyBvZiB0aGUgY29sdW1uCiAgICAgLy8gcmVzaXplcnMuCiAgICAgLy8KQEAgLTEx MDgsNyArMTExNCw3IEBAIFdlYkluc3BlY3Rvci5EYXRhR3JpZC5SZXNpemVNZXRob2QgPSB7CiAg ICAgTGFzdDogImxhc3QiCiB9CiAKLVdlYkluc3BlY3Rvci5EYXRhR3JpZC5wcm90b3R5cGUuX19w cm90b19fID0gV2ViSW5zcGVjdG9yLk9iamVjdC5wcm90b3R5cGU7CitXZWJJbnNwZWN0b3IuRGF0 YUdyaWQucHJvdG90eXBlLl9fcHJvdG9fXyA9IFdlYkluc3BlY3Rvci5WaWV3LnByb3RvdHlwZTsK IAogLyoqCiAgKiBAY29uc3RydWN0b3IKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvRGF0YWJhc2VRdWVyeVZpZXcuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL0RhdGFiYXNlUXVlcnlWaWV3LmpzCmluZGV4IGUwNDM1NGMwZGFmNmNm YjUxZjgzNzRlMTIwMzYwY2Y4ODIxZWQ5MzguLjNhZDQyOTZiMWNjYjVlZjNjYWZkMzI0MDE5NDYw MWEyMzQ0MDczYzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvRGF0YWJhc2VRdWVyeVZpZXcuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9EYXRhYmFzZVF1ZXJ5Vmlldy5qcwpAQCAtMTUwLDcgKzE1MCw3IEBAIFdlYkluc3Bl Y3Rvci5EYXRhYmFzZVF1ZXJ5Vmlldy5wcm90b3R5cGUgPSB7CiAKICAgICAgICAgaWYgKGRhdGFH cmlkKSB7CiAgICAgICAgICAgICBkYXRhR3JpZC5lbGVtZW50LmFkZFN0eWxlQ2xhc3MoImlubGlu ZSIpOwotICAgICAgICAgICAgdGhpcy5fYXBwZW5kUXVlcnlSZXN1bHQodHJpbW1lZFF1ZXJ5LCBk YXRhR3JpZC5lbGVtZW50KTsKKyAgICAgICAgICAgIHRoaXMuX2FwcGVuZFZpZXdRdWVyeVJlc3Vs dCh0cmltbWVkUXVlcnksIGRhdGFHcmlkKTsKICAgICAgICAgICAgIGRhdGFHcmlkLmF1dG9TaXpl Q29sdW1ucyg1KTsKICAgICAgICAgfQogCkBAIC0xNjcsMTYgKzE2NywzMSBAQCBXZWJJbnNwZWN0 b3IuRGF0YWJhc2VRdWVyeVZpZXcucHJvdG90eXBlID0gewogICAgICAgICBlbHNlCiAgICAgICAg ICAgICB2YXIgbWVzc2FnZSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiQW4gdW5leHBlY3RlZCBl cnJvciAlcyBvY2N1cnJlZC4iLCBlcnJvci5jb2RlKTsKIAotICAgICAgICB0aGlzLl9hcHBlbmRR dWVyeVJlc3VsdChxdWVyeSwgbWVzc2FnZSwgImVycm9yIik7CisgICAgICAgIHRoaXMuX2FwcGVu ZEVycm9yUXVlcnlSZXN1bHQocXVlcnksIG1lc3NhZ2UpOwogICAgIH0sCiAKLSAgICAvKioKLSAg ICAgKiBAcGFyYW0ge3N0cmluZz19IHJlc3VsdENsYXNzTmFtZQotICAgICAqLwotICAgIF9hcHBl bmRRdWVyeVJlc3VsdDogZnVuY3Rpb24ocXVlcnksIHJlc3VsdCwgcmVzdWx0Q2xhc3NOYW1lKQor ICAgIF9hcHBlbmRWaWV3UXVlcnlSZXN1bHQ6IGZ1bmN0aW9uKHF1ZXJ5LCB2aWV3KQorICAgIHsK KyAgICAgICAgdmFyIHJlc3VsdEVsZW1lbnQgPSB0aGlzLl9hcHBlbmRRdWVyeVJlc3VsdChxdWVy eSk7CisgICAgICAgIHZpZXcuc2hvdyhyZXN1bHRFbGVtZW50KTsKKworICAgICAgICB0aGlzLnBy b21wdEVsZW1lbnQuc2Nyb2xsSW50b1ZpZXcoZmFsc2UpOworICAgIH0sCisKKyAgICBfYXBwZW5k RXJyb3JRdWVyeVJlc3VsdDogZnVuY3Rpb24ocXVlcnksIGVycm9yVGV4dCkKKyAgICB7CisgICAg ICAgIHZhciByZXN1bHRFbGVtZW50ID0gdGhpcy5fYXBwZW5kUXVlcnlSZXN1bHQocXVlcnkpOwor ICAgICAgICByZXN1bHRFbGVtZW50LmFkZFN0eWxlQ2xhc3MoImVycm9yIikKKyAgICAgICAgcmVz dWx0RWxlbWVudC50ZXh0Q29udGVudCA9IGVycm9yVGV4dDsKKworICAgICAgICB0aGlzLnByb21w dEVsZW1lbnQuc2Nyb2xsSW50b1ZpZXcoZmFsc2UpOworICAgIH0sCisKKyAgICBfYXBwZW5kUXVl cnlSZXN1bHQ6IGZ1bmN0aW9uKHF1ZXJ5KQogICAgIHsKICAgICAgICAgdmFyIGVsZW1lbnQgPSBk b2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKICAgICAgICAgZWxlbWVudC5jbGFzc05hbWUg PSAiZGF0YWJhc2UtdXNlci1xdWVyeSI7CisgICAgICAgIHRoaXMuZWxlbWVudC5pbnNlcnRCZWZv cmUoZWxlbWVudCwgdGhpcy5wcm9tcHRFbGVtZW50KTsKIAogICAgICAgICB2YXIgY29tbWFuZFRl eHRFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgic3BhbiIpOwogICAgICAgICBjb21t YW5kVGV4dEVsZW1lbnQuY2xhc3NOYW1lID0gImRhdGFiYXNlLXF1ZXJ5LXRleHQiOwpAQCAtMTg1 LDIwICsyMDAsOCBAQCBXZWJJbnNwZWN0b3IuRGF0YWJhc2VRdWVyeVZpZXcucHJvdG90eXBlID0g ewogCiAgICAgICAgIHZhciByZXN1bHRFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgi ZGl2Iik7CiAgICAgICAgIHJlc3VsdEVsZW1lbnQuY2xhc3NOYW1lID0gImRhdGFiYXNlLXF1ZXJ5 LXJlc3VsdCI7Ci0KLSAgICAgICAgaWYgKHJlc3VsdENsYXNzTmFtZSkKLSAgICAgICAgICAgIHJl c3VsdEVsZW1lbnQuYWRkU3R5bGVDbGFzcyhyZXN1bHRDbGFzc05hbWUpOwotCi0gICAgICAgIGlm ICh0eXBlb2YgcmVzdWx0ID09PSAic3RyaW5nIiB8fCByZXN1bHQgaW5zdGFuY2VvZiBTdHJpbmcp Ci0gICAgICAgICAgICByZXN1bHRFbGVtZW50LnRleHRDb250ZW50ID0gcmVzdWx0OwotICAgICAg ICBlbHNlIGlmIChyZXN1bHQgJiYgcmVzdWx0Lm5vZGVOYW1lKQotICAgICAgICAgICAgcmVzdWx0 RWxlbWVudC5hcHBlbmRDaGlsZChyZXN1bHQpOwotCi0gICAgICAgIGlmIChyZXN1bHRFbGVtZW50 LmNoaWxkTm9kZXMubGVuZ3RoKQotICAgICAgICAgICAgZWxlbWVudC5hcHBlbmRDaGlsZChyZXN1 bHRFbGVtZW50KTsKLQotICAgICAgICB0aGlzLmVsZW1lbnQuaW5zZXJ0QmVmb3JlKGVsZW1lbnQs IHRoaXMucHJvbXB0RWxlbWVudCk7Ci0gICAgICAgIHRoaXMucHJvbXB0RWxlbWVudC5zY3JvbGxJ bnRvVmlldyhmYWxzZSk7CisgICAgICAgIGVsZW1lbnQuYXBwZW5kQ2hpbGQocmVzdWx0RWxlbWVu dCk7CisgICAgICAgIHJldHVybiByZXN1bHRFbGVtZW50OwogICAgIH0KIH0KIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EYXRhYmFzZVRhYmxlVmlldy5q cyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGF0YWJhc2VUYWJsZVZpZXcu anMKaW5kZXggNTc2ZWNlMzU2ZjFlMzM0ZjgwZTBhYjQ0OTdiMmFhYWFiNmQ1NmUwNC4uZjQzNDZk MjBiYzU0YmM5OTMxMDU5OTBhNTI4MTQyMmQzZDM2MGY0OSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EYXRhYmFzZVRhYmxlVmlldy5qcworKysgYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RhdGFiYXNlVGFibGVWaWV3LmpzCkBAIC01 OSw3ICs1OSw3IEBAIFdlYkluc3BlY3Rvci5EYXRhYmFzZVRhYmxlVmlldy5wcm90b3R5cGUgPSB7 CiAKICAgICBfcXVlcnlGaW5pc2hlZDogZnVuY3Rpb24oY29sdW1uTmFtZXMsIHZhbHVlcykKICAg ICB7Ci0gICAgICAgIHRoaXMuZWxlbWVudC5yZW1vdmVDaGlsZHJlbigpOworICAgICAgICB0aGlz LmRldGFjaENoaWxkVmlld3MoKTsKIAogICAgICAgICB2YXIgZGF0YUdyaWQgPSBXZWJJbnNwZWN0 b3IuRGF0YUdyaWQuY3JlYXRlU29ydGFibGVEYXRhR3JpZChjb2x1bW5OYW1lcywgdmFsdWVzKTsK ICAgICAgICAgaWYgKCFkYXRhR3JpZCkgewpAQCAtNjcsOCArNjcsNyBAQCBXZWJJbnNwZWN0b3Iu RGF0YWJhc2VUYWJsZVZpZXcucHJvdG90eXBlID0gewogICAgICAgICAgICAgdGhpcy5fZW1wdHlW aWV3LnNob3codGhpcy5lbGVtZW50KTsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQot Ci0gICAgICAgIHRoaXMuZWxlbWVudC5hcHBlbmRDaGlsZChkYXRhR3JpZC5lbGVtZW50KTsKKyAg ICAgICAgZGF0YUdyaWQuc2hvdyh0aGlzLmVsZW1lbnQpOwogICAgICAgICBkYXRhR3JpZC5hdXRv U2l6ZUNvbHVtbnMoNSk7CiAgICAgfSwKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9EZXRhaWxlZEhlYXBzaG90Vmlldy5qcyBiL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvRGV0YWlsZWRIZWFwc2hvdFZpZXcuanMKaW5kZXggNjgzZmZh NzVlMzg5MjkyZWEzMzNjMDk3ODkzNTA2ZmJlZDM5NTliNC4uMmZhNmI1MWM3MzYxMjQ2NjM4OTU3 ODY0ZmM3YTU2NjZmM2Q4MzQwOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9EZXRhaWxlZEhlYXBzaG90Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL0RldGFpbGVkSGVhcHNob3RWaWV3LmpzCkBAIC01ODUsMjcgKzU4 NSwyNyBAQCBXZWJJbnNwZWN0b3IuRGV0YWlsZWRIZWFwc2hvdFZpZXcgPSBmdW5jdGlvbihwYXJl bnQsIHByb2ZpbGUpCiAgICAgdGhpcy5jb250YWlubWVudERhdGFHcmlkID0gbmV3IFdlYkluc3Bl Y3Rvci5IZWFwU25hcHNob3RDb250YWlubWVudERhdGFHcmlkKCk7CiAgICAgdGhpcy5jb250YWlu bWVudERhdGFHcmlkLmVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigiY2xpY2siLCB0aGlzLl9tb3Vz ZUNsaWNrSW5Db250ZW50c0dyaWQuYmluZCh0aGlzKSwgdHJ1ZSk7CiAgICAgdGhpcy5jb250YWlu bWVudERhdGFHcmlkLmVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigibW91c2Vkb3duIiwgdGhpcy5f bW91c2VEb3duSW5Db250ZW50c0dyaWQuYmluZCh0aGlzKSwgdHJ1ZSk7Ci0gICAgdGhpcy5jb250 YWlubWVudFZpZXcuZWxlbWVudC5hcHBlbmRDaGlsZCh0aGlzLmNvbnRhaW5tZW50RGF0YUdyaWQu ZWxlbWVudCk7CisgICAgdGhpcy5jb250YWlubWVudERhdGFHcmlkLnNob3codGhpcy5jb250YWlu bWVudFZpZXcuZWxlbWVudCk7CiAKICAgICB0aGlzLmNvbnN0cnVjdG9yc1ZpZXcgPSBuZXcgV2Vi SW5zcGVjdG9yLlZpZXcoKTsKICAgICB0aGlzLmNvbnN0cnVjdG9yc1ZpZXcuZWxlbWVudC5hZGRT dHlsZUNsYXNzKCJ2aWV3Iik7CiAgICAgdGhpcy5jb25zdHJ1Y3RvcnNEYXRhR3JpZCA9IG5ldyBX ZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90Q29uc3RydWN0b3JzRGF0YUdyaWQoKTsKICAgICB0aGlz LmNvbnN0cnVjdG9yc0RhdGFHcmlkLmVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigiY2xpY2siLCB0 aGlzLl9tb3VzZUNsaWNrSW5Db250ZW50c0dyaWQuYmluZCh0aGlzKSwgdHJ1ZSk7CiAgICAgdGhp cy5jb25zdHJ1Y3RvcnNEYXRhR3JpZC5lbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoIm1vdXNlZG93 biIsIHRoaXMuX21vdXNlRG93bkluQ29udGVudHNHcmlkLmJpbmQodGhpcyksIHRydWUpOwotICAg IHRoaXMuY29uc3RydWN0b3JzVmlldy5lbGVtZW50LmFwcGVuZENoaWxkKHRoaXMuY29uc3RydWN0 b3JzRGF0YUdyaWQuZWxlbWVudCk7CisgICAgdGhpcy5jb25zdHJ1Y3RvcnNEYXRhR3JpZC5zaG93 KHRoaXMuY29uc3RydWN0b3JzVmlldy5lbGVtZW50KTsKIAogICAgIHRoaXMuZGlmZlZpZXcgPSBu ZXcgV2ViSW5zcGVjdG9yLlZpZXcoKTsKICAgICB0aGlzLmRpZmZWaWV3LmVsZW1lbnQuYWRkU3R5 bGVDbGFzcygidmlldyIpOwogICAgIHRoaXMuZGlmZkRhdGFHcmlkID0gbmV3IFdlYkluc3BlY3Rv ci5IZWFwU25hcHNob3REaWZmRGF0YUdyaWQoKTsKICAgICB0aGlzLmRpZmZEYXRhR3JpZC5lbGVt ZW50LmFkZEV2ZW50TGlzdGVuZXIoImNsaWNrIiwgdGhpcy5fbW91c2VDbGlja0luQ29udGVudHNH cmlkLmJpbmQodGhpcyksIHRydWUpOwotICAgIHRoaXMuZGlmZlZpZXcuZWxlbWVudC5hcHBlbmRD aGlsZCh0aGlzLmRpZmZEYXRhR3JpZC5lbGVtZW50KTsKKyAgICB0aGlzLmRpZmZEYXRhR3JpZC5z aG93KHRoaXMuZGlmZlZpZXcuZWxlbWVudCk7CiAKICAgICB0aGlzLmRvbWluYXRvclZpZXcgPSBu ZXcgV2ViSW5zcGVjdG9yLlZpZXcoKTsKICAgICB0aGlzLmRvbWluYXRvclZpZXcuZWxlbWVudC5h ZGRTdHlsZUNsYXNzKCJ2aWV3Iik7CiAgICAgdGhpcy5kb21pbmF0b3JEYXRhR3JpZCA9IG5ldyBX ZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90RG9taW5hdG9yc0RhdGFHcmlkKCk7CiAgICAgdGhpcy5k b21pbmF0b3JEYXRhR3JpZC5lbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoImNsaWNrIiwgdGhpcy5f bW91c2VDbGlja0luQ29udGVudHNHcmlkLmJpbmQodGhpcyksIHRydWUpOwogICAgIHRoaXMuZG9t aW5hdG9yRGF0YUdyaWQuZWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJtb3VzZWRvd24iLCB0aGlz Ll9tb3VzZURvd25JbkNvbnRlbnRzR3JpZC5iaW5kKHRoaXMpLCB0cnVlKTsKLSAgICB0aGlzLmRv bWluYXRvclZpZXcuZWxlbWVudC5hcHBlbmRDaGlsZCh0aGlzLmRvbWluYXRvckRhdGFHcmlkLmVs ZW1lbnQpOworICAgIHRoaXMuZG9taW5hdG9yRGF0YUdyaWQuc2hvdyh0aGlzLmRvbWluYXRvclZp ZXcuZWxlbWVudCk7CiAKICAgICB0aGlzLnJldGFpbm1lbnRWaWV3SGVhZGVyID0gZG9jdW1lbnQu Y3JlYXRlRWxlbWVudCgiZGl2Iik7CiAgICAgdGhpcy5yZXRhaW5tZW50Vmlld0hlYWRlci5hZGRT dHlsZUNsYXNzKCJyZXRhaW5lcnMtdmlldy1oZWFkZXIiKTsKQEAgLTYzMyw3ICs2MzMsNyBAQCBX ZWJJbnNwZWN0b3IuRGV0YWlsZWRIZWFwc2hvdFZpZXcgPSBmdW5jdGlvbihwYXJlbnQsIHByb2Zp bGUpCiAgICAgdGhpcy5yZXRhaW5tZW50Vmlldy5lbGVtZW50LmFkZFN0eWxlQ2xhc3MoInJldGFp bmluZy1wYXRocy12aWV3Iik7CiAgICAgdGhpcy5yZXRhaW5tZW50RGF0YUdyaWQgPSBuZXcgV2Vi SW5zcGVjdG9yLkhlYXBTbmFwc2hvdFJldGFpbmluZ1BhdGhzTGlzdCgpOwogICAgIHRoaXMucmV0 YWlubWVudERhdGFHcmlkLmVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigiY2xpY2siLCB0aGlzLl9t b3VzZUNsaWNrSW5SZXRhaW5tZW50R3JpZC5iaW5kKHRoaXMpLCB0cnVlKTsKLSAgICB0aGlzLnJl dGFpbm1lbnRWaWV3LmVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5yZXRhaW5tZW50RGF0YUdyaWQu ZWxlbWVudCk7CisgICAgdGhpcy5yZXRhaW5tZW50RGF0YUdyaWQuc2hvdyh0aGlzLnJldGFpbm1l bnRWaWV3LmVsZW1lbnQpOwogICAgIHRoaXMucmV0YWlubWVudFZpZXcuc2hvdyh0aGlzLmVsZW1l bnQpOwogICAgIHRoaXMucmV0YWlubWVudERhdGFHcmlkLnJlc2V0KCk7CiAKQEAgLTc1MSw3ICs3 NTEsNiBAQCBXZWJJbnNwZWN0b3IuRGV0YWlsZWRIZWFwc2hvdFZpZXcucHJvdG90eXBlID0gewog CiAgICAgICAgIGZ1bmN0aW9uIHByb2ZpbGVDYWxsYmFjazIoKSB7CiAgICAgICAgICAgICB0aGlz LmN1cnJlbnRWaWV3LnNob3codGhpcy5lbGVtZW50KTsKLSAgICAgICAgICAgIHRoaXMuZGF0YUdy aWQudXBkYXRlV2lkdGhzKCk7CiAgICAgICAgIH0KICAgICB9LAogCkBAIC03NjIsOSArNzYxLDYg QEAgV2ViSW5zcGVjdG9yLkRldGFpbGVkSGVhcHNob3RWaWV3LnByb3RvdHlwZSA9IHsKIAogICAg IG9uUmVzaXplOiBmdW5jdGlvbigpCiAgICAgewotICAgICAgICBpZiAodGhpcy5kYXRhR3JpZCkK LSAgICAgICAgICAgIHRoaXMuZGF0YUdyaWQudXBkYXRlV2lkdGhzKCk7Ci0KICAgICAgICAgdmFy IGhlaWdodCA9IHRoaXMucmV0YWlubWVudFZpZXcuZWxlbWVudC5jbGllbnRIZWlnaHQ7CiAgICAg ICAgIHRoaXMuX3VwZGF0ZVJldGFpbm1lbnRWaWV3SGVpZ2h0KGhlaWdodCk7CiAgICAgfSwKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya1BhbmVs LmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3b3JrUGFuZWwuanMK aW5kZXggODNjODNlNmIzMWE1ZDU5MGZhZWNkZDgwNzkyMzM4YjMzYmRiYzkxYS4uYTc3NDcwMGZk NDZlNjQ3YzA3YTE0MWJmYzQ3NWVmNGRjMzdjMGI5YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3b3JrUGFuZWwuanMKKysrIGIvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3b3JrUGFuZWwuanMKQEAgLTEyNSw3ICsxMjUsNiBA QCBXZWJJbnNwZWN0b3IuTmV0d29ya0xvZ1ZpZXcucHJvdG90eXBlID0gewogCiAgICAgb25SZXNp emU6IGZ1bmN0aW9uKCkKICAgICB7Ci0gICAgICAgIHRoaXMuX2RhdGFHcmlkLnVwZGF0ZVdpZHRo cygpOwogICAgICAgICB0aGlzLl91cGRhdGVPZmZzY3JlZW5Sb3dzKCk7CiAgICAgfSwKIApAQCAt MTg4LDggKzE4Nyw3IEBAIFdlYkluc3BlY3Rvci5OZXR3b3JrTG9nVmlldy5wcm90b3R5cGUgPSB7 CiAgICAgICAgIHRoaXMuX2RhdGFHcmlkLnJlc2l6ZU1ldGhvZCA9IFdlYkluc3BlY3Rvci5EYXRh R3JpZC5SZXNpemVNZXRob2QuTGFzdDsKICAgICAgICAgdGhpcy5fZGF0YUdyaWQuZWxlbWVudC5h ZGRTdHlsZUNsYXNzKCJuZXR3b3JrLWxvZy1ncmlkIik7CiAgICAgICAgIHRoaXMuX2RhdGFHcmlk LmVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigiY29udGV4dG1lbnUiLCB0aGlzLl9jb250ZXh0TWVu dS5iaW5kKHRoaXMpLCB0cnVlKTsKLQotICAgICAgICB0aGlzLmVsZW1lbnQuYXBwZW5kQ2hpbGQo dGhpcy5fZGF0YUdyaWQuZWxlbWVudCk7CisgICAgICAgIHRoaXMuX2RhdGFHcmlkLnNob3codGhp cy5lbGVtZW50KTsKIAogICAgICAgICAvLyBFdmVudCBsaXN0ZW5lcnMgbmVlZCB0byBiZSBhZGRl ZCBfYWZ0ZXJfIHdlIGF0dGFjaCB0byB0aGUgZG9jdW1lbnQsIHNvIHRoYXQgb3duZXIgZG9jdW1l bnQgaXMgcHJvcGVybHkgdXBkYXRlLgogICAgICAgICB0aGlzLl9kYXRhR3JpZC5hZGRFdmVudExp c3RlbmVyKCJzb3J0aW5nIGNoYW5nZWQiLCB0aGlzLl9zb3J0SXRlbXMsIHRoaXMpOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Qcm9maWxlVmlldy5qcyBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUHJvZmlsZVZpZXcuanMKaW5kZXgg NTkwNGFjNjMxZjFjNGM1MzcxZGZkNTE3NzhiN2Y1MzQ4NDRkMDNlZS4uNjZlNzNiNTlhNDU5YTdl OTY5MTQxYTNkN2IzYTRlMzNkNjAwNThjMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9Qcm9maWxlVmlldy5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL1Byb2ZpbGVWaWV3LmpzCkBAIC01MCw3ICs1MCw3IEBAIFdlYkluc3Bl Y3Rvci5DUFVQcm9maWxlVmlldyA9IGZ1bmN0aW9uKHByb2ZpbGUpCiAgICAgdGhpcy5kYXRhR3Jp ZCA9IG5ldyBXZWJJbnNwZWN0b3IuRGF0YUdyaWQoY29sdW1ucyk7CiAgICAgdGhpcy5kYXRhR3Jp ZC5hZGRFdmVudExpc3RlbmVyKCJzb3J0aW5nIGNoYW5nZWQiLCB0aGlzLl9zb3J0RGF0YSwgdGhp cyk7CiAgICAgdGhpcy5kYXRhR3JpZC5lbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoIm1vdXNlZG93 biIsIHRoaXMuX21vdXNlRG93bkluRGF0YUdyaWQuYmluZCh0aGlzKSwgdHJ1ZSk7Ci0gICAgdGhp cy5lbGVtZW50LmFwcGVuZENoaWxkKHRoaXMuZGF0YUdyaWQuZWxlbWVudCk7CisgICAgdGhpcy5k YXRhR3JpZC5zaG93KHRoaXMuZWxlbWVudCk7CiAKICAgICB0aGlzLnZpZXdTZWxlY3RFbGVtZW50 ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgic2VsZWN0Iik7CiAgICAgdGhpcy52aWV3U2VsZWN0 RWxlbWVudC5jbGFzc05hbWUgPSAic3RhdHVzLWJhci1pdGVtIjsKQEAgLTE2OSwxMiArMTY5LDYg QEAgV2ViSW5zcGVjdG9yLkNQVVByb2ZpbGVWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhp cy5fY3VycmVudFNlYXJjaFJlc3VsdEluZGV4ID0gLTE7CiAgICAgfSwKIAotICAgIG9uUmVzaXpl OiBmdW5jdGlvbigpCi0gICAgewotICAgICAgICBpZiAodGhpcy5kYXRhR3JpZCkKLSAgICAgICAg ICAgIHRoaXMuZGF0YUdyaWQudXBkYXRlV2lkdGhzKCk7Ci0gICAgfSwKLQogICAgIHJlZnJlc2g6 IGZ1bmN0aW9uKCkKICAgICB7CiAgICAgICAgIHZhciBzZWxlY3RlZFByb2ZpbGVOb2RlID0gdGhp cy5kYXRhR3JpZC5zZWxlY3RlZE5vZGUgPyB0aGlzLmRhdGFHcmlkLnNlbGVjdGVkTm9kZS5wcm9m aWxlTm9kZSA6IG51bGw7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL1Jlc291cmNlQ29va2llc1ZpZXcuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL1Jlc291cmNlQ29va2llc1ZpZXcuanMKaW5kZXggNjUyNjkyZjk3NjM5MmVhZTRk ZDVjZmM0NTI5M2FlNTA3ZTdhMjUxZC4uY2JmZjQ3ZDI3YzcxZjdkZjI1YWRkMDdkYjUyNDk3N2U5 MWJiN2ExZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9S ZXNvdXJjZUNvb2tpZXNWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvUmVzb3VyY2VDb29raWVzVmlldy5qcwpAQCAtNTgsMTIgKzU4LDYgQEAgV2ViSW5zcGVj dG9yLlJlc291cmNlQ29va2llc1ZpZXcucHJvdG90eXBlID0gewogICAgICAgICAgICAgdGhpcy5f YnVpbGRDb29raWVzVGFibGUoKTsKICAgICB9LAogCi0gICAgb25SZXNpemU6IGZ1bmN0aW9uKCkK LSAgICB7Ci0gICAgICAgIGlmICh0aGlzLl9jb29raWVzVGFibGUpCi0gICAgICAgICAgICB0aGlz Ll9jb29raWVzVGFibGUudXBkYXRlV2lkdGhzKCk7Ci0gICAgfSwKLQogICAgIGdldCBfZ290Q29v a2llcygpCiAgICAgewogICAgICAgICByZXR1cm4gISEodGhpcy5fcmVzb3VyY2UucmVxdWVzdENv b2tpZXMgfHwgdGhpcy5fcmVzb3VyY2UucmVzcG9uc2VDb29raWVzKTsKQEAgLTcxLDEyICs2NSwx MiBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VDb29raWVzVmlldy5wcm90b3R5cGUgPSB7CiAKICAg ICBfYnVpbGRDb29raWVzVGFibGU6IGZ1bmN0aW9uKCkKICAgICB7Ci0gICAgICAgIHRoaXMuZWxl bWVudC5yZW1vdmVDaGlsZHJlbigpOworICAgICAgICB0aGlzLmRldGFjaENoaWxkVmlld3MoKTsK IAogICAgICAgICB0aGlzLl9jb29raWVzVGFibGUgPSBuZXcgV2ViSW5zcGVjdG9yLkNvb2tpZXNU YWJsZShudWxsLCB0cnVlKTsKICAgICAgICAgdGhpcy5fY29va2llc1RhYmxlLmFkZENvb2tpZXNG b2xkZXIoV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJSZXF1ZXN0IENvb2tpZXMiKSwgdGhpcy5fcmVz b3VyY2UucmVxdWVzdENvb2tpZXMpOwogICAgICAgICB0aGlzLl9jb29raWVzVGFibGUuYWRkQ29v a2llc0ZvbGRlcihXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlJlc3BvbnNlIENvb2tpZXMiKSwgdGhp cy5fcmVzb3VyY2UucmVzcG9uc2VDb29raWVzKTsKLSAgICAgICAgdGhpcy5lbGVtZW50LmFwcGVu ZENoaWxkKHRoaXMuX2Nvb2tpZXNUYWJsZS5lbGVtZW50KTsKKyAgICAgICAgdGhpcy5fY29va2ll c1RhYmxlLnNob3codGhpcy5lbGVtZW50KTsKICAgICB9LAogCiAgICAgX3JlZnJlc2hDb29raWVz OiBmdW5jdGlvbigpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL1ZpZXcuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1ZpZXcuanMK aW5kZXggZDhjOGEyNDhkYTViYjZhYjkyMGM2YWNjMzNhMmIwZWVmN2UyYmYxMy4uMTg3MTlhY2Nm Njc0YjY5YTA5MzI5M2Y5Y2I5ZTAxZGUwY2E0NDNiNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9WaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvVmlldy5qcwpAQCAtMTc2LDYgKzE3NiwxMyBAQCBXZWJJbnNwZWN0b3Iu Vmlldy5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMuX3Zpc2libGUgPSBmYWxzZTsKICAgICB9 LAogCisgICAgZGV0YWNoQ2hpbGRWaWV3czogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgdmFy IGNoaWxkcmVuID0gdGhpcy5fY2hpbGRyZW4uc2xpY2UoKTsKKyAgICAgICAgZm9yICh2YXIgaSA9 IDA7IGkgPCBjaGlsZHJlbi5sZW5ndGg7ICsraSkKKyAgICAgICAgICAgIGNoaWxkcmVuW2ldLmRl dGFjaCgpOworICAgIH0sCisKICAgICBlbGVtZW50c1RvUmVzdG9yZVNjcm9sbFBvc2l0aW9uc0Zv cjogZnVuY3Rpb24oKQogICAgIHsKICAgICAgICAgcmV0dXJuIFt0aGlzLmVsZW1lbnRdOwo=