97524 2012-09-24 22:15:54 -0700 Web Inspector: Add Breadcrumb on FileSystemView status bar 2014-08-03 18:31:05 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED INVALID P2 Normal --- 68203 91709 0 tzik tzik apavlov burg bweinstein dglazkov joepeck keishi loislo pfeldman pmuellr rik webkit.review.bot yurys oldest_to_newest 727286 0 tzik 2012-09-24 22:15:54 -0700 Before removing its directory tree, we need other navigation UI to parent directory. I'm adding breadcrumb in this patch. This UI might not scale for deep directory tree. So, we should add crumb collapsion like ElementPanel does, before expose it by default. 727571 1 165597 tzik 2012-09-25 06:18:40 -0700 Created attachment 165597 Patch 727599 2 165597 webkit.review.bot 2012-09-25 07:03:50 -0700 Comment on attachment 165597 Patch Attachment 165597 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/14036034 New failing tests: http/tests/inspector/resource-tree/resource-tree-frame-add.html http/tests/inspector/resource-tree/resource-tree-reload.html http/tests/inspector/appcache/appcache-iframe-manifests.html http/tests/inspector/resource-tree/resource-tree-non-unique-url.html http/tests/inspector/appcache/appcache-swap.html inspector/console/command-line-api-inspect.html inspector/debugger/source-frame.html inspector/storage-panel-dom-storage-update.html inspector/database-table-name-excaping.html inspector/storage-panel-dom-storage.html http/tests/inspector/search/resources-search-match-index.html http/tests/inspector/appcache/appcache-manifest-with-non-existing-file.html http/tests/inspector/filesystem/directory-tree.html http/tests/inspector/indexeddb/resources-panel.html 727636 3 165597 buildbot 2012-09-25 07:37:37 -0700 Comment on attachment 165597 Patch Attachment 165597 did not pass mac-ews (mac): Output: http://queues.webkit.org/results/14030095 New failing tests: http/tests/inspector/appcache/appcache-iframe-manifests.html http/tests/inspector/appcache/appcache-swap.html inspector/console/command-line-api-inspect.html inspector/debugger/source-frame.html inspector/storage-panel-dom-storage-update.html inspector/database-table-name-excaping.html inspector/storage-panel-dom-storage.html http/tests/inspector/search/resources-search-match-index.html http/tests/inspector/appcache/appcache-manifest-with-non-existing-file.html http/tests/inspector/resource-tree/resource-tree-non-unique-url.html 733440 4 165597 vsevik 2012-10-03 01:37:55 -0700 Comment on attachment 165597 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=165597&action=review > Source/WebCore/inspector/front-end/BreadcrumbList.js:35 > +WebInspector.BreadcrumbList = function() This doesn't look like a ui component to me. It looks like a lot of boilerplate (most of it could be omitted if breadcrumb list implementation is moved to FileSystemView) with no meaningful code. I think you should either inline this implementation in FileSystemView or extract something that could be reused by ElementsPanel (e.g. click handling logic definitely belongs to the generic breadcrumb list implementation). > Source/WebCore/inspector/front-end/BreadcrumbList.js:46 > + set children(x) Please don't use setters/getters. We prefer not to use them as they cause some closure compilation problems. > Source/WebCore/inspector/front-end/BreadcrumbList.js:56 > + get element() You could make element field public instead. > Source/WebCore/inspector/front-end/BreadcrumbList.js:78 > + this._element.wrapper = this; redundant? > Source/WebCore/inspector/front-end/FileSystemView.js:31 > +importScript("BreadcrumbList.js"); import scripts implied dependencies should match those in compile-front-end. You should move add <script> element to inspector.html instead. > Source/WebCore/inspector/front-end/FileSystemView.js:41 > + this.registerRequiredCSS("breadcrumbList.css"); This should be moved to BreadcrumbList.js ? Also there is no such file in the patch. > Source/WebCore/inspector/front-end/FileSystemView.js:123 > + this._crumbs.updateSizes(); This method could be public (to be used in some resize handler) but I think children setter should call it implicitly. > Source/WebCore/inspector/front-end/FileSystemView.js:271 > + this._fileSystemView = fileSystemView; This one is not used currently. > Source/WebCore/inspector/front-end/FileSystemView.js:281 > + this._treeElement.select(); I don't think crumb element should depend on another ui representation of the folder (the one you are going to remove soon actually). I would use fileSystemView and path pair instead. 1026549 5 burg 2014-08-03 18:31:05 -0700 This feature is no longer in WebKit. 165597 2012-09-25 06:18:40 -0700 2012-10-03 01:37:53 -0700 Patch bug-97524-20120925221759.patch text/plain 11447 tzik U3VidmVyc2lvbiBSZXZpc2lvbjogMTI5NDQxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTk4ZjBlYzVjMTVmMDM5 NjgxMDU0ZDc1YWJhOWQ4NDZjMzRmZjk2Mi4uNmIwMDI2YjgyNzY0ZTg1NjU3NGY0MWMwNmQ4YTQz ZTRlNTY3ODQ2OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDEyLTA5LTI0ICBUYWlq dSBUc3Vpa2kgIDx0emlrQGNocm9taXVtLm9yZz4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBB ZGQgYnJlYWRjcnVtYnMgb24gRmlsZVN5c3RlbVZpZXcgc3RhdHVzIGJhcgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTc1MjQKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgY3J1bWJzIHRyYWlsaW5nIGZy b20gcm9vdCB0byBjdXJyZW50IGRpcmVjdG9yeSBmb3IgRmlsZVN5c3RlbS4KKworICAgICAgICBU ZXN0IHNob3VsZCBiZSBhZGRlZCBhZnRlciBvbWl0dGluZyBkaXJlY3RvcnkgdHJlZS4KKworICAg ICAgICAqIFdlYkNvcmUuZ3lwaToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0JyZWFk Y3J1bWJMaXN0LmpzOiBBZGRlZC4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5CcmVhZGNydW1iTGlz dCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQnJlYWRjcnVtYkxpc3QucHJvdG90eXBlLnNldCBj aGlsZHJlbik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQnJlYWRjcnVtYkxpc3QucHJvdG90eXBl LmdldCBlbGVtZW50KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5CcmVhZGNydW1iTGlzdC5wcm90 b3R5cGUudXBkYXRlU2l6ZXMpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkJyZWFkY3J1bWJFbGVt ZW50KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5CcmVhZGNydW1iRWxlbWVudC5wcm90b3R5cGUu Z2V0IGVsZW1lbnQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkJyZWFkY3J1bWJFbGVtZW50LnBy b3RvdHlwZS5zZXQgc2VsZWN0ZWQpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvRmls ZVN5c3RlbVZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRmlsZVN5c3RlbVZpZXcpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLkZpbGVTeXN0ZW1WaWV3LnByb3RvdHlwZS5nZXQgc3RhdHVz QmFySXRlbXMpOiBBZGRlZCBjcnVtYnMKKyAgICAgICAgKFdlYkluc3BlY3Rvci5GaWxlU3lzdGVt Vmlldy5wcm90b3R5cGUudXBkYXRlQ3J1bWJzKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5GaWxl U3lzdGVtVmlldy5FbnRyeVRyZWVFbGVtZW50LnByb3RvdHlwZS5nZXQgZW50cnkpOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLkZpbGVTeXN0ZW1WaWV3LkVudHJ5VHJlZUVsZW1lbnQucHJvdG90eXBl Lm9uc2VsZWN0KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5GaWxlU3lzdGVtVmlldy5FbnRyeUNy dW1iRWxlbWVudCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRmlsZVN5c3RlbVZpZXcuRW50cnlD cnVtYkVsZW1lbnQucHJvdG90eXBlLl9jbGlja2VkKToKKwogMjAxMi0wOS0yNCAgWW9zaGlmdW1p IElub3VlICA8eW9zaW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtGb3Jtc10gRGF0ZVRpbWVF ZGl0RWxlbWVudCBzaG91bGQgcmV0dXJuIHN0cmluZyB2YWx1ZSBmb3IgZWFzZSBvZiBpbXBsZW1l bnRpbmcgb3RoZXIgZGF0ZS90aW1lIGlucHV0IHR5cGVzLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvV2ViQ29yZS5neXBpIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5neXBpCmluZGV4IDMx MWU3NTg2NjYyMGYyMTdkNzFjNmJhMzVmNjhiMWVlZDAzMzVlOWUuLmRmMjc5ZWM0YjY1M2E2NThh MmFiNjZiNGRlMTYxMzYxNzA2MWNiNmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1dlYkNv cmUuZ3lwaQorKysgYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmd5cGkKQEAgLTYzMzMsNiArNjMz Myw3IEBACiAgICAgICAgICAgICAnaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuaHRtbCcs CiAgICAgICAgICAgICAnaW5zcGVjdG9yL2Zyb250LWVuZC9BZHZhbmNlZFNlYXJjaENvbnRyb2xs ZXIuanMnLAogICAgICAgICAgICAgJ2luc3BlY3Rvci9mcm9udC1lbmQvQXBwbGljYXRpb25DYWNo ZU1vZGVsLmpzJywKKyAgICAgICAgICAgICdpbnNwZWN0b3IvZnJvbnQtZW5kL0JyZWFkY3J1bWJM aXN0LmpzJywKICAgICAgICAgICAgICdpbnNwZWN0b3IvZnJvbnQtZW5kL0JyZWFrcG9pbnRNYW5h Z2VyLmpzJywKICAgICAgICAgICAgICdpbnNwZWN0b3IvZnJvbnQtZW5kL0NoZWNrYm94LmpzJywK ICAgICAgICAgICAgICdpbnNwZWN0b3IvZnJvbnQtZW5kL0NvbG9yLmpzJywKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUudmNwcm9qL1dlYkNvcmUudmNwcm9qIGIvU291cmNlL1dl YkNvcmUvV2ViQ29yZS52Y3Byb2ovV2ViQ29yZS52Y3Byb2oKaW5kZXggYjc3NGQ4YTM2ZTY4Mzlm YzkxMzQwMTY3YjQyYzIwYTM5MGQwZDQ3Mi4uOTAzNmM5ZTc0ZWU4N2E0MWRhODQyZTcxNGNlMGNk NzA2YTgwZDMyYiAxMDA3NTUKLS0tIGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS52Y3Byb2ovV2Vi Q29yZS52Y3Byb2oKKysrIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS52Y3Byb2ovV2ViQ29yZS52 Y3Byb2oKQEAgLTc1OTY2LDYgKzc1OTY2LDEwIEBACiAJCQkJCT4KIAkJCQk8L0ZpbGU+CiAJCQkJ PEZpbGUKKwkJCQkJUmVsYXRpdmVQYXRoPSIuLlxpbnNwZWN0b3JcZnJvbnQtZW5kXEJyZWFkY3J1 bWJMaXN0LmpzIgorCQkJCQk+CisJCQkJPC9GaWxlPgorCQkJCTxGaWxlCiAJCQkJCVJlbGF0aXZl UGF0aD0iLi5caW5zcGVjdG9yXGZyb250LWVuZFxCcmVha3BvaW50TWFuYWdlci5qcyIKIAkJCQkJ PgogCQkJCTwvRmlsZT4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9jb21w aWxlLWZyb250LWVuZC5weSBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9jb21waWxlLWZyb250 LWVuZC5weQppbmRleCA3NmRjYWVmMzQ1MTk0YWE1OWFjYTgzYmQwYjQ5MWRmMjNjZmNlNGNiLi4w OWRkZGFiMzA2NWY2OWM0OGViMTAwZjk0NDc4M2E2ODcyOGZjZWRlIDEwMDc1NQotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvY29tcGlsZS1mcm9udC1lbmQucHkKKysrIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2NvbXBpbGUtZnJvbnQtZW5kLnB5CkBAIC0xMTEsNiArMTExLDcgQEAg bW9kdWxlcyA9IFsKICAgICAgICAgIm5hbWUiOiAidWkiLAogICAgICAgICAiZGVwZW5kZW5jaWVz IjogWyJjb21tb24iXSwKICAgICAgICAgInNvdXJjZXMiOiBbCisgICAgICAgICAgICAiQnJlYWRj cnVtYkxpc3QuanMiLAogICAgICAgICAgICAgIkNoZWNrYm94LmpzIiwKICAgICAgICAgICAgICJD b250ZXh0TWVudS5qcyIsCiAgICAgICAgICAgICAiRE9NRXh0ZW5zaW9uLmpzIiwKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQnJlYWRjcnVtYkxpc3QuanMg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0JyZWFkY3J1bWJMaXN0LmpzCm5l dyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAuLjQxMzM1MzViMDRmYzE3YzI0NThhMTM3MDgxZWI4ZWU1MWYzZDJhMmEKLS0tIC9k ZXYvbnVsbAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0JyZWFkY3J1 bWJMaXN0LmpzCkBAIC0wLDAgKzEsMTAwIEBACisvKgorICogQ29weXJpZ2h0IChDKSAyMDEyIEdv b2dsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKgorICogUmVkaXN0cmlidXRpb24gYW5k IHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CisgKiBtb2Rp ZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRp dGlvbnMgYXJlCisgKiBtZXQ6CisgKgorICogICAgICogUmVkaXN0cmlidXRpb25zIG9mIHNvdXJj ZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqIG5vdGljZSwgdGhpcyBs aXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KKyAqICAgICAq IFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUK KyAqIGNvcHlyaWdodCBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9s bG93aW5nIGRpc2NsYWltZXIKKyAqIGluIHRoZSBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBt YXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUKKyAqIGRpc3RyaWJ1dGlvbi4KKyAqICAgICAqIE5l aXRoZXIgdGhlIG5hbWUgb2YgR29vZ2xlIEluYy4gbm9yIHRoZSBuYW1lcyBvZiBpdHMKKyAqIGNv bnRyaWJ1dG9ycyBtYXkgYmUgdXNlZCB0byBlbmRvcnNlIG9yIHByb21vdGUgcHJvZHVjdHMgZGVy aXZlZCBmcm9tCisgKiB0aGlzIHNvZnR3YXJlIHdpdGhvdXQgc3BlY2lmaWMgcHJpb3Igd3JpdHRl biBwZXJtaXNzaW9uLgorICoKKyAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgVEhFIENP UFlSSUdIVCBIT0xERVJTIEFORCBDT05UUklCVVRPUlMKKyAqICJBUyBJUyIgQU5EIEFOWSBFWFBS RVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UCisgKiBMSU1JVEVE IFRPLCBUSEUgSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVT UyBGT1IKKyAqIEEgUEFSVElDVUxBUiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiBJTiBOTyBFVkVO VCBTSEFMTCBUSEUgQ09QWVJJR0hUCisgKiBPV05FUiBPUiBDT05UUklCVVRPUlMgQkUgTElBQkxF IEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwKKyAqIFNQRUNJQUwsIEVYRU1Q TEFSWSwgT1IgQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QKKyAqIExJ TUlURUQgVE8sIFBST0NVUkVNRU5UIE9GIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExP U1MgT0YgVVNFLAorICogREFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5FU1MgSU5URVJSVVBUSU9O KSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZCisgKiBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVU SEVSIElOIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUCisgKiAoSU5DTFVESU5H IE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKSBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBV U0UKKyAqIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJ VFkgT0YgU1VDSCBEQU1BR0UuCisgKi8KKworLyoqCisgKiBAY29uc3RydWN0b3IKKyAqIEBleHRl bmRzIHtXZWJJbnNwZWN0b3IuT2JqZWN0fQorICovCitXZWJJbnNwZWN0b3IuQnJlYWRjcnVtYkxp c3QgPSBmdW5jdGlvbigpCit7CisgICAgV2ViSW5zcGVjdG9yLk9iamVjdC5jYWxsKHRoaXMpOwor ICAgIHRoaXMuX2VsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKKyAgICB0 aGlzLl9lbGVtZW50LmFkZFN0eWxlQ2xhc3MoImNydW1icyIpOworfQorCitXZWJJbnNwZWN0b3Iu QnJlYWRjcnVtYkxpc3QucHJvdG90eXBlID0geworICAgIC8qKgorICAgICAqIEBwYXJhbSB7QXJy YXkuPFdlYkluc3BlY3Rvci5CcmVhZGNydW1iRWxlbWVudD59IHgKKyAgICAgKi8KKyAgICBzZXQg Y2hpbGRyZW4oeCkKKyAgICB7CisgICAgICAgIHRoaXMuX2VsZW1lbnQucmVtb3ZlQ2hpbGRyZW4o KTsKKyAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCB4Lmxlbmd0aDsgKytpKQorICAgICAgICAg ICAgdGhpcy5lbGVtZW50LmFwcGVuZENoaWxkKHhbaV0uZWxlbWVudCk7CisgICAgfSwKKworICAg IC8qKgorICAgICAqIEByZXR1cm4ge0VsZW1lbnR9CisgICAgICovCisgICAgZ2V0IGVsZW1lbnQo KQorICAgIHsKKyAgICAgICAgcmV0dXJuIHRoaXMuX2VsZW1lbnQ7CisgICAgfSwKKworICAgIHVw ZGF0ZVNpemVzOiBmdW5jdGlvbigpCisgICAgeworICAgICAgICAvLyBGSVhNRSh0emlrKTogSW1w bGVtZW50IHRoaXMuCisgICAgICAgIC8vIElmIHRoZSBjcnVtYiBsaXN0IGlzIHRvbyB3aWRlIHRv IHNob3cgYWxsIGl0ZW1zLCB3ZSBzaG91bGQgY29sbGFwc2UgbGVmdC1tb3N0IG9yCisgICAgICAg IC8vIHJpZ2h0LW1vc3QgaXRlbXMuCisgICAgfQorfQorCitXZWJJbnNwZWN0b3IuQnJlYWRjcnVt Ykxpc3QucHJvdG90eXBlLl9fcHJvdG9fXyA9IFdlYkluc3BlY3Rvci5PYmplY3QucHJvdG90eXBl OworCisvKioKKyAqIEBjb25zdHJ1Y3RvcgorICovCitXZWJJbnNwZWN0b3IuQnJlYWRjcnVtYkVs ZW1lbnQgPSBmdW5jdGlvbigpCit7CisgICAgdGhpcy5fZWxlbWVudCA9IGRvY3VtZW50LmNyZWF0 ZUVsZW1lbnQoInNwYW4iKTsKKyAgICB0aGlzLl9lbGVtZW50LmFkZFN0eWxlQ2xhc3MoImNydW1i Iik7CisgICAgdGhpcy5fZWxlbWVudC53cmFwcGVyID0gdGhpczsKK30KKworV2ViSW5zcGVjdG9y LkJyZWFkY3J1bWJFbGVtZW50LnByb3RvdHlwZSA9IHsKKyAgICAvKioKKyAgICAgKiBAcmV0dXJu IHtFbGVtZW50fQorICAgICAqLworICAgIGdldCBlbGVtZW50KCkKKyAgICB7CisgICAgICAgIHJl dHVybiB0aGlzLl9lbGVtZW50OworICAgIH0sCisKKyAgICAvKioKKyAgICAgKiBAcGFyYW0ge2Jv b2xlYW59CisgICAgICovCisgICAgc2V0IHNlbGVjdGVkKHgpCisgICAgeworICAgICAgICBpZiAo eCkKKyAgICAgICAgICAgIHRoaXMuZWxlbWVudC5hZGRTdHlsZUNsYXNzKCJzZWxlY3RlZCIpOwor ICAgICAgICBlbHNlCisgICAgICAgICAgICB0aGlzLmVsZW1lbnQucmVtb3ZlU3R5bGVDbGFzcygi c2VsZWN0ZWQiKTsKKyAgICB9Cit9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL0ZpbGVTeXN0ZW1WaWV3LmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9GaWxlU3lzdGVtVmlldy5qcwppbmRleCA2MGI5ZjQyNTliMGIzZGI0ZTczODg3 Y2NlYmUyYTEwNzA3MjkwYmU0Li4zNzBmY2JmMGFkYjZhYzI4ZjIwZGJkNzAxZDhiNGEzNWQ5Mjc2 NGIwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0ZpbGVT eXN0ZW1WaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRmls ZVN5c3RlbVZpZXcuanMKQEAgLTI4LDYgKzI4LDggQEAKICAqIE9GIFRISVMgU09GVFdBUkUsIEVW RU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCiAgKi8KIAor aW1wb3J0U2NyaXB0KCJCcmVhZGNydW1iTGlzdC5qcyIpOworCiAvKioKICAqIEBjb25zdHJ1Y3Rv cgogICogQGV4dGVuZHMge1dlYkluc3BlY3Rvci5TcGxpdFZpZXd9CkBAIC0zNiw2ICszOCw3IEBA CiBXZWJJbnNwZWN0b3IuRmlsZVN5c3RlbVZpZXcgPSBmdW5jdGlvbihmaWxlU3lzdGVtKQogewog ICAgIFdlYkluc3BlY3Rvci5TcGxpdFZpZXcuY2FsbCh0aGlzLCBXZWJJbnNwZWN0b3IuU3BsaXRW aWV3LlNpZGViYXJQb3NpdGlvbi5MZWZ0LCAiRmlsZVN5c3RlbVZpZXdTaWRlYmFyV2lkdGgiKTsK KyAgICB0aGlzLnJlZ2lzdGVyUmVxdWlyZWRDU1MoImJyZWFkY3J1bWJMaXN0LmNzcyIpOwogICAg IHRoaXMuZWxlbWVudC5hZGRTdHlsZUNsYXNzKCJmaWxlLXN5c3RlbS12aWV3Iik7CiAgICAgdGhp cy5lbGVtZW50LmFkZFN0eWxlQ2xhc3MoInN0b3JhZ2UtdmlldyIpOwogCkBAIC01Nyw2ICs2MCw4 IEBAIFdlYkluc3BlY3Rvci5GaWxlU3lzdGVtVmlldyA9IGZ1bmN0aW9uKGZpbGVTeXN0ZW0pCiAg ICAgdGhpcy5fZGVsZXRlQnV0dG9uID0gbmV3IFdlYkluc3BlY3Rvci5TdGF0dXNCYXJCdXR0b24o V2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJEZWxldGUiKSwgImRlbGV0ZS1zdG9yYWdlLXN0YXR1cy1i YXItaXRlbSIpOwogICAgIHRoaXMuX2RlbGV0ZUJ1dHRvbi52aXNpYmxlID0gdHJ1ZTsKICAgICB0 aGlzLl9kZWxldGVCdXR0b24uYWRkRXZlbnRMaXN0ZW5lcigiY2xpY2siLCB0aGlzLl9jb25maXJt RGVsZXRlLCB0aGlzKTsKKworICAgIHRoaXMuX2NydW1icyA9IG5ldyBXZWJJbnNwZWN0b3IuQnJl YWRjcnVtYkxpc3QoKTsKIH0KIAogV2ViSW5zcGVjdG9yLkZpbGVTeXN0ZW1WaWV3LnByb3RvdHlw ZSA9IHsKQEAgLTY1LDcgKzcwLDcgQEAgV2ViSW5zcGVjdG9yLkZpbGVTeXN0ZW1WaWV3LnByb3Rv dHlwZSA9IHsKICAgICAgKi8KICAgICBnZXQgc3RhdHVzQmFySXRlbXMoKQogICAgIHsKLSAgICAg ICAgcmV0dXJuIFt0aGlzLl9yZWZyZXNoQnV0dG9uLmVsZW1lbnQsIHRoaXMuX2RlbGV0ZUJ1dHRv bi5lbGVtZW50XTsKKyAgICAgICAgcmV0dXJuIFt0aGlzLl9yZWZyZXNoQnV0dG9uLmVsZW1lbnQs IHRoaXMuX2RlbGV0ZUJ1dHRvbi5lbGVtZW50LCB0aGlzLl9jcnVtYnMuZWxlbWVudF07CiAgICAg fSwKIAogICAgIC8qKgpAQCAtMTAzLDYgKzEwOCwxOSBAQCBXZWJJbnNwZWN0b3IuRmlsZVN5c3Rl bVZpZXcucHJvdG90eXBlID0gewogICAgIF9kZWxldGU6IGZ1bmN0aW9uKCkKICAgICB7CiAgICAg ICAgIHRoaXMuX2RpcmVjdG9yeVRyZWUuc2VsZWN0ZWRUcmVlRWxlbWVudC5kZWxldGVFbnRyeSgp OworICAgIH0sCisKKyAgICB1cGRhdGVDcnVtYnM6IGZ1bmN0aW9uKHRyZWVFbGVtZW50KQorICAg IHsKKyAgICAgICAgdmFyIGNydW1iRWxlbWVudHMgPSBbXTsKKyAgICAgICAgd2hpbGUgKHRyZWVF bGVtZW50ICE9PSB0cmVlRWxlbWVudC50cmVlT3V0bGluZSkgeworICAgICAgICAgICAgY3J1bWJF bGVtZW50cy5wdXNoKG5ldyBXZWJJbnNwZWN0b3IuRmlsZVN5c3RlbVZpZXcuRW50cnlDcnVtYkVs ZW1lbnQodGhpcywgdHJlZUVsZW1lbnQpKTsKKyAgICAgICAgICAgIHRyZWVFbGVtZW50ID0gdHJl ZUVsZW1lbnQucGFyZW50OworICAgICAgICB9CisgICAgICAgIGlmIChjcnVtYkVsZW1lbnRzLmxl bmd0aCkKKyAgICAgICAgICAgIGNydW1iRWxlbWVudHNbMF0uc2VsZWN0ZWQgPSB0cnVlOworICAg ICAgICB0aGlzLl9jcnVtYnMuY2hpbGRyZW4gPSBjcnVtYkVsZW1lbnRzOworICAgICAgICB0aGlz Ll9jcnVtYnMudXBkYXRlU2l6ZXMoKTsKICAgICB9CiB9CiAKQEAgLTEyMyw2ICsxNDEsMTQgQEAg V2ViSW5zcGVjdG9yLkZpbGVTeXN0ZW1WaWV3LkVudHJ5VHJlZUVsZW1lbnQgPSBmdW5jdGlvbihm aWxlU3lzdGVtVmlldywgZW50cnkpCiB9CiAKIFdlYkluc3BlY3Rvci5GaWxlU3lzdGVtVmlldy5F bnRyeVRyZWVFbGVtZW50LnByb3RvdHlwZSA9IHsKKyAgICAvKioKKyAgICAgKiBAcmV0dXJuIHtX ZWJJbnNwZWN0b3IuRmlsZVN5c3RlbU1vZGVsLkVudHJ5fQorICAgICAqLworICAgIGdldCBlbnRy eSgpCisgICAgeworICAgICAgICByZXR1cm4gdGhpcy5fZW50cnk7CisgICAgfSwKKwogICAgIG9u YXR0YWNoOiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICB2YXIgc2VsZWN0aW9uID0gdGhpcy5s aXN0SXRlbUVsZW1lbnQuY3JlYXRlQ2hpbGQoImRpdiIsICJzZWxlY3Rpb24iKTsKQEAgLTE0MSw2 ICsxNjcsNyBAQCBXZWJJbnNwZWN0b3IuRmlsZVN5c3RlbVZpZXcuRW50cnlUcmVlRWxlbWVudC5w cm90b3R5cGUgPSB7CiAgICAgICAgIH0KICAgICAgICAgdGhpcy5fZmlsZVN5c3RlbVZpZXcuc2hv d1ZpZXcodGhpcy5fdmlldyk7CiAgICAgICAgIHRoaXMucmVmcmVzaCgpOworICAgICAgICB0aGlz Ll9maWxlU3lzdGVtVmlldy51cGRhdGVDcnVtYnModGhpcyk7CiAgICAgfSwKIAogICAgIG9ucG9w dWxhdGU6IGZ1bmN0aW9uKCkKQEAgLTIzMSwzICsyNTgsMjggQEAgV2ViSW5zcGVjdG9yLkZpbGVT eXN0ZW1WaWV3LkVudHJ5VHJlZUVsZW1lbnQucHJvdG90eXBlID0gewogfQogCiBXZWJJbnNwZWN0 b3IuRmlsZVN5c3RlbVZpZXcuRW50cnlUcmVlRWxlbWVudC5wcm90b3R5cGUuX19wcm90b19fID0g VHJlZUVsZW1lbnQucHJvdG90eXBlOworCisvKioKKyAqIEBjb25zdHJ1Y3RvcgorICogQGV4dGVu ZHMge1dlYkluc3BlY3Rvci5CcmVhZGNydW1iRWxlbWVudH0KKyAqIEBwYXJhbSB7V2ViSW5zcGVj dG9yLkZpbGVTeXN0ZW1WaWV3fSBmaWxlU3lzdGVtVmlldworICogQHBhcmFtIHtXZWJJbnNwZWN0 b3IuRW50cnlUcmVlRWxlbWVudH0gdHJlZUVsZW1lbnQKKyAqLworV2ViSW5zcGVjdG9yLkZpbGVT eXN0ZW1WaWV3LkVudHJ5Q3J1bWJFbGVtZW50ID0gZnVuY3Rpb24oZmlsZVN5c3RlbVZpZXcsIHRy ZWVFbGVtZW50KQoreworICAgIFdlYkluc3BlY3Rvci5CcmVhZGNydW1iRWxlbWVudC5jYWxsKHRo aXMpOworICAgIHRoaXMuX2ZpbGVTeXN0ZW1WaWV3ID0gZmlsZVN5c3RlbVZpZXc7CisgICAgdGhp cy5lbGVtZW50LmlubmVyVGV4dCA9IHRyZWVFbGVtZW50LmVudHJ5Lm5hbWU7CisgICAgdGhpcy5l bGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoImNsaWNrIiwgdGhpcy5fY2xpY2tlZC5iaW5kKHRoaXMp KTsKKworICAgIHRoaXMuX3RyZWVFbGVtZW50ID0gdHJlZUVsZW1lbnQ7Cit9CisKK1dlYkluc3Bl Y3Rvci5GaWxlU3lzdGVtVmlldy5FbnRyeUNydW1iRWxlbWVudC5wcm90b3R5cGUgPSB7CisgICAg X2NsaWNrZWQ6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIHRoaXMuX3RyZWVFbGVtZW50LnNl bGVjdCgpOworICAgIH0KK30KKworV2ViSW5zcGVjdG9yLkZpbGVTeXN0ZW1WaWV3LkVudHJ5Q3J1 bWJFbGVtZW50LnByb3RvdHlwZS5fX3Byb3RvX18gPSBXZWJJbnNwZWN0b3IuQnJlYWRjcnVtYkVs ZW1lbnQucHJvdG90eXBlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9XZWJLaXQucXJjIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9X ZWJLaXQucXJjCmluZGV4IGFjNjQ5NDdhMzE5YjE5MzkxMTU4ZjJjNWVlODQxNTI5Yzk0ODAxY2Yu LjU1YmVhYTIxNGRkOTBmMThlNjNmYjE5YWE4NWVhZThhNGMzNDQxMGMgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvV2ViS2l0LnFyYworKysgYi9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1dlYktpdC5xcmMKQEAgLTExLDYgKzExLDcgQEAK ICAgICA8ZmlsZT5BdWRpdFJ1bGVzLmpzPC9maWxlPgogICAgIDxmaWxlPkF1ZGl0c1BhbmVsLmpz PC9maWxlPgogICAgIDxmaWxlPkJvdHRvbVVwUHJvZmlsZURhdGFHcmlkVHJlZS5qczwvZmlsZT4K KyAgICA8ZmlsZT5CcmVhZGNydW1iTGlzdC5qczwvZmlsZT4KICAgICA8ZmlsZT5CcmVha3BvaW50 TWFuYWdlci5qczwvZmlsZT4KICAgICA8ZmlsZT5CcmVha3BvaW50c1NpZGViYXJQYW5lLmpzPC9m aWxlPgogICAgIDxmaWxlPkNhbGxTdGFja1NpZGViYXJQYW5lLmpzPC9maWxlPgo=