68897 2011-09-27 06:13:49 -0700 [Texmap] Code cleanup: remove unused boundingRect/visibleRect calculations 2011-09-27 09:37:30 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED Qt P2 Normal --- 47068 56935 1 noam webkit-unassigned webkit.review.bot oldest_to_newest 473893 0 noam 2011-09-27 06:13:49 -0700 Since we're going to add direct content updates to TextureMapperNode, it's a good time to clean unused code from it. We don't use the current calculations of visible rects, since partial updates are not supported by TextureMapper. 473894 1 108833 noam 2011-09-27 06:16:30 -0700 Created attachment 108833 Patch 473900 2 108833 webkit-ews 2011-09-27 06:24:16 -0700 Comment on attachment 108833 Patch Attachment 108833 did not pass qt-ews (qt): Output: http://queues.webkit.org/results/9877327 473908 3 108839 noam 2011-09-27 06:34:36 -0700 Created attachment 108839 Patch 473987 4 108839 webkit.review.bot 2011-09-27 09:37:26 -0700 Comment on attachment 108839 Patch Clearing flags on attachment: 108839 Committed r96120: <http://trac.webkit.org/changeset/96120> 473989 5 webkit.review.bot 2011-09-27 09:37:30 -0700 All reviewed patches have been landed. Closing bug. 108833 2011-09-27 06:16:30 -0700 2011-09-27 06:34:36 -0700 Patch patch.diff text/plain 6659 noam ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBiM2FkYjIwLi5hYjEwMmMzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTgg QEAKKzIwMTEtMDktMjcgIE5vJ2FtIFJvc2VudGhhbCAgPG5vYW0ucm9zZW50aGFsQG5va2lhLmNv bT4KKworICAgICAgICBbVGV4bWFwXSBDb2RlIGNsZWFudXA6IHJlbW92ZSB1bnVzZWQgYm91bmRp bmdSZWN0L3Zpc2libGVSZWN0IGNhbGN1bGF0aW9ucworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Njg4OTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBObyBuZXcgZnVuY3Rpb25hbGl0eSBzbyBubyBuZXcgdGVz dHMuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlck5v ZGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6VGV4dHVyZU1hcHBlck5vZGU6OmNvbXB1dGVBbGxU cmFuc2Zvcm1zKToKKyAgICAgICAgKFdlYkNvcmU6OlRleHR1cmVNYXBwZXJOb2RlOjpjb21wdXRl VGlsZXMpOgorICAgICAgICAoV2ViQ29yZTo6VGV4dHVyZU1hcHBlck5vZGU6OnN5bmNDb21wb3Np dGluZ1N0YXRlKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1h cHBlck5vZGUuaDoKKwogMjAxMS0wOS0yNiAgTm8nYW0gUm9zZW50aGFsICA8bm9hbS5yb3NlbnRo YWxAbm9raWEuY29tPgogCiAgICAgICAgIFtUZXhtYXBdW1F0XSBSZWZhY3RvciB0ZXh0dXJlLXVw bG9hZCB0byBhbGxvdyBkaXJlY3QgY2h1bmsgdXBkYXRlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlck5vZGUuY3BwIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJOb2RlLmNw cAppbmRleCBiMzcwZjQ4Li5hZDc2MzI2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlck5vZGUuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyTm9kZS5jcHAKQEAg LTEzNiwyMCArMTM2LDYgQEAgdm9pZCBUZXh0dXJlTWFwcGVyTm9kZTo6Y29tcHV0ZUxvY2FsVHJh bnNmb3JtSWZOZWVkZWQoKQogICAgICAgICAudHJhbnNsYXRlM2QoLW9yaWdpblgsIC1vcmlnaW5Z LCAtbV9zdGF0ZS5hbmNob3JQb2ludC56KCkpOwogfQogCi1ib29sIFRleHR1cmVNYXBwZXJOb2Rl OjpuZWVkc1RvQ29tcHV0ZUJvdW5kaW5nUmVjdCgpIGNvbnN0Ci17Ci0gICAgaWYgKG1fc2l6ZS53 aWR0aCgpID4gZ1RpbGVEaW1lbnNpb24gfHwgbV9zaXplLmhlaWdodCgpID4gZ1RpbGVEaW1lbnNp b24pCi0gICAgICAgIHJldHVybiB0cnVlOwotICAgIGlmICghbV9zdGF0ZS5tYXNrc1RvQm91bmRz KQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0KLSAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IG1f Y2hpbGRyZW4uc2l6ZSgpOyArK2kpCi0gICAgICAgIGlmIChtX2NoaWxkcmVuW2ldLT5uZWVkc1Rv Q29tcHV0ZUJvdW5kaW5nUmVjdCgpKQotICAgICAgICAgICAgcmV0dXJuIHRydWU7Ci0KLSAgICBy ZXR1cm4gZmFsc2U7Ci19Ci0KIHZvaWQgVGV4dHVyZU1hcHBlck5vZGU6OmNvbXB1dGVBbGxUcmFu c2Zvcm1zKCkKIHsKICAgICBpZiAobV9zaXplLmlzRW1wdHkoKSAmJiBtX3N0YXRlLm1hc2tzVG9C b3VuZHMpCkBAIC0xNjAsNyArMTQ2LDYgQEAgdm9pZCBUZXh0dXJlTWFwcGVyTm9kZTo6Y29tcHV0 ZUFsbFRyYW5zZm9ybXMoKQogICAgIGNvbXB1dGVQZXJzcGVjdGl2ZVRyYW5zZm9ybUlmTmVlZGVk KCk7CiAKICAgICBtX3RyYW5zZm9ybXMudGFyZ2V0ID0gVHJhbnNmb3JtYXRpb25NYXRyaXgobV9w YXJlbnQgPyBtX3BhcmVudC0+bV90cmFuc2Zvcm1zLmZvckRlc2NlbmRhbnRzIDogVHJhbnNmb3Jt YXRpb25NYXRyaXgoKSkubXVsdGlwbHkobV90cmFuc2Zvcm1zLmxvY2FsKTsKLSAgICBtX3RyYW5z Zm9ybXMudGFyZ2V0Qm91bmRpbmdSZWN0ID0gRmxvYXRSZWN0KG1fdHJhbnNmb3Jtcy50YXJnZXQu bWFwUmVjdCh0YXJnZXRSZWN0KCkpKTsKIAogICAgIG1fc3RhdGUudmlzaWJsZSA9IG1fc3RhdGUu YmFja2ZhY2VWaXNpYmlsaXR5IHx8IG1fdHJhbnNmb3Jtcy50YXJnZXQuaW52ZXJzZSgpLm0zMygp ID49IDA7CiAgICAgaWYgKCFtX3N0YXRlLnZpc2libGUpCkBAIC0xODYsMjggKzE3MSw2IEBAIHZv aWQgVGV4dHVyZU1hcHBlck5vZGU6OmNvbXB1dGVBbGxUcmFuc2Zvcm1zKCkKICAgICBtX3RyYW5z Zm9ybXMuZm9yRGVzY2VuZGFudHMubXVsdGlwbHkobV90cmFuc2Zvcm1zLnBlcnNwZWN0aXZlKTsK IH0KIAotdm9pZCBUZXh0dXJlTWFwcGVyTm9kZTo6Y29tcHV0ZUJvdW5kaW5nUmVjdEZyb21Sb290 SWZOZWVkZWQoKQotewotICAgIGlmICghbmVlZHNUb0NvbXB1dGVCb3VuZGluZ1JlY3QoKSkKLSAg ICAgICAgcmV0dXJuOwotICAgIGlmICghbV9wYXJlbnQpIHsKLSAgICAgICAgbV90cmFuc2Zvcm1z LmJvdW5kaW5nUmVjdEZyb21Sb290ID0gbV90cmFuc2Zvcm1zLmJvdW5kaW5nUmVjdEZyb21Sb290 Rm9yRGVzY2VuZGFudHMgPSBJbnRSZWN0KDAsIDAsIC0xLCAtMSk7Ci0gICAgICAgIHJldHVybjsK LSAgICB9Ci0KLSAgICBjb25zdCBGbG9hdFJlY3QgdGFyZ2V0UmVjdEluUm9vdENvb3JkaW5hdGVz ID0gbV90cmFuc2Zvcm1zLnRhcmdldC5tYXBSZWN0KHRhcmdldFJlY3QoKSk7Ci0KLSAgICBjb25z dCBGbG9hdFJlY3QgcGFyZW50Qm91bmRpbmdSZWN0ID0gbV9wYXJlbnQtPm1fdHJhbnNmb3Jtcy5i b3VuZGluZ1JlY3RGcm9tUm9vdEZvckRlc2NlbmRhbnRzOwotICAgIGlmIChwYXJlbnRCb3VuZGlu Z1JlY3Qud2lkdGgoKSA8IDApCi0gICAgICAgIG1fdHJhbnNmb3Jtcy5ib3VuZGluZ1JlY3RGcm9t Um9vdCA9IHRhcmdldFJlY3RJblJvb3RDb29yZGluYXRlczsKLSAgICBlbHNlIHsKLSAgICAgICAg bV90cmFuc2Zvcm1zLmJvdW5kaW5nUmVjdEZyb21Sb290Rm9yRGVzY2VuZGFudHMgPSBtX3RyYW5z Zm9ybXMuYm91bmRpbmdSZWN0RnJvbVJvb3QgPSBwYXJlbnRCb3VuZGluZ1JlY3Q7Ci0gICAgICAg IG1fdHJhbnNmb3Jtcy5ib3VuZGluZ1JlY3RGcm9tUm9vdC5pbnRlcnNlY3QodGFyZ2V0UmVjdElu Um9vdENvb3JkaW5hdGVzKTsKLSAgICB9Ci0gICAgaWYgKG1fc3RhdGUubWFza3NUb0JvdW5kcykK LSAgICAgICAgbV90cmFuc2Zvcm1zLmJvdW5kaW5nUmVjdEZyb21Sb290Rm9yRGVzY2VuZGFudHMu aW50ZXJzZWN0KG1fdHJhbnNmb3Jtcy5ib3VuZGluZ1JlY3RGcm9tUm9vdCk7Ci19Ci0KIHZvaWQg VGV4dHVyZU1hcHBlck5vZGU6OmNvbXB1dGVUaWxlcygpCiB7CiAgICAgaWYgKG1fY3VycmVudENv bnRlbnQuY29udGVudFR5cGUgPT0gSFRNTENvbnRlbnRUeXBlICYmICFtX3N0YXRlLmRyYXdzQ29u dGVudCkgewpAQCAtMjI4LDkgKzE5MSw3IEBAIHZvaWQgVGV4dHVyZU1hcHBlck5vZGU6OmNvbXB1 dGVUaWxlcygpCiAgICAgICAgICAgICB0aWxlUmVjdEluUm9vdENvb3JkaW5hdGVzLnNjYWxlKDEu MCAvIG1fc3RhdGUuY29udGVudFNjYWxlKTsKICAgICAgICAgICAgIHRpbGVSZWN0SW5Sb290Q29v cmRpbmF0ZXMgPSBtX3RyYW5zZm9ybXMudGFyZ2V0Lm1hcFJlY3QodGlsZVJlY3RJblJvb3RDb29y ZGluYXRlcyk7CiAgICAgICAgICAgICBzdGF0aWMgYm9vbCBzRGlzY2FyZEhpZGRlblRpbGVzID0g ZmFsc2U7Ci0gICAgICAgICAgICAvLyBGSVhNRTogZGlzY2FyZCBoaWRkZW4gdGlsZXMuCi0gICAg ICAgICAgICBpZiAoIXNEaXNjYXJkSGlkZGVuVGlsZXMgfHwgIW5lZWRzVG9Db21wdXRlQm91bmRp bmdSZWN0KCkgfHwgdGlsZVJlY3RJblJvb3RDb29yZGluYXRlcy5pbnRlcnNlY3RzKG1fc3RhdGUu dmlzaWJsZVJlY3QpKQotICAgICAgICAgICAgICAgIHRpbGVzVG9BZGQuYXBwZW5kKHRpbGVSZWN0 KTsKKyAgICAgICAgICAgIHRpbGVzVG9BZGQuYXBwZW5kKHRpbGVSZWN0KTsKICAgICAgICAgfQog ICAgIH0KIApAQCAtMjcxLDIxICsyMzIsNiBAQCB2b2lkIFRleHR1cmVNYXBwZXJOb2RlOjpjb21w dXRlVGlsZXMoKQogICAgICAgICBtX3RpbGVzLnJlbW92ZSh0aWxlc1RvUmVtb3ZlW2ldKTsKIH0K IAotdm9pZCBUZXh0dXJlTWFwcGVyTm9kZTo6Y29tcHV0ZVZpc2libGVSZWN0SWZOZWVkZWQoKQot ewotICAgIGlmICghbmVlZHNUb0NvbXB1dGVCb3VuZGluZ1JlY3QoKSkKLSAgICAgICAgcmV0dXJu OwotICAgIEZsb2F0UmVjdCByb290VmlzaWJsZVJlY3Q7Ci0gICAgaWYgKCFtX3BhcmVudCkKLSAg ICAgICAgcm9vdFZpc2libGVSZWN0ID0gbV9zdGF0ZS5yb290VmlzaWJsZVJlY3Q7Ci0gICAgZWxz ZSBpZiAobV9wYXJlbnQpCi0gICAgICAgIHJvb3RWaXNpYmxlUmVjdCA9IG1fcGFyZW50LT5tX3N0 YXRlLnJvb3RWaXNpYmxlUmVjdDsKLQotICAgIG1fc3RhdGUucm9vdFZpc2libGVSZWN0ID0gcm9v dFZpc2libGVSZWN0OwotICAgIG1fc3RhdGUudmlzaWJsZVJlY3QgPSBtX3N0YXRlLnJvb3RWaXNp YmxlUmVjdDsKLSAgICBtX3N0YXRlLnZpc2libGVSZWN0LmludGVyc2VjdChtX3RyYW5zZm9ybXMu Ym91bmRpbmdSZWN0RnJvbVJvb3QpOwotfQotCiB2b2lkIFRleHR1cmVNYXBwZXJOb2RlOjpyZW5k ZXJDb250ZW50KFRleHR1cmVNYXBwZXIqIHRleHR1cmVNYXBwZXIsIEdyYXBoaWNzTGF5ZXIqIGxh eWVyKQogewogICAgIGlmIChtX3NpemUuaXNFbXB0eSgpIHx8ICFsYXllciB8fCAoIW1fc3RhdGUu ZHJhd3NDb250ZW50ICYmIG1fY3VycmVudENvbnRlbnQuY29udGVudFR5cGUgPT0gSFRNTENvbnRl bnRUeXBlKSkgewpAQCAtNTY3LDExICs1MTMsNiBAQCBUZXh0dXJlTWFwcGVyTm9kZTo6flRleHR1 cmVNYXBwZXJOb2RlKCkKICAgICAgICAgbV9wYXJlbnQtPm1fY2hpbGRyZW4ucmVtb3ZlKG1fcGFy ZW50LT5tX2NoaWxkcmVuLmZpbmQodGhpcykpOwogfQogCi12b2lkIFRleHR1cmVNYXBwZXJOb2Rl OjpzZXRWaXNpYmxlUmVjdChjb25zdCBJbnRSZWN0JiByZWN0KQotewotICAgIG1fc3RhdGUucm9v dFZpc2libGVSZWN0ID0gbV9zdGF0ZS52aXNpYmxlUmVjdCA9IHJlY3Q7Ci19Ci0KIHZvaWQgVGV4 dHVyZU1hcHBlck5vZGU6OnN5bmNDb21wb3NpdGluZ1N0YXRlKEdyYXBoaWNzTGF5ZXJUZXh0dXJl TWFwcGVyKiBncmFwaGljc0xheWVyLCBpbnQgb3B0aW9ucykKIHsKICAgICBzeW5jQ29tcG9zaXRp bmdTdGF0ZShncmFwaGljc0xheWVyLCByb290TGF5ZXIoKS0+bV90ZXh0dXJlTWFwcGVyLCBvcHRp b25zKTsKQEAgLTg5NSw3ICs4MzYsNiBAQCB2b2lkIFRleHR1cmVNYXBwZXJOb2RlOjpzeW5jQ29t cG9zaXRpbmdTdGF0ZShHcmFwaGljc0xheWVyVGV4dHVyZU1hcHBlciogZ3JhcGhpYwogICAgIHN5 bmNBbmltYXRpb25zKGdyYXBoaWNzTGF5ZXIpOwogCiAgICAgY29tcHV0ZUFsbFRyYW5zZm9ybXMo KTsKLSAgICBjb21wdXRlQm91bmRpbmdSZWN0RnJvbVJvb3RJZk5lZWRlZCgpOwogICAgIGNvbXB1 dGVQZXJzcGVjdGl2ZVRyYW5zZm9ybUlmTmVlZGVkKCk7CiAgICAgY29tcHV0ZVRpbGVzKCk7CiAg ICAgY29tcHV0ZU92ZXJsYXBzSWZOZWVkZWQoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyTm9kZS5oIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJOb2RlLmgKaW5kZXgg NzY2ZDk5Yi4uYzI5OWQ2YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJOb2RlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJOb2RlLmgKQEAgLTEzNSw3ICsxMzUs NiBAQCBwdWJsaWM6CiAgICAgSW50U2l6ZSBzaXplKCkgY29uc3QgeyByZXR1cm4gSW50U2l6ZSht X3NpemUud2lkdGgoKSArIC41LCBtX3NpemUuaGVpZ2h0KCkgKyAuNSk7IH0KICAgICB2b2lkIHNl dFRyYW5zZm9ybShjb25zdCBUcmFuc2Zvcm1hdGlvbk1hdHJpeCYpOwogICAgIHZvaWQgc2V0T3Bh Y2l0eShmbG9hdCB2YWx1ZSkgeyBtX29wYWNpdHkgPSB2YWx1ZTsgfQotICAgIHZvaWQgc2V0Vmlz aWJsZVJlY3QoY29uc3QgSW50UmVjdCYpOwogICAgIHZvaWQgc2V0VGV4dHVyZU1hcHBlcihUZXh0 dXJlTWFwcGVyKiB0ZXhtYXApIHsgbV90ZXh0dXJlTWFwcGVyID0gdGV4bWFwOyB9CiAgICAgYm9v bCBkZXNjZW5kYW50c09yU2VsZkhhdmVSdW5uaW5nQW5pbWF0aW9ucygpIGNvbnN0OwogCkBAIC0x NDgsNyArMTQ3LDYgQEAgcHVibGljOgogcHJpdmF0ZToKICAgICBUZXh0dXJlTWFwcGVyTm9kZSog cm9vdExheWVyKCk7CiAgICAgdm9pZCBjb21wdXRlQWxsVHJhbnNmb3JtcygpOwotICAgIHZvaWQg Y29tcHV0ZVZpc2libGVSZWN0SWZOZWVkZWQoKTsKICAgICB2b2lkIGNvbXB1dGVQZXJzcGVjdGl2 ZVRyYW5zZm9ybUlmTmVlZGVkKCk7CiAgICAgdm9pZCBjb21wdXRlUmVwbGljYVRyYW5zZm9ybUlm TmVlZGVkKCk7CiAgICAgdm9pZCBjb21wdXRlT3ZlcmxhcHNJZk5lZWRlZCgpOwo= 108839 2011-09-27 06:34:36 -0700 2011-09-27 09:37:26 -0700 Patch patch.diff text/plain 6721 noam ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBiM2FkYjIwLi5hYjEwMmMzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTgg QEAKKzIwMTEtMDktMjcgIE5vJ2FtIFJvc2VudGhhbCAgPG5vYW0ucm9zZW50aGFsQG5va2lhLmNv bT4KKworICAgICAgICBbVGV4bWFwXSBDb2RlIGNsZWFudXA6IHJlbW92ZSB1bnVzZWQgYm91bmRp bmdSZWN0L3Zpc2libGVSZWN0IGNhbGN1bGF0aW9ucworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Njg4OTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBObyBuZXcgZnVuY3Rpb25hbGl0eSBzbyBubyBuZXcgdGVz dHMuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlck5v ZGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6VGV4dHVyZU1hcHBlck5vZGU6OmNvbXB1dGVBbGxU cmFuc2Zvcm1zKToKKyAgICAgICAgKFdlYkNvcmU6OlRleHR1cmVNYXBwZXJOb2RlOjpjb21wdXRl VGlsZXMpOgorICAgICAgICAoV2ViQ29yZTo6VGV4dHVyZU1hcHBlck5vZGU6OnN5bmNDb21wb3Np dGluZ1N0YXRlKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1h cHBlck5vZGUuaDoKKwogMjAxMS0wOS0yNiAgTm8nYW0gUm9zZW50aGFsICA8bm9hbS5yb3NlbnRo YWxAbm9raWEuY29tPgogCiAgICAgICAgIFtUZXhtYXBdW1F0XSBSZWZhY3RvciB0ZXh0dXJlLXVw bG9hZCB0byBhbGxvdyBkaXJlY3QgY2h1bmsgdXBkYXRlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlck5vZGUuY3BwIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJOb2RlLmNw cAppbmRleCBiMzcwZjQ4Li41NGJhM2IzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlck5vZGUuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyTm9kZS5jcHAKQEAg LTEzNiwyMCArMTM2LDYgQEAgdm9pZCBUZXh0dXJlTWFwcGVyTm9kZTo6Y29tcHV0ZUxvY2FsVHJh bnNmb3JtSWZOZWVkZWQoKQogICAgICAgICAudHJhbnNsYXRlM2QoLW9yaWdpblgsIC1vcmlnaW5Z LCAtbV9zdGF0ZS5hbmNob3JQb2ludC56KCkpOwogfQogCi1ib29sIFRleHR1cmVNYXBwZXJOb2Rl OjpuZWVkc1RvQ29tcHV0ZUJvdW5kaW5nUmVjdCgpIGNvbnN0Ci17Ci0gICAgaWYgKG1fc2l6ZS53 aWR0aCgpID4gZ1RpbGVEaW1lbnNpb24gfHwgbV9zaXplLmhlaWdodCgpID4gZ1RpbGVEaW1lbnNp b24pCi0gICAgICAgIHJldHVybiB0cnVlOwotICAgIGlmICghbV9zdGF0ZS5tYXNrc1RvQm91bmRz KQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0KLSAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IG1f Y2hpbGRyZW4uc2l6ZSgpOyArK2kpCi0gICAgICAgIGlmIChtX2NoaWxkcmVuW2ldLT5uZWVkc1Rv Q29tcHV0ZUJvdW5kaW5nUmVjdCgpKQotICAgICAgICAgICAgcmV0dXJuIHRydWU7Ci0KLSAgICBy ZXR1cm4gZmFsc2U7Ci19Ci0KIHZvaWQgVGV4dHVyZU1hcHBlck5vZGU6OmNvbXB1dGVBbGxUcmFu c2Zvcm1zKCkKIHsKICAgICBpZiAobV9zaXplLmlzRW1wdHkoKSAmJiBtX3N0YXRlLm1hc2tzVG9C b3VuZHMpCkBAIC0xNjAsNyArMTQ2LDYgQEAgdm9pZCBUZXh0dXJlTWFwcGVyTm9kZTo6Y29tcHV0 ZUFsbFRyYW5zZm9ybXMoKQogICAgIGNvbXB1dGVQZXJzcGVjdGl2ZVRyYW5zZm9ybUlmTmVlZGVk KCk7CiAKICAgICBtX3RyYW5zZm9ybXMudGFyZ2V0ID0gVHJhbnNmb3JtYXRpb25NYXRyaXgobV9w YXJlbnQgPyBtX3BhcmVudC0+bV90cmFuc2Zvcm1zLmZvckRlc2NlbmRhbnRzIDogVHJhbnNmb3Jt YXRpb25NYXRyaXgoKSkubXVsdGlwbHkobV90cmFuc2Zvcm1zLmxvY2FsKTsKLSAgICBtX3RyYW5z Zm9ybXMudGFyZ2V0Qm91bmRpbmdSZWN0ID0gRmxvYXRSZWN0KG1fdHJhbnNmb3Jtcy50YXJnZXQu bWFwUmVjdCh0YXJnZXRSZWN0KCkpKTsKIAogICAgIG1fc3RhdGUudmlzaWJsZSA9IG1fc3RhdGUu YmFja2ZhY2VWaXNpYmlsaXR5IHx8IG1fdHJhbnNmb3Jtcy50YXJnZXQuaW52ZXJzZSgpLm0zMygp ID49IDA7CiAgICAgaWYgKCFtX3N0YXRlLnZpc2libGUpCkBAIC0xODYsMjggKzE3MSw2IEBAIHZv aWQgVGV4dHVyZU1hcHBlck5vZGU6OmNvbXB1dGVBbGxUcmFuc2Zvcm1zKCkKICAgICBtX3RyYW5z Zm9ybXMuZm9yRGVzY2VuZGFudHMubXVsdGlwbHkobV90cmFuc2Zvcm1zLnBlcnNwZWN0aXZlKTsK IH0KIAotdm9pZCBUZXh0dXJlTWFwcGVyTm9kZTo6Y29tcHV0ZUJvdW5kaW5nUmVjdEZyb21Sb290 SWZOZWVkZWQoKQotewotICAgIGlmICghbmVlZHNUb0NvbXB1dGVCb3VuZGluZ1JlY3QoKSkKLSAg ICAgICAgcmV0dXJuOwotICAgIGlmICghbV9wYXJlbnQpIHsKLSAgICAgICAgbV90cmFuc2Zvcm1z LmJvdW5kaW5nUmVjdEZyb21Sb290ID0gbV90cmFuc2Zvcm1zLmJvdW5kaW5nUmVjdEZyb21Sb290 Rm9yRGVzY2VuZGFudHMgPSBJbnRSZWN0KDAsIDAsIC0xLCAtMSk7Ci0gICAgICAgIHJldHVybjsK LSAgICB9Ci0KLSAgICBjb25zdCBGbG9hdFJlY3QgdGFyZ2V0UmVjdEluUm9vdENvb3JkaW5hdGVz ID0gbV90cmFuc2Zvcm1zLnRhcmdldC5tYXBSZWN0KHRhcmdldFJlY3QoKSk7Ci0KLSAgICBjb25z dCBGbG9hdFJlY3QgcGFyZW50Qm91bmRpbmdSZWN0ID0gbV9wYXJlbnQtPm1fdHJhbnNmb3Jtcy5i b3VuZGluZ1JlY3RGcm9tUm9vdEZvckRlc2NlbmRhbnRzOwotICAgIGlmIChwYXJlbnRCb3VuZGlu Z1JlY3Qud2lkdGgoKSA8IDApCi0gICAgICAgIG1fdHJhbnNmb3Jtcy5ib3VuZGluZ1JlY3RGcm9t Um9vdCA9IHRhcmdldFJlY3RJblJvb3RDb29yZGluYXRlczsKLSAgICBlbHNlIHsKLSAgICAgICAg bV90cmFuc2Zvcm1zLmJvdW5kaW5nUmVjdEZyb21Sb290Rm9yRGVzY2VuZGFudHMgPSBtX3RyYW5z Zm9ybXMuYm91bmRpbmdSZWN0RnJvbVJvb3QgPSBwYXJlbnRCb3VuZGluZ1JlY3Q7Ci0gICAgICAg IG1fdHJhbnNmb3Jtcy5ib3VuZGluZ1JlY3RGcm9tUm9vdC5pbnRlcnNlY3QodGFyZ2V0UmVjdElu Um9vdENvb3JkaW5hdGVzKTsKLSAgICB9Ci0gICAgaWYgKG1fc3RhdGUubWFza3NUb0JvdW5kcykK LSAgICAgICAgbV90cmFuc2Zvcm1zLmJvdW5kaW5nUmVjdEZyb21Sb290Rm9yRGVzY2VuZGFudHMu aW50ZXJzZWN0KG1fdHJhbnNmb3Jtcy5ib3VuZGluZ1JlY3RGcm9tUm9vdCk7Ci19Ci0KIHZvaWQg VGV4dHVyZU1hcHBlck5vZGU6OmNvbXB1dGVUaWxlcygpCiB7CiAgICAgaWYgKG1fY3VycmVudENv bnRlbnQuY29udGVudFR5cGUgPT0gSFRNTENvbnRlbnRUeXBlICYmICFtX3N0YXRlLmRyYXdzQ29u dGVudCkgewpAQCAtMjI3LDEwICsxOTAsNyBAQCB2b2lkIFRleHR1cmVNYXBwZXJOb2RlOjpjb21w dXRlVGlsZXMoKQogICAgICAgICAgICAgRmxvYXRSZWN0IHRpbGVSZWN0SW5Sb290Q29vcmRpbmF0 ZXMgPSB0aWxlUmVjdDsKICAgICAgICAgICAgIHRpbGVSZWN0SW5Sb290Q29vcmRpbmF0ZXMuc2Nh bGUoMS4wIC8gbV9zdGF0ZS5jb250ZW50U2NhbGUpOwogICAgICAgICAgICAgdGlsZVJlY3RJblJv b3RDb29yZGluYXRlcyA9IG1fdHJhbnNmb3Jtcy50YXJnZXQubWFwUmVjdCh0aWxlUmVjdEluUm9v dENvb3JkaW5hdGVzKTsKLSAgICAgICAgICAgIHN0YXRpYyBib29sIHNEaXNjYXJkSGlkZGVuVGls ZXMgPSBmYWxzZTsKLSAgICAgICAgICAgIC8vIEZJWE1FOiBkaXNjYXJkIGhpZGRlbiB0aWxlcy4K LSAgICAgICAgICAgIGlmICghc0Rpc2NhcmRIaWRkZW5UaWxlcyB8fCAhbmVlZHNUb0NvbXB1dGVC b3VuZGluZ1JlY3QoKSB8fCB0aWxlUmVjdEluUm9vdENvb3JkaW5hdGVzLmludGVyc2VjdHMobV9z dGF0ZS52aXNpYmxlUmVjdCkpCi0gICAgICAgICAgICAgICAgdGlsZXNUb0FkZC5hcHBlbmQodGls ZVJlY3QpOworICAgICAgICAgICAgdGlsZXNUb0FkZC5hcHBlbmQodGlsZVJlY3QpOwogICAgICAg ICB9CiAgICAgfQogCkBAIC0yNzEsMjEgKzIzMSw2IEBAIHZvaWQgVGV4dHVyZU1hcHBlck5vZGU6 OmNvbXB1dGVUaWxlcygpCiAgICAgICAgIG1fdGlsZXMucmVtb3ZlKHRpbGVzVG9SZW1vdmVbaV0p OwogfQogCi12b2lkIFRleHR1cmVNYXBwZXJOb2RlOjpjb21wdXRlVmlzaWJsZVJlY3RJZk5lZWRl ZCgpCi17Ci0gICAgaWYgKCFuZWVkc1RvQ29tcHV0ZUJvdW5kaW5nUmVjdCgpKQotICAgICAgICBy ZXR1cm47Ci0gICAgRmxvYXRSZWN0IHJvb3RWaXNpYmxlUmVjdDsKLSAgICBpZiAoIW1fcGFyZW50 KQotICAgICAgICByb290VmlzaWJsZVJlY3QgPSBtX3N0YXRlLnJvb3RWaXNpYmxlUmVjdDsKLSAg ICBlbHNlIGlmIChtX3BhcmVudCkKLSAgICAgICAgcm9vdFZpc2libGVSZWN0ID0gbV9wYXJlbnQt Pm1fc3RhdGUucm9vdFZpc2libGVSZWN0OwotCi0gICAgbV9zdGF0ZS5yb290VmlzaWJsZVJlY3Qg PSByb290VmlzaWJsZVJlY3Q7Ci0gICAgbV9zdGF0ZS52aXNpYmxlUmVjdCA9IG1fc3RhdGUucm9v dFZpc2libGVSZWN0OwotICAgIG1fc3RhdGUudmlzaWJsZVJlY3QuaW50ZXJzZWN0KG1fdHJhbnNm b3Jtcy5ib3VuZGluZ1JlY3RGcm9tUm9vdCk7Ci19Ci0KIHZvaWQgVGV4dHVyZU1hcHBlck5vZGU6 OnJlbmRlckNvbnRlbnQoVGV4dHVyZU1hcHBlciogdGV4dHVyZU1hcHBlciwgR3JhcGhpY3NMYXll ciogbGF5ZXIpCiB7CiAgICAgaWYgKG1fc2l6ZS5pc0VtcHR5KCkgfHwgIWxheWVyIHx8ICghbV9z dGF0ZS5kcmF3c0NvbnRlbnQgJiYgbV9jdXJyZW50Q29udGVudC5jb250ZW50VHlwZSA9PSBIVE1M Q29udGVudFR5cGUpKSB7CkBAIC01NjcsMTEgKzUxMiw2IEBAIFRleHR1cmVNYXBwZXJOb2RlOjp+ VGV4dHVyZU1hcHBlck5vZGUoKQogICAgICAgICBtX3BhcmVudC0+bV9jaGlsZHJlbi5yZW1vdmUo bV9wYXJlbnQtPm1fY2hpbGRyZW4uZmluZCh0aGlzKSk7CiB9CiAKLXZvaWQgVGV4dHVyZU1hcHBl ck5vZGU6OnNldFZpc2libGVSZWN0KGNvbnN0IEludFJlY3QmIHJlY3QpCi17Ci0gICAgbV9zdGF0 ZS5yb290VmlzaWJsZVJlY3QgPSBtX3N0YXRlLnZpc2libGVSZWN0ID0gcmVjdDsKLX0KLQogdm9p ZCBUZXh0dXJlTWFwcGVyTm9kZTo6c3luY0NvbXBvc2l0aW5nU3RhdGUoR3JhcGhpY3NMYXllclRl eHR1cmVNYXBwZXIqIGdyYXBoaWNzTGF5ZXIsIGludCBvcHRpb25zKQogewogICAgIHN5bmNDb21w b3NpdGluZ1N0YXRlKGdyYXBoaWNzTGF5ZXIsIHJvb3RMYXllcigpLT5tX3RleHR1cmVNYXBwZXIs IG9wdGlvbnMpOwpAQCAtODk1LDcgKzgzNSw2IEBAIHZvaWQgVGV4dHVyZU1hcHBlck5vZGU6OnN5 bmNDb21wb3NpdGluZ1N0YXRlKEdyYXBoaWNzTGF5ZXJUZXh0dXJlTWFwcGVyKiBncmFwaGljCiAg ICAgc3luY0FuaW1hdGlvbnMoZ3JhcGhpY3NMYXllcik7CiAKICAgICBjb21wdXRlQWxsVHJhbnNm b3JtcygpOwotICAgIGNvbXB1dGVCb3VuZGluZ1JlY3RGcm9tUm9vdElmTmVlZGVkKCk7CiAgICAg Y29tcHV0ZVBlcnNwZWN0aXZlVHJhbnNmb3JtSWZOZWVkZWQoKTsKICAgICBjb21wdXRlVGlsZXMo KTsKICAgICBjb21wdXRlT3ZlcmxhcHNJZk5lZWRlZCgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJOb2RlLmggYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlck5vZGUuaApp bmRleCA3NjZkOTliLi5jMjk5ZDZiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlck5vZGUuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlck5vZGUuaApAQCAtMTM1LDcg KzEzNSw2IEBAIHB1YmxpYzoKICAgICBJbnRTaXplIHNpemUoKSBjb25zdCB7IHJldHVybiBJbnRT aXplKG1fc2l6ZS53aWR0aCgpICsgLjUsIG1fc2l6ZS5oZWlnaHQoKSArIC41KTsgfQogICAgIHZv aWQgc2V0VHJhbnNmb3JtKGNvbnN0IFRyYW5zZm9ybWF0aW9uTWF0cml4Jik7CiAgICAgdm9pZCBz ZXRPcGFjaXR5KGZsb2F0IHZhbHVlKSB7IG1fb3BhY2l0eSA9IHZhbHVlOyB9Ci0gICAgdm9pZCBz ZXRWaXNpYmxlUmVjdChjb25zdCBJbnRSZWN0Jik7CiAgICAgdm9pZCBzZXRUZXh0dXJlTWFwcGVy KFRleHR1cmVNYXBwZXIqIHRleG1hcCkgeyBtX3RleHR1cmVNYXBwZXIgPSB0ZXhtYXA7IH0KICAg ICBib29sIGRlc2NlbmRhbnRzT3JTZWxmSGF2ZVJ1bm5pbmdBbmltYXRpb25zKCkgY29uc3Q7CiAK QEAgLTE0OCw3ICsxNDcsNiBAQCBwdWJsaWM6CiBwcml2YXRlOgogICAgIFRleHR1cmVNYXBwZXJO b2RlKiByb290TGF5ZXIoKTsKICAgICB2b2lkIGNvbXB1dGVBbGxUcmFuc2Zvcm1zKCk7Ci0gICAg dm9pZCBjb21wdXRlVmlzaWJsZVJlY3RJZk5lZWRlZCgpOwogICAgIHZvaWQgY29tcHV0ZVBlcnNw ZWN0aXZlVHJhbnNmb3JtSWZOZWVkZWQoKTsKICAgICB2b2lkIGNvbXB1dGVSZXBsaWNhVHJhbnNm b3JtSWZOZWVkZWQoKTsKICAgICB2b2lkIGNvbXB1dGVPdmVybGFwc0lmTmVlZGVkKCk7Cg==