82771 2012-03-30 12:42:06 -0700 Remove dead code behind ENSURE_VALUE_SAFETY_FOR_SKIA flag 2012-03-30 14:17:00 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 reed reed senorblanco webkit.review.bot oldest_to_newest 592409 0 reed 2012-03-30 12:42:06 -0700 Remove deadcode behind "SafeSkia" flag 592411 1 134864 reed 2012-03-30 12:44:28 -0700 Created attachment 134864 Patch 592412 2 reed 2012-03-30 12:45:23 -0700 According to the comment, ENSURE_VALUE_SAFETY_FOR_SKIA has not been defined for over 2 years, so for the sake of readability, I wanted to remove it and the (dead) code it was bracketing. 592453 3 senorblanco 2012-03-30 13:36:55 -0700 Damn, I was going to have our intern do this as his first task. :) 592457 4 134864 senorblanco 2012-03-30 13:39:17 -0700 Comment on attachment 134864 Patch Awesome. r=me 592493 5 134864 webkit.review.bot 2012-03-30 14:16:56 -0700 Comment on attachment 134864 Patch Clearing flags on attachment: 134864 Committed r112726: <http://trac.webkit.org/changeset/112726> 592494 6 webkit.review.bot 2012-03-30 14:17:00 -0700 All reviewed patches have been landed. Closing bug. 134864 2012-03-30 12:44:28 -0700 2012-03-30 14:16:56 -0700 Patch bug-82771-20120330154426.patch text/plain 14507 reed SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDExMjcxMSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMzIEBACisyMDEyLTAzLTMwICBNaWtlIFJl ZWQgIDxyZWVkQGdvb2dsZS5jb20+CisKKyAgICAgICAgUmVtb3ZlIGRlYWRjb2RlIGJlaGluZCAi U2FmZVNraWEiIGZsYWcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTgyNzcxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgSnVzdCByZW1vdmluZyBkZWFkIGNvZGUgKGJlaGluZCBvYnNvbGV0ZSBidWlsZCBmbGFn KSwgZXhpc3Rpbmcgd2Via2l0IHRlc3RzIGFwcGx5CisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFw aGljcy9za2lhL0dyYXBoaWNzQ29udGV4dFNraWEuY3BwOgorICAgICAgICAoV2ViQ29yZTo6R3Jh cGhpY3NDb250ZXh0OjphZGRJbm5lclJvdW5kZWRSZWN0Q2xpcCk6CisgICAgICAgIChXZWJDb3Jl OjpHcmFwaGljc0NvbnRleHQ6OmNsZWFyUmVjdCk6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGlj c0NvbnRleHQ6OmNsaXApOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0OjpjYW52 YXNDbGlwKToKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dDo6Y2xpcE91dCk6Cisg ICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQ6OmNsaXBQYXRoKToKKyAgICAgICAgKFdl YkNvcmU6OkdyYXBoaWNzQ29udGV4dDo6ZHJhd0NvbnZleFBvbHlnb24pOgorICAgICAgICAoV2Vi Q29yZTo6R3JhcGhpY3NDb250ZXh0OjpjbGlwQ29udmV4UG9seWdvbik6CisgICAgICAgIChXZWJD b3JlOjpHcmFwaGljc0NvbnRleHQ6OmRyYXdFbGxpcHNlKToKKyAgICAgICAgKFdlYkNvcmU6Okdy YXBoaWNzQ29udGV4dDo6ZHJhd0xpbmUpOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NDb250 ZXh0OjpkcmF3UmVjdCk6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQ6OmZpbGxQ YXRoKToKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dDo6ZmlsbFJlY3QpOgorICAg ICAgICAoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0OjpmaWxsUm91bmRlZFJlY3QpOgorICAgICAg ICAoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0OjpzdHJva2VBcmMpOgorICAgICAgICAoV2ViQ29y ZTo6R3JhcGhpY3NDb250ZXh0OjpzdHJva2VQYXRoKToKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBo aWNzQ29udGV4dDo6c3Ryb2tlUmVjdCk6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0NvbnRl eHQ6OnBsYXRmb3JtRmlsbEVsbGlwc2UpOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NDb250 ZXh0OjpwbGF0Zm9ybVN0cm9rZUVsbGlwc2UpOgorCiAyMDEyLTAzLTMwICBBbmRlcnMgQ2FybHNz b24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKICAgICAgICAgRml4IGJ1aWxkLgpJbmRleDogU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9HcmFwaGljc0NvbnRleHRTa2lhLmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lhL0dy YXBoaWNzQ29udGV4dFNraWEuY3BwCShyZXZpc2lvbiAxMTI2ODMpCisrKyBTb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lhL0dyYXBoaWNzQ29udGV4dFNraWEuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC04MiwxMTEgKzgyLDYgQEAgaW5saW5lIGZsb2F0IHNxdWFyZShmbG9hdCBuKQog CiB9ICAvLyBuYW1lc3BhY2UKIAotLy8gIlNlYXRiZWx0IiBmdW5jdGlvbnMgLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCi0vLwotLy8gVGhlc2Ug ZnVuY3Rpb25zIGNoZWNrIGNlcnRhaW4gZ3JhcGhpY3MgcHJpbWl0aXZlcyBmb3IgYmVpbmcgInNh ZmUiLgotLy8gU2tpYSBoYXMgaGlzdG9yaWNhbGx5IGNyYXNoZWQgd2hlbiBzZW50IGNyYXp5IGRh dGEuIFRoZXNlIGZ1bmN0aW9ucyBkbwotLy8gYWRkaXRpb25hbCBjaGVja2luZyB0byBwcmV2ZW50 IGNyYXNoZXMuCi0vLwotLy8gSWRlYWxseSwgYWxsIG9mIHRoZXNlIHdvdWxkIGJlIGZpeGVkIGlu IHRoZSBncmFwaGljcyBsYXllciBhbmQgd2Ugd291bGQgbm90Ci0vLyBoYXZlIHRvIGRvIGFueSBj aGVja2luZy4gWW91IGNhbiB1bmNvbW1lbnQgdGhlIEVOU1VSRV9WQUxVRV9TQUZFVFlfRk9SX1NL SUEKLS8vIGZsYWcgdG8gY2hlY2sgdGhlIGdyYXBoaWNzIGxheWVyLgotCi0vLyBEaXNhYmxpbmcg dGhlc2UgY2hlY2tzICgyMC8wMS8yMDEwKSwgc2luY2Ugd2UgdGhpbmsgd2UndmUgZml4ZWQgYWxs IHRoZSBTa2lhCi0vLyBidWdzLiAgTGVhdmluZyB0aGUgY29kZSBpbiBmb3Igbm93LCBzbyB3ZSBj YW4gcmV2ZXJ0IGVhc2lseSBpZiBuZWNlc3NhcnkuCi0vLyAjZGVmaW5lIEVOU1VSRV9WQUxVRV9T QUZFVFlfRk9SX1NLSUEKLQotI2lmZGVmIEVOU1VSRV9WQUxVRV9TQUZFVFlfRk9SX1NLSUEKLXN0 YXRpYyBib29sIGlzQ29vcmRpbmF0ZVNraWFTYWZlKGZsb2F0IGNvb3JkKQotewotICAgIC8vIEZp cnN0IGNoZWNrIGZvciB2YWxpZCBmbG9hdHMuCi0jaWYgZGVmaW5lZChfTVNDX1ZFUikKLSAgICBp ZiAoIV9maW5pdGUoY29vcmQpKQotI2Vsc2UKLSAgICBpZiAoIWZpbml0ZShjb29yZCkpCi0jZW5k aWYKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotCi0gICAgLy8gU2tpYSB1c2VzIDE2LjE2IGZpeGVk IHBvaW50IGFuZCAyNi42IGZpeGVkIHBvaW50IGluIHZhcmlvdXMgcGxhY2VzLiBJZgotICAgIC8v IHRoZSB0cmFuc2Zvcm1lZCBwb2ludCBleGNlZWRzIDE1IGJpdHMsIHdlIGp1c3QgZGVjbGFyZSB0 aGF0IGl0J3MKLSAgICAvLyB1bnJlYXNvbmFibGUgdG8gY2F0Y2ggYm90aCBvZiB0aGVzZSBjYXNl cy4KLSAgICBzdGF0aWMgY29uc3QgaW50IG1heFBvaW50TWFnbml0dWRlID0gMzI3Njc7Ci0gICAg aWYgKGNvb3JkID4gbWF4UG9pbnRNYWduaXR1ZGUgfHwgY29vcmQgPCAtbWF4UG9pbnRNYWduaXR1 ZGUpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLQotICAgIHJldHVybiB0cnVlOwotfQotI2VuZGlm Ci0KLXN0YXRpYyBib29sIGlzUG9pbnRTa2lhU2FmZShjb25zdCBTa01hdHJpeCYgdHJhbnNmb3Jt LCBjb25zdCBTa1BvaW50JiBwdCkKLXsKLSNpZmRlZiBFTlNVUkVfVkFMVUVfU0FGRVRZX0ZPUl9T S0lBCi0gICAgLy8gTm93IGNoZWNrIGZvciBwb2ludHMgdGhhdCB3aWxsIG92ZXJmbG93LiBXZSBj aGVjayB0aGUgKnRyYW5zZm9ybWVkKgotICAgIC8vIHBvaW50cyBzaW5jZSB0aGlzIGlzIHdoYXQg d2lsbCBiZSByYXN0ZXJpemVkLgotICAgIFNrUG9pbnQgeFB0OwotICAgIHRyYW5zZm9ybS5tYXBQ b2ludHMoJnhQdCwgJnB0LCAxKTsKLSAgICByZXR1cm4gaXNDb29yZGluYXRlU2tpYVNhZmUoeFB0 LmZYKSAmJiBpc0Nvb3JkaW5hdGVTa2lhU2FmZSh4UHQuZlkpOwotI2Vsc2UKLSAgICByZXR1cm4g dHJ1ZTsKLSNlbmRpZgotfQotCi1zdGF0aWMgYm9vbCBpc1JlY3RTa2lhU2FmZShjb25zdCBTa01h dHJpeCYgdHJhbnNmb3JtLCBjb25zdCBTa1JlY3QmIHJjKQotewotI2lmZGVmIEVOU1VSRV9WQUxV RV9TQUZFVFlfRk9SX1NLSUEKLSAgICBTa1BvaW50IHRvcGxlZnQgPSB7cmMuZkxlZnQsIHJjLmZU b3B9OwotICAgIFNrUG9pbnQgYm90dG9tcmlnaHQgPSB7cmMuZlJpZ2h0LCByYy5mQm90dG9tfTsK LSAgICByZXR1cm4gaXNQb2ludFNraWFTYWZlKHRyYW5zZm9ybSwgdG9wbGVmdCkgJiYgaXNQb2lu dFNraWFTYWZlKHRyYW5zZm9ybSwgYm90dG9tcmlnaHQpOwotI2Vsc2UKLSAgICByZXR1cm4gdHJ1 ZTsKLSNlbmRpZgotfQotCi1ib29sIGlzUGF0aFNraWFTYWZlKGNvbnN0IFNrTWF0cml4JiB0cmFu c2Zvcm0sIGNvbnN0IFNrUGF0aCYgcGF0aCkKLXsKLSNpZmRlZiBFTlNVUkVfVkFMVUVfU0FGRVRZ X0ZPUl9TS0lBCi0gICAgU2tQb2ludCBjdXJyZW50X3BvaW50c1s0XTsKLSAgICBTa1BhdGg6Okl0 ZXIgaXRlcihwYXRoLCBmYWxzZSk7Ci0gICAgZm9yIChTa1BhdGg6OlZlcmIgdmVyYiA9IGl0ZXIu bmV4dChjdXJyZW50X3BvaW50cyk7Ci0gICAgICAgICB2ZXJiICE9IFNrUGF0aDo6a0RvbmVfVmVy YjsKLSAgICAgICAgIHZlcmIgPSBpdGVyLm5leHQoY3VycmVudF9wb2ludHMpKSB7Ci0gICAgICAg IHN3aXRjaCAodmVyYikgewotICAgICAgICBjYXNlIFNrUGF0aDo6a01vdmVfVmVyYjoKLSAgICAg ICAgICAgIC8vIFRoaXMgbW92ZSB3aWxsIGJlIGR1cGxpY2F0ZWQgaW4gdGhlIG5leHQgdmVyYiwg c28gd2UgY2FuIGlnbm9yZS4KLSAgICAgICAgICAgIGJyZWFrOwotICAgICAgICBjYXNlIFNrUGF0 aDo6a0xpbmVfVmVyYjoKLSAgICAgICAgICAgIC8vIGl0ZXIubmV4dCByZXR1cm5zIDIgcG9pbnRz LgotICAgICAgICAgICAgaWYgKCFpc1BvaW50U2tpYVNhZmUodHJhbnNmb3JtLCBjdXJyZW50X3Bv aW50c1swXSkKLSAgICAgICAgICAgICAgICB8fCAhaXNQb2ludFNraWFTYWZlKHRyYW5zZm9ybSwg Y3VycmVudF9wb2ludHNbMV0pKQotICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICAg ICAgICAgIGJyZWFrOwotICAgICAgICBjYXNlIFNrUGF0aDo6a1F1YWRfVmVyYjoKLSAgICAgICAg ICAgIC8vIGl0ZXIubmV4dCByZXR1cm5zIDMgcG9pbnRzLgotICAgICAgICAgICAgaWYgKCFpc1Bv aW50U2tpYVNhZmUodHJhbnNmb3JtLCBjdXJyZW50X3BvaW50c1swXSkKLSAgICAgICAgICAgICAg ICB8fCAhaXNQb2ludFNraWFTYWZlKHRyYW5zZm9ybSwgY3VycmVudF9wb2ludHNbMV0pCi0gICAg ICAgICAgICAgICAgfHwgIWlzUG9pbnRTa2lhU2FmZSh0cmFuc2Zvcm0sIGN1cnJlbnRfcG9pbnRz WzJdKSkKLSAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgICAgICAgICBicmVhazsK LSAgICAgICAgY2FzZSBTa1BhdGg6OmtDdWJpY19WZXJiOgotICAgICAgICAgICAgLy8gaXRlci5u ZXh0IHJldHVybnMgNCBwb2ludHMuCi0gICAgICAgICAgICBpZiAoIWlzUG9pbnRTa2lhU2FmZSh0 cmFuc2Zvcm0sIGN1cnJlbnRfcG9pbnRzWzBdKQotICAgICAgICAgICAgICAgIHx8ICFpc1BvaW50 U2tpYVNhZmUodHJhbnNmb3JtLCBjdXJyZW50X3BvaW50c1sxXSkKLSAgICAgICAgICAgICAgICB8 fCAhaXNQb2ludFNraWFTYWZlKHRyYW5zZm9ybSwgY3VycmVudF9wb2ludHNbMl0pCi0gICAgICAg ICAgICAgICAgfHwgIWlzUG9pbnRTa2lhU2FmZSh0cmFuc2Zvcm0sIGN1cnJlbnRfcG9pbnRzWzNd KSkKLSAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgICAgICAgICBicmVhazsKLSAg ICAgICAgY2FzZSBTa1BhdGg6OmtDbG9zZV9WZXJiOgotICAgICAgICBjYXNlIFNrUGF0aDo6a0Rv bmVfVmVyYjoKLSAgICAgICAgZGVmYXVsdDoKLSAgICAgICAgICAgIGJyZWFrOwotICAgICAgICB9 Ci0gICAgfQotICAgIHJldHVybiB0cnVlOwotI2Vsc2UKLSAgICByZXR1cm4gdHJ1ZTsKLSNlbmRp ZgotfQotCiAvLyBMb2NhbCBoZWxwZXIgZnVuY3Rpb25zIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogCiB2b2lkIGFkZENvcm5lckFyYyhTa1Bh dGgqIHBhdGgsIGNvbnN0IFNrUmVjdCYgcmVjdCwgY29uc3QgSW50U2l6ZSYgc2l6ZSwgaW50IHN0 YXJ0QW5nbGUpCkBAIC0zMDMsOSArMTk4LDYgQEAgdm9pZCBHcmFwaGljc0NvbnRleHQ6OmFkZElu bmVyUm91bmRlZFJlYwogICAgICAgICByZXR1cm47CiAKICAgICBTa1JlY3QgcihyZWN0KTsKLSAg ICBpZiAoIWlzUmVjdFNraWFTYWZlKGdldENUTSgpLCByKSkKLSAgICAgICAgcmV0dXJuOwotCiAg ICAgU2tQYXRoIHBhdGg7CiAgICAgcGF0aC5hZGRPdmFsKHIsIFNrUGF0aDo6a0NXX0RpcmVjdGlv bik7CiAgICAgLy8gb25seSBwZXJmb3JtIHRoZSBpbnNldCBpZiB3ZSB3b24ndCBpbnZlcnQgcgpA QCAtMzMyLDkgKzIyNCw2IEBAIHZvaWQgR3JhcGhpY3NDb250ZXh0OjpjbGVhclJlY3QoY29uc3Qg RmwKICAgICAgICAgcmV0dXJuOwogCiAgICAgU2tSZWN0IHIgPSByZWN0OwotICAgIGlmICghaXNS ZWN0U2tpYVNhZmUoZ2V0Q1RNKCksIHIpKQotICAgICAgICBDbGlwUmVjdFRvQ2FudmFzKCpwbGF0 Zm9ybUNvbnRleHQoKS0+Y2FudmFzKCksIHIsICZyKTsKLQogICAgIFNrUGFpbnQgcGFpbnQ7CiAg ICAgcGxhdGZvcm1Db250ZXh0KCktPnNldHVwUGFpbnRGb3JGaWxsaW5nKCZwYWludCk7CiAgICAg cGFpbnQuc2V0WGZlcm1vZGVNb2RlKFNrWGZlcm1vZGU6OmtDbGVhcl9Nb2RlKTsKQEAgLTM0Nywx MSArMjM2LDcgQEAgdm9pZCBHcmFwaGljc0NvbnRleHQ6OmNsaXAoY29uc3QgRmxvYXRSZQogICAg IGlmIChwYWludGluZ0Rpc2FibGVkKCkpCiAgICAgICAgIHJldHVybjsKIAotICAgIFNrUmVjdCBy KHJlY3QpOwotICAgIGlmICghaXNSZWN0U2tpYVNhZmUoZ2V0Q1RNKCksIHIpKQotICAgICAgICBy ZXR1cm47Ci0KLSAgICBwbGF0Zm9ybUNvbnRleHQoKS0+Y2FudmFzKCktPmNsaXBSZWN0KHIpOwor ICAgIHBsYXRmb3JtQ29udGV4dCgpLT5jYW52YXMoKS0+Y2xpcFJlY3QocmVjdCk7CiB9CiAKIHZv aWQgR3JhcGhpY3NDb250ZXh0OjpjbGlwKGNvbnN0IFBhdGgmIHBhdGgpCkBAIC0zNTksMTEgKzI0 NCw3IEBAIHZvaWQgR3JhcGhpY3NDb250ZXh0OjpjbGlwKGNvbnN0IFBhdGgmIHAKICAgICBpZiAo cGFpbnRpbmdEaXNhYmxlZCgpKQogICAgICAgICByZXR1cm47CiAKLSAgICBjb25zdCBTa1BhdGgm IHAgPSAqcGF0aC5wbGF0Zm9ybVBhdGgoKTsKLSAgICBpZiAoIWlzUGF0aFNraWFTYWZlKGdldENU TSgpLCBwKSkKLSAgICAgICAgcmV0dXJuOwotCi0gICAgcGxhdGZvcm1Db250ZXh0KCktPmNsaXBQ YXRoQW50aUFsaWFzZWQocCk7CisgICAgcGxhdGZvcm1Db250ZXh0KCktPmNsaXBQYXRoQW50aUFs aWFzZWQoKnBhdGgucGxhdGZvcm1QYXRoKCkpOwogfQogCiB2b2lkIEdyYXBoaWNzQ29udGV4dDo6 Y2FudmFzQ2xpcChjb25zdCBQYXRoJiBwYXRoKQpAQCAtMzcxLDExICsyNTIsNyBAQCB2b2lkIEdy YXBoaWNzQ29udGV4dDo6Y2FudmFzQ2xpcChjb25zdCBQCiAgICAgaWYgKHBhaW50aW5nRGlzYWJs ZWQoKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgY29uc3QgU2tQYXRoJiBwID0gKnBhdGgucGxh dGZvcm1QYXRoKCk7Ci0gICAgaWYgKCFpc1BhdGhTa2lhU2FmZShnZXRDVE0oKSwgcCkpCi0gICAg ICAgIHJldHVybjsKLQotICAgIHBsYXRmb3JtQ29udGV4dCgpLT5jYW52YXNDbGlwUGF0aChwKTsK KyAgICBwbGF0Zm9ybUNvbnRleHQoKS0+Y2FudmFzQ2xpcFBhdGgoKnBhdGgucGxhdGZvcm1QYXRo KCkpOwogfQogCiB2b2lkIEdyYXBoaWNzQ29udGV4dDo6Y2xpcE91dChjb25zdCBJbnRSZWN0JiBy ZWN0KQpAQCAtMzgzLDExICsyNjAsNyBAQCB2b2lkIEdyYXBoaWNzQ29udGV4dDo6Y2xpcE91dChj b25zdCBJbnRSCiAgICAgaWYgKHBhaW50aW5nRGlzYWJsZWQoKSkKICAgICAgICAgcmV0dXJuOwog Ci0gICAgU2tSZWN0IHIocmVjdCk7Ci0gICAgaWYgKCFpc1JlY3RTa2lhU2FmZShnZXRDVE0oKSwg cikpCi0gICAgICAgIHJldHVybjsKLQotICAgIHBsYXRmb3JtQ29udGV4dCgpLT5jYW52YXMoKS0+ Y2xpcFJlY3QociwgU2tSZWdpb246OmtEaWZmZXJlbmNlX09wKTsKKyAgICBwbGF0Zm9ybUNvbnRl eHQoKS0+Y2FudmFzKCktPmNsaXBSZWN0KHJlY3QsIFNrUmVnaW9uOjprRGlmZmVyZW5jZV9PcCk7 CiB9CiAKIHZvaWQgR3JhcGhpY3NDb250ZXh0OjpjbGlwT3V0KGNvbnN0IFBhdGgmIHApCkBAIC0z OTcsOSArMjcwLDYgQEAgdm9pZCBHcmFwaGljc0NvbnRleHQ6OmNsaXBPdXQoY29uc3QgUGF0aAog CiAgICAgLy8gV2UgbXVzdCBtYWtlIGEgY29weSBvZiB0aGUgcGF0aCwgdG8gbWFyayBpdCBhcyBp bnZlcnNlLWZpbGxlZC4KICAgICBTa1BhdGggcGF0aCgqcC5wbGF0Zm9ybVBhdGgoKSk7Ci0gICAg aWYgKCFpc1BhdGhTa2lhU2FmZShnZXRDVE0oKSwgcGF0aCkpCi0gICAgICAgIHJldHVybjsKLQog ICAgIHBhdGgudG9nZ2xlSW52ZXJzZUZpbGxUeXBlKCk7CiAgICAgcGxhdGZvcm1Db250ZXh0KCkt PmNsaXBQYXRoQW50aUFsaWFzZWQocGF0aCk7CiB9CkBAIC00MTAsOSArMjgwLDYgQEAgdm9pZCBH cmFwaGljc0NvbnRleHQ6OmNsaXBQYXRoKGNvbnN0IFBhdAogICAgICAgICByZXR1cm47CiAKICAg ICBjb25zdCBTa1BhdGgqIHBhdGggPSBwYXRoVG9DbGlwLnBsYXRmb3JtUGF0aCgpOwotICAgIGlm ICghaXNQYXRoU2tpYVNhZmUoZ2V0Q1RNKCksICpwYXRoKSkKLSAgICAgICAgcmV0dXJuOwotCiAg ICAgU2tQYXRoOjpGaWxsVHlwZSBmdHlwZSA9IChjbGlwUnVsZSA9PSBSVUxFX0VWRU5PREQpID8g U2tQYXRoOjprRXZlbk9kZF9GaWxsVHlwZSA6IFNrUGF0aDo6a1dpbmRpbmdfRmlsbFR5cGU7CiAg ICAgU2tQYXRoIHN0b3JhZ2U7CiAgICAgaWYgKHBhdGgtPmdldEZpbGxUeXBlKCkgIT0gZnR5cGUp IHsKQEAgLTQ3NCw5ICszNDEsNiBAQCB2b2lkIEdyYXBoaWNzQ29udGV4dDo6ZHJhd0NvbnZleFBv bHlnb24oCiAgICAgU2tQYXRoIHBhdGg7CiAgICAgc2V0UGF0aEZyb21Db252ZXhQb2ludHMoJnBh dGgsIG51bVBvaW50cywgcG9pbnRzKTsKIAotICAgIGlmICghaXNQYXRoU2tpYVNhZmUoZ2V0Q1RN KCksIHBhdGgpKQotICAgICAgICByZXR1cm47Ci0KICAgICBTa1BhaW50IHBhaW50OwogICAgIHBs YXRmb3JtQ29udGV4dCgpLT5zZXR1cFBhaW50Rm9yRmlsbGluZygmcGFpbnQpOwogICAgIHBhaW50 LnNldEFudGlBbGlhcyhzaG91bGRBbnRpYWxpYXMpOwpAQCAtNTAwLDkgKzM2NCw2IEBAIHZvaWQg R3JhcGhpY3NDb250ZXh0OjpjbGlwQ29udmV4UG9seWdvbigKICAgICAgICAgcmV0dXJuOwogCiAg ICAgU2tQYXRoIHBhdGg7Ci0gICAgaWYgKCFpc1BhdGhTa2lhU2FmZShnZXRDVE0oKSwgcGF0aCkp Ci0gICAgICAgIHJldHVybjsKLQogICAgIHNldFBhdGhGcm9tQ29udmV4UG9pbnRzKCZwYXRoLCBu dW1Qb2ludHMsIHBvaW50cyk7CiAgICAgaWYgKGFudGlhbGlhc2VkKQogICAgICAgICBwbGF0Zm9y bUNvbnRleHQoKS0+Y2xpcFBhdGhBbnRpQWxpYXNlZChwYXRoKTsKQEAgLTUxNyw5ICszNzgsNiBA QCB2b2lkIEdyYXBoaWNzQ29udGV4dDo6ZHJhd0VsbGlwc2UoY29uc3QgCiAgICAgICAgIHJldHVy bjsKIAogICAgIFNrUmVjdCByZWN0ID0gZWxpcHNlUmVjdDsKLSAgICBpZiAoIWlzUmVjdFNraWFT YWZlKGdldENUTSgpLCByZWN0KSkKLSAgICAgICAgcmV0dXJuOwotCiAgICAgU2tQYWludCBwYWlu dDsKICAgICBwbGF0Zm9ybUNvbnRleHQoKS0+c2V0dXBQYWludEZvckZpbGxpbmcoJnBhaW50KTsK ICAgICBwbGF0Zm9ybUNvbnRleHQoKS0+Y2FudmFzKCktPmRyYXdPdmFsKHJlY3QsIHBhaW50KTsK QEAgLTYxMCw5ICs0NjgsNiBAQCB2b2lkIEdyYXBoaWNzQ29udGV4dDo6ZHJhd0xpbmUoY29uc3Qg SW50CiAgICAgICAgIHJldHVybjsKIAogICAgIFNrUGFpbnQgcGFpbnQ7Ci0gICAgaWYgKCFpc1Bv aW50U2tpYVNhZmUoZ2V0Q1RNKCksIHBvaW50MSkgfHwgIWlzUG9pbnRTa2lhU2FmZShnZXRDVE0o KSwgcG9pbnQyKSkKLSAgICAgICAgcmV0dXJuOwotCiAgICAgRmxvYXRQb2ludCBwMSA9IHBvaW50 MTsKICAgICBGbG9hdFBvaW50IHAyID0gcG9pbnQyOwogICAgIGJvb2wgaXNWZXJ0aWNhbExpbmUg PSAocDEueCgpID09IHAyLngoKSk7CkBAIC03OTUsMTMgKzY1MCw3IEBAIHZvaWQgR3JhcGhpY3ND b250ZXh0OjpkcmF3UmVjdChjb25zdCBJbnQKICAgICBpZiAocGFpbnRpbmdEaXNhYmxlZCgpKQog ICAgICAgICByZXR1cm47CiAKLSAgICBTa1JlY3QgciA9IHJlY3Q7Ci0gICAgaWYgKCFpc1JlY3RT a2lhU2FmZShnZXRDVE0oKSwgcikpIHsKLSAgICAgICAgLy8gU2VlIHRoZSBmaWxsUmVjdCBiZWxv dy4KLSAgICAgICAgQ2xpcFJlY3RUb0NhbnZhcygqcGxhdGZvcm1Db250ZXh0KCktPmNhbnZhcygp LCByLCAmcik7Ci0gICAgfQotCi0gICAgcGxhdGZvcm1Db250ZXh0KCktPmRyYXdSZWN0KHIpOwor ICAgIHBsYXRmb3JtQ29udGV4dCgpLT5kcmF3UmVjdChyZWN0KTsKIH0KIAogdm9pZCBHcmFwaGlj c0NvbnRleHQ6OmZpbGxQYXRoKGNvbnN0IFBhdGgmIHBhdGhUb0ZpbGwpCkBAIC04MDksMTQgKzY1 OCwxMSBAQCB2b2lkIEdyYXBoaWNzQ29udGV4dDo6ZmlsbFBhdGgoY29uc3QgUGF0CiAgICAgaWYg KHBhaW50aW5nRGlzYWJsZWQoKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgY29uc3QgU2tQYXRo KiBwYXRoID0gcGF0aFRvRmlsbC5wbGF0Zm9ybVBhdGgoKTsKLSAgICBpZiAoIWlzUGF0aFNraWFT YWZlKGdldENUTSgpLCAqcGF0aCkpCi0gICAgICByZXR1cm47Ci0KICAgICBjb25zdCBHcmFwaGlj c0NvbnRleHRTdGF0ZSYgc3RhdGUgPSBtX3N0YXRlOwogICAgIFNrUGF0aDo6RmlsbFR5cGUgZnR5 cGUgPSBzdGF0ZS5maWxsUnVsZSA9PSBSVUxFX0VWRU5PREQgPwogICAgICAgICBTa1BhdGg6OmtF dmVuT2RkX0ZpbGxUeXBlIDogU2tQYXRoOjprV2luZGluZ19GaWxsVHlwZTsKIAorICAgIGNvbnN0 IFNrUGF0aCogcGF0aCA9IHBhdGhUb0ZpbGwucGxhdGZvcm1QYXRoKCk7CiAgICAgU2tQYXRoIHN0 b3JhZ2U7CiAgICAgaWYgKHBhdGgtPmdldEZpbGxUeXBlKCkgIT0gZnR5cGUpIHsKICAgICAgICAg c3RvcmFnZSA9ICpwYXRoOwpAQCAtODM3LDEwICs2ODMsNiBAQCB2b2lkIEdyYXBoaWNzQ29udGV4 dDo6ZmlsbFJlY3QoY29uc3QgRmxvCiAgICAgICAgIHJldHVybjsKIAogICAgIFNrUmVjdCByID0g cmVjdDsKLSAgICBpZiAoIWlzUmVjdFNraWFTYWZlKGdldENUTSgpLCByKSkgewotICAgICAgICAv LyBTZWUgdGhlIG90aGVyIHZlcnNpb24gb2YgZmlsbFJlY3QgYmVsb3cuCi0gICAgICAgIENsaXBS ZWN0VG9DYW52YXMoKnBsYXRmb3JtQ29udGV4dCgpLT5jYW52YXMoKSwgciwgJnIpOwotICAgIH0K IAogICAgIFNrUGFpbnQgcGFpbnQ7CiAgICAgcGxhdGZvcm1Db250ZXh0KCktPnNldHVwUGFpbnRG b3JGaWxsaW5nKCZwYWludCk7CkBAIC04NTQsMjAgKzY5Niw2IEBAIHZvaWQgR3JhcGhpY3NDb250 ZXh0OjpmaWxsUmVjdChjb25zdCBGbG8KICAgICAgICAgcmV0dXJuOwogCiAgICAgU2tSZWN0IHIg PSByZWN0OwotICAgIGlmICghaXNSZWN0U2tpYVNhZmUoZ2V0Q1RNKCksIHIpKSB7Ci0gICAgICAg IC8vIFNwZWNpYWwgY2FzZSB3aGVuIHRoZSByZWN0YW5nbGUgb3ZlcmZsb3dzIGZpeGVkIHBvaW50 LiBUaGlzIGlzIGEKLSAgICAgICAgLy8gd29ya2Fyb3VuZCB0byBmaXggYnVnIDEyMTI4NDQuIFdo ZW4gdGhlIGlucHV0IHJlY3RhbmdsZSBpcyB2ZXJ5Ci0gICAgICAgIC8vIGxhcmdlLCBpdCBjYW4g b3ZlcmZsb3cgU2tpYSdzIGludGVybmFsIGZpeGVkIHBvaW50IHJlY3QuIFRoaXMKLSAgICAgICAg Ly8gc2hvdWxkIGJlIGZpeGFibGUgaW4gU2tpYSAoc2luY2UgdGhlIG91dHB1dCBiaXRtYXAgaXNu J3QgdGhhdAotICAgICAgICAvLyBsYXJnZSksIGJ1dCB1bnRpbCB0aGF0IGlzIGZpeGVkLCB3ZSB0 cnkgdG8gaGFuZGxlIGl0IG91cnNlbHZlcy4KLSAgICAgICAgLy8KLSAgICAgICAgLy8gV2UgbWFu dWFsbHkgY2xpcCB0aGUgcmVjdGFuZ2xlIHRvIHRoZSBjdXJyZW50IGNsaXAgcmVjdC4gVGhpcwot ICAgICAgICAvLyB3aWxsIHByZXZlbnQgb3ZlcmZsb3cuIFRoZSByZWN0YW5nbGUgd2lsbCBiZSB0 cmFuc2Zvcm1lZCB0byB0aGUKLSAgICAgICAgLy8gY2FudmFzJyBjb29yZGluYXRlIHNwYWNlIGJl Zm9yZSBpdCBpcyBjb252ZXJ0ZWQgdG8gZml4ZWQgcG9pbnQKLSAgICAgICAgLy8gc28gd2UgYXJl IGd1YXJhbnRlZWQgbm90IHRvIG92ZXJmbG93IGFmdGVyIGRvaW5nIHRoaXMuCi0gICAgICAgIENs aXBSZWN0VG9DYW52YXMoKnBsYXRmb3JtQ29udGV4dCgpLT5jYW52YXMoKSwgciwgJnIpOwotICAg IH0KLQogICAgIFNrUGFpbnQgcGFpbnQ7CiAgICAgcGxhdGZvcm1Db250ZXh0KCktPnNldHVwUGFp bnRDb21tb24oJnBhaW50KTsKICAgICBwYWludC5zZXRDb2xvcihjb2xvci5yZ2IoKSk7CkBAIC04 ODYsMTEgKzcxNCw2IEBAIHZvaWQgR3JhcGhpY3NDb250ZXh0OjpmaWxsUm91bmRlZFJlY3QoY28K ICAgICBpZiAocGFpbnRpbmdEaXNhYmxlZCgpKQogICAgICAgICByZXR1cm47CiAKLSAgICBTa1Jl Y3QgciA9IHJlY3Q7Ci0gICAgaWYgKCFpc1JlY3RTa2lhU2FmZShnZXRDVE0oKSwgcikpCi0gICAg ICAgIC8vIFNlZSBmaWxsUmVjdCgpLgotICAgICAgICBDbGlwUmVjdFRvQ2FudmFzKCpwbGF0Zm9y bUNvbnRleHQoKS0+Y2FudmFzKCksIHIsICZyKTsKLQogICAgIGlmICh0b3BMZWZ0LndpZHRoKCkg KyB0b3BSaWdodC53aWR0aCgpID4gcmVjdC53aWR0aCgpCiAgICAgICAgICAgICB8fCBib3R0b21M ZWZ0LndpZHRoKCkgKyBib3R0b21SaWdodC53aWR0aCgpID4gcmVjdC53aWR0aCgpCiAgICAgICAg ICAgICB8fCB0b3BMZWZ0LmhlaWdodCgpICsgYm90dG9tTGVmdC5oZWlnaHQoKSA+IHJlY3QuaGVp Z2h0KCkKQEAgLTkwMiw2ICs3MjUsNyBAQCB2b2lkIEdyYXBoaWNzQ29udGV4dDo6ZmlsbFJvdW5k ZWRSZWN0KGNvCiAgICAgICAgIHJldHVybjsKICAgICB9CiAKKyAgICBTa1JlY3QgciA9IHJlY3Q7 CiAgICAgU2tQYXRoIHBhdGg7CiAgICAgYWRkQ29ybmVyQXJjKCZwYXRoLCByLCB0b3BSaWdodCwg MjcwKTsKICAgICBhZGRDb3JuZXJBcmMoJnBhdGgsIHIsIGJvdHRvbVJpZ2h0LCAwKTsKQEAgLTEx OTQsOCArMTAxOCw2IEBAIHZvaWQgR3JhcGhpY3NDb250ZXh0OjpzdHJva2VBcmMoY29uc3QgSW4K IAogICAgIFNrUGF0aCBwYXRoOwogICAgIHBhdGguYWRkQXJjKG92YWwsIFNrSW50VG9TY2FsYXIo LXN0YXJ0QW5nbGUpLCBTa0ludFRvU2NhbGFyKC1hbmdsZVNwYW4pKTsKLSAgICBpZiAoIWlzUGF0 aFNraWFTYWZlKGdldENUTSgpLCBwYXRoKSkKLSAgICAgICAgcmV0dXJuOwogICAgIHBsYXRmb3Jt Q29udGV4dCgpLT5jYW52YXMoKS0+ZHJhd1BhdGgocGF0aCwgcGFpbnQpOwogICAgIHBsYXRmb3Jt Q29udGV4dCgpLT5kaWREcmF3UGF0aChwYXRoLCBwYWludCk7CiB9CkBAIC0xMjA2LDkgKzEwMjgs NiBAQCB2b2lkIEdyYXBoaWNzQ29udGV4dDo6c3Ryb2tlUGF0aChjb25zdCBQCiAgICAgICAgIHJl dHVybjsKIAogICAgIGNvbnN0IFNrUGF0aCYgcGF0aCA9ICpwYXRoVG9TdHJva2UucGxhdGZvcm1Q YXRoKCk7Ci0gICAgaWYgKCFpc1BhdGhTa2lhU2FmZShnZXRDVE0oKSwgcGF0aCkpCi0gICAgICAg IHJldHVybjsKLQogICAgIFNrUGFpbnQgcGFpbnQ7CiAgICAgcGxhdGZvcm1Db250ZXh0KCktPnNl dHVwUGFpbnRGb3JTdHJva2luZygmcGFpbnQsIDAsIDApOwogICAgIHBsYXRmb3JtQ29udGV4dCgp LT5jYW52YXMoKS0+ZHJhd1BhdGgocGF0aCwgcGFpbnQpOwpAQCAtMTIyMCw5ICsxMDM5LDYgQEAg dm9pZCBHcmFwaGljc0NvbnRleHQ6OnN0cm9rZVJlY3QoY29uc3QgRgogICAgIGlmIChwYWludGlu Z0Rpc2FibGVkKCkpCiAgICAgICAgIHJldHVybjsKIAotICAgIGlmICghaXNSZWN0U2tpYVNhZmUo Z2V0Q1RNKCksIHJlY3QpKQotICAgICAgICByZXR1cm47Ci0KICAgICBTa1BhaW50IHBhaW50Owog ICAgIHBsYXRmb3JtQ29udGV4dCgpLT5zZXR1cFBhaW50Rm9yU3Ryb2tpbmcoJnBhaW50LCAwLCAw KTsKICAgICBwYWludC5zZXRTdHJva2VXaWR0aChXZWJDb3JlRmxvYXRUb1NrU2NhbGFyKGxpbmVX aWR0aCkpOwpAQCAtMTI4NSw5ICsxMTAxLDYgQEAgdm9pZCBHcmFwaGljc0NvbnRleHQ6OnBsYXRm b3JtRmlsbEVsbGlwcwogICAgICAgICByZXR1cm47CiAKICAgICBTa1JlY3QgcmVjdCA9IGVsbGlw c2U7Ci0gICAgaWYgKCFpc1JlY3RTa2lhU2FmZShnZXRDVE0oKSwgcmVjdCkpCi0gICAgICAgIHJl dHVybjsKLQogICAgIFNrUGFpbnQgcGFpbnQ7CiAgICAgcGxhdGZvcm1Db250ZXh0KCktPnNldHVw UGFpbnRGb3JGaWxsaW5nKCZwYWludCk7CiAgICAgcGxhdGZvcm1Db250ZXh0KCktPmNhbnZhcygp LT5kcmF3T3ZhbChyZWN0LCBwYWludCk7CkBAIC0xMzAwLDkgKzExMTMsNiBAQCB2b2lkIEdyYXBo aWNzQ29udGV4dDo6cGxhdGZvcm1TdHJva2VFbGxpCiAgICAgICAgIHJldHVybjsKIAogICAgIFNr UmVjdCByZWN0KGVsbGlwc2UpOwotICAgIGlmICghaXNSZWN0U2tpYVNhZmUoZ2V0Q1RNKCksIHJl Y3QpKQotICAgICAgICByZXR1cm47Ci0KICAgICBTa1BhaW50IHBhaW50OwogICAgIHBsYXRmb3Jt Q29udGV4dCgpLT5zZXR1cFBhaW50Rm9yU3Ryb2tpbmcoJnBhaW50LCAwLCAwKTsKICAgICBwbGF0 Zm9ybUNvbnRleHQoKS0+Y2FudmFzKCktPmRyYXdPdmFsKHJlY3QsIHBhaW50KTsKQEAgLTEzMTAs MyArMTEyMCw0IEBAIHZvaWQgR3JhcGhpY3NDb250ZXh0OjpwbGF0Zm9ybVN0cm9rZUVsbGkKIH0K IAogfSAgLy8gbmFtZXNwYWNlIFdlYkNvcmUKKwo=