91699 2012-07-18 18:00:29 -0700 Web Inspector: Factor ExtensionView into separate file 2012-07-19 03:03:44 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 janx webkit-unassigned apavlov bweinstein caseq joepeck keishi loislo pfeldman pmuellr rik timothy webkit.review.bot yurys oldest_to_newest 673035 0 janx 2012-07-18 18:00:29 -0700 I'm planning on using the class `ExtensionView` for something else than `ExtensionPanel`s. Therefore this class should be defined in a separate file rather than `ExtensionPanel.js`. 673053 1 153153 janx 2012-07-18 18:28:19 -0700 Created attachment 153153 Patch 673343 2 153153 caseq 2012-07-19 02:46:59 -0700 Comment on attachment 153153 Patch LGTM 673348 3 153153 webkit.review.bot 2012-07-19 03:03:38 -0700 Comment on attachment 153153 Patch Clearing flags on attachment: 153153 Committed r123086: <http://trac.webkit.org/changeset/123086> 673349 4 webkit.review.bot 2012-07-19 03:03:44 -0700 All reviewed patches have been landed. Closing bug. 153153 2012-07-18 18:28:19 -0700 2012-07-19 03:03:38 -0700 Patch bug-91699-20120718182818.patch text/plain 10546 janx U3VidmVyc2lvbiBSZXZpc2lvbjogMTIyOTY4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTFlOWM5OGQ5OGNkZGJi MjM5MDAwMTk2NGMyNDRlZDM3NWM1MjZkYi4uYTI2ODEyYzNiZWUyNDhmMjI4NWNkYzcwYmNkYmEy MzMwNDAxNWEzMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEyLTA3LTE4ICBKYW4g S2Vyb21uZXMgIDxqYW54QGxpbnV4LmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBGYWN0 b3IgRXh0ZW5zaW9uVmlldyBpbnRvIHNlcGFyYXRlIGZpbGUKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTkxNjk5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIGNsYXNzIEV4dGVuc2lvblZpZXcgd2FzIGRl ZmluZWQgaW4gRXh0ZW5zaW9uUGFuZWwuanMgYnV0IG5lZWRlZCB0bworICAgICAgICBiZSBpbiBh IHNlcGFyYXRlIGZpbGUgc2luY2UgaXQgaXMgZ29pbmcgdG8gYmUgcmV1c2VkIHNvbWV3aGVyZSBl bHNlLgorCisgICAgICAgIEN1cnJlbnQgdGVzdCBjb3ZlcmFnZSBpcyBlbm91Z2ggc2luY2Ugbm8g YmVoYXZpb3Igd2FzIGNoYW5nZWQuCisKKyAgICAgICAgKiBXZWJDb3JlLmd5cGk6CisgICAgICAg ICogV2ViQ29yZS52Y3Byb2ovV2ViQ29yZS52Y3Byb2o6CisgICAgICAgICogaW5zcGVjdG9yL2Nv bXBpbGUtZnJvbnQtZW5kLnB5OgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvRXh0ZW5z aW9uUGFuZWwuanM6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9XZWJLaXQucXJjOgor ICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmh0bWw6CisKIDIwMTItMDct MTggIFNlcmdleSBSb2d1bGVua28gIDxyb2d1bGVua29AZ29vZ2xlLmNvbT4KIAogICAgICAgICBX ZWIgSW5zcGVjdG9yOiBhZGRpbmcgcGF1c2UgaWNvbiBmb3IgSmF2YVNjcmlwdCBkZWJ1Z2dpbmcK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZ3lwaSBiL1NvdXJjZS9XZWJDb3Jl L1dlYkNvcmUuZ3lwaQppbmRleCAwOWQ5NzBmMWY5ZmRkNDA2OWM2OWIwYjIxZjE4NGQ2ZjRkYWU5 YzU2Li4wMzk3MmE0Y2Y5ZWEwMGZmZGZjOTAyYjAwNDgyZWQ4ZTVlODg4MzFmIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmd5cGkKKysrIGIvU291cmNlL1dlYkNvcmUvV2ViQ29y ZS5neXBpCkBAIC02Mjk1LDYgKzYyOTUsNyBAQAogICAgICAgICAgICAgJ2luc3BlY3Rvci9mcm9u dC1lbmQvRXh0ZW5zaW9uUGFuZWwuanMnLAogICAgICAgICAgICAgJ2luc3BlY3Rvci9mcm9udC1l bmQvRXh0ZW5zaW9uUmVnaXN0cnlTdHViLmpzJywKICAgICAgICAgICAgICdpbnNwZWN0b3IvZnJv bnQtZW5kL0V4dGVuc2lvblNlcnZlci5qcycsCisgICAgICAgICAgICAnaW5zcGVjdG9yL2Zyb250 LWVuZC9FeHRlbnNpb25WaWV3LmpzJywKICAgICAgICAgICAgICdpbnNwZWN0b3IvZnJvbnQtZW5k L0ZpbGVNYW5hZ2VyLmpzJywKICAgICAgICAgICAgICdpbnNwZWN0b3IvZnJvbnQtZW5kL0ZpbGVD b250ZW50Vmlldy5qcycsCiAgICAgICAgICAgICAnaW5zcGVjdG9yL2Zyb250LWVuZC9GaWxlU3lz dGVtTW9kZWwuanMnLApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS52Y3Byb2ov V2ViQ29yZS52Y3Byb2ogYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnZjcHJvai9XZWJDb3JlLnZj cHJvagppbmRleCAxOWJlMDU2ZDFkNTQwOTM1OTk3Mjk5MjgxOWYzMzFhNGY1ODhhNmFhLi43MDVh NGJjZTk4NGE3YjYzMjNhMjBhOWY5MTIzNzQ3ZWVmYzJkYTYyIDEwMDc1NQotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9XZWJDb3JlLnZjcHJvai9XZWJDb3JlLnZjcHJvagorKysgYi9Tb3VyY2UvV2ViQ29y ZS9XZWJDb3JlLnZjcHJvai9XZWJDb3JlLnZjcHJvagpAQCAtNzUxMDYsNiArNzUxMDYsMTAgQEAK IAkJCQkJPgogCQkJCTwvRmlsZT4KIAkJCQk8RmlsZQorCQkJCQlSZWxhdGl2ZVBhdGg9Ii4uXGlu c3BlY3Rvclxmcm9udC1lbmRcRXh0ZW5zaW9uVmlldy5qcyIKKwkJCQkJPgorCQkJCTwvRmlsZT4K KwkJCQk8RmlsZQogCQkJCQlSZWxhdGl2ZVBhdGg9Ii4uXGluc3BlY3Rvclxmcm9udC1lbmRcRmls ZUNvbnRlbnRWaWV3LmpzIgogCQkJCQk+CiAJCQkJPC9GaWxlPgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2NvbXBpbGUtZnJvbnQtZW5kLnB5IGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2NvbXBpbGUtZnJvbnQtZW5kLnB5CmluZGV4IDk3YTYxNzE3ZmY1NWM5NmI1OWEz ZTYxNGM2ZGZmMTE5ZTdkMjRlZjEuLjM3NTgzZjc4YTdjMWVkZTk3ZTBmMGJhN2ZmNDcxOWNjMWVi NmFmYzYgMTAwNzU1Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9jb21waWxlLWZyb250 LWVuZC5weQorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvY29tcGlsZS1mcm9udC1lbmQu cHkKQEAgLTI4Myw2ICsyODMsNyBAQCBtb2R1bGVzID0gWwogICAgICAgICAgICAgIkV4dGVuc2lv blBhbmVsLmpzIiwKICAgICAgICAgICAgICJFeHRlbnNpb25SZWdpc3RyeVN0dWIuanMiLAogICAg ICAgICAgICAgIkV4dGVuc2lvblNlcnZlci5qcyIsCisgICAgICAgICAgICAiRXh0ZW5zaW9uVmll dy5qcyIsCiAgICAgICAgIF0KICAgICB9LAogICAgIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRXh0ZW5zaW9uUGFuZWwuanMgYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0V4dGVuc2lvblBhbmVsLmpzCmluZGV4IDE0ODViMDk2NjY0 NGNjMGRhNzE2MTI3ODczZTlmY2ZmNWM2MjAwMGYuLjRjZGM4MWM5OTc2N2U2OWFlYjY5ZGM0ZTYy NmQ1Nzk1YWNkZmY2ZTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvRXh0ZW5zaW9uUGFuZWwuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9FeHRlbnNpb25QYW5lbC5qcwpAQCAtMzAsODEgKzMwLDEwIEBACiAKIC8qKgogICog QGNvbnN0cnVjdG9yCi0gKiBAZXh0ZW5kcyB7V2ViSW5zcGVjdG9yLlZpZXd9Ci0gKiBAcGFyYW0g e3N0cmluZ30gaWQKLSAqIEBwYXJhbSB7RWxlbWVudH0gcGFyZW50Ci0gKiBAcGFyYW0ge3N0cmlu Z30gc3JjCi0gKiBAcGFyYW0ge3N0cmluZ30gY2xhc3NOYW1lCi0gKi8KLVdlYkluc3BlY3Rvci5F eHRlbnNpb25WaWV3ID0gZnVuY3Rpb24oaWQsIHBhcmVudCwgc3JjLCBjbGFzc05hbWUpCi17Ci0g ICAgV2ViSW5zcGVjdG9yLlZpZXcuY2FsbCh0aGlzKTsKLSAgICB0aGlzLmVsZW1lbnQuY2xhc3NO YW1lID0gImZpbGwiOwotCi0gICAgdGhpcy5faWQgPSBpZDsKLSAgICB0aGlzLl9pZnJhbWUgPSBk b2N1bWVudC5jcmVhdGVFbGVtZW50KCJpZnJhbWUiKTsKLSAgICB0aGlzLl9pZnJhbWUuYWRkRXZl bnRMaXN0ZW5lcigibG9hZCIsIHRoaXMuX29uTG9hZC5iaW5kKHRoaXMpLCBmYWxzZSk7Ci0gICAg dGhpcy5faWZyYW1lLnNyYyA9IHNyYzsKLSAgICB0aGlzLl9pZnJhbWUuY2xhc3NOYW1lID0gY2xh c3NOYW1lOwotCi0gICAgdGhpcy5lbGVtZW50LmFwcGVuZENoaWxkKHRoaXMuX2lmcmFtZSk7Ci0g ICAgdGhpcy5zaG93KHBhcmVudCk7Ci19Ci0KLVdlYkluc3BlY3Rvci5FeHRlbnNpb25WaWV3LnBy b3RvdHlwZSA9IHsKLSAgICB3YXNTaG93bjogZnVuY3Rpb24oKQotICAgIHsKLSAgICAgICAgaWYg KHR5cGVvZiB0aGlzLl9mcmFtZUluZGV4ID09PSAibnVtYmVyIikKLSAgICAgICAgICAgIFdlYklu c3BlY3Rvci5leHRlbnNpb25TZXJ2ZXIubm90aWZ5Vmlld1Nob3duKHRoaXMuX2lkLCB0aGlzLl9m cmFtZUluZGV4KTsKLSAgICB9LAotCi0gICAgd2lsbEhpZGU6IGZ1bmN0aW9uKCkKLSAgICB7Ci0g ICAgICAgIGlmICh0eXBlb2YgdGhpcy5fZnJhbWVJbmRleCA9PT0gIm51bWJlciIpCi0gICAgICAg ICAgICBXZWJJbnNwZWN0b3IuZXh0ZW5zaW9uU2VydmVyLm5vdGlmeVZpZXdIaWRkZW4odGhpcy5f aWQpOwotICAgIH0sCi0KLSAgICBfb25Mb2FkOiBmdW5jdGlvbigpCi0gICAgewotICAgICAgICB0 aGlzLl9mcmFtZUluZGV4ID0gQXJyYXkucHJvdG90eXBlLmluZGV4T2YuY2FsbCh3aW5kb3cuZnJh bWVzLCB0aGlzLl9pZnJhbWUuY29udGVudFdpbmRvdyk7Ci0gICAgICAgIGlmICh0aGlzLmlzU2hv d2luZygpKQotICAgICAgICAgICAgV2ViSW5zcGVjdG9yLmV4dGVuc2lvblNlcnZlci5ub3RpZnlW aWV3U2hvd24odGhpcy5faWQsIHRoaXMuX2ZyYW1lSW5kZXgpOwotICAgIH0KLX0KLQotV2ViSW5z cGVjdG9yLkV4dGVuc2lvblZpZXcucHJvdG90eXBlLl9fcHJvdG9fXyA9IFdlYkluc3BlY3Rvci5W aWV3LnByb3RvdHlwZTsKLQotLyoqCi0gKiBAY29uc3RydWN0b3IKLSAqIEBleHRlbmRzIHtXZWJJ bnNwZWN0b3IuVmlld30KLSAqIEBwYXJhbSB7c3RyaW5nfSBpZAotICovCi1XZWJJbnNwZWN0b3Iu RXh0ZW5zaW9uTm90aWZpZXJWaWV3ID0gZnVuY3Rpb24oaWQpCi17Ci0gICAgV2ViSW5zcGVjdG9y LlZpZXcuY2FsbCh0aGlzKTsKLQotICAgIHRoaXMuX2lkID0gaWQ7Ci19Ci0KLVdlYkluc3BlY3Rv ci5FeHRlbnNpb25Ob3RpZmllclZpZXcucHJvdG90eXBlID0gewotICAgIHdhc1Nob3duOiBmdW5j dGlvbigpCi0gICAgewotICAgICAgICBXZWJJbnNwZWN0b3IuZXh0ZW5zaW9uU2VydmVyLm5vdGlm eVZpZXdTaG93bih0aGlzLl9pZCk7Ci0gICAgfSwKLQotICAgIHdpbGxIaWRlOiBmdW5jdGlvbigp Ci0gICAgewotICAgICAgICBXZWJJbnNwZWN0b3IuZXh0ZW5zaW9uU2VydmVyLm5vdGlmeVZpZXdI aWRkZW4odGhpcy5faWQpOwotICAgIH0KLX0KLQotV2ViSW5zcGVjdG9yLkV4dGVuc2lvbk5vdGlm aWVyVmlldy5wcm90b3R5cGUuX19wcm90b19fID0gV2ViSW5zcGVjdG9yLlZpZXcucHJvdG90eXBl OwotCi0vKioKLSAqIEBjb25zdHJ1Y3RvcgogICogQGV4dGVuZHMge1dlYkluc3BlY3Rvci5QYW5l bH0KICAqIEBwYXJhbSB7c3RyaW5nfSBpZAogICogQHBhcmFtIHtzdHJpbmd9IGxhYmVsCisgKiBA cGFyYW0ge3N0cmluZ30gcGFnZVVSTAogICogQHBhcmFtIHtzdHJpbmd9IGljb25VUkwKICAqLwog V2ViSW5zcGVjdG9yLkV4dGVuc2lvblBhbmVsID0gZnVuY3Rpb24oaWQsIGxhYmVsLCBwYWdlVVJM LCBpY29uVVJMKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9FeHRlbnNpb25WaWV3LmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9F eHRlbnNpb25WaWV3LmpzCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmQ3OTI1MTg4MjlkZmMzYThhOTQ2OGM2MmM4Yzdh NjViNTg3ZGQ4NDMKLS0tIC9kZXYvbnVsbAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL0V4dGVuc2lvblZpZXcuanMKQEAgLTAsMCArMSwxMDEgQEAKKy8qCisgKiBDb3B5 cmlnaHQgKEMpIDIwMTIgR29vZ2xlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqCisgKiBS ZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9y IHdpdGhvdXQKKyAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRo ZSBmb2xsb3dpbmcgY29uZGl0aW9ucyBhcmUKKyAqIG1ldDoKKyAqCisgKiAgICAgKiBSZWRpc3Ry aWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAor ICogbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNj bGFpbWVyLgorICogICAgICogUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVw cm9kdWNlIHRoZSBhYm92ZQorICogY29weXJpZ2h0IG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRp dGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lcgorICogaW4gdGhlIGRvY3VtZW50YXRp b24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZQorICogZGlzdHJpYnV0 aW9uLgorICogICAgICogTmVpdGhlciB0aGUgbmFtZSBvZiBHb29nbGUgSW5jLiBub3IgdGhlIG5h bWVzIG9mIGl0cworICogY29udHJpYnV0b3JzIG1heSBiZSB1c2VkIHRvIGVuZG9yc2Ugb3IgcHJv bW90ZSBwcm9kdWN0cyBkZXJpdmVkIGZyb20KKyAqIHRoaXMgc29mdHdhcmUgd2l0aG91dCBzcGVj aWZpYyBwcmlvciB3cml0dGVuIHBlcm1pc3Npb24uCisgKgorICogVEhJUyBTT0ZUV0FSRSBJUyBQ Uk9WSURFRCBCWSBUSEUgQ09QWVJJR0hUIEhPTERFUlMgQU5EIENPTlRSSUJVVE9SUworICogIkFT IElTIiBBTkQgQU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJV VCBOT1QKKyAqIExJTUlURUQgVE8sIFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRB QklMSVRZIEFORCBGSVRORVNTIEZPUgorICogQSBQQVJUSUNVTEFSIFBVUlBPU0UgQVJFIERJU0NM QUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIFRIRSBDT1BZUklHSFQKKyAqIE9XTkVSIE9SIENPTlRS SUJVVE9SUyBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLAor ICogU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElO RywgQlVUIE5PVAorICogTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YgU1VCU1RJVFVURSBHT09E UyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsCisgKiBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJ TkVTUyBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkKKyAqIFRIRU9SWSBP RiBMSUFCSUxJVFksIFdIRVRIRVIgSU4gQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRP UlQKKyAqIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5Z IFdBWSBPVVQgT0YgVEhFIFVTRQorICogT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VE IE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKyAqLworCisvKioKKyAqIEBjb25z dHJ1Y3RvcgorICogQGV4dGVuZHMge1dlYkluc3BlY3Rvci5WaWV3fQorICogQHBhcmFtIHtzdHJp bmd9IGlkCisgKiBAcGFyYW0ge0VsZW1lbnR9IHBhcmVudAorICogQHBhcmFtIHtzdHJpbmd9IHNy YworICogQHBhcmFtIHtzdHJpbmd9IGNsYXNzTmFtZQorICovCitXZWJJbnNwZWN0b3IuRXh0ZW5z aW9uVmlldyA9IGZ1bmN0aW9uKGlkLCBwYXJlbnQsIHNyYywgY2xhc3NOYW1lKQoreworICAgIFdl Ykluc3BlY3Rvci5WaWV3LmNhbGwodGhpcyk7CisgICAgdGhpcy5lbGVtZW50LmNsYXNzTmFtZSA9 ICJmaWxsIjsKKworICAgIHRoaXMuX2lkID0gaWQ7CisgICAgdGhpcy5faWZyYW1lID0gZG9jdW1l bnQuY3JlYXRlRWxlbWVudCgiaWZyYW1lIik7CisgICAgdGhpcy5faWZyYW1lLmFkZEV2ZW50TGlz dGVuZXIoImxvYWQiLCB0aGlzLl9vbkxvYWQuYmluZCh0aGlzKSwgZmFsc2UpOworICAgIHRoaXMu X2lmcmFtZS5zcmMgPSBzcmM7CisgICAgdGhpcy5faWZyYW1lLmNsYXNzTmFtZSA9IGNsYXNzTmFt ZTsKKworICAgIHRoaXMuZWxlbWVudC5hcHBlbmRDaGlsZCh0aGlzLl9pZnJhbWUpOworICAgIHRo aXMuc2hvdyhwYXJlbnQpOworfQorCitXZWJJbnNwZWN0b3IuRXh0ZW5zaW9uVmlldy5wcm90b3R5 cGUgPSB7CisgICAgd2FzU2hvd246IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIGlmICh0eXBl b2YgdGhpcy5fZnJhbWVJbmRleCA9PT0gIm51bWJlciIpCisgICAgICAgICAgICBXZWJJbnNwZWN0 b3IuZXh0ZW5zaW9uU2VydmVyLm5vdGlmeVZpZXdTaG93bih0aGlzLl9pZCwgdGhpcy5fZnJhbWVJ bmRleCk7CisgICAgfSwKKworICAgIHdpbGxIaWRlOiBmdW5jdGlvbigpCisgICAgeworICAgICAg ICBpZiAodHlwZW9mIHRoaXMuX2ZyYW1lSW5kZXggPT09ICJudW1iZXIiKQorICAgICAgICAgICAg V2ViSW5zcGVjdG9yLmV4dGVuc2lvblNlcnZlci5ub3RpZnlWaWV3SGlkZGVuKHRoaXMuX2lkKTsK KyAgICB9LAorCisgICAgX29uTG9hZDogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgdGhpcy5f ZnJhbWVJbmRleCA9IEFycmF5LnByb3RvdHlwZS5pbmRleE9mLmNhbGwod2luZG93LmZyYW1lcywg dGhpcy5faWZyYW1lLmNvbnRlbnRXaW5kb3cpOworICAgICAgICBpZiAodGhpcy5pc1Nob3dpbmco KSkKKyAgICAgICAgICAgIFdlYkluc3BlY3Rvci5leHRlbnNpb25TZXJ2ZXIubm90aWZ5Vmlld1No b3duKHRoaXMuX2lkLCB0aGlzLl9mcmFtZUluZGV4KTsKKyAgICB9Cit9CisKK1dlYkluc3BlY3Rv ci5FeHRlbnNpb25WaWV3LnByb3RvdHlwZS5fX3Byb3RvX18gPSBXZWJJbnNwZWN0b3IuVmlldy5w cm90b3R5cGU7CisKKy8qKgorICogQGNvbnN0cnVjdG9yCisgKiBAZXh0ZW5kcyB7V2ViSW5zcGVj dG9yLlZpZXd9CisgKiBAcGFyYW0ge3N0cmluZ30gaWQKKyAqLworV2ViSW5zcGVjdG9yLkV4dGVu c2lvbk5vdGlmaWVyVmlldyA9IGZ1bmN0aW9uKGlkKQoreworICAgIFdlYkluc3BlY3Rvci5WaWV3 LmNhbGwodGhpcyk7CisKKyAgICB0aGlzLl9pZCA9IGlkOworfQorCitXZWJJbnNwZWN0b3IuRXh0 ZW5zaW9uTm90aWZpZXJWaWV3LnByb3RvdHlwZSA9IHsKKyAgICB3YXNTaG93bjogZnVuY3Rpb24o KQorICAgIHsKKyAgICAgICAgV2ViSW5zcGVjdG9yLmV4dGVuc2lvblNlcnZlci5ub3RpZnlWaWV3 U2hvd24odGhpcy5faWQpOworICAgIH0sCisKKyAgICB3aWxsSGlkZTogZnVuY3Rpb24oKQorICAg IHsKKyAgICAgICAgV2ViSW5zcGVjdG9yLmV4dGVuc2lvblNlcnZlci5ub3RpZnlWaWV3SGlkZGVu KHRoaXMuX2lkKTsKKyAgICB9Cit9CisKK1dlYkluc3BlY3Rvci5FeHRlbnNpb25Ob3RpZmllclZp ZXcucHJvdG90eXBlLl9fcHJvdG9fXyA9IFdlYkluc3BlY3Rvci5WaWV3LnByb3RvdHlwZTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvV2ViS2l0LnFyYyBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvV2ViS2l0LnFyYwppbmRleCBiNGZj ODVmZDU1ZmMyMDYyMTVlOWNiMTExYmU5MmFjMjg0MWJlYmI0Li5jZDMxYjMwZTJiMTc4Y2Q5OTVm ZTg1MDE0OWQ0NWZhMWVkYzE0Mzk0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1dlYktpdC5xcmMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9XZWJLaXQucXJjCkBAIC01Nyw2ICs1Nyw3IEBACiAgICAgPGZpbGU+RXh0ZW5zaW9u UGFuZWwuanM8L2ZpbGU+CiAgICAgPGZpbGU+RXh0ZW5zaW9uUmVnaXN0cnlTdHViLmpzPC9maWxl PgogICAgIDxmaWxlPkV4dGVuc2lvblNlcnZlci5qczwvZmlsZT4KKyAgICA8ZmlsZT5FeHRlbnNp b25WaWV3LmpzPC9maWxlPgogICAgIDxmaWxlPkZpbGVDb250ZW50Vmlldy5qczwvZmlsZT4KICAg ICA8ZmlsZT5GaWxlTWFuYWdlci5qczwvZmlsZT4KICAgICA8ZmlsZT5GaWxlU3lzdGVtTW9kZWwu anM8L2ZpbGU+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L2luc3BlY3Rvci5odG1sIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNw ZWN0b3IuaHRtbAppbmRleCAwZjE2NWQzZTMxZGZjN2MzYjJlZmI1M2NkNmQ5N2Q3NmZjNGE2NjJi Li5lYmQ1MjQ0OTBkYmNlMTRhNmRkMTdiZTJjM2MwMzU0ODMyY2JmMDU1IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5odG1sCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmh0bWwKQEAgLTEzNiw2 ICsxMzYsNyBAQCBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklM SVRZIE9GIFNVQ0ggREFNQUdFLgogICAgIDxzY3JpcHQgdHlwZT0idGV4dC9qYXZhc2NyaXB0IiBz cmM9IkV4dGVuc2lvbkFQSS5qcyI+PC9zY3JpcHQ+CiAgICAgPHNjcmlwdCB0eXBlPSJ0ZXh0L2ph dmFzY3JpcHQiIHNyYz0iRXh0ZW5zaW9uQXVkaXRDYXRlZ29yeS5qcyI+PC9zY3JpcHQ+CiAgICAg PHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiIHNyYz0iRXh0ZW5zaW9uU2VydmVyLmpzIj48 L3NjcmlwdD4KKyAgICA8c2NyaXB0IHR5cGU9InRleHQvamF2YXNjcmlwdCIgc3JjPSJFeHRlbnNp b25WaWV3LmpzIj48L3NjcmlwdD4KICAgICA8c2NyaXB0IHR5cGU9InRleHQvamF2YXNjcmlwdCIg c3JjPSJFeHRlbnNpb25QYW5lbC5qcyI+PC9zY3JpcHQ+CiAgICAgPHNjcmlwdCB0eXBlPSJ0ZXh0 L2phdmFzY3JpcHQiIHNyYz0iQXVkaXRzUGFuZWwuanMiPjwvc2NyaXB0PgogICAgIDxzY3JpcHQg dHlwZT0idGV4dC9qYXZhc2NyaXB0IiBzcmM9IkF1ZGl0UmVzdWx0Vmlldy5qcyI+PC9zY3JpcHQ+ Cg==