64195 2011-07-08 12:27:06 -0700 Refactor override size to be a size rather than just an int 2011-07-08 15:15:33 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 tony tony eae eric hyatt leviw webkit.review.bot oldest_to_newest 434234 0 tony 2011-07-08 12:27:06 -0700 Refactor override size to be a size rather than just an int 434237 1 100146 tony 2011-07-08 12:31:17 -0700 Created attachment 100146 Patch 434240 2 leviw 2011-07-08 12:33:18 -0700 Thanks for switching to Layout units! 434272 3 100146 hyatt 2011-07-08 13:30:12 -0700 Comment on attachment 100146 Patch r=me 434329 4 100146 webkit.review.bot 2011-07-08 15:15:29 -0700 Comment on attachment 100146 Patch Clearing flags on attachment: 100146 Committed r90668: <http://trac.webkit.org/changeset/90668> 434330 5 webkit.review.bot 2011-07-08 15:15:33 -0700 All reviewed patches have been landed. Closing bug. 100146 2011-07-08 12:31:17 -0700 2011-07-08 15:15:29 -0700 Patch bug-64195-20110708123048.patch text/plain 15447 tony U3VidmVyc2lvbiBSZXZpc2lvbjogOTA2NDQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA3YWI1ODQ2YjRjZTZjY2Fl NmQzYjlmY2UzM2FhNzRjMzg4ZDcwNWQ0Li41M2M1NDBiYzExNjg0NmJjZmJmNTNkMWNjYmIzODc4 NTBlZGYzYjFkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDEgQEAKKzIwMTEtMDctMDggIFRvbnkg Q2hhbmcgIDx0b255QGNocm9taXVtLm9yZz4KKworICAgICAgICBSZWZhY3RvciBvdmVycmlkZSBz aXplIHRvIGJlIGEgc2l6ZSByYXRoZXIgdGhhbiBqdXN0IGFuIGludAorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjQxOTUKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBbHNvIGNvbnZlcnQgdG8gTGF5b3V0U2l6 ZSBhbmQgTGF5b3V0VW5pdC4KKworICAgICAgICBDb3ZlcmVkIGJ5IGV4aXN0aW5nIHRlc3RzLgor CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJCb3g6Om92ZXJyaWRlU2l6ZSk6IFBhc3MgaW4gYSBMYXlvdXRTaXplLgorICAgICAgICAo V2ViQ29yZTo6UmVuZGVyQm94OjpzZXRPdmVycmlkZVNpemUpOgorICAgICAgICAoV2ViQ29yZTo6 UmVuZGVyQm94OjpjbGVhck92ZXJyaWRlU2l6ZSk6IE5ldyBtZXRob2QgZm9yIGNsZWFyaW5nIHRo ZQorICAgICAgICAgICAgb3ZlcnJpZGUgc2l6ZSAocHJldmlvdXMgd2Ugd291bGQgcGFzcyBpbiAt MSkKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6b3ZlcnJpZGVXaWR0aCk6CisgICAgICAg IChXZWJDb3JlOjpSZW5kZXJCb3g6Om92ZXJyaWRlSGVpZ2h0KToKKyAgICAgICAgKFdlYkNvcmU6 OlJlbmRlckJveDo6Y29tcHV0ZUxvZ2ljYWxXaWR0aCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJCb3g6OmNvbXB1dGVMb2dpY2FsSGVpZ2h0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJv eDo6Y29tcHV0ZVBlcmNlbnRhZ2VMb2dpY2FsSGVpZ2h0KToKKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlckJveDo6YXZhaWxhYmxlTG9naWNhbEhlaWdodFVzaW5nKToKKyAgICAgICAgKiByZW5kZXJp bmcvUmVuZGVyQm94Lmg6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckRlcHJlY2F0ZWRGbGV4 aWJsZUJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpnYXRoZXJGbGV4Q2hpbGRyZW5JbmZvKToK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckRlcHJlY2F0ZWRGbGV4aWJsZUJveDo6bGF5b3V0SG9y aXpvbnRhbEJveCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJEZXByZWNhdGVkRmxleGlibGVC b3g6OmxheW91dFZlcnRpY2FsQm94KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckRlcHJlY2F0 ZWRGbGV4aWJsZUJveDo6YXBwbHlMaW5lQ2xhbXApOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5k ZXJUYWJsZUNlbGwuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGFibGVDZWxsOjpzZXRP dmVycmlkZVNpemVGcm9tUm93SGVpZ2h0KToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVGFi bGVDZWxsLmg6IFJlbW92ZSBzZXRPdmVycmlkZVNpemUgc2luY2UgaXQgd2FzCisgICAgICAgICAg ICBvbmx5IGNhbGxlZCBpbiBvbmUgcGxhY2UgdG8gY2xlYXIgdGhlIG92ZXJyaWRlIHNpemUuICBJ bmxpbmUgdGhpcworICAgICAgICAgICAgbG9naWMgaW5zdGVhZC4KKyAgICAgICAgKiByZW5kZXJp bmcvUmVuZGVyVGFibGVTZWN0aW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRhYmxl U2VjdGlvbjo6Y2FsY1Jvd0xvZ2ljYWxIZWlnaHQpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5k ZXJXaWRnZXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyV2lkZ2V0OjpkZXN0cm95KToK KwogMjAxMS0wNy0wOCAgQ2hhbmcgU2h1ICA8Y3NodUB3ZWJraXQub3JnPgogCiAgICAgICAgIFVw ZGF0ZSBjYWxsaW5nIHNpdGVzIGFmdGVyIGZ1bmN0aW9uIHJlbmFtZWQuCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJCb3guY3BwCmluZGV4IDkzY2M4NDhkNTRmNzZhNzM0OGY2NjVjMWMwOWNi OWIwOThjNGMyMDMuLjE3NjYzYjgwNzZiYWZlOWI0YTRiNzczNzY2MzRiMDNjN2NhZjFjZDUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCkBAIC01OCw4ICs1OCw4IEBAIG5h bWVzcGFjZSBXZWJDb3JlIHsKIAogdXNpbmcgbmFtZXNwYWNlIEhUTUxOYW1lczsKIAotLy8gVXNl ZCBieSBmbGV4aWJsZSBib3hlcyB3aGVuIGZsZXhpbmcgdGhpcyBlbGVtZW50LgotdHlwZWRlZiBX VEY6Okhhc2hNYXA8Y29uc3QgUmVuZGVyQm94KiwgaW50PiBPdmVycmlkZVNpemVNYXA7CisvLyBV c2VkIGJ5IGZsZXhpYmxlIGJveGVzIHdoZW4gZmxleGluZyB0aGlzIGVsZW1lbnQgYW5kIGJ5IHRh YmxlIGNlbGxzLgordHlwZWRlZiBXVEY6Okhhc2hNYXA8Y29uc3QgUmVuZGVyQm94KiwgTGF5b3V0 U2l6ZT4gT3ZlcnJpZGVTaXplTWFwOwogc3RhdGljIE92ZXJyaWRlU2l6ZU1hcCogZ092ZXJyaWRl U2l6ZU1hcCA9IDA7CiAKIGJvb2wgUmVuZGVyQm94OjpzX2hhZE92ZXJmbG93Q2xpcCA9IGZhbHNl OwpAQCAtNjg2LDM2ICs2ODYsMzcgQEAgaW50IFJlbmRlckJveDo6bWF4UHJlZmVycmVkTG9naWNh bFdpZHRoKCkgY29uc3QKICAgICByZXR1cm4gbV9tYXhQcmVmZXJyZWRMb2dpY2FsV2lkdGg7CiB9 CiAKLWludCBSZW5kZXJCb3g6Om92ZXJyaWRlU2l6ZSgpIGNvbnN0CitMYXlvdXRTaXplIFJlbmRl ckJveDo6b3ZlcnJpZGVTaXplKCkgY29uc3QKIHsKICAgICBpZiAoIWhhc092ZXJyaWRlU2l6ZSgp KQotICAgICAgICByZXR1cm4gLTE7CisgICAgICAgIHJldHVybiBMYXlvdXRTaXplKC0xLCAtMSk7 CiAgICAgcmV0dXJuIGdPdmVycmlkZVNpemVNYXAtPmdldCh0aGlzKTsKIH0KIAotdm9pZCBSZW5k ZXJCb3g6OnNldE92ZXJyaWRlU2l6ZShpbnQgcykKK3ZvaWQgUmVuZGVyQm94OjpzZXRPdmVycmlk ZVNpemUoY29uc3QgTGF5b3V0U2l6ZSYgc2l6ZSkKIHsKLSAgICBpZiAocyA9PSAtMSkgewotICAg ICAgICBpZiAoaGFzT3ZlcnJpZGVTaXplKCkpIHsKLSAgICAgICAgICAgIHNldEhhc092ZXJyaWRl U2l6ZShmYWxzZSk7Ci0gICAgICAgICAgICBnT3ZlcnJpZGVTaXplTWFwLT5yZW1vdmUodGhpcyk7 Ci0gICAgICAgIH0KLSAgICB9IGVsc2UgewotICAgICAgICBpZiAoIWdPdmVycmlkZVNpemVNYXAp Ci0gICAgICAgICAgICBnT3ZlcnJpZGVTaXplTWFwID0gbmV3IE92ZXJyaWRlU2l6ZU1hcCgpOwot ICAgICAgICBzZXRIYXNPdmVycmlkZVNpemUodHJ1ZSk7Ci0gICAgICAgIGdPdmVycmlkZVNpemVN YXAtPnNldCh0aGlzLCBzKTsKLSAgICB9CisgICAgaWYgKCFnT3ZlcnJpZGVTaXplTWFwKQorICAg ICAgICBnT3ZlcnJpZGVTaXplTWFwID0gbmV3IE92ZXJyaWRlU2l6ZU1hcCgpOworICAgIHNldEhh c092ZXJyaWRlU2l6ZSh0cnVlKTsKKyAgICBnT3ZlcnJpZGVTaXplTWFwLT5zZXQodGhpcywgc2l6 ZSk7Cit9CisKK3ZvaWQgUmVuZGVyQm94OjpjbGVhck92ZXJyaWRlU2l6ZSgpCit7CisgICAgaWYg KCFoYXNPdmVycmlkZVNpemUoKSkKKyAgICAgICAgcmV0dXJuOworICAgIHNldEhhc092ZXJyaWRl U2l6ZShmYWxzZSk7CisgICAgZ092ZXJyaWRlU2l6ZU1hcC0+cmVtb3ZlKHRoaXMpOwogfQogCi1p bnQgUmVuZGVyQm94OjpvdmVycmlkZVdpZHRoKCkgY29uc3QKK0xheW91dFVuaXQgUmVuZGVyQm94 OjpvdmVycmlkZVdpZHRoKCkgY29uc3QKIHsKLSAgICByZXR1cm4gaGFzT3ZlcnJpZGVTaXplKCkg PyBvdmVycmlkZVNpemUoKSA6IHdpZHRoKCk7CisgICAgcmV0dXJuIGhhc092ZXJyaWRlU2l6ZSgp ID8gb3ZlcnJpZGVTaXplKCkud2lkdGgoKSA6IHdpZHRoKCk7CiB9CiAKLWludCBSZW5kZXJCb3g6 Om92ZXJyaWRlSGVpZ2h0KCkgY29uc3QKK0xheW91dFVuaXQgUmVuZGVyQm94OjpvdmVycmlkZUhl aWdodCgpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIGhhc092ZXJyaWRlU2l6ZSgpID8gb3ZlcnJpZGVT aXplKCkgOiBoZWlnaHQoKTsKKyAgICByZXR1cm4gaGFzT3ZlcnJpZGVTaXplKCkgPyBvdmVycmlk ZVNpemUoKS5oZWlnaHQoKSA6IGhlaWdodCgpOwogfQogCiBMYXlvdXRVbml0IFJlbmRlckJveDo6 Y29tcHV0ZUJvcmRlckJveExvZ2ljYWxXaWR0aChMYXlvdXRVbml0IHdpZHRoKSBjb25zdApAQCAt MTU1NCw3ICsxNTU1LDcgQEAgdm9pZCBSZW5kZXJCb3g6OmNvbXB1dGVMb2dpY2FsV2lkdGgoKQog ICAgIC8vIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NjQxOAogICAg IGlmIChoYXNPdmVycmlkZVNpemUoKSAmJiAgcGFyZW50KCktPnN0eWxlKCktPmJveE9yaWVudCgp ID09IEhPUklaT05UQUwKICAgICAgICAgICAgICYmIHBhcmVudCgpLT5pc0ZsZXhpYmxlQm94KCkg JiYgcGFyZW50KCktPmlzRmxleGluZ0NoaWxkcmVuKCkpIHsKLSAgICAgICAgc2V0TG9naWNhbFdp ZHRoKG92ZXJyaWRlU2l6ZSgpKTsKKyAgICAgICAgc2V0TG9naWNhbFdpZHRoKG92ZXJyaWRlV2lk dGgoKSk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKQEAgLTE3NjgsNyArMTc2OSw3IEBAIHZv aWQgUmVuZGVyQm94Ojpjb21wdXRlTG9naWNhbEhlaWdodCgpCiAgICAgICAgIC8vIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NjQxOAogICAgICAgICBpZiAoaGFzT3Zl cnJpZGVTaXplKCkgJiYgcGFyZW50KCktPmlzRmxleGlibGVCb3goKSAmJiBwYXJlbnQoKS0+c3R5 bGUoKS0+Ym94T3JpZW50KCkgPT0gVkVSVElDQUwKICAgICAgICAgICAgICAgICAmJiBwYXJlbnQo KS0+aXNGbGV4aW5nQ2hpbGRyZW4oKSkKLSAgICAgICAgICAgIGggPSBMZW5ndGgob3ZlcnJpZGVT aXplKCkgLSBib3JkZXJBbmRQYWRkaW5nTG9naWNhbEhlaWdodCgpLCBGaXhlZCk7CisgICAgICAg ICAgICBoID0gTGVuZ3RoKG92ZXJyaWRlSGVpZ2h0KCkgLSBib3JkZXJBbmRQYWRkaW5nTG9naWNh bEhlaWdodCgpLCBGaXhlZCk7CiAgICAgICAgIGVsc2UgaWYgKHRyZWF0QXNSZXBsYWNlZCkKICAg ICAgICAgICAgIGggPSBMZW5ndGgoY29tcHV0ZVJlcGxhY2VkTG9naWNhbEhlaWdodCgpLCBGaXhl ZCk7CiAgICAgICAgIGVsc2UgewpAQCAtMTg4Niw4ICsxODg3LDcgQEAgTGF5b3V0VW5pdCBSZW5k ZXJCb3g6OmNvbXB1dGVQZXJjZW50YWdlTG9naWNhbEhlaWdodChjb25zdCBMZW5ndGgmIGhlaWdo dCkKICAgICAvLyBiZSBhIHBlcmNlbnRhZ2Ugb2YgdGhlIGNlbGwncyBjdXJyZW50IGNvbnRlbnQg aGVpZ2h0LgogICAgIGlmIChjYi0+aXNUYWJsZUNlbGwoKSkgewogICAgICAgICBpZiAoIXNraXBw ZWRBdXRvSGVpZ2h0Q29udGFpbmluZ0Jsb2NrKSB7Ci0gICAgICAgICAgICByZXN1bHQgPSBjYi0+ b3ZlcnJpZGVTaXplKCk7Ci0gICAgICAgICAgICBpZiAocmVzdWx0ID09IC0xKSB7CisgICAgICAg ICAgICBpZiAoIWNiLT5oYXNPdmVycmlkZVNpemUoKSkgewogICAgICAgICAgICAgICAgIC8vIE5v cm1hbGx5IHdlIHdvdWxkIGxldCB0aGUgY2VsbCBzaXplIGludHJpbnNpY2FsbHksIGJ1dCBzY3Jv bGxpbmcgb3ZlcmZsb3cgaGFzIHRvIGJlCiAgICAgICAgICAgICAgICAgLy8gdHJlYXRlZCBkaWZm ZXJlbnRseSwgc2luY2UgV2luSUUgbGV0cyBzY3JvbGxlZCBvdmVyZmxvdyByZWdpb25zIHNocmlu ayBhcyBuZWVkZWQuCiAgICAgICAgICAgICAgICAgLy8gV2hpbGUgd2UgY2FuJ3QgZ2V0IGFsbCBj YXNlcyByaWdodCwgd2UgY2FuIGF0IGxlYXN0IGRldGVjdCB3aGVuIHRoZSBjZWxsIGhhcyBhIHNw ZWNpZmllZApAQCAtMTkwMCw2ICsxOTAwLDcgQEAgTGF5b3V0VW5pdCBSZW5kZXJCb3g6OmNvbXB1 dGVQZXJjZW50YWdlTG9naWNhbEhlaWdodChjb25zdCBMZW5ndGgmIGhlaWdodCkKICAgICAgICAg ICAgICAgICAgICAgcmV0dXJuIDA7CiAgICAgICAgICAgICAgICAgcmV0dXJuIC0xOwogICAgICAg ICAgICAgfQorICAgICAgICAgICAgcmVzdWx0ID0gY2ItPm92ZXJyaWRlSGVpZ2h0KCk7CiAgICAg ICAgICAgICBpbmNsdWRlQm9yZGVyUGFkZGluZyA9IHRydWU7CiAgICAgICAgIH0KICAgICB9CkBA IC0yMDUyLDcgKzIwNTMsNyBAQCBMYXlvdXRVbml0IFJlbmRlckJveDo6YXZhaWxhYmxlTG9naWNh bEhlaWdodFVzaW5nKGNvbnN0IExlbmd0aCYgaCkgY29uc3QKICAgICAvLyBhcnRpZmljaWFsbHku ICBXZSdyZSBnb2luZyB0byByZWx5IG9uIHRoaXMgY2VsbCBnZXR0aW5nIGV4cGFuZGVkIHRvIHNv bWUgbmV3CiAgICAgLy8gaGVpZ2h0LCBhbmQgdGhlbiB3aGVuIHdlIGxheSBvdXQgYWdhaW4gd2Un bGwgdXNlIHRoZSBjYWxjdWxhdGlvbiBiZWxvdy4KICAgICBpZiAoaXNUYWJsZUNlbGwoKSAmJiAo aC5pc0F1dG8oKSB8fCBoLmlzUGVyY2VudCgpKSkKLSAgICAgICAgcmV0dXJuIG92ZXJyaWRlU2l6 ZSgpIC0gYm9yZGVyQW5kUGFkZGluZ0xvZ2ljYWxXaWR0aCgpOworICAgICAgICByZXR1cm4gb3Zl cnJpZGVIZWlnaHQoKSAtIGJvcmRlckFuZFBhZGRpbmdMb2dpY2FsV2lkdGgoKTsKIAogICAgIGlm IChoLmlzUGVyY2VudCgpKQogICAgICAgIHJldHVybiBjb21wdXRlQ29udGVudEJveExvZ2ljYWxI ZWlnaHQoaC5jYWxjVmFsdWUoY29udGFpbmluZ0Jsb2NrKCktPmF2YWlsYWJsZUxvZ2ljYWxIZWln aHQoKSkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5o IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5oCmluZGV4IGVmYWVjN2RmN2Nk YmJjMjY0ODZmYWU4MTZmYWI2MzVkZjhlYTYwNTUuLmI2NzczZDY2NWRmMTAzYTgyZDJhZjEwNmQw MWU2MmRiOTllNTdiMmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJCb3guaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmgKQEAgLTI0 NCwxMCArMjQ0LDExIEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIGludCBtaW5QcmVmZXJyZWRMb2dp Y2FsV2lkdGgoKSBjb25zdDsKICAgICB2aXJ0dWFsIGludCBtYXhQcmVmZXJyZWRMb2dpY2FsV2lk dGgoKSBjb25zdDsKIAotICAgIGludCBvdmVycmlkZVNpemUoKSBjb25zdDsKLSAgICBpbnQgb3Zl cnJpZGVXaWR0aCgpIGNvbnN0OwotICAgIGludCBvdmVycmlkZUhlaWdodCgpIGNvbnN0OwotICAg IHZpcnR1YWwgdm9pZCBzZXRPdmVycmlkZVNpemUoaW50KTsKKyAgICBMYXlvdXRTaXplIG92ZXJy aWRlU2l6ZSgpIGNvbnN0OworICAgIExheW91dFVuaXQgb3ZlcnJpZGVXaWR0aCgpIGNvbnN0Owor ICAgIExheW91dFVuaXQgb3ZlcnJpZGVIZWlnaHQoKSBjb25zdDsKKyAgICB2b2lkIHNldE92ZXJy aWRlU2l6ZShjb25zdCBMYXlvdXRTaXplJik7CisgICAgdm9pZCBjbGVhck92ZXJyaWRlU2l6ZSgp OwogCiAgICAgdmlydHVhbCBMYXlvdXRTaXplIG9mZnNldEZyb21Db250YWluZXIoUmVuZGVyT2Jq ZWN0KiwgY29uc3QgTGF5b3V0UG9pbnQmKSBjb25zdDsKICAgICAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJEZXByZWNhdGVkRmxleGlibGVCb3guY3BwIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckRlcHJlY2F0ZWRGbGV4aWJsZUJveC5jcHAKaW5k ZXggNDczYTY2NWJlOGIzNWExMjliZjE2ZjU4Mjk5YTczOTJmNDA5YmI3NC4uOTNkYjU3YjY5MWRh ZWY1NjBhZWM1ZTkzMDM2NGJmYjkzYTc1YjY5NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckRlcHJlY2F0ZWRGbGV4aWJsZUJveC5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckRlcHJlY2F0ZWRGbGV4aWJsZUJveC5jcHAKQEAgLTI5Myw3 ICsyOTMsNyBAQCBzdGF0aWMgdm9pZCBnYXRoZXJGbGV4Q2hpbGRyZW5JbmZvKEZsZXhCb3hJdGVy YXRvciYgaXRlcmF0b3IsIGJvb2wgcmVsYXlvdXRDaGlsZAogICAgICAgICBpZiAoIWNoaWxkLT5p c1Bvc2l0aW9uZWQoKSAmJiBjaGlsZC0+c3R5bGUoKS0+Ym94RmxleCgpID4gMC4wZikgewogICAg ICAgICAgICAgLy8gV2UgYWx3YXlzIGhhdmUgdG8gbGF5IG91dCBmbGV4aWJsZSBvYmplY3RzIGFn YWluLCBzaW5jZSB0aGUgZmxleCBkaXN0cmlidXRpb24KICAgICAgICAgICAgIC8vIG1heSBoYXZl IGNoYW5nZWQsIGFuZCB3ZSBuZWVkIHRvIHJlYWxsb2NhdGUgc3BhY2UuCi0gICAgICAgICAgICBj aGlsZC0+c2V0T3ZlcnJpZGVTaXplKC0xKTsKKyAgICAgICAgICAgIGNoaWxkLT5jbGVhck92ZXJy aWRlU2l6ZSgpOwogICAgICAgICAgICAgaWYgKCFyZWxheW91dENoaWxkcmVuKQogICAgICAgICAg ICAgICAgIGNoaWxkLT5zZXRDaGlsZE5lZWRzTGF5b3V0KHRydWUsIGZhbHNlKTsKICAgICAgICAg ICAgIGhhdmVGbGV4ID0gdHJ1ZTsKQEAgLTQ5Niw3ICs0OTYsNyBAQCB2b2lkIFJlbmRlckRlcHJl Y2F0ZWRGbGV4aWJsZUJveDo6bGF5b3V0SG9yaXpvbnRhbEJveChib29sIHJlbGF5b3V0Q2hpbGRy ZW4pCiAgICAgICAgICAgICAgICAgICAgICAgICBpZiAoYWxsb3dlZENoaWxkRmxleChjaGlsZCwg ZXhwYW5kaW5nLCBpKSkgewogICAgICAgICAgICAgICAgICAgICAgICAgICAgIGludCBzcGFjZUFk ZCA9IChpbnQpKHNwYWNlQXZhaWxhYmxlVGhpc1Bhc3MgKiAoY2hpbGQtPnN0eWxlKCktPmJveEZs ZXgoKS90b3RhbEZsZXgpKTsKICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpZiAoc3BhY2VB ZGQpIHsKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY2hpbGQtPnNldE92ZXJyaWRl U2l6ZShjaGlsZC0+b3ZlcnJpZGVXaWR0aCgpICsgc3BhY2VBZGQpOworICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBjaGlsZC0+c2V0T3ZlcnJpZGVTaXplKExheW91dFNpemUoY2hpbGQt Pm92ZXJyaWRlV2lkdGgoKSArIHNwYWNlQWRkLCAwKSk7CiAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIG1fZmxleGluZ0NoaWxkcmVuID0gdHJ1ZTsKICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgcmVsYXlvdXRDaGlsZHJlbiA9IHRydWU7CiAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgfQpAQCAtNTEzLDcgKzUxMyw3IEBAIHZvaWQgUmVuZGVyRGVwcmVjYXRlZEZsZXhp YmxlQm94OjpsYXlvdXRIb3Jpem9udGFsQm94KGJvb2wgcmVsYXlvdXRDaGlsZHJlbikKICAgICAg ICAgICAgICAgICAgICAgICAgIGludCBzcGFjZUFkZCA9IGdyb3VwUmVtYWluaW5nU3BhY2UgPiAw ID8gMSA6IC0xOwogICAgICAgICAgICAgICAgICAgICAgICAgZm9yIChSZW5kZXJCb3gqIGNoaWxk ID0gaXRlcmF0b3IuZmlyc3QoKTsgY2hpbGQgJiYgZ3JvdXBSZW1haW5pbmdTcGFjZTsgY2hpbGQg PSBpdGVyYXRvci5uZXh0KCkpIHsKICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpZiAoYWxs b3dlZENoaWxkRmxleChjaGlsZCwgZXhwYW5kaW5nLCBpKSkgewotICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBjaGlsZC0+c2V0T3ZlcnJpZGVTaXplKGNoaWxkLT5vdmVycmlkZVdpZHRo KCkgKyBzcGFjZUFkZCk7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNoaWxkLT5z ZXRPdmVycmlkZVNpemUoTGF5b3V0U2l6ZShjaGlsZC0+b3ZlcnJpZGVXaWR0aCgpICsgc3BhY2VB ZGQsIDApKTsKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbV9mbGV4aW5nQ2hpbGRy ZW4gPSB0cnVlOwogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICByZWxheW91dENoaWxk cmVuID0gdHJ1ZTsKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcmVtYWluaW5nU3Bh Y2UgLT0gc3BhY2VBZGQ7CkBAIC03NDIsNyArNzQyLDcgQEAgdm9pZCBSZW5kZXJEZXByZWNhdGVk RmxleGlibGVCb3g6OmxheW91dFZlcnRpY2FsQm94KGJvb2wgcmVsYXlvdXRDaGlsZHJlbikKICAg ICAgICAgICAgICAgICAgICAgICAgIGlmIChhbGxvd2VkQ2hpbGRGbGV4KGNoaWxkLCBleHBhbmRp bmcsIGkpKSB7CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW50IHNwYWNlQWRkID0gKGlu dCkoc3BhY2VBdmFpbGFibGVUaGlzUGFzcyAqIChjaGlsZC0+c3R5bGUoKS0+Ym94RmxleCgpL3Rv dGFsRmxleCkpOwogICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlmIChzcGFjZUFkZCkgewot ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjaGlsZC0+c2V0T3ZlcnJpZGVTaXplKGNo aWxkLT5vdmVycmlkZUhlaWdodCgpICsgc3BhY2VBZGQpOworICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBjaGlsZC0+c2V0T3ZlcnJpZGVTaXplKExheW91dFNpemUoMCwgY2hpbGQtPm92 ZXJyaWRlSGVpZ2h0KCkgKyBzcGFjZUFkZCkpOwogICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBtX2ZsZXhpbmdDaGlsZHJlbiA9IHRydWU7CiAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIHJlbGF5b3V0Q2hpbGRyZW4gPSB0cnVlOwogICAgICAgICAgICAgICAgICAgICAgICAg ICAgIH0KQEAgLTc1OSw3ICs3NTksNyBAQCB2b2lkIFJlbmRlckRlcHJlY2F0ZWRGbGV4aWJsZUJv eDo6bGF5b3V0VmVydGljYWxCb3goYm9vbCByZWxheW91dENoaWxkcmVuKQogICAgICAgICAgICAg ICAgICAgICAgICAgaW50IHNwYWNlQWRkID0gZ3JvdXBSZW1haW5pbmdTcGFjZSA+IDAgPyAxIDog LTE7CiAgICAgICAgICAgICAgICAgICAgICAgICBmb3IgKFJlbmRlckJveCogY2hpbGQgPSBpdGVy YXRvci5maXJzdCgpOyBjaGlsZCAmJiBncm91cFJlbWFpbmluZ1NwYWNlOyBjaGlsZCA9IGl0ZXJh dG9yLm5leHQoKSkgewogICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlmIChhbGxvd2VkQ2hp bGRGbGV4KGNoaWxkLCBleHBhbmRpbmcsIGkpKSB7Ci0gICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIGNoaWxkLT5zZXRPdmVycmlkZVNpemUoY2hpbGQtPm92ZXJyaWRlSGVpZ2h0KCkgKyBz cGFjZUFkZCk7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNoaWxkLT5zZXRPdmVy cmlkZVNpemUoTGF5b3V0U2l6ZSgwLCBjaGlsZC0+b3ZlcnJpZGVIZWlnaHQoKSArIHNwYWNlQWRk KSk7CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1fZmxleGluZ0NoaWxkcmVuID0g dHJ1ZTsKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcmVsYXlvdXRDaGlsZHJlbiA9 IHRydWU7CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJlbWFpbmluZ1NwYWNlIC09 IHNwYWNlQWRkOwpAQCAtODczLDExICs4NzMsMTEgQEAgdm9pZCBSZW5kZXJEZXByZWNhdGVkRmxl eGlibGVCb3g6OmFwcGx5TGluZUNsYW1wKEZsZXhCb3hJdGVyYXRvciYgaXRlcmF0b3IsIGJvb2wK ICAgICAgICAgICAgIGNvbnRpbnVlOwogCiAgICAgICAgIGNoaWxkLT5zZXRDaGlsZE5lZWRzTGF5 b3V0KHRydWUsIGZhbHNlKTsKLSAgICAgICAgY2hpbGQtPnNldE92ZXJyaWRlU2l6ZShuZXdIZWln aHQpOworICAgICAgICBjaGlsZC0+c2V0T3ZlcnJpZGVTaXplKExheW91dFNpemUoMCwgbmV3SGVp Z2h0KSk7CiAgICAgICAgIG1fZmxleGluZ0NoaWxkcmVuID0gdHJ1ZTsKICAgICAgICAgY2hpbGQt PmxheW91dElmTmVlZGVkKCk7CiAgICAgICAgIG1fZmxleGluZ0NoaWxkcmVuID0gZmFsc2U7Ci0g ICAgICAgIGNoaWxkLT5zZXRPdmVycmlkZVNpemUoLTEpOworICAgICAgICBjaGlsZC0+Y2xlYXJP dmVycmlkZVNpemUoKTsKIAogICAgICAgICAvLyBGSVhNRTogRm9yIG5vdyBkb24ndCBzdXBwb3J0 IFJUTC4KICAgICAgICAgaWYgKHN0eWxlKCktPmRpcmVjdGlvbigpICE9IExUUikKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJsZUNlbGwuY3BwIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRhYmxlQ2VsbC5jcHAKaW5kZXggNzQzZWFlOGYzN2Q0 ZGM2ODhjZWI2NzNkMzBiNzVmOTVmNGVlOGU0Zi4uNDBkNWIwMWUwODBjZTU1ODVhZDBhOWEyYzdj ZDkzNTk4MmRjNTAwMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl clRhYmxlQ2VsbC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRhYmxl Q2VsbC5jcHAKQEAgLTIxMiwxNiArMjEyLDEwIEBAIGludCBSZW5kZXJUYWJsZUNlbGw6OnBhZGRp bmdBZnRlcihib29sIGluY2x1ZGVJbnRyaW5zaWNQYWRkaW5nKSBjb25zdAogICAgIHJldHVybiBy ZXN1bHQgKyBpbnRyaW5zaWNQYWRkaW5nQWZ0ZXIoKTsKIH0KIAotdm9pZCBSZW5kZXJUYWJsZUNl bGw6OnNldE92ZXJyaWRlU2l6ZShpbnQgc2l6ZSkKLXsKLSAgICBjbGVhckludHJpbnNpY1BhZGRp bmcoKTsKLSAgICBSZW5kZXJCbG9jazo6c2V0T3ZlcnJpZGVTaXplKHNpemUpOwotfQotICAgIAog dm9pZCBSZW5kZXJUYWJsZUNlbGw6OnNldE92ZXJyaWRlU2l6ZUZyb21Sb3dIZWlnaHQoaW50IHJv d0hlaWdodCkKIHsKICAgICBjbGVhckludHJpbnNpY1BhZGRpbmcoKTsKLSAgICBSZW5kZXJCbG9j azo6c2V0T3ZlcnJpZGVTaXplKG1heCgwLCByb3dIZWlnaHQgLSBib3JkZXJCZWZvcmUoKSAtIHBh ZGRpbmdCZWZvcmUoKSAtIGJvcmRlckFmdGVyKCkgLSBwYWRkaW5nQWZ0ZXIoKSkpOworICAgIFJl bmRlckJsb2NrOjpzZXRPdmVycmlkZVNpemUoTGF5b3V0U2l6ZSgwLCBtYXgoMCwgcm93SGVpZ2h0 IC0gYm9yZGVyQmVmb3JlKCkgLSBwYWRkaW5nQmVmb3JlKCkgLSBib3JkZXJBZnRlcigpIC0gcGFk ZGluZ0FmdGVyKCkpKSk7CiB9CiAKIExheW91dFNpemUgUmVuZGVyVGFibGVDZWxsOjpvZmZzZXRG cm9tQ29udGFpbmVyKFJlbmRlck9iamVjdCogbywgY29uc3QgTGF5b3V0UG9pbnQmIHBvaW50KSBj b25zdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRhYmxlQ2Vs bC5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRhYmxlQ2VsbC5oCmluZGV4IGVj ZDE0YzQ1YjQ3NjVlZjFkMzkxNzYxNmY3YWI0NWEzYWM5NGMyYzYuLmVhOGI3ZTNmMzY0MTM1NDBj NGM0MTE5ZjAzYmZhMGM3NWY4MDU1NzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJUYWJsZUNlbGwuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyVGFibGVDZWxsLmgKQEAgLTExOSw3ICsxMTksNiBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCBp bnQgcGFkZGluZ0JlZm9yZShib29sIGluY2x1ZGVJbnRyaW5zaWNQYWRkaW5nID0gdHJ1ZSkgY29u c3Q7CiAgICAgdmlydHVhbCBpbnQgcGFkZGluZ0FmdGVyKGJvb2wgaW5jbHVkZUludHJpbnNpY1Bh ZGRpbmcgPSB0cnVlKSBjb25zdDsKIAotICAgIHZpcnR1YWwgdm9pZCBzZXRPdmVycmlkZVNpemUo aW50KTsKICAgICB2b2lkIHNldE92ZXJyaWRlU2l6ZUZyb21Sb3dIZWlnaHQoaW50KTsKIAogICAg IGJvb2wgaGFzVmlzdWFsT3ZlcmZsb3coKSBjb25zdCB7IHJldHVybiBtX292ZXJmbG93ICYmICFi b3JkZXJCb3hSZWN0KCkuY29udGFpbnMobV9vdmVyZmxvdy0+dmlzdWFsT3ZlcmZsb3dSZWN0KCkp OyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGFibGVTZWN0 aW9uLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJsZVNlY3Rpb24uY3Bw CmluZGV4IDM0OTBkMTVmZTI5ZWUyNzdjZWUxM2E3ZDhjMThhNzUxNWRhMTkxYWIuLmZkNTQ0YjU2 Y2FhZWY2MTFhZTEzZjM1Mzc0NWI4YmNiZGZjZmY1NWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJUYWJsZVNlY3Rpb24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJUYWJsZVNlY3Rpb24uY3BwCkBAIC0zMzUsMTMgKzMzNSwxNCBAQCBp bnQgUmVuZGVyVGFibGVTZWN0aW9uOjpjYWxjUm93TG9naWNhbEhlaWdodCgpCiAKICAgICAgICAg ICAgIGludCBpbmR4ID0gbWF4KHIgLSBjZWxsLT5yb3dTcGFuKCkgKyAxLCAwKTsKIAotICAgICAg ICAgICAgaWYgKGNlbGwtPm92ZXJyaWRlU2l6ZSgpICE9IC0xKSB7CisgICAgICAgICAgICBpZiAo Y2VsbC0+aGFzT3ZlcnJpZGVTaXplKCkpIHsKICAgICAgICAgICAgICAgICBpZiAoIXN0YXRlUHVz aGVyLmRpZFB1c2goKSkgewogICAgICAgICAgICAgICAgICAgICAvLyBUZWNobmljYWxseSwgd2Ug c2hvdWxkIGFsc28gcHVzaCBzdGF0ZSBmb3IgdGhlIHJvdywgYnV0IHNpbmNlCiAgICAgICAgICAg ICAgICAgICAgIC8vIHJvd3MgZG9uJ3QgcHVzaCBhIGNvb3JkaW5hdGUgdHJhbnNmb3JtLCB0aGF0 J3Mgbm90IG5lY2Vzc2FyeS4KICAgICAgICAgICAgICAgICAgICAgc3RhdGVQdXNoZXIucHVzaCh0 aGlzLCBJbnRTaXplKHgoKSwgeSgpKSk7CiAgICAgICAgICAgICAgICAgfQotICAgICAgICAgICAg ICAgIGNlbGwtPnNldE92ZXJyaWRlU2l6ZSgtMSk7CisgICAgICAgICAgICAgICAgY2VsbC0+Y2xl YXJJbnRyaW5zaWNQYWRkaW5nKCk7CisgICAgICAgICAgICAgICAgY2VsbC0+Y2xlYXJPdmVycmlk ZVNpemUoKTsKICAgICAgICAgICAgICAgICBjZWxsLT5zZXRDaGlsZE5lZWRzTGF5b3V0KHRydWUs IGZhbHNlKTsKICAgICAgICAgICAgICAgICBjZWxsLT5sYXlvdXRJZk5lZWRlZCgpOwogICAgICAg ICAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlcldpZGdl dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyV2lkZ2V0LmNwcAppbmRleCBh OTQ1YjBhYjE1ZWU2ZjNkY2ZlZmEwMjZmYmFkZTE4MjlhOTBjMTA4Li5lMTQwNWVhMzBiNTQ0NWRm MjgwYWQ3ZTM4MTgyMjM5YTdjNTQ2ODFmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyV2lkZ2V0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyV2lkZ2V0LmNwcApAQCAtMTM5LDcgKzEzOSw3IEBAIHZvaWQgUmVuZGVyV2lkZ2V0OjpkZXN0 cm95KCkKIAogICAgIC8vIHJlbW92ZXMgZnJvbSBvdmVycmlkZSBzaXplIG1hcAogICAgIGlmICho YXNPdmVycmlkZVNpemUoKSkKLSAgICAgICAgc2V0T3ZlcnJpZGVTaXplKC0xKTsKKyAgICAgICAg Y2xlYXJPdmVycmlkZVNpemUoKTsKIAogICAgIGlmIChzdHlsZSgpICYmIChzdHlsZSgpLT5sb2dp Y2FsSGVpZ2h0KCkuaXNQZXJjZW50KCkgfHwgc3R5bGUoKS0+bG9naWNhbE1pbkhlaWdodCgpLmlz UGVyY2VudCgpIHx8IHN0eWxlKCktPmxvZ2ljYWxNYXhIZWlnaHQoKS5pc1BlcmNlbnQoKSkpCiAg ICAgICAgIFJlbmRlckJsb2NrOjpyZW1vdmVQZXJjZW50SGVpZ2h0RGVzY2VuZGFudCh0aGlzKTsK