137355 2014-10-02 13:13:10 -0700 Clean up interface to Font::expansionOpportunityCount() 2014-10-06 16:54:47 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mmaxfield mmaxfield commit-queue dino esprehn+autocc glenn jonlee koivisto kondapallykalyan simon.fraser thorton zalan oldest_to_newest 1038951 0 mmaxfield 2014-10-02 13:13:10 -0700 Clean up interface to Font::expansionOpportunityCount() 1038952 1 239132 mmaxfield 2014-10-02 13:17:06 -0700 Created attachment 239132 Patch 1039288 2 mmaxfield 2014-10-03 12:19:28 -0700 This needs to be rebaselined. 1039290 3 mmaxfield 2014-10-03 12:19:46 -0700 **** The code needs to be rebased 1039333 4 239231 mmaxfield 2014-10-03 14:04:09 -0700 Created attachment 239231 Patch 1039371 5 239231 commit-queue 2014-10-03 15:07:47 -0700 Comment on attachment 239231 Patch Clearing flags on attachment: 239231 Committed r174297: <http://trac.webkit.org/changeset/174297> 1039372 6 commit-queue 2014-10-03 15:07:51 -0700 All reviewed patches have been landed. Closing bug. 1039450 7 239231 darin 2014-10-03 22:02:33 -0700 Comment on attachment 239231 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=239231&action=review > Source/WebCore/rendering/RenderText.cpp:1533 > +StringView RenderText::stringView(int start, int stop) const > +{ > + if (is8Bit()) > + return StringView(characters8() + start, stop - start); > + return StringView(characters16() + start, stop - start); > +} This function either needs assertions about start and stop being reasonable values, or code to clamp start and stop to make them reasonable values. 1039878 8 239231 mmaxfield 2014-10-06 16:54:47 -0700 Comment on attachment 239231 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=239231&action=review >> Source/WebCore/rendering/RenderText.cpp:1533 >> +} > > This function either needs assertions about start and stop being reasonable values, or code to clamp start and stop to make them reasonable values. Addressed in r174373. 239132 2014-10-02 13:17:06 -0700 2014-10-03 14:04:03 -0700 Patch bug-137355-20141002131708.patch text/plain 11342 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMTc0MTg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTMyYzlhYTE4NTY0Yzkw ZDg5MjZlN2RhYmJmOTBhZmVhYzE3ZmU2MC4uZjc5YzVkOTUyMjY2YzM2ZjRmYTIxZjZjZDhiOGMw YzM4OWI1MzFhOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQwIEBACisyMDE0LTEwLTAyICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgQ2xlYW4gdXAg aW50ZXJmYWNlIHRvIEZvbnQ6OmV4cGFuc2lvbk9wcG9ydHVuaXR5Q291bnQoKQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM3MzU1CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlcmUgYXJlIHR3byBvdmVy bG9hZHMgb2YgRm9udDo6ZXhwYW5zaW9uT3Bwb3J0dW5pdHlDb3VudCgpIHdoaWNoIHBlcmZvcm0g dGhlIHNhbWUKKyAgICAgICAgb3BlcmF0aW9uLiBPbmUgb3ZlcmxvYWQgdGFrZXMgYSBVQ2hhcios IHRoZSBvdGhlciB0YWtlcyBhbiBMQ2hhciosIGFuZCB0aGV5IGJvdGgKKyAgICAgICAgdGFrZSBh IGxlbmd0aC4gVGhpcyBpcyB0aGUgYWJzdHJhY3Rpb24gdGhhdCBTdHJpbmdWaWV3IHdhcyBkZXNp Z25lZCB0byBiZS4gSW5zdGVhZAorICAgICAgICBvZiBmb3JjaW5nIGVhY2ggY2FsbGVyIHRvIHRh a2UgYSBkaWZmZXJlbnQgb3ZlcmxvYWQgYmFzZWQgb24gaWYgdGhlaXIgZGF0YSBpcworICAgICAg ICA4IGJpdCBvciBub3QsIGFsbG93IHRoZSBjYWxsZXIgdG8gY29uc3RydWN0IGEgU3RyaW5nVmll dyBhbmQgcGFzcyB0aGF0IGludG8KKyAgICAgICAgRm9udDo6ZXhwYW5zaW9uT3Bwb3J0dW5pdHlD b3VudCgpIGluc3RlYWQgb2YgYSByYXcgcG9pbnRlci9sZW5ndGguCisKKyAgICAgICAgTm8gbmV3 IHRlc3RzIGJlY2F1c2UgdGhlcmUgaXMgbm8gYmVoYXZpb3IgY2hhbmdlLgorCisgICAgICAgICog cGxhdGZvcm0vZ3JhcGhpY3MvRm9udC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGb250OjpleHBh bnNpb25PcHBvcnR1bml0eUNvdW50SW50ZXJuYWwpOiBPcmlnaW5hbCB0d28gZnVuY3Rpb25zLAor ICAgICAgICByZW5hbWVkLgorICAgICAgICAoV2ViQ29yZTo6Rm9udDo6ZXhwYW5zaW9uT3Bwb3J0 dW5pdHlDb3VudCk6IFRha2VzIGEgU3RyaW5nVmlldywgY2FsbHMgCisgICAgICAgIGV4cGFuc2lv bk9wcG9ydHVuaXR5Q291bnRJbnRlcm5hbCgpLgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNz L0ZvbnQuaDogVXBkYXRlIHNpZ25hdHVyZXMuCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mv VGV4dFJ1bi5oOgorICAgICAgICAoV2ViQ29yZTo6VGV4dFJ1bjo6c3RyaW5nVmlldyk6IEFjY2Vz c29yIHRvIGVuY2Fwc3VsYXRlIGNoYXJhY3RlciBwb2ludGVyIGFuZAorICAgICAgICBsZW5ndGgu CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvV2lkdGhJdGVyYXRvci5jcHA6CisgICAgICAg IChXZWJDb3JlOjpXaWR0aEl0ZXJhdG9yOjpXaWR0aEl0ZXJhdG9yKTogVXNlIG5ldyBzaWduYXR1 cmUgdG8KKyAgICAgICAgRm9udDo6ZXhwYW5zaW9uT3Bwb3J0dW5pdHlDb3VudCgpLgorICAgICAg ICAqIHBsYXRmb3JtL2dyYXBoaWNzL21hYy9Db21wbGV4VGV4dENvbnRyb2xsZXIuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6Q29tcGxleFRleHRDb250cm9sbGVyOjpDb21wbGV4VGV4dENvbnRyb2xs ZXIpOiBEaXR0by4KKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQmxvY2tMaW5lTGF5b3V0LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJsb2NrRmxvdzo6Y29tcHV0ZUlubGluZURpcmVj dGlvblBvc2l0aW9uc0ZvclNlZ21lbnQpOiBEaXR0by4KKyAgICAgICAgKiByZW5kZXJpbmcvUmVu ZGVyVGV4dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUZXh0OjpzdHJpbmdWaWV3KTog QWNjZXNzb3IgdG8gZW5jYXBzdWxhdGUgY2hhcmFjdGVyIHBvaXRuZXIKKyAgICAgICAgYW5kIGxl bmd0aC4KKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVGV4dC5oOiBTaWduYXR1cmUgb2YgbmV3 IGFjY2Vzc29yLgorCiAyMDE0LTEwLTAxICBDaHJpc3RvcGhlIER1bWV6ICA8Y2R1bWV6QGFwcGxl LmNvbT4KIAogICAgICAgICBVc2UgaXM8PigpIC8gZG93bmNhc3Q8PigpIGZvciBFdmVudCBjbGFz c2VzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250LmNw cCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnQuY3BwCmluZGV4IDZhOTM3 YTllMDRlYWMxNmQ0Y2MxOWE3NjJjZmY1MjNmNDRiMjE3YTYuLjZlOWZjN2ExYTI5MzhhYjk0MWU5 OWUzYzliYTJjZmY1Y2JjN2E5ZmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL0ZvbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L0ZvbnQuY3BwCkBAIC05NjgsNyArOTY4LDcgQEAgYm9vbCBGb250Ojppc0NKS0lkZW9ncmFwaE9y U3ltYm9sKFVDaGFyMzIgYykKICAgICByZXR1cm4gaXNDSktJZGVvZ3JhcGgoYyk7CiB9CiAKLXVu c2lnbmVkIEZvbnQ6OmV4cGFuc2lvbk9wcG9ydHVuaXR5Q291bnQoY29uc3QgTENoYXIqIGNoYXJh Y3RlcnMsIHNpemVfdCBsZW5ndGgsIFRleHREaXJlY3Rpb24gZGlyZWN0aW9uLCBib29sJiBpc0Fm dGVyRXhwYW5zaW9uKQordW5zaWduZWQgRm9udDo6ZXhwYW5zaW9uT3Bwb3J0dW5pdHlDb3VudElu dGVybmFsKGNvbnN0IExDaGFyKiBjaGFyYWN0ZXJzLCBzaXplX3QgbGVuZ3RoLCBUZXh0RGlyZWN0 aW9uIGRpcmVjdGlvbiwgYm9vbCYgaXNBZnRlckV4cGFuc2lvbikKIHsKICAgICB1bnNpZ25lZCBj b3VudCA9IDA7CiAgICAgaWYgKGRpcmVjdGlvbiA9PSBMVFIpIHsKQEAgLTk5MSw3ICs5OTEsNyBA QCB1bnNpZ25lZCBGb250OjpleHBhbnNpb25PcHBvcnR1bml0eUNvdW50KGNvbnN0IExDaGFyKiBj aGFyYWN0ZXJzLCBzaXplX3QgbGVuZ3RoLAogICAgIHJldHVybiBjb3VudDsKIH0KIAotdW5zaWdu ZWQgRm9udDo6ZXhwYW5zaW9uT3Bwb3J0dW5pdHlDb3VudChjb25zdCBVQ2hhciogY2hhcmFjdGVy cywgc2l6ZV90IGxlbmd0aCwgVGV4dERpcmVjdGlvbiBkaXJlY3Rpb24sIGJvb2wmIGlzQWZ0ZXJF eHBhbnNpb24pCit1bnNpZ25lZCBGb250OjpleHBhbnNpb25PcHBvcnR1bml0eUNvdW50SW50ZXJu YWwoY29uc3QgVUNoYXIqIGNoYXJhY3RlcnMsIHNpemVfdCBsZW5ndGgsIFRleHREaXJlY3Rpb24g ZGlyZWN0aW9uLCBib29sJiBpc0FmdGVyRXhwYW5zaW9uKQogewogICAgIHN0YXRpYyBib29sIGV4 cGFuZEFyb3VuZElkZW9ncmFwaHMgPSBjYW5FeHBhbmRBcm91bmRJZGVvZ3JhcGhzSW5Db21wbGV4 VGV4dCgpOwogICAgIHVuc2lnbmVkIGNvdW50ID0gMDsKQEAgLTEwNDEsNiArMTA0MSwxMyBAQCB1 bnNpZ25lZCBGb250OjpleHBhbnNpb25PcHBvcnR1bml0eUNvdW50KGNvbnN0IFVDaGFyKiBjaGFy YWN0ZXJzLCBzaXplX3QgbGVuZ3RoLAogICAgIHJldHVybiBjb3VudDsKIH0KIAordW5zaWduZWQg Rm9udDo6ZXhwYW5zaW9uT3Bwb3J0dW5pdHlDb3VudChjb25zdCBTdHJpbmdWaWV3JiBzdHJpbmdW aWV3LCBUZXh0RGlyZWN0aW9uIGRpcmVjdGlvbiwgYm9vbCYgaXNBZnRlckV4cGFuc2lvbikKK3sK KyAgICBpZiAoc3RyaW5nVmlldy5pczhCaXQoKSkKKyAgICAgICAgcmV0dXJuIGV4cGFuc2lvbk9w cG9ydHVuaXR5Q291bnRJbnRlcm5hbChzdHJpbmdWaWV3LmNoYXJhY3RlcnM4KCksIHN0cmluZ1Zp ZXcubGVuZ3RoKCksIGRpcmVjdGlvbiwgaXNBZnRlckV4cGFuc2lvbik7CisgICAgcmV0dXJuIGV4 cGFuc2lvbk9wcG9ydHVuaXR5Q291bnRJbnRlcm5hbChzdHJpbmdWaWV3LmNoYXJhY3RlcnMxNigp LCBzdHJpbmdWaWV3Lmxlbmd0aCgpLCBkaXJlY3Rpb24sIGlzQWZ0ZXJFeHBhbnNpb24pOworfQor CiBib29sIEZvbnQ6OmNhblJlY2VpdmVUZXh0RW1waGFzaXMoVUNoYXIzMiBjKQogewogICAgIGlm IChVX0dFVF9HQ19NQVNLKGMpICYgKFVfR0NfWl9NQVNLIHwgVV9HQ19DTl9NQVNLIHwgVV9HQ19D Q19NQVNLIHwgVV9HQ19DRl9NQVNLKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL0ZvbnQuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0Zv bnQuaAppbmRleCA1OGM0MGFiNmYxMTVmNTI4NzQ3Yzg0ZmI5ZjMzMDUyMjFmZmFlOThmLi5kNDU1 OWE3ZThiYzVmZTQzY2E0NTBkMmY1NThlOWMzZTIzMWI1ZjQ1IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvRm9udC5oCkBAIC0yMDEsOCArMjAxLDcgQEAgcHVibGljOgogICAgIHN0 YXRpYyBib29sIGlzQ0pLSWRlb2dyYXBoKFVDaGFyMzIpOwogICAgIHN0YXRpYyBib29sIGlzQ0pL SWRlb2dyYXBoT3JTeW1ib2woVUNoYXIzMik7CiAKLSAgICBzdGF0aWMgdW5zaWduZWQgZXhwYW5z aW9uT3Bwb3J0dW5pdHlDb3VudChjb25zdCBMQ2hhciosIHNpemVfdCBsZW5ndGgsIFRleHREaXJl Y3Rpb24sIGJvb2wmIGlzQWZ0ZXJFeHBhbnNpb24pOwotICAgIHN0YXRpYyB1bnNpZ25lZCBleHBh bnNpb25PcHBvcnR1bml0eUNvdW50KGNvbnN0IFVDaGFyKiwgc2l6ZV90IGxlbmd0aCwgVGV4dERp cmVjdGlvbiwgYm9vbCYgaXNBZnRlckV4cGFuc2lvbik7CisgICAgc3RhdGljIHVuc2lnbmVkIGV4 cGFuc2lvbk9wcG9ydHVuaXR5Q291bnQoY29uc3QgU3RyaW5nVmlldyYsIFRleHREaXJlY3Rpb24s IGJvb2wmIGlzQWZ0ZXJFeHBhbnNpb24pOwogCiAgICAgV0VCQ09SRV9FWFBPUlQgc3RhdGljIHZv aWQgc2V0U2hvdWxkVXNlU21vb3RoaW5nKGJvb2wpOwogICAgIFdFQkNPUkVfRVhQT1JUIHN0YXRp YyBib29sIHNob3VsZFVzZVNtb290aGluZygpOwpAQCAtMjQwLDYgKzIzOSw5IEBAIHByaXZhdGU6 CiAgICAgaW50IG9mZnNldEZvclBvc2l0aW9uRm9yQ29tcGxleFRleHQoY29uc3QgVGV4dFJ1biYs IGZsb2F0IHBvc2l0aW9uLCBib29sIGluY2x1ZGVQYXJ0aWFsR2x5cGhzKSBjb25zdDsKICAgICB2 b2lkIGFkanVzdFNlbGVjdGlvblJlY3RGb3JDb21wbGV4VGV4dChjb25zdCBUZXh0UnVuJiwgTGF5 b3V0UmVjdCYgc2VsZWN0aW9uUmVjdCwgaW50IGZyb20sIGludCB0bykgY29uc3Q7CiAKKyAgICBz dGF0aWMgdW5zaWduZWQgZXhwYW5zaW9uT3Bwb3J0dW5pdHlDb3VudEludGVybmFsKGNvbnN0IExD aGFyKiwgc2l6ZV90IGxlbmd0aCwgVGV4dERpcmVjdGlvbiwgYm9vbCYgaXNBZnRlckV4cGFuc2lv bik7CisgICAgc3RhdGljIHVuc2lnbmVkIGV4cGFuc2lvbk9wcG9ydHVuaXR5Q291bnRJbnRlcm5h bChjb25zdCBVQ2hhciosIHNpemVfdCBsZW5ndGgsIFRleHREaXJlY3Rpb24sIGJvb2wmIGlzQWZ0 ZXJFeHBhbnNpb24pOworCiAgICAgZnJpZW5kIHN0cnVjdCBXaWR0aEl0ZXJhdG9yOwogICAgIGZy aWVuZCBjbGFzcyBTVkdUZXh0UnVuUmVuZGVyaW5nQ29udGV4dDsKIApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvVGV4dFJ1bi5oIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvVGV4dFJ1bi5oCmluZGV4IDM5NjFhNGNjNWY1Y2ZkMGM0ZWExMzY4 NDYyNTlhZmY2N2IwNzViNzQuLjVhYjRmNzA4NzBlYjAwYjYzM2VkZjQ5YzkxMjU4ODg5ZWYwOTIy MTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL1RleHRSdW4u aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9UZXh0UnVuLmgKQEAgLTIx Miw2ICsyMTIsOCBAQCBwdWJsaWM6CiAgICAgdm9pZCBzZXREaXJlY3Rpb25hbE92ZXJyaWRlKGJv b2wgb3ZlcnJpZGUpIHsgbV9kaXJlY3Rpb25hbE92ZXJyaWRlID0gb3ZlcnJpZGU7IH0KICAgICB2 b2lkIHNldENoYXJhY3RlclNjYW5Gb3JDb2RlUGF0aChib29sIHNjYW4pIHsgbV9jaGFyYWN0ZXJT Y2FuRm9yQ29kZVBhdGggPSBzY2FuOyB9CiAKKyAgICBTdHJpbmdWaWV3IHN0cmluZ1ZpZXcoKSBj b25zdCB7IHJldHVybiBpczhCaXQoKSA/IFN0cmluZ1ZpZXcoY2hhcmFjdGVyczgoKSwgbGVuZ3Ro KCkpIDogU3RyaW5nVmlldyhjaGFyYWN0ZXJzMTYoKSwgbGVuZ3RoKCkpOyB9CisKICAgICBjbGFz cyBSZW5kZXJpbmdDb250ZXh0IDogcHVibGljIFJlZkNvdW50ZWQ8UmVuZGVyaW5nQ29udGV4dD4g ewogICAgIHB1YmxpYzoKICAgICAgICAgdmlydHVhbCB+UmVuZGVyaW5nQ29udGV4dCgpIHsgfQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvV2lkdGhJdGVyYXRv ci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9XaWR0aEl0ZXJhdG9yLmNw cAppbmRleCA3YzUxZGU3NmJiZGFkN2VmYjE2MzFhYWZjN2NiYTU2ZmUyMjBiOTM5Li45NmNhZjZh YjYxYjM0MGQ4ODkwYTNmZTRmNmU2YzhmNWE1NmU0ODNhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9XaWR0aEl0ZXJhdG9yLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9XaWR0aEl0ZXJhdG9yLmNwcApAQCAtNTcsNyArNTcsNyBA QCBXaWR0aEl0ZXJhdG9yOjpXaWR0aEl0ZXJhdG9yKGNvbnN0IEZvbnQqIGZvbnQsIGNvbnN0IFRl eHRSdW4mIHJ1biwgSGFzaFNldDxjb25zdAogICAgICAgICBtX2V4cGFuc2lvblBlck9wcG9ydHVu aXR5ID0gMDsKICAgICBlbHNlIHsKICAgICAgICAgYm9vbCBpc0FmdGVyRXhwYW5zaW9uID0gbV9p c0FmdGVyRXhwYW5zaW9uOwotICAgICAgICB1bnNpZ25lZCBleHBhbnNpb25PcHBvcnR1bml0eUNv dW50ID0gbV9ydW4uaXM4Qml0KCkgPyBGb250OjpleHBhbnNpb25PcHBvcnR1bml0eUNvdW50KG1f cnVuLmNoYXJhY3RlcnM4KCksIG1fcnVuLmxlbmd0aCgpLCBtX3J1bi5sdHIoKSA/IExUUiA6IFJU TCwgaXNBZnRlckV4cGFuc2lvbikgOiBGb250OjpleHBhbnNpb25PcHBvcnR1bml0eUNvdW50KG1f cnVuLmNoYXJhY3RlcnMxNigpLCBtX3J1bi5sZW5ndGgoKSwgbV9ydW4ubHRyKCkgPyBMVFIgOiBS VEwsIGlzQWZ0ZXJFeHBhbnNpb24pOworICAgICAgICB1bnNpZ25lZCBleHBhbnNpb25PcHBvcnR1 bml0eUNvdW50ID0gRm9udDo6ZXhwYW5zaW9uT3Bwb3J0dW5pdHlDb3VudChtX3J1bi5zdHJpbmdW aWV3KCksIG1fcnVuLmx0cigpID8gTFRSIDogUlRMLCBpc0FmdGVyRXhwYW5zaW9uKTsKICAgICAg ICAgaWYgKGlzQWZ0ZXJFeHBhbnNpb24gJiYgIW1fcnVuLmFsbG93c1RyYWlsaW5nRXhwYW5zaW9u KCkpCiAgICAgICAgICAgICBleHBhbnNpb25PcHBvcnR1bml0eUNvdW50LS07CiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL21hYy9Db21wbGV4VGV4dENvbnRy b2xsZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL0NvbXBsZXhU ZXh0Q29udHJvbGxlci5jcHAKaW5kZXggODZkMjQzYjIzOTRmNGU0YTVkMWZmOGMwZmM4YTA2MWI2 ZDM3M2M3MS4uMWQxYjc2YWY3NWIwMGJjOWM3ZGQzMmYyMjk3NDZjMTQ2M2VmY2E5YyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL0NvbXBsZXhUZXh0Q29u dHJvbGxlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL0Nv bXBsZXhUZXh0Q29udHJvbGxlci5jcHAKQEAgLTE0NCwxMSArMTQ0LDcgQEAgQ29tcGxleFRleHRD b250cm9sbGVyOjpDb21wbGV4VGV4dENvbnRyb2xsZXIoY29uc3QgRm9udCogZm9udCwgY29uc3Qg VGV4dFJ1biYgcnUKICAgICAgICAgbV9leHBhbnNpb25QZXJPcHBvcnR1bml0eSA9IDA7CiAgICAg ZWxzZSB7CiAgICAgICAgIGJvb2wgaXNBZnRlckV4cGFuc2lvbiA9IG1fYWZ0ZXJFeHBhbnNpb247 Ci0gICAgICAgIHVuc2lnbmVkIGV4cGFuc2lvbk9wcG9ydHVuaXR5Q291bnQ7Ci0gICAgICAgIGlm IChtX3J1bi5pczhCaXQoKSkKLSAgICAgICAgICAgIGV4cGFuc2lvbk9wcG9ydHVuaXR5Q291bnQg PSBGb250OjpleHBhbnNpb25PcHBvcnR1bml0eUNvdW50KG1fcnVuLmNoYXJhY3RlcnM4KCksIG1f ZW5kLCBtX3J1bi5sdHIoKSA/IExUUiA6IFJUTCwgaXNBZnRlckV4cGFuc2lvbik7Ci0gICAgICAg ICBlbHNlCi0gICAgICAgICAgICAgZXhwYW5zaW9uT3Bwb3J0dW5pdHlDb3VudCA9IEZvbnQ6OmV4 cGFuc2lvbk9wcG9ydHVuaXR5Q291bnQobV9ydW4uY2hhcmFjdGVyczE2KCksIG1fZW5kLCBtX3J1 bi5sdHIoKSA/IExUUiA6IFJUTCwgaXNBZnRlckV4cGFuc2lvbik7CisgICAgICAgIHVuc2lnbmVk IGV4cGFuc2lvbk9wcG9ydHVuaXR5Q291bnQgPSBGb250OjpleHBhbnNpb25PcHBvcnR1bml0eUNv dW50KG1fcnVuLnN0cmluZ1ZpZXcoKSwgbV9ydW4ubHRyKCkgPyBMVFIgOiBSVEwsIGlzQWZ0ZXJF eHBhbnNpb24pOwogICAgICAgICBpZiAoaXNBZnRlckV4cGFuc2lvbiAmJiAhbV9ydW4uYWxsb3dz VHJhaWxpbmdFeHBhbnNpb24oKSkKICAgICAgICAgICAgIGV4cGFuc2lvbk9wcG9ydHVuaXR5Q291 bnQtLTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2Nr TGluZUxheW91dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tMaW5l TGF5b3V0LmNwcAppbmRleCBhOTlmNmM5YjJkYmM0YzEyODNhNmMxMjdjMzQwM2U1Y2FhNTA3MTky Li5jYWQwZjQ4NDJkZDkzODVjYmVkZjlmNzg2Y2M2M2Q1MjBhZTdjMjRlIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tMaW5lTGF5b3V0LmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tMaW5lTGF5b3V0LmNwcApAQCAtNjgy LDExICs2ODIsNyBAQCBCaWRpUnVuKiBSZW5kZXJCbG9ja0Zsb3c6OmNvbXB1dGVJbmxpbmVEaXJl Y3Rpb25Qb3NpdGlvbnNGb3JTZWdtZW50KFJvb3RJbmxpbmVCbwogICAgICAgICAgICAgaWYgKHRl eHRBbGlnbiA9PSBKVVNUSUZZICYmIHIgIT0gdHJhaWxpbmdTcGFjZVJ1bikgewogICAgICAgICAg ICAgICAgIGlmICghaXNBZnRlckV4cGFuc2lvbikKICAgICAgICAgICAgICAgICAgICAgdG9Jbmxp bmVUZXh0Qm94KHItPmJveCgpKS0+c2V0Q2FuSGF2ZUxlYWRpbmdFeHBhbnNpb24odHJ1ZSk7Ci0g ICAgICAgICAgICAgICAgdW5zaWduZWQgb3Bwb3J0dW5pdGllc0luUnVuOwotICAgICAgICAgICAg ICAgIGlmIChydC5pczhCaXQoKSkKLSAgICAgICAgICAgICAgICAgICAgb3Bwb3J0dW5pdGllc0lu UnVuID0gRm9udDo6ZXhwYW5zaW9uT3Bwb3J0dW5pdHlDb3VudChydC5jaGFyYWN0ZXJzOCgpICsg ci0+bV9zdGFydCwgci0+bV9zdG9wIC0gci0+bV9zdGFydCwgci0+Ym94KCktPmRpcmVjdGlvbigp LCBpc0FmdGVyRXhwYW5zaW9uKTsKLSAgICAgICAgICAgICAgICBlbHNlCi0gICAgICAgICAgICAg ICAgICAgIG9wcG9ydHVuaXRpZXNJblJ1biA9IEZvbnQ6OmV4cGFuc2lvbk9wcG9ydHVuaXR5Q291 bnQocnQuY2hhcmFjdGVyczE2KCkgKyByLT5tX3N0YXJ0LCByLT5tX3N0b3AgLSByLT5tX3N0YXJ0 LCByLT5ib3goKS0+ZGlyZWN0aW9uKCksIGlzQWZ0ZXJFeHBhbnNpb24pOworICAgICAgICAgICAg ICAgIHVuc2lnbmVkIG9wcG9ydHVuaXRpZXNJblJ1biA9IEZvbnQ6OmV4cGFuc2lvbk9wcG9ydHVu aXR5Q291bnQocnQuc3RyaW5nVmlldyhyLT5tX3N0YXJ0LCByLT5tX3N0b3ApLCByLT5ib3goKS0+ ZGlyZWN0aW9uKCksIGlzQWZ0ZXJFeHBhbnNpb24pOwogICAgICAgICAgICAgICAgIGV4cGFuc2lv bk9wcG9ydHVuaXRpZXMuYXBwZW5kKG9wcG9ydHVuaXRpZXNJblJ1bik7CiAgICAgICAgICAgICAg ICAgZXhwYW5zaW9uT3Bwb3J0dW5pdHlDb3VudCArPSBvcHBvcnR1bml0aWVzSW5SdW47CiAgICAg ICAgICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4 dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dC5jcHAKaW5kZXggMzkw MTJmMmQzYmYyYWU3ZmM5MDQwZGI0YjdlNTNiYTQzMTIzOTNlOC4uZmM3NTMwMmJhODQyN2M5ODMw MjM2NDE4M2E0NDMxYzkzZGMyYzBjZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlclRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJU ZXh0LmNwcApAQCAtMTUyNSw0ICsxNTI1LDExIEBAIHZvaWQgUmVuZGVyVGV4dDo6bW9tZW50YXJp bHlSZXZlYWxMYXN0VHlwZWRDaGFyYWN0ZXIodW5zaWduZWQgbGFzdFR5cGVkQ2hhcmFjdGVyCiAg ICAgc2VjdXJlVGV4dFRpbWVyLT5yZXN0YXJ0V2l0aE5ld1RleHQobGFzdFR5cGVkQ2hhcmFjdGVy T2Zmc2V0KTsKIH0KIAorU3RyaW5nVmlldyBSZW5kZXJUZXh0OjpzdHJpbmdWaWV3KGludCBzdGFy dCwgaW50IHN0b3ApIGNvbnN0Cit7CisgICAgaWYgKGlzOEJpdCgpKQorICAgICAgICByZXR1cm4g U3RyaW5nVmlldyhjaGFyYWN0ZXJzOCgpICsgc3RhcnQsIHN0b3AgLSBzdGFydCk7CisgICAgcmV0 dXJuIFN0cmluZ1ZpZXcoY2hhcmFjdGVyczE2KCkgKyBzdGFydCwgc3RvcCAtIHN0YXJ0KTsKK30K KwogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlclRleHQuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0 LmgKaW5kZXggZjAyNGFhNmUyODhhOWRlNmNlNDQ1MTg0NDI5NTM2ZDE2YTcwMjc5YS4uODQxMTVh MzNlMmExNDU1ODZmMDY0ZjcyZWY1NThkMjNjMDA5ZTUwNiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyVGV4dC5oCkBAIC0xNTYsNiArMTU2LDggQEAgcHVibGljOgogICAgIHZvaWQgZGVs ZXRlTGluZUJveGVzQmVmb3JlU2ltcGxlTGluZUxheW91dCgpOwogICAgIGNvbnN0IFNpbXBsZUxp bmVMYXlvdXQ6OkxheW91dCogc2ltcGxlTGluZUxheW91dCgpIGNvbnN0OwogCisgICAgU3RyaW5n VmlldyBzdHJpbmdWaWV3KGludCBzdGFydCwgaW50IHN0b3ApIGNvbnN0OworCiBwcm90ZWN0ZWQ6 CiAgICAgdmlydHVhbCB2b2lkIGNvbXB1dGVQcmVmZXJyZWRMb2dpY2FsV2lkdGhzKGZsb2F0IGxl YWRXaWR0aCk7CiAgICAgdmlydHVhbCB2b2lkIHdpbGxCZURlc3Ryb3llZCgpIG92ZXJyaWRlOwo= 239231 2014-10-03 14:04:09 -0700 2014-10-06 16:54:47 -0700 Patch bug-137355-20141003140410.patch text/plain 10440 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMTc0Mjc5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWI1YjEyZmRjMmIyMjA1 MTQyMzI5Zjg5YzMzZGU2N2EyZTVlMDc1Zi4uZjYzNjY5N2Q1NDZkYWZmNWM0NzkzMmY1N2EwMDZm YTQ3ZGExNWExYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM3IEBACisyMDE0LTEwLTAzICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgQ2xlYW4gdXAg aW50ZXJmYWNlIHRvIEZvbnQ6OmV4cGFuc2lvbk9wcG9ydHVuaXR5Q291bnQoKQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM3MzU1CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlcmUgYXJlIHR3byBvdmVy bG9hZHMgb2YgRm9udDo6ZXhwYW5zaW9uT3Bwb3J0dW5pdHlDb3VudCgpIHdoaWNoIHBlcmZvcm0g dGhlIHNhbWUKKyAgICAgICAgb3BlcmF0aW9uLiBPbmUgb3ZlcmxvYWQgdGFrZXMgYSBVQ2hhcios IHRoZSBvdGhlciB0YWtlcyBhbiBMQ2hhciosIGFuZCB0aGV5IGJvdGgKKyAgICAgICAgdGFrZSBh IGxlbmd0aC4gVGhpcyBpcyB0aGUgYWJzdHJhY3Rpb24gdGhhdCBTdHJpbmdWaWV3IHdhcyBkZXNp Z25lZCB0byBiZS4gSW5zdGVhZAorICAgICAgICBvZiBmb3JjaW5nIGVhY2ggY2FsbGVyIHRvIHRh a2UgYSBkaWZmZXJlbnQgb3ZlcmxvYWQgYmFzZWQgb24gaWYgdGhlaXIgZGF0YSBpcworICAgICAg ICA4IGJpdCBvciBub3QsIGFsbG93IHRoZSBjYWxsZXIgdG8gY29uc3RydWN0IGEgU3RyaW5nVmll dyBhbmQgcGFzcyB0aGF0IGludG8KKyAgICAgICAgRm9udDo6ZXhwYW5zaW9uT3Bwb3J0dW5pdHlD b3VudCgpIGluc3RlYWQgb2YgYSByYXcgcG9pbnRlci9sZW5ndGguCisKKyAgICAgICAgTm8gbmV3 IHRlc3RzIGJlY2F1c2UgdGhlcmUgaXMgbm8gYmVoYXZpb3IgY2hhbmdlLgorCisgICAgICAgICog cGxhdGZvcm0vZ3JhcGhpY3MvRm9udC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGb250OjpleHBh bnNpb25PcHBvcnR1bml0eUNvdW50SW50ZXJuYWwpOiBPcmlnaW5hbCB0d28gZnVuY3Rpb25zLAor ICAgICAgICByZW5hbWVkLgorICAgICAgICAoV2ViQ29yZTo6Rm9udDo6ZXhwYW5zaW9uT3Bwb3J0 dW5pdHlDb3VudCk6IFRha2VzIGEgU3RyaW5nVmlldywgY2FsbHMgCisgICAgICAgIGV4cGFuc2lv bk9wcG9ydHVuaXR5Q291bnRJbnRlcm5hbCgpLgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNz L0ZvbnQuaDogVXBkYXRlIHNpZ25hdHVyZXMuCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mv V2lkdGhJdGVyYXRvci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpXaWR0aEl0ZXJhdG9yOjpXaWR0 aEl0ZXJhdG9yKTogVXNlIG5ldyBzaWduYXR1cmUgdG8KKyAgICAgICAgRm9udDo6ZXhwYW5zaW9u T3Bwb3J0dW5pdHlDb3VudCgpLgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL21hYy9Db21w bGV4VGV4dENvbnRyb2xsZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q29tcGxleFRleHRDb250 cm9sbGVyOjpDb21wbGV4VGV4dENvbnRyb2xsZXIpOiBEaXR0by4KKyAgICAgICAgKiByZW5kZXJp bmcvUmVuZGVyQmxvY2tMaW5lTGF5b3V0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJs b2NrRmxvdzo6Y29tcHV0ZUlubGluZURpcmVjdGlvblBvc2l0aW9uc0ZvclNlZ21lbnQpOiBEaXR0 by4KKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVGV4dC5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJUZXh0OjpzdHJpbmdWaWV3KTogQWNjZXNzb3IgdG8gZW5jYXBzdWxhdGUgY2hhcmFj dGVyIHBvaW50ZXIKKyAgICAgICAgYW5kIGxlbmd0aC4KKyAgICAgICAgKiByZW5kZXJpbmcvUmVu ZGVyVGV4dC5oOiBTaWduYXR1cmUgb2YgbmV3IGFjY2Vzc29yLgorCiAyMDE0LTA5LTI4ICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CiAKICAgICAgICAgW1NWRyAtPiBP VEYgQ29udmVydGVyXSBTdXBwb3J0IG5vbi1CTVAgY29kZXBvaW50cwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9Gb250LmNwcAppbmRleCA1ZWM0MjRhYzZiNGNkNGNjZDkzYTZhN2Fl NWRjY2FmYmMzMTgxOTM4Li5hNWI0ZDEyYzNiODFjNmZiZThhOWI4Zjk1MTA5OTU4YTEyYTYxZTk4 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250LmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250LmNwcApAQCAtOTY4LDcg Kzk2OCw3IEBAIGJvb2wgRm9udDo6aXNDSktJZGVvZ3JhcGhPclN5bWJvbChVQ2hhcjMyIGMpCiAg ICAgcmV0dXJuIGlzQ0pLSWRlb2dyYXBoKGMpOwogfQogCi11bnNpZ25lZCBGb250OjpleHBhbnNp b25PcHBvcnR1bml0eUNvdW50KGNvbnN0IExDaGFyKiBjaGFyYWN0ZXJzLCBzaXplX3QgbGVuZ3Ro LCBUZXh0RGlyZWN0aW9uIGRpcmVjdGlvbiwgYm9vbCYgaXNBZnRlckV4cGFuc2lvbikKK3Vuc2ln bmVkIEZvbnQ6OmV4cGFuc2lvbk9wcG9ydHVuaXR5Q291bnRJbnRlcm5hbChjb25zdCBMQ2hhciog Y2hhcmFjdGVycywgc2l6ZV90IGxlbmd0aCwgVGV4dERpcmVjdGlvbiBkaXJlY3Rpb24sIGJvb2wm IGlzQWZ0ZXJFeHBhbnNpb24pCiB7CiAgICAgdW5zaWduZWQgY291bnQgPSAwOwogICAgIGlmIChk aXJlY3Rpb24gPT0gTFRSKSB7CkBAIC05OTEsNyArOTkxLDcgQEAgdW5zaWduZWQgRm9udDo6ZXhw YW5zaW9uT3Bwb3J0dW5pdHlDb3VudChjb25zdCBMQ2hhciogY2hhcmFjdGVycywgc2l6ZV90IGxl bmd0aCwKICAgICByZXR1cm4gY291bnQ7CiB9CiAKLXVuc2lnbmVkIEZvbnQ6OmV4cGFuc2lvbk9w cG9ydHVuaXR5Q291bnQoY29uc3QgVUNoYXIqIGNoYXJhY3RlcnMsIHNpemVfdCBsZW5ndGgsIFRl eHREaXJlY3Rpb24gZGlyZWN0aW9uLCBib29sJiBpc0FmdGVyRXhwYW5zaW9uKQordW5zaWduZWQg Rm9udDo6ZXhwYW5zaW9uT3Bwb3J0dW5pdHlDb3VudEludGVybmFsKGNvbnN0IFVDaGFyKiBjaGFy YWN0ZXJzLCBzaXplX3QgbGVuZ3RoLCBUZXh0RGlyZWN0aW9uIGRpcmVjdGlvbiwgYm9vbCYgaXNB ZnRlckV4cGFuc2lvbikKIHsKICAgICBzdGF0aWMgYm9vbCBleHBhbmRBcm91bmRJZGVvZ3JhcGhz ID0gY2FuRXhwYW5kQXJvdW5kSWRlb2dyYXBoc0luQ29tcGxleFRleHQoKTsKICAgICB1bnNpZ25l ZCBjb3VudCA9IDA7CkBAIC0xMDQxLDYgKzEwNDEsMTMgQEAgdW5zaWduZWQgRm9udDo6ZXhwYW5z aW9uT3Bwb3J0dW5pdHlDb3VudChjb25zdCBVQ2hhciogY2hhcmFjdGVycywgc2l6ZV90IGxlbmd0 aCwKICAgICByZXR1cm4gY291bnQ7CiB9CiAKK3Vuc2lnbmVkIEZvbnQ6OmV4cGFuc2lvbk9wcG9y dHVuaXR5Q291bnQoY29uc3QgU3RyaW5nVmlldyYgc3RyaW5nVmlldywgVGV4dERpcmVjdGlvbiBk aXJlY3Rpb24sIGJvb2wmIGlzQWZ0ZXJFeHBhbnNpb24pCit7CisgICAgaWYgKHN0cmluZ1ZpZXcu aXM4Qml0KCkpCisgICAgICAgIHJldHVybiBleHBhbnNpb25PcHBvcnR1bml0eUNvdW50SW50ZXJu YWwoc3RyaW5nVmlldy5jaGFyYWN0ZXJzOCgpLCBzdHJpbmdWaWV3Lmxlbmd0aCgpLCBkaXJlY3Rp b24sIGlzQWZ0ZXJFeHBhbnNpb24pOworICAgIHJldHVybiBleHBhbnNpb25PcHBvcnR1bml0eUNv dW50SW50ZXJuYWwoc3RyaW5nVmlldy5jaGFyYWN0ZXJzMTYoKSwgc3RyaW5nVmlldy5sZW5ndGgo KSwgZGlyZWN0aW9uLCBpc0FmdGVyRXhwYW5zaW9uKTsKK30KKwogYm9vbCBGb250OjpjYW5SZWNl aXZlVGV4dEVtcGhhc2lzKFVDaGFyMzIgYykKIHsKICAgICBpZiAoVV9HRVRfR0NfTUFTSyhjKSAm IChVX0dDX1pfTUFTSyB8IFVfR0NfQ05fTUFTSyB8IFVfR0NfQ0NfTUFTSyB8IFVfR0NfQ0ZfTUFT SykpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250Lmgg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250LmgKaW5kZXggNThjNDBhYjZm MTE1ZjUyODc0N2M4NGZiOWYzMzA1MjIxZmZhZTk4Zi4uZDQ1NTlhN2U4YmM1ZmU0M2NhNDUwZDJm NTU4ZTljM2UyMzFiNWY0NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvRm9udC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnQu aApAQCAtMjAxLDggKzIwMSw3IEBAIHB1YmxpYzoKICAgICBzdGF0aWMgYm9vbCBpc0NKS0lkZW9n cmFwaChVQ2hhcjMyKTsKICAgICBzdGF0aWMgYm9vbCBpc0NKS0lkZW9ncmFwaE9yU3ltYm9sKFVD aGFyMzIpOwogCi0gICAgc3RhdGljIHVuc2lnbmVkIGV4cGFuc2lvbk9wcG9ydHVuaXR5Q291bnQo Y29uc3QgTENoYXIqLCBzaXplX3QgbGVuZ3RoLCBUZXh0RGlyZWN0aW9uLCBib29sJiBpc0FmdGVy RXhwYW5zaW9uKTsKLSAgICBzdGF0aWMgdW5zaWduZWQgZXhwYW5zaW9uT3Bwb3J0dW5pdHlDb3Vu dChjb25zdCBVQ2hhciosIHNpemVfdCBsZW5ndGgsIFRleHREaXJlY3Rpb24sIGJvb2wmIGlzQWZ0 ZXJFeHBhbnNpb24pOworICAgIHN0YXRpYyB1bnNpZ25lZCBleHBhbnNpb25PcHBvcnR1bml0eUNv dW50KGNvbnN0IFN0cmluZ1ZpZXcmLCBUZXh0RGlyZWN0aW9uLCBib29sJiBpc0FmdGVyRXhwYW5z aW9uKTsKIAogICAgIFdFQkNPUkVfRVhQT1JUIHN0YXRpYyB2b2lkIHNldFNob3VsZFVzZVNtb290 aGluZyhib29sKTsKICAgICBXRUJDT1JFX0VYUE9SVCBzdGF0aWMgYm9vbCBzaG91bGRVc2VTbW9v dGhpbmcoKTsKQEAgLTI0MCw2ICsyMzksOSBAQCBwcml2YXRlOgogICAgIGludCBvZmZzZXRGb3JQ b3NpdGlvbkZvckNvbXBsZXhUZXh0KGNvbnN0IFRleHRSdW4mLCBmbG9hdCBwb3NpdGlvbiwgYm9v bCBpbmNsdWRlUGFydGlhbEdseXBocykgY29uc3Q7CiAgICAgdm9pZCBhZGp1c3RTZWxlY3Rpb25S ZWN0Rm9yQ29tcGxleFRleHQoY29uc3QgVGV4dFJ1biYsIExheW91dFJlY3QmIHNlbGVjdGlvblJl Y3QsIGludCBmcm9tLCBpbnQgdG8pIGNvbnN0OwogCisgICAgc3RhdGljIHVuc2lnbmVkIGV4cGFu c2lvbk9wcG9ydHVuaXR5Q291bnRJbnRlcm5hbChjb25zdCBMQ2hhciosIHNpemVfdCBsZW5ndGgs IFRleHREaXJlY3Rpb24sIGJvb2wmIGlzQWZ0ZXJFeHBhbnNpb24pOworICAgIHN0YXRpYyB1bnNp Z25lZCBleHBhbnNpb25PcHBvcnR1bml0eUNvdW50SW50ZXJuYWwoY29uc3QgVUNoYXIqLCBzaXpl X3QgbGVuZ3RoLCBUZXh0RGlyZWN0aW9uLCBib29sJiBpc0FmdGVyRXhwYW5zaW9uKTsKKwogICAg IGZyaWVuZCBzdHJ1Y3QgV2lkdGhJdGVyYXRvcjsKICAgICBmcmllbmQgY2xhc3MgU1ZHVGV4dFJ1 blJlbmRlcmluZ0NvbnRleHQ7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL1dpZHRoSXRlcmF0b3IuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvV2lkdGhJdGVyYXRvci5jcHAKaW5kZXggNDEzNmQxZTNkYTdlZDhlMDA3YmVmZmJlYTYy MDJiNWM0NzEyMjA4Zi4uZjJjN2MwNWU3ZDMyOTVjMmM3NmNiMzM5YTY5MzAxOTNjMzAzY2FhYSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvV2lkdGhJdGVyYXRv ci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvV2lkdGhJdGVyYXRv ci5jcHAKQEAgLTU3LDcgKzU3LDcgQEAgV2lkdGhJdGVyYXRvcjo6V2lkdGhJdGVyYXRvcihjb25z dCBGb250KiBmb250LCBjb25zdCBUZXh0UnVuJiBydW4sIEhhc2hTZXQ8Y29uc3QKICAgICAgICAg bV9leHBhbnNpb25QZXJPcHBvcnR1bml0eSA9IDA7CiAgICAgZWxzZSB7CiAgICAgICAgIGJvb2wg aXNBZnRlckV4cGFuc2lvbiA9IG1faXNBZnRlckV4cGFuc2lvbjsKLSAgICAgICAgdW5zaWduZWQg ZXhwYW5zaW9uT3Bwb3J0dW5pdHlDb3VudCA9IG1fcnVuLmlzOEJpdCgpID8gRm9udDo6ZXhwYW5z aW9uT3Bwb3J0dW5pdHlDb3VudChtX3J1bi5jaGFyYWN0ZXJzOCgpLCBtX3J1bi5sZW5ndGgoKSwg bV9ydW4ubHRyKCkgPyBMVFIgOiBSVEwsIGlzQWZ0ZXJFeHBhbnNpb24pIDogRm9udDo6ZXhwYW5z aW9uT3Bwb3J0dW5pdHlDb3VudChtX3J1bi5jaGFyYWN0ZXJzMTYoKSwgbV9ydW4ubGVuZ3RoKCks IG1fcnVuLmx0cigpID8gTFRSIDogUlRMLCBpc0FmdGVyRXhwYW5zaW9uKTsKKyAgICAgICAgdW5z aWduZWQgZXhwYW5zaW9uT3Bwb3J0dW5pdHlDb3VudCA9IEZvbnQ6OmV4cGFuc2lvbk9wcG9ydHVu aXR5Q291bnQobV9ydW4udGV4dCgpLCBtX3J1bi5sdHIoKSA/IExUUiA6IFJUTCwgaXNBZnRlckV4 cGFuc2lvbik7CiAgICAgICAgIGlmIChpc0FmdGVyRXhwYW5zaW9uICYmICFtX3J1bi5hbGxvd3NU cmFpbGluZ0V4cGFuc2lvbigpKQogICAgICAgICAgICAgZXhwYW5zaW9uT3Bwb3J0dW5pdHlDb3Vu dC0tOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9tYWMv Q29tcGxleFRleHRDb250cm9sbGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL21hYy9Db21wbGV4VGV4dENvbnRyb2xsZXIuY3BwCmluZGV4IDg2ZDI0M2IyMzk0ZjRlNGE1 ZDFmZjhjMGZjOGEwNjFiNmQzNzNjNzEuLjM1Y2E3MzY0NGU5YjcxMmFhNThhOTMyYWQyZjVkMjIy ZDA3NDk4YmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL21h Yy9Db21wbGV4VGV4dENvbnRyb2xsZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL21hYy9Db21wbGV4VGV4dENvbnRyb2xsZXIuY3BwCkBAIC0xNDQsMTEgKzE0NCw3 IEBAIENvbXBsZXhUZXh0Q29udHJvbGxlcjo6Q29tcGxleFRleHRDb250cm9sbGVyKGNvbnN0IEZv bnQqIGZvbnQsIGNvbnN0IFRleHRSdW4mIHJ1CiAgICAgICAgIG1fZXhwYW5zaW9uUGVyT3Bwb3J0 dW5pdHkgPSAwOwogICAgIGVsc2UgewogICAgICAgICBib29sIGlzQWZ0ZXJFeHBhbnNpb24gPSBt X2FmdGVyRXhwYW5zaW9uOwotICAgICAgICB1bnNpZ25lZCBleHBhbnNpb25PcHBvcnR1bml0eUNv dW50OwotICAgICAgICBpZiAobV9ydW4uaXM4Qml0KCkpCi0gICAgICAgICAgICBleHBhbnNpb25P cHBvcnR1bml0eUNvdW50ID0gRm9udDo6ZXhwYW5zaW9uT3Bwb3J0dW5pdHlDb3VudChtX3J1bi5j aGFyYWN0ZXJzOCgpLCBtX2VuZCwgbV9ydW4ubHRyKCkgPyBMVFIgOiBSVEwsIGlzQWZ0ZXJFeHBh bnNpb24pOwotICAgICAgICAgZWxzZQotICAgICAgICAgICAgIGV4cGFuc2lvbk9wcG9ydHVuaXR5 Q291bnQgPSBGb250OjpleHBhbnNpb25PcHBvcnR1bml0eUNvdW50KG1fcnVuLmNoYXJhY3RlcnMx NigpLCBtX2VuZCwgbV9ydW4ubHRyKCkgPyBMVFIgOiBSVEwsIGlzQWZ0ZXJFeHBhbnNpb24pOwor ICAgICAgICB1bnNpZ25lZCBleHBhbnNpb25PcHBvcnR1bml0eUNvdW50ID0gRm9udDo6ZXhwYW5z aW9uT3Bwb3J0dW5pdHlDb3VudChtX3J1bi50ZXh0KCksIG1fcnVuLmx0cigpID8gTFRSIDogUlRM LCBpc0FmdGVyRXhwYW5zaW9uKTsKICAgICAgICAgaWYgKGlzQWZ0ZXJFeHBhbnNpb24gJiYgIW1f cnVuLmFsbG93c1RyYWlsaW5nRXhwYW5zaW9uKCkpCiAgICAgICAgICAgICBleHBhbnNpb25PcHBv cnR1bml0eUNvdW50LS07CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJCbG9ja0xpbmVMYXlvdXQuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckJsb2NrTGluZUxheW91dC5jcHAKaW5kZXggYTQ3ODExZWQzZWE2YTk3MDdiMzM4NzViYTgxNjg2 MWJhYWU2ZWY0NC4uNjEyNzg4MmYwMWZiZjAyNWUwOGIzOWE3OGExMTc0ODAzNDkwMGUwYyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrTGluZUxheW91dC5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrTGluZUxheW91dC5j cHAKQEAgLTY4MiwxMSArNjgyLDcgQEAgQmlkaVJ1biogUmVuZGVyQmxvY2tGbG93Ojpjb21wdXRl SW5saW5lRGlyZWN0aW9uUG9zaXRpb25zRm9yU2VnbWVudChSb290SW5saW5lQm8KICAgICAgICAg ICAgIGlmICh0ZXh0QWxpZ24gPT0gSlVTVElGWSAmJiByICE9IHRyYWlsaW5nU3BhY2VSdW4pIHsK ICAgICAgICAgICAgICAgICBpZiAoIWlzQWZ0ZXJFeHBhbnNpb24pCiAgICAgICAgICAgICAgICAg ICAgIHRvSW5saW5lVGV4dEJveChyLT5ib3goKSktPnNldENhbkhhdmVMZWFkaW5nRXhwYW5zaW9u KHRydWUpOwotICAgICAgICAgICAgICAgIHVuc2lnbmVkIG9wcG9ydHVuaXRpZXNJblJ1bjsKLSAg ICAgICAgICAgICAgICBpZiAocnQuaXM4Qml0KCkpCi0gICAgICAgICAgICAgICAgICAgIG9wcG9y dHVuaXRpZXNJblJ1biA9IEZvbnQ6OmV4cGFuc2lvbk9wcG9ydHVuaXR5Q291bnQocnQuY2hhcmFj dGVyczgoKSArIHItPm1fc3RhcnQsIHItPm1fc3RvcCAtIHItPm1fc3RhcnQsIHItPmJveCgpLT5k aXJlY3Rpb24oKSwgaXNBZnRlckV4cGFuc2lvbik7Ci0gICAgICAgICAgICAgICAgZWxzZQotICAg ICAgICAgICAgICAgICAgICBvcHBvcnR1bml0aWVzSW5SdW4gPSBGb250OjpleHBhbnNpb25PcHBv cnR1bml0eUNvdW50KHJ0LmNoYXJhY3RlcnMxNigpICsgci0+bV9zdGFydCwgci0+bV9zdG9wIC0g ci0+bV9zdGFydCwgci0+Ym94KCktPmRpcmVjdGlvbigpLCBpc0FmdGVyRXhwYW5zaW9uKTsKKyAg ICAgICAgICAgICAgICB1bnNpZ25lZCBvcHBvcnR1bml0aWVzSW5SdW4gPSBGb250OjpleHBhbnNp b25PcHBvcnR1bml0eUNvdW50KHJ0LnN0cmluZ1ZpZXcoci0+bV9zdGFydCwgci0+bV9zdG9wKSwg ci0+Ym94KCktPmRpcmVjdGlvbigpLCBpc0FmdGVyRXhwYW5zaW9uKTsKICAgICAgICAgICAgICAg ICBleHBhbnNpb25PcHBvcnR1bml0aWVzLmFwcGVuZChvcHBvcnR1bml0aWVzSW5SdW4pOwogICAg ICAgICAgICAgICAgIGV4cGFuc2lvbk9wcG9ydHVuaXR5Q291bnQgKz0gb3Bwb3J0dW5pdGllc0lu UnVuOwogICAgICAgICAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlclRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHQuY3Bw CmluZGV4IDM5MDEyZjJkM2JmMmFlN2ZjOTA0MGRiNGI3ZTUzYmE0MzEyMzkzZTguLmZjNzUzMDJi YTg0MjdjOTgzMDIzNjQxODNhNDQzMWM5M2RjMmMwY2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyVGV4dC5jcHAKQEAgLTE1MjUsNCArMTUyNSwxMSBAQCB2b2lkIFJlbmRlclRleHQ6 Om1vbWVudGFyaWx5UmV2ZWFsTGFzdFR5cGVkQ2hhcmFjdGVyKHVuc2lnbmVkIGxhc3RUeXBlZENo YXJhY3RlcgogICAgIHNlY3VyZVRleHRUaW1lci0+cmVzdGFydFdpdGhOZXdUZXh0KGxhc3RUeXBl ZENoYXJhY3Rlck9mZnNldCk7CiB9CiAKK1N0cmluZ1ZpZXcgUmVuZGVyVGV4dDo6c3RyaW5nVmll dyhpbnQgc3RhcnQsIGludCBzdG9wKSBjb25zdAoreworICAgIGlmIChpczhCaXQoKSkKKyAgICAg ICAgcmV0dXJuIFN0cmluZ1ZpZXcoY2hhcmFjdGVyczgoKSArIHN0YXJ0LCBzdG9wIC0gc3RhcnQp OworICAgIHJldHVybiBTdHJpbmdWaWV3KGNoYXJhY3RlcnMxNigpICsgc3RhcnQsIHN0b3AgLSBz dGFydCk7Cit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0LmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyVGV4dC5oCmluZGV4IGYwMjRhYTZlMjg4YTlkZTZjZTQ0NTE4NDQyOTUzNmQxNmE3MDI3 OWEuLjg0MTE1YTMzZTJhMTQ1NTg2ZjA2NGY3MmVmNTU4ZDIzYzAwOWU1MDYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0LmgKKysrIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlclRleHQuaApAQCAtMTU2LDYgKzE1Niw4IEBAIHB1YmxpYzoKICAg ICB2b2lkIGRlbGV0ZUxpbmVCb3hlc0JlZm9yZVNpbXBsZUxpbmVMYXlvdXQoKTsKICAgICBjb25z dCBTaW1wbGVMaW5lTGF5b3V0OjpMYXlvdXQqIHNpbXBsZUxpbmVMYXlvdXQoKSBjb25zdDsKIAor ICAgIFN0cmluZ1ZpZXcgc3RyaW5nVmlldyhpbnQgc3RhcnQsIGludCBzdG9wKSBjb25zdDsKKwog cHJvdGVjdGVkOgogICAgIHZpcnR1YWwgdm9pZCBjb21wdXRlUHJlZmVycmVkTG9naWNhbFdpZHRo cyhmbG9hdCBsZWFkV2lkdGgpOwogICAgIHZpcnR1YWwgdm9pZCB3aWxsQmVEZXN0cm95ZWQoKSBv dmVycmlkZTsK