54454 2011-02-15 06:24:16 -0800 Web Inspector: wrong filename when saving resource from ResourceImageContentView 2017-03-17 20:49:59 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 loislo hi bweinstein commit-queue hi inspector-bugzilla-changes pmuellr rik webkit-bug-importer oldest_to_newest 351218 0 loislo 2011-02-15 06:24:16 -0800 2. When I download something from the Resources layout under Developer Tools the filename of the image (or anything I download) is changed to the generic term "download.jpg" or other type of extension. The previous version of Google Chrome downloaded items with their original file name. 972056 1 bburg 2014-01-25 14:52:34 -0800 Migrating to new component. On Nightly Safari, it saves the resource with the name "Unknown". 972057 2 webkit-bug-importer 2014-01-25 14:52:42 -0800 <rdar://problem/15909852> 1288763 3 304697 hi 2017-03-16 14:41:54 -0700 Created attachment 304697 Patch 1288766 4 304697 joepeck 2017-03-16 14:46:38 -0700 Comment on attachment 304697 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=304697&action=review Seems like this could save the wrong content. That doesn't seem correct to me. Maybe leave the TextResourceContentView's saveData? > Source/WebInspectorUI/UserInterface/Views/ResourceContentView.js:74 > + get saveData() > + { > + return {url: this.resource.url, content: this.resource.content}; > + } > + This saves the resources's content. > Source/WebInspectorUI/UserInterface/Views/TextResourceContentView.js:-137 > - get saveData() > - { > - return {url: this.resource.url, content: this._textEditor.string}; > - } This would have saved the current text in the editor. 1288776 5 304697 hi 2017-03-16 15:00:35 -0700 Comment on attachment 304697 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=304697&action=review >> Source/WebInspectorUI/UserInterface/Views/TextResourceContentView.js:-137 >> - } > > This would have saved the current text in the editor. I dunno why, but I completely misread how the `this._textEditor.readOnly` works. Thought it was backwards. 1288777 6 304700 hi 2017-03-16 15:00:54 -0700 Created attachment 304700 Patch 1288778 7 304700 joepeck 2017-03-16 15:03:20 -0700 Comment on attachment 304700 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=304700&action=review > Source/WebInspectorUI/UserInterface/Views/ResourceContentView.js:73 > + get supportsSave() > + { > + return true; > + } > + > + get saveData() > + { > + return {url: this.resource.url, content: this.resource.content}; > + } Should this wait until the resource has content? What happens if you trigger the save during the spinner / downloading screen? 1288801 8 304708 hi 2017-03-16 15:42:35 -0700 Created attachment 304708 Patch 1289064 9 304708 joepeck 2017-03-17 11:08:11 -0700 Comment on attachment 304708 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=304708&action=review r=me > Source/WebInspectorUI/UserInterface/Views/ResourceContentView.js:72 > + return {url: this.resource.url, content: this.resource.content}; Nit: I'd have made these this._resource instead of going through the public accessor. 1289237 10 304852 hi 2017-03-17 20:08:53 -0700 Created attachment 304852 Patch 1289242 11 304852 commit-queue 2017-03-17 20:49:53 -0700 Comment on attachment 304852 Patch Clearing flags on attachment: 304852 Committed r214133: <http://trac.webkit.org/changeset/214133> 1289243 12 commit-queue 2017-03-17 20:49:59 -0700 All reviewed patches have been landed. Closing bug. 304697 2017-03-16 14:41:54 -0700 2017-03-16 15:00:50 -0700 Patch bug-54454-20170316154153.patch text/plain 2806 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGIyN2U1ZDNhOTI4NjgwMmNjNjdiZDlkMGNhN2Fj OGE4NTQ2YmFjNzIuLjQwOGEyNjhkMThiMTZhMzZiN2ZmMGUxZjRiYTU0ZDE4NDdjYjIwOTggMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIxIEBACiAyMDE3LTAzLTE2ICBEZXZp biBSb3Vzc28gIDx3ZWJraXRAZGV2aW5yb3Vzc28uY29tPgogCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IHdyb25nIGZpbGVuYW1lIHdoZW4gc2F2aW5nIHJlc291cmNlIGZyb20gUmVzb3VyY2VJbWFn ZUNvbnRlbnRWaWV3CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD01NDQ1NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgICogVXNlckludGVyZmFjZS9WaWV3cy9SZXNvdXJjZUNvbnRlbnRWaWV3LmpzOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLlJlc291cmNlQ29udGVudFZpZXcucHJvdG90eXBlLmdldCBzdXBwb3J0 c1NhdmUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlQ29udGVudFZpZXcucHJvdG90 eXBlLmdldCBzYXZlRGF0YSk6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9UZXh0UmVz b3VyY2VDb250ZW50Vmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UZXh0UmVzb3VyY2VD b250ZW50Vmlldy5wcm90b3R5cGUuZ2V0IHN1cHBvcnRzU2F2ZSk6IERlbGV0ZWQuCisgICAgICAg IChXZWJJbnNwZWN0b3IuVGV4dFJlc291cmNlQ29udGVudFZpZXcucHJvdG90eXBlLmdldCBzYXZl RGF0YSk6IERlbGV0ZWQuCisgICAgICAgIE1vdmUgdGhlIHNhdmUgZGF0YSBnZXR0ZXIgdG8gdGhl IHBhcmVudCBjbGFzcywgc28gdGhhdCBib3RoIEltYWdlcyBhbmQgRm9udHMgYXJlIGFsc28gYWJs ZQorICAgICAgICB0byBiZSBzYXZlZC4KKworMjAxNy0wMy0xNiAgRGV2aW4gUm91c3NvICA8d2Vi a2l0QGRldmlucm91c3NvLmNvbT4KKwogICAgICAgICBXZWIgSW5zcGVjdG9yOiBSVEw6IGZpbHRl ciBtb2RlIGljb24gaW4gRGVidWdnZXIgc2lkZWJhciBpcyBtaXNhbGlnbmVkCiAgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjk3NjYKIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUmVzb3VyY2VDb250 ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Jl c291cmNlQ29udGVudFZpZXcuanMKaW5kZXggZGIxNDE3YTkwMjUxNGNjZTJiYmY3YjVhYzQwZmM3 ZmI0ZTkyNTU4Zi4uMTU4OWQ4ZWZmNDRkNzllZTA3MmM0ZmE1MzkxYzY4NmI3NTBiZmI3MSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUmVzb3Vy Y2VDb250ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9SZXNvdXJjZUNvbnRlbnRWaWV3LmpzCkBAIC02Miw2ICs2MiwxNiBAQCBXZWJJbnNw ZWN0b3IuUmVzb3VyY2VDb250ZW50VmlldyA9IGNsYXNzIFJlc291cmNlQ29udGVudFZpZXcgZXh0 ZW5kcyBXZWJJbnNwZWN0bwogICAgICAgICByZXR1cm4gdGhpcy5fcmVzb3VyY2U7CiAgICAgfQog CisgICAgZ2V0IHN1cHBvcnRzU2F2ZSgpCisgICAgeworICAgICAgICByZXR1cm4gdHJ1ZTsKKyAg ICB9CisKKyAgICBnZXQgc2F2ZURhdGEoKQorICAgIHsKKyAgICAgICAgcmV0dXJuIHt1cmw6IHRo aXMucmVzb3VyY2UudXJsLCBjb250ZW50OiB0aGlzLnJlc291cmNlLmNvbnRlbnR9OworICAgIH0K KwogICAgIGNvbnRlbnRBdmFpbGFibGUoY29udGVudCwgYmFzZTY0RW5jb2RlZCkKICAgICB7CiAg ICAgICAgIC8vIEltcGxlbWVudGVkIGJ5IHN1YmNsYXNzZXMuCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UZXh0UmVzb3VyY2VDb250ZW50Vmll dy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RleHRSZXNv dXJjZUNvbnRlbnRWaWV3LmpzCmluZGV4IDI2N2E4ZTRhOTM3MGU1OThkYWM1OGY2OThiYjEyMWQ0 ZjEwY2M5MGMuLjFkNWRlNWVmM2RiZWEzZTQ5YzU0NjY4ZmIxZTNiZjNkYmQwYWM0OWYgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RleHRSZXNv dXJjZUNvbnRlbnRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL1RleHRSZXNvdXJjZUNvbnRlbnRWaWV3LmpzCkBAIC0xMjYsMTYgKzEyNiw2IEBA IFdlYkluc3BlY3Rvci5UZXh0UmVzb3VyY2VDb250ZW50VmlldyA9IGNsYXNzIFRleHRSZXNvdXJj ZUNvbnRlbnRWaWV3IGV4dGVuZHMgV2ViCiAgICAgICAgIHRoaXMuX3RleHRFZGl0b3IuY2xvc2Uo KTsKICAgICB9CiAKLSAgICBnZXQgc3VwcG9ydHNTYXZlKCkKLSAgICB7Ci0gICAgICAgIHJldHVy biB0cnVlOwotICAgIH0KLQotICAgIGdldCBzYXZlRGF0YSgpCi0gICAgewotICAgICAgICByZXR1 cm4ge3VybDogdGhpcy5yZXNvdXJjZS51cmwsIGNvbnRlbnQ6IHRoaXMuX3RleHRFZGl0b3Iuc3Ry aW5nfTsKLSAgICB9Ci0KICAgICBnZXQgc3VwcG9ydHNTZWFyY2goKQogICAgIHsKICAgICAgICAg cmV0dXJuIHRydWU7Cg== 304700 2017-03-16 15:00:54 -0700 2017-03-16 15:42:31 -0700 Patch bug-54454-20170316160053.patch text/plain 2634 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGIyN2U1ZDNhOTI4NjgwMmNjNjdiZDlkMGNhN2Fj OGE4NTQ2YmFjNzIuLjRkN2JmYmNiNTc1NGU5NTA0MGQxZWQzODg0NTdkYjJlMDk4Njk3MjIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE5IEBACiAyMDE3LTAzLTE2ICBEZXZp biBSb3Vzc28gIDx3ZWJraXRAZGV2aW5yb3Vzc28uY29tPgogCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IHdyb25nIGZpbGVuYW1lIHdoZW4gc2F2aW5nIHJlc291cmNlIGZyb20gUmVzb3VyY2VJbWFn ZUNvbnRlbnRWaWV3CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD01NDQ1NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgICogVXNlckludGVyZmFjZS9WaWV3cy9SZXNvdXJjZUNvbnRlbnRWaWV3LmpzOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLlJlc291cmNlQ29udGVudFZpZXcucHJvdG90eXBlLmdldCBzdXBwb3J0 c1NhdmUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlQ29udGVudFZpZXcucHJvdG90 eXBlLmdldCBzYXZlRGF0YSk6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9UZXh0UmVz b3VyY2VDb250ZW50Vmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UZXh0UmVzb3VyY2VD b250ZW50Vmlldy5wcm90b3R5cGUuZ2V0IHN1cHBvcnRzU2F2ZSk6IERlbGV0ZWQuCisgICAgICAg IEFkZCBzYXZlIGRhdGEgZ2V0dGVyIHRvIHRoZSBwYXJlbnQgY2xhc3MsIHNvIHRoYXQgYm90aCBJ bWFnZXMgYW5kIEZvbnRzIGNhbiBiZSBzYXZlZC4KKworMjAxNy0wMy0xNiAgRGV2aW4gUm91c3Nv ICA8d2Via2l0QGRldmlucm91c3NvLmNvbT4KKwogICAgICAgICBXZWIgSW5zcGVjdG9yOiBSVEw6 IGZpbHRlciBtb2RlIGljb24gaW4gRGVidWdnZXIgc2lkZWJhciBpcyBtaXNhbGlnbmVkCiAgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjk3NjYKIApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUmVzb3Vy Y2VDb250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL1Jlc291cmNlQ29udGVudFZpZXcuanMKaW5kZXggZGIxNDE3YTkwMjUxNGNjZTJiYmY3YjVh YzQwZmM3ZmI0ZTkyNTU4Zi4uMTU4OWQ4ZWZmNDRkNzllZTA3MmM0ZmE1MzkxYzY4NmI3NTBiZmI3 MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv UmVzb3VyY2VDb250ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9SZXNvdXJjZUNvbnRlbnRWaWV3LmpzCkBAIC02Miw2ICs2MiwxNiBAQCBX ZWJJbnNwZWN0b3IuUmVzb3VyY2VDb250ZW50VmlldyA9IGNsYXNzIFJlc291cmNlQ29udGVudFZp ZXcgZXh0ZW5kcyBXZWJJbnNwZWN0bwogICAgICAgICByZXR1cm4gdGhpcy5fcmVzb3VyY2U7CiAg ICAgfQogCisgICAgZ2V0IHN1cHBvcnRzU2F2ZSgpCisgICAgeworICAgICAgICByZXR1cm4gdHJ1 ZTsKKyAgICB9CisKKyAgICBnZXQgc2F2ZURhdGEoKQorICAgIHsKKyAgICAgICAgcmV0dXJuIHt1 cmw6IHRoaXMucmVzb3VyY2UudXJsLCBjb250ZW50OiB0aGlzLnJlc291cmNlLmNvbnRlbnR9Owor ICAgIH0KKwogICAgIGNvbnRlbnRBdmFpbGFibGUoY29udGVudCwgYmFzZTY0RW5jb2RlZCkKICAg ICB7CiAgICAgICAgIC8vIEltcGxlbWVudGVkIGJ5IHN1YmNsYXNzZXMuCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UZXh0UmVzb3VyY2VDb250 ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Rl eHRSZXNvdXJjZUNvbnRlbnRWaWV3LmpzCmluZGV4IDI2N2E4ZTRhOTM3MGU1OThkYWM1OGY2OThi YjEyMWQ0ZjEwY2M5MGMuLmViNDRiOGQwNGViNWYwZDliOGUwZjE3MjE1ZmMwNzA0YjI0Y2MzYTMg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Rl eHRSZXNvdXJjZUNvbnRlbnRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL1RleHRSZXNvdXJjZUNvbnRlbnRWaWV3LmpzCkBAIC0xMjYsMTEgKzEy Niw2IEBAIFdlYkluc3BlY3Rvci5UZXh0UmVzb3VyY2VDb250ZW50VmlldyA9IGNsYXNzIFRleHRS ZXNvdXJjZUNvbnRlbnRWaWV3IGV4dGVuZHMgV2ViCiAgICAgICAgIHRoaXMuX3RleHRFZGl0b3Iu Y2xvc2UoKTsKICAgICB9CiAKLSAgICBnZXQgc3VwcG9ydHNTYXZlKCkKLSAgICB7Ci0gICAgICAg IHJldHVybiB0cnVlOwotICAgIH0KLQogICAgIGdldCBzYXZlRGF0YSgpCiAgICAgewogICAgICAg ICByZXR1cm4ge3VybDogdGhpcy5yZXNvdXJjZS51cmwsIGNvbnRlbnQ6IHRoaXMuX3RleHRFZGl0 b3Iuc3RyaW5nfTsK 304708 2017-03-16 15:42:35 -0700 2017-03-17 20:08:53 -0700 Patch bug-54454-20170316164234.patch text/plain 3592 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGIyN2U1ZDNhOTI4NjgwMmNjNjdiZDlkMGNhN2Fj OGE4NTQ2YmFjNzIuLmYyZjMzODFjZGU4OGIwOGIzN2RiYWFmYWJmMGM2MDYzYjgzNjAwMzAgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIzIEBACiAyMDE3LTAzLTE2ICBEZXZp biBSb3Vzc28gIDx3ZWJraXRAZGV2aW5yb3Vzc28uY29tPgogCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IHdyb25nIGZpbGVuYW1lIHdoZW4gc2F2aW5nIHJlc291cmNlIGZyb20gUmVzb3VyY2VJbWFn ZUNvbnRlbnRWaWV3CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD01NDQ1NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgICogVXNlckludGVyZmFjZS9WaWV3cy9SZXNvdXJjZUNvbnRlbnRWaWV3LmpzOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLlJlc291cmNlQ29udGVudFZpZXcucHJvdG90eXBlLmdldCBzdXBwb3J0 c1NhdmUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlQ29udGVudFZpZXcucHJvdG90 eXBlLmdldCBzYXZlRGF0YSk6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9UZXh0UmVz b3VyY2VDb250ZW50Vmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UZXh0UmVzb3VyY2VD b250ZW50Vmlldy5wcm90b3R5cGUuZ2V0IHN1cHBvcnRzU2F2ZSk6IERlbGV0ZWQuCisgICAgICAg IEFkZCBzYXZlIGRhdGEgZ2V0dGVyIHRvIHRoZSBwYXJlbnQgY2xhc3MsIHNvIHRoYXQgYm90aCBJ bWFnZXMgYW5kIEZvbnRzIGNhbiBiZSBzYXZlZC4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2Uv Vmlld3MvUmVzb3VyY2UuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2UucHJvdG90 eXBlLmNhblJlcXVlc3RDb250ZW50KToKKyAgICAgICAgRHJpdmUtYnk6IHJlbW92ZSB1bnVzZWQg ZnVuY3Rpb24uCisKKzIwMTctMDMtMTYgIERldmluIFJvdXNzbyAgPHdlYmtpdEBkZXZpbnJvdXNz by5jb20+CisKICAgICAgICAgV2ViIEluc3BlY3RvcjogUlRMOiBmaWx0ZXIgbW9kZSBpY29uIGlu IERlYnVnZ2VyIHNpZGViYXIgaXMgbWlzYWxpZ25lZAogICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTY5NzY2CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9SZXNvdXJjZS5qcyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9SZXNvdXJjZS5qcwppbmRleCAzZjQ3YjA0 MmJiNDRiNDNlOTk1MDkwNTgxYTUzZWQ1OTA4M2Y0ODU0Li4wMWUzMzRkMmNlOTc1NmZmMGMyMmM3 YTIyZGMyYjZlM2I3ODU0Y2ZkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9Nb2RlbHMvUmVzb3VyY2UuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvTW9kZWxzL1Jlc291cmNlLmpzCkBAIC01NzIsMTEgKzU3Miw2IEBAIFdl Ykluc3BlY3Rvci5SZXNvdXJjZSA9IGNsYXNzIFJlc291cmNlIGV4dGVuZHMgV2ViSW5zcGVjdG9y LlNvdXJjZUNvZGUKICAgICAgICAgICAgIHRoaXMuX2Nvbm5lY3Rpb25JZGVudGlmaWVyID0gV2Vi SW5zcGVjdG9yLlJlc291cmNlLmNvbm5lY3Rpb25JZGVudGlmaWVyRnJvbVBheWxvYWQobWV0cmlj cy5jb25uZWN0aW9uSWRlbnRpZmllcik7CiAgICAgfQogCi0gICAgY2FuUmVxdWVzdENvbnRlbnQo KQotICAgIHsKLSAgICAgICAgcmV0dXJuIHRoaXMuX2ZpbmlzaGVkOwotICAgIH0KLQogICAgIHJl cXVlc3RDb250ZW50RnJvbUJhY2tlbmQoKQogICAgIHsKICAgICAgICAgLy8gSWYgd2UgaGF2ZSB0 aGUgcmVxdWVzdElkZW50aWZpZXIgd2UgY2FuIGdldCB0aGUgYWN0dWFsIHJlc3BvbnNlIGZvciB0 aGlzIHNwZWNpZmljIHJlc291cmNlLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvUmVzb3VyY2VDb250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Jlc291cmNlQ29udGVudFZpZXcuanMKaW5k ZXggZGIxNDE3YTkwMjUxNGNjZTJiYmY3YjVhYzQwZmM3ZmI0ZTkyNTU4Zi4uODNiY2RiOTAwZDBm NGY3YTZlZWI0NmQ3MWViMTIxMDZmYTMzNzcyZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUmVzb3VyY2VDb250ZW50Vmlldy5qcworKysgYi9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SZXNvdXJjZUNvbnRlbnRW aWV3LmpzCkBAIC02Miw2ICs2MiwxNiBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VDb250ZW50Vmll dyA9IGNsYXNzIFJlc291cmNlQ29udGVudFZpZXcgZXh0ZW5kcyBXZWJJbnNwZWN0bwogICAgICAg ICByZXR1cm4gdGhpcy5fcmVzb3VyY2U7CiAgICAgfQogCisgICAgZ2V0IHN1cHBvcnRzU2F2ZSgp CisgICAgeworICAgICAgICByZXR1cm4gdGhpcy5fcmVzb3VyY2UuZmluaXNoZWQ7CisgICAgfQor CisgICAgZ2V0IHNhdmVEYXRhKCkKKyAgICB7CisgICAgICAgIHJldHVybiB7dXJsOiB0aGlzLnJl c291cmNlLnVybCwgY29udGVudDogdGhpcy5yZXNvdXJjZS5jb250ZW50fTsKKyAgICB9CisKICAg ICBjb250ZW50QXZhaWxhYmxlKGNvbnRlbnQsIGJhc2U2NEVuY29kZWQpCiAgICAgewogICAgICAg ICAvLyBJbXBsZW1lbnRlZCBieSBzdWJjbGFzc2VzLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGV4dFJlc291cmNlQ29udGVudFZpZXcuanMg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UZXh0UmVzb3VyY2VD b250ZW50Vmlldy5qcwppbmRleCAyNjdhOGU0YTkzNzBlNTk4ZGFjNThmNjk4YmIxMjFkNGYxMGNj OTBjLi5lYjQ0YjhkMDRlYjVmMGQ5YjhlMGYxNzIxNWZjMDcwNGIyNGNjM2EzIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UZXh0UmVzb3VyY2VD b250ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9UZXh0UmVzb3VyY2VDb250ZW50Vmlldy5qcwpAQCAtMTI2LDExICsxMjYsNiBAQCBXZWJJ bnNwZWN0b3IuVGV4dFJlc291cmNlQ29udGVudFZpZXcgPSBjbGFzcyBUZXh0UmVzb3VyY2VDb250 ZW50VmlldyBleHRlbmRzIFdlYgogICAgICAgICB0aGlzLl90ZXh0RWRpdG9yLmNsb3NlKCk7CiAg ICAgfQogCi0gICAgZ2V0IHN1cHBvcnRzU2F2ZSgpCi0gICAgewotICAgICAgICByZXR1cm4gdHJ1 ZTsKLSAgICB9Ci0KICAgICBnZXQgc2F2ZURhdGEoKQogICAgIHsKICAgICAgICAgcmV0dXJuIHt1 cmw6IHRoaXMucmVzb3VyY2UudXJsLCBjb250ZW50OiB0aGlzLl90ZXh0RWRpdG9yLnN0cmluZ307 Cg== 304852 2017-03-17 20:08:53 -0700 2017-03-17 20:49:53 -0700 Patch 54454.diff text/plain 3273 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGIyN2U1ZDMuLjJhOWI3OTUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE3LTAzLTE3ICBEZXZpbiBSb3Vzc28g IDx3ZWJraXRAZGV2aW5yb3Vzc28uY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IHdyb25n IGZpbGVuYW1lIHdoZW4gc2F2aW5nIHJlc291cmNlIGZyb20gUmVzb3VyY2VJbWFnZUNvbnRlbnRW aWV3CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01NDQ1 NAorCisgICAgICAgIFJldmlld2VkIGJ5IEpvc2VwaCBQZWNvcmFyby4KKworICAgICAgICAqIFVz ZXJJbnRlcmZhY2UvVmlld3MvUmVzb3VyY2VDb250ZW50Vmlldy5qczoKKyAgICAgICAgKFdlYklu c3BlY3Rvci5SZXNvdXJjZUNvbnRlbnRWaWV3LnByb3RvdHlwZS5nZXQgc3VwcG9ydHNTYXZlKToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZUNvbnRlbnRWaWV3LnByb3RvdHlwZS5nZXQg c2F2ZURhdGEpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvVGV4dFJlc291cmNlQ29u dGVudFZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGV4dFJlc291cmNlQ29udGVudFZp ZXcucHJvdG90eXBlLmdldCBzdXBwb3J0c1NhdmUpOiBEZWxldGVkLgorICAgICAgICBBZGQgc2F2 ZSBkYXRhIGdldHRlciB0byB0aGUgcGFyZW50IGNsYXNzLCBzbyB0aGF0IGJvdGggSW1hZ2VzIGFu ZCBGb250cyBjYW4gYmUgc2F2ZWQuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1Jl c291cmNlLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlLnByb3RvdHlwZS5jYW5S ZXF1ZXN0Q29udGVudCk6CisgICAgICAgIERyaXZlLWJ5OiByZW1vdmUgdW51c2VkIGZ1bmN0aW9u LgorCiAyMDE3LTAzLTE2ICBEZXZpbiBSb3Vzc28gIDx3ZWJraXRAZGV2aW5yb3Vzc28uY29tPgog CiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IFJUTDogZmlsdGVyIG1vZGUgaWNvbiBpbiBEZWJ1Z2dl ciBzaWRlYmFyIGlzIG1pc2FsaWduZWQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL01vZGVscy9SZXNvdXJjZS5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL01vZGVscy9SZXNvdXJjZS5qcwppbmRleCAzZjQ3YjA0Li4wMWUzMzRk IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMv UmVzb3VyY2UuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9k ZWxzL1Jlc291cmNlLmpzCkBAIC01NzIsMTEgKzU3Miw2IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJj ZSA9IGNsYXNzIFJlc291cmNlIGV4dGVuZHMgV2ViSW5zcGVjdG9yLlNvdXJjZUNvZGUKICAgICAg ICAgICAgIHRoaXMuX2Nvbm5lY3Rpb25JZGVudGlmaWVyID0gV2ViSW5zcGVjdG9yLlJlc291cmNl LmNvbm5lY3Rpb25JZGVudGlmaWVyRnJvbVBheWxvYWQobWV0cmljcy5jb25uZWN0aW9uSWRlbnRp Zmllcik7CiAgICAgfQogCi0gICAgY2FuUmVxdWVzdENvbnRlbnQoKQotICAgIHsKLSAgICAgICAg cmV0dXJuIHRoaXMuX2ZpbmlzaGVkOwotICAgIH0KLQogICAgIHJlcXVlc3RDb250ZW50RnJvbUJh Y2tlbmQoKQogICAgIHsKICAgICAgICAgLy8gSWYgd2UgaGF2ZSB0aGUgcmVxdWVzdElkZW50aWZp ZXIgd2UgY2FuIGdldCB0aGUgYWN0dWFsIHJlc3BvbnNlIGZvciB0aGlzIHNwZWNpZmljIHJlc291 cmNlLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvUmVzb3VyY2VDb250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL1Jlc291cmNlQ29udGVudFZpZXcuanMKaW5kZXggZGIxNDE3YS4uZjQxMzY3 NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv UmVzb3VyY2VDb250ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9SZXNvdXJjZUNvbnRlbnRWaWV3LmpzCkBAIC02Miw2ICs2MiwxNiBAQCBX ZWJJbnNwZWN0b3IuUmVzb3VyY2VDb250ZW50VmlldyA9IGNsYXNzIFJlc291cmNlQ29udGVudFZp ZXcgZXh0ZW5kcyBXZWJJbnNwZWN0bwogICAgICAgICByZXR1cm4gdGhpcy5fcmVzb3VyY2U7CiAg ICAgfQogCisgICAgZ2V0IHN1cHBvcnRzU2F2ZSgpCisgICAgeworICAgICAgICByZXR1cm4gdGhp cy5fcmVzb3VyY2UuZmluaXNoZWQ7CisgICAgfQorCisgICAgZ2V0IHNhdmVEYXRhKCkKKyAgICB7 CisgICAgICAgIHJldHVybiB7dXJsOiB0aGlzLl9yZXNvdXJjZS51cmwsIGNvbnRlbnQ6IHRoaXMu X3Jlc291cmNlLmNvbnRlbnR9OworICAgIH0KKwogICAgIGNvbnRlbnRBdmFpbGFibGUoY29udGVu dCwgYmFzZTY0RW5jb2RlZCkKICAgICB7CiAgICAgICAgIC8vIEltcGxlbWVudGVkIGJ5IHN1YmNs YXNzZXMuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9UZXh0UmVzb3VyY2VDb250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL1RleHRSZXNvdXJjZUNvbnRlbnRWaWV3LmpzCmluZGV4IDI2N2E4 ZTQuLmViNDRiOGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL1RleHRSZXNvdXJjZUNvbnRlbnRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RleHRSZXNvdXJjZUNvbnRlbnRWaWV3LmpzCkBA IC0xMjYsMTEgKzEyNiw2IEBAIFdlYkluc3BlY3Rvci5UZXh0UmVzb3VyY2VDb250ZW50VmlldyA9 IGNsYXNzIFRleHRSZXNvdXJjZUNvbnRlbnRWaWV3IGV4dGVuZHMgV2ViCiAgICAgICAgIHRoaXMu X3RleHRFZGl0b3IuY2xvc2UoKTsKICAgICB9CiAKLSAgICBnZXQgc3VwcG9ydHNTYXZlKCkKLSAg ICB7Ci0gICAgICAgIHJldHVybiB0cnVlOwotICAgIH0KLQogICAgIGdldCBzYXZlRGF0YSgpCiAg ICAgewogICAgICAgICByZXR1cm4ge3VybDogdGhpcy5yZXNvdXJjZS51cmwsIGNvbnRlbnQ6IHRo aXMuX3RleHRFZGl0b3Iuc3RyaW5nfTsK