147919 2015-08-11 19:28:36 -0700 Web Inspector: Implement selector highlighting for iOS 2015-08-12 10:54:21 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 hi hi bburg commit-queue graouts joepeck mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1116827 0 hi 2015-08-11 19:28:36 -0700 Originally from https://bugs.webkit.org/show_bug.cgi?id=145658. Basically, this would allow a node list to be passed to the highlight view which would render overlays on multiple nodes instead of just one. 1116832 1 258794 hi 2015-08-11 19:34:52 -0700 Created attachment 258794 Patch 1116865 2 258794 timothy 2015-08-11 21:59:26 -0700 Comment on attachment 258794 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=258794&action=review > Source/WebKit2/UIProcess/WKInspectorHighlightView.mm:219 > + if ([_layers count] < (offset + 4) || highlight.quads.size() < (offset + 4)) No need for the () around the math. > Source/WebKit2/UIProcess/WKInspectorHighlightView.mm:251 > + [self _createLayers:(nodeCount * 4)]; Ditto. Line break after this line before the loop. > Source/WebKit2/UIProcess/WKInspectorHighlightView.mm:253 > + [self _layoutForNodeHighlight:highlight offset:(i * 4)]; No (). 1116960 3 258825 hi 2015-08-12 10:02:14 -0700 Created attachment 258825 Patch 1116967 4 commit-queue 2015-08-12 10:22:17 -0700 Attachment 258825 did not pass style-queue: ERROR: Source/WebKit2/UIProcess/WKInspectorHighlightView.mm:219: The parameter name "4" adds no information, so it should be removed. [readability/parameter_name] [5] Total errors found: 1 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 1116975 5 258825 commit-queue 2015-08-12 10:54:18 -0700 Comment on attachment 258825 Patch Clearing flags on attachment: 258825 Committed r188337: <http://trac.webkit.org/changeset/188337> 1116976 6 commit-queue 2015-08-12 10:54:21 -0700 All reviewed patches have been landed. Closing bug. 258794 2015-08-11 19:34:52 -0700 2015-08-12 10:02:14 -0700 Patch bug-147919-20150811193437.patch text/plain 6517 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBjYjc0YzJkMjNmZDg2MGMzY2NmYjFhNzg0OTczMGEwMjdiYmRiYzg3Li5m MWIzYjhlZjkyODcyZTBmZDA4NGU1ZTFiMzU5MTM1NDViMTYyNDEyIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMTUgQEAKKzIwMTUtMDgtMTEgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29t PgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IEltcGxlbWVudCBzZWxlY3RvciBoaWdobGlnaHRp bmcgZm9yIGlPUworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTQ3OTE5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yT3ZlcmxheS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJ bnNwZWN0b3JPdmVybGF5OjpnZXRIaWdobGlnaHQpOgorICAgICAgICBJZiB0aGUgY3VycmVudCBo aWdobGlnaHQgaXMgYSBub2RlTGlzdCwgZ2VuZXJhdGUgaGlnaGxpZ2h0cyBmb3IgZWFjaCBub2Rl IGluIHRoZSBsaXN0IGFuZAorICAgICAgICByZXR1cm4gdGhlIGNvbmNhdGVuYXRlZCB2YWx1ZSBv ZiB0aG9zZSBoaWdobGlnaHRzLgorCiAyMDE1LTA4LTExICBTYW0gV2VpbmlnICA8c2FtQHdlYmtp dC5vcmc+CiAKICAgICAgICAgTW92ZSBDb3VudFF1ZXVpbmdTdHJhdGVneSBhbmQgcmVsYXRlZCB0 byBmaWxlcyB0byB0aGVpciBjb3JyZWN0IHBsYWNlIGluIHRoZSBYY29kZSBwcm9qZWN0CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VM b2cKaW5kZXggZDkzNzQyMmMwMWMxNmFiMzI3M2U4NzQ2NTRiOWIzMjgzOTZlYjdlNy4uYjE0NTk0 NDM2NjM5ODZiNzczNjdkYmNiYmZmYzdkOWIwYzQ3ZjhlNiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdDIvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsx LDIwIEBACisyMDE1LTA4LTExICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKwor ICAgICAgICBXZWIgSW5zcGVjdG9yOiBJbXBsZW1lbnQgc2VsZWN0b3IgaGlnaGxpZ2h0aW5nIGZv ciBpT1MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0 NzkxOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog VUlQcm9jZXNzL1dLSW5zcGVjdG9ySGlnaGxpZ2h0Vmlldy5tbToKKyAgICAgICAgKC1bV0tJbnNw ZWN0b3JIaWdobGlnaHRWaWV3IF9sYXlvdXRGb3JOb2RlSGlnaGxpZ2h0Om9mZnNldDpdKToKKyAg ICAgICAgQWRkZWQgb2Zmc2V0IHBhcmFtZXRlciB0byBzdGFydCBkcmF3aW5nIHRoZSBoaWdobGln aHQgYXQgdGhhdCBpbmRleCBvZiB0aGUgaGlnaGxpZ2h0IHF1YWQgbGlzdC4KKworICAgICAgICAo LVtXS0luc3BlY3RvckhpZ2hsaWdodFZpZXcgX2xheW91dEZvck5vZGVMaXN0SGlnaGxpZ2h0Ol0p OgorICAgICAgICBMb29wcyB0aHJvdWdoIHRoZSBoaWdobGlnaHQgcXVhZHMgYW5kIGRyYXdzIGEg bmV3IGhpZ2hsaWdodCBmb3IgZXZlcnkgNCBoaWdobGlnaHQgcXVhZCBvYmplY3RzLgorCisgICAg ICAgICgtW1dLSW5zcGVjdG9ySGlnaGxpZ2h0VmlldyB1cGRhdGU6XSk6CisgICAgICAgIE5vdyB1 c2VzIHRoZSBsaWdodCBoaWdobGlnaHRpbmcgZm9yIGJvdGggbm9kZXMgYW5kIGxpc3RzIG9mIG5v ZGVzLgorCiAyMDE1LTA4LTExICBBbmR5IEVzdGVzICA8YWVzdGVzQGFwcGxlLmNvbT4KIAogICAg ICAgICBUcmllZCBhZ2FpbiB0byBmaXggdGhlIGlPUyBidWlsZC4KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JPdmVybGF5LmNwcCBiL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9JbnNwZWN0b3JPdmVybGF5LmNwcAppbmRleCBiNWU4MTRhMjI4YTlhMGZkZTI3 NzNjOGNjNDM2M2U0ODg4ZDg2NTU3Li5hMDQ3MzQ5ZmExZWYyOTNmYTM0OTM0MzJiYjI5Njc1MjA4 NzBhOTJiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yT3Zl cmxheS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvck92ZXJsYXku Y3BwCkBAIC0yMjYsMTMgKzIyNiwyMiBAQCB2b2lkIEluc3BlY3Rvck92ZXJsYXk6OnBhaW50KEdy YXBoaWNzQ29udGV4dCYgY29udGV4dCkKIAogdm9pZCBJbnNwZWN0b3JPdmVybGF5OjpnZXRIaWdo bGlnaHQoSGlnaGxpZ2h0JiBoaWdobGlnaHQsIEluc3BlY3Rvck92ZXJsYXk6OkNvb3JkaW5hdGVT eXN0ZW0gY29vcmRpbmF0ZVN5c3RlbSkgY29uc3QKIHsKLSAgICBpZiAoIW1faGlnaGxpZ2h0Tm9k ZSAmJiAhbV9oaWdobGlnaHRRdWFkKQorICAgIGlmICghbV9oaWdobGlnaHROb2RlICYmICFtX2hp Z2hsaWdodFF1YWQgJiYgIW1faGlnaGxpZ2h0Tm9kZUxpc3QpCiAgICAgICAgIHJldHVybjsKIAog ICAgIGhpZ2hsaWdodC50eXBlID0gSGlnaGxpZ2h0VHlwZTo6UmVjdHM7CiAgICAgaWYgKG1faGln aGxpZ2h0Tm9kZSkKICAgICAgICAgYnVpbGROb2RlSGlnaGxpZ2h0KCptX2hpZ2hsaWdodE5vZGUs IG51bGxwdHIsIG1fbm9kZUhpZ2hsaWdodENvbmZpZywgaGlnaGxpZ2h0LCBjb29yZGluYXRlU3lz dGVtKTsKLSAgICBlbHNlCisgICAgZWxzZSBpZiAobV9oaWdobGlnaHROb2RlTGlzdCkgeworICAg ICAgICBoaWdobGlnaHQuc2V0RGF0YUZyb21Db25maWcobV9ub2RlSGlnaGxpZ2h0Q29uZmlnKTsK KyAgICAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IG1faGlnaGxpZ2h0Tm9kZUxpc3QtPmxl bmd0aCgpOyArK2kpIHsKKyAgICAgICAgICAgIEhpZ2hsaWdodCBub2RlSGlnaGxpZ2h0OworICAg ICAgICAgICAgYnVpbGROb2RlSGlnaGxpZ2h0KCoobV9oaWdobGlnaHROb2RlTGlzdC0+aXRlbShp KSksIG51bGxwdHIsIG1fbm9kZUhpZ2hsaWdodENvbmZpZywgbm9kZUhpZ2hsaWdodCwgY29vcmRp bmF0ZVN5c3RlbSk7CisgICAgICAgICAgICBpZiAobm9kZUhpZ2hsaWdodC50eXBlID09IEhpZ2hs aWdodFR5cGU6Ok5vZGUpCisgICAgICAgICAgICAgICAgaGlnaGxpZ2h0LnF1YWRzLmFwcGVuZFZl Y3Rvcihub2RlSGlnaGxpZ2h0LnF1YWRzKTsKKyAgICAgICAgfQorICAgICAgICBoaWdobGlnaHQu dHlwZSA9IEhpZ2hsaWdodFR5cGU6Ok5vZGVMaXN0OworICAgIH0gZWxzZQogICAgICAgICBidWls ZFF1YWRIaWdobGlnaHQoKm1faGlnaGxpZ2h0UXVhZCwgbV9xdWFkSGlnaGxpZ2h0Q29uZmlnLCBo aWdobGlnaHQpOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV0tJ bnNwZWN0b3JIaWdobGlnaHRWaWV3Lm1tIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dLSW5z cGVjdG9ySGlnaGxpZ2h0Vmlldy5tbQppbmRleCAzYWZmZmIzYzVmMjYxYjExY2NmYTJkMjQwNzQw OTUyYzU1MmU4ZTliLi5lODM3YmU5Y2FiOTU5NTQ3YWM2YWRiOGJhOWY1ZGIwMTI2NGNlNzIwIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV0tJbnNwZWN0b3JIaWdobGlnaHRW aWV3Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XS0luc3BlY3RvckhpZ2hsaWdo dFZpZXcubW0KQEAgLTIxMiwyNCArMjEyLDIyIEBAIHN0YXRpYyB2b2lkIGxheWVyUGF0aChDQVNo YXBlTGF5ZXIgKmxheWVyLCBjb25zdCBGbG9hdFF1YWQmIG91dGVyUXVhZCkKICAgICBDR1BhdGhS ZWxlYXNlKHBhdGgpOwogfQogCi0tICh2b2lkKV9sYXlvdXRGb3JOb2RlSGlnaGxpZ2h0Oihjb25z dCBIaWdobGlnaHQmKWhpZ2hsaWdodAorLSAodm9pZClfbGF5b3V0Rm9yTm9kZUhpZ2hsaWdodDoo Y29uc3QgSGlnaGxpZ2h0JiloaWdobGlnaHQgb2Zmc2V0Oih1bnNpZ25lZClvZmZzZXQKIHsKLSAg ICBpZiAoIWhpZ2hsaWdodC5xdWFkcy5zaXplKCkpIHsKLSAgICAgICAgW3NlbGYgX3JlbW92ZUFs bExheWVyc107CisgICAgQVNTRVJUKFtfbGF5ZXJzIGNvdW50XSA+PSBvZmZzZXQgKyA0KTsKKyAg ICBBU1NFUlQoaGlnaGxpZ2h0LnF1YWRzLnNpemUoKSA+PSBvZmZzZXQgKyA0KTsKKyAgICBpZiAo W19sYXllcnMgY291bnRdIDwgKG9mZnNldCArIDQpIHx8IGhpZ2hsaWdodC5xdWFkcy5zaXplKCkg PCAob2Zmc2V0ICsgNCkpCiAgICAgICAgIHJldHVybjsKLSAgICB9CiAKLSAgICBbc2VsZiBfY3Jl YXRlTGF5ZXJzOjRdOworICAgIENBU2hhcGVMYXllciAqbWFyZ2luTGF5ZXIgPSBbX2xheWVycyBv YmplY3RBdEluZGV4Om9mZnNldF07CisgICAgQ0FTaGFwZUxheWVyICpib3JkZXJMYXllciA9IFtf bGF5ZXJzIG9iamVjdEF0SW5kZXg6b2Zmc2V0ICsgMV07CisgICAgQ0FTaGFwZUxheWVyICpwYWRk aW5nTGF5ZXIgPSBbX2xheWVycyBvYmplY3RBdEluZGV4Om9mZnNldCArIDJdOworICAgIENBU2hh cGVMYXllciAqY29udGVudExheWVyID0gW19sYXllcnMgb2JqZWN0QXRJbmRleDpvZmZzZXQgKyAz XTsKIAotICAgIENBU2hhcGVMYXllciAqbWFyZ2luTGF5ZXIgPSBbX2xheWVycyBvYmplY3RBdElu ZGV4OjBdOwotICAgIENBU2hhcGVMYXllciAqYm9yZGVyTGF5ZXIgPSBbX2xheWVycyBvYmplY3RB dEluZGV4OjFdOwotICAgIENBU2hhcGVMYXllciAqcGFkZGluZ0xheWVyID0gW19sYXllcnMgb2Jq ZWN0QXRJbmRleDoyXTsKLSAgICBDQVNoYXBlTGF5ZXIgKmNvbnRlbnRMYXllciA9IFtfbGF5ZXJz IG9iamVjdEF0SW5kZXg6M107Ci0KLSAgICBGbG9hdFF1YWQgbWFyZ2luUXVhZCA9IGhpZ2hsaWdo dC5xdWFkc1swXTsKLSAgICBGbG9hdFF1YWQgYm9yZGVyUXVhZCA9IGhpZ2hsaWdodC5xdWFkc1sx XTsKLSAgICBGbG9hdFF1YWQgcGFkZGluZ1F1YWQgPSBoaWdobGlnaHQucXVhZHNbMl07Ci0gICAg RmxvYXRRdWFkIGNvbnRlbnRRdWFkID0gaGlnaGxpZ2h0LnF1YWRzWzNdOworICAgIEZsb2F0UXVh ZCBtYXJnaW5RdWFkID0gaGlnaGxpZ2h0LnF1YWRzW29mZnNldF07CisgICAgRmxvYXRRdWFkIGJv cmRlclF1YWQgPSBoaWdobGlnaHQucXVhZHNbb2Zmc2V0ICsgMV07CisgICAgRmxvYXRRdWFkIHBh ZGRpbmdRdWFkID0gaGlnaGxpZ2h0LnF1YWRzW29mZnNldCArIDJdOworICAgIEZsb2F0UXVhZCBj b250ZW50UXVhZCA9IGhpZ2hsaWdodC5xdWFkc1tvZmZzZXQgKyAzXTsKIAogICAgIG1hcmdpbkxh eWVyLmZpbGxDb2xvciA9IGNhY2hlZENHQ29sb3IoaGlnaGxpZ2h0Lm1hcmdpbkNvbG9yLCBDb2xv clNwYWNlRGV2aWNlUkdCKTsKICAgICBib3JkZXJMYXllci5maWxsQ29sb3IgPSBjYWNoZWRDR0Nv bG9yKGhpZ2hsaWdodC5ib3JkZXJDb2xvciwgQ29sb3JTcGFjZURldmljZVJHQik7CkBAIC0yNDIs NiArMjQwLDE5IEBAIC0gKHZvaWQpX2xheW91dEZvck5vZGVIaWdobGlnaHQ6KGNvbnN0IEhpZ2hs aWdodCYpaGlnaGxpZ2h0CiAgICAgbGF5ZXJQYXRoKGNvbnRlbnRMYXllciwgY29udGVudFF1YWQp OwogfQogCistICh2b2lkKV9sYXlvdXRGb3JOb2RlTGlzdEhpZ2hsaWdodDooY29uc3QgSGlnaGxp Z2h0JiloaWdobGlnaHQKK3sKKyAgICBpZiAoIWhpZ2hsaWdodC5xdWFkcy5zaXplKCkpIHsKKyAg ICAgICAgW3NlbGYgX3JlbW92ZUFsbExheWVyc107CisgICAgICAgIHJldHVybjsKKyAgICB9CisK KyAgICB1bnNpZ25lZCBub2RlQ291bnQgPSBoaWdobGlnaHQucXVhZHMuc2l6ZSgpIC8gNDsKKyAg ICBbc2VsZiBfY3JlYXRlTGF5ZXJzOihub2RlQ291bnQgKiA0KV07CisgICAgZm9yICh1bnNpZ25l ZCBpID0gMDsgaSA8IG5vZGVDb3VudDsgKytpKQorICAgICAgICBbc2VsZiBfbGF5b3V0Rm9yTm9k ZUhpZ2hsaWdodDpoaWdobGlnaHQgb2Zmc2V0OihpICogNCldOworfQorCiAtICh2b2lkKV9sYXlv dXRGb3JSZWN0c0hpZ2hsaWdodDooY29uc3QgSGlnaGxpZ2h0JiloaWdobGlnaHQKIHsKICAgICBO U1VJbnRlZ2VyIG51bUxheWVycyA9IGhpZ2hsaWdodC5xdWFkcy5zaXplKCk7CkBAIC0yNjIsOCAr MjczLDggQEAgLSAodm9pZClfbGF5b3V0Rm9yUmVjdHNIaWdobGlnaHQ6KGNvbnN0IEhpZ2hsaWdo dCYpaGlnaGxpZ2h0CiAKIC0gKHZvaWQpdXBkYXRlOihjb25zdCBIaWdobGlnaHQmKWhpZ2hsaWdo dAogewotICAgIGlmIChoaWdobGlnaHQudHlwZSA9PSBIaWdobGlnaHRUeXBlOjpOb2RlKQotICAg ICAgICBbc2VsZiBfbGF5b3V0Rm9yTm9kZUhpZ2hsaWdodDpoaWdobGlnaHRdOworICAgIGlmICho aWdobGlnaHQudHlwZSA9PSBIaWdobGlnaHRUeXBlOjpOb2RlIHx8IGhpZ2hsaWdodC50eXBlID09 IEhpZ2hsaWdodFR5cGU6Ok5vZGVMaXN0KQorICAgICAgICBbc2VsZiBfbGF5b3V0Rm9yTm9kZUxp c3RIaWdobGlnaHQ6aGlnaGxpZ2h0XTsKICAgICBlbHNlIGlmIChoaWdobGlnaHQudHlwZSA9PSBI aWdobGlnaHRUeXBlOjpSZWN0cykKICAgICAgICAgW3NlbGYgX2xheW91dEZvclJlY3RzSGlnaGxp Z2h0OmhpZ2hsaWdodF07CiB9Cg== 258825 2015-08-12 10:02:14 -0700 2015-08-12 10:54:18 -0700 Patch 147919.txt text/plain 6249 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBjYjc0YzJkLi4yYzU0ZDJjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUg QEAKKzIwMTUtMDgtMTEgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgorCisgICAg ICAgIFdlYiBJbnNwZWN0b3I6IEltcGxlbWVudCBzZWxlY3RvciBoaWdobGlnaHRpbmcgZm9yIGlP UworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ3OTE5 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgVGltb3RoeSBIYXRjaGVyLgorCisgICAgICAgICogaW5z cGVjdG9yL0luc3BlY3Rvck92ZXJsYXkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9y T3ZlcmxheTo6Z2V0SGlnaGxpZ2h0KToKKyAgICAgICAgSWYgdGhlIGN1cnJlbnQgaGlnaGxpZ2h0 IGlzIGEgbm9kZUxpc3QsIGdlbmVyYXRlIGhpZ2hsaWdodHMgZm9yIGVhY2ggbm9kZSBpbiB0aGUg bGlzdCBhbmQKKyAgICAgICAgcmV0dXJuIHRoZSBjb25jYXRlbmF0ZWQgdmFsdWUgb2YgdGhvc2Ug aGlnaGxpZ2h0cy4KKwogMjAxNS0wOC0xMSAgU2FtIFdlaW5pZyAgPHNhbUB3ZWJraXQub3JnPgog CiAgICAgICAgIE1vdmUgQ291bnRRdWV1aW5nU3RyYXRlZ3kgYW5kIHJlbGF0ZWQgdG8gZmlsZXMg dG8gdGhlaXIgY29ycmVjdCBwbGFjZSBpbiB0aGUgWGNvZGUgcHJvamVjdApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvck92ZXJsYXkuY3BwIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvck92ZXJsYXkuY3BwCmluZGV4IGI1ZTgxNGEuLmEwNDcz NDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JPdmVybGF5 LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yT3ZlcmxheS5jcHAK QEAgLTIyNiwxMyArMjI2LDIyIEBAIHZvaWQgSW5zcGVjdG9yT3ZlcmxheTo6cGFpbnQoR3JhcGhp Y3NDb250ZXh0JiBjb250ZXh0KQogCiB2b2lkIEluc3BlY3Rvck92ZXJsYXk6OmdldEhpZ2hsaWdo dChIaWdobGlnaHQmIGhpZ2hsaWdodCwgSW5zcGVjdG9yT3ZlcmxheTo6Q29vcmRpbmF0ZVN5c3Rl bSBjb29yZGluYXRlU3lzdGVtKSBjb25zdAogewotICAgIGlmICghbV9oaWdobGlnaHROb2RlICYm ICFtX2hpZ2hsaWdodFF1YWQpCisgICAgaWYgKCFtX2hpZ2hsaWdodE5vZGUgJiYgIW1faGlnaGxp Z2h0UXVhZCAmJiAhbV9oaWdobGlnaHROb2RlTGlzdCkKICAgICAgICAgcmV0dXJuOwogCiAgICAg aGlnaGxpZ2h0LnR5cGUgPSBIaWdobGlnaHRUeXBlOjpSZWN0czsKICAgICBpZiAobV9oaWdobGln aHROb2RlKQogICAgICAgICBidWlsZE5vZGVIaWdobGlnaHQoKm1faGlnaGxpZ2h0Tm9kZSwgbnVs bHB0ciwgbV9ub2RlSGlnaGxpZ2h0Q29uZmlnLCBoaWdobGlnaHQsIGNvb3JkaW5hdGVTeXN0ZW0p OwotICAgIGVsc2UKKyAgICBlbHNlIGlmIChtX2hpZ2hsaWdodE5vZGVMaXN0KSB7CisgICAgICAg IGhpZ2hsaWdodC5zZXREYXRhRnJvbUNvbmZpZyhtX25vZGVIaWdobGlnaHRDb25maWcpOworICAg ICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgbV9oaWdobGlnaHROb2RlTGlzdC0+bGVuZ3Ro KCk7ICsraSkgeworICAgICAgICAgICAgSGlnaGxpZ2h0IG5vZGVIaWdobGlnaHQ7CisgICAgICAg ICAgICBidWlsZE5vZGVIaWdobGlnaHQoKihtX2hpZ2hsaWdodE5vZGVMaXN0LT5pdGVtKGkpKSwg bnVsbHB0ciwgbV9ub2RlSGlnaGxpZ2h0Q29uZmlnLCBub2RlSGlnaGxpZ2h0LCBjb29yZGluYXRl U3lzdGVtKTsKKyAgICAgICAgICAgIGlmIChub2RlSGlnaGxpZ2h0LnR5cGUgPT0gSGlnaGxpZ2h0 VHlwZTo6Tm9kZSkKKyAgICAgICAgICAgICAgICBoaWdobGlnaHQucXVhZHMuYXBwZW5kVmVjdG9y KG5vZGVIaWdobGlnaHQucXVhZHMpOworICAgICAgICB9CisgICAgICAgIGhpZ2hsaWdodC50eXBl ID0gSGlnaGxpZ2h0VHlwZTo6Tm9kZUxpc3Q7CisgICAgfSBlbHNlCiAgICAgICAgIGJ1aWxkUXVh ZEhpZ2hsaWdodCgqbV9oaWdobGlnaHRRdWFkLCBtX3F1YWRIaWdobGlnaHRDb25maWcsIGhpZ2hs aWdodCk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJj ZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCBkOTM3NDIyLi4zM2RlOTk5IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjAgQEAKKzIwMTUtMDgtMTEgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUu Y29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IEltcGxlbWVudCBzZWxlY3RvciBoaWdobGln aHRpbmcgZm9yIGlPUworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTQ3OTE5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgVGltb3RoeSBIYXRjaGVyLgorCisg ICAgICAgICogVUlQcm9jZXNzL1dLSW5zcGVjdG9ySGlnaGxpZ2h0Vmlldy5tbToKKyAgICAgICAg KC1bV0tJbnNwZWN0b3JIaWdobGlnaHRWaWV3IF9sYXlvdXRGb3JOb2RlSGlnaGxpZ2h0Om9mZnNl dDpdKToKKyAgICAgICAgQWRkZWQgb2Zmc2V0IHBhcmFtZXRlciB0byBzdGFydCBkcmF3aW5nIHRo ZSBoaWdobGlnaHQgYXQgdGhhdCBpbmRleCBvZiB0aGUgaGlnaGxpZ2h0IHF1YWQgbGlzdC4KKwor ICAgICAgICAoLVtXS0luc3BlY3RvckhpZ2hsaWdodFZpZXcgX2xheW91dEZvck5vZGVMaXN0SGln aGxpZ2h0Ol0pOgorICAgICAgICBMb29wcyB0aHJvdWdoIHRoZSBoaWdobGlnaHQgcXVhZHMgYW5k IGRyYXdzIGEgbmV3IGhpZ2hsaWdodCBmb3IgZXZlcnkgNCBoaWdobGlnaHQgcXVhZCBvYmplY3Rz LgorCisgICAgICAgICgtW1dLSW5zcGVjdG9ySGlnaGxpZ2h0VmlldyB1cGRhdGU6XSk6CisgICAg ICAgIE5vdyB1c2VzIHRoZSBsaWdodCBoaWdobGlnaHRpbmcgZm9yIGJvdGggbm9kZXMgYW5kIGxp c3RzIG9mIG5vZGVzLgorCiAyMDE1LTA4LTExICBBbmR5IEVzdGVzICA8YWVzdGVzQGFwcGxlLmNv bT4KIAogICAgICAgICBUcmllZCBhZ2FpbiB0byBmaXggdGhlIGlPUyBidWlsZC4KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XS0luc3BlY3RvckhpZ2hsaWdodFZpZXcubW0g Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV0tJbnNwZWN0b3JIaWdobGlnaHRWaWV3Lm1tCmlu ZGV4IDNhZmZmYjMuLjM2Y2RhYmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9XS0luc3BlY3RvckhpZ2hsaWdodFZpZXcubW0KKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL1dLSW5zcGVjdG9ySGlnaGxpZ2h0Vmlldy5tbQpAQCAtMjEyLDI0ICsyMTIsMjIgQEAgc3Rh dGljIHZvaWQgbGF5ZXJQYXRoKENBU2hhcGVMYXllciAqbGF5ZXIsIGNvbnN0IEZsb2F0UXVhZCYg b3V0ZXJRdWFkKQogICAgIENHUGF0aFJlbGVhc2UocGF0aCk7CiB9CiAKLS0gKHZvaWQpX2xheW91 dEZvck5vZGVIaWdobGlnaHQ6KGNvbnN0IEhpZ2hsaWdodCYpaGlnaGxpZ2h0CistICh2b2lkKV9s YXlvdXRGb3JOb2RlSGlnaGxpZ2h0Oihjb25zdCBIaWdobGlnaHQmKWhpZ2hsaWdodCBvZmZzZXQ6 KHVuc2lnbmVkKW9mZnNldAogewotICAgIGlmICghaGlnaGxpZ2h0LnF1YWRzLnNpemUoKSkgewot ICAgICAgICBbc2VsZiBfcmVtb3ZlQWxsTGF5ZXJzXTsKKyAgICBBU1NFUlQoW19sYXllcnMgY291 bnRdID49IG9mZnNldCArIDQpOworICAgIEFTU0VSVChoaWdobGlnaHQucXVhZHMuc2l6ZSgpID49 IG9mZnNldCArIDQpOworICAgIGlmIChbX2xheWVycyBjb3VudF0gPCBvZmZzZXQgKyA0IHx8IGhp Z2hsaWdodC5xdWFkcy5zaXplKCkgPCBvZmZzZXQgKyA0KQogICAgICAgICByZXR1cm47Ci0gICAg fQotCi0gICAgW3NlbGYgX2NyZWF0ZUxheWVyczo0XTsKIAotICAgIENBU2hhcGVMYXllciAqbWFy Z2luTGF5ZXIgPSBbX2xheWVycyBvYmplY3RBdEluZGV4OjBdOwotICAgIENBU2hhcGVMYXllciAq Ym9yZGVyTGF5ZXIgPSBbX2xheWVycyBvYmplY3RBdEluZGV4OjFdOwotICAgIENBU2hhcGVMYXll ciAqcGFkZGluZ0xheWVyID0gW19sYXllcnMgb2JqZWN0QXRJbmRleDoyXTsKLSAgICBDQVNoYXBl TGF5ZXIgKmNvbnRlbnRMYXllciA9IFtfbGF5ZXJzIG9iamVjdEF0SW5kZXg6M107CisgICAgQ0FT aGFwZUxheWVyICptYXJnaW5MYXllciA9IFtfbGF5ZXJzIG9iamVjdEF0SW5kZXg6b2Zmc2V0XTsK KyAgICBDQVNoYXBlTGF5ZXIgKmJvcmRlckxheWVyID0gW19sYXllcnMgb2JqZWN0QXRJbmRleDpv ZmZzZXQgKyAxXTsKKyAgICBDQVNoYXBlTGF5ZXIgKnBhZGRpbmdMYXllciA9IFtfbGF5ZXJzIG9i amVjdEF0SW5kZXg6b2Zmc2V0ICsgMl07CisgICAgQ0FTaGFwZUxheWVyICpjb250ZW50TGF5ZXIg PSBbX2xheWVycyBvYmplY3RBdEluZGV4Om9mZnNldCArIDNdOwogCi0gICAgRmxvYXRRdWFkIG1h cmdpblF1YWQgPSBoaWdobGlnaHQucXVhZHNbMF07Ci0gICAgRmxvYXRRdWFkIGJvcmRlclF1YWQg PSBoaWdobGlnaHQucXVhZHNbMV07Ci0gICAgRmxvYXRRdWFkIHBhZGRpbmdRdWFkID0gaGlnaGxp Z2h0LnF1YWRzWzJdOwotICAgIEZsb2F0UXVhZCBjb250ZW50UXVhZCA9IGhpZ2hsaWdodC5xdWFk c1szXTsKKyAgICBGbG9hdFF1YWQgbWFyZ2luUXVhZCA9IGhpZ2hsaWdodC5xdWFkc1tvZmZzZXRd OworICAgIEZsb2F0UXVhZCBib3JkZXJRdWFkID0gaGlnaGxpZ2h0LnF1YWRzW29mZnNldCArIDFd OworICAgIEZsb2F0UXVhZCBwYWRkaW5nUXVhZCA9IGhpZ2hsaWdodC5xdWFkc1tvZmZzZXQgKyAy XTsKKyAgICBGbG9hdFF1YWQgY29udGVudFF1YWQgPSBoaWdobGlnaHQucXVhZHNbb2Zmc2V0ICsg M107CiAKICAgICBtYXJnaW5MYXllci5maWxsQ29sb3IgPSBjYWNoZWRDR0NvbG9yKGhpZ2hsaWdo dC5tYXJnaW5Db2xvciwgQ29sb3JTcGFjZURldmljZVJHQik7CiAgICAgYm9yZGVyTGF5ZXIuZmls bENvbG9yID0gY2FjaGVkQ0dDb2xvcihoaWdobGlnaHQuYm9yZGVyQ29sb3IsIENvbG9yU3BhY2VE ZXZpY2VSR0IpOwpAQCAtMjQyLDYgKzI0MCwyMCBAQCAtICh2b2lkKV9sYXlvdXRGb3JOb2RlSGln aGxpZ2h0Oihjb25zdCBIaWdobGlnaHQmKWhpZ2hsaWdodAogICAgIGxheWVyUGF0aChjb250ZW50 TGF5ZXIsIGNvbnRlbnRRdWFkKTsKIH0KIAorLSAodm9pZClfbGF5b3V0Rm9yTm9kZUxpc3RIaWdo bGlnaHQ6KGNvbnN0IEhpZ2hsaWdodCYpaGlnaGxpZ2h0Cit7CisgICAgaWYgKCFoaWdobGlnaHQu cXVhZHMuc2l6ZSgpKSB7CisgICAgICAgIFtzZWxmIF9yZW1vdmVBbGxMYXllcnNdOworICAgICAg ICByZXR1cm47CisgICAgfQorCisgICAgdW5zaWduZWQgbm9kZUNvdW50ID0gaGlnaGxpZ2h0LnF1 YWRzLnNpemUoKSAvIDQ7CisgICAgW3NlbGYgX2NyZWF0ZUxheWVyczpub2RlQ291bnQgKiA0XTsK KworICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBub2RlQ291bnQ7ICsraSkKKyAgICAgICAg W3NlbGYgX2xheW91dEZvck5vZGVIaWdobGlnaHQ6aGlnaGxpZ2h0IG9mZnNldDppICogNF07Cit9 CisKIC0gKHZvaWQpX2xheW91dEZvclJlY3RzSGlnaGxpZ2h0Oihjb25zdCBIaWdobGlnaHQmKWhp Z2hsaWdodAogewogICAgIE5TVUludGVnZXIgbnVtTGF5ZXJzID0gaGlnaGxpZ2h0LnF1YWRzLnNp emUoKTsKQEAgLTI2Miw4ICsyNzQsOCBAQCAtICh2b2lkKV9sYXlvdXRGb3JSZWN0c0hpZ2hsaWdo dDooY29uc3QgSGlnaGxpZ2h0JiloaWdobGlnaHQKIAogLSAodm9pZCl1cGRhdGU6KGNvbnN0IEhp Z2hsaWdodCYpaGlnaGxpZ2h0CiB7Ci0gICAgaWYgKGhpZ2hsaWdodC50eXBlID09IEhpZ2hsaWdo dFR5cGU6Ok5vZGUpCi0gICAgICAgIFtzZWxmIF9sYXlvdXRGb3JOb2RlSGlnaGxpZ2h0OmhpZ2hs aWdodF07CisgICAgaWYgKGhpZ2hsaWdodC50eXBlID09IEhpZ2hsaWdodFR5cGU6Ok5vZGUgfHwg aGlnaGxpZ2h0LnR5cGUgPT0gSGlnaGxpZ2h0VHlwZTo6Tm9kZUxpc3QpCisgICAgICAgIFtzZWxm IF9sYXlvdXRGb3JOb2RlTGlzdEhpZ2hsaWdodDpoaWdobGlnaHRdOwogICAgIGVsc2UgaWYgKGhp Z2hsaWdodC50eXBlID09IEhpZ2hsaWdodFR5cGU6OlJlY3RzKQogICAgICAgICBbc2VsZiBfbGF5 b3V0Rm9yUmVjdHNIaWdobGlnaHQ6aGlnaGxpZ2h0XTsKIH0K