124074 2013-11-08 14:49:45 -0800 Use references instead of pointers to RenderBlockFlow in FloatingObjects and ComputeFloatOffsetAdapter 2013-11-08 15:22:44 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 bjonesbe bjonesbe commit-queue esprehn+autocc glenn kondapallykalyan oldest_to_newest 948862 0 bjonesbe 2013-11-08 14:49:45 -0800 Use references instead of pointers to RenderBlockFlow in FloatingObjects and ComputeFloatOffsetAdapter 948863 1 216445 bjonesbe 2013-11-08 14:51:51 -0800 Created attachment 216445 Patch 948877 2 216445 commit-queue 2013-11-08 15:22:42 -0800 Comment on attachment 216445 Patch Clearing flags on attachment: 216445 Committed r158963: <http://trac.webkit.org/changeset/158963> 948878 3 commit-queue 2013-11-08 15:22:44 -0800 All reviewed patches have been landed. Closing bug. 216445 2013-11-08 14:51:51 -0800 2013-11-08 15:22:42 -0800 Patch bug-124074-20131108145150.patch text/plain 9598 bjonesbe U3VidmVyc2lvbiBSZXZpc2lvbjogMTU4OTU0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWU0MjBjYzgwNmI0ZDI3 Y2NkZTE4MGVmNGE2MTM4ZjRlNzI2YjQ3NS4uMGUyOGU5ZWRmYjA0Yjg4YTQ5NzEzOGUxZjNmMDI5 MDJkN2FmZmNlNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMzIEBACiAyMDEzLTExLTA4ICBCZW0g Sm9uZXMtQmV5ICA8YmpvbmVzYmVAYWRvYmUuY29tPgogCisgICAgICAgIFVzZSByZWZlcmVuY2Vz IGluc3RlYWQgb2YgcG9pbnRlcnMgdG8gUmVuZGVyQmxvY2tGbG93IGluIEZsb2F0aW5nT2JqZWN0 cyBhbmQgQ29tcHV0ZUZsb2F0T2Zmc2V0QWRhcHRlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI0MDc0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgSnVzdCBhIHN0cmFpZ2h0Zm9yd2FyZCBjb252ZXJzaW9u IGZyb20gY29uc3QgcG9pbnRlcnMgdG8gY29uc3QgcmVmZXJlbmNlcy4KKworICAgICAgICBBbHNv LCByZW1vdmUgdW5uZWVkZWQgYXJndW1lbnQgZnJvbSBGbG9hdGluZ09iamVjdHMgY29uc3RydWN0 b3IuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBubyBiZWhhdmlvciBjaGFuZ2UuCisKKyAgICAg ICAgKiByZW5kZXJpbmcvRmxvYXRpbmdPYmplY3RzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNv bXB1dGVGbG9hdE9mZnNldEFkYXB0ZXI6OkNvbXB1dGVGbG9hdE9mZnNldEFkYXB0ZXIpOgorICAg ICAgICAoV2ViQ29yZTo6RmxvYXRpbmdPYmplY3RzOjpmaW5kTmV4dEZsb2F0TG9naWNhbEJvdHRv bUJlbG93KToKKyAgICAgICAgKFdlYkNvcmU6OkZsb2F0aW5nT2JqZWN0czo6ZmluZE5leHRGbG9h dExvZ2ljYWxCb3R0b21CZWxvd0ZvckJsb2NrKToKKyAgICAgICAgKFdlYkNvcmU6OkZsb2F0aW5n T2JqZWN0czo6RmxvYXRpbmdPYmplY3RzKToKKyAgICAgICAgKFdlYkNvcmU6OkZsb2F0aW5nT2Jq ZWN0czo6Y2xlYXJMaW5lQm94VHJlZVBvaW50ZXJzKToKKyAgICAgICAgKFdlYkNvcmU6OkZsb2F0 aW5nT2JqZWN0czo6Y29tcHV0ZVBsYWNlZEZsb2F0c1RyZWUpOgorICAgICAgICAoV2ViQ29yZTo6 c2hhcGVJbmZvRm9yRmxvYXQpOgorICAgICAgICAoV2ViQ29yZTo6Ojp1cGRhdGVPZmZzZXRJZk5l ZWRlZCk6CisgICAgICAgIChXZWJDb3JlOjo6OmNvbGxlY3RJZk5lZWRlZCk6CisgICAgICAgIChX ZWJDb3JlOjo6OmhlaWdodFJlbWFpbmluZyk6CisgICAgICAgICogcmVuZGVyaW5nL0Zsb2F0aW5n T2JqZWN0cy5oOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6UmVuZGVyQmxvY2tGbG93OjpjcmVhdGVGbG9hdGluZ09iamVjdHMpOgor CisyMDEzLTExLTA4ICBCZW0gSm9uZXMtQmV5ICA8YmpvbmVzYmVAYWRvYmUuY29tPgorCiAgICAg ICAgIFJlbmRlckJsb2NrRmxvdzo6bmV4dEZsb2F0TG9naWNhbEJvdHRvbUJlbG93IHNob3VsZCBu b3QgdXNlIFNoYXBlT3V0c2lkZUZsb2F0T2Zmc2V0TW9kZQogICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTIzOTMxCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9GbG9hdGluZ09iamVjdHMuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL0Zsb2F0aW5nT2JqZWN0cy5jcHAKaW5kZXggNGEwNGFkZTVmMGYxNWJkYWRlYmUxNmRl MWQwNTNlMWU2NzhmZDNhNC4uMmVjZWI0YzI2MDgyMGNkYzMyY2MyYzAzMzBkYTVlYmY0YTRhNDEw YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0Zsb2F0aW5nT2JqZWN0cy5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0Zsb2F0aW5nT2JqZWN0cy5jcHAKQEAg LTEyNSw3ICsxMjUsNyBAQCBjbGFzcyBDb21wdXRlRmxvYXRPZmZzZXRBZGFwdGVyIHsKIHB1Ymxp YzoKICAgICB0eXBlZGVmIEZsb2F0aW5nT2JqZWN0SW50ZXJ2YWwgSW50ZXJ2YWxUeXBlOwogCi0g ICAgQ29tcHV0ZUZsb2F0T2Zmc2V0QWRhcHRlcihjb25zdCBSZW5kZXJCbG9ja0Zsb3cqIHJlbmRl cmVyLCBMYXlvdXRVbml0IGxpbmVUb3AsIExheW91dFVuaXQgbGluZUJvdHRvbSwgTGF5b3V0VW5p dCBvZmZzZXQpCisgICAgQ29tcHV0ZUZsb2F0T2Zmc2V0QWRhcHRlcihjb25zdCBSZW5kZXJCbG9j a0Zsb3cmIHJlbmRlcmVyLCBMYXlvdXRVbml0IGxpbmVUb3AsIExheW91dFVuaXQgbGluZUJvdHRv bSwgTGF5b3V0VW5pdCBvZmZzZXQpCiAgICAgICAgIDogbV9yZW5kZXJlcihyZW5kZXJlcikKICAg ICAgICAgLCBtX2xpbmVUb3Aocm91bmRUb0ludChsaW5lVG9wKSkKICAgICAgICAgLCBtX2xpbmVC b3R0b20ocm91bmRUb0ludChsaW5lQm90dG9tKSkKQEAgLTE0NSw3ICsxNDUsNyBAQCBwdWJsaWM6 CiBwcml2YXRlOgogICAgIGJvb2wgdXBkYXRlT2Zmc2V0SWZOZWVkZWQoY29uc3QgRmxvYXRpbmdP YmplY3QqKTsKIAotICAgIGNvbnN0IFJlbmRlckJsb2NrRmxvdyogbV9yZW5kZXJlcjsKKyAgICBj b25zdCBSZW5kZXJCbG9ja0Zsb3cmIG1fcmVuZGVyZXI7CiAgICAgaW50IG1fbGluZVRvcDsKICAg ICBpbnQgbV9saW5lQm90dG9tOwogICAgIExheW91dFVuaXQgbV9vZmZzZXQ7CkBAIC0yMDcsNyAr MjA3LDcgQEAgaW5saW5lIHZvaWQgRmluZE5leHRGbG9hdExvZ2ljYWxCb3R0b21BZGFwdGVyOjpj b2xsZWN0SWZOZWVkZWQoY29uc3QgSW50ZXJ2YWxUeXAKIAogTGF5b3V0VW5pdCBGbG9hdGluZ09i amVjdHM6OmZpbmROZXh0RmxvYXRMb2dpY2FsQm90dG9tQmVsb3coTGF5b3V0VW5pdCBsb2dpY2Fs SGVpZ2h0KQogewotICAgIEZpbmROZXh0RmxvYXRMb2dpY2FsQm90dG9tQWRhcHRlciBhZGFwdGVy KCptX3JlbmRlcmVyLCBsb2dpY2FsSGVpZ2h0KTsKKyAgICBGaW5kTmV4dEZsb2F0TG9naWNhbEJv dHRvbUFkYXB0ZXIgYWRhcHRlcihtX3JlbmRlcmVyLCBsb2dpY2FsSGVpZ2h0KTsKICAgICBwbGFj ZWRGbG9hdHNUcmVlKCkuYWxsT3ZlcmxhcHNXaXRoQWRhcHRlcihhZGFwdGVyKTsKIAogICAgIHJl dHVybiBhZGFwdGVyLm5leHRTaGFwZUxvZ2ljYWxCb3R0b20oKTsKQEAgLTIxNSwxNyArMjE1LDE3 IEBAIExheW91dFVuaXQgRmxvYXRpbmdPYmplY3RzOjpmaW5kTmV4dEZsb2F0TG9naWNhbEJvdHRv bUJlbG93KExheW91dFVuaXQgbG9naWNhbEhlCiAKIExheW91dFVuaXQgRmxvYXRpbmdPYmplY3Rz OjpmaW5kTmV4dEZsb2F0TG9naWNhbEJvdHRvbUJlbG93Rm9yQmxvY2soTGF5b3V0VW5pdCBsb2dp Y2FsSGVpZ2h0KQogewotICAgIEZpbmROZXh0RmxvYXRMb2dpY2FsQm90dG9tQWRhcHRlciBhZGFw dGVyKCptX3JlbmRlcmVyLCBsb2dpY2FsSGVpZ2h0KTsKKyAgICBGaW5kTmV4dEZsb2F0TG9naWNh bEJvdHRvbUFkYXB0ZXIgYWRhcHRlcihtX3JlbmRlcmVyLCBsb2dpY2FsSGVpZ2h0KTsKICAgICBw bGFjZWRGbG9hdHNUcmVlKCkuYWxsT3ZlcmxhcHNXaXRoQWRhcHRlcihhZGFwdGVyKTsKIAogICAg IHJldHVybiBhZGFwdGVyLm5leHRMb2dpY2FsQm90dG9tKCk7CiB9CiAKLUZsb2F0aW5nT2JqZWN0 czo6RmxvYXRpbmdPYmplY3RzKGNvbnN0IFJlbmRlckJsb2NrRmxvdyogcmVuZGVyZXIsIGJvb2wg aG9yaXpvbnRhbFdyaXRpbmdNb2RlKQorRmxvYXRpbmdPYmplY3RzOjpGbG9hdGluZ09iamVjdHMo Y29uc3QgUmVuZGVyQmxvY2tGbG93JiByZW5kZXJlcikKICAgICA6IG1fcGxhY2VkRmxvYXRzVHJl ZShVbmluaXRpYWxpemVkVHJlZSkKICAgICAsIG1fbGVmdE9iamVjdHNDb3VudCgwKQogICAgICwg bV9yaWdodE9iamVjdHNDb3VudCgwKQotICAgICwgbV9ob3Jpem9udGFsV3JpdGluZ01vZGUoaG9y aXpvbnRhbFdyaXRpbmdNb2RlKQorICAgICwgbV9ob3Jpem9udGFsV3JpdGluZ01vZGUocmVuZGVy ZXIuaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSkKICAgICAsIG1fcmVuZGVyZXIocmVuZGVyZXIp CiB7CiB9CkBAIC0yMzgsNyArMjM4LDcgQEAgdm9pZCBGbG9hdGluZ09iamVjdHM6OmNsZWFyTGlu ZUJveFRyZWVQb2ludGVycygpCiB7CiAgICAgLy8gQ2xlYXIgcmVmZXJlbmNlcyB0byBvcmlnaW5h dGluZyBsaW5lcywgc2luY2UgdGhlIGxpbmVzIGFyZSBiZWluZyBkZWxldGVkCiAgICAgZm9yIChh dXRvIGl0ID0gbV9zZXQuYmVnaW4oKSwgZW5kID0gbV9zZXQuZW5kKCk7IGl0ICE9IGVuZDsgKytp dCkgewotICAgICAgICBBU1NFUlQoISgoKml0KS0+b3JpZ2luYXRpbmdMaW5lKCkpIHx8ICYoKCpp dCktPm9yaWdpbmF0aW5nTGluZSgpLT5yZW5kZXJlcigpKSA9PSBtX3JlbmRlcmVyKTsKKyAgICAg ICAgQVNTRVJUKCEoKCppdCktPm9yaWdpbmF0aW5nTGluZSgpKSB8fCAmKCgqaXQpLT5vcmlnaW5h dGluZ0xpbmUoKS0+cmVuZGVyZXIoKSkgPT0gJm1fcmVuZGVyZXIpOwogICAgICAgICAoKml0KS0+ c2V0T3JpZ2luYXRpbmdMaW5lKDApOwogICAgIH0KIH0KQEAgLTM0MSw3ICszNDEsNyBAQCB2b2lk IEZsb2F0aW5nT2JqZWN0czo6Y29tcHV0ZVBsYWNlZEZsb2F0c1RyZWUoKQogICAgIEFTU0VSVCgh bV9wbGFjZWRGbG9hdHNUcmVlLmlzSW5pdGlhbGl6ZWQoKSk7CiAgICAgaWYgKG1fc2V0LmlzRW1w dHkoKSkKICAgICAgICAgcmV0dXJuOwotICAgIG1fcGxhY2VkRmxvYXRzVHJlZS5pbml0SWZOZWVk ZWQobV9yZW5kZXJlci0+dmlldygpLmludGVydmFsQXJlbmEoKSk7CisgICAgbV9wbGFjZWRGbG9h dHNUcmVlLmluaXRJZk5lZWRlZChtX3JlbmRlcmVyLnZpZXcoKS5pbnRlcnZhbEFyZW5hKCkpOwog ICAgIGZvciAoYXV0byBpdCA9IG1fc2V0LmJlZ2luKCksIGVuZCA9IG1fc2V0LmVuZCgpOyBpdCAh PSBlbmQ7ICsraXQpIHsKICAgICAgICAgRmxvYXRpbmdPYmplY3QqIGZsb2F0aW5nT2JqZWN0ID0g aXQtPmdldCgpOwogICAgICAgICBpZiAoZmxvYXRpbmdPYmplY3QtPmlzUGxhY2VkKCkpCkBAIC0z NTcsMTEgKzM1NywxMSBAQCBpbmxpbmUgY29uc3QgRmxvYXRpbmdPYmplY3RUcmVlJiBGbG9hdGlu Z09iamVjdHM6OnBsYWNlZEZsb2F0c1RyZWUoKQogfQogCiAjaWYgRU5BQkxFKENTU19TSEFQRVMp Ci1zdGF0aWMgaW5saW5lIFNoYXBlT3V0c2lkZUluZm8qIHNoYXBlSW5mb0ZvckZsb2F0KGNvbnN0 IEZsb2F0aW5nT2JqZWN0KiBmbG9hdGluZ09iamVjdCwgY29uc3QgUmVuZGVyQmxvY2tGbG93KiBj b250YWluaW5nQmxvY2ssIExheW91dFVuaXQgbGluZVRvcCwgTGF5b3V0VW5pdCBsaW5lQm90dG9t KQorc3RhdGljIGlubGluZSBTaGFwZU91dHNpZGVJbmZvKiBzaGFwZUluZm9Gb3JGbG9hdChjb25z dCBGbG9hdGluZ09iamVjdCogZmxvYXRpbmdPYmplY3QsIGNvbnN0IFJlbmRlckJsb2NrRmxvdyYg Y29udGFpbmluZ0Jsb2NrLCBMYXlvdXRVbml0IGxpbmVUb3AsIExheW91dFVuaXQgbGluZUJvdHRv bSkKIHsKICAgICBpZiAoZmxvYXRpbmdPYmplY3QpIHsKICAgICAgICAgaWYgKFNoYXBlT3V0c2lk ZUluZm8qIHNoYXBlT3V0c2lkZSA9IGZsb2F0aW5nT2JqZWN0LT5yZW5kZXJlcigpLnNoYXBlT3V0 c2lkZUluZm8oKSkgewotICAgICAgICAgICAgc2hhcGVPdXRzaWRlLT51cGRhdGVEZWx0YXNGb3JD b250YWluaW5nQmxvY2tMaW5lKGNvbnRhaW5pbmdCbG9jaywgZmxvYXRpbmdPYmplY3QsIGxpbmVU b3AsIGxpbmVCb3R0b20gLSBsaW5lVG9wKTsKKyAgICAgICAgICAgIHNoYXBlT3V0c2lkZS0+dXBk YXRlRGVsdGFzRm9yQ29udGFpbmluZ0Jsb2NrTGluZSgmY29udGFpbmluZ0Jsb2NrLCBmbG9hdGlu Z09iamVjdCwgbGluZVRvcCwgbGluZUJvdHRvbSAtIGxpbmVUb3ApOwogICAgICAgICAgICAgcmV0 dXJuIHNoYXBlT3V0c2lkZTsKICAgICAgICAgfQogICAgIH0KQEAgLTQzMyw3ICs0MzMsNyBAQCBM YXlvdXRVbml0IEZsb2F0aW5nT2JqZWN0czo6bG9naWNhbFJpZ2h0T2Zmc2V0KExheW91dFVuaXQg Zml4ZWRPZmZzZXQsIExheW91dFVuaQogdGVtcGxhdGU8PgogaW5saW5lIGJvb2wgQ29tcHV0ZUZs b2F0T2Zmc2V0QWRhcHRlcjxGbG9hdGluZ09iamVjdDo6RmxvYXRMZWZ0Pjo6dXBkYXRlT2Zmc2V0 SWZOZWVkZWQoY29uc3QgRmxvYXRpbmdPYmplY3QqIGZsb2F0aW5nT2JqZWN0KQogewotICAgIExh eW91dFVuaXQgbG9naWNhbFJpZ2h0ID0gbV9yZW5kZXJlci0+bG9naWNhbFJpZ2h0Rm9yRmxvYXQo ZmxvYXRpbmdPYmplY3QpOworICAgIExheW91dFVuaXQgbG9naWNhbFJpZ2h0ID0gbV9yZW5kZXJl ci5sb2dpY2FsUmlnaHRGb3JGbG9hdChmbG9hdGluZ09iamVjdCk7CiAgICAgaWYgKGxvZ2ljYWxS aWdodCA+IG1fb2Zmc2V0KSB7CiAgICAgICAgIG1fb2Zmc2V0ID0gbG9naWNhbFJpZ2h0OwogICAg ICAgICByZXR1cm4gdHJ1ZTsKQEAgLTQ0NCw3ICs0NDQsNyBAQCBpbmxpbmUgYm9vbCBDb21wdXRl RmxvYXRPZmZzZXRBZGFwdGVyPEZsb2F0aW5nT2JqZWN0OjpGbG9hdExlZnQ+Ojp1cGRhdGVPZmZz ZXRJZgogdGVtcGxhdGU8PgogaW5saW5lIGJvb2wgQ29tcHV0ZUZsb2F0T2Zmc2V0QWRhcHRlcjxG bG9hdGluZ09iamVjdDo6RmxvYXRSaWdodD46OnVwZGF0ZU9mZnNldElmTmVlZGVkKGNvbnN0IEZs b2F0aW5nT2JqZWN0KiBmbG9hdGluZ09iamVjdCkKIHsKLSAgICBMYXlvdXRVbml0IGxvZ2ljYWxM ZWZ0ID0gbV9yZW5kZXJlci0+bG9naWNhbExlZnRGb3JGbG9hdChmbG9hdGluZ09iamVjdCk7Cisg ICAgTGF5b3V0VW5pdCBsb2dpY2FsTGVmdCA9IG1fcmVuZGVyZXIubG9naWNhbExlZnRGb3JGbG9h dChmbG9hdGluZ09iamVjdCk7CiAgICAgaWYgKGxvZ2ljYWxMZWZ0IDwgbV9vZmZzZXQpIHsKICAg ICAgICAgbV9vZmZzZXQgPSBsb2dpY2FsTGVmdDsKICAgICAgICAgcmV0dXJuIHRydWU7CkBAIC00 NjEsNyArNDYxLDcgQEAgaW5saW5lIHZvaWQgQ29tcHV0ZUZsb2F0T2Zmc2V0QWRhcHRlcjxGbG9h dFR5cGVWYWx1ZT46OmNvbGxlY3RJZk5lZWRlZChjb25zdCBJbnQKIAogICAgIC8vIEFsbCB0aGUg b2JqZWN0cyByZXR1cm5lZCBmcm9tIHRoZSB0cmVlIHNob3VsZCBiZSBhbHJlYWR5IHBsYWNlZC4K ICAgICBBU1NFUlQoZmxvYXRpbmdPYmplY3QtPmlzUGxhY2VkKCkpOwotICAgIEFTU0VSVChyYW5n ZXNJbnRlcnNlY3QobV9yZW5kZXJlci0+cGl4ZWxTbmFwcGVkTG9naWNhbFRvcEZvckZsb2F0KGZs b2F0aW5nT2JqZWN0KSwgbV9yZW5kZXJlci0+cGl4ZWxTbmFwcGVkTG9naWNhbEJvdHRvbUZvckZs b2F0KGZsb2F0aW5nT2JqZWN0KSwgbV9saW5lVG9wLCBtX2xpbmVCb3R0b20pKTsKKyAgICBBU1NF UlQocmFuZ2VzSW50ZXJzZWN0KG1fcmVuZGVyZXIucGl4ZWxTbmFwcGVkTG9naWNhbFRvcEZvckZs b2F0KGZsb2F0aW5nT2JqZWN0KSwgbV9yZW5kZXJlci5waXhlbFNuYXBwZWRMb2dpY2FsQm90dG9t Rm9yRmxvYXQoZmxvYXRpbmdPYmplY3QpLCBtX2xpbmVUb3AsIG1fbGluZUJvdHRvbSkpOwogCiAg ICAgYm9vbCBmbG9hdElzTmV3RXh0cmVtZSA9IHVwZGF0ZU9mZnNldElmTmVlZGVkKGZsb2F0aW5n T2JqZWN0KTsKICAgICBpZiAoZmxvYXRJc05ld0V4dHJlbWUpCkBAIC00NzEsNyArNDcxLDcgQEAg aW5saW5lIHZvaWQgQ29tcHV0ZUZsb2F0T2Zmc2V0QWRhcHRlcjxGbG9hdFR5cGVWYWx1ZT46OmNv bGxlY3RJZk5lZWRlZChjb25zdCBJbnQKIHRlbXBsYXRlIDxGbG9hdGluZ09iamVjdDo6VHlwZSBG bG9hdFR5cGVWYWx1ZT4KIExheW91dFVuaXQgQ29tcHV0ZUZsb2F0T2Zmc2V0QWRhcHRlcjxGbG9h dFR5cGVWYWx1ZT46OmhlaWdodFJlbWFpbmluZygpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIG1fb3V0 ZXJtb3N0RmxvYXQgPyBtX3JlbmRlcmVyLT5sb2dpY2FsQm90dG9tRm9yRmxvYXQobV9vdXRlcm1v c3RGbG9hdCkgLSBtX2xpbmVUb3AgOiBMYXlvdXRVbml0KDEpOworICAgIHJldHVybiBtX291dGVy bW9zdEZsb2F0ID8gbV9yZW5kZXJlci5sb2dpY2FsQm90dG9tRm9yRmxvYXQobV9vdXRlcm1vc3RG bG9hdCkgLSBtX2xpbmVUb3AgOiBMYXlvdXRVbml0KDEpOwogfQogCiAjaWZuZGVmIE5ERUJVRwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0Zsb2F0aW5nT2JqZWN0cy5oIGIv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0Zsb2F0aW5nT2JqZWN0cy5oCmluZGV4IDBiNDc1Y2Yz ODU1YzIzMTRkN2ZkMmMwZTY0YmEwZjZmYmYyNTRmMWMuLjYyODk0MGZhN2FmZmY3N2U2YjcyYmQ4 ZTNlOWYzOWU0M2IyN2YwOGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9G bG9hdGluZ09iamVjdHMuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvRmxvYXRpbmdP YmplY3RzLmgKQEAgLTEyNCw3ICsxMjQsNyBAQCB0eXBlZGVmIEhhc2hNYXA8UmVuZGVyQm94Kiwg c3RkOjp1bmlxdWVfcHRyPEZsb2F0aW5nT2JqZWN0Pj4gUmVuZGVyZXJUb0Zsb2F0SW5mbwogY2xh c3MgRmxvYXRpbmdPYmplY3RzIHsKICAgICBXVEZfTUFLRV9OT05DT1BZQUJMRShGbG9hdGluZ09i amVjdHMpOyBXVEZfTUFLRV9GQVNUX0FMTE9DQVRFRDsKIHB1YmxpYzoKLSAgICBGbG9hdGluZ09i amVjdHMoY29uc3QgUmVuZGVyQmxvY2tGbG93KiwgYm9vbCBob3Jpem9udGFsV3JpdGluZ01vZGUp OworICAgIEZsb2F0aW5nT2JqZWN0cyhjb25zdCBSZW5kZXJCbG9ja0Zsb3cmKTsKICAgICB+Rmxv YXRpbmdPYmplY3RzKCk7CiAKICAgICB2b2lkIGNsZWFyKCk7CkBAIC0xNjEsNyArMTYxLDcgQEAg cHJpdmF0ZToKICAgICB1bnNpZ25lZCBtX2xlZnRPYmplY3RzQ291bnQ7CiAgICAgdW5zaWduZWQg bV9yaWdodE9iamVjdHNDb3VudDsKICAgICBib29sIG1faG9yaXpvbnRhbFdyaXRpbmdNb2RlOwot ICAgIGNvbnN0IFJlbmRlckJsb2NrRmxvdyogbV9yZW5kZXJlcjsKKyAgICBjb25zdCBSZW5kZXJC bG9ja0Zsb3cmIG1fcmVuZGVyZXI7CiB9OwogCiAjaWZuZGVmIE5ERUJVRwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmNwcAppbmRleCAxMmNkYjk1NjUyZGZmZDJl MDc3NzA4NzUwZGUyMWQ1ZTUzMTBlZjc3Li44ZTk5YzUxNDBjYzc2ZWQ0YjUzNjI3NWRiMzcxMzhj NzM2OTNjYjFkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxv Y2tGbG93LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93 LmNwcApAQCAtMTkyNyw3ICsxOTI3LDcgQEAgdm9pZCBSZW5kZXJCbG9ja0Zsb3c6OmNsaXBPdXRG bG9hdGluZ09iamVjdHMoUmVuZGVyQmxvY2smIHJvb3RCbG9jaywgY29uc3QgUGFpbnQKIAogdm9p ZCBSZW5kZXJCbG9ja0Zsb3c6OmNyZWF0ZUZsb2F0aW5nT2JqZWN0cygpCiB7Ci0gICAgbV9mbG9h dGluZ09iamVjdHMgPSBhZG9wdFB0cihuZXcgRmxvYXRpbmdPYmplY3RzKHRoaXMsIGlzSG9yaXpv bnRhbFdyaXRpbmdNb2RlKCkpKTsKKyAgICBtX2Zsb2F0aW5nT2JqZWN0cyA9IGFkb3B0UHRyKG5l dyBGbG9hdGluZ09iamVjdHMoKnRoaXMpKTsKIH0KIAogdm9pZCBSZW5kZXJCbG9ja0Zsb3c6OnJl bW92ZUZsb2F0aW5nT2JqZWN0cygpCg==