93037 2012-08-02 15:50:30 -0700 Remove dependency on LayoutTypes.h from transformation code 2012-08-03 15:00:28 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 93050 1 eae eae eric jamesr leviw webkit.review.bot oldest_to_newest 685925 0 eae 2012-08-02 15:50:30 -0700 TransformationMatrix includes LayoutTypes.h which is in rendering, this is a layering violation and makes using the it outside of rendering complicated. 685931 1 156185 eae 2012-08-02 15:53:49 -0700 Created attachment 156185 Patch 685933 2 156187 eae 2012-08-02 15:55:49 -0700 Created attachment 156187 Patch 685936 3 156187 leviw 2012-08-02 15:56:55 -0700 Comment on attachment 156187 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=156187&action=review > Source/WebCore/ChangeLog:9 > + TransformationMatrix includes LayoutTypes.h which is in rendering, > + this is a layering violation. Remove this dependency as it is no longer Grammar Levi says: This is a run on. Period or conjunction needed :p 685940 4 eae 2012-08-02 16:00:23 -0700 We'll also have to change it not to use MAX_LAYOUT_UNIT... 685972 5 156198 eae 2012-08-02 16:29:55 -0700 Created attachment 156198 Patch 685979 6 156198 leviw 2012-08-02 16:38:42 -0700 Comment on attachment 156198 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=156198&action=review > Source/WebCore/platform/FractionalLayoutUnit.h:188 > + static FractionalLayoutUnit clamp(double value) > + { > + return clampTo<FractionalLayoutUnit>(value, FractionalLayoutUnit::min(), FractionalLayoutUnit::max()); > + } I don't like the duplication of this code here and in LayoutTypes.h. Seems like if this is where this needs to live to prevent layering problems, we should eliminate the version in LayoutTypes. 686005 7 156211 eae 2012-08-02 17:03:07 -0700 Created attachment 156211 Patch 686011 8 156211 leviw 2012-08-02 17:07:55 -0700 Comment on attachment 156211 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=156211&action=review > Source/WebCore/ChangeLog:16 > + * rendering/LayoutTypes.h: > + Remove clampToLayoutUnit > + We don't usually put whitespace here, and this could just be one line. > Source/WebCore/ChangeLog:21 > + Add FractionalLayoutUnit::clamp method that clamps a double to a > + FractionalLayoutUnit. > + Ditto. > Source/WebCore/ChangeLog:27 > + Use clamp/max/min from FractionalLayoutUnit instead of going through > + LayoutUnit abstraction. > + Ditto. 687009 9 156427 eae 2012-08-03 11:54:28 -0700 Created attachment 156427 Patch for landing 687183 10 156427 webkit.review.bot 2012-08-03 15:00:24 -0700 Comment on attachment 156427 Patch for landing Clearing flags on attachment: 156427 Committed r124658: <http://trac.webkit.org/changeset/124658> 687184 11 webkit.review.bot 2012-08-03 15:00:28 -0700 All reviewed patches have been landed. Closing bug. 156185 2012-08-02 15:53:49 -0700 2012-08-02 15:55:47 -0700 Patch bug-93037-20120802155330.patch text/plain 3401 eae SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEyNDUxNykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBACisyMDEyLTA4LTAyICBFbWlsIEEg RWtsdW5kICA8ZWFlQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZW1vdmUgVHJhbnNmb3JtYXRp b25NYXRyaXggZGVwZW5kZW5jeSBvbiBMYXlvdXRUeXBlcy5oCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MzAzNworCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRyYW5zZm9ybWF0aW9uTWF0cml4IGluY2x1ZGVz IExheW91dFR5cGVzLmggd2hpY2ggaXMgaW4gcmVuZGVyaW5nLAorICAgICAgICB0aGlzIGlzIGEg bGF5ZXJpbmcgdmlvbGF0aW9uLiBSZW1vdmUgdGhpcyBkZXBlbmRlbmN5IGFzIGl0IGlzIG5vIGxv bmdlcgorICAgICAgICBuZWVkZWQuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIChPT1BTISkuCisK KyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy90cmFuc2Zvcm1zL1RyYW5zZm9ybWF0aW9uTWF0 cml4LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlRyYW5zZm9ybWF0aW9uTWF0cml4OjpjbGFtcGVk Qm91bmRzT2ZQcm9qZWN0ZWRRdWFkKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy90cmFu c2Zvcm1zL1RyYW5zZm9ybWF0aW9uTWF0cml4Lmg6CisgICAgICAgIChUcmFuc2Zvcm1hdGlvbk1h dHJpeCk6CisgICAgICAgIENoYW5nZSB0eXBlIG9mIGNsYW1wZWRCb3VuZHNPZlByb2plY3RlZFF1 YWQgZnJvbSBMYXlvdXRSZWN0IHRvCisgICAgICAgIEZyYWN0aW9uYWxMYXlvdXRSZWN0IGFzIExh eW91dFJlY3QgbWFwcyB0byBGcmFjdGlvbmFsTGF5b3V0UmVjdCBvbiBhbGwKKyAgICAgICAgcGxh dGZvcm1zLgorCiAyMDEyLTA4LTAyICBBZGFtIEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CiAK ICAgICAgICAgQWRkIGJhY2sgYSBoZWFkZXIgSSBtaXN0YWtlbmx5IHJlbW92ZWQgaW4gbXkgcHJl dmlvdXMgY29tbWl0LgpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdHJh bnNmb3Jtcy9UcmFuc2Zvcm1hdGlvbk1hdHJpeC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdHJhbnNmb3Jtcy9UcmFuc2Zvcm1hdGlvbk1hdHJpeC5j cHAJKHJldmlzaW9uIDEyNDUxNikKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L3RyYW5zZm9ybXMvVHJhbnNmb3JtYXRpb25NYXRyaXguY3BwCSh3b3JraW5nIGNvcHkpCkBAIC02 MTcsNyArNjE3LDcgQEAgc3RhdGljIGZsb2F0IGNsYW1wRWRnZVZhbHVlKGZsb2F0IGYpCiAgICAg cmV0dXJuIG1pbjxmbG9hdD4obWF4PGZsb2F0PihmLCAtTUFYX0xBWU9VVF9VTklUIC8gMiksIE1B WF9MQVlPVVRfVU5JVCAvIDIpOwogfQogCi1MYXlvdXRSZWN0IFRyYW5zZm9ybWF0aW9uTWF0cml4 OjpjbGFtcGVkQm91bmRzT2ZQcm9qZWN0ZWRRdWFkKGNvbnN0IEZsb2F0UXVhZCYgcSkgY29uc3QK K0ZyYWN0aW9uYWxMYXlvdXRSZWN0IFRyYW5zZm9ybWF0aW9uTWF0cml4OjpjbGFtcGVkQm91bmRz T2ZQcm9qZWN0ZWRRdWFkKGNvbnN0IEZsb2F0UXVhZCYgcSkgY29uc3QKIHsKICAgICBGbG9hdFJl Y3QgbWFwcGVkUXVhZEJvdW5kcyA9IHByb2plY3RRdWFkKHEpLmJvdW5kaW5nQm94KCk7CiAKQEAg LTYzNiw4ICs2MzYsOCBAQCBMYXlvdXRSZWN0IFRyYW5zZm9ybWF0aW9uTWF0cml4OjpjbGFtcGVk CiAgICAgZWxzZQogICAgICAgICBib3R0b20gPSBjbGFtcEVkZ2VWYWx1ZShjZWlsZihtYXBwZWRR dWFkQm91bmRzLm1heFkoKSkpOwogICAgIAotICAgIHJldHVybiBMYXlvdXRSZWN0KGNsYW1wVG9M YXlvdXRVbml0KGxlZnQpLCBjbGFtcFRvTGF5b3V0VW5pdCh0b3ApLCAKLSAgICAgICAgICAgICAg ICAgICAgICBjbGFtcFRvTGF5b3V0VW5pdChyaWdodCAtIGxlZnQpLCBjbGFtcFRvTGF5b3V0VW5p dChib3R0b20gLSB0b3ApKTsKKyAgICByZXR1cm4gRnJhY3Rpb25hbExheW91dFJlY3QoY2xhbXBU b0xheW91dFVuaXQobGVmdCksIGNsYW1wVG9MYXlvdXRVbml0KHRvcCksIAorICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBjbGFtcFRvTGF5b3V0VW5pdChyaWdodCAtIGxlZnQpLCBjbGFt cFRvTGF5b3V0VW5pdChib3R0b20gLSB0b3ApKTsKIH0KIAogRmxvYXRQb2ludCBUcmFuc2Zvcm1h dGlvbk1hdHJpeDo6bWFwUG9pbnQoY29uc3QgRmxvYXRQb2ludCYgcCkgY29uc3QKSW5kZXg6IFNv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RyYW5zZm9ybXMvVHJhbnNmb3JtYXRpb25N YXRyaXguaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90 cmFuc2Zvcm1zL1RyYW5zZm9ybWF0aW9uTWF0cml4LmgJKHJldmlzaW9uIDEyNDUxNikKKysrIFNv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RyYW5zZm9ybXMvVHJhbnNmb3JtYXRpb25N YXRyaXguaAkod29ya2luZyBjb3B5KQpAQCAtMjgsNyArMjgsNiBAQAogCiAjaW5jbHVkZSAiRmxv YXRQb2ludC5oIgogI2luY2x1ZGUgIkludFBvaW50LmgiCi0jaW5jbHVkZSAiTGF5b3V0VHlwZXMu aCIKICNpbmNsdWRlIDxzdHJpbmcuaD4gLy9mb3IgbWVtY3B5CiAjaW5jbHVkZSA8d3RmL0Zhc3RB bGxvY0Jhc2UuaD4KIApAQCAtMTY3LDcgKzE2Niw3IEBAIHB1YmxpYzoKICAgICBGbG9hdFF1YWQg cHJvamVjdFF1YWQoY29uc3QgRmxvYXRRdWFkJikgY29uc3Q7CiAgICAgLy8gUHJvamVjdHMgdGhl IGZvdXIgY29ybmVycyBvZiB0aGUgcXVhZCBhbmQgdGFrZXMgYSBib3VuZGluZyBib3gsCiAgICAg Ly8gd2hpbGUgc2FuaXRpemluZyB2YWx1ZXMgY3JlYXRlZCB3aGVuIHRoZSB3IGNvbXBvbmVudCBp cyBuZWdhdGl2ZS4KLSAgICBMYXlvdXRSZWN0IGNsYW1wZWRCb3VuZHNPZlByb2plY3RlZFF1YWQo Y29uc3QgRmxvYXRRdWFkJikgY29uc3Q7CisgICAgRnJhY3Rpb25hbExheW91dFJlY3QgY2xhbXBl ZEJvdW5kc09mUHJvamVjdGVkUXVhZChjb25zdCBGbG9hdFF1YWQmKSBjb25zdDsKIAogICAgIGRv dWJsZSBtMTEoKSBjb25zdCB7IHJldHVybiBtX21hdHJpeFswXVswXTsgfQogICAgIHZvaWQgc2V0 TTExKGRvdWJsZSBmKSB7IG1fbWF0cml4WzBdWzBdID0gZjsgfQo= 156187 2012-08-02 15:55:49 -0700 2012-08-02 16:01:33 -0700 Patch bug-93037-20120802155530.patch text/plain 3421 eae SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEyNDUxNykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBACisyMDEyLTA4LTAyICBFbWlsIEEg RWtsdW5kICA8ZWFlQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZW1vdmUgVHJhbnNmb3JtYXRp b25NYXRyaXggZGVwZW5kZW5jeSBvbiBMYXlvdXRUeXBlcy5oCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MzAzNworCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRyYW5zZm9ybWF0aW9uTWF0cml4IGluY2x1ZGVz IExheW91dFR5cGVzLmggd2hpY2ggaXMgaW4gcmVuZGVyaW5nLAorICAgICAgICB0aGlzIGlzIGEg bGF5ZXJpbmcgdmlvbGF0aW9uLiBSZW1vdmUgdGhpcyBkZXBlbmRlbmN5IGFzIGl0IGlzIG5vIGxv bmdlcgorICAgICAgICBuZWVkZWQuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBubyBjaGFuZ2Ug aW4gZnVuY3Rpb25hbGl0eS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3RyYW5zZm9y bXMvVHJhbnNmb3JtYXRpb25NYXRyaXguY3BwOgorICAgICAgICAoV2ViQ29yZTo6VHJhbnNmb3Jt YXRpb25NYXRyaXg6OmNsYW1wZWRCb3VuZHNPZlByb2plY3RlZFF1YWQpOgorICAgICAgICAqIHBs YXRmb3JtL2dyYXBoaWNzL3RyYW5zZm9ybXMvVHJhbnNmb3JtYXRpb25NYXRyaXguaDoKKyAgICAg ICAgKFRyYW5zZm9ybWF0aW9uTWF0cml4KToKKyAgICAgICAgQ2hhbmdlIHR5cGUgb2YgY2xhbXBl ZEJvdW5kc09mUHJvamVjdGVkUXVhZCBmcm9tIExheW91dFJlY3QgdG8KKyAgICAgICAgRnJhY3Rp b25hbExheW91dFJlY3QgYXMgTGF5b3V0UmVjdCBtYXBzIHRvIEZyYWN0aW9uYWxMYXlvdXRSZWN0 IG9uIGFsbAorICAgICAgICBwbGF0Zm9ybXMuCisKIDIwMTItMDgtMDIgIEFkYW0gQmFydGggIDxh YmFydGhAd2Via2l0Lm9yZz4KIAogICAgICAgICBBZGQgYmFjayBhIGhlYWRlciBJIG1pc3Rha2Vu bHkgcmVtb3ZlZCBpbiBteSBwcmV2aW91cyBjb21taXQuCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy90cmFuc2Zvcm1zL1RyYW5zZm9ybWF0aW9uTWF0cml4LmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90cmFuc2Zvcm1zL1Ry YW5zZm9ybWF0aW9uTWF0cml4LmNwcAkocmV2aXNpb24gMTI0NTE2KQorKysgU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvdHJhbnNmb3Jtcy9UcmFuc2Zvcm1hdGlvbk1hdHJpeC5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTYxNyw3ICs2MTcsNyBAQCBzdGF0aWMgZmxvYXQgY2xhbXBFZGdl VmFsdWUoZmxvYXQgZikKICAgICByZXR1cm4gbWluPGZsb2F0PihtYXg8ZmxvYXQ+KGYsIC1NQVhf TEFZT1VUX1VOSVQgLyAyKSwgTUFYX0xBWU9VVF9VTklUIC8gMik7CiB9CiAKLUxheW91dFJlY3Qg VHJhbnNmb3JtYXRpb25NYXRyaXg6OmNsYW1wZWRCb3VuZHNPZlByb2plY3RlZFF1YWQoY29uc3Qg RmxvYXRRdWFkJiBxKSBjb25zdAorRnJhY3Rpb25hbExheW91dFJlY3QgVHJhbnNmb3JtYXRpb25N YXRyaXg6OmNsYW1wZWRCb3VuZHNPZlByb2plY3RlZFF1YWQoY29uc3QgRmxvYXRRdWFkJiBxKSBj b25zdAogewogICAgIEZsb2F0UmVjdCBtYXBwZWRRdWFkQm91bmRzID0gcHJvamVjdFF1YWQocSku Ym91bmRpbmdCb3goKTsKIApAQCAtNjM2LDggKzYzNiw4IEBAIExheW91dFJlY3QgVHJhbnNmb3Jt YXRpb25NYXRyaXg6OmNsYW1wZWQKICAgICBlbHNlCiAgICAgICAgIGJvdHRvbSA9IGNsYW1wRWRn ZVZhbHVlKGNlaWxmKG1hcHBlZFF1YWRCb3VuZHMubWF4WSgpKSk7CiAgICAgCi0gICAgcmV0dXJu IExheW91dFJlY3QoY2xhbXBUb0xheW91dFVuaXQobGVmdCksIGNsYW1wVG9MYXlvdXRVbml0KHRv cCksIAotICAgICAgICAgICAgICAgICAgICAgIGNsYW1wVG9MYXlvdXRVbml0KHJpZ2h0IC0gbGVm dCksIGNsYW1wVG9MYXlvdXRVbml0KGJvdHRvbSAtIHRvcCkpOworICAgIHJldHVybiBGcmFjdGlv bmFsTGF5b3V0UmVjdChjbGFtcFRvTGF5b3V0VW5pdChsZWZ0KSwgY2xhbXBUb0xheW91dFVuaXQo dG9wKSwgCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNsYW1wVG9MYXlvdXRVbml0 KHJpZ2h0IC0gbGVmdCksIGNsYW1wVG9MYXlvdXRVbml0KGJvdHRvbSAtIHRvcCkpOwogfQogCiBG bG9hdFBvaW50IFRyYW5zZm9ybWF0aW9uTWF0cml4OjptYXBQb2ludChjb25zdCBGbG9hdFBvaW50 JiBwKSBjb25zdApJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdHJhbnNm b3Jtcy9UcmFuc2Zvcm1hdGlvbk1hdHJpeC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL3RyYW5zZm9ybXMvVHJhbnNmb3JtYXRpb25NYXRyaXguaAkocmV2 aXNpb24gMTI0NTE2KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdHJhbnNm b3Jtcy9UcmFuc2Zvcm1hdGlvbk1hdHJpeC5oCSh3b3JraW5nIGNvcHkpCkBAIC0yOCw3ICsyOCw2 IEBACiAKICNpbmNsdWRlICJGbG9hdFBvaW50LmgiCiAjaW5jbHVkZSAiSW50UG9pbnQuaCIKLSNp bmNsdWRlICJMYXlvdXRUeXBlcy5oIgogI2luY2x1ZGUgPHN0cmluZy5oPiAvL2ZvciBtZW1jcHkK ICNpbmNsdWRlIDx3dGYvRmFzdEFsbG9jQmFzZS5oPgogCkBAIC0xNjcsNyArMTY2LDcgQEAgcHVi bGljOgogICAgIEZsb2F0UXVhZCBwcm9qZWN0UXVhZChjb25zdCBGbG9hdFF1YWQmKSBjb25zdDsK ICAgICAvLyBQcm9qZWN0cyB0aGUgZm91ciBjb3JuZXJzIG9mIHRoZSBxdWFkIGFuZCB0YWtlcyBh IGJvdW5kaW5nIGJveCwKICAgICAvLyB3aGlsZSBzYW5pdGl6aW5nIHZhbHVlcyBjcmVhdGVkIHdo ZW4gdGhlIHcgY29tcG9uZW50IGlzIG5lZ2F0aXZlLgotICAgIExheW91dFJlY3QgY2xhbXBlZEJv dW5kc09mUHJvamVjdGVkUXVhZChjb25zdCBGbG9hdFF1YWQmKSBjb25zdDsKKyAgICBGcmFjdGlv bmFsTGF5b3V0UmVjdCBjbGFtcGVkQm91bmRzT2ZQcm9qZWN0ZWRRdWFkKGNvbnN0IEZsb2F0UXVh ZCYpIGNvbnN0OwogCiAgICAgZG91YmxlIG0xMSgpIGNvbnN0IHsgcmV0dXJuIG1fbWF0cml4WzBd WzBdOyB9CiAgICAgdm9pZCBzZXRNMTEoZG91YmxlIGYpIHsgbV9tYXRyaXhbMF1bMF0gPSBmOyB9 Cg== 156198 2012-08-02 16:29:55 -0700 2012-08-02 17:03:05 -0700 Patch bug-93037-20120802162936.patch text/plain 6728 eae SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEyNDUyNykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMzIEBACisyMDEyLTA4LTAyICBFbWlsIEEg RWtsdW5kICA8ZWFlQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZW1vdmUgZGVwZW5kZW5jeSBv biBMYXlvdXRUeXBlcy5oIGZyb20gdHJhbnNmb3JtYXRpb24gY29kZQorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTMwMzcKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUcmFuc2Zvcm1hdGlvbk1hdHJpeCBhbmQg SGl0VGVzdGluZ1RyYW5zZm9ybVN0YXRlIGluY2x1ZGVzIExheW91dFR5cGVzLmgKKyAgICAgICAg d2hpY2ggaXMgaW4gcmVuZGVyaW5nLiBUaGlzIGlzIGEgbGF5ZXJpbmcgdmlvbGF0aW9uLgorICAg ICAgICBSZW1vdmUgdGhpcyBkZXBlbmRlbmN5IGFzIGl0IGlzIG5vIGxvbmdlciBuZWVkZWQuCisK KyAgICAgICAgTm8gbmV3IHRlc3RzLCBubyBjaGFuZ2UgaW4gZnVuY3Rpb25hbGl0eS4KKworICAg ICAgICAqIHBsYXRmb3JtL0ZyYWN0aW9uYWxMYXlvdXRVbml0Lmg6CisgICAgICAgIChXZWJDb3Jl OjpGcmFjdGlvbmFsTGF5b3V0VW5pdDo6Y2xhbXApOgorICAgICAgICBBZGQgRnJhY3Rpb25hbExh eW91dFVuaXQ6OmNsYW1wIG1ldGhvZCB0aGF0IGNsYW1wcyBhIGRvdWJsZSB0byBhCisgICAgICAg IEZyYWN0aW9uYWxMYXlvdXRVbml0LgorICAgICAgICAKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFw aGljcy90cmFuc2Zvcm1zL1RyYW5zZm9ybWF0aW9uTWF0cml4LmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OmNsYW1wRWRnZVZhbHVlKToKKyAgICAgICAgKFdlYkNvcmU6OlRyYW5zZm9ybWF0aW9uTWF0 cml4OjpjbGFtcGVkQm91bmRzT2ZQcm9qZWN0ZWRRdWFkKToKKyAgICAgICAgVXNlIGNsYW1wL21h eC9taW4gZnJvbSBGcmFjdGlvbmFsTGF5b3V0VW5pdCBpbnN0ZWFkIG9mIGdvaW5nIHRocm91Z2gK KyAgICAgICAgTGF5b3V0VW5pdCBhYnN0cmFjdGlvbi4KKyAgICAgICAgCisgICAgICAgICogcGxh dGZvcm0vZ3JhcGhpY3MvdHJhbnNmb3Jtcy9UcmFuc2Zvcm1hdGlvbk1hdHJpeC5oOgorICAgICAg ICAqIHJlbmRlcmluZy9IaXRUZXN0aW5nVHJhbnNmb3JtU3RhdGUuY3BwOgorICAgICAgICAqIHJl bmRlcmluZy9IaXRUZXN0aW5nVHJhbnNmb3JtU3RhdGUuaDoKKyAgICAgICAgUmVwbGFjZSB1c2Ug b2YgTGF5b3V0UmVjdCB3aXRoIEZyYWN0aW9uYWxMYXlvdXRSZWN0IGFzIExheW91dFJlY3QgbWFw cyB0bworICAgICAgICBGcmFjdGlvbmFsTGF5b3V0UmVjdCBvbiBhbGwgcGxhdGZvcm1zLgorCiAy MDEyLTA4LTAyICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgogCiAgICAgICAgIHNj cmlwdHMgaW4gZm9ybWFjdGlvbiBzaG91bGQgYmUgc3RyaXBwZWQgdXBvbiBwYXN0ZQpJbmRleDog U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vRnJhY3Rpb25hbExheW91dFVuaXQuaAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9GcmFjdGlvbmFsTGF5b3V0VW5pdC5oCShyZXZp c2lvbiAxMjQ1MTYpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9GcmFjdGlvbmFsTGF5b3V0 VW5pdC5oCSh3b3JraW5nIGNvcHkpCkBAIC0zNSw2ICszNSw3IEBACiAjaW5jbHVkZSA8bGltaXRz PgogI2luY2x1ZGUgPG1hdGguaD4KICNpbmNsdWRlIDxzdGRsaWIuaD4KKyNpbmNsdWRlIDx3dGYv TWF0aEV4dHJhcy5oPgogCiAjaWYgUExBVEZPUk0oUVQpCiAjaW5jbHVkZSA8UURhdGFTdHJlYW0+ CkBAIC0xODEsNiArMTgyLDEwIEBAIHB1YmxpYzoKICAgICAgICAgbS5tX3ZhbHVlID0gc3RkOjpu dW1lcmljX2xpbWl0czxpbnQ+OjptaW4oKTsKICAgICAgICAgcmV0dXJuIG07CiAgICAgfQorICAg IHN0YXRpYyBGcmFjdGlvbmFsTGF5b3V0VW5pdCBjbGFtcChkb3VibGUgdmFsdWUpCisgICAgewor ICAgICAgICByZXR1cm4gY2xhbXBUbzxGcmFjdGlvbmFsTGF5b3V0VW5pdD4odmFsdWUsIEZyYWN0 aW9uYWxMYXlvdXRVbml0OjptaW4oKSwgRnJhY3Rpb25hbExheW91dFVuaXQ6Om1heCgpKTsKKyAg ICB9CiAgICAgCiBwcml2YXRlOgogICAgIHN0YXRpYyBib29sIGlzSW5Cb3VuZHMoaW50IHZhbHVl KQpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdHJhbnNmb3Jtcy9UcmFu c2Zvcm1hdGlvbk1hdHJpeC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvdHJhbnNmb3Jtcy9UcmFuc2Zvcm1hdGlvbk1hdHJpeC5jcHAJKHJldmlzaW9u IDEyNDUxNikKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RyYW5zZm9ybXMv VHJhbnNmb3JtYXRpb25NYXRyaXguY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yOCw3ICsyOCw2IEBA CiAjaW5jbHVkZSAiVHJhbnNmb3JtYXRpb25NYXRyaXguaCIKIAogI2luY2x1ZGUgIkFmZmluZVRy YW5zZm9ybS5oIgotI2luY2x1ZGUgIkZyYWN0aW9uYWxMYXlvdXRSZWN0LmgiCiAjaW5jbHVkZSAi RmxvYXRQb2ludDNELmgiCiAjaW5jbHVkZSAiRmxvYXRSZWN0LmgiCiAjaW5jbHVkZSAiRmxvYXRR dWFkLmgiCkBAIC02MTQsMTAgKzYxMywxMCBAQCBGbG9hdFF1YWQgVHJhbnNmb3JtYXRpb25NYXRy aXg6OnByb2plY3RRCiBzdGF0aWMgZmxvYXQgY2xhbXBFZGdlVmFsdWUoZmxvYXQgZikKIHsKICAg ICBBU1NFUlQoIWlzbmFuKGYpKTsKLSAgICByZXR1cm4gbWluPGZsb2F0PihtYXg8ZmxvYXQ+KGYs IC1NQVhfTEFZT1VUX1VOSVQgLyAyKSwgTUFYX0xBWU9VVF9VTklUIC8gMik7CisgICAgcmV0dXJu IG1pbjxmbG9hdD4obWF4PGZsb2F0PihmLCAtRnJhY3Rpb25hbExheW91dFVuaXQ6Om1heCgpIC8g MiksIEZyYWN0aW9uYWxMYXlvdXRVbml0OjptYXgoKSAvIDIpOwogfQogCi1MYXlvdXRSZWN0IFRy YW5zZm9ybWF0aW9uTWF0cml4OjpjbGFtcGVkQm91bmRzT2ZQcm9qZWN0ZWRRdWFkKGNvbnN0IEZs b2F0UXVhZCYgcSkgY29uc3QKK0ZyYWN0aW9uYWxMYXlvdXRSZWN0IFRyYW5zZm9ybWF0aW9uTWF0 cml4OjpjbGFtcGVkQm91bmRzT2ZQcm9qZWN0ZWRRdWFkKGNvbnN0IEZsb2F0UXVhZCYgcSkgY29u c3QKIHsKICAgICBGbG9hdFJlY3QgbWFwcGVkUXVhZEJvdW5kcyA9IHByb2plY3RRdWFkKHEpLmJv dW5kaW5nQm94KCk7CiAKQEAgLTYyNiwxOCArNjI1LDE4IEBAIExheW91dFJlY3QgVHJhbnNmb3Jt YXRpb25NYXRyaXg6OmNsYW1wZWQKIAogICAgIGZsb2F0IHJpZ2h0OwogICAgIGlmIChpc2luZiht YXBwZWRRdWFkQm91bmRzLngoKSkgJiYgaXNpbmYobWFwcGVkUXVhZEJvdW5kcy53aWR0aCgpKSkK LSAgICAgICAgcmlnaHQgPSBNQVhfTEFZT1VUX1VOSVQgLyAyOworICAgICAgICByaWdodCA9IEZy YWN0aW9uYWxMYXlvdXRVbml0OjptYXgoKSAvIDI7CiAgICAgZWxzZQogICAgICAgICByaWdodCA9 IGNsYW1wRWRnZVZhbHVlKGNlaWxmKG1hcHBlZFF1YWRCb3VuZHMubWF4WCgpKSk7CiAKICAgICBm bG9hdCBib3R0b207CiAgICAgaWYgKGlzaW5mKG1hcHBlZFF1YWRCb3VuZHMueSgpKSAmJiBpc2lu ZihtYXBwZWRRdWFkQm91bmRzLmhlaWdodCgpKSkKLSAgICAgICAgYm90dG9tID0gTUFYX0xBWU9V VF9VTklUIC8gMjsKKyAgICAgICAgYm90dG9tID0gRnJhY3Rpb25hbExheW91dFVuaXQ6Om1heCgp IC8gMjsKICAgICBlbHNlCiAgICAgICAgIGJvdHRvbSA9IGNsYW1wRWRnZVZhbHVlKGNlaWxmKG1h cHBlZFF1YWRCb3VuZHMubWF4WSgpKSk7Ci0gICAgCi0gICAgcmV0dXJuIExheW91dFJlY3QoY2xh bXBUb0xheW91dFVuaXQobGVmdCksIGNsYW1wVG9MYXlvdXRVbml0KHRvcCksIAotICAgICAgICAg ICAgICAgICAgICAgIGNsYW1wVG9MYXlvdXRVbml0KHJpZ2h0IC0gbGVmdCksIGNsYW1wVG9MYXlv dXRVbml0KGJvdHRvbSAtIHRvcCkpOworCisgICAgcmV0dXJuIEZyYWN0aW9uYWxMYXlvdXRSZWN0 KEZyYWN0aW9uYWxMYXlvdXRVbml0OjpjbGFtcChsZWZ0KSwgRnJhY3Rpb25hbExheW91dFVuaXQ6 OmNsYW1wKHRvcCksIAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBGcmFjdGlvbmFs TGF5b3V0VW5pdDo6Y2xhbXAocmlnaHQgLSBsZWZ0KSwgRnJhY3Rpb25hbExheW91dFVuaXQ6OmNs YW1wKGJvdHRvbSAtIHRvcCkpOwogfQogCiBGbG9hdFBvaW50IFRyYW5zZm9ybWF0aW9uTWF0cml4 OjptYXBQb2ludChjb25zdCBGbG9hdFBvaW50JiBwKSBjb25zdApJbmRleDogU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvdHJhbnNmb3Jtcy9UcmFuc2Zvcm1hdGlvbk1hdHJpeC5oCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RyYW5zZm9ybXMv VHJhbnNmb3JtYXRpb25NYXRyaXguaAkocmV2aXNpb24gMTI0NTE2KQorKysgU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvdHJhbnNmb3Jtcy9UcmFuc2Zvcm1hdGlvbk1hdHJpeC5oCSh3 b3JraW5nIGNvcHkpCkBAIC0yNyw4ICsyNyw4IEBACiAjZGVmaW5lIFRyYW5zZm9ybWF0aW9uTWF0 cml4X2gKIAogI2luY2x1ZGUgIkZsb2F0UG9pbnQuaCIKKyNpbmNsdWRlICJGcmFjdGlvbmFsTGF5 b3V0UmVjdC5oIgogI2luY2x1ZGUgIkludFBvaW50LmgiCi0jaW5jbHVkZSAiTGF5b3V0VHlwZXMu aCIKICNpbmNsdWRlIDxzdHJpbmcuaD4gLy9mb3IgbWVtY3B5CiAjaW5jbHVkZSA8d3RmL0Zhc3RB bGxvY0Jhc2UuaD4KIApAQCAtMTY3LDcgKzE2Nyw3IEBAIHB1YmxpYzoKICAgICBGbG9hdFF1YWQg cHJvamVjdFF1YWQoY29uc3QgRmxvYXRRdWFkJikgY29uc3Q7CiAgICAgLy8gUHJvamVjdHMgdGhl IGZvdXIgY29ybmVycyBvZiB0aGUgcXVhZCBhbmQgdGFrZXMgYSBib3VuZGluZyBib3gsCiAgICAg Ly8gd2hpbGUgc2FuaXRpemluZyB2YWx1ZXMgY3JlYXRlZCB3aGVuIHRoZSB3IGNvbXBvbmVudCBp cyBuZWdhdGl2ZS4KLSAgICBMYXlvdXRSZWN0IGNsYW1wZWRCb3VuZHNPZlByb2plY3RlZFF1YWQo Y29uc3QgRmxvYXRRdWFkJikgY29uc3Q7CisgICAgRnJhY3Rpb25hbExheW91dFJlY3QgY2xhbXBl ZEJvdW5kc09mUHJvamVjdGVkUXVhZChjb25zdCBGbG9hdFF1YWQmKSBjb25zdDsKIAogICAgIGRv dWJsZSBtMTEoKSBjb25zdCB7IHJldHVybiBtX21hdHJpeFswXVswXTsgfQogICAgIHZvaWQgc2V0 TTExKGRvdWJsZSBmKSB7IG1fbWF0cml4WzBdWzBdID0gZjsgfQpJbmRleDogU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL0hpdFRlc3RpbmdUcmFuc2Zvcm1TdGF0ZS5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0hpdFRlc3RpbmdUcmFuc2Zvcm1TdGF0ZS5jcHAJKHJl dmlzaW9uIDEyNDUxNikKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9IaXRUZXN0aW5nVHJh bnNmb3JtU3RhdGUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC03OSw3ICs3OSw3IEBAIEZsb2F0UXVh ZCBIaXRUZXN0aW5nVHJhbnNmb3JtU3RhdGU6Om1hcHAKICAgICByZXR1cm4gbV9hY2N1bXVsYXRl ZFRyYW5zZm9ybS5pbnZlcnNlKCkucHJvamVjdFF1YWQobV9sYXN0UGxhbmFyQXJlYSk7CiB9CiAK LUxheW91dFJlY3QgSGl0VGVzdGluZ1RyYW5zZm9ybVN0YXRlOjpib3VuZHNPZk1hcHBlZEFyZWEo KSBjb25zdAorRnJhY3Rpb25hbExheW91dFJlY3QgSGl0VGVzdGluZ1RyYW5zZm9ybVN0YXRlOjpi b3VuZHNPZk1hcHBlZEFyZWEoKSBjb25zdAogewogICAgIHJldHVybiBtX2FjY3VtdWxhdGVkVHJh bnNmb3JtLmludmVyc2UoKS5jbGFtcGVkQm91bmRzT2ZQcm9qZWN0ZWRRdWFkKG1fbGFzdFBsYW5h ckFyZWEpOwogfQpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0hpdFRlc3RpbmdUcmFu c2Zvcm1TdGF0ZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9IaXRU ZXN0aW5nVHJhbnNmb3JtU3RhdGUuaAkocmV2aXNpb24gMTI0NTE2KQorKysgU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL0hpdFRlc3RpbmdUcmFuc2Zvcm1TdGF0ZS5oCSh3b3JraW5nIGNvcHkpCkBA IC01OSw3ICs1OSw3IEBAIHB1YmxpYzoKICAgICBGbG9hdFBvaW50IG1hcHBlZFBvaW50KCkgY29u c3Q7CiAgICAgRmxvYXRRdWFkIG1hcHBlZFF1YWQoKSBjb25zdDsKICAgICBGbG9hdFF1YWQgbWFw cGVkQXJlYSgpIGNvbnN0OwotICAgIExheW91dFJlY3QgYm91bmRzT2ZNYXBwZWRBcmVhKCkgY29u c3Q7CisgICAgRnJhY3Rpb25hbExheW91dFJlY3QgYm91bmRzT2ZNYXBwZWRBcmVhKCkgY29uc3Q7 CiAgICAgdm9pZCBmbGF0dGVuKCk7CiAKICAgICBGbG9hdFBvaW50IG1fbGFzdFBsYW5hclBvaW50 Owo= 156211 2012-08-02 17:03:07 -0700 2012-08-03 11:54:24 -0700 Patch bug-93037-20120802170248.patch text/plain 7522 eae SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEyNDUyNykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM2IEBACisyMDEyLTA4LTAyICBFbWlsIEEg RWtsdW5kICA8ZWFlQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZW1vdmUgZGVwZW5kZW5jeSBv biBMYXlvdXRUeXBlcy5oIGZyb20gdHJhbnNmb3JtYXRpb24gY29kZQorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTMwMzcKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUcmFuc2Zvcm1hdGlvbk1hdHJpeCBhbmQg SGl0VGVzdGluZ1RyYW5zZm9ybVN0YXRlIGluY2x1ZGVzIExheW91dFR5cGVzLmgKKyAgICAgICAg d2hpY2ggaXMgaW4gcmVuZGVyaW5nLiBUaGlzIGlzIGEgbGF5ZXJpbmcgdmlvbGF0aW9uLgorICAg ICAgICBSZW1vdmUgdGhpcyBkZXBlbmRlbmN5IGFzIGl0IGlzIG5vIGxvbmdlciBuZWVkZWQuCisK KyAgICAgICAgTm8gbmV3IHRlc3RzLCBubyBjaGFuZ2UgaW4gZnVuY3Rpb25hbGl0eS4KKworICAg ICAgICAqIHJlbmRlcmluZy9MYXlvdXRUeXBlcy5oOgorICAgICAgICBSZW1vdmUgY2xhbXBUb0xh eW91dFVuaXQKKyAgICAgICAgCisgICAgICAgICogcGxhdGZvcm0vRnJhY3Rpb25hbExheW91dFVu aXQuaDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYWN0aW9uYWxMYXlvdXRVbml0OjpjbGFtcCk6Cisg ICAgICAgIEFkZCBGcmFjdGlvbmFsTGF5b3V0VW5pdDo6Y2xhbXAgbWV0aG9kIHRoYXQgY2xhbXBz IGEgZG91YmxlIHRvIGEKKyAgICAgICAgRnJhY3Rpb25hbExheW91dFVuaXQuCisgICAgICAgIAor ICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3RyYW5zZm9ybXMvVHJhbnNmb3JtYXRpb25NYXRy aXguY3BwOgorICAgICAgICAoV2ViQ29yZTo6Y2xhbXBFZGdlVmFsdWUpOgorICAgICAgICAoV2Vi Q29yZTo6VHJhbnNmb3JtYXRpb25NYXRyaXg6OmNsYW1wZWRCb3VuZHNPZlByb2plY3RlZFF1YWQp OgorICAgICAgICBVc2UgY2xhbXAvbWF4L21pbiBmcm9tIEZyYWN0aW9uYWxMYXlvdXRVbml0IGlu c3RlYWQgb2YgZ29pbmcgdGhyb3VnaAorICAgICAgICBMYXlvdXRVbml0IGFic3RyYWN0aW9uLgor ICAgICAgICAKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy90cmFuc2Zvcm1zL1RyYW5zZm9y bWF0aW9uTWF0cml4Lmg6CisgICAgICAgICogcmVuZGVyaW5nL0hpdFRlc3RpbmdUcmFuc2Zvcm1T dGF0ZS5jcHA6CisgICAgICAgICogcmVuZGVyaW5nL0hpdFRlc3RpbmdUcmFuc2Zvcm1TdGF0ZS5o OgorICAgICAgICBSZXBsYWNlIHVzZSBvZiBMYXlvdXRSZWN0IHdpdGggRnJhY3Rpb25hbExheW91 dFJlY3QgYXMgTGF5b3V0UmVjdCBtYXBzIHRvCisgICAgICAgIEZyYWN0aW9uYWxMYXlvdXRSZWN0 IG9uIGFsbCBwbGF0Zm9ybXMuCisKIDIwMTItMDgtMDIgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdl YmtpdC5vcmc+CiAKICAgICAgICAgc2NyaXB0cyBpbiBmb3JtYWN0aW9uIHNob3VsZCBiZSBzdHJp cHBlZCB1cG9uIHBhc3RlCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9GcmFjdGlvbmFs TGF5b3V0VW5pdC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0ZyYWN0 aW9uYWxMYXlvdXRVbml0LmgJKHJldmlzaW9uIDEyNDUxNikKKysrIFNvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL0ZyYWN0aW9uYWxMYXlvdXRVbml0LmgJKHdvcmtpbmcgY29weSkKQEAgLTM1LDYgKzM1 LDcgQEAKICNpbmNsdWRlIDxsaW1pdHM+CiAjaW5jbHVkZSA8bWF0aC5oPgogI2luY2x1ZGUgPHN0 ZGxpYi5oPgorI2luY2x1ZGUgPHd0Zi9NYXRoRXh0cmFzLmg+CiAKICNpZiBQTEFURk9STShRVCkK ICNpbmNsdWRlIDxRRGF0YVN0cmVhbT4KQEAgLTE4MSw2ICsxODIsMTAgQEAgcHVibGljOgogICAg ICAgICBtLm1fdmFsdWUgPSBzdGQ6Om51bWVyaWNfbGltaXRzPGludD46Om1pbigpOwogICAgICAg ICByZXR1cm4gbTsKICAgICB9CisgICAgc3RhdGljIEZyYWN0aW9uYWxMYXlvdXRVbml0IGNsYW1w KGRvdWJsZSB2YWx1ZSkKKyAgICB7CisgICAgICAgIHJldHVybiBjbGFtcFRvPEZyYWN0aW9uYWxM YXlvdXRVbml0Pih2YWx1ZSwgRnJhY3Rpb25hbExheW91dFVuaXQ6Om1pbigpLCBGcmFjdGlvbmFs TGF5b3V0VW5pdDo6bWF4KCkpOworICAgIH0KICAgICAKIHByaXZhdGU6CiAgICAgc3RhdGljIGJv b2wgaXNJbkJvdW5kcyhpbnQgdmFsdWUpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy90cmFuc2Zvcm1zL1RyYW5zZm9ybWF0aW9uTWF0cml4LmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90cmFuc2Zvcm1zL1RyYW5zZm9ybWF0 aW9uTWF0cml4LmNwcAkocmV2aXNpb24gMTI0NTE2KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvdHJhbnNmb3Jtcy9UcmFuc2Zvcm1hdGlvbk1hdHJpeC5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTI4LDcgKzI4LDYgQEAKICNpbmNsdWRlICJUcmFuc2Zvcm1hdGlvbk1hdHJpeC5o IgogCiAjaW5jbHVkZSAiQWZmaW5lVHJhbnNmb3JtLmgiCi0jaW5jbHVkZSAiRnJhY3Rpb25hbExh eW91dFJlY3QuaCIKICNpbmNsdWRlICJGbG9hdFBvaW50M0QuaCIKICNpbmNsdWRlICJGbG9hdFJl Y3QuaCIKICNpbmNsdWRlICJGbG9hdFF1YWQuaCIKQEAgLTYxNCwxMCArNjEzLDEwIEBAIEZsb2F0 UXVhZCBUcmFuc2Zvcm1hdGlvbk1hdHJpeDo6cHJvamVjdFEKIHN0YXRpYyBmbG9hdCBjbGFtcEVk Z2VWYWx1ZShmbG9hdCBmKQogewogICAgIEFTU0VSVCghaXNuYW4oZikpOwotICAgIHJldHVybiBt aW48ZmxvYXQ+KG1heDxmbG9hdD4oZiwgLU1BWF9MQVlPVVRfVU5JVCAvIDIpLCBNQVhfTEFZT1VU X1VOSVQgLyAyKTsKKyAgICByZXR1cm4gbWluPGZsb2F0PihtYXg8ZmxvYXQ+KGYsIC1GcmFjdGlv bmFsTGF5b3V0VW5pdDo6bWF4KCkgLyAyKSwgRnJhY3Rpb25hbExheW91dFVuaXQ6Om1heCgpIC8g Mik7CiB9CiAKLUxheW91dFJlY3QgVHJhbnNmb3JtYXRpb25NYXRyaXg6OmNsYW1wZWRCb3VuZHNP ZlByb2plY3RlZFF1YWQoY29uc3QgRmxvYXRRdWFkJiBxKSBjb25zdAorRnJhY3Rpb25hbExheW91 dFJlY3QgVHJhbnNmb3JtYXRpb25NYXRyaXg6OmNsYW1wZWRCb3VuZHNPZlByb2plY3RlZFF1YWQo Y29uc3QgRmxvYXRRdWFkJiBxKSBjb25zdAogewogICAgIEZsb2F0UmVjdCBtYXBwZWRRdWFkQm91 bmRzID0gcHJvamVjdFF1YWQocSkuYm91bmRpbmdCb3goKTsKIApAQCAtNjI2LDE4ICs2MjUsMTgg QEAgTGF5b3V0UmVjdCBUcmFuc2Zvcm1hdGlvbk1hdHJpeDo6Y2xhbXBlZAogCiAgICAgZmxvYXQg cmlnaHQ7CiAgICAgaWYgKGlzaW5mKG1hcHBlZFF1YWRCb3VuZHMueCgpKSAmJiBpc2luZihtYXBw ZWRRdWFkQm91bmRzLndpZHRoKCkpKQotICAgICAgICByaWdodCA9IE1BWF9MQVlPVVRfVU5JVCAv IDI7CisgICAgICAgIHJpZ2h0ID0gRnJhY3Rpb25hbExheW91dFVuaXQ6Om1heCgpIC8gMjsKICAg ICBlbHNlCiAgICAgICAgIHJpZ2h0ID0gY2xhbXBFZGdlVmFsdWUoY2VpbGYobWFwcGVkUXVhZEJv dW5kcy5tYXhYKCkpKTsKIAogICAgIGZsb2F0IGJvdHRvbTsKICAgICBpZiAoaXNpbmYobWFwcGVk UXVhZEJvdW5kcy55KCkpICYmIGlzaW5mKG1hcHBlZFF1YWRCb3VuZHMuaGVpZ2h0KCkpKQotICAg ICAgICBib3R0b20gPSBNQVhfTEFZT1VUX1VOSVQgLyAyOworICAgICAgICBib3R0b20gPSBGcmFj dGlvbmFsTGF5b3V0VW5pdDo6bWF4KCkgLyAyOwogICAgIGVsc2UKICAgICAgICAgYm90dG9tID0g Y2xhbXBFZGdlVmFsdWUoY2VpbGYobWFwcGVkUXVhZEJvdW5kcy5tYXhZKCkpKTsKLSAgICAKLSAg ICByZXR1cm4gTGF5b3V0UmVjdChjbGFtcFRvTGF5b3V0VW5pdChsZWZ0KSwgY2xhbXBUb0xheW91 dFVuaXQodG9wKSwgCi0gICAgICAgICAgICAgICAgICAgICAgY2xhbXBUb0xheW91dFVuaXQocmln aHQgLSBsZWZ0KSwgY2xhbXBUb0xheW91dFVuaXQoYm90dG9tIC0gdG9wKSk7CisKKyAgICByZXR1 cm4gRnJhY3Rpb25hbExheW91dFJlY3QoRnJhY3Rpb25hbExheW91dFVuaXQ6OmNsYW1wKGxlZnQp LCBGcmFjdGlvbmFsTGF5b3V0VW5pdDo6Y2xhbXAodG9wKSwgCisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIEZyYWN0aW9uYWxMYXlvdXRVbml0OjpjbGFtcChyaWdodCAtIGxlZnQpLCBG cmFjdGlvbmFsTGF5b3V0VW5pdDo6Y2xhbXAoYm90dG9tIC0gdG9wKSk7CiB9CiAKIEZsb2F0UG9p bnQgVHJhbnNmb3JtYXRpb25NYXRyaXg6Om1hcFBvaW50KGNvbnN0IEZsb2F0UG9pbnQmIHApIGNv bnN0CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90cmFuc2Zvcm1zL1Ry YW5zZm9ybWF0aW9uTWF0cml4LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvdHJhbnNmb3Jtcy9UcmFuc2Zvcm1hdGlvbk1hdHJpeC5oCShyZXZpc2lvbiAx MjQ1MTYpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90cmFuc2Zvcm1zL1Ry YW5zZm9ybWF0aW9uTWF0cml4LmgJKHdvcmtpbmcgY29weSkKQEAgLTI3LDggKzI3LDggQEAKICNk ZWZpbmUgVHJhbnNmb3JtYXRpb25NYXRyaXhfaAogCiAjaW5jbHVkZSAiRmxvYXRQb2ludC5oIgor I2luY2x1ZGUgIkZyYWN0aW9uYWxMYXlvdXRSZWN0LmgiCiAjaW5jbHVkZSAiSW50UG9pbnQuaCIK LSNpbmNsdWRlICJMYXlvdXRUeXBlcy5oIgogI2luY2x1ZGUgPHN0cmluZy5oPiAvL2ZvciBtZW1j cHkKICNpbmNsdWRlIDx3dGYvRmFzdEFsbG9jQmFzZS5oPgogCkBAIC0xNjcsNyArMTY3LDcgQEAg cHVibGljOgogICAgIEZsb2F0UXVhZCBwcm9qZWN0UXVhZChjb25zdCBGbG9hdFF1YWQmKSBjb25z dDsKICAgICAvLyBQcm9qZWN0cyB0aGUgZm91ciBjb3JuZXJzIG9mIHRoZSBxdWFkIGFuZCB0YWtl cyBhIGJvdW5kaW5nIGJveCwKICAgICAvLyB3aGlsZSBzYW5pdGl6aW5nIHZhbHVlcyBjcmVhdGVk IHdoZW4gdGhlIHcgY29tcG9uZW50IGlzIG5lZ2F0aXZlLgotICAgIExheW91dFJlY3QgY2xhbXBl ZEJvdW5kc09mUHJvamVjdGVkUXVhZChjb25zdCBGbG9hdFF1YWQmKSBjb25zdDsKKyAgICBGcmFj dGlvbmFsTGF5b3V0UmVjdCBjbGFtcGVkQm91bmRzT2ZQcm9qZWN0ZWRRdWFkKGNvbnN0IEZsb2F0 UXVhZCYpIGNvbnN0OwogCiAgICAgZG91YmxlIG0xMSgpIGNvbnN0IHsgcmV0dXJuIG1fbWF0cml4 WzBdWzBdOyB9CiAgICAgdm9pZCBzZXRNMTEoZG91YmxlIGYpIHsgbV9tYXRyaXhbMF1bMF0gPSBm OyB9CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSGl0VGVzdGluZ1RyYW5zZm9ybVN0 YXRlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSGl0VGVzdGlu Z1RyYW5zZm9ybVN0YXRlLmNwcAkocmV2aXNpb24gMTI0NTE2KQorKysgU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL0hpdFRlc3RpbmdUcmFuc2Zvcm1TdGF0ZS5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTc5LDcgKzc5LDcgQEAgRmxvYXRRdWFkIEhpdFRlc3RpbmdUcmFuc2Zvcm1TdGF0ZTo6bWFwcAog ICAgIHJldHVybiBtX2FjY3VtdWxhdGVkVHJhbnNmb3JtLmludmVyc2UoKS5wcm9qZWN0UXVhZCht X2xhc3RQbGFuYXJBcmVhKTsKIH0KIAotTGF5b3V0UmVjdCBIaXRUZXN0aW5nVHJhbnNmb3JtU3Rh dGU6OmJvdW5kc09mTWFwcGVkQXJlYSgpIGNvbnN0CitGcmFjdGlvbmFsTGF5b3V0UmVjdCBIaXRU ZXN0aW5nVHJhbnNmb3JtU3RhdGU6OmJvdW5kc09mTWFwcGVkQXJlYSgpIGNvbnN0CiB7CiAgICAg cmV0dXJuIG1fYWNjdW11bGF0ZWRUcmFuc2Zvcm0uaW52ZXJzZSgpLmNsYW1wZWRCb3VuZHNPZlBy b2plY3RlZFF1YWQobV9sYXN0UGxhbmFyQXJlYSk7CiB9CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvSGl0VGVzdGluZ1RyYW5zZm9ybVN0YXRlLmgKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL0hpdFRlc3RpbmdUcmFuc2Zvcm1TdGF0ZS5oCShyZXZpc2lvbiAx MjQ1MTYpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSGl0VGVzdGluZ1RyYW5zZm9ybVN0 YXRlLmgJKHdvcmtpbmcgY29weSkKQEAgLTU5LDcgKzU5LDcgQEAgcHVibGljOgogICAgIEZsb2F0 UG9pbnQgbWFwcGVkUG9pbnQoKSBjb25zdDsKICAgICBGbG9hdFF1YWQgbWFwcGVkUXVhZCgpIGNv bnN0OwogICAgIEZsb2F0UXVhZCBtYXBwZWRBcmVhKCkgY29uc3Q7Ci0gICAgTGF5b3V0UmVjdCBi b3VuZHNPZk1hcHBlZEFyZWEoKSBjb25zdDsKKyAgICBGcmFjdGlvbmFsTGF5b3V0UmVjdCBib3Vu ZHNPZk1hcHBlZEFyZWEoKSBjb25zdDsKICAgICB2b2lkIGZsYXR0ZW4oKTsKIAogICAgIEZsb2F0 UG9pbnQgbV9sYXN0UGxhbmFyUG9pbnQ7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv TGF5b3V0VHlwZXMuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvTGF5 b3V0VHlwZXMuaAkocmV2aXNpb24gMTI0NTE2KQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L0xheW91dFR5cGVzLmgJKHdvcmtpbmcgY29weSkKQEAgLTE1MiwxMSArMTUyLDYgQEAgaW5saW5l IExheW91dFVuaXQgbGF5b3V0TW9kKGNvbnN0IExheW91dAogICAgIHJldHVybiBudW1lcmF0b3Iu dG9JbnQoKSAlIGRlbm9taW5hdG9yLnRvSW50KCk7CiB9CiAKLWlubGluZSBMYXlvdXRVbml0IGNs YW1wVG9MYXlvdXRVbml0KGRvdWJsZSB2YWx1ZSkKLXsKLSAgICByZXR1cm4gY2xhbXBUbzxGcmFj dGlvbmFsTGF5b3V0VW5pdD4odmFsdWUsIEZyYWN0aW9uYWxMYXlvdXRVbml0OjptaW4oKSwgRnJh Y3Rpb25hbExheW91dFVuaXQ6Om1heCgpKTsKLX0KLQogaW5saW5lIEludFNpemUgcGl4ZWxTbmFw cGVkSW50U2l6ZShjb25zdCBGcmFjdGlvbmFsTGF5b3V0U2l6ZSYgcywgY29uc3QgRnJhY3Rpb25h bExheW91dFBvaW50JiBwKQogewogICAgIHJldHVybiBJbnRTaXplKHNuYXBTaXplVG9QaXhlbChz LndpZHRoKCksIHAueCgpKSwgc25hcFNpemVUb1BpeGVsKHMuaGVpZ2h0KCksIHAueSgpKSk7Cg== 156427 2012-08-03 11:54:28 -0700 2012-08-03 15:00:24 -0700 Patch for landing bug-93037-20120803115408.patch text/plain 7475 eae SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEyNDUyNykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMxIEBACisyMDEyLTA4LTAyICBFbWlsIEEg RWtsdW5kICA8ZWFlQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZW1vdmUgZGVwZW5kZW5jeSBv biBMYXlvdXRUeXBlcy5oIGZyb20gdHJhbnNmb3JtYXRpb24gY29kZQorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTMwMzcKKworICAgICAgICBSZXZpZXdl ZCBieSBMZXZpIFdlaW50cmF1Yi4KKworICAgICAgICBUcmFuc2Zvcm1hdGlvbk1hdHJpeCBhbmQg SGl0VGVzdGluZ1RyYW5zZm9ybVN0YXRlIGluY2x1ZGVzIExheW91dFR5cGVzLmgKKyAgICAgICAg d2hpY2ggaXMgaW4gcmVuZGVyaW5nLiBUaGlzIGlzIGEgbGF5ZXJpbmcgdmlvbGF0aW9uLgorICAg ICAgICBSZW1vdmUgdGhpcyBkZXBlbmRlbmN5IGFzIGl0IGlzIG5vIGxvbmdlciBuZWVkZWQuCisK KyAgICAgICAgTm8gbmV3IHRlc3RzLCBubyBjaGFuZ2UgaW4gZnVuY3Rpb25hbGl0eS4KKworICAg ICAgICAqIHJlbmRlcmluZy9MYXlvdXRUeXBlcy5oOgorICAgICAgICBSZW1vdmUgY2xhbXBUb0xh eW91dFVuaXQKKyAgICAgICAgCisgICAgICAgICogcGxhdGZvcm0vRnJhY3Rpb25hbExheW91dFVu aXQuaDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYWN0aW9uYWxMYXlvdXRVbml0OjpjbGFtcCk6Cisg ICAgICAgIEFkZCBGcmFjdGlvbmFsTGF5b3V0VW5pdDo6Y2xhbXAgbWV0aG9kIHRoYXQgY2xhbXBz IGEgZG91YmxlIHRvIGEgRnJhY3Rpb25hbExheW91dFVuaXQuCisgICAgICAgICogcGxhdGZvcm0v Z3JhcGhpY3MvdHJhbnNmb3Jtcy9UcmFuc2Zvcm1hdGlvbk1hdHJpeC5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpjbGFtcEVkZ2VWYWx1ZSk6CisgICAgICAgIChXZWJDb3JlOjpUcmFuc2Zvcm1hdGlv bk1hdHJpeDo6Y2xhbXBlZEJvdW5kc09mUHJvamVjdGVkUXVhZCk6CisgICAgICAgIFVzZSBjbGFt cC9tYXgvbWluIGZyb20gRnJhY3Rpb25hbExheW91dFVuaXQgaW5zdGVhZCBvZiBnb2luZyB0aHJv dWdoIExheW91dFVuaXQgYWJzdHJhY3Rpb24uCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mv dHJhbnNmb3Jtcy9UcmFuc2Zvcm1hdGlvbk1hdHJpeC5oOgorICAgICAgICAqIHJlbmRlcmluZy9I aXRUZXN0aW5nVHJhbnNmb3JtU3RhdGUuY3BwOgorICAgICAgICAqIHJlbmRlcmluZy9IaXRUZXN0 aW5nVHJhbnNmb3JtU3RhdGUuaDoKKyAgICAgICAgUmVwbGFjZSB1c2Ugb2YgTGF5b3V0UmVjdCB3 aXRoIEZyYWN0aW9uYWxMYXlvdXRSZWN0IGFzIExheW91dFJlY3QgbWFwcyB0byBGcmFjdGlvbmFs TGF5b3V0UmVjdCBvbiBhbGwgcGxhdGZvcm1zLgorCiAyMDEyLTA4LTAyICBSeW9zdWtlIE5pd2Eg IDxybml3YUB3ZWJraXQub3JnPgogCiAgICAgICAgIHNjcmlwdHMgaW4gZm9ybWFjdGlvbiBzaG91 bGQgYmUgc3RyaXBwZWQgdXBvbiBwYXN0ZQpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v RnJhY3Rpb25hbExheW91dFVuaXQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9GcmFjdGlvbmFsTGF5b3V0VW5pdC5oCShyZXZpc2lvbiAxMjQ1MTYpCisrKyBTb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9GcmFjdGlvbmFsTGF5b3V0VW5pdC5oCSh3b3JraW5nIGNvcHkpCkBA IC0zNSw2ICszNSw3IEBACiAjaW5jbHVkZSA8bGltaXRzPgogI2luY2x1ZGUgPG1hdGguaD4KICNp bmNsdWRlIDxzdGRsaWIuaD4KKyNpbmNsdWRlIDx3dGYvTWF0aEV4dHJhcy5oPgogCiAjaWYgUExB VEZPUk0oUVQpCiAjaW5jbHVkZSA8UURhdGFTdHJlYW0+CkBAIC0xODEsNiArMTgyLDEwIEBAIHB1 YmxpYzoKICAgICAgICAgbS5tX3ZhbHVlID0gc3RkOjpudW1lcmljX2xpbWl0czxpbnQ+OjptaW4o KTsKICAgICAgICAgcmV0dXJuIG07CiAgICAgfQorICAgIHN0YXRpYyBGcmFjdGlvbmFsTGF5b3V0 VW5pdCBjbGFtcChkb3VibGUgdmFsdWUpCisgICAgeworICAgICAgICByZXR1cm4gY2xhbXBUbzxG cmFjdGlvbmFsTGF5b3V0VW5pdD4odmFsdWUsIEZyYWN0aW9uYWxMYXlvdXRVbml0OjptaW4oKSwg RnJhY3Rpb25hbExheW91dFVuaXQ6Om1heCgpKTsKKyAgICB9CiAgICAgCiBwcml2YXRlOgogICAg IHN0YXRpYyBib29sIGlzSW5Cb3VuZHMoaW50IHZhbHVlKQpJbmRleDogU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvdHJhbnNmb3Jtcy9UcmFuc2Zvcm1hdGlvbk1hdHJpeC5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdHJhbnNmb3Jtcy9U cmFuc2Zvcm1hdGlvbk1hdHJpeC5jcHAJKHJldmlzaW9uIDEyNDUxNikKKysrIFNvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RyYW5zZm9ybXMvVHJhbnNmb3JtYXRpb25NYXRyaXguY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC0yOCw3ICsyOCw2IEBACiAjaW5jbHVkZSAiVHJhbnNmb3JtYXRp b25NYXRyaXguaCIKIAogI2luY2x1ZGUgIkFmZmluZVRyYW5zZm9ybS5oIgotI2luY2x1ZGUgIkZy YWN0aW9uYWxMYXlvdXRSZWN0LmgiCiAjaW5jbHVkZSAiRmxvYXRQb2ludDNELmgiCiAjaW5jbHVk ZSAiRmxvYXRSZWN0LmgiCiAjaW5jbHVkZSAiRmxvYXRRdWFkLmgiCkBAIC02MTQsMTAgKzYxMywx MCBAQCBGbG9hdFF1YWQgVHJhbnNmb3JtYXRpb25NYXRyaXg6OnByb2plY3RRCiBzdGF0aWMgZmxv YXQgY2xhbXBFZGdlVmFsdWUoZmxvYXQgZikKIHsKICAgICBBU1NFUlQoIWlzbmFuKGYpKTsKLSAg ICByZXR1cm4gbWluPGZsb2F0PihtYXg8ZmxvYXQ+KGYsIC1NQVhfTEFZT1VUX1VOSVQgLyAyKSwg TUFYX0xBWU9VVF9VTklUIC8gMik7CisgICAgcmV0dXJuIG1pbjxmbG9hdD4obWF4PGZsb2F0Pihm LCAtRnJhY3Rpb25hbExheW91dFVuaXQ6Om1heCgpIC8gMiksIEZyYWN0aW9uYWxMYXlvdXRVbml0 OjptYXgoKSAvIDIpOwogfQogCi1MYXlvdXRSZWN0IFRyYW5zZm9ybWF0aW9uTWF0cml4OjpjbGFt cGVkQm91bmRzT2ZQcm9qZWN0ZWRRdWFkKGNvbnN0IEZsb2F0UXVhZCYgcSkgY29uc3QKK0ZyYWN0 aW9uYWxMYXlvdXRSZWN0IFRyYW5zZm9ybWF0aW9uTWF0cml4OjpjbGFtcGVkQm91bmRzT2ZQcm9q ZWN0ZWRRdWFkKGNvbnN0IEZsb2F0UXVhZCYgcSkgY29uc3QKIHsKICAgICBGbG9hdFJlY3QgbWFw cGVkUXVhZEJvdW5kcyA9IHByb2plY3RRdWFkKHEpLmJvdW5kaW5nQm94KCk7CiAKQEAgLTYyNiwx OCArNjI1LDE4IEBAIExheW91dFJlY3QgVHJhbnNmb3JtYXRpb25NYXRyaXg6OmNsYW1wZWQKIAog ICAgIGZsb2F0IHJpZ2h0OwogICAgIGlmIChpc2luZihtYXBwZWRRdWFkQm91bmRzLngoKSkgJiYg aXNpbmYobWFwcGVkUXVhZEJvdW5kcy53aWR0aCgpKSkKLSAgICAgICAgcmlnaHQgPSBNQVhfTEFZ T1VUX1VOSVQgLyAyOworICAgICAgICByaWdodCA9IEZyYWN0aW9uYWxMYXlvdXRVbml0OjptYXgo KSAvIDI7CiAgICAgZWxzZQogICAgICAgICByaWdodCA9IGNsYW1wRWRnZVZhbHVlKGNlaWxmKG1h cHBlZFF1YWRCb3VuZHMubWF4WCgpKSk7CiAKICAgICBmbG9hdCBib3R0b207CiAgICAgaWYgKGlz aW5mKG1hcHBlZFF1YWRCb3VuZHMueSgpKSAmJiBpc2luZihtYXBwZWRRdWFkQm91bmRzLmhlaWdo dCgpKSkKLSAgICAgICAgYm90dG9tID0gTUFYX0xBWU9VVF9VTklUIC8gMjsKKyAgICAgICAgYm90 dG9tID0gRnJhY3Rpb25hbExheW91dFVuaXQ6Om1heCgpIC8gMjsKICAgICBlbHNlCiAgICAgICAg IGJvdHRvbSA9IGNsYW1wRWRnZVZhbHVlKGNlaWxmKG1hcHBlZFF1YWRCb3VuZHMubWF4WSgpKSk7 Ci0gICAgCi0gICAgcmV0dXJuIExheW91dFJlY3QoY2xhbXBUb0xheW91dFVuaXQobGVmdCksIGNs YW1wVG9MYXlvdXRVbml0KHRvcCksIAotICAgICAgICAgICAgICAgICAgICAgIGNsYW1wVG9MYXlv dXRVbml0KHJpZ2h0IC0gbGVmdCksIGNsYW1wVG9MYXlvdXRVbml0KGJvdHRvbSAtIHRvcCkpOwor CisgICAgcmV0dXJuIEZyYWN0aW9uYWxMYXlvdXRSZWN0KEZyYWN0aW9uYWxMYXlvdXRVbml0Ojpj bGFtcChsZWZ0KSwgRnJhY3Rpb25hbExheW91dFVuaXQ6OmNsYW1wKHRvcCksIAorICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBGcmFjdGlvbmFsTGF5b3V0VW5pdDo6Y2xhbXAocmlnaHQg LSBsZWZ0KSwgRnJhY3Rpb25hbExheW91dFVuaXQ6OmNsYW1wKGJvdHRvbSAtIHRvcCkpOwogfQog CiBGbG9hdFBvaW50IFRyYW5zZm9ybWF0aW9uTWF0cml4OjptYXBQb2ludChjb25zdCBGbG9hdFBv aW50JiBwKSBjb25zdApJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdHJh bnNmb3Jtcy9UcmFuc2Zvcm1hdGlvbk1hdHJpeC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RyYW5zZm9ybXMvVHJhbnNmb3JtYXRpb25NYXRyaXguaAko cmV2aXNpb24gMTI0NTE2KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdHJh bnNmb3Jtcy9UcmFuc2Zvcm1hdGlvbk1hdHJpeC5oCSh3b3JraW5nIGNvcHkpCkBAIC0yNyw4ICsy Nyw4IEBACiAjZGVmaW5lIFRyYW5zZm9ybWF0aW9uTWF0cml4X2gKIAogI2luY2x1ZGUgIkZsb2F0 UG9pbnQuaCIKKyNpbmNsdWRlICJGcmFjdGlvbmFsTGF5b3V0UmVjdC5oIgogI2luY2x1ZGUgIklu dFBvaW50LmgiCi0jaW5jbHVkZSAiTGF5b3V0VHlwZXMuaCIKICNpbmNsdWRlIDxzdHJpbmcuaD4g Ly9mb3IgbWVtY3B5CiAjaW5jbHVkZSA8d3RmL0Zhc3RBbGxvY0Jhc2UuaD4KIApAQCAtMTY3LDcg KzE2Nyw3IEBAIHB1YmxpYzoKICAgICBGbG9hdFF1YWQgcHJvamVjdFF1YWQoY29uc3QgRmxvYXRR dWFkJikgY29uc3Q7CiAgICAgLy8gUHJvamVjdHMgdGhlIGZvdXIgY29ybmVycyBvZiB0aGUgcXVh ZCBhbmQgdGFrZXMgYSBib3VuZGluZyBib3gsCiAgICAgLy8gd2hpbGUgc2FuaXRpemluZyB2YWx1 ZXMgY3JlYXRlZCB3aGVuIHRoZSB3IGNvbXBvbmVudCBpcyBuZWdhdGl2ZS4KLSAgICBMYXlvdXRS ZWN0IGNsYW1wZWRCb3VuZHNPZlByb2plY3RlZFF1YWQoY29uc3QgRmxvYXRRdWFkJikgY29uc3Q7 CisgICAgRnJhY3Rpb25hbExheW91dFJlY3QgY2xhbXBlZEJvdW5kc09mUHJvamVjdGVkUXVhZChj b25zdCBGbG9hdFF1YWQmKSBjb25zdDsKIAogICAgIGRvdWJsZSBtMTEoKSBjb25zdCB7IHJldHVy biBtX21hdHJpeFswXVswXTsgfQogICAgIHZvaWQgc2V0TTExKGRvdWJsZSBmKSB7IG1fbWF0cml4 WzBdWzBdID0gZjsgfQpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0hpdFRlc3RpbmdU cmFuc2Zvcm1TdGF0ZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L0hpdFRlc3RpbmdUcmFuc2Zvcm1TdGF0ZS5jcHAJKHJldmlzaW9uIDEyNDUxNikKKysrIFNvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9IaXRUZXN0aW5nVHJhbnNmb3JtU3RhdGUuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC03OSw3ICs3OSw3IEBAIEZsb2F0UXVhZCBIaXRUZXN0aW5nVHJhbnNmb3JtU3Rh dGU6Om1hcHAKICAgICByZXR1cm4gbV9hY2N1bXVsYXRlZFRyYW5zZm9ybS5pbnZlcnNlKCkucHJv amVjdFF1YWQobV9sYXN0UGxhbmFyQXJlYSk7CiB9CiAKLUxheW91dFJlY3QgSGl0VGVzdGluZ1Ry YW5zZm9ybVN0YXRlOjpib3VuZHNPZk1hcHBlZEFyZWEoKSBjb25zdAorRnJhY3Rpb25hbExheW91 dFJlY3QgSGl0VGVzdGluZ1RyYW5zZm9ybVN0YXRlOjpib3VuZHNPZk1hcHBlZEFyZWEoKSBjb25z dAogewogICAgIHJldHVybiBtX2FjY3VtdWxhdGVkVHJhbnNmb3JtLmludmVyc2UoKS5jbGFtcGVk Qm91bmRzT2ZQcm9qZWN0ZWRRdWFkKG1fbGFzdFBsYW5hckFyZWEpOwogfQpJbmRleDogU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL0hpdFRlc3RpbmdUcmFuc2Zvcm1TdGF0ZS5oCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9IaXRUZXN0aW5nVHJhbnNmb3JtU3RhdGUuaAko cmV2aXNpb24gMTI0NTE2KQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0hpdFRlc3RpbmdU cmFuc2Zvcm1TdGF0ZS5oCSh3b3JraW5nIGNvcHkpCkBAIC01OSw3ICs1OSw3IEBAIHB1YmxpYzoK ICAgICBGbG9hdFBvaW50IG1hcHBlZFBvaW50KCkgY29uc3Q7CiAgICAgRmxvYXRRdWFkIG1hcHBl ZFF1YWQoKSBjb25zdDsKICAgICBGbG9hdFF1YWQgbWFwcGVkQXJlYSgpIGNvbnN0OwotICAgIExh eW91dFJlY3QgYm91bmRzT2ZNYXBwZWRBcmVhKCkgY29uc3Q7CisgICAgRnJhY3Rpb25hbExheW91 dFJlY3QgYm91bmRzT2ZNYXBwZWRBcmVhKCkgY29uc3Q7CiAgICAgdm9pZCBmbGF0dGVuKCk7CiAK ICAgICBGbG9hdFBvaW50IG1fbGFzdFBsYW5hclBvaW50OwpJbmRleDogU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL0xheW91dFR5cGVzLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL0xheW91dFR5cGVzLmgJKHJldmlzaW9uIDEyNDUxNikKKysrIFNvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9MYXlvdXRUeXBlcy5oCSh3b3JraW5nIGNvcHkpCkBAIC0xNTIsMTEgKzE1Miw2 IEBAIGlubGluZSBMYXlvdXRVbml0IGxheW91dE1vZChjb25zdCBMYXlvdXQKICAgICByZXR1cm4g bnVtZXJhdG9yLnRvSW50KCkgJSBkZW5vbWluYXRvci50b0ludCgpOwogfQogCi1pbmxpbmUgTGF5 b3V0VW5pdCBjbGFtcFRvTGF5b3V0VW5pdChkb3VibGUgdmFsdWUpCi17Ci0gICAgcmV0dXJuIGNs YW1wVG88RnJhY3Rpb25hbExheW91dFVuaXQ+KHZhbHVlLCBGcmFjdGlvbmFsTGF5b3V0VW5pdDo6 bWluKCksIEZyYWN0aW9uYWxMYXlvdXRVbml0OjptYXgoKSk7Ci19Ci0KIGlubGluZSBJbnRTaXpl IHBpeGVsU25hcHBlZEludFNpemUoY29uc3QgRnJhY3Rpb25hbExheW91dFNpemUmIHMsIGNvbnN0 IEZyYWN0aW9uYWxMYXlvdXRQb2ludCYgcCkKIHsKICAgICByZXR1cm4gSW50U2l6ZShzbmFwU2l6 ZVRvUGl4ZWwocy53aWR0aCgpLCBwLngoKSksIHNuYXBTaXplVG9QaXhlbChzLmhlaWdodCgpLCBw LnkoKSkpOwo=