48915 2010-11-03 07:15:27 -0700 Web Inspector: show proper image size for cached resources. 2010-11-03 11:38:34 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 pfeldman pfeldman apavlov bweinstein caseq joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 304022 0 pfeldman 2010-11-03 07:15:27 -0700 Patch to follow. 304023 1 72820 pfeldman 2010-11-03 07:18:01 -0700 Created attachment 72820 [PATCH] Proposed change. 304028 2 72820 caseq 2010-11-03 07:32:24 -0700 Comment on attachment 72820 [PATCH] Proposed change. View in context: https://bugs.webkit.org/attachment.cgi?id=72820&action=review > WebCore/inspector/front-end/ImageView.js:79 > + var resourceSize = this.resource.resourceSize; Wouldn't it be more readable with a ternary operator? > WebCore/inspector/front-end/ImageView.js:101 > + _base64ToSize: function(content) This is rather generic, I would consider moving this to utilities.js or making it a member of Resource. > WebCore/inspector/front-end/ImageView.js:105 > + var size = (content.length || 0) * 3 / 4; content.length || 0 seems to be redundant considering the above line. > WebCore/inspector/front-end/ImageView.js:107 > + size--; ditto. 304139 3 72820 simon.fraser 2010-11-03 11:21:55 -0700 Comment on attachment 72820 [PATCH] Proposed change. View in context: https://bugs.webkit.org/attachment.cgi?id=72820&action=review > WebCore/ChangeLog:9 > + https://bugs.webkit.org/show_bug.cgi?id=48915 > + > + * inspector/front-end/ExtensionServer.js: > + (WebInspector.ExtensionServer.prototype._onGetResourceContent): I'd like to see some explanation of what the problem was and how you fixed it here. 304142 4 pfeldman 2010-11-03 11:23:57 -0700 (In reply to comment #3) > (From update of attachment 72820 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=72820&action=review > > > WebCore/ChangeLog:9 > > + https://bugs.webkit.org/show_bug.cgi?id=48915 > > + > > + * inspector/front-end/ExtensionServer.js: > > + (WebInspector.ExtensionServer.prototype._onGetResourceContent): > > I'd like to see some explanation of what the problem was and how you fixed it here. The problem was that resourceSize for cached resources is 0 and I calculate it from the actual image object instead. And height is a drive-by fix via using naturalHeight. 304158 5 pfeldman 2010-11-03 11:38:34 -0700 Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebCore/ChangeLog M WebCore/inspector/front-end/ExtensionServer.js M WebCore/inspector/front-end/ImageView.js M WebCore/inspector/front-end/NetworkPanel.js M WebCore/inspector/front-end/Resource.js M WebCore/inspector/front-end/ResourceManager.js M WebCore/inspector/front-end/SourceView.js Committed r71254 72820 2010-11-03 07:18:01 -0700 2010-11-03 11:21:55 -0700 [PATCH] Proposed change. image_size text/plain 8137 pfeldman ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg YmIxYWU5OC4uMDIxYWI2MCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsNSArMSwzMCBAQAogMjAxMC0xMS0wMyAgUGF2ZWwgRmVsZG1h biAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KIAorICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBzaG93IHByb3BlciBpbWFnZSBzaXpl IGZvciBjYWNoZWQgcmVzb3VyY2VzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NDg5MTUKKworICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvRXh0 ZW5zaW9uU2VydmVyLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkV4dGVuc2lvblNlcnZlci5w cm90b3R5cGUuX29uR2V0UmVzb3VyY2VDb250ZW50KToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJv bnQtZW5kL0ltYWdlVmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5JbWFnZVZpZXcucHJv dG90eXBlLmNvbnRlbnRUYWJTZWxlY3RlZC5vbkltYWdlTG9hZCk6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuSW1hZ2VWaWV3LnByb3RvdHlwZS5jb250ZW50VGFiU2VsZWN0ZWQpOgorICAgICAgICAo V2ViSW5zcGVjdG9yLkltYWdlVmlldy5wcm90b3R5cGUuX2Jhc2U2NFRvU2l6ZSk6CisgICAgICAg ICogaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3b3JrUGFuZWwuanM6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuTmV0d29ya0RhdGFHcmlkTm9kZS5wcm90b3R5cGUuX3JlZnJlc2hOYW1lQ2VsbCk6Cisg ICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZS5qczoKKyAgICAgICAgKFdlYklu c3BlY3Rvci5SZXNvdXJjZS5wcm90b3R5cGUuc2V0IGZpbmlzaGVkKToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5SZXNvdXJjZS5wcm90b3R5cGUuZ2V0IGNvbnRlbnQpOgorICAgICAgICAoV2ViSW5z cGVjdG9yLlJlc291cmNlLnByb3RvdHlwZS5yZXF1ZXN0Q29udGVudCk6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuUmVzb3VyY2UucHJvdG90eXBlLl9pbm5lclJlcXVlc3RDb250ZW50KToKKyAgICAg ICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlTWFuYWdlci5qczoKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5SZXNvdXJjZU1hbmFnZXIucmVxdWVzdENvbnRlbnQpOgorICAgICAgICAqIGlu c3BlY3Rvci9mcm9udC1lbmQvU291cmNlVmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5T b3VyY2VWaWV3LnByb3RvdHlwZS5zZXR1cFNvdXJjZUZyYW1lSWZOZWVkZWQpOgorCisyMDEwLTEx LTAzICBQYXZlbCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgorCiAgICAgICAgIFJl dmlld2VkIGJ5IEplcmVteSBPcmxvdy4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBicnVzaCB1 cCBicmVha3BvaW50cyBVSSBhbmQgVVguCmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvRXh0ZW5zaW9uU2VydmVyLmpzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L0V4dGVuc2lvblNlcnZlci5qcwppbmRleCA3MjlhYjgxLi42ZmZhMzNhIDEwMDY0NAotLS0gYS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRXh0ZW5zaW9uU2VydmVyLmpzCisrKyBiL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FeHRlbnNpb25TZXJ2ZXIuanMKQEAgLTMzMiw3ICszMzIs NyBAQCBXZWJJbnNwZWN0b3IuRXh0ZW5zaW9uU2VydmVyLnByb3RvdHlwZSA9IHsKICAgICAgICAg ICAgIGlmICghcmVzb3VyY2UpCiAgICAgICAgICAgICAgICAgcmVzcG9uc2UucHVzaCh0aGlzLl9z dGF0dXMuRV9OT1RGT1VORChpZCkpOwogICAgICAgICAgICAgZWxzZQotICAgICAgICAgICAgICAg IHJlc291cmNlLmdldENvbnRlbnQob25Db250ZW50QXZhaWxhYmxlLmJpbmQodGhpcywgaWQpKTsK KyAgICAgICAgICAgICAgICByZXNvdXJjZS5yZXF1ZXN0Q29udGVudChvbkNvbnRlbnRBdmFpbGFi bGUuYmluZCh0aGlzLCBpZCkpOwogICAgICAgICB9CiAgICAgICAgIGlmIChyZXNwb25zZS5sZW5n dGggPT09IGlkcy5sZW5ndGgpCiAgICAgICAgICAgICB0aGlzLl9kaXNwYXRjaENhbGxiYWNrKG1l c3NhZ2UucmVxdWVzdElkLCBwb3J0LCByZXNwb25zZSk7CmRpZmYgLS1naXQgYS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvSW1hZ2VWaWV3LmpzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL0ltYWdlVmlldy5qcwppbmRleCAxMzA1ODRmLi5mNzBmYWQ2IDEwMDY0NAotLS0gYS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSW1hZ2VWaWV3LmpzCisrKyBiL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9JbWFnZVZpZXcuanMKQEAgLTY3LDE0ICs2NywyMCBAQCBXZWJJbnNwZWN0 b3IuSW1hZ2VWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAgewogICAgICAgICAgICAgaW1hZ2VQ cmV2aWV3RWxlbWVudC5zZXRBdHRyaWJ1dGUoInNyYyIsIHRoaXMucmVzb3VyY2UuY29udGVudFVS TCk7CiAgICAgICAgIH0KLSAgICAgICAgdGhpcy5yZXNvdXJjZS5nZXRDb250ZW50KG9uUmVzb3Vy Y2VDb250ZW50LmJpbmQodGhpcykpOworICAgICAgICB0aGlzLnJlc291cmNlLnJlcXVlc3RDb250 ZW50KG9uUmVzb3VyY2VDb250ZW50LmJpbmQodGhpcykpOwogCiAKICAgICAgICAgZnVuY3Rpb24g b25JbWFnZUxvYWQoKQogICAgICAgICB7CisgICAgICAgICAgICB2YXIgY29udGVudCA9IHRoaXMu cmVzb3VyY2UuY29udGVudDsKKyAgICAgICAgICAgIGlmIChjb250ZW50KQorICAgICAgICAgICAg ICAgIHZhciByZXNvdXJjZVNpemUgPSB0aGlzLl9iYXNlNjRUb1NpemUoY29udGVudCk7CisgICAg ICAgICAgICBlbHNlCisgICAgICAgICAgICAgICAgdmFyIHJlc291cmNlU2l6ZSA9IHRoaXMucmVz b3VyY2UucmVzb3VyY2VTaXplOworCiAgICAgICAgICAgICB2YXIgaW1hZ2VQcm9wZXJ0aWVzID0g WwotICAgICAgICAgICAgICAgIHsgbmFtZTogV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJEaW1lbnNp b25zIiksIHZhbHVlOiBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIiVkIMOXICVkIiwgaW1hZ2VQcmV2 aWV3RWxlbWVudC5uYXR1cmFsV2lkdGgsIGltYWdlUHJldmlld0VsZW1lbnQuaGVpZ2h0KSB9LAot ICAgICAgICAgICAgICAgIHsgbmFtZTogV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJGaWxlIHNpemUi KSwgdmFsdWU6IE51bWJlci5ieXRlc1RvU3RyaW5nKHRoaXMucmVzb3VyY2UucmVzb3VyY2VTaXpl LCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcpIH0sCisgICAgICAgICAgICAgICAgeyBuYW1lOiBXZWJJ bnNwZWN0b3IuVUlTdHJpbmcoIkRpbWVuc2lvbnMiKSwgdmFsdWU6IFdlYkluc3BlY3Rvci5VSVN0 cmluZygiJWQgw5cgJWQiLCBpbWFnZVByZXZpZXdFbGVtZW50Lm5hdHVyYWxXaWR0aCwgaW1hZ2VQ cmV2aWV3RWxlbWVudC5uYXR1cmFsSGVpZ2h0KSB9LAorICAgICAgICAgICAgICAgIHsgbmFtZTog V2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJGaWxlIHNpemUiKSwgdmFsdWU6IE51bWJlci5ieXRlc1Rv U3RyaW5nKHJlc291cmNlU2l6ZSwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKSB9LAogICAgICAgICAg ICAgICAgIHsgbmFtZTogV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJNSU1FIHR5cGUiKSwgdmFsdWU6 IHRoaXMucmVzb3VyY2UubWltZVR5cGUgfQogICAgICAgICAgICAgXTsKICAgICAKQEAgLTkwLDYg Kzk2LDE4IEBAIFdlYkluc3BlY3Rvci5JbWFnZVZpZXcucHJvdG90eXBlID0gewogICAgICAgICAg ICAgdGhpcy5fY29udGFpbmVyLmFwcGVuZENoaWxkKGluZm9MaXN0RWxlbWVudCk7CiAgICAgICAg IH0KICAgICAgICAgaW1hZ2VQcmV2aWV3RWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJsb2FkIiwg b25JbWFnZUxvYWQuYmluZCh0aGlzKSwgZmFsc2UpOworICAgIH0sCisKKyAgICBfYmFzZTY0VG9T aXplOiBmdW5jdGlvbihjb250ZW50KQorICAgIHsKKyAgICAgICAgaWYgKCFjb250ZW50Lmxlbmd0 aCkKKyAgICAgICAgICAgIHJldHVybiAwOworICAgICAgICB2YXIgc2l6ZSA9IChjb250ZW50Lmxl bmd0aCB8fCAwKSAqIDMgLyA0OworICAgICAgICBpZiAoY29udGVudC5sZW5ndGggPiAwICYmIGNv bnRlbnRbY29udGVudC5sZW5ndGggLSAxXSA9PT0gIj0iKQorICAgICAgICAgICAgc2l6ZS0tOwor ICAgICAgICBpZiAoY29udGVudC5sZW5ndGggPiAxICYmIGNvbnRlbnRbY29udGVudC5sZW5ndGgg LSAyXSA9PT0gIj0iKQorICAgICAgICAgICAgc2l6ZS0tOworICAgICAgICByZXR1cm4gc2l6ZTsK ICAgICB9CiB9CiAKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3 b3JrUGFuZWwuanMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya1BhbmVsLmpz CmluZGV4IDZmZDYxYTkuLmJmMDQ1OTYgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9OZXR3b3JrUGFuZWwuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L05ldHdvcmtQYW5lbC5qcwpAQCAtMTQ4Miw3ICsxNDgyLDcgQEAgV2ViSW5zcGVjdG9yLk5ldHdv cmtEYXRhR3JpZE5vZGUucHJvdG90eXBlID0gewogICAgICAgICAgICAgICAgIHByZXZpZXdJbWFn ZS5zcmMgPSB0aGlzLl9yZXNvdXJjZS5jb250ZW50VVJMOwogICAgICAgICAgICAgfQogICAgICAg ICAgICAgaWYgKFByZWZlcmVuY2VzLnVzZURhdGFVUkxGb3JSZXNvdXJjZUltYWdlSWNvbnMpCi0g ICAgICAgICAgICAgICAgdGhpcy5fcmVzb3VyY2UuZ2V0Q29udGVudChvblJlc291cmNlQ29udGVu dC5iaW5kKHRoaXMpKTsKKyAgICAgICAgICAgICAgICB0aGlzLl9yZXNvdXJjZS5yZXF1ZXN0Q29u dGVudChvblJlc291cmNlQ29udGVudC5iaW5kKHRoaXMpKTsKICAgICAgICAgICAgIGVsc2UKICAg ICAgICAgICAgICAgICBwcmV2aWV3SW1hZ2Uuc3JjID0gdGhpcy5fcmVzb3VyY2UudXJsOwogCmRp ZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2UuanMgYi9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2UuanMKaW5kZXggNzJmODY3Zi4uMjRhZjE2 NSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlLmpzCisr KyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZS5qcwpAQCAtMjU1LDcgKzI1 NSw3IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZS5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICB0 aGlzLl9jaGVja1dhcm5pbmdzKCk7CiAgICAgICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xp c3RlbmVycygiZmluaXNoZWQiKTsKICAgICAgICAgICAgIGlmICh0aGlzLl9wZW5kaW5nQ29udGVu dENhbGxiYWNrcy5sZW5ndGgpCi0gICAgICAgICAgICAgICAgdGhpcy5fcmVxdWVzdENvbnRlbnQo KTsKKyAgICAgICAgICAgICAgICB0aGlzLl9pbm5lclJlcXVlc3RDb250ZW50KCk7CiAgICAgICAg IH0KICAgICB9LAogCkBAIC02MTYsMTIgKzYxNiwxNyBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2Uu cHJvdG90eXBlID0gewogICAgICAgICAgICAgV2ViSW5zcGVjdG9yLmNvbnNvbGUuYWRkTWVzc2Fn ZShtc2cpOwogICAgIH0sCiAKKyAgICBnZXQgY29udGVudCgpCisgICAgeworICAgICAgICByZXR1 cm4gdGhpcy5fY29udGVudDsKKyAgICB9LAorCiAgICAgc2V0IGNvbnRlbnQoY29udGVudCkKICAg ICB7CiAgICAgICAgIHRoaXMuX2NvbnRlbnQgPSBjb250ZW50OwogICAgIH0sCiAKLSAgICBnZXRD b250ZW50OiBmdW5jdGlvbihjYWxsYmFjaykKKyAgICByZXF1ZXN0Q29udGVudDogZnVuY3Rpb24o Y2FsbGJhY2spCiAgICAgewogICAgICAgICBpZiAodGhpcy5fY29udGVudCkgewogICAgICAgICAg ICAgY2FsbGJhY2sodGhpcy5fY29udGVudCwgdGhpcy5fY29udGVudEVuY29kZWQpOwpAQCAtNjI5 LDcgKzYzNCw3IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZS5wcm90b3R5cGUgPSB7CiAgICAgICAg IH0KICAgICAgICAgdGhpcy5fcGVuZGluZ0NvbnRlbnRDYWxsYmFja3MucHVzaChjYWxsYmFjayk7 CiAgICAgICAgIGlmICh0aGlzLmZpbmlzaGVkKQotICAgICAgICAgICAgdGhpcy5fcmVxdWVzdENv bnRlbnQoKTsKKyAgICAgICAgICAgIHRoaXMuX2lubmVyUmVxdWVzdENvbnRlbnQoKTsKICAgICB9 LAogCiAgICAgZ2V0IGNvbnRlbnRVUkwoKQpAQCAtNjQyLDcgKzY0Nyw3IEBAIFdlYkluc3BlY3Rv ci5SZXNvdXJjZS5wcm90b3R5cGUgPSB7CiAgICAgICAgIHJldHVybiAiZGF0YToiICsgdGhpcy5t aW1lVHlwZSArICh0aGlzLl9jb250ZW50RW5jb2RlZCA/ICI7YmFzZTY0LCIgOiAiLCIpICsgdGhp cy5fY29udGVudDsKICAgICB9LAogCi0gICAgX3JlcXVlc3RDb250ZW50OiBmdW5jdGlvbigpCisg ICAgX2lubmVyUmVxdWVzdENvbnRlbnQ6IGZ1bmN0aW9uKCkKICAgICB7CiAgICAgICAgIGlmICh0 aGlzLl9jb250ZW50UmVxdWVzdGVkKQogICAgICAgICAgICAgcmV0dXJuOwpAQCAtNjU4LDcgKzY2 Myw3IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZS5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICB0 aGlzLl9wZW5kaW5nQ29udGVudENhbGxiYWNrcy5sZW5ndGggPSAwOwogICAgICAgICAgICAgZGVs ZXRlIHRoaXMuX2NvbnRlbnRSZXF1ZXN0ZWQ7CiAgICAgICAgIH0KLSAgICAgICAgV2ViSW5zcGVj dG9yLlJlc291cmNlTWFuYWdlci5nZXRDb250ZW50KHRoaXMsIHRoaXMuX2NvbnRlbnRFbmNvZGVk LCBvblJlc291cmNlQ29udGVudC5iaW5kKHRoaXMpKTsKKyAgICAgICAgV2ViSW5zcGVjdG9yLlJl c291cmNlTWFuYWdlci5yZXF1ZXN0Q29udGVudCh0aGlzLCB0aGlzLl9jb250ZW50RW5jb2RlZCwg b25SZXNvdXJjZUNvbnRlbnQuYmluZCh0aGlzKSk7CiAgICAgfQogfQogCmRpZmYgLS1naXQgYS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VNYW5hZ2VyLmpzIGIvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlTWFuYWdlci5qcwppbmRleCBmNTk0ZDhiLi40MDlh ZDMxIDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VNYW5h Z2VyLmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZU1hbmFnZXIu anMKQEAgLTQ2OSw3ICs0NjksNyBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VNYW5hZ2VyLmV4aXN0 aW5nUmVzb3VyY2VWaWV3Rm9yUmVzb3VyY2UgPSBmdW5jdGlvbihyZXNvdXJjZQogICAgIHJldHVy biByZXNvdXJjZS5fcmVzb3VyY2VzVmlldzsKIH0KIAotV2ViSW5zcGVjdG9yLlJlc291cmNlTWFu YWdlci5nZXRDb250ZW50ID0gZnVuY3Rpb24ocmVzb3VyY2UsIGJhc2U2NEVuY29kZSwgY2FsbGJh Y2spCitXZWJJbnNwZWN0b3IuUmVzb3VyY2VNYW5hZ2VyLnJlcXVlc3RDb250ZW50ID0gZnVuY3Rp b24ocmVzb3VyY2UsIGJhc2U2NEVuY29kZSwgY2FsbGJhY2spCiB7CiAgICAgSW5zcGVjdG9yQmFj a2VuZC5yZXNvdXJjZUNvbnRlbnQocmVzb3VyY2UubG9hZGVyLmZyYW1lSWQsIHJlc291cmNlLnVy bCwgYmFzZTY0RW5jb2RlLCBjYWxsYmFjayk7CiB9CmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvU291cmNlVmlldy5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9Tb3VyY2VWaWV3LmpzCmluZGV4IGJmZGMwNTguLmM3YTM1ZjcgMTAwNjQ0Ci0tLSBhL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VWaWV3LmpzCisrKyBiL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9Tb3VyY2VWaWV3LmpzCkBAIC04NCw3ICs4NCw3IEBAIFdlYkluc3BlY3Rv ci5Tb3VyY2VWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5hdHRhY2goKTsKIAogICAg ICAgICBkZWxldGUgdGhpcy5fZnJhbWVOZWVkc1NldHVwOwotICAgICAgICB0aGlzLnJlc291cmNl LmdldENvbnRlbnQodGhpcy5fY29udGVudExvYWRlZC5iaW5kKHRoaXMpKTsKKyAgICAgICAgdGhp cy5yZXNvdXJjZS5yZXF1ZXN0Q29udGVudCh0aGlzLl9jb250ZW50TG9hZGVkLmJpbmQodGhpcykp OwogICAgIH0sCiAKICAgICBoYXNDb250ZW50VGFiOiBmdW5jdGlvbigpCg==