145668 2015-06-04 15:44:15 -0700 Web Inspector: Fixing code style and adding more limitations for bug 141262 2015-06-05 18:23:43 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED DoNotImportToRadar P2 Normal --- 1 hi webkit-unassigned commit-queue graouts joepeck jonowells mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1099650 0 hi 2015-06-04 15:44:15 -0700 Fixing style changes in https://bugs.webkit.org/show_bug.cgi?id=141262. In addition, code was added to prevent the invalid strikethrough from being applied to the following cases: - <property name>: // Only the property name and colon are present. - <property name>: <property value>; // Multiple/zero spaces are present between the colon and property value (caused the strikethrough to be applied to the wrong selection of text). 1099651 1 webkit-bug-importer 2015-06-04 15:44:40 -0700 <rdar://problem/21250324> 1099652 2 254309 hi 2015-06-04 15:49:00 -0700 Created attachment 254309 Patch 1099750 3 254309 timothy 2015-06-04 21:29:37 -0700 Comment on attachment 254309 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=254309&action=review > Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationTextEditor.js:538 > + if (!property.valid && propertyNameIsValid && property.text.slice(-1) !== ":") { .trim().endsWith(":")? 1099985 4 254392 hi 2015-06-05 15:23:06 -0700 Created attachment 254392 Patch 1100025 5 254392 commit-queue 2015-06-05 17:28:20 -0700 Comment on attachment 254392 Patch Rejecting attachment 254392 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.appspot.com', '--bot-id=webkit-cq-03', 'validate-changelog', '--check-oops', '--non-interactive', 254392, '--port=mac']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit ChangeLog entry in Source/WebInspectorUI/ChangeLog contains OOPS!. Full output: http://webkit-queues.appspot.com/results/6439325541597184 1100026 6 254392 timothy 2015-06-05 17:29:28 -0700 Comment on attachment 254392 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=254392&action=review > Source/WebInspectorUI/ChangeLog:6 > + Reviewed by NOBODY (OOPS!). Double ChangeLog. 1100033 7 254402 hi 2015-06-05 17:49:49 -0700 Created attachment 254402 Patch 1100041 8 254402 commit-queue 2015-06-05 18:23:40 -0700 Comment on attachment 254402 Patch Clearing flags on attachment: 254402 Committed r185282: <http://trac.webkit.org/changeset/185282> 1100042 9 commit-queue 2015-06-05 18:23:43 -0700 All reviewed patches have been landed. Closing bug. 254309 2015-06-04 15:49:00 -0700 2015-06-05 15:23:02 -0700 Patch bug-145668-20150604154838.patch text/plain 4555 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGYyODczZWJiOGJlNTQxOTY2NGQ5NWEzMTcyMmU1 MDJkNGQ2YmFlYjIuLjA4NzZhZTkzOTAxZGIxNWU3NDliMjNkZmNmYzEwMTgwNTNjMjliOWEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDE1LTA2LTA0ICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBG aXhpbmcgY29kZSBzdHlsZSBhbmQgYWRkaW5nIG1vcmUgbGltaXRhdGlvbnMgZm9yIGJ1ZyAxNDEy NjIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NTY2 OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVXNl ckludGVyZmFjZS9WaWV3cy9DU1NTdHlsZURlY2xhcmF0aW9uVGV4dEVkaXRvci5qczoKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5DU1NTdHlsZURlY2xhcmF0aW9uVGV4dEVkaXRvci5wcm90b3R5cGUu X2NyZWF0ZVRleHRNYXJrZXJGb3JQcm9wZXJ0eUlmTmVlZGVkKTogQWRkZWQgbG9naWMgdG8gcHJl dmVudCBpbnZhbGlkIHN0eWxlIGZyb20gYmVpbmcgYXBwbGllZCBpbmNvcnJlY3RseS4KKworMjAx NS0wNi0wMyAgRGV2aW4gUm91c3NvICA8ZHJvdXNzb0BhcHBsZS5jb20+CisKKyAgICAgICAgV2Vi IEluc3BlY3RvcjogaWYgYSBrbm93biBDU1MgcHJvcGVydHkgaGFzIGFuIHVuc3VwcG9ydGVkIHZh bHVlLCBvbmx5IHN0cmlrZXRocm91Z2ggdGhlIHZhbHVlCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDEyNjIKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvTW9kZWxzL0NTU0NvbXBs ZXRpb25zLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNTU0NvbXBsZXRpb25zLnByb3RvdHlw ZS5pc1ZhbGlkUHJvcGVydHlOYW1lKTogTG9vcHMgdGhyb3VnaCB0aGUgZnVsbCBwcm9wZXJ0eSBs aXN0IGFuZCByZXR1cm5zIHRydWUgb25seSBpZiBhIHByb3BlcnR5IGV4YWN0bHkgbWF0Y2hlcyB0 aGUgZ2l2ZW4gcHJvcGVydHkgbmFtZS4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5DU1NDb21wbGV0 aW9ucyk6IEFkZGVkIGlzVmFsaWRQcm9wZXJ0eU5hbWUgZnVuY3Rpb24uCisgICAgICAgICogVXNl ckludGVyZmFjZS9WaWV3cy9DU1NTdHlsZURlY2xhcmF0aW9uVGV4dEVkaXRvci5qczoKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5DU1NTdHlsZURlY2xhcmF0aW9uVGV4dEVkaXRvci5wcm90b3R5cGUu X2NyZWF0ZVRleHRNYXJrZXJGb3JQcm9wZXJ0eUlmTmVlZGVkKTogQWRkZWQgbG9naWMgdG8gbGlt aXQgdGhlIGludmFsaWQgY2xhc3MgbWFya2VyIHRvIG9ubHkgdGhlIHByb3BlcnR5IHZhbHVlIGlm IHRoZSBwcm9wZXJ0eSBuYW1lIGlzIGFuIGFjdHVhbCBwcm9wZXJ0eS4KKwogMjAxNS0wNi0wNCAg TmlraXRhIFZhc2lseWV2ICA8bnZhc2lseWV2QGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5z cGVjdG9yOiBEZWNyZWFzZSB0YWJzIGhlaWdodCB0byBtYXRjaCBTYWZhcmkncyB0YWJzIGhlaWdo dApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxz L0NTU0NvbXBsZXRpb25zLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv TW9kZWxzL0NTU0NvbXBsZXRpb25zLmpzCmluZGV4IDQ3YmZjYWZjNWVkY2IyZWQ2Y2FkODI0M2Jj ZWIwM2FiYTA0OGVkNzEuLmQ1MDBiNTJmYWQ5MmI4ZjViYmI1YzQyMGZjNDIwZWJmMzM0YTlkZGMg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9D U1NDb21wbGV0aW9ucy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9Nb2RlbHMvQ1NTQ29tcGxldGlvbnMuanMKQEAgLTI3NiwxNCArMjc2LDkgQEAgV2ViSW5zcGVj dG9yLkNTU0NvbXBsZXRpb25zID0gY2xhc3MgQ1NTQ29tcGxldGlvbnMKICAgICAgICAgcmV0dXJu IHRoaXMuX3Nob3J0aGFuZHNbbG9uZ2hhbmRdIHx8IFtdOwogICAgIH0KIAotICAgIG5hbWVNYXRj aGVzVmFsaWRQcm9wZXJ0eUV4YWN0bHkobmFtZSkKKyAgICBpc1ZhbGlkUHJvcGVydHlOYW1lKG5h bWUpCiAgICAgewotICAgICAgICBmb3IgKHZhciBwcm9wZXJ0eSBvZiB0aGlzLl92YWx1ZXMpIHsK LSAgICAgICAgICAgIGlmIChwcm9wZXJ0eSA9PT0gbmFtZSkKLSAgICAgICAgICAgICAgICByZXR1 cm4gdHJ1ZTsKLSAgICAgICAgfQotCi0gICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgcmV0 dXJuIHRoaXMuX3ZhbHVlcy5pbmNsdWRlcyhuYW1lKTsKICAgICB9CiB9OwogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9DU1NTdHlsZURlY2xh cmF0aW9uVGV4dEVkaXRvci5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL0NTU1N0eWxlRGVjbGFyYXRpb25UZXh0RWRpdG9yLmpzCmluZGV4IDg1NjQ2Mjk4Y2Jl ODE2NGQzMDFlMjYzNzVjMTUyNjM2ZDNlYjllZTQuLjU1YmEwZjQ2NDI4MTY0ODVmMDdmZjdhZDA4 OWIwOGQ3MTc1NGNjZTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL0NTU1N0eWxlRGVjbGFyYXRpb25UZXh0RWRpdG9yLmpzCisrKyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NTU1N0eWxlRGVjbGFyYXRpb25U ZXh0RWRpdG9yLmpzCkBAIC00OTIsNyArNDkyLDcgQEAgV2ViSW5zcGVjdG9yLkNTU1N0eWxlRGVj bGFyYXRpb25UZXh0RWRpdG9yID0gY2xhc3MgQ1NTU3R5bGVEZWNsYXJhdGlvblRleHRFZGl0b3IK IAogICAgICAgICB2YXIgcHJvcGVydHlOYW1lSXNWYWxpZCA9IGZhbHNlOwogICAgICAgICBpZiAo V2ViSW5zcGVjdG9yLkNTU0NvbXBsZXRpb25zLmNzc05hbWVDb21wbGV0aW9ucykKLSAgICAgICAg ICAgIHByb3BlcnR5TmFtZUlzVmFsaWQgPSBXZWJJbnNwZWN0b3IuQ1NTQ29tcGxldGlvbnMuY3Nz TmFtZUNvbXBsZXRpb25zLm5hbWVNYXRjaGVzVmFsaWRQcm9wZXJ0eUV4YWN0bHkocHJvcGVydHku bmFtZSk7CisgICAgICAgICAgICBwcm9wZXJ0eU5hbWVJc1ZhbGlkID0gV2ViSW5zcGVjdG9yLkNT U0NvbXBsZXRpb25zLmNzc05hbWVDb21wbGV0aW9ucy5pc1ZhbGlkUHJvcGVydHlOYW1lKHByb3Bl cnR5Lm5hbWUpOwogCiAgICAgICAgIHZhciBjbGFzc05hbWVzID0gWyJjc3Mtc3R5bGUtZGVjbGFy YXRpb24tcHJvcGVydHkiXTsKIApAQCAtNTM1LDggKzUzNSwxMSBAQCBXZWJJbnNwZWN0b3IuQ1NT U3R5bGVEZWNsYXJhdGlvblRleHRFZGl0b3IgPSBjbGFzcyBDU1NTdHlsZURlY2xhcmF0aW9uVGV4 dEVkaXRvcgogCiAgICAgICAgIHRoaXMuX3JlbW92ZUNoZWNrYm94UGxhY2Vob2xkZXIoZnJvbS5s aW5lKTsKIAotICAgICAgICBpZiAoIXByb3BlcnR5LnZhbGlkICYmIHByb3BlcnR5TmFtZUlzVmFs aWQpIHsKLSAgICAgICAgICAgIHZhciBzdGFydCA9IHtsaW5lOiBmcm9tLmxpbmUsIGNoOiBmcm9t LmNoICsgcHJvcGVydHkudGV4dC5pbmRleE9mKHByb3BlcnR5LnZhbHVlKX07CisgICAgICAgIGlm ICghcHJvcGVydHkudmFsaWQgJiYgcHJvcGVydHlOYW1lSXNWYWxpZCAmJiBwcm9wZXJ0eS50ZXh0 LnNsaWNlKC0xKSAhPT0gIjoiKSB7CisgICAgICAgICAgICAvLyBUaGUgcHJvcGVydHkudGV4dC5z bGljZSgtMSkgaXMgZm9yIHRoZSBzaXR1YXRpb24gd2hlbiBhIHByb3BlcnR5IG9ubHkgaGFzIGEg bmFtZSBhbmQgY29sb24gYW5kIHRoZSB1c2VyIGxlYXZlcyB0aGUgdmFsdWUgYmxhbmsgKGl0IGxv b2tzIHdlaXJkIHRvIGhhdmUgYW4gaW52YWxpZCBtYXJrZXIgdGhyb3VnaCBqdXN0IHRoZSBjb2xv bikuCisgICAgICAgICAgICAvLyBDcmVhdGluZyB0aGUgc3ludGhlc2l6ZWRUZXh0IGlzIG5lY2Vz c2FyeSBmb3IgaWYgdGhlIHVzZXIgYWRkcyBtdWx0aXBsZSBzcGFjZXMgYmVmb3JlIHRoZSB2YWx1 ZSwgY2F1c2luZyB0aGUgbWFya1RleHQgdG8gbWFyayBvbmUgb2YgdGhlIHNwYWNlcyBpbnN0ZWFk LgorICAgICAgICAgICAgdmFyIHN5bnRoZXNpemVkVGV4dCA9IHByb3BlcnR5Lm5hbWUgKyAiOiAi ICsgcHJvcGVydHkudmFsdWUgKyAiOyI7CisgICAgICAgICAgICB2YXIgc3RhcnQgPSB7bGluZTog ZnJvbS5saW5lLCBjaDogZnJvbS5jaCArIHN5bnRoZXNpemVkVGV4dC5pbmRleE9mKHByb3BlcnR5 LnZhbHVlKX07CiAgICAgICAgICAgICB2YXIgZW5kID0ge2xpbmU6IHRvLmxpbmUsIGNoOiBzdGFy dC5jaCArIHByb3BlcnR5LnZhbHVlLmxlbmd0aH07CiAKICAgICAgICAgICAgIHRoaXMuX2NvZGVN aXJyb3IubWFya1RleHQoc3RhcnQsIGVuZCwge2NsYXNzTmFtZTogImludmFsaWQifSk7Cg== 254392 2015-06-05 15:23:06 -0700 2015-06-05 17:49:46 -0700 Patch bug-145668-20150605152243.patch text/plain 4603 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDE5NjlkOWQ0ZjkzZjAxYjg3YjJlM2FkY2UyYWM2 ZmY4ZGE5MTk1NDcuLmVkNWJjNGY5MTUyMThlOTUxMTE5NGI4ZTg4M2MzZTU2NDJmNDBiZmYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDE1LTA2LTA0ICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBG aXhpbmcgY29kZSBzdHlsZSBhbmQgYWRkaW5nIG1vcmUgbGltaXRhdGlvbnMgZm9yIGJ1ZyAxNDEy NjIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NTY2 OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVXNl ckludGVyZmFjZS9WaWV3cy9DU1NTdHlsZURlY2xhcmF0aW9uVGV4dEVkaXRvci5qczoKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5DU1NTdHlsZURlY2xhcmF0aW9uVGV4dEVkaXRvci5wcm90b3R5cGUu X2NyZWF0ZVRleHRNYXJrZXJGb3JQcm9wZXJ0eUlmTmVlZGVkKTogQWRkZWQgbG9naWMgdG8gcHJl dmVudCBpbnZhbGlkIHN0eWxlIGZyb20gYmVpbmcgYXBwbGllZCBpbmNvcnJlY3RseS4KKworMjAx NS0wNi0wMyAgRGV2aW4gUm91c3NvICA8ZHJvdXNzb0BhcHBsZS5jb20+CisKKyAgICAgICAgV2Vi IEluc3BlY3RvcjogaWYgYSBrbm93biBDU1MgcHJvcGVydHkgaGFzIGFuIHVuc3VwcG9ydGVkIHZh bHVlLCBvbmx5IHN0cmlrZXRocm91Z2ggdGhlIHZhbHVlCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDEyNjIKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvTW9kZWxzL0NTU0NvbXBs ZXRpb25zLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNTU0NvbXBsZXRpb25zLnByb3RvdHlw ZS5pc1ZhbGlkUHJvcGVydHlOYW1lKTogTG9vcHMgdGhyb3VnaCB0aGUgZnVsbCBwcm9wZXJ0eSBs aXN0IGFuZCByZXR1cm5zIHRydWUgb25seSBpZiBhIHByb3BlcnR5IGV4YWN0bHkgbWF0Y2hlcyB0 aGUgZ2l2ZW4gcHJvcGVydHkgbmFtZS4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5DU1NDb21wbGV0 aW9ucyk6IEFkZGVkIGlzVmFsaWRQcm9wZXJ0eU5hbWUgZnVuY3Rpb24uCisgICAgICAgICogVXNl ckludGVyZmFjZS9WaWV3cy9DU1NTdHlsZURlY2xhcmF0aW9uVGV4dEVkaXRvci5qczoKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5DU1NTdHlsZURlY2xhcmF0aW9uVGV4dEVkaXRvci5wcm90b3R5cGUu X2NyZWF0ZVRleHRNYXJrZXJGb3JQcm9wZXJ0eUlmTmVlZGVkKTogQWRkZWQgbG9naWMgdG8gbGlt aXQgdGhlIGludmFsaWQgY2xhc3MgbWFya2VyIHRvIG9ubHkgdGhlIHByb3BlcnR5IHZhbHVlIGlm IHRoZSBwcm9wZXJ0eSBuYW1lIGlzIGFuIGFjdHVhbCBwcm9wZXJ0eS4KKwogMjAxNS0wNi0wNSAg TmlraXRhIFZhc2lseWV2ICA8bnZhc2lseWV2QGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5z cGVjdG9yOiBbUkVHUkVTU0lPTl0gRGFzaGJvYXJkJ3MgcmVzb3VyY2UgY291bnQgZG9lcyBub3Qg cmVzZXQgd2hlbiBtYWluIHJlc291cmNlIG5hdmlnYXRlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL0NTU0NvbXBsZXRpb25zLmpzIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL0NTU0NvbXBsZXRpb25zLmpz CmluZGV4IDQ3YmZjYWZjNWVkY2IyZWQ2Y2FkODI0M2JjZWIwM2FiYTA0OGVkNzEuLmQ1MDBiNTJm YWQ5MmI4ZjViYmI1YzQyMGZjNDIwZWJmMzM0YTlkZGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9DU1NDb21wbGV0aW9ucy5qcworKysgYi9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvQ1NTQ29tcGxldGlvbnMu anMKQEAgLTI3NiwxNCArMjc2LDkgQEAgV2ViSW5zcGVjdG9yLkNTU0NvbXBsZXRpb25zID0gY2xh c3MgQ1NTQ29tcGxldGlvbnMKICAgICAgICAgcmV0dXJuIHRoaXMuX3Nob3J0aGFuZHNbbG9uZ2hh bmRdIHx8IFtdOwogICAgIH0KIAotICAgIG5hbWVNYXRjaGVzVmFsaWRQcm9wZXJ0eUV4YWN0bHko bmFtZSkKKyAgICBpc1ZhbGlkUHJvcGVydHlOYW1lKG5hbWUpCiAgICAgewotICAgICAgICBmb3Ig KHZhciBwcm9wZXJ0eSBvZiB0aGlzLl92YWx1ZXMpIHsKLSAgICAgICAgICAgIGlmIChwcm9wZXJ0 eSA9PT0gbmFtZSkKLSAgICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKLSAgICAgICAgfQotCi0g ICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgcmV0dXJuIHRoaXMuX3ZhbHVlcy5pbmNsdWRl cyhuYW1lKTsKICAgICB9CiB9OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9DU1NTdHlsZURlY2xhcmF0aW9uVGV4dEVkaXRvci5qcyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NTU1N0eWxlRGVjbGFyYXRp b25UZXh0RWRpdG9yLmpzCmluZGV4IDg1NjQ2Mjk4Y2JlODE2NGQzMDFlMjYzNzVjMTUyNjM2ZDNl YjllZTQuLjNlNDlkNzMyYWU0NmMwZDc0NWZhNTExMzk4NmM0OWE2YTNiYTk5MGQgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NTU1N0eWxlRGVj bGFyYXRpb25UZXh0RWRpdG9yLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL0NTU1N0eWxlRGVjbGFyYXRpb25UZXh0RWRpdG9yLmpzCkBAIC00OTIsNyAr NDkyLDcgQEAgV2ViSW5zcGVjdG9yLkNTU1N0eWxlRGVjbGFyYXRpb25UZXh0RWRpdG9yID0gY2xh c3MgQ1NTU3R5bGVEZWNsYXJhdGlvblRleHRFZGl0b3IKIAogICAgICAgICB2YXIgcHJvcGVydHlO YW1lSXNWYWxpZCA9IGZhbHNlOwogICAgICAgICBpZiAoV2ViSW5zcGVjdG9yLkNTU0NvbXBsZXRp b25zLmNzc05hbWVDb21wbGV0aW9ucykKLSAgICAgICAgICAgIHByb3BlcnR5TmFtZUlzVmFsaWQg PSBXZWJJbnNwZWN0b3IuQ1NTQ29tcGxldGlvbnMuY3NzTmFtZUNvbXBsZXRpb25zLm5hbWVNYXRj aGVzVmFsaWRQcm9wZXJ0eUV4YWN0bHkocHJvcGVydHkubmFtZSk7CisgICAgICAgICAgICBwcm9w ZXJ0eU5hbWVJc1ZhbGlkID0gV2ViSW5zcGVjdG9yLkNTU0NvbXBsZXRpb25zLmNzc05hbWVDb21w bGV0aW9ucy5pc1ZhbGlkUHJvcGVydHlOYW1lKHByb3BlcnR5Lm5hbWUpOwogCiAgICAgICAgIHZh ciBjbGFzc05hbWVzID0gWyJjc3Mtc3R5bGUtZGVjbGFyYXRpb24tcHJvcGVydHkiXTsKIApAQCAt NTM1LDggKzUzNSwxMSBAQCBXZWJJbnNwZWN0b3IuQ1NTU3R5bGVEZWNsYXJhdGlvblRleHRFZGl0 b3IgPSBjbGFzcyBDU1NTdHlsZURlY2xhcmF0aW9uVGV4dEVkaXRvcgogCiAgICAgICAgIHRoaXMu X3JlbW92ZUNoZWNrYm94UGxhY2Vob2xkZXIoZnJvbS5saW5lKTsKIAotICAgICAgICBpZiAoIXBy b3BlcnR5LnZhbGlkICYmIHByb3BlcnR5TmFtZUlzVmFsaWQpIHsKLSAgICAgICAgICAgIHZhciBz dGFydCA9IHtsaW5lOiBmcm9tLmxpbmUsIGNoOiBmcm9tLmNoICsgcHJvcGVydHkudGV4dC5pbmRl eE9mKHByb3BlcnR5LnZhbHVlKX07CisgICAgICAgIGlmICghcHJvcGVydHkudmFsaWQgJiYgcHJv cGVydHlOYW1lSXNWYWxpZCAmJiAhcHJvcGVydHkudGV4dC50cmltKCkuZW5kc1dpdGgoIjoiKSkg eworICAgICAgICAgICAgLy8gVGhlIHByb3BlcnR5LnRleHQudHJpbSgpLmVuZHNXaXRoKCI6Iikg aXMgZm9yIHRoZSBzaXR1YXRpb24gd2hlbiBhIHByb3BlcnR5IG9ubHkgaGFzIGEgbmFtZSBhbmQg Y29sb24gYW5kIHRoZSB1c2VyIGxlYXZlcyB0aGUgdmFsdWUgYmxhbmsgKGl0IGxvb2tzIHdlaXJk IHRvIGhhdmUgYW4gaW52YWxpZCBtYXJrZXIgdGhyb3VnaCBqdXN0IHRoZSBjb2xvbikuCisgICAg ICAgICAgICAvLyBDcmVhdGluZyB0aGUgc3ludGhlc2l6ZWRUZXh0IGlzIG5lY2Vzc2FyeSBmb3Ig aWYgdGhlIHVzZXIgYWRkcyBtdWx0aXBsZSBzcGFjZXMgYmVmb3JlIHRoZSB2YWx1ZSwgY2F1c2lu ZyB0aGUgbWFya1RleHQgdG8gbWFyayBvbmUgb2YgdGhlIHNwYWNlcyBpbnN0ZWFkLgorICAgICAg ICAgICAgdmFyIHN5bnRoZXNpemVkVGV4dCA9IHByb3BlcnR5Lm5hbWUgKyAiOiAiICsgcHJvcGVy dHkudmFsdWUgKyAiOyI7CisgICAgICAgICAgICB2YXIgc3RhcnQgPSB7bGluZTogZnJvbS5saW5l LCBjaDogZnJvbS5jaCArIHN5bnRoZXNpemVkVGV4dC5pbmRleE9mKHByb3BlcnR5LnZhbHVlKX07 CiAgICAgICAgICAgICB2YXIgZW5kID0ge2xpbmU6IHRvLmxpbmUsIGNoOiBzdGFydC5jaCArIHBy b3BlcnR5LnZhbHVlLmxlbmd0aH07CiAKICAgICAgICAgICAgIHRoaXMuX2NvZGVNaXJyb3IubWFy a1RleHQoc3RhcnQsIGVuZCwge2NsYXNzTmFtZTogImludmFsaWQifSk7Cg== 254402 2015-06-05 17:49:49 -0700 2015-06-05 18:23:40 -0700 Patch bug-145668-20150605174927.patch text/plain 4187 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDNjMGIwYWZmYjk2MTQxNDBlZmRhN2U2ODhiNmY2 MTBjYTQwZjYyYTcuLjFmOWQ4NGU3OTUwNjNmZDgzYmIzYThhZWUzOGZhYzU0MjIyMjk0ZjUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDE1LTA2LTA0ICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBG aXhpbmcgY29kZSBzdHlsZSBhbmQgYWRkaW5nIG1vcmUgbGltaXRhdGlvbnMgZm9yIGJ1ZyAxNDEy NjIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NTY2 OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVXNl ckludGVyZmFjZS9Nb2RlbHMvQ1NTQ29tcGxldGlvbnMuanM6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuQ1NTQ29tcGxldGlvbnMucHJvdG90eXBlLmlzVmFsaWRQcm9wZXJ0eU5hbWUpOiBMb29wcyB0 aHJvdWdoIHRoZSBmdWxsIHByb3BlcnR5IGxpc3QgYW5kIHJldHVybnMgdHJ1ZSBvbmx5IGlmIGEg cHJvcGVydHkgZXhhY3RseSBtYXRjaGVzIHRoZSBnaXZlbiBwcm9wZXJ0eSBuYW1lLgorICAgICAg ICAoV2ViSW5zcGVjdG9yLkNTU0NvbXBsZXRpb25zKTogQWRkZWQgaXNWYWxpZFByb3BlcnR5TmFt ZSBmdW5jdGlvbi4KKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0NTU1N0eWxlRGVjbGFy YXRpb25UZXh0RWRpdG9yLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNTU1N0eWxlRGVjbGFy YXRpb25UZXh0RWRpdG9yLnByb3RvdHlwZS5fY3JlYXRlVGV4dE1hcmtlckZvclByb3BlcnR5SWZO ZWVkZWQpOiBBZGRlZCBsb2dpYyB0byBsaW1pdCB0aGUgaW52YWxpZCBjbGFzcyBtYXJrZXIgdG8g b25seSB0aGUgcHJvcGVydHkgdmFsdWUgaWYgdGhlIHByb3BlcnR5IG5hbWUgaXMgYW4gYWN0dWFs IHByb3BlcnR5IGFuZCB0byBwcmV2ZW50IGludmFsaWQgc3R5bGUgZnJvbSBiZWluZyBhcHBsaWVk IGluY29ycmVjdGx5LgorCiAyMDE1LTA2LTA1ICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFyb0Bh cHBsZS5jb20+CiAKICAgICAgICAgUkVHUkVTU0lPTiAocjE4NTIxMyk6IFR5cGVFcnJvcjogdW5k ZWZpbmVkIGlzIG5vdCBhbiBvYmplY3QgKGV2YWx1YXRpbmcgJ1dlYkluc3BlY3Rvci5jbGVhckxv Z09uUmVsb2FkLnZhbHVlJykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL01vZGVscy9DU1NDb21wbGV0aW9ucy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL01vZGVscy9DU1NDb21wbGV0aW9ucy5qcwppbmRleCA0N2JmY2FmYzVl ZGNiMmVkNmNhZDgyNDNiY2ViMDNhYmEwNDhlZDcxLi5kNTAwYjUyZmFkOTJiOGY1YmJiNWM0MjBm YzQyMGViZjMzNGE5ZGRjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9Nb2RlbHMvQ1NTQ29tcGxldGlvbnMuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL0NTU0NvbXBsZXRpb25zLmpzCkBAIC0yNzYsMTQgKzI3 Niw5IEBAIFdlYkluc3BlY3Rvci5DU1NDb21wbGV0aW9ucyA9IGNsYXNzIENTU0NvbXBsZXRpb25z CiAgICAgICAgIHJldHVybiB0aGlzLl9zaG9ydGhhbmRzW2xvbmdoYW5kXSB8fCBbXTsKICAgICB9 CiAKLSAgICBuYW1lTWF0Y2hlc1ZhbGlkUHJvcGVydHlFeGFjdGx5KG5hbWUpCisgICAgaXNWYWxp ZFByb3BlcnR5TmFtZShuYW1lKQogICAgIHsKLSAgICAgICAgZm9yICh2YXIgcHJvcGVydHkgb2Yg dGhpcy5fdmFsdWVzKSB7Ci0gICAgICAgICAgICBpZiAocHJvcGVydHkgPT09IG5hbWUpCi0gICAg ICAgICAgICAgICAgcmV0dXJuIHRydWU7Ci0gICAgICAgIH0KLQotICAgICAgICByZXR1cm4gZmFs c2U7CisgICAgICAgIHJldHVybiB0aGlzLl92YWx1ZXMuaW5jbHVkZXMobmFtZSk7CiAgICAgfQog fTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvQ1NTU3R5bGVEZWNsYXJhdGlvblRleHRFZGl0b3IuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9DU1NTdHlsZURlY2xhcmF0aW9uVGV4dEVkaXRvci5qcwpp bmRleCA4NTY0NjI5OGNiZTgxNjRkMzAxZTI2Mzc1YzE1MjYzNmQzZWI5ZWU0Li4zZTQ5ZDczMmFl NDZjMGQ3NDVmYTUxMTM5ODZjNDlhNmEzYmE5OTBkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9DU1NTdHlsZURlY2xhcmF0aW9uVGV4dEVkaXRv ci5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9DU1NT dHlsZURlY2xhcmF0aW9uVGV4dEVkaXRvci5qcwpAQCAtNDkyLDcgKzQ5Miw3IEBAIFdlYkluc3Bl Y3Rvci5DU1NTdHlsZURlY2xhcmF0aW9uVGV4dEVkaXRvciA9IGNsYXNzIENTU1N0eWxlRGVjbGFy YXRpb25UZXh0RWRpdG9yCiAKICAgICAgICAgdmFyIHByb3BlcnR5TmFtZUlzVmFsaWQgPSBmYWxz ZTsKICAgICAgICAgaWYgKFdlYkluc3BlY3Rvci5DU1NDb21wbGV0aW9ucy5jc3NOYW1lQ29tcGxl dGlvbnMpCi0gICAgICAgICAgICBwcm9wZXJ0eU5hbWVJc1ZhbGlkID0gV2ViSW5zcGVjdG9yLkNT U0NvbXBsZXRpb25zLmNzc05hbWVDb21wbGV0aW9ucy5uYW1lTWF0Y2hlc1ZhbGlkUHJvcGVydHlF eGFjdGx5KHByb3BlcnR5Lm5hbWUpOworICAgICAgICAgICAgcHJvcGVydHlOYW1lSXNWYWxpZCA9 IFdlYkluc3BlY3Rvci5DU1NDb21wbGV0aW9ucy5jc3NOYW1lQ29tcGxldGlvbnMuaXNWYWxpZFBy b3BlcnR5TmFtZShwcm9wZXJ0eS5uYW1lKTsKIAogICAgICAgICB2YXIgY2xhc3NOYW1lcyA9IFsi Y3NzLXN0eWxlLWRlY2xhcmF0aW9uLXByb3BlcnR5Il07CiAKQEAgLTUzNSw4ICs1MzUsMTEgQEAg V2ViSW5zcGVjdG9yLkNTU1N0eWxlRGVjbGFyYXRpb25UZXh0RWRpdG9yID0gY2xhc3MgQ1NTU3R5 bGVEZWNsYXJhdGlvblRleHRFZGl0b3IKIAogICAgICAgICB0aGlzLl9yZW1vdmVDaGVja2JveFBs YWNlaG9sZGVyKGZyb20ubGluZSk7CiAKLSAgICAgICAgaWYgKCFwcm9wZXJ0eS52YWxpZCAmJiBw cm9wZXJ0eU5hbWVJc1ZhbGlkKSB7Ci0gICAgICAgICAgICB2YXIgc3RhcnQgPSB7bGluZTogZnJv bS5saW5lLCBjaDogZnJvbS5jaCArIHByb3BlcnR5LnRleHQuaW5kZXhPZihwcm9wZXJ0eS52YWx1 ZSl9OworICAgICAgICBpZiAoIXByb3BlcnR5LnZhbGlkICYmIHByb3BlcnR5TmFtZUlzVmFsaWQg JiYgIXByb3BlcnR5LnRleHQudHJpbSgpLmVuZHNXaXRoKCI6IikpIHsKKyAgICAgICAgICAgIC8v IFRoZSBwcm9wZXJ0eS50ZXh0LnRyaW0oKS5lbmRzV2l0aCgiOiIpIGlzIGZvciB0aGUgc2l0dWF0 aW9uIHdoZW4gYSBwcm9wZXJ0eSBvbmx5IGhhcyBhIG5hbWUgYW5kIGNvbG9uIGFuZCB0aGUgdXNl ciBsZWF2ZXMgdGhlIHZhbHVlIGJsYW5rIChpdCBsb29rcyB3ZWlyZCB0byBoYXZlIGFuIGludmFs aWQgbWFya2VyIHRocm91Z2gganVzdCB0aGUgY29sb24pLgorICAgICAgICAgICAgLy8gQ3JlYXRp bmcgdGhlIHN5bnRoZXNpemVkVGV4dCBpcyBuZWNlc3NhcnkgZm9yIGlmIHRoZSB1c2VyIGFkZHMg bXVsdGlwbGUgc3BhY2VzIGJlZm9yZSB0aGUgdmFsdWUsIGNhdXNpbmcgdGhlIG1hcmtUZXh0IHRv IG1hcmsgb25lIG9mIHRoZSBzcGFjZXMgaW5zdGVhZC4KKyAgICAgICAgICAgIHZhciBzeW50aGVz aXplZFRleHQgPSBwcm9wZXJ0eS5uYW1lICsgIjogIiArIHByb3BlcnR5LnZhbHVlICsgIjsiOwor ICAgICAgICAgICAgdmFyIHN0YXJ0ID0ge2xpbmU6IGZyb20ubGluZSwgY2g6IGZyb20uY2ggKyBz eW50aGVzaXplZFRleHQuaW5kZXhPZihwcm9wZXJ0eS52YWx1ZSl9OwogICAgICAgICAgICAgdmFy IGVuZCA9IHtsaW5lOiB0by5saW5lLCBjaDogc3RhcnQuY2ggKyBwcm9wZXJ0eS52YWx1ZS5sZW5n dGh9OwogCiAgICAgICAgICAgICB0aGlzLl9jb2RlTWlycm9yLm1hcmtUZXh0KHN0YXJ0LCBlbmQs IHtjbGFzc05hbWU6ICJpbnZhbGlkIn0pOwo=