148147 2015-08-18 15:46:09 -0700 Web Inspector: Add proper formatting for editing styles in the Visual Panel 2015-08-18 21:56:43 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 147563 1 hi hi bburg commit-queue graouts joepeck mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1118665 0 hi 2015-08-18 15:46:09 -0700 Currently, when any style changes in the Visual panel are saved to a resource (such as in the resources page) the formatting for those new styles is not consistent with the rest of the resource. This needs to be changed to match the rest of the resource. 1118666 1 webkit-bug-importer 2015-08-18 15:46:53 -0700 <rdar://problem/22333968> 1118676 2 259308 hi 2015-08-18 16:16:17 -0700 Created attachment 259308 Patch 1118718 3 259308 timothy 2015-08-18 17:11:45 -0700 Comment on attachment 259308 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=259308&action=review > Source/WebInspectorUI/UserInterface/Views/VisualStylePropertyCombiner.js:178 > + _generateFormattedTextForNewProperty(styleText, propertyValue) { No way to sure this with the other version below? 1118722 4 259308 hi 2015-08-18 17:16:08 -0700 Comment on attachment 259308 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=259308&action=review >> Source/WebInspectorUI/UserInterface/Views/VisualStylePropertyCombiner.js:178 >> + _generateFormattedTextForNewProperty(styleText, propertyValue) { > > No way to sure this with the other version below? Would making _generateFormattedTextForNewProperty a static function inside VisualStylePropertyEditor work? 1118724 5 timothy 2015-08-18 17:17:02 -0700 If it was not prefixed with an underscore, sure. 1118726 6 259326 hi 2015-08-18 17:21:30 -0700 Created attachment 259326 Patch 1118822 7 259326 commit-queue 2015-08-18 21:56:38 -0700 Comment on attachment 259326 Patch Clearing flags on attachment: 259326 Committed r188630: <http://trac.webkit.org/changeset/188630> 1118823 8 commit-queue 2015-08-18 21:56:43 -0700 All reviewed patches have been landed. Closing bug. 259308 2015-08-18 16:16:17 -0700 2015-08-18 17:21:28 -0700 Patch bug-148147-20150818161613.patch text/plain 8046 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDdiNTYwNjhkZTIwNWRmMzkzNDlkOGY0ZWQxMGNk NjE3ZmE1M2QzY2UuLjk1OGNlODY0OTYzNzA4N2M5YjQyZTVmMmM5MmE0NTI3MWFjNDk5YTcgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE1LTA4LTE4ICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBB ZGQgcHJvcGVyIGZvcm1hdHRpbmcgZm9yIGVkaXRpbmcgc3R5bGVzIGluIHRoZSBWaXN1YWwgUGFu ZWwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0ODE0 NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEVkaXRp bmcgc3R5bGVzIGluIHRoZSBWaXN1YWwgc3R5bGVzIHBhbmVsIG5vdyBwcmVzZXJ2ZXMgd2hpdGVz cGFjZSBpbiB0aGUgcmVsYXRlZCByZXNvdXJjZSBmaWxlLgorCisgICAgICAgICogVXNlckludGVy ZmFjZS9WaWV3cy9WaXN1YWxTdHlsZVByb3BlcnR5Q29tYmluZXIuanM6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuVmlzdWFsU3R5bGVQcm9wZXJ0eUNvbWJpbmVyKToKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5WaXN1YWxTdHlsZVByb3BlcnR5Q29tYmluZXIucHJvdG90eXBlLm1vZGlmeVByb3BlcnR5 VGV4dCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVmlzdWFsU3R5bGVQcm9wZXJ0eUNvbWJpbmVy LnByb3RvdHlwZS5fZ2VuZXJhdGVGb3JtYXR0ZWRUZXh0Rm9yTmV3UHJvcGVydHkpOgorCisgICAg ICAgICogVXNlckludGVyZmFjZS9WaWV3cy9WaXN1YWxTdHlsZVByb3BlcnR5RWRpdG9yLmpzOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLlZpc3VhbFN0eWxlUHJvcGVydHlFZGl0b3IpOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLlZpc3VhbFN0eWxlUHJvcGVydHlFZGl0b3IucHJvdG90eXBlLm1vZGlm eVByb3BlcnR5VGV4dCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVmlzdWFsU3R5bGVQcm9wZXJ0 eUVkaXRvci5wcm90b3R5cGUuX2dlbmVyYXRlRm9ybWF0dGVkVGV4dEZvck5ld1Byb3BlcnR5KToK KwogMjAxNS0wOC0xOCAgTmlraXRhIFZhc2lseWV2ICA8bnZhc2lseWV2QGFwcGxlLmNvbT4KIAog ICAgICAgICBXZWIgSW5zcGVjdG9yOiBPcHRpb24tRW50ZXIgc2hvdWxkIGNvbW1pdCBjb25zb2xl IGNvbW1hbmQgd2l0aG91dCBlcmFzaW5nIHRoZSBwcm9tcHQKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Zpc3VhbFN0eWxlUHJvcGVydHlDb21i aW5lci5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Zpc3Vh bFN0eWxlUHJvcGVydHlDb21iaW5lci5qcwppbmRleCAwYTdlZDFjN2M3OGM4ZTExYTljN2VlZDc2 ZDg5ZjM4MjFlMTdhZDU1Li45NzIxODJiNDM3NDgzNmMyYTM1YTRmOWI0YWJlMTNiYTEzZTZkMzQ3 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9W aXN1YWxTdHlsZVByb3BlcnR5Q29tYmluZXIuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvVmlzdWFsU3R5bGVQcm9wZXJ0eUNvbWJpbmVyLmpzCkBAIC00 MCw3ICs0MCw3IEBAIFdlYkluc3BlY3Rvci5WaXN1YWxTdHlsZVByb3BlcnR5Q29tYmluZXIgPSBj bGFzcyBWaXN1YWxTdHlsZVByb3BlcnR5Q29tYmluZXIgZXh0CiAgICAgICAgIH0KIAogICAgICAg ICB0aGlzLl90ZXh0Q29udGFpbnNOYW1lUmVnRXhwID0gbmV3IFJlZ0V4cCgiKD86KD86Xnw7KVxc cyoiICsgdGhpcy5fcHJvcGVydHlOYW1lICsgIlxccyo6KSIpOwotICAgICAgICB0aGlzLl9yZXBs YWNlbWVudFJlZ0V4cCA9IG5ldyBSZWdFeHAoIihefDspKD86XFxzKikoIiArIHRoaXMuX3Byb3Bl cnR5TmFtZSArICIpKC4rPyg/Ojt8JCkpIik7CisgICAgICAgIHRoaXMuX3JlcGxhY2VtZW50UmVn RXhwID0gbmV3IFJlZ0V4cCgiKCg/Ol58OylcXHMqKSgiICsgdGhpcy5fcHJvcGVydHlOYW1lICsg IikoLis/KD86O3wkKSkiKTsKICAgICAgICAgdGhpcy5fdmFsdWVSZWdFeHAgPSAvKFteXHNdK1wo LitcKXxbXlxzXSspKD86Oz8pL2c7CiAgICAgfQogCkBAIC04MCwxMiArODAsOSBAQCBXZWJJbnNw ZWN0b3IuVmlzdWFsU3R5bGVQcm9wZXJ0eUNvbWJpbmVyID0gY2xhc3MgVmlzdWFsU3R5bGVQcm9w ZXJ0eUNvbWJpbmVyIGV4dAogICAgICAgICBsZXQgdHJpbW1lZFRleHQgPSB0ZXh0LnRyaW1SaWdo dCgpOwogICAgICAgICBpZiAodGhpcy5fdGV4dENvbnRhaW5zTmFtZVJlZ0V4cC50ZXN0KHRleHQp KQogICAgICAgICAgICAgdGV4dCA9IHRleHQucmVwbGFjZSh0aGlzLl9yZXBsYWNlbWVudFJlZ0V4 cCwgdmFsdWUgIT09IG51bGwgPyAiJDEkMjogIiArIHZhbHVlICsgIjsiIDogIiQxIik7Ci0gICAg ICAgIGVsc2UgaWYgKHZhbHVlICE9PSBudWxsKSB7Ci0gICAgICAgICAgICBpZiAodHJpbW1lZFRl eHQudHJpbUxlZnQoKS5sZW5ndGggJiYgIXRyaW1tZWRUZXh0LmVuZHNXaXRoKCI7IikpCi0gICAg ICAgICAgICAgICAgdGV4dCArPSAiOyI7CisgICAgICAgIGVsc2UgaWYgKHZhbHVlICE9PSBudWxs KQorICAgICAgICAgICAgdGV4dCArPSB0aGlzLl9nZW5lcmF0ZUZvcm1hdHRlZFRleHRGb3JOZXdQ cm9wZXJ0eSh0ZXh0LCB2YWx1ZSk7CiAKLSAgICAgICAgICAgIHRleHQgKz0gdGhpcy5fcHJvcGVy dHlOYW1lICsgIjogIiArIHZhbHVlICsgIjsiOwotICAgICAgICB9CiAgICAgICAgIHJldHVybiB0 ZXh0OwogICAgIH0KIApAQCAtMTc3LDYgKzE3NCwzOCBAQCBXZWJJbnNwZWN0b3IuVmlzdWFsU3R5 bGVQcm9wZXJ0eUNvbWJpbmVyID0gY2xhc3MgVmlzdWFsU3R5bGVQcm9wZXJ0eUNvbWJpbmVyIGV4 dAogICAgICAgICB0aGlzLl9wcm9wZXJ0eU1pc3NpbmcgPSAhdmFsdWU7CiAgICAgICAgIHRoaXMu ZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5WaXN1YWxTdHlsZVByb3BlcnR5 RWRpdG9yLkV2ZW50LlZhbHVlRGlkQ2hhbmdlKTsKICAgICB9CisKKyAgICBfZ2VuZXJhdGVGb3Jt YXR0ZWRUZXh0Rm9yTmV3UHJvcGVydHkoc3R5bGVUZXh0LCBwcm9wZXJ0eVZhbHVlKSB7CisgICAg ICAgIGlmICghdGhpcy5fcHJvcGVydHlOYW1lIHx8ICFwcm9wZXJ0eVZhbHVlKQorICAgICAgICAg ICAgcmV0dXJuICIiOworCisgICAgICAgIHN0eWxlVGV4dCA9IHN0eWxlVGV4dCB8fCAiIjsKKwor ICAgICAgICAvLyBGSVhNRTogPHJkYXI6Ly9wcm9ibGVtLzEwNTkzOTQ4PiBQcm92aWRlIGEgd2F5 IHRvIGNoYW5nZSB0aGUgdGFiIHdpZHRoIGluIHRoZSBXZWIgSW5zcGVjdG9yCisgICAgICAgIGxl dCBsaW5lUHJlZml4VGV4dCA9ICIgICAgIjsKKyAgICAgICAgbGV0IGxpbmVTdWZmaXhXaGl0ZXNw YWNlID0gIlxuIjsKKyAgICAgICAgbGV0IHRyaW1tZWRUZXh0ID0gc3R5bGVUZXh0LnRyaW1SaWdo dCgpOworICAgICAgICBsZXQgdGV4dEhhc05ld2xpbmVzID0gdHJpbW1lZFRleHQuaW5jbHVkZXMo IlxuIik7CisKKyAgICAgICAgaWYgKHRyaW1tZWRUZXh0LnRyaW1MZWZ0KCkubGVuZ3RoKSB7Cisg ICAgICAgICAgICBsZXQgc3R5bGVUZXh0UHJlZml4V2hpdGVzcGFjZSA9IHRyaW1tZWRUZXh0Lm1h dGNoKC9eXHMqLyk7CisgICAgICAgICAgICBpZiAoc3R5bGVUZXh0UHJlZml4V2hpdGVzcGFjZSkg eworICAgICAgICAgICAgICAgIGxldCBsaW5lUHJlZml4V2hpdGVzcGFjZU1hdGNoID0gc3R5bGVU ZXh0UHJlZml4V2hpdGVzcGFjZVswXS5tYXRjaCgvW15cU1xuXSskLyk7CisgICAgICAgICAgICAg ICAgaWYgKGxpbmVQcmVmaXhXaGl0ZXNwYWNlTWF0Y2ggJiYgdGV4dEhhc05ld2xpbmVzKQorICAg ICAgICAgICAgICAgICAgICBsaW5lUHJlZml4VGV4dCA9IGxpbmVQcmVmaXhXaGl0ZXNwYWNlTWF0 Y2hbMF07CisgICAgICAgICAgICAgICAgZWxzZSB7CisgICAgICAgICAgICAgICAgICAgIGxpbmVQ cmVmaXhUZXh0ID0gIiI7CisgICAgICAgICAgICAgICAgICAgIGxpbmVTdWZmaXhXaGl0ZXNwYWNl ID0gc3R5bGVUZXh0UHJlZml4V2hpdGVzcGFjZVswXTsKKyAgICAgICAgICAgICAgICB9CisgICAg ICAgICAgICB9CisKKyAgICAgICAgICAgIGlmICghdHJpbW1lZFRleHQuZW5kc1dpdGgoIjsiKSkK KyAgICAgICAgICAgICAgICBsaW5lUHJlZml4VGV4dCA9ICI7IiArIGxpbmVQcmVmaXhUZXh0Owor ICAgICAgICB9IGVsc2UKKyAgICAgICAgICAgIGxpbmVQcmVmaXhUZXh0ID0gIlxuIiArIGxpbmVQ cmVmaXhUZXh0OworCisgICAgICAgIHJldHVybiBsaW5lUHJlZml4VGV4dCArIHRoaXMuX3Byb3Bl cnR5TmFtZSArICI6ICIgKyBwcm9wZXJ0eVZhbHVlICsgIjsiICsgbGluZVN1ZmZpeFdoaXRlc3Bh Y2U7CisgICAgfQogfTsKIAogV2ViSW5zcGVjdG9yLlZpc3VhbFN0eWxlUHJvcGVydHlDb21iaW5l ci5FZGl0b3JVcGRhdGVkU3ltYm9sID0gU3ltYm9sKCJ2aXN1YWwtc3R5bGUtcHJvcGVydHktY29t YmluZXItZWRpdG9yLXVwZGF0ZWQiKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Zpc3VhbFN0eWxlUHJvcGVydHlFZGl0b3IuanMgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9WaXN1YWxTdHlsZVByb3BlcnR5 RWRpdG9yLmpzCmluZGV4IDFkZGRmMDU3ZjdhOTEwM2RhNDRlZWRmYTYyOTkwZDU0ZjkxMDViMWUu LjMwN2I5M2FlM2Y4MjYwNjMzMjMwMGJkZDk0YmUwY2Y3NzE0MmE2YzIgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Zpc3VhbFN0eWxlUHJvcGVy dHlFZGl0b3IuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvVmlzdWFsU3R5bGVQcm9wZXJ0eUVkaXRvci5qcwpAQCAtMTA4LDcgKzEwOCw3IEBAIFdlYklu c3BlY3Rvci5WaXN1YWxTdHlsZVByb3BlcnR5RWRpdG9yID0gY2xhc3MgVmlzdWFsU3R5bGVQcm9w ZXJ0eUVkaXRvciBleHRlbmRzCiAgICAgICAgICAgICB0aGlzLl9wcm9wZXJ0eUluZm9MaXN0LnB1 c2goewogICAgICAgICAgICAgICAgIG5hbWUsCiAgICAgICAgICAgICAgICAgdGV4dENvbnRhaW5z TmFtZVJlZ0V4cDogbmV3IFJlZ0V4cCgiKD86KD86Xnw7KVxccyoiICsgbmFtZSArICJcXHMqOiki KSwKLSAgICAgICAgICAgICAgICByZXBsYWNlbWVudFJlZ0V4cDogbmV3IFJlZ0V4cCgiKF58Oyko PzpcXHMqKSgiICsgbmFtZSArICIpKC4rPyg/Ojt8JCkpIikKKyAgICAgICAgICAgICAgICByZXBs YWNlbWVudFJlZ0V4cDogbmV3IFJlZ0V4cCgiKCg/Ol58OylcXHMqKSgiICsgbmFtZSArICIpKC4r Pyg/Ojt8JCkpIikKICAgICAgICAgICAgIH0pCiAgICAgICAgIH0KIApAQCAtMjk3LDE2ICsyOTcs MTEgQEAgV2ViSW5zcGVjdG9yLlZpc3VhbFN0eWxlUHJvcGVydHlFZGl0b3IgPSBjbGFzcyBWaXN1 YWxTdHlsZVByb3BlcnR5RWRpdG9yIGV4dGVuZHMKIAogICAgIG1vZGlmeVByb3BlcnR5VGV4dCh0 ZXh0LCB2YWx1ZSkKICAgICB7Ci0gICAgICAgIGxldCB0cmltbWVkVGV4dCA9IHRleHQudHJpbVJp Z2h0KCk7CiAgICAgICAgIGZvciAobGV0IHByb3BlcnR5IG9mIHRoaXMuX3Byb3BlcnR5SW5mb0xp c3QpIHsKICAgICAgICAgICAgIGlmIChwcm9wZXJ0eS50ZXh0Q29udGFpbnNOYW1lUmVnRXhwLnRl c3QodGV4dCkpCiAgICAgICAgICAgICAgICAgdGV4dCA9IHRleHQucmVwbGFjZShwcm9wZXJ0eS5y ZXBsYWNlbWVudFJlZ0V4cCwgdmFsdWUgIT09IG51bGwgPyAiJDEkMjogIiArIHZhbHVlICsgIjsi IDogIiQxIik7Ci0gICAgICAgICAgICBlbHNlIGlmICh2YWx1ZSAhPT0gbnVsbCkgewotICAgICAg ICAgICAgICAgIGlmICh0cmltbWVkVGV4dC50cmltTGVmdCgpLmxlbmd0aCAmJiAhdHJpbW1lZFRl eHQuZW5kc1dpdGgoIjsiKSkKLSAgICAgICAgICAgICAgICAgICAgdGV4dCArPSAiOyI7Ci0KLSAg ICAgICAgICAgICAgICB0ZXh0ICs9IHByb3BlcnR5Lm5hbWUgKyAiOiAiICsgdmFsdWUgKyAiOyI7 Ci0gICAgICAgICAgICB9CisgICAgICAgICAgICBlbHNlIGlmICh2YWx1ZSAhPT0gbnVsbCkKKyAg ICAgICAgICAgICAgICB0ZXh0ICs9IHRoaXMuX2dlbmVyYXRlRm9ybWF0dGVkVGV4dEZvck5ld1By b3BlcnR5KHRleHQsIHByb3BlcnR5Lm5hbWUsIHZhbHVlKTsKICAgICAgICAgfQogICAgICAgICBy ZXR1cm4gdGV4dDsKICAgICB9CkBAIC00NTgsNiArNDUzLDM4IEBAIFdlYkluc3BlY3Rvci5WaXN1 YWxTdHlsZVByb3BlcnR5RWRpdG9yID0gY2xhc3MgVmlzdWFsU3R5bGVQcm9wZXJ0eUVkaXRvciBl eHRlbmRzCiAgICAgICAgIHJldHVybiBsb25naGFuZFRleHQgPyB0ZXh0LnJlcGxhY2Uoc2hvcnRo YW5kLnRleHQsIGxvbmdoYW5kVGV4dCkgOiB0ZXh0OwogICAgIH0KIAorICAgIF9nZW5lcmF0ZUZv cm1hdHRlZFRleHRGb3JOZXdQcm9wZXJ0eShzdHlsZVRleHQsIHByb3BlcnR5TmFtZSwgcHJvcGVy dHlWYWx1ZSkgeworICAgICAgICBpZiAoIXByb3BlcnR5TmFtZSB8fCAhcHJvcGVydHlWYWx1ZSkK KyAgICAgICAgICAgIHJldHVybiAiIjsKKworICAgICAgICBzdHlsZVRleHQgPSBzdHlsZVRleHQg fHwgIiI7CisKKyAgICAgICAgLy8gRklYTUU6IDxyZGFyOi8vcHJvYmxlbS8xMDU5Mzk0OD4gUHJv dmlkZSBhIHdheSB0byBjaGFuZ2UgdGhlIHRhYiB3aWR0aCBpbiB0aGUgV2ViIEluc3BlY3Rvcgor ICAgICAgICBsZXQgbGluZVByZWZpeFRleHQgPSAiICAgICI7CisgICAgICAgIGxldCBsaW5lU3Vm Zml4V2hpdGVzcGFjZSA9ICJcbiI7CisgICAgICAgIGxldCB0cmltbWVkVGV4dCA9IHN0eWxlVGV4 dC50cmltUmlnaHQoKTsKKyAgICAgICAgbGV0IHRleHRIYXNOZXdsaW5lcyA9IHRyaW1tZWRUZXh0 LmluY2x1ZGVzKCJcbiIpOworCisgICAgICAgIGlmICh0cmltbWVkVGV4dC50cmltTGVmdCgpLmxl bmd0aCkgeworICAgICAgICAgICAgbGV0IHN0eWxlVGV4dFByZWZpeFdoaXRlc3BhY2UgPSB0cmlt bWVkVGV4dC5tYXRjaCgvXlxzKi8pOworICAgICAgICAgICAgaWYgKHN0eWxlVGV4dFByZWZpeFdo aXRlc3BhY2UpIHsKKyAgICAgICAgICAgICAgICBsZXQgbGluZVByZWZpeFdoaXRlc3BhY2VNYXRj aCA9IHN0eWxlVGV4dFByZWZpeFdoaXRlc3BhY2VbMF0ubWF0Y2goL1teXFNcbl0rJC8pOworICAg ICAgICAgICAgICAgIGlmIChsaW5lUHJlZml4V2hpdGVzcGFjZU1hdGNoICYmIHRleHRIYXNOZXds aW5lcykKKyAgICAgICAgICAgICAgICAgICAgbGluZVByZWZpeFRleHQgPSBsaW5lUHJlZml4V2hp dGVzcGFjZU1hdGNoWzBdOworICAgICAgICAgICAgICAgIGVsc2UgeworICAgICAgICAgICAgICAg ICAgICBsaW5lUHJlZml4VGV4dCA9ICIiOworICAgICAgICAgICAgICAgICAgICBsaW5lU3VmZml4 V2hpdGVzcGFjZSA9IHN0eWxlVGV4dFByZWZpeFdoaXRlc3BhY2VbMF07CisgICAgICAgICAgICAg ICAgfQorICAgICAgICAgICAgfQorCisgICAgICAgICAgICBpZiAoIXRyaW1tZWRUZXh0LmVuZHNX aXRoKCI7IikpCisgICAgICAgICAgICAgICAgbGluZVByZWZpeFRleHQgPSAiOyIgKyBsaW5lUHJl Zml4VGV4dDsKKyAgICAgICAgfSBlbHNlCisgICAgICAgICAgICBsaW5lUHJlZml4VGV4dCA9ICJc biIgKyBsaW5lUHJlZml4VGV4dDsKKworICAgICAgICByZXR1cm4gbGluZVByZWZpeFRleHQgKyBw cm9wZXJ0eU5hbWUgKyAiOiAiICsgcHJvcGVydHlWYWx1ZSArICI7IiArIGxpbmVTdWZmaXhXaGl0 ZXNwYWNlOworICAgIH0KKwogICAgIF90aXRsZUVsZW1lbnRQcmVwYXJlRm9yQ2xpY2soZXZlbnQp CiAgICAgewogICAgICAgICB0aGlzLl90aXRsZUVsZW1lbnQuY2xhc3NMaXN0LnRvZ2dsZSgicHJv cGVydHktcmVmZXJlbmNlLWluZm8iLCBldmVudC50eXBlID09PSAia2V5ZG93biIgJiYgZXZlbnQu YWx0S2V5KTsK 259326 2015-08-18 17:21:30 -0700 2015-08-18 21:56:38 -0700 Patch bug-148147-20150818172128.patch text/plain 6158 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDdiNTYwNjhkZTIwNWRmMzkzNDlkOGY0ZWQxMGNk NjE3ZmE1M2QzY2UuLjc1YjAyZjhjNmVmMjMzOTFkNDFlOTY3ZWYyZDkwYWI0NmEyN2FmZWMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE1LTA4LTE4ICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBB ZGQgcHJvcGVyIGZvcm1hdHRpbmcgZm9yIGVkaXRpbmcgc3R5bGVzIGluIHRoZSBWaXN1YWwgUGFu ZWwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0ODE0 NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEVkaXRp bmcgc3R5bGVzIGluIHRoZSBWaXN1YWwgc3R5bGVzIHBhbmVsIG5vdyBwcmVzZXJ2ZXMgd2hpdGVz cGFjZSBpbiB0aGUgcmVsYXRlZCByZXNvdXJjZSBmaWxlLgorCisgICAgICAgICogVXNlckludGVy ZmFjZS9WaWV3cy9WaXN1YWxTdHlsZVByb3BlcnR5Q29tYmluZXIuanM6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuVmlzdWFsU3R5bGVQcm9wZXJ0eUNvbWJpbmVyKToKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5WaXN1YWxTdHlsZVByb3BlcnR5Q29tYmluZXIucHJvdG90eXBlLm1vZGlmeVByb3BlcnR5 VGV4dCk6CisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1Zpc3VhbFN0eWxlUHJvcGVy dHlFZGl0b3IuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVmlzdWFsU3R5bGVQcm9wZXJ0eUVk aXRvcik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVmlzdWFsU3R5bGVQcm9wZXJ0eUVkaXRvci5n ZW5lcmF0ZUZvcm1hdHRlZFRleHRGb3JOZXdQcm9wZXJ0eSk6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuVmlzdWFsU3R5bGVQcm9wZXJ0eUVkaXRvci5wcm90b3R5cGUubW9kaWZ5UHJvcGVydHlUZXh0 KToKKwogMjAxNS0wOC0xOCAgTmlraXRhIFZhc2lseWV2ICA8bnZhc2lseWV2QGFwcGxlLmNvbT4K IAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBPcHRpb24tRW50ZXIgc2hvdWxkIGNvbW1pdCBjb25z b2xlIGNvbW1hbmQgd2l0aG91dCBlcmFzaW5nIHRoZSBwcm9tcHQKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Zpc3VhbFN0eWxlUHJvcGVydHlD b21iaW5lci5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Zp c3VhbFN0eWxlUHJvcGVydHlDb21iaW5lci5qcwppbmRleCAwYTdlZDFjN2M3OGM4ZTExYTljN2Vl ZDc2ZDg5ZjM4MjFlMTdhZDU1Li4yM2VlNGEwZTNmYTU0OWI3MjFjNTMzZjEwMGZkYmI1ODBlMzVk MjE1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9WaXN1YWxTdHlsZVByb3BlcnR5Q29tYmluZXIuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVmlzdWFsU3R5bGVQcm9wZXJ0eUNvbWJpbmVyLmpzCkBA IC00MCw3ICs0MCw3IEBAIFdlYkluc3BlY3Rvci5WaXN1YWxTdHlsZVByb3BlcnR5Q29tYmluZXIg PSBjbGFzcyBWaXN1YWxTdHlsZVByb3BlcnR5Q29tYmluZXIgZXh0CiAgICAgICAgIH0KIAogICAg ICAgICB0aGlzLl90ZXh0Q29udGFpbnNOYW1lUmVnRXhwID0gbmV3IFJlZ0V4cCgiKD86KD86Xnw7 KVxccyoiICsgdGhpcy5fcHJvcGVydHlOYW1lICsgIlxccyo6KSIpOwotICAgICAgICB0aGlzLl9y ZXBsYWNlbWVudFJlZ0V4cCA9IG5ldyBSZWdFeHAoIihefDspKD86XFxzKikoIiArIHRoaXMuX3By b3BlcnR5TmFtZSArICIpKC4rPyg/Ojt8JCkpIik7CisgICAgICAgIHRoaXMuX3JlcGxhY2VtZW50 UmVnRXhwID0gbmV3IFJlZ0V4cCgiKCg/Ol58OylcXHMqKSgiICsgdGhpcy5fcHJvcGVydHlOYW1l ICsgIikoLis/KD86O3wkKSkiKTsKICAgICAgICAgdGhpcy5fdmFsdWVSZWdFeHAgPSAvKFteXHNd K1woLitcKXxbXlxzXSspKD86Oz8pL2c7CiAgICAgfQogCkBAIC04MCwxMiArODAsOSBAQCBXZWJJ bnNwZWN0b3IuVmlzdWFsU3R5bGVQcm9wZXJ0eUNvbWJpbmVyID0gY2xhc3MgVmlzdWFsU3R5bGVQ cm9wZXJ0eUNvbWJpbmVyIGV4dAogICAgICAgICBsZXQgdHJpbW1lZFRleHQgPSB0ZXh0LnRyaW1S aWdodCgpOwogICAgICAgICBpZiAodGhpcy5fdGV4dENvbnRhaW5zTmFtZVJlZ0V4cC50ZXN0KHRl eHQpKQogICAgICAgICAgICAgdGV4dCA9IHRleHQucmVwbGFjZSh0aGlzLl9yZXBsYWNlbWVudFJl Z0V4cCwgdmFsdWUgIT09IG51bGwgPyAiJDEkMjogIiArIHZhbHVlICsgIjsiIDogIiQxIik7Ci0g ICAgICAgIGVsc2UgaWYgKHZhbHVlICE9PSBudWxsKSB7Ci0gICAgICAgICAgICBpZiAodHJpbW1l ZFRleHQudHJpbUxlZnQoKS5sZW5ndGggJiYgIXRyaW1tZWRUZXh0LmVuZHNXaXRoKCI7IikpCi0g ICAgICAgICAgICAgICAgdGV4dCArPSAiOyI7CisgICAgICAgIGVsc2UgaWYgKHZhbHVlICE9PSBu dWxsKQorICAgICAgICAgICAgdGV4dCArPSBXZWJJbnNwZWN0b3IuVmlzdWFsU3R5bGVQcm9wZXJ0 eUVkaXRvci5nZW5lcmF0ZUZvcm1hdHRlZFRleHRGb3JOZXdQcm9wZXJ0eSh0ZXh0LCB0aGlzLl9w cm9wZXJ0eU5hbWUsIHZhbHVlKTsKIAotICAgICAgICAgICAgdGV4dCArPSB0aGlzLl9wcm9wZXJ0 eU5hbWUgKyAiOiAiICsgdmFsdWUgKyAiOyI7Ci0gICAgICAgIH0KICAgICAgICAgcmV0dXJuIHRl eHQ7CiAgICAgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9WaXN1YWxTdHlsZVByb3BlcnR5RWRpdG9yLmpzIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVmlzdWFsU3R5bGVQcm9wZXJ0eUVkaXRvci5qcwpp bmRleCAxZGRkZjA1N2Y3YTkxMDNkYTQ0ZWVkZmE2Mjk5MGQ1NGY5MTA1YjFlLi5iMDkyMDhhMTE5 ZThkZDg0ODk1ZWNhNmNiODRiMGFiNWU0ZjJlMDJmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9WaXN1YWxTdHlsZVByb3BlcnR5RWRpdG9yLmpz CisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Zpc3VhbFN0 eWxlUHJvcGVydHlFZGl0b3IuanMKQEAgLTEwOCw3ICsxMDgsNyBAQCBXZWJJbnNwZWN0b3IuVmlz dWFsU3R5bGVQcm9wZXJ0eUVkaXRvciA9IGNsYXNzIFZpc3VhbFN0eWxlUHJvcGVydHlFZGl0b3Ig ZXh0ZW5kcwogICAgICAgICAgICAgdGhpcy5fcHJvcGVydHlJbmZvTGlzdC5wdXNoKHsKICAgICAg ICAgICAgICAgICBuYW1lLAogICAgICAgICAgICAgICAgIHRleHRDb250YWluc05hbWVSZWdFeHA6 IG5ldyBSZWdFeHAoIig/Oig/Ol58OylcXHMqIiArIG5hbWUgKyAiXFxzKjopIiksCi0gICAgICAg ICAgICAgICAgcmVwbGFjZW1lbnRSZWdFeHA6IG5ldyBSZWdFeHAoIihefDspKD86XFxzKikoIiAr IG5hbWUgKyAiKSguKz8oPzo7fCQpKSIpCisgICAgICAgICAgICAgICAgcmVwbGFjZW1lbnRSZWdF eHA6IG5ldyBSZWdFeHAoIigoPzpefDspXFxzKikoIiArIG5hbWUgKyAiKSguKz8oPzo7fCQpKSIp CiAgICAgICAgICAgICB9KQogICAgICAgICB9CiAKQEAgLTExOCw2ICsxMTgsNDAgQEAgV2ViSW5z cGVjdG9yLlZpc3VhbFN0eWxlUHJvcGVydHlFZGl0b3IgPSBjbGFzcyBWaXN1YWxTdHlsZVByb3Bl cnR5RWRpdG9yIGV4dGVuZHMKICAgICAgICAgdGhpcy5fcmVwcmVzZW50ZWRQcm9wZXJ0eSA9IG51 bGw7CiAgICAgfQogCisgICAgLy8gU3RhdGljCisKKyAgICBzdGF0aWMgZ2VuZXJhdGVGb3JtYXR0 ZWRUZXh0Rm9yTmV3UHJvcGVydHkoc3R5bGVUZXh0LCBwcm9wZXJ0eU5hbWUsIHByb3BlcnR5VmFs dWUpIHsKKyAgICAgICAgaWYgKCFwcm9wZXJ0eU5hbWUgfHwgIXByb3BlcnR5VmFsdWUpCisgICAg ICAgICAgICByZXR1cm4gIiI7CisKKyAgICAgICAgc3R5bGVUZXh0ID0gc3R5bGVUZXh0IHx8ICIi OworCisgICAgICAgIC8vIEZJWE1FOiA8cmRhcjovL3Byb2JsZW0vMTA1OTM5NDg+IFByb3ZpZGUg YSB3YXkgdG8gY2hhbmdlIHRoZSB0YWIgd2lkdGggaW4gdGhlIFdlYiBJbnNwZWN0b3IKKyAgICAg ICAgbGV0IGxpbmVQcmVmaXhUZXh0ID0gIiAgICAiOworICAgICAgICBsZXQgbGluZVN1ZmZpeFdo aXRlc3BhY2UgPSAiXG4iOworICAgICAgICBsZXQgdHJpbW1lZFRleHQgPSBzdHlsZVRleHQudHJp bVJpZ2h0KCk7CisgICAgICAgIGxldCB0ZXh0SGFzTmV3bGluZXMgPSB0cmltbWVkVGV4dC5pbmNs dWRlcygiXG4iKTsKKworICAgICAgICBpZiAodHJpbW1lZFRleHQudHJpbUxlZnQoKS5sZW5ndGgp IHsKKyAgICAgICAgICAgIGxldCBzdHlsZVRleHRQcmVmaXhXaGl0ZXNwYWNlID0gdHJpbW1lZFRl eHQubWF0Y2goL15ccyovKTsKKyAgICAgICAgICAgIGlmIChzdHlsZVRleHRQcmVmaXhXaGl0ZXNw YWNlKSB7CisgICAgICAgICAgICAgICAgbGV0IGxpbmVQcmVmaXhXaGl0ZXNwYWNlTWF0Y2ggPSBz dHlsZVRleHRQcmVmaXhXaGl0ZXNwYWNlWzBdLm1hdGNoKC9bXlxTXG5dKyQvKTsKKyAgICAgICAg ICAgICAgICBpZiAobGluZVByZWZpeFdoaXRlc3BhY2VNYXRjaCAmJiB0ZXh0SGFzTmV3bGluZXMp CisgICAgICAgICAgICAgICAgICAgIGxpbmVQcmVmaXhUZXh0ID0gbGluZVByZWZpeFdoaXRlc3Bh Y2VNYXRjaFswXTsKKyAgICAgICAgICAgICAgICBlbHNlIHsKKyAgICAgICAgICAgICAgICAgICAg bGluZVByZWZpeFRleHQgPSAiIjsKKyAgICAgICAgICAgICAgICAgICAgbGluZVN1ZmZpeFdoaXRl c3BhY2UgPSBzdHlsZVRleHRQcmVmaXhXaGl0ZXNwYWNlWzBdOworICAgICAgICAgICAgICAgIH0K KyAgICAgICAgICAgIH0KKworICAgICAgICAgICAgaWYgKCF0cmltbWVkVGV4dC5lbmRzV2l0aCgi OyIpKQorICAgICAgICAgICAgICAgIGxpbmVQcmVmaXhUZXh0ID0gIjsiICsgbGluZVByZWZpeFRl eHQ7CisgICAgICAgIH0gZWxzZQorICAgICAgICAgICAgbGluZVByZWZpeFRleHQgPSAiXG4iICsg bGluZVByZWZpeFRleHQ7CisKKyAgICAgICAgcmV0dXJuIGxpbmVQcmVmaXhUZXh0ICsgcHJvcGVy dHlOYW1lICsgIjogIiArIHByb3BlcnR5VmFsdWUgKyAiOyIgKyBsaW5lU3VmZml4V2hpdGVzcGFj ZTsKKyAgICB9CisKICAgICAvLyBQdWJsaWMKIAogICAgIGdldCBlbGVtZW50KCkKQEAgLTI5Nywx NiArMzMxLDExIEBAIFdlYkluc3BlY3Rvci5WaXN1YWxTdHlsZVByb3BlcnR5RWRpdG9yID0gY2xh c3MgVmlzdWFsU3R5bGVQcm9wZXJ0eUVkaXRvciBleHRlbmRzCiAKICAgICBtb2RpZnlQcm9wZXJ0 eVRleHQodGV4dCwgdmFsdWUpCiAgICAgewotICAgICAgICBsZXQgdHJpbW1lZFRleHQgPSB0ZXh0 LnRyaW1SaWdodCgpOwogICAgICAgICBmb3IgKGxldCBwcm9wZXJ0eSBvZiB0aGlzLl9wcm9wZXJ0 eUluZm9MaXN0KSB7CiAgICAgICAgICAgICBpZiAocHJvcGVydHkudGV4dENvbnRhaW5zTmFtZVJl Z0V4cC50ZXN0KHRleHQpKQogICAgICAgICAgICAgICAgIHRleHQgPSB0ZXh0LnJlcGxhY2UocHJv cGVydHkucmVwbGFjZW1lbnRSZWdFeHAsIHZhbHVlICE9PSBudWxsID8gIiQxJDI6ICIgKyB2YWx1 ZSArICI7IiA6ICIkMSIpOwotICAgICAgICAgICAgZWxzZSBpZiAodmFsdWUgIT09IG51bGwpIHsK LSAgICAgICAgICAgICAgICBpZiAodHJpbW1lZFRleHQudHJpbUxlZnQoKS5sZW5ndGggJiYgIXRy aW1tZWRUZXh0LmVuZHNXaXRoKCI7IikpCi0gICAgICAgICAgICAgICAgICAgIHRleHQgKz0gIjsi OwotCi0gICAgICAgICAgICAgICAgdGV4dCArPSBwcm9wZXJ0eS5uYW1lICsgIjogIiArIHZhbHVl ICsgIjsiOwotICAgICAgICAgICAgfQorICAgICAgICAgICAgZWxzZSBpZiAodmFsdWUgIT09IG51 bGwpCisgICAgICAgICAgICAgICAgdGV4dCArPSBXZWJJbnNwZWN0b3IuVmlzdWFsU3R5bGVQcm9w ZXJ0eUVkaXRvci5nZW5lcmF0ZUZvcm1hdHRlZFRleHRGb3JOZXdQcm9wZXJ0eSh0ZXh0LCBwcm9w ZXJ0eS5uYW1lLCB2YWx1ZSk7CiAgICAgICAgIH0KICAgICAgICAgcmV0dXJuIHRleHQ7CiAgICAg fQo=