130695 2014-03-24 14:33:17 -0700 [core] FEGaussianBlur: use IntSize to simplify member function interface 2014-03-24 18:14:56 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All RESOLVED FIXED P3 Normal --- 1 savagobr webkit-unassigned commit-queue dino kondapallykalyan krit simon.fraser oldest_to_newest 993971 0 savagobr 2014-03-24 14:33:17 -0700 A continuation on #50881, this patch simplifies FEGaussianBlur::calculateKernelSize() member function by using IntSize to return the calculated parameters. 993973 1 227693 savagobr 2014-03-24 14:38:00 -0700 Created attachment 227693 Patch 993974 2 commit-queue 2014-03-24 14:39:48 -0700 Attachment 227693 did not pass style-queue: ERROR: Source/WebCore/ChangeLog:10: Line contains tab character. [whitespace/tab] [5] Total errors found: 1 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style. 994034 3 227707 savagobr 2014-03-24 17:29:58 -0700 Created attachment 227707 Patch 994053 4 227707 commit-queue 2014-03-24 18:14:52 -0700 Comment on attachment 227707 Patch Clearing flags on attachment: 227707 Committed r166214: <http://trac.webkit.org/changeset/166214> 994054 5 commit-queue 2014-03-24 18:14:56 -0700 All reviewed patches have been landed. Closing bug. 227693 2014-03-24 14:38:00 -0700 2014-03-24 17:29:53 -0700 Patch bug-130695-20140324143739.patch text/plain 9381 savagobr U3VidmVyc2lvbiBSZXZpc2lvbjogMTY2MTgwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODE1MTA5MTU2YWQ5MWQw ZmMxZDQ4OGFhYTBmM2ZmMDk2ZjgyOGEwZC4uYmFmOWQ5NGZlNWI0NTM2MzEyZmFjNzZmMmZkMmYw MzZkNWMxN2QyMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDE0LTAzLTI0ICBBZGVu aWxzb24gQ2F2YWxjYW50aSAgPGNhdmFsY2FudGlpQGdtYWlsLmNvbT4KKworICAgICAgICBbY29y ZV0gRkVHYXVzc2lhbkJsdXI6IHVzZSBJbnRTaXplIHRvIHNpbXBsaWZ5IG1lbWJlciBmdW5jdGlv biBpbnRlcmZhY2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTEzMDY5NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIEJ5IHJldHVybmluZyBhIEludFNpemUgdG8gc3RvcmUgdGhlIGNhbGN1bGF0ZWQga2VybmVs IHNpemUgdmFsdWVzLAorICAgICAgICBpdCBpcyBwb3NzaWJsZSB0byBoYXZlIGxlc3MgZnVuY3Rp b24gcGFyYW1ldGVycy4gVGhpcyBwYXRjaCBhbHNvCisJc3RyZWFtbGluZXMgYSBiaXQgdGhlIGNv ZGUgaW4gY2FsY3VsYXRlVW5zY2FsZWRLZXJuZWxTaXplLgorCisgICAgICAgIE5vIG5ldyB0ZXN0 cywgbm8gY2hhbmdlIG9uIGJlaGF2aW9yLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mv ZmlsdGVycy9GRURyb3BTaGFkb3cuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RkVEcm9wU2hhZG93 OjpkZXRlcm1pbmVBYnNvbHV0ZVBhaW50UmVjdCk6CisgICAgICAgIChCbGluayk6IERlbGV0ZWQu CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZmlsdGVycy9GRUdhdXNzaWFuQmx1ci5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpGRUdhdXNzaWFuQmx1cjo6Y2FsY3VsYXRlVW5zY2FsZWRLZXJu ZWxTaXplKToKKyAgICAgICAgKFdlYkNvcmU6OkZFR2F1c3NpYW5CbHVyOjpjYWxjdWxhdGVLZXJu ZWxTaXplKToKKyAgICAgICAgKFdlYkNvcmU6OkZFR2F1c3NpYW5CbHVyOjpkZXRlcm1pbmVBYnNv bHV0ZVBhaW50UmVjdCk6CisgICAgICAgIChXZWJDb3JlOjpGRUdhdXNzaWFuQmx1cjo6cGxhdGZv cm1BcHBseVNvZnR3YXJlKToKKyAgICAgICAgKEJsaW5rKTogRGVsZXRlZC4KKyAgICAgICAgKiBw bGF0Zm9ybS9ncmFwaGljcy9maWx0ZXJzL0ZFR2F1c3NpYW5CbHVyLmg6CisgICAgICAgIChCbGlu ayk6IERlbGV0ZWQuCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZmlsdGVycy9GaWx0ZXJP cGVyYXRpb25zLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Om91dHNldFNpemVGb3JCbHVyKToKKyAg ICAgICAgKEJsaW5rKTogRGVsZXRlZC4KKwogMjAxNC0wMy0yNCAgQnJlbnQgRnVsZ2hhbSAgPGJm dWxnaGFtQGFwcGxlLmNvbT4KIAogICAgICAgICBNZXJnZSBNaW5vciBXZWJWVFQgQ2xlYW51cHMg ZnJvbSBCbGluawpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv ZmlsdGVycy9GRURyb3BTaGFkb3cuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvZmlsdGVycy9GRURyb3BTaGFkb3cuY3BwCmluZGV4IGJkYzk0ZDJkOGRmNjAzMTAwY2NkNGFj OWM3ZjA5NTY0MGQwYjU5ZDIuLmVlYzczNDVhNTRiYzg0Y2VmNzhjODg5ZTI1ZWMyMmQ2NjYzYWZj MzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2ZpbHRlcnMv RkVEcm9wU2hhZG93LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9m aWx0ZXJzL0ZFRHJvcFNoYWRvdy5jcHAKQEAgLTU4LDE0ICs1OCwxMiBAQCB2b2lkIEZFRHJvcFNo YWRvdzo6ZGV0ZXJtaW5lQWJzb2x1dGVQYWludFJlY3QoKQogICAgIEZsb2F0UmVjdCBhYnNvbHV0 ZU9mZnNldFBhaW50UmVjdChhYnNvbHV0ZVBhaW50UmVjdCk7CiAgICAgYWJzb2x1dGVPZmZzZXRQ YWludFJlY3QubW92ZShmaWx0ZXItPmFwcGx5SG9yaXpvbnRhbFNjYWxlKG1fZHgpLCBmaWx0ZXIt PmFwcGx5VmVydGljYWxTY2FsZShtX2R5KSk7CiAgICAgYWJzb2x1dGVQYWludFJlY3QudW5pdGUo YWJzb2x1dGVPZmZzZXRQYWludFJlY3QpOwotICAgIAotICAgIHVuc2lnbmVkIGtlcm5lbFNpemVY ID0gMDsKLSAgICB1bnNpZ25lZCBrZXJuZWxTaXplWSA9IDA7Ci0gICAgRkVHYXVzc2lhbkJsdXI6 OmNhbGN1bGF0ZUtlcm5lbFNpemUoZmlsdGVyLCBrZXJuZWxTaXplWCwga2VybmVsU2l6ZVksIG1f c3RkWCwgbV9zdGRZKTsKLSAgICAKKworICAgIEludFNpemUga2VybmVsU2l6ZSA9IEZFR2F1c3Np YW5CbHVyOjpjYWxjdWxhdGVLZXJuZWxTaXplKGZpbHRlciwgbV9zdGRYLCBtX3N0ZFkpOworCiAg ICAgLy8gV2UgdGFrZSB0aGUgaGFsZiBrZXJuZWwgc2l6ZSBhbmQgbXVsdGlwbHkgaXQgd2l0aCB0 aHJlZSwgYmVjYXVzZSB3ZSBydW4gYm94IGJsdXIgdGhyZWUgdGltZXMuCi0gICAgYWJzb2x1dGVQ YWludFJlY3QuaW5mbGF0ZVgoMyAqIGtlcm5lbFNpemVYICogMC41Zik7Ci0gICAgYWJzb2x1dGVQ YWludFJlY3QuaW5mbGF0ZVkoMyAqIGtlcm5lbFNpemVZICogMC41Zik7CisgICAgYWJzb2x1dGVQ YWludFJlY3QuaW5mbGF0ZVgoMyAqIGtlcm5lbFNpemUud2lkdGgoKSAqIDAuNWYpOworICAgIGFi c29sdXRlUGFpbnRSZWN0LmluZmxhdGVZKDMgKiBrZXJuZWxTaXplLmhlaWdodCgpICogMC41Zik7 CiAKICAgICBpZiAoY2xpcHNUb0JvdW5kcygpKQogICAgICAgICBhYnNvbHV0ZVBhaW50UmVjdC5p bnRlcnNlY3QobWF4RWZmZWN0UmVjdCgpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2ZpbHRlcnMvRkVHYXVzc2lhbkJsdXIuY3BwIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvZmlsdGVycy9GRUdhdXNzaWFuQmx1ci5jcHAKaW5kZXggZTM3 MTU3NWJiODhhNjM2OTViYzc4ZWZlZjc5NjZjZGJiZTAxYjI2NC4uMTUwYTM4ZjJlZmJiMjhkY2I3 MTk5NWI2NjE0NGEzNDQ4ZWE0YThlZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvZmlsdGVycy9GRUdhdXNzaWFuQmx1ci5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvZmlsdGVycy9GRUdhdXNzaWFuQmx1ci5jcHAKQEAgLTQzLDcg KzQzLDcgQEAgc3RhdGljIGlubGluZSBmbG9hdCBnYXVzc2lhbktlcm5lbEZhY3RvcigpCiAgICAg cmV0dXJuIDMgLyA0LmYgKiBzcXJ0ZigyICogcGlGbG9hdCk7CiB9CiAKLXN0YXRpYyBjb25zdCB1 bnNpZ25lZCBnTWF4S2VybmVsU2l6ZSA9IDUwMDsKK3N0YXRpYyBjb25zdCBpbnQgZ01heEtlcm5l bFNpemUgPSA1MDA7CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIApAQCAtMzg1LDM4ICszODUsMzcg QEAgaW5saW5lIHZvaWQgRkVHYXVzc2lhbkJsdXI6OnBsYXRmb3JtQXBwbHkoVWludDhDbGFtcGVk QXJyYXkqIHNyY1BpeGVsQXJyYXksIFVpbnQKICAgICBwbGF0Zm9ybUFwcGx5R2VuZXJpYyhzcmNQ aXhlbEFycmF5LCB0bXBQaXhlbEFycmF5LCBrZXJuZWxTaXplWCwga2VybmVsU2l6ZVksIHBhaW50 U2l6ZSk7CiB9CiAKLXZvaWQgRkVHYXVzc2lhbkJsdXI6OmNhbGN1bGF0ZVVuc2NhbGVkS2VybmVs U2l6ZSh1bnNpZ25lZCYga2VybmVsU2l6ZVgsIHVuc2lnbmVkJiBrZXJuZWxTaXplWSwgZmxvYXQg c3RkWCwgZmxvYXQgc3RkWSkKK0ludFNpemUgRkVHYXVzc2lhbkJsdXI6OmNhbGN1bGF0ZVVuc2Nh bGVkS2VybmVsU2l6ZShGbG9hdFBvaW50IHN0ZCkKIHsKLSAgICBBU1NFUlQoc3RkWCA+PSAwICYm IHN0ZFkgPj0gMCk7Ci0KLSAgICBrZXJuZWxTaXplWCA9IDA7Ci0gICAgaWYgKHN0ZFgpCi0gICAg ICAgIGtlcm5lbFNpemVYID0gc3RkOjptYXg8dW5zaWduZWQ+KDIsIHN0YXRpY19jYXN0PHVuc2ln bmVkPihmbG9vcmYoc3RkWCAqIGdhdXNzaWFuS2VybmVsRmFjdG9yKCkgKyAwLjVmKSkpOwotICAg IGtlcm5lbFNpemVZID0gMDsKLSAgICBpZiAoc3RkWSkKLSAgICAgICAga2VybmVsU2l6ZVkgPSBz dGQ6Om1heDx1bnNpZ25lZD4oMiwgc3RhdGljX2Nhc3Q8dW5zaWduZWQ+KGZsb29yZihzdGRZICog Z2F1c3NpYW5LZXJuZWxGYWN0b3IoKSArIDAuNWYpKSk7Ci0gICAgCi0gICAgLy8gTGltaXQgdGhl IGtlcm5lbCBzaXplIHRvIDEwMDAuIEEgYmlnZ2VyIHJhZGl1cyB3b24ndCBtYWtlIGEgYmlnIGRp ZmZlcmVuY2UgZm9yIHRoZSByZXN1bHQgaW1hZ2UgYnV0CisgICAgQVNTRVJUKHN0ZC54KCkgPj0g MCAmJiBzdGQueSgpID49IDApOworICAgIEludFNpemUga2VybmVsU2l6ZSgwLCAwKTsKKworICAg IC8vIExpbWl0IHRoZSBrZXJuZWwgc2l6ZSB0byA1MDAuIEEgYmlnZ2VyIHJhZGl1cyB3b24ndCBt YWtlIGEgYmlnIGRpZmZlcmVuY2UgZm9yIHRoZSByZXN1bHQgaW1hZ2UgYnV0CiAgICAgLy8gaW5m bGF0ZXMgdGhlIGFic29sdXRlIHBhaW50IHJlY3QgdG8gbXVjaC4gVGhpcyBpcyBjb21wYXRpYmxl IHdpdGggRmlyZWZveCcgYmVoYXZpb3IuCi0gICAgaWYgKGtlcm5lbFNpemVYID4gZ01heEtlcm5l bFNpemUpCi0gICAgICAgIGtlcm5lbFNpemVYID0gZ01heEtlcm5lbFNpemU7Ci0gICAgaWYgKGtl cm5lbFNpemVZID4gZ01heEtlcm5lbFNpemUpCi0gICAgICAgIGtlcm5lbFNpemVZID0gZ01heEtl cm5lbFNpemU7CisgICAgaWYgKHN0ZC54KCkpIHsKKyAgICAgICAgaW50IHNpemUgPSBzdGQ6Om1h eDx1bnNpZ25lZD4oMiwgc3RhdGljX2Nhc3Q8dW5zaWduZWQ+KGZsb29yZihzdGQueCgpICogZ2F1 c3NpYW5LZXJuZWxGYWN0b3IoKSArIDAuNWYpKSk7CisgICAgICAgIGtlcm5lbFNpemUuc2V0V2lk dGgoc3RkOjptaW4oc2l6ZSwgZ01heEtlcm5lbFNpemUpKTsKKyAgICB9CisKKyAgICBpZiAoc3Rk LnkoKSkgeworICAgICAgICBpbnQgc2l6ZSA9IHN0ZDo6bWF4PHVuc2lnbmVkPigyLCBzdGF0aWNf Y2FzdDx1bnNpZ25lZD4oZmxvb3JmKHN0ZC55KCkgKiBnYXVzc2lhbktlcm5lbEZhY3RvcigpICsg MC41ZikpKTsKKyAgICAgICAga2VybmVsU2l6ZS5zZXRIZWlnaHQoc3RkOjptaW4oc2l6ZSwgZ01h eEtlcm5lbFNpemUpKTsKKyAgICB9CisKKyAgICByZXR1cm4ga2VybmVsU2l6ZTsKIH0KIAotdm9p ZCBGRUdhdXNzaWFuQmx1cjo6Y2FsY3VsYXRlS2VybmVsU2l6ZShGaWx0ZXIqIGZpbHRlciwgdW5z aWduZWQmIGtlcm5lbFNpemVYLCB1bnNpZ25lZCYga2VybmVsU2l6ZVksIGZsb2F0IHN0ZFgsIGZs b2F0IHN0ZFkpCitJbnRTaXplIEZFR2F1c3NpYW5CbHVyOjpjYWxjdWxhdGVLZXJuZWxTaXplKEZp bHRlciogZmlsdGVyLCBmbG9hdCBzdGRYLCBmbG9hdCBzdGRZKQogewogICAgIHN0ZFggPSBmaWx0 ZXItPmFwcGx5SG9yaXpvbnRhbFNjYWxlKHN0ZFgpOwogICAgIHN0ZFkgPSBmaWx0ZXItPmFwcGx5 VmVydGljYWxTY2FsZShzdGRZKTsKIAotICAgIGNhbGN1bGF0ZVVuc2NhbGVkS2VybmVsU2l6ZShr ZXJuZWxTaXplWCwga2VybmVsU2l6ZVksIHN0ZFgsIHN0ZFkpOworICAgIHJldHVybiBjYWxjdWxh dGVVbnNjYWxlZEtlcm5lbFNpemUoRmxvYXRQb2ludChzdGRYLCBzdGRZKSk7CiB9CiAKIHZvaWQg RkVHYXVzc2lhbkJsdXI6OmRldGVybWluZUFic29sdXRlUGFpbnRSZWN0KCkKIHsKLSAgICB1bnNp Z25lZCBrZXJuZWxTaXplWCA9IDA7Ci0gICAgdW5zaWduZWQga2VybmVsU2l6ZVkgPSAwOwotICAg IGNhbGN1bGF0ZUtlcm5lbFNpemUoZmlsdGVyKCksIGtlcm5lbFNpemVYLCBrZXJuZWxTaXplWSwg bV9zdGRYLCBtX3N0ZFkpOworICAgIEludFNpemUga2VybmVsU2l6ZSA9IGNhbGN1bGF0ZUtlcm5l bFNpemUoZmlsdGVyKCksIG1fc3RkWCwgbV9zdGRZKTsKIAogICAgIEZsb2F0UmVjdCBhYnNvbHV0 ZVBhaW50UmVjdCA9IGlucHV0RWZmZWN0KDApLT5hYnNvbHV0ZVBhaW50UmVjdCgpOwogICAgIC8v IEVkZ2UgbW9kZXMgb3RoZXIgdGhhbiAnbm9uZScgZG8gbm90IGluZmxhdGUgdGhlIGFmZmVjdGVk IHBhaW50IHJlY3QuCkBAIC00MjYsOCArNDI1LDggQEAgdm9pZCBGRUdhdXNzaWFuQmx1cjo6ZGV0 ZXJtaW5lQWJzb2x1dGVQYWludFJlY3QoKQogICAgIH0KIAogICAgIC8vIFdlIHRha2UgdGhlIGhh bGYga2VybmVsIHNpemUgYW5kIG11bHRpcGx5IGl0IHdpdGggdGhyZWUsIGJlY2F1c2Ugd2UgcnVu IGJveCBibHVyIHRocmVlIHRpbWVzLgotICAgIGFic29sdXRlUGFpbnRSZWN0LmluZmxhdGVYKDMg KiBrZXJuZWxTaXplWCAqIDAuNWYpOwotICAgIGFic29sdXRlUGFpbnRSZWN0LmluZmxhdGVZKDMg KiBrZXJuZWxTaXplWSAqIDAuNWYpOworICAgIGFic29sdXRlUGFpbnRSZWN0LmluZmxhdGVYKDMg KiBrZXJuZWxTaXplLndpZHRoKCkgKiAwLjVmKTsKKyAgICBhYnNvbHV0ZVBhaW50UmVjdC5pbmZs YXRlWSgzICoga2VybmVsU2l6ZS5oZWlnaHQoKSAqIDAuNWYpOwogCiAgICAgaWYgKGNsaXBzVG9C b3VuZHMoKSkKICAgICAgICAgYWJzb2x1dGVQYWludFJlY3QuaW50ZXJzZWN0KG1heEVmZmVjdFJl Y3QoKSk7CkBAIC00NTMsMTUgKzQ1MiwxMyBAQCB2b2lkIEZFR2F1c3NpYW5CbHVyOjpwbGF0Zm9y bUFwcGx5U29mdHdhcmUoKQogICAgIGlmICghbV9zdGRYICYmICFtX3N0ZFkpCiAgICAgICAgIHJl dHVybjsKIAotICAgIHVuc2lnbmVkIGtlcm5lbFNpemVYID0gMDsKLSAgICB1bnNpZ25lZCBrZXJu ZWxTaXplWSA9IDA7Ci0gICAgY2FsY3VsYXRlS2VybmVsU2l6ZShmaWx0ZXIoKSwga2VybmVsU2l6 ZVgsIGtlcm5lbFNpemVZLCBtX3N0ZFgsIG1fc3RkWSk7CisgICAgSW50U2l6ZSBrZXJuZWxTaXpl ID0gY2FsY3VsYXRlS2VybmVsU2l6ZShmaWx0ZXIoKSwgbV9zdGRYLCBtX3N0ZFkpOwogCiAgICAg SW50U2l6ZSBwYWludFNpemUgPSBhYnNvbHV0ZVBhaW50UmVjdCgpLnNpemUoKTsKICAgICBSZWZQ dHI8VWludDhDbGFtcGVkQXJyYXk+IHRtcEltYWdlRGF0YSA9IFVpbnQ4Q2xhbXBlZEFycmF5Ojpj cmVhdGVVbmluaXRpYWxpemVkKHBhaW50U2l6ZS53aWR0aCgpICogcGFpbnRTaXplLmhlaWdodCgp ICogNCk7CiAgICAgVWludDhDbGFtcGVkQXJyYXkqIHRtcFBpeGVsQXJyYXkgPSB0bXBJbWFnZURh dGEuZ2V0KCk7CiAKLSAgICBwbGF0Zm9ybUFwcGx5KHNyY1BpeGVsQXJyYXksIHRtcFBpeGVsQXJy YXksIGtlcm5lbFNpemVYLCBrZXJuZWxTaXplWSwgcGFpbnRTaXplKTsKKyAgICBwbGF0Zm9ybUFw cGx5KHNyY1BpeGVsQXJyYXksIHRtcFBpeGVsQXJyYXksIGtlcm5lbFNpemUud2lkdGgoKSwga2Vy bmVsU2l6ZS5oZWlnaHQoKSwgcGFpbnRTaXplKTsKIH0KIAogdm9pZCBGRUdhdXNzaWFuQmx1cjo6 ZHVtcCgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9maWx0 ZXJzL0ZFR2F1c3NpYW5CbHVyLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9m aWx0ZXJzL0ZFR2F1c3NpYW5CbHVyLmgKaW5kZXggYzIyMDQzMDkzNGViNjMyNDgzZWY1ZWFlNTAw YTM4MjcwZDU4ODJlNi4uZGU2NWQ1NzA3Y2UzYWQwYjg0ZWU0NjYzNmM5OGM4MDM0OTE5ODUwZCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZmlsdGVycy9GRUdh dXNzaWFuQmx1ci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2ZpbHRl cnMvRkVHYXVzc2lhbkJsdXIuaApAQCAtNDYsOCArNDYsOCBAQCBwdWJsaWM6CiAgICAgdmlydHVh bCB2b2lkIGR1bXAoKTsKIAogICAgIHZpcnR1YWwgdm9pZCBkZXRlcm1pbmVBYnNvbHV0ZVBhaW50 UmVjdCgpOwotICAgIHN0YXRpYyB2b2lkIGNhbGN1bGF0ZUtlcm5lbFNpemUoRmlsdGVyKiwgdW5z aWduZWQmIGtlcm5lbFNpemVYLCB1bnNpZ25lZCYga2VybmVsU2l6ZVksIGZsb2F0IHN0ZFgsIGZs b2F0IHN0ZFkpOwotICAgIHN0YXRpYyB2b2lkIGNhbGN1bGF0ZVVuc2NhbGVkS2VybmVsU2l6ZSh1 bnNpZ25lZCYga2VybmVsU2l6ZVgsIHVuc2lnbmVkJiBrZXJuZWxTaXplWSwgZmxvYXQgc3RkWCwg ZmxvYXQgc3RkWSk7CisgICAgc3RhdGljIEludFNpemUgY2FsY3VsYXRlS2VybmVsU2l6ZShGaWx0 ZXIqLCBmbG9hdCBzdGRYLCBmbG9hdCBzdGRZKTsKKyAgICBzdGF0aWMgSW50U2l6ZSBjYWxjdWxh dGVVbnNjYWxlZEtlcm5lbFNpemUoRmxvYXRQb2ludCBzdGQpOwogCiAgICAgdmlydHVhbCBUZXh0 U3RyZWFtJiBleHRlcm5hbFJlcHJlc2VudGF0aW9uKFRleHRTdHJlYW0mLCBpbnQgaW5kZW50aW9u KSBjb25zdDsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv ZmlsdGVycy9GaWx0ZXJPcGVyYXRpb25zLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2ZpbHRlcnMvRmlsdGVyT3BlcmF0aW9ucy5jcHAKaW5kZXggNTBmZDhlYzA2ZGY3OWQz YWY2ZmYxNmIxZTg5MjEzZjMzOGFlMTU2OS4uZDZmZDg5OWU5MjdmNTdkMGRmYjFhM2JmMmVkOTg1 N2MwZTMwMWViYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv ZmlsdGVycy9GaWx0ZXJPcGVyYXRpb25zLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9maWx0ZXJzL0ZpbHRlck9wZXJhdGlvbnMuY3BwCkBAIC0zNiwxNCArMzYsMTIg QEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiBzdGF0aWMgaW5saW5lIEludFNpemUgb3V0c2V0U2l6 ZUZvckJsdXIoZmxvYXQgc3RkRGV2aWF0aW9uKQogewotICAgIHVuc2lnbmVkIGtlcm5lbFNpemVY ID0gMDsKLSAgICB1bnNpZ25lZCBrZXJuZWxTaXplWSA9IDA7Ci0gICAgRkVHYXVzc2lhbkJsdXI6 OmNhbGN1bGF0ZVVuc2NhbGVkS2VybmVsU2l6ZShrZXJuZWxTaXplWCwga2VybmVsU2l6ZVksIHN0 ZERldmlhdGlvbiwgc3RkRGV2aWF0aW9uKTsKKyAgICBJbnRTaXplIGtlcm5lbFNpemUgPSBGRUdh dXNzaWFuQmx1cjo6Y2FsY3VsYXRlVW5zY2FsZWRLZXJuZWxTaXplKEZsb2F0UG9pbnQoc3RkRGV2 aWF0aW9uLCBzdGREZXZpYXRpb24pKTsKIAogICAgIEludFNpemUgb3V0c2V0OwogICAgIC8vIFdl IHRha2UgdGhlIGhhbGYga2VybmVsIHNpemUgYW5kIG11bHRpcGx5IGl0IHdpdGggdGhyZWUsIGJl Y2F1c2Ugd2UgcnVuIGJveCBibHVyIHRocmVlIHRpbWVzLgotICAgIG91dHNldC5zZXRXaWR0aCgz ICoga2VybmVsU2l6ZVggKiAwLjVmKTsKLSAgICBvdXRzZXQuc2V0SGVpZ2h0KDMgKiBrZXJuZWxT aXplWSAqIDAuNWYpOworICAgIG91dHNldC5zZXRXaWR0aCgzICoga2VybmVsU2l6ZS53aWR0aCgp ICogMC41Zik7CisgICAgb3V0c2V0LnNldEhlaWdodCgzICoga2VybmVsU2l6ZS5oZWlnaHQoKSAq IDAuNWYpOwogCiAgICAgcmV0dXJuIG91dHNldDsKIH0K 227707 2014-03-24 17:29:58 -0700 2014-03-24 18:14:51 -0700 Patch bug-130695-20140324172936.patch text/plain 9357 savagobr U3VidmVyc2lvbiBSZXZpc2lvbjogMTY2MjA3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTNkZDc2YWU2ZDU2ZWQ0 Njc3ODgwY2I5NDI1NTdlZDVjODA4ODI1MS4uYzRjOTI4OWRlYmU4OGUwMGIzMzIzOGYxMjEzZDY3 ODlhMTRkYjU4NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDE0LTAzLTI0ICBBZGVu aWxzb24gQ2F2YWxjYW50aSAgPGNhdmFsY2FudGlpQGdtYWlsLmNvbT4KKworICAgICAgICBbY29y ZV0gRkVHYXVzc2lhbkJsdXI6IHVzZSBJbnRTaXplIHRvIHNpbXBsaWZ5IG1lbWJlciBmdW5jdGlv biBpbnRlcmZhY2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTEzMDY5NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIEJ5IHJldHVybmluZyBhbiBJbnRTaXplIHRvIHN0b3JlIHRoZSBjYWxjdWxhdGVkIGtlcm5l bCBzaXplIHZhbHVlcworICAgICAgICBpdCBpcyBwb3NzaWJsZSB0byBoYXZlIGxlc3MgZnVuY3Rp b24gcGFyYW1ldGVycy4gVGhpcyBwYXRjaCBhbHNvCisgICAgICAgIHN0cmVhbWxpbmVzIGEgYml0 IHRoZSBjb2RlIGluIGNhbGN1bGF0ZVVuc2NhbGVkS2VybmVsU2l6ZS4KKworICAgICAgICBObyBu ZXcgdGVzdHMsIG5vIGNoYW5nZSBpbiBiZWhhdmlvci4KKworICAgICAgICAqIHBsYXRmb3JtL2dy YXBoaWNzL2ZpbHRlcnMvRkVEcm9wU2hhZG93LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZFRHJv cFNoYWRvdzo6ZGV0ZXJtaW5lQWJzb2x1dGVQYWludFJlY3QpOgorICAgICAgICAqIHBsYXRmb3Jt L2dyYXBoaWNzL2ZpbHRlcnMvRkVHYXVzc2lhbkJsdXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 RkVHYXVzc2lhbkJsdXI6OmNhbGN1bGF0ZVVuc2NhbGVkS2VybmVsU2l6ZSk6CisgICAgICAgIChX ZWJDb3JlOjpGRUdhdXNzaWFuQmx1cjo6Y2FsY3VsYXRlS2VybmVsU2l6ZSk6CisgICAgICAgIChX ZWJDb3JlOjpGRUdhdXNzaWFuQmx1cjo6ZGV0ZXJtaW5lQWJzb2x1dGVQYWludFJlY3QpOgorICAg ICAgICAoV2ViQ29yZTo6RkVHYXVzc2lhbkJsdXI6OnBsYXRmb3JtQXBwbHlTb2Z0d2FyZSk6Cisg ICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZmlsdGVycy9GRUdhdXNzaWFuQmx1ci5oOgorICAg ICAgICAoaWYpOiBEZWxldGVkLgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2ZpbHRlcnMv RmlsdGVyT3BlcmF0aW9ucy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpvdXRzZXRTaXplRm9yQmx1 cik6CisKIDIwMTQtMDMtMjQgIFRoaWFnbyBkZSBCYXJyb3MgTGFjZXJkYSAgPHRoaWFnby5sYWNl cmRhQG9wZW5ib3NzYS5vcmc+CiAKICAgICAgICAgT3B0aW1pemluZyBzdHJpbmcgY29uc3RydWN0 aW9uIGZvciB0eXBlIGVycm9yIGluIEpTTmF2aWdhdG9yQ3VzdG9tLmNwcApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZmlsdGVycy9GRURyb3BTaGFkb3cuY3Bw IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZmlsdGVycy9GRURyb3BTaGFkb3cu Y3BwCmluZGV4IGJkYzk0ZDJkOGRmNjAzMTAwY2NkNGFjOWM3ZjA5NTY0MGQwYjU5ZDIuLmVlYzcz NDVhNTRiYzg0Y2VmNzhjODg5ZTI1ZWMyMmQ2NjYzYWZjMzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2ZpbHRlcnMvRkVEcm9wU2hhZG93LmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9maWx0ZXJzL0ZFRHJvcFNoYWRvdy5jcHAK QEAgLTU4LDE0ICs1OCwxMiBAQCB2b2lkIEZFRHJvcFNoYWRvdzo6ZGV0ZXJtaW5lQWJzb2x1dGVQ YWludFJlY3QoKQogICAgIEZsb2F0UmVjdCBhYnNvbHV0ZU9mZnNldFBhaW50UmVjdChhYnNvbHV0 ZVBhaW50UmVjdCk7CiAgICAgYWJzb2x1dGVPZmZzZXRQYWludFJlY3QubW92ZShmaWx0ZXItPmFw cGx5SG9yaXpvbnRhbFNjYWxlKG1fZHgpLCBmaWx0ZXItPmFwcGx5VmVydGljYWxTY2FsZShtX2R5 KSk7CiAgICAgYWJzb2x1dGVQYWludFJlY3QudW5pdGUoYWJzb2x1dGVPZmZzZXRQYWludFJlY3Qp OwotICAgIAotICAgIHVuc2lnbmVkIGtlcm5lbFNpemVYID0gMDsKLSAgICB1bnNpZ25lZCBrZXJu ZWxTaXplWSA9IDA7Ci0gICAgRkVHYXVzc2lhbkJsdXI6OmNhbGN1bGF0ZUtlcm5lbFNpemUoZmls dGVyLCBrZXJuZWxTaXplWCwga2VybmVsU2l6ZVksIG1fc3RkWCwgbV9zdGRZKTsKLSAgICAKKwor ICAgIEludFNpemUga2VybmVsU2l6ZSA9IEZFR2F1c3NpYW5CbHVyOjpjYWxjdWxhdGVLZXJuZWxT aXplKGZpbHRlciwgbV9zdGRYLCBtX3N0ZFkpOworCiAgICAgLy8gV2UgdGFrZSB0aGUgaGFsZiBr ZXJuZWwgc2l6ZSBhbmQgbXVsdGlwbHkgaXQgd2l0aCB0aHJlZSwgYmVjYXVzZSB3ZSBydW4gYm94 IGJsdXIgdGhyZWUgdGltZXMuCi0gICAgYWJzb2x1dGVQYWludFJlY3QuaW5mbGF0ZVgoMyAqIGtl cm5lbFNpemVYICogMC41Zik7Ci0gICAgYWJzb2x1dGVQYWludFJlY3QuaW5mbGF0ZVkoMyAqIGtl cm5lbFNpemVZICogMC41Zik7CisgICAgYWJzb2x1dGVQYWludFJlY3QuaW5mbGF0ZVgoMyAqIGtl cm5lbFNpemUud2lkdGgoKSAqIDAuNWYpOworICAgIGFic29sdXRlUGFpbnRSZWN0LmluZmxhdGVZ KDMgKiBrZXJuZWxTaXplLmhlaWdodCgpICogMC41Zik7CiAKICAgICBpZiAoY2xpcHNUb0JvdW5k cygpKQogICAgICAgICBhYnNvbHV0ZVBhaW50UmVjdC5pbnRlcnNlY3QobWF4RWZmZWN0UmVjdCgp KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2ZpbHRlcnMv RkVHYXVzc2lhbkJsdXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZmls dGVycy9GRUdhdXNzaWFuQmx1ci5jcHAKaW5kZXggZTM3MTU3NWJiODhhNjM2OTViYzc4ZWZlZjc5 NjZjZGJiZTAxYjI2NC4uMTUwYTM4ZjJlZmJiMjhkY2I3MTk5NWI2NjE0NGEzNDQ4ZWE0YThlZiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZmlsdGVycy9GRUdh dXNzaWFuQmx1ci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZmls dGVycy9GRUdhdXNzaWFuQmx1ci5jcHAKQEAgLTQzLDcgKzQzLDcgQEAgc3RhdGljIGlubGluZSBm bG9hdCBnYXVzc2lhbktlcm5lbEZhY3RvcigpCiAgICAgcmV0dXJuIDMgLyA0LmYgKiBzcXJ0Zigy ICogcGlGbG9hdCk7CiB9CiAKLXN0YXRpYyBjb25zdCB1bnNpZ25lZCBnTWF4S2VybmVsU2l6ZSA9 IDUwMDsKK3N0YXRpYyBjb25zdCBpbnQgZ01heEtlcm5lbFNpemUgPSA1MDA7CiAKIG5hbWVzcGFj ZSBXZWJDb3JlIHsKIApAQCAtMzg1LDM4ICszODUsMzcgQEAgaW5saW5lIHZvaWQgRkVHYXVzc2lh bkJsdXI6OnBsYXRmb3JtQXBwbHkoVWludDhDbGFtcGVkQXJyYXkqIHNyY1BpeGVsQXJyYXksIFVp bnQKICAgICBwbGF0Zm9ybUFwcGx5R2VuZXJpYyhzcmNQaXhlbEFycmF5LCB0bXBQaXhlbEFycmF5 LCBrZXJuZWxTaXplWCwga2VybmVsU2l6ZVksIHBhaW50U2l6ZSk7CiB9CiAKLXZvaWQgRkVHYXVz c2lhbkJsdXI6OmNhbGN1bGF0ZVVuc2NhbGVkS2VybmVsU2l6ZSh1bnNpZ25lZCYga2VybmVsU2l6 ZVgsIHVuc2lnbmVkJiBrZXJuZWxTaXplWSwgZmxvYXQgc3RkWCwgZmxvYXQgc3RkWSkKK0ludFNp emUgRkVHYXVzc2lhbkJsdXI6OmNhbGN1bGF0ZVVuc2NhbGVkS2VybmVsU2l6ZShGbG9hdFBvaW50 IHN0ZCkKIHsKLSAgICBBU1NFUlQoc3RkWCA+PSAwICYmIHN0ZFkgPj0gMCk7Ci0KLSAgICBrZXJu ZWxTaXplWCA9IDA7Ci0gICAgaWYgKHN0ZFgpCi0gICAgICAgIGtlcm5lbFNpemVYID0gc3RkOjpt YXg8dW5zaWduZWQ+KDIsIHN0YXRpY19jYXN0PHVuc2lnbmVkPihmbG9vcmYoc3RkWCAqIGdhdXNz aWFuS2VybmVsRmFjdG9yKCkgKyAwLjVmKSkpOwotICAgIGtlcm5lbFNpemVZID0gMDsKLSAgICBp ZiAoc3RkWSkKLSAgICAgICAga2VybmVsU2l6ZVkgPSBzdGQ6Om1heDx1bnNpZ25lZD4oMiwgc3Rh dGljX2Nhc3Q8dW5zaWduZWQ+KGZsb29yZihzdGRZICogZ2F1c3NpYW5LZXJuZWxGYWN0b3IoKSAr IDAuNWYpKSk7Ci0gICAgCi0gICAgLy8gTGltaXQgdGhlIGtlcm5lbCBzaXplIHRvIDEwMDAuIEEg YmlnZ2VyIHJhZGl1cyB3b24ndCBtYWtlIGEgYmlnIGRpZmZlcmVuY2UgZm9yIHRoZSByZXN1bHQg aW1hZ2UgYnV0CisgICAgQVNTRVJUKHN0ZC54KCkgPj0gMCAmJiBzdGQueSgpID49IDApOworICAg IEludFNpemUga2VybmVsU2l6ZSgwLCAwKTsKKworICAgIC8vIExpbWl0IHRoZSBrZXJuZWwgc2l6 ZSB0byA1MDAuIEEgYmlnZ2VyIHJhZGl1cyB3b24ndCBtYWtlIGEgYmlnIGRpZmZlcmVuY2UgZm9y IHRoZSByZXN1bHQgaW1hZ2UgYnV0CiAgICAgLy8gaW5mbGF0ZXMgdGhlIGFic29sdXRlIHBhaW50 IHJlY3QgdG8gbXVjaC4gVGhpcyBpcyBjb21wYXRpYmxlIHdpdGggRmlyZWZveCcgYmVoYXZpb3Iu Ci0gICAgaWYgKGtlcm5lbFNpemVYID4gZ01heEtlcm5lbFNpemUpCi0gICAgICAgIGtlcm5lbFNp emVYID0gZ01heEtlcm5lbFNpemU7Ci0gICAgaWYgKGtlcm5lbFNpemVZID4gZ01heEtlcm5lbFNp emUpCi0gICAgICAgIGtlcm5lbFNpemVZID0gZ01heEtlcm5lbFNpemU7CisgICAgaWYgKHN0ZC54 KCkpIHsKKyAgICAgICAgaW50IHNpemUgPSBzdGQ6Om1heDx1bnNpZ25lZD4oMiwgc3RhdGljX2Nh c3Q8dW5zaWduZWQ+KGZsb29yZihzdGQueCgpICogZ2F1c3NpYW5LZXJuZWxGYWN0b3IoKSArIDAu NWYpKSk7CisgICAgICAgIGtlcm5lbFNpemUuc2V0V2lkdGgoc3RkOjptaW4oc2l6ZSwgZ01heEtl cm5lbFNpemUpKTsKKyAgICB9CisKKyAgICBpZiAoc3RkLnkoKSkgeworICAgICAgICBpbnQgc2l6 ZSA9IHN0ZDo6bWF4PHVuc2lnbmVkPigyLCBzdGF0aWNfY2FzdDx1bnNpZ25lZD4oZmxvb3JmKHN0 ZC55KCkgKiBnYXVzc2lhbktlcm5lbEZhY3RvcigpICsgMC41ZikpKTsKKyAgICAgICAga2VybmVs U2l6ZS5zZXRIZWlnaHQoc3RkOjptaW4oc2l6ZSwgZ01heEtlcm5lbFNpemUpKTsKKyAgICB9CisK KyAgICByZXR1cm4ga2VybmVsU2l6ZTsKIH0KIAotdm9pZCBGRUdhdXNzaWFuQmx1cjo6Y2FsY3Vs YXRlS2VybmVsU2l6ZShGaWx0ZXIqIGZpbHRlciwgdW5zaWduZWQmIGtlcm5lbFNpemVYLCB1bnNp Z25lZCYga2VybmVsU2l6ZVksIGZsb2F0IHN0ZFgsIGZsb2F0IHN0ZFkpCitJbnRTaXplIEZFR2F1 c3NpYW5CbHVyOjpjYWxjdWxhdGVLZXJuZWxTaXplKEZpbHRlciogZmlsdGVyLCBmbG9hdCBzdGRY LCBmbG9hdCBzdGRZKQogewogICAgIHN0ZFggPSBmaWx0ZXItPmFwcGx5SG9yaXpvbnRhbFNjYWxl KHN0ZFgpOwogICAgIHN0ZFkgPSBmaWx0ZXItPmFwcGx5VmVydGljYWxTY2FsZShzdGRZKTsKIAot ICAgIGNhbGN1bGF0ZVVuc2NhbGVkS2VybmVsU2l6ZShrZXJuZWxTaXplWCwga2VybmVsU2l6ZVks IHN0ZFgsIHN0ZFkpOworICAgIHJldHVybiBjYWxjdWxhdGVVbnNjYWxlZEtlcm5lbFNpemUoRmxv YXRQb2ludChzdGRYLCBzdGRZKSk7CiB9CiAKIHZvaWQgRkVHYXVzc2lhbkJsdXI6OmRldGVybWlu ZUFic29sdXRlUGFpbnRSZWN0KCkKIHsKLSAgICB1bnNpZ25lZCBrZXJuZWxTaXplWCA9IDA7Ci0g ICAgdW5zaWduZWQga2VybmVsU2l6ZVkgPSAwOwotICAgIGNhbGN1bGF0ZUtlcm5lbFNpemUoZmls dGVyKCksIGtlcm5lbFNpemVYLCBrZXJuZWxTaXplWSwgbV9zdGRYLCBtX3N0ZFkpOworICAgIElu dFNpemUga2VybmVsU2l6ZSA9IGNhbGN1bGF0ZUtlcm5lbFNpemUoZmlsdGVyKCksIG1fc3RkWCwg bV9zdGRZKTsKIAogICAgIEZsb2F0UmVjdCBhYnNvbHV0ZVBhaW50UmVjdCA9IGlucHV0RWZmZWN0 KDApLT5hYnNvbHV0ZVBhaW50UmVjdCgpOwogICAgIC8vIEVkZ2UgbW9kZXMgb3RoZXIgdGhhbiAn bm9uZScgZG8gbm90IGluZmxhdGUgdGhlIGFmZmVjdGVkIHBhaW50IHJlY3QuCkBAIC00MjYsOCAr NDI1LDggQEAgdm9pZCBGRUdhdXNzaWFuQmx1cjo6ZGV0ZXJtaW5lQWJzb2x1dGVQYWludFJlY3Qo KQogICAgIH0KIAogICAgIC8vIFdlIHRha2UgdGhlIGhhbGYga2VybmVsIHNpemUgYW5kIG11bHRp cGx5IGl0IHdpdGggdGhyZWUsIGJlY2F1c2Ugd2UgcnVuIGJveCBibHVyIHRocmVlIHRpbWVzLgot ICAgIGFic29sdXRlUGFpbnRSZWN0LmluZmxhdGVYKDMgKiBrZXJuZWxTaXplWCAqIDAuNWYpOwot ICAgIGFic29sdXRlUGFpbnRSZWN0LmluZmxhdGVZKDMgKiBrZXJuZWxTaXplWSAqIDAuNWYpOwor ICAgIGFic29sdXRlUGFpbnRSZWN0LmluZmxhdGVYKDMgKiBrZXJuZWxTaXplLndpZHRoKCkgKiAw LjVmKTsKKyAgICBhYnNvbHV0ZVBhaW50UmVjdC5pbmZsYXRlWSgzICoga2VybmVsU2l6ZS5oZWln aHQoKSAqIDAuNWYpOwogCiAgICAgaWYgKGNsaXBzVG9Cb3VuZHMoKSkKICAgICAgICAgYWJzb2x1 dGVQYWludFJlY3QuaW50ZXJzZWN0KG1heEVmZmVjdFJlY3QoKSk7CkBAIC00NTMsMTUgKzQ1Miwx MyBAQCB2b2lkIEZFR2F1c3NpYW5CbHVyOjpwbGF0Zm9ybUFwcGx5U29mdHdhcmUoKQogICAgIGlm ICghbV9zdGRYICYmICFtX3N0ZFkpCiAgICAgICAgIHJldHVybjsKIAotICAgIHVuc2lnbmVkIGtl cm5lbFNpemVYID0gMDsKLSAgICB1bnNpZ25lZCBrZXJuZWxTaXplWSA9IDA7Ci0gICAgY2FsY3Vs YXRlS2VybmVsU2l6ZShmaWx0ZXIoKSwga2VybmVsU2l6ZVgsIGtlcm5lbFNpemVZLCBtX3N0ZFgs IG1fc3RkWSk7CisgICAgSW50U2l6ZSBrZXJuZWxTaXplID0gY2FsY3VsYXRlS2VybmVsU2l6ZShm aWx0ZXIoKSwgbV9zdGRYLCBtX3N0ZFkpOwogCiAgICAgSW50U2l6ZSBwYWludFNpemUgPSBhYnNv bHV0ZVBhaW50UmVjdCgpLnNpemUoKTsKICAgICBSZWZQdHI8VWludDhDbGFtcGVkQXJyYXk+IHRt cEltYWdlRGF0YSA9IFVpbnQ4Q2xhbXBlZEFycmF5OjpjcmVhdGVVbmluaXRpYWxpemVkKHBhaW50 U2l6ZS53aWR0aCgpICogcGFpbnRTaXplLmhlaWdodCgpICogNCk7CiAgICAgVWludDhDbGFtcGVk QXJyYXkqIHRtcFBpeGVsQXJyYXkgPSB0bXBJbWFnZURhdGEuZ2V0KCk7CiAKLSAgICBwbGF0Zm9y bUFwcGx5KHNyY1BpeGVsQXJyYXksIHRtcFBpeGVsQXJyYXksIGtlcm5lbFNpemVYLCBrZXJuZWxT aXplWSwgcGFpbnRTaXplKTsKKyAgICBwbGF0Zm9ybUFwcGx5KHNyY1BpeGVsQXJyYXksIHRtcFBp eGVsQXJyYXksIGtlcm5lbFNpemUud2lkdGgoKSwga2VybmVsU2l6ZS5oZWlnaHQoKSwgcGFpbnRT aXplKTsKIH0KIAogdm9pZCBGRUdhdXNzaWFuQmx1cjo6ZHVtcCgpCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9maWx0ZXJzL0ZFR2F1c3NpYW5CbHVyLmggYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9maWx0ZXJzL0ZFR2F1c3NpYW5CbHVyLmgK aW5kZXggYzIyMDQzMDkzNGViNjMyNDgzZWY1ZWFlNTAwYTM4MjcwZDU4ODJlNi4uZGU2NWQ1NzA3 Y2UzYWQwYjg0ZWU0NjYzNmM5OGM4MDM0OTE5ODUwZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvZmlsdGVycy9GRUdhdXNzaWFuQmx1ci5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2ZpbHRlcnMvRkVHYXVzc2lhbkJsdXIuaApAQCAt NDYsOCArNDYsOCBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIGR1bXAoKTsKIAogICAgIHZp cnR1YWwgdm9pZCBkZXRlcm1pbmVBYnNvbHV0ZVBhaW50UmVjdCgpOwotICAgIHN0YXRpYyB2b2lk IGNhbGN1bGF0ZUtlcm5lbFNpemUoRmlsdGVyKiwgdW5zaWduZWQmIGtlcm5lbFNpemVYLCB1bnNp Z25lZCYga2VybmVsU2l6ZVksIGZsb2F0IHN0ZFgsIGZsb2F0IHN0ZFkpOwotICAgIHN0YXRpYyB2 b2lkIGNhbGN1bGF0ZVVuc2NhbGVkS2VybmVsU2l6ZSh1bnNpZ25lZCYga2VybmVsU2l6ZVgsIHVu c2lnbmVkJiBrZXJuZWxTaXplWSwgZmxvYXQgc3RkWCwgZmxvYXQgc3RkWSk7CisgICAgc3RhdGlj IEludFNpemUgY2FsY3VsYXRlS2VybmVsU2l6ZShGaWx0ZXIqLCBmbG9hdCBzdGRYLCBmbG9hdCBz dGRZKTsKKyAgICBzdGF0aWMgSW50U2l6ZSBjYWxjdWxhdGVVbnNjYWxlZEtlcm5lbFNpemUoRmxv YXRQb2ludCBzdGQpOwogCiAgICAgdmlydHVhbCBUZXh0U3RyZWFtJiBleHRlcm5hbFJlcHJlc2Vu dGF0aW9uKFRleHRTdHJlYW0mLCBpbnQgaW5kZW50aW9uKSBjb25zdDsKIApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZmlsdGVycy9GaWx0ZXJPcGVyYXRpb25z LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2ZpbHRlcnMvRmlsdGVyT3Bl cmF0aW9ucy5jcHAKaW5kZXggNTBmZDhlYzA2ZGY3OWQzYWY2ZmYxNmIxZTg5MjEzZjMzOGFlMTU2 OS4uZDZmZDg5OWU5MjdmNTdkMGRmYjFhM2JmMmVkOTg1N2MwZTMwMWViYiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZmlsdGVycy9GaWx0ZXJPcGVyYXRpb25z LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9maWx0ZXJzL0ZpbHRl ck9wZXJhdGlvbnMuY3BwCkBAIC0zNiwxNCArMzYsMTIgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewog CiBzdGF0aWMgaW5saW5lIEludFNpemUgb3V0c2V0U2l6ZUZvckJsdXIoZmxvYXQgc3RkRGV2aWF0 aW9uKQogewotICAgIHVuc2lnbmVkIGtlcm5lbFNpemVYID0gMDsKLSAgICB1bnNpZ25lZCBrZXJu ZWxTaXplWSA9IDA7Ci0gICAgRkVHYXVzc2lhbkJsdXI6OmNhbGN1bGF0ZVVuc2NhbGVkS2VybmVs U2l6ZShrZXJuZWxTaXplWCwga2VybmVsU2l6ZVksIHN0ZERldmlhdGlvbiwgc3RkRGV2aWF0aW9u KTsKKyAgICBJbnRTaXplIGtlcm5lbFNpemUgPSBGRUdhdXNzaWFuQmx1cjo6Y2FsY3VsYXRlVW5z Y2FsZWRLZXJuZWxTaXplKEZsb2F0UG9pbnQoc3RkRGV2aWF0aW9uLCBzdGREZXZpYXRpb24pKTsK IAogICAgIEludFNpemUgb3V0c2V0OwogICAgIC8vIFdlIHRha2UgdGhlIGhhbGYga2VybmVsIHNp emUgYW5kIG11bHRpcGx5IGl0IHdpdGggdGhyZWUsIGJlY2F1c2Ugd2UgcnVuIGJveCBibHVyIHRo cmVlIHRpbWVzLgotICAgIG91dHNldC5zZXRXaWR0aCgzICoga2VybmVsU2l6ZVggKiAwLjVmKTsK LSAgICBvdXRzZXQuc2V0SGVpZ2h0KDMgKiBrZXJuZWxTaXplWSAqIDAuNWYpOworICAgIG91dHNl dC5zZXRXaWR0aCgzICoga2VybmVsU2l6ZS53aWR0aCgpICogMC41Zik7CisgICAgb3V0c2V0LnNl dEhlaWdodCgzICoga2VybmVsU2l6ZS5oZWlnaHQoKSAqIDAuNWYpOwogCiAgICAgcmV0dXJuIG91 dHNldDsKIH0K