200935 2019-08-20 12:26:46 -0700 Web Inspector: Address a few Esprima issues preventing pretty printing of resources 2019-08-20 16:48:16 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck joepeck commit-queue inspector-bugzilla-changes joepeck simon.fraser timothy webkit-bug-importer oldest_to_newest 1563183 0 joepeck 2019-08-20 12:26:46 -0700 Address a few Esprima issues preventing pretty printing of resources 1563184 1 376789 joepeck 2019-08-20 12:29:38 -0700 Created attachment 376789 [PATCH] Proposed Fix 1563300 2 376789 commit-queue 2019-08-20 16:47:09 -0700 Comment on attachment 376789 [PATCH] Proposed Fix Clearing flags on attachment: 376789 Committed r248923: <https://trac.webkit.org/changeset/248923> 1563301 3 commit-queue 2019-08-20 16:47:11 -0700 All reviewed patches have been landed. Closing bug. 1563303 4 webkit-bug-importer 2019-08-20 16:48:16 -0700 <rdar://problem/54534614> 376789 2019-08-20 12:29:38 -0700 2019-08-20 16:47:09 -0700 [PATCH] Proposed Fix esprima-1.patch text/plain 3913 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDkyNTEyN2RkY2Y3Li5hODM2NWUwMGU2MyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTktMDgtMjAgIEpvc2Vw aCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9y OiBBZGRyZXNzIGEgZmV3IEVzcHJpbWEgaXNzdWVzIHByZXZlbnRpbmcgcHJldHR5IHByaW50aW5n IG9mIHJlc291cmNlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjAwOTM1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgQWRkcmVzcyBhIGZldyBFc3ByaW1hIGlzc3VlczoKKworICAgICAgICAgICAgSXNzdWUg IzE5OTEgLSBGYWlsdXJlIHRvIHBhcnNlIHRlbXBsYXRlIGxpdGVyYWwgd2l0aCBkZXN0cnVjdHVy aW5nIGFzc2lnbm1lbnQgZXhwcmVzc2lvbgorICAgICAgICAgICAgaHR0cHM6Ly9naXRodWIuY29t L2pxdWVyeS9lc3ByaW1hL2lzc3Vlcy8xOTkxCisKKyAgICAgICAgICAgIElzc3VlICMxOTIwIC0g SW52YWxpZCBMZWZ0IEhhbmQgU2lkZSBpbiBmb3ItaW4KKyAgICAgICAgICAgIGh0dHBzOi8vZ2l0 aHViLmNvbS9qcXVlcnkvZXNwcmltYS9pc3N1ZXMvMTkyMAorCisgICAgICAgICogVXNlckludGVy ZmFjZS9FeHRlcm5hbC9Fc3ByaW1hL2VzcHJpbWEuanM6CisKIDIwMTktMDgtMjAgIEpvc2VwaCBQ ZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBT b3VyY2VzOiBHaXZlIE9yaWdpbnMgdGhlaXIgb3duIGljb24gaW4gdGhlIFNvdXJjZXMgc2lkZWJh cgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvRXh0ZXJu YWwvRXNwcmltYS9lc3ByaW1hLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvRXh0ZXJuYWwvRXNwcmltYS9lc3ByaW1hLmpzCmluZGV4IDAwNGE3ODUyMzg1Li5kOGVmOGVi NDIxOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvRXh0 ZXJuYWwvRXNwcmltYS9lc3ByaW1hLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL0V4dGVybmFsL0VzcHJpbWEvZXNwcmltYS5qcwpAQCAtMzc4NCw2ICszNzg0LDkg QEAgcmV0dXJuIC8qKioqKiovIChmdW5jdGlvbihtb2R1bGVzKSB7IC8vIHdlYnBhY2tCb290c3Ry YXAKICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgZWxzZSB7CiAgICAgICAgICAg ICAgICAgICAgIGNvbnN0IGluaXRTdGFydFRva2VuID0gdGhpcy5sb29rYWhlYWQ7CisgICAgICAg ICAgICAgICAgICAgIGNvbnN0IHByZXZpb3VzSXNCaW5kaW5nRWxlbWVudCA9IHRoaXMuY29udGV4 dC5pc0JpbmRpbmdFbGVtZW50OworICAgICAgICAgICAgICAgICAgICBjb25zdCBwcmV2aW91c0lz QXNzaWdubWVudFRhcmdldCA9IHRoaXMuY29udGV4dC5pc0Fzc2lnbm1lbnRUYXJnZXQ7CisgICAg ICAgICAgICAgICAgICAgIGNvbnN0IHByZXZpb3VzRmlyc3RDb3ZlckluaXRpYWxpemVkTmFtZUVy cm9yID0gdGhpcy5jb250ZXh0LmZpcnN0Q292ZXJJbml0aWFsaXplZE5hbWVFcnJvcjsKICAgICAg ICAgICAgICAgICAgICAgY29uc3QgcHJldmlvdXNBbGxvd0luID0gdGhpcy5jb250ZXh0LmFsbG93 SW47CiAgICAgICAgICAgICAgICAgICAgIHRoaXMuY29udGV4dC5hbGxvd0luID0gZmFsc2U7CiAg ICAgICAgICAgICAgICAgICAgIGluaXQgPSB0aGlzLmluaGVyaXRDb3ZlckdyYW1tYXIodGhpcy5w YXJzZUFzc2lnbm1lbnRFeHByZXNzaW9uKTsKQEAgLTM4MTMsNiArMzgxNiwxMCBAQCByZXR1cm4g LyoqKioqKi8gKGZ1bmN0aW9uKG1vZHVsZXMpIHsgLy8gd2VicGFja0Jvb3RzdHJhcAogICAgICAg ICAgICAgICAgICAgICAgICAgZm9ySW4gPSBmYWxzZTsKICAgICAgICAgICAgICAgICAgICAgfQog ICAgICAgICAgICAgICAgICAgICBlbHNlIHsKKyAgICAgICAgICAgICAgICAgICAgICAgIC8vIFRo ZSBgaW5pdGAgbm9kZSB3YXMgbm90IHBhcnNlZCBpc29sYXRlZCwgYnV0IHdlIHdvdWxkIGhhdmUg d2FudGVkIGl0IHRvLgorICAgICAgICAgICAgICAgICAgICAgICAgdGhpcy5jb250ZXh0LmlzQmlu ZGluZ0VsZW1lbnQgPSBwcmV2aW91c0lzQmluZGluZ0VsZW1lbnQ7CisgICAgICAgICAgICAgICAg ICAgICAgICB0aGlzLmNvbnRleHQuaXNBc3NpZ25tZW50VGFyZ2V0ID0gcHJldmlvdXNJc0Fzc2ln bm1lbnRUYXJnZXQ7CisgICAgICAgICAgICAgICAgICAgICAgICB0aGlzLmNvbnRleHQuZmlyc3RD b3ZlckluaXRpYWxpemVkTmFtZUVycm9yID0gcHJldmlvdXNGaXJzdENvdmVySW5pdGlhbGl6ZWRO YW1lRXJyb3I7CiAgICAgICAgICAgICAgICAgICAgICAgICBpZiAodGhpcy5tYXRjaCgnLCcpKSB7 CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgaW5pdFNlcSA9IFtpbml0XTsKICAg ICAgICAgICAgICAgICAgICAgICAgICAgICB3aGlsZSAodGhpcy5tYXRjaCgnLCcpKSB7CkBAIC0z ODI3LDExICszODM0LDExIEBAIHJldHVybiAvKioqKioqLyAoZnVuY3Rpb24obW9kdWxlcykgeyAv LyB3ZWJwYWNrQm9vdHN0cmFwCiAgICAgICAgICAgICB9CiAgICAgICAgICAgICBpZiAodHlwZW9m IGxlZnQgPT09ICd1bmRlZmluZWQnKSB7CiAgICAgICAgICAgICAgICAgaWYgKCF0aGlzLm1hdGNo KCc7JykpIHsKLSAgICAgICAgICAgICAgICAgICAgdGVzdCA9IHRoaXMucGFyc2VFeHByZXNzaW9u KCk7CisgICAgICAgICAgICAgICAgICAgIHRlc3QgPSB0aGlzLmlzb2xhdGVDb3ZlckdyYW1tYXIo dGhpcy5wYXJzZUV4cHJlc3Npb24pOwogICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAg ICB0aGlzLmV4cGVjdCgnOycpOwogICAgICAgICAgICAgICAgIGlmICghdGhpcy5tYXRjaCgnKScp KSB7Ci0gICAgICAgICAgICAgICAgICAgIHVwZGF0ZSA9IHRoaXMucGFyc2VFeHByZXNzaW9uKCk7 CisgICAgICAgICAgICAgICAgICAgIHVwZGF0ZSA9IHRoaXMuaXNvbGF0ZUNvdmVyR3JhbW1hcih0 aGlzLnBhcnNlRXhwcmVzc2lvbik7CiAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgfQog ICAgICAgICAgICAgbGV0IGJvZHk7CkBAIC01MTQ4LDEzICs1MTU1LDE1IEBAIHJldHVybiAvKioq KioqLyAoZnVuY3Rpb24obW9kdWxlcykgeyAvLyB3ZWJwYWNrQm9vdHN0cmFwCiAgICAgICAgICAg ICByZXR1cm4gewogICAgICAgICAgICAgICAgIGluZGV4OiB0aGlzLmluZGV4LAogICAgICAgICAg ICAgICAgIGxpbmVOdW1iZXI6IHRoaXMubGluZU51bWJlciwKLSAgICAgICAgICAgICAgICBsaW5l U3RhcnQ6IHRoaXMubGluZVN0YXJ0CisgICAgICAgICAgICAgICAgbGluZVN0YXJ0OiB0aGlzLmxp bmVTdGFydCwKKyAgICAgICAgICAgICAgICBjdXJseVN0YWNrOiB0aGlzLmN1cmx5U3RhY2suc2xp Y2UoKQogICAgICAgICAgICAgfTsKICAgICAgICAgfQogICAgICAgICByZXN0b3JlU3RhdGUoc3Rh dGUpIHsKICAgICAgICAgICAgIHRoaXMuaW5kZXggPSBzdGF0ZS5pbmRleDsKICAgICAgICAgICAg IHRoaXMubGluZU51bWJlciA9IHN0YXRlLmxpbmVOdW1iZXI7CiAgICAgICAgICAgICB0aGlzLmxp bmVTdGFydCA9IHN0YXRlLmxpbmVTdGFydDsKKyAgICAgICAgICAgIHRoaXMuY3VybHlTdGFjayA9 IHN0YXRlLmN1cmx5U3RhY2s7CiAgICAgICAgIH0KICAgICAgICAgZW9mKCkgewogICAgICAgICAg ICAgcmV0dXJuIHRoaXMuaW5kZXggPj0gdGhpcy5sZW5ndGg7Cg==