156566 2016-04-13 19:28:04 -0700 JSContext Inspector: Improve Class instances and JSC API Exported Values view in Console / ObjectTree 2016-04-13 21:59:45 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck joepeck bburg commit-queue graouts joepeck keith_miller mark.lam mattbaker msaboff nvasilyev saam timothy webkit-bug-importer oldest_to_newest 1183608 0 joepeck 2016-04-13 19:28:04 -0700 * SUMMARY Improve Class instances and JSC API Exported Values view in Console / ObjectTree Given this example ObjC Exported class: @protocol JSBridgeExports <JSExport> @property (readonly) NSUInteger count; - (void)log:(NSString *)str; - (void)clear; - (void)test; @end @interface JSBridge : NSObject <JSBridgeExports> @end ... /* implementation */ _bridge = [[JSBridge alloc] init]; JSValue *globalObject = [_context globalObject]; globalObject[@"bridge"] = _bridge; Or the same as an ES6 Class instance: JSBridge = class JSBridge { get count() { return 1; } log(str) {} clear() {} test() {} }; bridge = new JSBridge; Currently logging this object in the console results in very little: js> bridge JSBridge {} There are a couple improvements that can be made here. All of the properties / methods of these objects are non-enumerable, which is why our UI treats them as lossless. 1. Any non-basic Object type that has a prototype should be expandable - having a non-basic prototype likely means there are methods you can use, so treat them as not lossless, to allow expanding to see the methods. 2. Special Case Native Getters to show in Preview, even if non-enumerable - This applies to the JSC API Exported @property getters, which are non-enumerable. We skipped non-enumerable properties in previews before. - This follows the existing convention we have of invoking getters if they are native because we assume they shouldn't have side-effects. - This would make the preview "JSBridge {count:#}" for the Exported API object 1183609 1 joepeck 2016-04-13 19:28:17 -0700 <rdar://problem/16392365> 1183611 2 276370 joepeck 2016-04-13 19:29:58 -0700 Created attachment 276370 [PATCH] Proposed Fix 1183630 3 276370 commit-queue 2016-04-13 21:59:42 -0700 Comment on attachment 276370 [PATCH] Proposed Fix Clearing flags on attachment: 276370 Committed r199529: <http://trac.webkit.org/changeset/199529> 1183631 4 commit-queue 2016-04-13 21:59:45 -0700 All reviewed patches have been landed. Closing bug. 276370 2016-04-13 19:29:58 -0700 2016-04-13 21:59:42 -0700 [PATCH] Proposed Fix improve-console.patch text/plain 12532 joepeck ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBmMWJjYTNmLi4wOGU1ZjA1IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTYtMDQt MTMgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKworICAgICAgICBKU0Nv bnRleHQgSW5zcGVjdG9yOiBJbXByb3ZlIENsYXNzIGluc3RhbmNlcyBhbmQgSlNDIEFQSSBFeHBv cnRlZCBWYWx1ZXMgdmlldyBpbiBDb25zb2xlIC8gT2JqZWN0VHJlZQorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU2NTY2CisgICAgICAgIDxyZGFyOi8v cHJvYmxlbS8xNjM5MjM2NT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIGluc3BlY3Rvci9jb25zb2xlL2NvbnNvbGUtdGFibGUtZXhwZWN0ZWQudHh0 OgorICAgICAgICAqIGluc3BlY3Rvci9tb2RlbC9yZW1vdGUtb2JqZWN0Lmh0bWw6CisgICAgICAg ICogcGxhdGZvcm0vbWFjL2luc3BlY3Rvci9tb2RlbC9yZW1vdGUtb2JqZWN0LWV4cGVjdGVkLnR4 dDoKKyAgICAgICAgTW9yZSB2YWx1ZXMgYXJlIHRyZWF0ZWQgYXMgbm90LWxvc3NsZXNzIGFuZCB0 aGVyZWZvcmUgZXhwYW5kYWJsZS4KKwogMjAxNi0wNC0xMiAgSm9zZXBoIFBlY29yYXJvICA8cGVj b3Jhcm9AYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IFNob3VsZCBiZSBhYmxl IHRvIGV4cGFuZCBPYmplY3RzIGluIEhlYXAgQWxsb2NhdGlvbnMgVmlldyB0byBzZWUgZXhhY3Rs eSB3aGF0IGl0IHJldGFpbnMKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9jb25z b2xlL2NvbnNvbGUtdGFibGUtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2Nv bnNvbGUvY29uc29sZS10YWJsZS1leHBlY3RlZC50eHQKaW5kZXggNzE1ZTU2ZC4uMTVmMzE3YiAx MDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2NvbnNvbGUvY29uc29sZS10YWJsZS1l eHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2NvbnNvbGUvY29uc29sZS10 YWJsZS1leHBlY3RlZC50eHQKQEAgLTI5Miw3ICsyOTIsNyBAQCBTVEVQOiBjb25zb2xlLnRhYmxl KFtqb2huLCBqYW5lLCBlbWlseV0pCiAgICAgICAgICJfdHlwZSI6ICJvYmplY3QiLAogICAgICAg ICAiX3N1YnR5cGUiOiAiYXJyYXkiLAogICAgICAgICAiX2Rlc2NyaXB0aW9uIjogIkFycmF5IiwK LSAgICAgICAgIl9sb3NzbGVzcyI6IHRydWUsCisgICAgICAgICJfbG9zc2xlc3MiOiBmYWxzZSwK ICAgICAgICAgIl9vdmVyZmxvdyI6IGZhbHNlLAogICAgICAgICAiX3NpemUiOiAzLAogICAgICAg ICAiX3Byb3BlcnRpZXMiOiBbCkBAIC0zMDQsNyArMzA0LDcgQEAgU1RFUDogY29uc29sZS50YWJs ZShbam9obiwgamFuZSwgZW1pbHldKQogICAgICAgICAgICAgICAiX2xpc3RlbmVycyI6IG51bGws CiAgICAgICAgICAgICAgICJfdHlwZSI6ICJvYmplY3QiLAogICAgICAgICAgICAgICAiX2Rlc2Ny aXB0aW9uIjogIlBlcnNvbiIsCi0gICAgICAgICAgICAgICJfbG9zc2xlc3MiOiB0cnVlLAorICAg ICAgICAgICAgICAiX2xvc3NsZXNzIjogZmFsc2UsCiAgICAgICAgICAgICAgICJfb3ZlcmZsb3ci OiBmYWxzZSwKICAgICAgICAgICAgICAgIl9wcm9wZXJ0aWVzIjogWwogICAgICAgICAgICAgICAg IHsKQEAgLTMzMSw3ICszMzEsNyBAQCBTVEVQOiBjb25zb2xlLnRhYmxlKFtqb2huLCBqYW5lLCBl bWlseV0pCiAgICAgICAgICAgICAgICJfbGlzdGVuZXJzIjogbnVsbCwKICAgICAgICAgICAgICAg Il90eXBlIjogIm9iamVjdCIsCiAgICAgICAgICAgICAgICJfZGVzY3JpcHRpb24iOiAiUGVyc29u IiwKLSAgICAgICAgICAgICAgIl9sb3NzbGVzcyI6IHRydWUsCisgICAgICAgICAgICAgICJfbG9z c2xlc3MiOiBmYWxzZSwKICAgICAgICAgICAgICAgIl9vdmVyZmxvdyI6IGZhbHNlLAogICAgICAg ICAgICAgICAiX3Byb3BlcnRpZXMiOiBbCiAgICAgICAgICAgICAgICAgewpAQCAtMzU4LDcgKzM1 OCw3IEBAIFNURVA6IGNvbnNvbGUudGFibGUoW2pvaG4sIGphbmUsIGVtaWx5XSkKICAgICAgICAg ICAgICAgIl9saXN0ZW5lcnMiOiBudWxsLAogICAgICAgICAgICAgICAiX3R5cGUiOiAib2JqZWN0 IiwKICAgICAgICAgICAgICAgIl9kZXNjcmlwdGlvbiI6ICJQZXJzb24iLAotICAgICAgICAgICAg ICAiX2xvc3NsZXNzIjogdHJ1ZSwKKyAgICAgICAgICAgICAgIl9sb3NzbGVzcyI6IGZhbHNlLAog ICAgICAgICAgICAgICAiX292ZXJmbG93IjogZmFsc2UsCiAgICAgICAgICAgICAgICJfcHJvcGVy dGllcyI6IFsKICAgICAgICAgICAgICAgICB7CkBAIC00MTAsNyArNDEwLDcgQEAgU1RFUDogY29u c29sZS50YWJsZShbam9obiwgamFuZSwgZW1pbHldLCBbJ2ZpcnN0TmFtZSddKQogICAgICAgICAi X3R5cGUiOiAib2JqZWN0IiwKICAgICAgICAgIl9zdWJ0eXBlIjogImFycmF5IiwKICAgICAgICAg Il9kZXNjcmlwdGlvbiI6ICJBcnJheSIsCi0gICAgICAgICJfbG9zc2xlc3MiOiB0cnVlLAorICAg ICAgICAiX2xvc3NsZXNzIjogZmFsc2UsCiAgICAgICAgICJfb3ZlcmZsb3ciOiBmYWxzZSwKICAg ICAgICAgIl9zaXplIjogMywKICAgICAgICAgIl9wcm9wZXJ0aWVzIjogWwpAQCAtNDIyLDcgKzQy Miw3IEBAIFNURVA6IGNvbnNvbGUudGFibGUoW2pvaG4sIGphbmUsIGVtaWx5XSwgWydmaXJzdE5h bWUnXSkKICAgICAgICAgICAgICAgIl9saXN0ZW5lcnMiOiBudWxsLAogICAgICAgICAgICAgICAi X3R5cGUiOiAib2JqZWN0IiwKICAgICAgICAgICAgICAgIl9kZXNjcmlwdGlvbiI6ICJQZXJzb24i LAotICAgICAgICAgICAgICAiX2xvc3NsZXNzIjogdHJ1ZSwKKyAgICAgICAgICAgICAgIl9sb3Nz bGVzcyI6IGZhbHNlLAogICAgICAgICAgICAgICAiX292ZXJmbG93IjogZmFsc2UsCiAgICAgICAg ICAgICAgICJfcHJvcGVydGllcyI6IFsKICAgICAgICAgICAgICAgICB7CkBAIC00NDksNyArNDQ5 LDcgQEAgU1RFUDogY29uc29sZS50YWJsZShbam9obiwgamFuZSwgZW1pbHldLCBbJ2ZpcnN0TmFt ZSddKQogICAgICAgICAgICAgICAiX2xpc3RlbmVycyI6IG51bGwsCiAgICAgICAgICAgICAgICJf dHlwZSI6ICJvYmplY3QiLAogICAgICAgICAgICAgICAiX2Rlc2NyaXB0aW9uIjogIlBlcnNvbiIs Ci0gICAgICAgICAgICAgICJfbG9zc2xlc3MiOiB0cnVlLAorICAgICAgICAgICAgICAiX2xvc3Ns ZXNzIjogZmFsc2UsCiAgICAgICAgICAgICAgICJfb3ZlcmZsb3ciOiBmYWxzZSwKICAgICAgICAg ICAgICAgIl9wcm9wZXJ0aWVzIjogWwogICAgICAgICAgICAgICAgIHsKQEAgLTQ3Niw3ICs0NzYs NyBAQCBTVEVQOiBjb25zb2xlLnRhYmxlKFtqb2huLCBqYW5lLCBlbWlseV0sIFsnZmlyc3ROYW1l J10pCiAgICAgICAgICAgICAgICJfbGlzdGVuZXJzIjogbnVsbCwKICAgICAgICAgICAgICAgIl90 eXBlIjogIm9iamVjdCIsCiAgICAgICAgICAgICAgICJfZGVzY3JpcHRpb24iOiAiUGVyc29uIiwK LSAgICAgICAgICAgICAgIl9sb3NzbGVzcyI6IHRydWUsCisgICAgICAgICAgICAgICJfbG9zc2xl c3MiOiBmYWxzZSwKICAgICAgICAgICAgICAgIl9vdmVyZmxvdyI6IGZhbHNlLAogICAgICAgICAg ICAgICAiX3Byb3BlcnRpZXMiOiBbCiAgICAgICAgICAgICAgICAgewpkaWZmIC0tZ2l0IGEvTGF5 b3V0VGVzdHMvaW5zcGVjdG9yL21vZGVsL3JlbW90ZS1vYmplY3QuaHRtbCBiL0xheW91dFRlc3Rz L2luc3BlY3Rvci9tb2RlbC9yZW1vdGUtb2JqZWN0Lmh0bWwKaW5kZXggYWJjZDkzYS4uMmIyOTYy ZCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL21vZGVsL3JlbW90ZS1vYmplY3Qu aHRtbAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvbW9kZWwvcmVtb3RlLW9iamVjdC5odG1s CkBAIC0xNzUsNiArMTc1LDcgQEAgZnVuY3Rpb24gdGVzdCgpCiAKICAgICAgICAge2V4cHJlc3Np b246ICJQZXJzb24gPSBjbGFzcyBQZXJzb24geyBjb25zdHJ1Y3RvcihuYW1lKXt9IGdldCBmdWxs TmFtZSgpe30gbWV0aG9kTmFtZShwMSwgcDIpe30gfTsgUGVyc29uIn0sIC8vIENvbnN0cnVjdG9y ID0+IGNsYXNzIHR5cGUKICAgICAgICAge2V4cHJlc3Npb246ICJQZXJzb24ucHJvdG90eXBlLm1l dGhvZE5hbWUifSwgLy8gTWV0aG9kID0+IGp1c3QgYSBmdW5jdGlvbiB0eXBlCisgICAgICAgIHtl eHByZXNzaW9uOiAibmV3IFBlcnNvbiJ9LCAvLyBJbnN0YW5jZSwgbm90IGxvc3NsZXNzLCBpdCdz IHByb3RvdHlwZSBtYXkgaGF2ZSBpbnRlcmVzdGluZyBtZXRob2RzIHRvIHNob3cKICAgICAgICAg e2V4cHJlc3Npb246ICJBbHBoYSA9IGNsYXNzIEEgeyBtZXRob2RBKCl7fSB9OyBCZXRhID0gY2xh c3MgQiBleHRlbmRzIEFscGhhIHsgbWV0aG9kQigpe30gfTsgQmV0YSJ9LAogICAgICAgICB7ZXhw cmVzc2lvbjogIltCZXRhXSJ9LAogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9t YWMvaW5zcGVjdG9yL21vZGVsL3JlbW90ZS1vYmplY3QtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVz dHMvcGxhdGZvcm0vbWFjL2luc3BlY3Rvci9tb2RlbC9yZW1vdGUtb2JqZWN0LWV4cGVjdGVkLnR4 dAppbmRleCBiNGIzM2RhLi44ZGI3YzRjIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9y bS9tYWMvaW5zcGVjdG9yL21vZGVsL3JlbW90ZS1vYmplY3QtZXhwZWN0ZWQudHh0CisrKyBiL0xh eW91dFRlc3RzL3BsYXRmb3JtL21hYy9pbnNwZWN0b3IvbW9kZWwvcmVtb3RlLW9iamVjdC1leHBl Y3RlZC50eHQKQEAgLTExMjAsNyArMTEyMCw3IEBAIEVYUFJFU1NJT046IG5ldyBJbnQzMkFycmF5 KG5ldyBBcnJheUJ1ZmZlcigxNikpCiAgICAgIl90eXBlIjogIm9iamVjdCIsCiAgICAgIl9zdWJ0 eXBlIjogImFycmF5IiwKICAgICAiX2Rlc2NyaXB0aW9uIjogIkludDMyQXJyYXkiLAotICAgICJf bG9zc2xlc3MiOiB0cnVlLAorICAgICJfbG9zc2xlc3MiOiBmYWxzZSwKICAgICAiX292ZXJmbG93 IjogZmFsc2UsCiAgICAgIl9zaXplIjogNCwKICAgICAiX3Byb3BlcnRpZXMiOiBbCkBAIC0xMTY2 LDcgKzExNjYsNyBAQCBFWFBSRVNTSU9OOiB2YXIgaW50QXJyYXkgPSBuZXcgSW50MzJBcnJheShu ZXcgQXJyYXlCdWZmZXIoMTYpKTsgZm9yICh2YXIgaSA9IDA7CiAgICAgIl90eXBlIjogIm9iamVj dCIsCiAgICAgIl9zdWJ0eXBlIjogImFycmF5IiwKICAgICAiX2Rlc2NyaXB0aW9uIjogIkludDMy QXJyYXkiLAotICAgICJfbG9zc2xlc3MiOiB0cnVlLAorICAgICJfbG9zc2xlc3MiOiBmYWxzZSwK ICAgICAiX292ZXJmbG93IjogZmFsc2UsCiAgICAgIl9zaXplIjogNCwKICAgICAiX3Byb3BlcnRp ZXMiOiBbCkBAIC0xNDgxLDcgKzE0ODEsNyBAQCBFWFBSRVNTSU9OOiBmdW5jdGlvbiBGb28oKSB7 fTsgbmV3IEZvbwogICAgICJfbGlzdGVuZXJzIjogbnVsbCwKICAgICAiX3R5cGUiOiAib2JqZWN0 IiwKICAgICAiX2Rlc2NyaXB0aW9uIjogIkZvbyIsCi0gICAgIl9sb3NzbGVzcyI6IHRydWUsCisg ICAgIl9sb3NzbGVzcyI6IGZhbHNlLAogICAgICJfb3ZlcmZsb3ciOiBmYWxzZSwKICAgICAiX3By b3BlcnRpZXMiOiBbXSwKICAgICAiX2VudHJpZXMiOiBudWxsCkBAIC0xNDk4LDcgKzE0OTgsNyBA QCBFWFBSRVNTSU9OOiB2YXIgRm9vMiA9IGZ1bmN0aW9uKCkge307IG5ldyBGb28yCiAgICAgIl9s aXN0ZW5lcnMiOiBudWxsLAogICAgICJfdHlwZSI6ICJvYmplY3QiLAogICAgICJfZGVzY3JpcHRp b24iOiAiRm9vMiIsCi0gICAgIl9sb3NzbGVzcyI6IHRydWUsCisgICAgIl9sb3NzbGVzcyI6IGZh bHNlLAogICAgICJfb3ZlcmZsb3ciOiBmYWxzZSwKICAgICAiX3Byb3BlcnRpZXMiOiBbXSwKICAg ICAiX2VudHJpZXMiOiBudWxsCkBAIC0xNTE1LDcgKzE1MTUsNyBAQCBFWFBSRVNTSU9OOiB2YXIg bmFtZXNwYWNlID0ge307IG5hbWVzcGFjZS5Gb28zID0gZnVuY3Rpb24oKSB7fTsgbmV3IG5hbWVz cGFjZS5GbwogICAgICJfbGlzdGVuZXJzIjogbnVsbCwKICAgICAiX3R5cGUiOiAib2JqZWN0IiwK ICAgICAiX2Rlc2NyaXB0aW9uIjogIkZvbzMiLAotICAgICJfbG9zc2xlc3MiOiB0cnVlLAorICAg ICJfbG9zc2xlc3MiOiBmYWxzZSwKICAgICAiX292ZXJmbG93IjogZmFsc2UsCiAgICAgIl9wcm9w ZXJ0aWVzIjogW10sCiAgICAgIl9lbnRyaWVzIjogbnVsbApAQCAtMTU2Nyw3ICsxNTY3LDcgQEAg RVhQUkVTU0lPTjogZnVuY3Rpb24gQmFyMigpIHsgdGhpcy5feCA9IDUgfTsgQmFyLnByb3RvdHlw ZSA9IHtnZXQgeCgpIHtyZXR1cm4gdGgKICAgICAiX2xpc3RlbmVycyI6IG51bGwsCiAgICAgIl90 eXBlIjogIm9iamVjdCIsCiAgICAgIl9kZXNjcmlwdGlvbiI6ICJCYXIyIiwKLSAgICAiX2xvc3Ns ZXNzIjogdHJ1ZSwKKyAgICAiX2xvc3NsZXNzIjogZmFsc2UsCiAgICAgIl9vdmVyZmxvdyI6IGZh bHNlLAogICAgICJfcHJvcGVydGllcyI6IFsKICAgICAgIHsKQEAgLTE2NDAsNyArMTY0MCw3IEBA IEVYUFJFU1NJT046IG5ldyBBcnJheUJ1ZmZlcigxNikKICAgICAiX2xpc3RlbmVycyI6IG51bGws CiAgICAgIl90eXBlIjogIm9iamVjdCIsCiAgICAgIl9kZXNjcmlwdGlvbiI6ICJBcnJheUJ1ZmZl ciIsCi0gICAgIl9sb3NzbGVzcyI6IHRydWUsCisgICAgIl9sb3NzbGVzcyI6IGZhbHNlLAogICAg ICJfb3ZlcmZsb3ciOiBmYWxzZSwKICAgICAiX3Byb3BlcnRpZXMiOiBbCiAgICAgICB7CkBAIC0x NjY0LDcgKzE2NjQsNyBAQCBFWFBSRVNTSU9OOiBuZXcgRGF0YVZpZXcobmV3IEFycmF5QnVmZmVy KDE2KSkKICAgICAiX2xpc3RlbmVycyI6IG51bGwsCiAgICAgIl90eXBlIjogIm9iamVjdCIsCiAg ICAgIl9kZXNjcmlwdGlvbiI6ICJEYXRhVmlldyIsCi0gICAgIl9sb3NzbGVzcyI6IHRydWUsCisg ICAgIl9sb3NzbGVzcyI6IGZhbHNlLAogICAgICJfb3ZlcmZsb3ciOiBmYWxzZSwKICAgICAiX3By b3BlcnRpZXMiOiBbCiAgICAgICB7CkBAIC0xNjc4LDYgKzE2NzgsMTIgQEAgRVhQUkVTU0lPTjog bmV3IERhdGFWaWV3KG5ldyBBcnJheUJ1ZmZlcigxNikpCiAgICAgICAgICJfbmFtZSI6ICJieXRl TGVuZ3RoIiwKICAgICAgICAgIl90eXBlIjogIm51bWJlciIsCiAgICAgICAgICJfdmFsdWUiOiAi MTYiCisgICAgICB9LAorICAgICAgeworICAgICAgICAiX2xpc3RlbmVycyI6IG51bGwsCisgICAg ICAgICJfbmFtZSI6ICJidWZmZXIiLAorICAgICAgICAiX3R5cGUiOiAib2JqZWN0IiwKKyAgICAg ICAgIl92YWx1ZSI6ICJBcnJheUJ1ZmZlciIKICAgICAgIH0KICAgICBdLAogICAgICJfZW50cmll cyI6IG51bGwKQEAgLTIyOTcsNyArMjMwMyw3IEBAIEVYUFJFU1NJT046IGVycm9yID0gbnVsbDsg dHJ5IHsgW10ueC54OyB9IGNhdGNoIChlKSB7IGVycm9yID0gZTsgfTsgZXJyb3IKICAgICAiX3R5 cGUiOiAib2JqZWN0IiwKICAgICAiX3N1YnR5cGUiOiAiZXJyb3IiLAogICAgICJfZGVzY3JpcHRp b24iOiAiVHlwZUVycm9yOiB1bmRlZmluZWQgaXMgbm90IGFuIG9iamVjdCAoZXZhbHVhdGluZyAn W10ueC54JykiLAotICAgICJfbG9zc2xlc3MiOiB0cnVlLAorICAgICJfbG9zc2xlc3MiOiBmYWxz ZSwKICAgICAiX292ZXJmbG93IjogZmFsc2UsCiAgICAgIl9wcm9wZXJ0aWVzIjogWwogICAgICAg ewpAQCAtMjM0MSw3ICsyMzQ3LDcgQEAgRVhQUkVTU0lPTjogZXJyb3IgPSBudWxsOyB0cnkgeyBl dmFsKCdpZigpJyk7IH0gY2F0Y2ggKGUpIHsgZXJyb3IgPSBlOyB9OyBlcnJvcgogICAgICJfdHlw ZSI6ICJvYmplY3QiLAogICAgICJfc3VidHlwZSI6ICJlcnJvciIsCiAgICAgIl9kZXNjcmlwdGlv biI6ICJTeW50YXhFcnJvcjogVW5leHBlY3RlZCB0b2tlbiAnKSciLAotICAgICJfbG9zc2xlc3Mi OiB0cnVlLAorICAgICJfbG9zc2xlc3MiOiBmYWxzZSwKICAgICAiX292ZXJmbG93IjogZmFsc2Us CiAgICAgIl9wcm9wZXJ0aWVzIjogWwogICAgICAgewpAQCAtNDQ5Miw3ICs0NDk4LDcgQEAgRVhQ UkVTU0lPTjogbmV3IFByb21pc2UoZnVuY3Rpb24oKXt9KQogICAgICJfbGlzdGVuZXJzIjogbnVs bCwKICAgICAiX3R5cGUiOiAib2JqZWN0IiwKICAgICAiX2Rlc2NyaXB0aW9uIjogIlByb21pc2Ui LAotICAgICJfbG9zc2xlc3MiOiB0cnVlLAorICAgICJfbG9zc2xlc3MiOiBmYWxzZSwKICAgICAi X292ZXJmbG93IjogZmFsc2UsCiAgICAgIl9wcm9wZXJ0aWVzIjogWwogICAgICAgewpAQCAtNDUx Nyw3ICs0NTIzLDcgQEAgRVhQUkVTU0lPTjogUHJvbWlzZS5yZWplY3QoKQogICAgICJfbGlzdGVu ZXJzIjogbnVsbCwKICAgICAiX3R5cGUiOiAib2JqZWN0IiwKICAgICAiX2Rlc2NyaXB0aW9uIjog IlByb21pc2UiLAotICAgICJfbG9zc2xlc3MiOiB0cnVlLAorICAgICJfbG9zc2xlc3MiOiBmYWxz ZSwKICAgICAiX292ZXJmbG93IjogZmFsc2UsCiAgICAgIl9wcm9wZXJ0aWVzIjogWwogICAgICAg ewpAQCAtNDU0OSw3ICs0NTU1LDcgQEAgRVhQUkVTU0lPTjogUHJvbWlzZS5yZWplY3QoJ3Jlc3Vs dCcpCiAgICAgIl9saXN0ZW5lcnMiOiBudWxsLAogICAgICJfdHlwZSI6ICJvYmplY3QiLAogICAg ICJfZGVzY3JpcHRpb24iOiAiUHJvbWlzZSIsCi0gICAgIl9sb3NzbGVzcyI6IHRydWUsCisgICAg Il9sb3NzbGVzcyI6IGZhbHNlLAogICAgICJfb3ZlcmZsb3ciOiBmYWxzZSwKICAgICAiX3Byb3Bl cnRpZXMiOiBbCiAgICAgICB7CkBAIC00NTgxLDcgKzQ1ODcsNyBAQCBFWFBSRVNTSU9OOiBQcm9t aXNlLnJlc29sdmUoKQogICAgICJfbGlzdGVuZXJzIjogbnVsbCwKICAgICAiX3R5cGUiOiAib2Jq ZWN0IiwKICAgICAiX2Rlc2NyaXB0aW9uIjogIlByb21pc2UiLAotICAgICJfbG9zc2xlc3MiOiB0 cnVlLAorICAgICJfbG9zc2xlc3MiOiBmYWxzZSwKICAgICAiX292ZXJmbG93IjogZmFsc2UsCiAg ICAgIl9wcm9wZXJ0aWVzIjogWwogICAgICAgewpAQCAtNDYxMyw3ICs0NjE5LDcgQEAgRVhQUkVT U0lPTjogUHJvbWlzZS5yZXNvbHZlKHtyZXN1bHQ6MX0pCiAgICAgIl9saXN0ZW5lcnMiOiBudWxs LAogICAgICJfdHlwZSI6ICJvYmplY3QiLAogICAgICJfZGVzY3JpcHRpb24iOiAiUHJvbWlzZSIs Ci0gICAgIl9sb3NzbGVzcyI6IHRydWUsCisgICAgIl9sb3NzbGVzcyI6IGZhbHNlLAogICAgICJf b3ZlcmZsb3ciOiBmYWxzZSwKICAgICAiX3Byb3BlcnRpZXMiOiBbCiAgICAgICB7CkBAIC00NzU0 LDYgKzQ3NjAsMjMgQEAgRVhQUkVTU0lPTjogUGVyc29uLnByb3RvdHlwZS5tZXRob2ROYW1lCiB9 CiAKIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t CitFWFBSRVNTSU9OOiBuZXcgUGVyc29uCit7CisgICJfdHlwZSI6ICJvYmplY3QiLAorICAiX29i amVjdElkIjogIjxmaWx0ZXJlZD4iLAorICAiX2Rlc2NyaXB0aW9uIjogIlBlcnNvbiIsCisgICJf cHJldmlldyI6IHsKKyAgICAiX2xpc3RlbmVycyI6IG51bGwsCisgICAgIl90eXBlIjogIm9iamVj dCIsCisgICAgIl9kZXNjcmlwdGlvbiI6ICJQZXJzb24iLAorICAgICJfbG9zc2xlc3MiOiBmYWxz ZSwKKyAgICAiX292ZXJmbG93IjogZmFsc2UsCisgICAgIl9wcm9wZXJ0aWVzIjogW10sCisgICAg Il9lbnRyaWVzIjogbnVsbAorICB9Cit9CisKKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiBFWFBSRVNTSU9OOiBBbHBoYSA9IGNsYXNzIEEgeyBt ZXRob2RBKCl7fSB9OyBCZXRhID0gY2xhc3MgQiBleHRlbmRzIEFscGhhIHsgbWV0aG9kQigpe30g fTsgQmV0YQogewogICAiX3R5cGUiOiAiZnVuY3Rpb24iLApkaWZmIC0tZ2l0IGEvU291cmNlL0ph dmFTY3JpcHRDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cK aW5kZXggNjZlMDdmNC4uOWM0YjRiNCAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3Jl L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMTYgQEAKKzIwMTYtMDQtMTMgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNv bT4KKworICAgICAgICBKU0NvbnRleHQgSW5zcGVjdG9yOiBJbXByb3ZlIENsYXNzIGluc3RhbmNl cyBhbmQgSlNDIEFQSSBFeHBvcnRlZCBWYWx1ZXMgdmlldyBpbiBDb25zb2xlIC8gT2JqZWN0VHJl ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU2NTY2 CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xNjM5MjM2NT4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGluc3BlY3Rvci9JbmplY3RlZFNjcmlwdFNv dXJjZS5qczoKKyAgICAgICAgKEluamVjdGVkU2NyaXB0LlJlbW90ZU9iamVjdC5wcm90b3R5cGUu X2FwcGVuZFByb3BlcnR5UHJldmlld3MpOgorICAgICAgICBUcmVhdCBub24tYmFzaWMgb2JqZWN0 IHR5cGVzIGFzIG5vdCBsb3NzbGVzcyBzbyB0aGV5IGNhbiBiZSBleHBhbmRlZC4KKyAgICAgICAg U2hvdyBub24tZW51bWVyYWJsZSBuYXRpdmUgZ2V0dGVycyBpbiBPYmplY3QgcHJldmlld3MuCisK IDIwMTYtMDQtMTEgIEZpbGlwIFBpemxvICA8ZnBpemxvQGFwcGxlLmNvbT4KIAogICAgICAgICBQ b2x5bW9ycGhpY0FjY2VzcyBzaG91bGQgYnVmZmVyIEFjY2Vzc0Nhc2VzIGJlZm9yZSByZWdlbmVy YXRpbmcKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvSW5qZWN0 ZWRTY3JpcHRTb3VyY2UuanMgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL0luamVj dGVkU2NyaXB0U291cmNlLmpzCmluZGV4IDdmMjYxOGUuLjI0MjczYzIgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvSW5qZWN0ZWRTY3JpcHRTb3VyY2UuanMKKysr IGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9JbmplY3RlZFNjcmlwdFNvdXJjZS5q cwpAQCAtMTEyOCwxNSArMTEyOCwyNCBAQCBJbmplY3RlZFNjcmlwdC5SZW1vdGVPYmplY3QucHJv dG90eXBlID0gewogCiAgICAgICAgICAgICAvLyBEbyBub3Qgc2hvdyAiX19wcm90b19fIiBpbiBw cmV2aWV3LgogICAgICAgICAgICAgdmFyIG5hbWUgPSBkZXNjcmlwdG9yLm5hbWU7Ci0gICAgICAg ICAgICBpZiAobmFtZSA9PT0gIl9fcHJvdG9fXyIpCisgICAgICAgICAgICBpZiAobmFtZSA9PT0g Il9fcHJvdG9fXyIpIHsKKyAgICAgICAgICAgICAgICAvLyBOb24gYmFzaWMgX19wcm90b19fIG9i amVjdHMgbWF5IGhhdmUgaW50ZXJlc3RpbmcsIG5vbi1lbnVtZXJhYmxlLCBtZXRob2RzIHRvIHNo b3cuCisgICAgICAgICAgICAgICAgaWYgKGRlc2NyaXB0b3IudmFsdWUgJiYgZGVzY3JpcHRvci52 YWx1ZS5jb25zdHJ1Y3RvcgorICAgICAgICAgICAgICAgICAgICAmJiBkZXNjcmlwdG9yLnZhbHVl LmNvbnN0cnVjdG9yICE9PSBPYmplY3QKKyAgICAgICAgICAgICAgICAgICAgJiYgZGVzY3JpcHRv ci52YWx1ZS5jb25zdHJ1Y3RvciAhPT0gQXJyYXkKKyAgICAgICAgICAgICAgICAgICAgJiYgZGVz Y3JpcHRvci52YWx1ZS5jb25zdHJ1Y3RvciAhPT0gUmVnRXhwKQorICAgICAgICAgICAgICAgICAg ICBwcmV2aWV3Lmxvc3NsZXNzID0gZmFsc2U7CiAgICAgICAgICAgICAgICAgY29udGludWU7Cisg ICAgICAgICAgICB9CiAKICAgICAgICAgICAgIC8vIEZvciBhcnJheXMsIG9ubHkgYWxsb3cgaW5k ZXhlcy4KICAgICAgICAgICAgIGlmICh0aGlzLnN1YnR5cGUgPT09ICJhcnJheSIgJiYgIWlzVUlu dDMyKG5hbWUpKQogICAgICAgICAgICAgICAgIGNvbnRpbnVlOwogCi0gICAgICAgICAgICAvLyBE byBub3Qgc2hvdyBub24tZW51bWVyYWJsZSBub24tb3duIHByb3BlcnRpZXMuIFNwZWNpYWwgY2Fz ZSB0byBhbGxvdyBhcnJheSBpbmRleGVzIHRoYXQgbWF5IGJlIG9uIHRoZSBwcm90b3R5cGUuCi0g ICAgICAgICAgICBpZiAoIWRlc2NyaXB0b3IuZW51bWVyYWJsZSAmJiAhZGVzY3JpcHRvci5pc093 biAmJiB0aGlzLnN1YnR5cGUgIT09ICJhcnJheSIpCisgICAgICAgICAgICAvLyBEbyBub3Qgc2hv dyBub24tZW51bWVyYWJsZSBub24tb3duIHByb3BlcnRpZXMuCisgICAgICAgICAgICAvLyBTcGVj aWFsIGNhc2UgdG8gYWxsb3cgYXJyYXkgaW5kZXhlcyB0aGF0IG1heSBiZSBvbiB0aGUgcHJvdG90 eXBlLgorICAgICAgICAgICAgLy8gU3BlY2lhbCBjYXNlIHRvIGFsbG93IG5hdGl2ZSBnZXR0ZXJz IG9uIG5vbi1SZWdFeHAgb2JqZWN0cy4KKyAgICAgICAgICAgIGlmICghZGVzY3JpcHRvci5lbnVt ZXJhYmxlICYmICFkZXNjcmlwdG9yLmlzT3duICYmICEodGhpcy5zdWJ0eXBlID09PSAiYXJyYXki IHx8ICh0aGlzLnN1YnR5cGUgIT09ICJyZWdleHAiICYmIGRlc2NyaXB0b3IubmF0aXZlR2V0dGVy KSkpCiAgICAgICAgICAgICAgICAgY29udGludWU7CiAKICAgICAgICAgICAgIC8vIElmIHdlIGhh dmUgYSBmaWx0ZXIsIG9ubHkgc2hvdyBwcm9wZXJ0aWVzIGluIHRoZSBmaWx0ZXIuCg==