134173 2014-06-22 10:36:41 -0700 InlineTextBox's m_len can be an unsigned (rather than an unsigned short) 2014-06-24 18:20:16 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mmaxfield mmaxfield commit-queue dbates esprehn+autocc glenn kling kondapallykalyan zalan oldest_to_newest 1017403 0 mmaxfield 2014-06-22 10:36:41 -0700 Simple line layout alleviates the need for these memory savings. 1017818 1 233669 mmaxfield 2014-06-23 19:45:37 -0700 Created attachment 233669 Patch 1017819 2 233669 mmaxfield 2014-06-23 19:46:24 -0700 Comment on attachment 233669 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=233669&action=review > Source/WebCore/ChangeLog:8 > + After Zalan's talks with Antti, it seems that the simple line layout code Whoops. Looks like this was Kling. 1017820 3 233670 mmaxfield 2014-06-23 19:46:58 -0700 Created attachment 233670 Patch 1018068 4 233670 dbates 2014-06-24 12:53:53 -0700 Comment on attachment 233670 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=233670&action=review OK > Source/WebCore/rendering/InlineTextBox.h:38 > +const unsigned cNoTruncation = UINT_MAX; > +const unsigned cFullTruncation = UINT_MAX - 1; We should take this opportunity to substitute the C++ idiom of std::numeric_limits<unsigned>::max() for UINT_MAX in these lines. 1018208 5 mmaxfield 2014-06-24 18:20:16 -0700 http://trac.webkit.org/changeset/170413 233669 2014-06-23 19:45:37 -0700 2014-06-23 19:46:55 -0700 Patch bug-134173-20140623194516.patch text/plain 9680 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMTcwMzQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmU1NzY5OWMzZGQxODQz YjZhYWM3YTc2ZDA0ZTRkYzZiMjIwMjVmZi4uNDYzMjllYTI1YzFlMzNkMDQ5MjE2YzYwYmJjYTZm MTU4YTA0ODkwZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDE0LTA2LTIzICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgSW5saW5lVGV4 dEJveCdzIG1fbGVuIGNhbiBiZSBhbiB1bnNpZ25lZCAocmF0aGVyIHRoYW4gYW4gdW5zaWduZWQg c2hvcnQpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x MzQxNzMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBB ZnRlciBaYWxhbidzIHRhbGtzIHdpdGggQW50dGksIGl0IHNlZW1zIHRoYXQgdGhlIHNpbXBsZSBs aW5lIGxheW91dCBjb2RlCisgICAgICAgIG1pZ2h0IGFsbGV2aWF0ZSB0aGUgbmVlZCBmb3IgdGhl IHNwYWNlIHNhdmluZ3MgaW4gSW5saW5lVGV4dEJveC4gR2l2ZW4gdGhpcywKKyAgICAgICAgaXQg d291bGQgYmUgYmVuZWZpY2lhbCB0byBiZSBhIGxpdHRsZSBtb3JlIHNhZmUgYnkgdXNpbmcgdW5z aWduZWRzIHRocm91Z2hvdXQuCisKKyAgICAgICAgRm9yIGV4YW1wbGUsIHdlIGhhdmUgY29kZSBs aWtlICJ2b2lkIHNldExlbih1bnNpZ25lZCBsZW4pIHsgbV9sZW4gPSBsZW47IH0iCisgICAgICAg IHdoaWNoIG1pZ2h0IHNpbGVudGx5IGJyZWFrIGlmIGdpdmVuIHBhcnRpY3VsYXIgaW5wdXRzLgor CisgICAgICAgIE5vIG5ldyB0ZXN0cyBiZWNhdXNlIHRoZXJlIGlzIG5vIGJlaGF2aW9yIGNoYW5n ZS4KKworICAgICAgICAqIHJlbmRlcmluZy9JbmxpbmVUZXh0Qm94LmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OklubGluZVRleHRCb3g6OmlzU2VsZWN0ZWQpOgorICAgICAgICAoV2ViQ29yZTo6SW5s aW5lVGV4dEJveDo6bG9jYWxTZWxlY3Rpb25SZWN0KToKKyAgICAgICAgKFdlYkNvcmU6OklubGlu ZVRleHRCb3g6OnBhaW50KToKKyAgICAgICAgKFdlYkNvcmU6OklubGluZVRleHRCb3g6OnNlbGVj dGlvblN0YXJ0RW5kKToKKyAgICAgICAgKFdlYkNvcmU6OklubGluZVRleHRCb3g6OnBhaW50U2Vs ZWN0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OklubGluZVRleHRCb3g6OnBhaW50Q29tcG9zaXRp b25CYWNrZ3JvdW5kKToKKyAgICAgICAgKFdlYkNvcmU6OklubGluZVRleHRCb3g6OnBhaW50RG9j dW1lbnRNYXJrZXIpOgorICAgICAgICAoV2ViQ29yZTo6SW5saW5lVGV4dEJveDo6cGFpbnRUZXh0 TWF0Y2hNYXJrZXIpOgorICAgICAgICAoV2ViQ29yZTo6SW5saW5lVGV4dEJveDo6Y29tcHV0ZVJl Y3RGb3JSZXBsYWNlbWVudE1hcmtlcik6CisgICAgICAgICogcmVuZGVyaW5nL0lubGluZVRleHRC b3guaDoKKyAgICAgICAgKFdlYkNvcmU6OklubGluZVRleHRCb3g6OnRydW5jYXRpb24pOgorICAg ICAgICAqIHJlbmRlcmluZy9SZW5kZXJUZXh0TGluZUJveGVzLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OmVsbGlwc2lzUmVjdEZvckJveCk6CisKIDIwMTQtMDYtMjMgIEtyenlzenRvZiBDemVjaCAg PGsuY3plY2hAc2Ftc3VuZy5jb20+CiAKICAgICAgICAgW0FUS10gUmVtb3ZlIHNvbWUgdW5uZWNl c3NhcnkgY29kZSBmcm9tIFdlYktpdEFjY2Vzc2libGVXcmFwcGVyQXRrCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSW5saW5lVGV4dEJveC5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvSW5saW5lVGV4dEJveC5jcHAKaW5kZXggYzNjOTZhMzQ5Y2ZjOTg3ODEyYzk0 ZDE2MWYzZWVhNjJlYjE4NTg1MS4uNDY0OWJiNGQ4Y2ZmOTU4YTY5ODNlZGQ5MjhhYWFjMGFiMTg3 OWYxNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0lubGluZVRleHRCb3gu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9JbmxpbmVUZXh0Qm94LmNwcApAQCAt NTksNyArNTksNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIHN0cnVjdCBTYW1lU2l6ZUFzSW5s aW5lVGV4dEJveCA6IHB1YmxpYyBJbmxpbmVCb3ggewogICAgIHVuc2lnbmVkIHZhcmlhYmxlc1sx XTsKLSAgICB1bnNpZ25lZCBzaG9ydCB2YXJpYWJsZXMyWzJdOworICAgIHVuc2lnbmVkIHZhcmlh YmxlczJbMl07CiAgICAgdm9pZCogcG9pbnRlcnNbMl07CiB9OwogCkBAIC0yMDEsNyArMjAxLDcg QEAgYm9vbCBJbmxpbmVUZXh0Qm94Ojppc1NlbGVjdGVkKHVuc2lnbmVkIHN0YXJ0UG9zLCB1bnNp Z25lZCBlbmRQb3MpIGNvbnN0CiAgICAgdW5zaWduZWQgc1BvcyA9IHN0YXJ0UG9zID4gbV9zdGFy dCA/IHN0YXJ0UG9zIC0gbV9zdGFydCA6IDA7CiAgICAgaWYgKGVuZFBvcyA8PSBtX3N0YXJ0KQog ICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgdW5zaWduZWQgZVBvcyA9IHN0ZDo6bWluKGVuZFBv cyAtIG1fc3RhcnQsIHN0YXRpY19jYXN0PHVuc2lnbmVkPihtX2xlbikpOworICAgIHVuc2lnbmVk IGVQb3MgPSBzdGQ6Om1pbihlbmRQb3MgLSBtX3N0YXJ0LCBtX2xlbik7CiAgICAgcmV0dXJuIHNQ b3MgPCBlUG9zOwogfQogCkBAIC0yNzgsNyArMjc4LDcgQEAgTGF5b3V0UmVjdCBJbmxpbmVUZXh0 Qm94Ojpsb2NhbFNlbGVjdGlvblJlY3QodW5zaWduZWQgc3RhcnRQb3MsIHVuc2lnbmVkIGVuZFBv cykKICAgICBpZiAoZW5kUG9zIDwgbV9zdGFydCkKICAgICAgICAgcmV0dXJuIExheW91dFJlY3Qo KTsKIAotICAgIHVuc2lnbmVkIGVQb3MgPSBzdGQ6Om1pbihlbmRQb3MgLSBtX3N0YXJ0LCBzdGF0 aWNfY2FzdDx1bnNpZ25lZD4obV9sZW4pKTsKKyAgICB1bnNpZ25lZCBlUG9zID0gc3RkOjptaW4o ZW5kUG9zIC0gbV9zdGFydCwgbV9sZW4pOwogICAgIAogICAgIGlmIChzUG9zID4gZVBvcykKICAg ICAgICAgcmV0dXJuIExheW91dFJlY3QoKTsKQEAgLTY0MCw4ICs2NDAsOCBAQCB2b2lkIElubGlu ZVRleHRCb3g6OnBhaW50KFBhaW50SW5mbyYgcGFpbnRJbmZvLCBjb25zdCBMYXlvdXRQb2ludCYg cGFpbnRPZmZzZXQsCiAgICAgICAgIHNlbGVjdGlvblN0YXJ0RW5kKHNQb3MsIGVQb3MpOwogCiAg ICAgaWYgKG1fdHJ1bmNhdGlvbiAhPSBjTm9UcnVuY2F0aW9uKSB7Ci0gICAgICAgIHNQb3MgPSBz dGQ6Om1pbihzUG9zLCBzdGF0aWNfY2FzdDx1bnNpZ25lZD4obV90cnVuY2F0aW9uKSk7Ci0gICAg ICAgIGVQb3MgPSBzdGQ6Om1pbihlUG9zLCBzdGF0aWNfY2FzdDx1bnNpZ25lZD4obV90cnVuY2F0 aW9uKSk7CisgICAgICAgIHNQb3MgPSBzdGQ6Om1pbihzUG9zLCBtX3RydW5jYXRpb24pOworICAg ICAgICBlUG9zID0gc3RkOjptaW4oZVBvcywgbV90cnVuY2F0aW9uKTsKICAgICAgICAgbGVuZ3Ro ID0gbV90cnVuY2F0aW9uOwogICAgIH0KIApAQCAtNzIxLDcgKzcyMSw3IEBAIHZvaWQgSW5saW5l VGV4dEJveDo6c2VsZWN0aW9uU3RhcnRFbmQodW5zaWduZWQmIHNQb3MsIHVuc2lnbmVkJiBlUG9z KQogICAgIAogICAgIHNQb3MgPSBzdGFydFBvcyA+IG1fc3RhcnQgPyBzdGFydFBvcyAtIG1fc3Rh cnQgOiAwOwogICAgIGVQb3MgPSBlbmRQb3MgPiBtX3N0YXJ0ID8gZW5kUG9zIC0gbV9zdGFydCA6 IDA7Ci0gICAgZVBvcyA9IHN0ZDo6bWluKGVQb3MsIHN0YXRpY19jYXN0PHVuc2lnbmVkPihtX2xl bikpOworICAgIGVQb3MgPSBzdGQ6Om1pbihlUG9zLCBtX2xlbik7CiB9CiAKIHZvaWQgSW5saW5l VGV4dEJveDo6cGFpbnRTZWxlY3Rpb24oR3JhcGhpY3NDb250ZXh0KiBjb250ZXh0LCBjb25zdCBG bG9hdFBvaW50JiBib3hPcmlnaW4sIGNvbnN0IFJlbmRlclN0eWxlJiBzdHlsZSwgY29uc3QgRm9u dCYgZm9udCwgQ29sb3IgdGV4dENvbG9yKQpAQCAtNzUzLDggKzc1Myw4IEBAIHZvaWQgSW5saW5l VGV4dEJveDo6cGFpbnRTZWxlY3Rpb24oR3JhcGhpY3NDb250ZXh0KiBjb250ZXh0LCBjb25zdCBG bG9hdFBvaW50JiBiCiAgICAgdW5zaWduZWQgbGVuZ3RoID0gbV90cnVuY2F0aW9uICE9IGNOb1Ry dW5jYXRpb24gPyBtX3RydW5jYXRpb24gOiBtX2xlbjsKICAgICBTdHJpbmcgc3RyaW5nID0gcmVu ZGVyZXIoKS50ZXh0KCk7CiAKLSAgICBpZiAoc3RyaW5nLmxlbmd0aCgpICE9IHN0YXRpY19jYXN0 PHVuc2lnbmVkPihsZW5ndGgpIHx8IG1fc3RhcnQpIHsKLSAgICAgICAgQVNTRVJUX1dJVEhfU0VD VVJJVFlfSU1QTElDQVRJT04oc3RhdGljX2Nhc3Q8dW5zaWduZWQ+KG1fc3RhcnQgKyBsZW5ndGgp IDw9IHN0cmluZy5sZW5ndGgoKSk7CisgICAgaWYgKHN0cmluZy5sZW5ndGgoKSAhPSBsZW5ndGgg fHwgbV9zdGFydCkgeworICAgICAgICBBU1NFUlRfV0lUSF9TRUNVUklUWV9JTVBMSUNBVElPTiht X3N0YXJ0ICsgbGVuZ3RoIDw9IHN0cmluZy5sZW5ndGgoKSk7CiAgICAgICAgIHN0cmluZyA9IHN0 cmluZy5zdWJzdHJpbmdTaGFyaW5nSW1wbChtX3N0YXJ0LCBsZW5ndGgpOwogICAgIH0KIApAQCAt Nzg5LDcgKzc4OSw3IEBAIHZvaWQgSW5saW5lVGV4dEJveDo6cGFpbnRDb21wb3NpdGlvbkJhY2tn cm91bmQoR3JhcGhpY3NDb250ZXh0KiBjb250ZXh0LCBjb25zdCBGCiAgICAgdW5zaWduZWQgb2Zm c2V0ID0gbV9zdGFydDsKICAgICB1bnNpZ25lZCBzUG9zID0gc3RhcnRQb3MgPiBvZmZzZXQgPyBz dGFydFBvcyAtIG9mZnNldCA6IDA7CiAgICAgQVNTRVJUKGVuZFBvcyA+PSBvZmZzZXQpOwotICAg IHVuc2lnbmVkIGVQb3MgPSBzdGQ6Om1pbihlbmRQb3MgLSBvZmZzZXQsIHN0YXRpY19jYXN0PHVu c2lnbmVkPihtX2xlbikpOworICAgIHVuc2lnbmVkIGVQb3MgPSBzdGQ6Om1pbihlbmRQb3MgLSBv ZmZzZXQsIG1fbGVuKTsKIAogICAgIGlmIChzUG9zID49IGVQb3MpCiAgICAgICAgIHJldHVybjsK QEAgLTExMzksMTAgKzExMzksMTAgQEAgdm9pZCBJbmxpbmVUZXh0Qm94OjpwYWludERvY3VtZW50 TWFya2VyKEdyYXBoaWNzQ29udGV4dCogcHQsIGNvbnN0IEZsb2F0UG9pbnQmIGIKICAgICBpZiAo IW1hcmtlclNwYW5zV2hvbGVCb3ggfHwgZ3JhbW1hciB8fCBpc0RpY3RhdGlvbk1hcmtlcikgewog ICAgICAgICB1bnNpZ25lZCBzdGFydFBvc2l0aW9uID0gbWFya2VyLT5zdGFydE9mZnNldCgpID4g bV9zdGFydCA/IG1hcmtlci0+c3RhcnRPZmZzZXQoKSAtIG1fc3RhcnQgOiAwOwogICAgICAgICBB U1NFUlQobWFya2VyLT5lbmRPZmZzZXQoKSA+PSBtX3N0YXJ0KTsKLSAgICAgICAgdW5zaWduZWQg ZW5kUG9zaXRpb24gPSBzdGQ6Om1pbihtYXJrZXItPmVuZE9mZnNldCgpIC0gbV9zdGFydCwgc3Rh dGljX2Nhc3Q8dW5zaWduZWQ+KG1fbGVuKSk7CisgICAgICAgIHVuc2lnbmVkIGVuZFBvc2l0aW9u ID0gc3RkOjptaW4obWFya2VyLT5lbmRPZmZzZXQoKSAtIG1fc3RhcnQsIG1fbGVuKTsKICAgICAg ICAgCiAgICAgICAgIGlmIChtX3RydW5jYXRpb24gIT0gY05vVHJ1bmNhdGlvbikKLSAgICAgICAg ICAgIGVuZFBvc2l0aW9uID0gc3RkOjptaW4oZW5kUG9zaXRpb24sIHN0YXRpY19jYXN0PHVuc2ln bmVkPihtX3RydW5jYXRpb24pKTsKKyAgICAgICAgICAgIGVuZFBvc2l0aW9uID0gc3RkOjptaW4o ZW5kUG9zaXRpb24sIG1fdHJ1bmNhdGlvbik7CiAKICAgICAgICAgLy8gQ2FsY3VsYXRlIHN0YXJ0 ICYgd2lkdGgKICAgICAgICAgaW50IGRlbHRhWSA9IHJlbmRlcmVyKCkuc3R5bGUoKS5pc0ZsaXBw ZWRMaW5lc1dyaXRpbmdNb2RlKCkgPyBzZWxlY3Rpb25Cb3R0b20oKSAtIGxvZ2ljYWxCb3R0b20o KSA6IGxvZ2ljYWxUb3AoKSAtIHNlbGVjdGlvblRvcCgpOwpAQCAtMTE5MSw3ICsxMTkxLDcgQEAg dm9pZCBJbmxpbmVUZXh0Qm94OjpwYWludFRleHRNYXRjaE1hcmtlcihHcmFwaGljc0NvbnRleHQq IGNvbnRleHQsIGNvbnN0IEZsb2F0UG8KIAogICAgIHVuc2lnbmVkIHNQb3MgPSBtYXJrZXItPnN0 YXJ0T2Zmc2V0KCkgPiBtX3N0YXJ0ID8gbWFya2VyLT5zdGFydE9mZnNldCgpIC0gbV9zdGFydCA6 IDA7CiAgICAgQVNTRVJUKG1hcmtlci0+ZW5kT2Zmc2V0KCkgPj0gbV9zdGFydCk7Ci0gICAgdW5z aWduZWQgZVBvcyA9IHN0ZDo6bWluKG1hcmtlci0+ZW5kT2Zmc2V0KCkgLSBtX3N0YXJ0LCBzdGF0 aWNfY2FzdDx1bnNpZ25lZD4obV9sZW4pKTsKKyAgICB1bnNpZ25lZCBlUG9zID0gc3RkOjptaW4o bWFya2VyLT5lbmRPZmZzZXQoKSAtIG1fc3RhcnQsIG1fbGVuKTsKICAgICBUZXh0UnVuIHJ1biA9 IGNvbnN0cnVjdFRleHRSdW4oc3R5bGUsIGZvbnQpOwogCiAgICAgLy8gQWx3YXlzIGNvbXB1dGUg YW5kIHN0b3JlIHRoZSByZWN0IGFzc29jaWF0ZWQgd2l0aCB0aGlzIG1hcmtlci4gVGhlIGNvbXB1 dGVkIHJlY3QgaXMgaW4gYWJzb2x1dGUgY29vcmRpbmF0ZXMuCkBAIC0xMjI1LDcgKzEyMjUsNyBA QCB2b2lkIElubGluZVRleHRCb3g6OmNvbXB1dGVSZWN0Rm9yUmVwbGFjZW1lbnRNYXJrZXIoRG9j dW1lbnRNYXJrZXIqIG1hcmtlciwgY29ucwogICAgIAogICAgIHVuc2lnbmVkIHNQb3MgPSBtYXJr ZXItPnN0YXJ0T2Zmc2V0KCkgPiBtX3N0YXJ0ID8gbWFya2VyLT5zdGFydE9mZnNldCgpIC0gbV9z dGFydCA6IDA7CiAgICAgQVNTRVJUKG1hcmtlci0+ZW5kT2Zmc2V0KCkgPj0gbV9zdGFydCk7Ci0g ICAgdW5zaWduZWQgZVBvcyA9IHN0ZDo6bWluKG1hcmtlci0+ZW5kT2Zmc2V0KCkgLSBtX3N0YXJ0 LCAodW5zaWduZWQpbV9sZW4pOworICAgIHVuc2lnbmVkIGVQb3MgPSBzdGQ6Om1pbihtYXJrZXIt PmVuZE9mZnNldCgpIC0gbV9zdGFydCwgbV9sZW4pOwogICAgIFRleHRSdW4gcnVuID0gY29uc3Ry dWN0VGV4dFJ1bihzdHlsZSwgZm9udCk7CiAKICAgICAvLyBDb21wdXRlIGFuZCBzdG9yZSB0aGUg cmVjdCBhc3NvY2lhdGVkIHdpdGggdGhpcyBtYXJrZXIuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvSW5saW5lVGV4dEJveC5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L0lubGluZVRleHRCb3guaAppbmRleCA3ZDNmNWI2NmVmZDgzMTk1NjQ4ZWZiODJiZDNkYmE5MDUz YTJkNGZjLi5lNjcyNzYzYTViZDEwYjJiMDNlMWZhZTk1MWRjNWIyNzU3ZjE0NzI1IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSW5saW5lVGV4dEJveC5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9JbmxpbmVUZXh0Qm94LmgKQEAgLTM0LDggKzM0LDggQEAgc3Ry dWN0IENvbXBvc2l0aW9uVW5kZXJsaW5lOwogY2xhc3MgRG9jdW1lbnRNYXJrZXI7CiBjbGFzcyBU ZXh0UGFpbnRlcjsKIAotY29uc3QgdW5zaWduZWQgc2hvcnQgY05vVHJ1bmNhdGlvbiA9IFVTSFJU X01BWDsKLWNvbnN0IHVuc2lnbmVkIHNob3J0IGNGdWxsVHJ1bmNhdGlvbiA9IFVTSFJUX01BWCAt IDE7Citjb25zdCB1bnNpZ25lZCBjTm9UcnVuY2F0aW9uID0gVUlOVF9NQVg7Citjb25zdCB1bnNp Z25lZCBjRnVsbFRydW5jYXRpb24gPSBVSU5UX01BWCAtIDE7CiAKIGNsYXNzIEJ1ZmZlckZvckFw cGVuZGluZ0h5cGhlbiA6IHB1YmxpYyBTdHJpbmdCdWlsZGVyIHsKIHB1YmxpYzoKQEAgLTc1LDcg Kzc1LDcgQEAgcHVibGljOgogCiAgICAgdm9pZCBvZmZzZXRSdW4oaW50IGQpIHsgQVNTRVJUKCFp c0RpcnR5KCkpOyBtX3N0YXJ0ICs9IGQ7IH0KIAotICAgIHVuc2lnbmVkIHNob3J0IHRydW5jYXRp b24oKSBjb25zdCB7IHJldHVybiBtX3RydW5jYXRpb247IH0KKyAgICB1bnNpZ25lZCB0cnVuY2F0 aW9uKCkgY29uc3QgeyByZXR1cm4gbV90cnVuY2F0aW9uOyB9CiAKICAgICB2aXJ0dWFsIHZvaWQg bWFya0RpcnR5KGJvb2wgZGlydHkgPSB0cnVlKSBvdmVycmlkZSBmaW5hbDsKIApAQCAtMTg4LDEx ICsxODgsMTEgQEAgcHJpdmF0ZToKICAgICBJbmxpbmVUZXh0Qm94KiBtX25leHRUZXh0Qm94OyAv LyBUaGUgbmV4dCBib3ggdGhhdCBhbHNvIHVzZXMgb3VyIFJlbmRlck9iamVjdAogCiAgICAgdW5z aWduZWQgbV9zdGFydDsKLSAgICB1bnNpZ25lZCBzaG9ydCBtX2xlbjsKKyAgICB1bnNpZ25lZCBt X2xlbjsKIAogICAgIC8vIFdoZXJlIHRvIHRydW5jYXRlIHdoZW4gdGV4dCBvdmVyZmxvdyBpcyBh cHBsaWVkLiBXZSB1c2Ugc3BlY2lhbCBjb25zdGFudHMgdG8KICAgICAvLyBkZW5vdGUgbm8gdHJ1 bmNhdGlvbiAodGhlIHdob2xlIHJ1biBwYWludHMpIGFuZCBmdWxsIHRydW5jYXRpb24gKG5vdGhp bmcgcGFpbnRzIGF0IGFsbCkuCi0gICAgdW5zaWduZWQgc2hvcnQgbV90cnVuY2F0aW9uOworICAg IHVuc2lnbmVkIG1fdHJ1bmNhdGlvbjsKIH07CiAKIElOTElORV9CT1hfT0JKRUNUX1RZUEVfQ0FT VFMoSW5saW5lVGV4dEJveCwgaXNJbmxpbmVUZXh0Qm94KCkpCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dExpbmVCb3hlcy5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyVGV4dExpbmVCb3hlcy5jcHAKaW5kZXggOGFlMGQ2MGMxYzczMzAz ZTE3NjhlMjlkYzMyMjBkYTk1ODhiYmYwNy4uM2FjNjhhNDVmMWQxNDRiYThiNGVjZWQyZGE2YzFi NGU1NmYxZDkyYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRl eHRMaW5lQm94ZXMuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0 TGluZUJveGVzLmNwcApAQCAtNDY0LDcgKzQ2NCw3IEBAIHZvaWQgUmVuZGVyVGV4dExpbmVCb3hl czo6c2V0U2VsZWN0aW9uU3RhdGUoUmVuZGVyVGV4dCYgcmVuZGVyZXIsIFJlbmRlck9iamVjdDo6 CiAKIHN0YXRpYyBJbnRSZWN0IGVsbGlwc2lzUmVjdEZvckJveChjb25zdCBJbmxpbmVUZXh0Qm94 JiBib3gsIHVuc2lnbmVkIHN0YXJ0LCB1bnNpZ25lZCBlbmQpCiB7Ci0gICAgdW5zaWduZWQgc2hv cnQgdHJ1bmNhdGlvbiA9IGJveC50cnVuY2F0aW9uKCk7CisgICAgdW5zaWduZWQgdHJ1bmNhdGlv biA9IGJveC50cnVuY2F0aW9uKCk7CiAgICAgaWYgKHRydW5jYXRpb24gPT0gY05vVHJ1bmNhdGlv bikKICAgICAgICAgcmV0dXJuIEludFJlY3QoKTsKIApAQCAtNDczLDggKzQ3Myw5IEBAIHN0YXRp YyBJbnRSZWN0IGVsbGlwc2lzUmVjdEZvckJveChjb25zdCBJbmxpbmVUZXh0Qm94JiBib3gsIHVu c2lnbmVkIHN0YXJ0LCB1bnNpCiAgICAgICAgIHJldHVybiBJbnRSZWN0KCk7CiAgICAgCiAgICAg SW50UmVjdCByZWN0OwotICAgIGludCBlbGxpcHNpc1N0YXJ0UG9zaXRpb24gPSBzdGQ6Om1heDxp bnQ+KHN0YXJ0IC0gYm94LnN0YXJ0KCksIDApOwotICAgIGludCBlbGxpcHNpc0VuZFBvc2l0aW9u ID0gc3RkOjptaW48aW50PihlbmQgLSBib3guc3RhcnQoKSwgYm94LmxlbigpKTsKKyAgICB1bnNp Z25lZCBlbGxpcHNpc1N0YXJ0UG9zaXRpb24gPSBzdGFydCA+IGJveC5zdGFydCgpID8gc3RhcnQg LSBib3guc3RhcnQoKSA6IDA7CisgICAgQVNTRVJUKGVuZCA+PSBib3guc3RhcnQoKSk7CisgICAg dW5zaWduZWQgZWxsaXBzaXNFbmRQb3NpdGlvbiA9IHN0ZDo6bWluKGVuZCAtIGJveC5zdGFydCgp LCBib3gubGVuKCkpOwogICAgIAogICAgIC8vIFRoZSBlbGxpcHNpcyBzaG91bGQgYmUgY29uc2lk ZXJlZCB0byBiZSBzZWxlY3RlZCBpZiB0aGUgZW5kIG9mCiAgICAgLy8gdGhlIHNlbGVjdGlvbiBp cyBwYXN0IHRoZSBiZWdpbm5pbmcgb2YgdGhlIHRydW5jYXRpb24gYW5kIHRoZQo= 233670 2014-06-23 19:46:58 -0700 2014-06-24 12:53:52 -0700 Patch bug-134173-20140623194637.patch text/plain 9680 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMTcwMzQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmU1NzY5OWMzZGQxODQz YjZhYWM3YTc2ZDA0ZTRkYzZiMjIwMjVmZi4uMjg3N2I3YTEzMjIyMzRkNzZiYjJlMDEyMjMwYzc0 M2M0OTRjYzQyNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDE0LTA2LTIzICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgSW5saW5lVGV4 dEJveCdzIG1fbGVuIGNhbiBiZSBhbiB1bnNpZ25lZCAocmF0aGVyIHRoYW4gYW4gdW5zaWduZWQg c2hvcnQpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x MzQxNzMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBB ZnRlciBaYWxhbidzIHRhbGtzIHdpdGggS2xpbmcsIGl0IHNlZW1zIHRoYXQgdGhlIHNpbXBsZSBs aW5lIGxheW91dCBjb2RlCisgICAgICAgIG1pZ2h0IGFsbGV2aWF0ZSB0aGUgbmVlZCBmb3IgdGhl IHNwYWNlIHNhdmluZ3MgaW4gSW5saW5lVGV4dEJveC4gR2l2ZW4gdGhpcywKKyAgICAgICAgaXQg d291bGQgYmUgYmVuZWZpY2lhbCB0byBiZSBhIGxpdHRsZSBtb3JlIHNhZmUgYnkgdXNpbmcgdW5z aWduZWRzIHRocm91Z2hvdXQuCisKKyAgICAgICAgRm9yIGV4YW1wbGUsIHdlIGhhdmUgY29kZSBs aWtlICJ2b2lkIHNldExlbih1bnNpZ25lZCBsZW4pIHsgbV9sZW4gPSBsZW47IH0iCisgICAgICAg IHdoaWNoIG1pZ2h0IHNpbGVudGx5IGJyZWFrIGlmIGdpdmVuIHBhcnRpY3VsYXIgaW5wdXRzLgor CisgICAgICAgIE5vIG5ldyB0ZXN0cyBiZWNhdXNlIHRoZXJlIGlzIG5vIGJlaGF2aW9yIGNoYW5n ZS4KKworICAgICAgICAqIHJlbmRlcmluZy9JbmxpbmVUZXh0Qm94LmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OklubGluZVRleHRCb3g6OmlzU2VsZWN0ZWQpOgorICAgICAgICAoV2ViQ29yZTo6SW5s aW5lVGV4dEJveDo6bG9jYWxTZWxlY3Rpb25SZWN0KToKKyAgICAgICAgKFdlYkNvcmU6OklubGlu ZVRleHRCb3g6OnBhaW50KToKKyAgICAgICAgKFdlYkNvcmU6OklubGluZVRleHRCb3g6OnNlbGVj dGlvblN0YXJ0RW5kKToKKyAgICAgICAgKFdlYkNvcmU6OklubGluZVRleHRCb3g6OnBhaW50U2Vs ZWN0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OklubGluZVRleHRCb3g6OnBhaW50Q29tcG9zaXRp b25CYWNrZ3JvdW5kKToKKyAgICAgICAgKFdlYkNvcmU6OklubGluZVRleHRCb3g6OnBhaW50RG9j dW1lbnRNYXJrZXIpOgorICAgICAgICAoV2ViQ29yZTo6SW5saW5lVGV4dEJveDo6cGFpbnRUZXh0 TWF0Y2hNYXJrZXIpOgorICAgICAgICAoV2ViQ29yZTo6SW5saW5lVGV4dEJveDo6Y29tcHV0ZVJl Y3RGb3JSZXBsYWNlbWVudE1hcmtlcik6CisgICAgICAgICogcmVuZGVyaW5nL0lubGluZVRleHRC b3guaDoKKyAgICAgICAgKFdlYkNvcmU6OklubGluZVRleHRCb3g6OnRydW5jYXRpb24pOgorICAg ICAgICAqIHJlbmRlcmluZy9SZW5kZXJUZXh0TGluZUJveGVzLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OmVsbGlwc2lzUmVjdEZvckJveCk6CisKIDIwMTQtMDYtMjMgIEtyenlzenRvZiBDemVjaCAg PGsuY3plY2hAc2Ftc3VuZy5jb20+CiAKICAgICAgICAgW0FUS10gUmVtb3ZlIHNvbWUgdW5uZWNl c3NhcnkgY29kZSBmcm9tIFdlYktpdEFjY2Vzc2libGVXcmFwcGVyQXRrCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSW5saW5lVGV4dEJveC5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvSW5saW5lVGV4dEJveC5jcHAKaW5kZXggYzNjOTZhMzQ5Y2ZjOTg3ODEyYzk0 ZDE2MWYzZWVhNjJlYjE4NTg1MS4uNDY0OWJiNGQ4Y2ZmOTU4YTY5ODNlZGQ5MjhhYWFjMGFiMTg3 OWYxNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0lubGluZVRleHRCb3gu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9JbmxpbmVUZXh0Qm94LmNwcApAQCAt NTksNyArNTksNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIHN0cnVjdCBTYW1lU2l6ZUFzSW5s aW5lVGV4dEJveCA6IHB1YmxpYyBJbmxpbmVCb3ggewogICAgIHVuc2lnbmVkIHZhcmlhYmxlc1sx XTsKLSAgICB1bnNpZ25lZCBzaG9ydCB2YXJpYWJsZXMyWzJdOworICAgIHVuc2lnbmVkIHZhcmlh YmxlczJbMl07CiAgICAgdm9pZCogcG9pbnRlcnNbMl07CiB9OwogCkBAIC0yMDEsNyArMjAxLDcg QEAgYm9vbCBJbmxpbmVUZXh0Qm94Ojppc1NlbGVjdGVkKHVuc2lnbmVkIHN0YXJ0UG9zLCB1bnNp Z25lZCBlbmRQb3MpIGNvbnN0CiAgICAgdW5zaWduZWQgc1BvcyA9IHN0YXJ0UG9zID4gbV9zdGFy dCA/IHN0YXJ0UG9zIC0gbV9zdGFydCA6IDA7CiAgICAgaWYgKGVuZFBvcyA8PSBtX3N0YXJ0KQog ICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgdW5zaWduZWQgZVBvcyA9IHN0ZDo6bWluKGVuZFBv cyAtIG1fc3RhcnQsIHN0YXRpY19jYXN0PHVuc2lnbmVkPihtX2xlbikpOworICAgIHVuc2lnbmVk IGVQb3MgPSBzdGQ6Om1pbihlbmRQb3MgLSBtX3N0YXJ0LCBtX2xlbik7CiAgICAgcmV0dXJuIHNQ b3MgPCBlUG9zOwogfQogCkBAIC0yNzgsNyArMjc4LDcgQEAgTGF5b3V0UmVjdCBJbmxpbmVUZXh0 Qm94Ojpsb2NhbFNlbGVjdGlvblJlY3QodW5zaWduZWQgc3RhcnRQb3MsIHVuc2lnbmVkIGVuZFBv cykKICAgICBpZiAoZW5kUG9zIDwgbV9zdGFydCkKICAgICAgICAgcmV0dXJuIExheW91dFJlY3Qo KTsKIAotICAgIHVuc2lnbmVkIGVQb3MgPSBzdGQ6Om1pbihlbmRQb3MgLSBtX3N0YXJ0LCBzdGF0 aWNfY2FzdDx1bnNpZ25lZD4obV9sZW4pKTsKKyAgICB1bnNpZ25lZCBlUG9zID0gc3RkOjptaW4o ZW5kUG9zIC0gbV9zdGFydCwgbV9sZW4pOwogICAgIAogICAgIGlmIChzUG9zID4gZVBvcykKICAg ICAgICAgcmV0dXJuIExheW91dFJlY3QoKTsKQEAgLTY0MCw4ICs2NDAsOCBAQCB2b2lkIElubGlu ZVRleHRCb3g6OnBhaW50KFBhaW50SW5mbyYgcGFpbnRJbmZvLCBjb25zdCBMYXlvdXRQb2ludCYg cGFpbnRPZmZzZXQsCiAgICAgICAgIHNlbGVjdGlvblN0YXJ0RW5kKHNQb3MsIGVQb3MpOwogCiAg ICAgaWYgKG1fdHJ1bmNhdGlvbiAhPSBjTm9UcnVuY2F0aW9uKSB7Ci0gICAgICAgIHNQb3MgPSBz dGQ6Om1pbihzUG9zLCBzdGF0aWNfY2FzdDx1bnNpZ25lZD4obV90cnVuY2F0aW9uKSk7Ci0gICAg ICAgIGVQb3MgPSBzdGQ6Om1pbihlUG9zLCBzdGF0aWNfY2FzdDx1bnNpZ25lZD4obV90cnVuY2F0 aW9uKSk7CisgICAgICAgIHNQb3MgPSBzdGQ6Om1pbihzUG9zLCBtX3RydW5jYXRpb24pOworICAg ICAgICBlUG9zID0gc3RkOjptaW4oZVBvcywgbV90cnVuY2F0aW9uKTsKICAgICAgICAgbGVuZ3Ro ID0gbV90cnVuY2F0aW9uOwogICAgIH0KIApAQCAtNzIxLDcgKzcyMSw3IEBAIHZvaWQgSW5saW5l VGV4dEJveDo6c2VsZWN0aW9uU3RhcnRFbmQodW5zaWduZWQmIHNQb3MsIHVuc2lnbmVkJiBlUG9z KQogICAgIAogICAgIHNQb3MgPSBzdGFydFBvcyA+IG1fc3RhcnQgPyBzdGFydFBvcyAtIG1fc3Rh cnQgOiAwOwogICAgIGVQb3MgPSBlbmRQb3MgPiBtX3N0YXJ0ID8gZW5kUG9zIC0gbV9zdGFydCA6 IDA7Ci0gICAgZVBvcyA9IHN0ZDo6bWluKGVQb3MsIHN0YXRpY19jYXN0PHVuc2lnbmVkPihtX2xl bikpOworICAgIGVQb3MgPSBzdGQ6Om1pbihlUG9zLCBtX2xlbik7CiB9CiAKIHZvaWQgSW5saW5l VGV4dEJveDo6cGFpbnRTZWxlY3Rpb24oR3JhcGhpY3NDb250ZXh0KiBjb250ZXh0LCBjb25zdCBG bG9hdFBvaW50JiBib3hPcmlnaW4sIGNvbnN0IFJlbmRlclN0eWxlJiBzdHlsZSwgY29uc3QgRm9u dCYgZm9udCwgQ29sb3IgdGV4dENvbG9yKQpAQCAtNzUzLDggKzc1Myw4IEBAIHZvaWQgSW5saW5l VGV4dEJveDo6cGFpbnRTZWxlY3Rpb24oR3JhcGhpY3NDb250ZXh0KiBjb250ZXh0LCBjb25zdCBG bG9hdFBvaW50JiBiCiAgICAgdW5zaWduZWQgbGVuZ3RoID0gbV90cnVuY2F0aW9uICE9IGNOb1Ry dW5jYXRpb24gPyBtX3RydW5jYXRpb24gOiBtX2xlbjsKICAgICBTdHJpbmcgc3RyaW5nID0gcmVu ZGVyZXIoKS50ZXh0KCk7CiAKLSAgICBpZiAoc3RyaW5nLmxlbmd0aCgpICE9IHN0YXRpY19jYXN0 PHVuc2lnbmVkPihsZW5ndGgpIHx8IG1fc3RhcnQpIHsKLSAgICAgICAgQVNTRVJUX1dJVEhfU0VD VVJJVFlfSU1QTElDQVRJT04oc3RhdGljX2Nhc3Q8dW5zaWduZWQ+KG1fc3RhcnQgKyBsZW5ndGgp IDw9IHN0cmluZy5sZW5ndGgoKSk7CisgICAgaWYgKHN0cmluZy5sZW5ndGgoKSAhPSBsZW5ndGgg fHwgbV9zdGFydCkgeworICAgICAgICBBU1NFUlRfV0lUSF9TRUNVUklUWV9JTVBMSUNBVElPTiht X3N0YXJ0ICsgbGVuZ3RoIDw9IHN0cmluZy5sZW5ndGgoKSk7CiAgICAgICAgIHN0cmluZyA9IHN0 cmluZy5zdWJzdHJpbmdTaGFyaW5nSW1wbChtX3N0YXJ0LCBsZW5ndGgpOwogICAgIH0KIApAQCAt Nzg5LDcgKzc4OSw3IEBAIHZvaWQgSW5saW5lVGV4dEJveDo6cGFpbnRDb21wb3NpdGlvbkJhY2tn cm91bmQoR3JhcGhpY3NDb250ZXh0KiBjb250ZXh0LCBjb25zdCBGCiAgICAgdW5zaWduZWQgb2Zm c2V0ID0gbV9zdGFydDsKICAgICB1bnNpZ25lZCBzUG9zID0gc3RhcnRQb3MgPiBvZmZzZXQgPyBz dGFydFBvcyAtIG9mZnNldCA6IDA7CiAgICAgQVNTRVJUKGVuZFBvcyA+PSBvZmZzZXQpOwotICAg IHVuc2lnbmVkIGVQb3MgPSBzdGQ6Om1pbihlbmRQb3MgLSBvZmZzZXQsIHN0YXRpY19jYXN0PHVu c2lnbmVkPihtX2xlbikpOworICAgIHVuc2lnbmVkIGVQb3MgPSBzdGQ6Om1pbihlbmRQb3MgLSBv ZmZzZXQsIG1fbGVuKTsKIAogICAgIGlmIChzUG9zID49IGVQb3MpCiAgICAgICAgIHJldHVybjsK QEAgLTExMzksMTAgKzExMzksMTAgQEAgdm9pZCBJbmxpbmVUZXh0Qm94OjpwYWludERvY3VtZW50 TWFya2VyKEdyYXBoaWNzQ29udGV4dCogcHQsIGNvbnN0IEZsb2F0UG9pbnQmIGIKICAgICBpZiAo IW1hcmtlclNwYW5zV2hvbGVCb3ggfHwgZ3JhbW1hciB8fCBpc0RpY3RhdGlvbk1hcmtlcikgewog ICAgICAgICB1bnNpZ25lZCBzdGFydFBvc2l0aW9uID0gbWFya2VyLT5zdGFydE9mZnNldCgpID4g bV9zdGFydCA/IG1hcmtlci0+c3RhcnRPZmZzZXQoKSAtIG1fc3RhcnQgOiAwOwogICAgICAgICBB U1NFUlQobWFya2VyLT5lbmRPZmZzZXQoKSA+PSBtX3N0YXJ0KTsKLSAgICAgICAgdW5zaWduZWQg ZW5kUG9zaXRpb24gPSBzdGQ6Om1pbihtYXJrZXItPmVuZE9mZnNldCgpIC0gbV9zdGFydCwgc3Rh dGljX2Nhc3Q8dW5zaWduZWQ+KG1fbGVuKSk7CisgICAgICAgIHVuc2lnbmVkIGVuZFBvc2l0aW9u ID0gc3RkOjptaW4obWFya2VyLT5lbmRPZmZzZXQoKSAtIG1fc3RhcnQsIG1fbGVuKTsKICAgICAg ICAgCiAgICAgICAgIGlmIChtX3RydW5jYXRpb24gIT0gY05vVHJ1bmNhdGlvbikKLSAgICAgICAg ICAgIGVuZFBvc2l0aW9uID0gc3RkOjptaW4oZW5kUG9zaXRpb24sIHN0YXRpY19jYXN0PHVuc2ln bmVkPihtX3RydW5jYXRpb24pKTsKKyAgICAgICAgICAgIGVuZFBvc2l0aW9uID0gc3RkOjptaW4o ZW5kUG9zaXRpb24sIG1fdHJ1bmNhdGlvbik7CiAKICAgICAgICAgLy8gQ2FsY3VsYXRlIHN0YXJ0 ICYgd2lkdGgKICAgICAgICAgaW50IGRlbHRhWSA9IHJlbmRlcmVyKCkuc3R5bGUoKS5pc0ZsaXBw ZWRMaW5lc1dyaXRpbmdNb2RlKCkgPyBzZWxlY3Rpb25Cb3R0b20oKSAtIGxvZ2ljYWxCb3R0b20o KSA6IGxvZ2ljYWxUb3AoKSAtIHNlbGVjdGlvblRvcCgpOwpAQCAtMTE5MSw3ICsxMTkxLDcgQEAg dm9pZCBJbmxpbmVUZXh0Qm94OjpwYWludFRleHRNYXRjaE1hcmtlcihHcmFwaGljc0NvbnRleHQq IGNvbnRleHQsIGNvbnN0IEZsb2F0UG8KIAogICAgIHVuc2lnbmVkIHNQb3MgPSBtYXJrZXItPnN0 YXJ0T2Zmc2V0KCkgPiBtX3N0YXJ0ID8gbWFya2VyLT5zdGFydE9mZnNldCgpIC0gbV9zdGFydCA6 IDA7CiAgICAgQVNTRVJUKG1hcmtlci0+ZW5kT2Zmc2V0KCkgPj0gbV9zdGFydCk7Ci0gICAgdW5z aWduZWQgZVBvcyA9IHN0ZDo6bWluKG1hcmtlci0+ZW5kT2Zmc2V0KCkgLSBtX3N0YXJ0LCBzdGF0 aWNfY2FzdDx1bnNpZ25lZD4obV9sZW4pKTsKKyAgICB1bnNpZ25lZCBlUG9zID0gc3RkOjptaW4o bWFya2VyLT5lbmRPZmZzZXQoKSAtIG1fc3RhcnQsIG1fbGVuKTsKICAgICBUZXh0UnVuIHJ1biA9 IGNvbnN0cnVjdFRleHRSdW4oc3R5bGUsIGZvbnQpOwogCiAgICAgLy8gQWx3YXlzIGNvbXB1dGUg YW5kIHN0b3JlIHRoZSByZWN0IGFzc29jaWF0ZWQgd2l0aCB0aGlzIG1hcmtlci4gVGhlIGNvbXB1 dGVkIHJlY3QgaXMgaW4gYWJzb2x1dGUgY29vcmRpbmF0ZXMuCkBAIC0xMjI1LDcgKzEyMjUsNyBA QCB2b2lkIElubGluZVRleHRCb3g6OmNvbXB1dGVSZWN0Rm9yUmVwbGFjZW1lbnRNYXJrZXIoRG9j dW1lbnRNYXJrZXIqIG1hcmtlciwgY29ucwogICAgIAogICAgIHVuc2lnbmVkIHNQb3MgPSBtYXJr ZXItPnN0YXJ0T2Zmc2V0KCkgPiBtX3N0YXJ0ID8gbWFya2VyLT5zdGFydE9mZnNldCgpIC0gbV9z dGFydCA6IDA7CiAgICAgQVNTRVJUKG1hcmtlci0+ZW5kT2Zmc2V0KCkgPj0gbV9zdGFydCk7Ci0g ICAgdW5zaWduZWQgZVBvcyA9IHN0ZDo6bWluKG1hcmtlci0+ZW5kT2Zmc2V0KCkgLSBtX3N0YXJ0 LCAodW5zaWduZWQpbV9sZW4pOworICAgIHVuc2lnbmVkIGVQb3MgPSBzdGQ6Om1pbihtYXJrZXIt PmVuZE9mZnNldCgpIC0gbV9zdGFydCwgbV9sZW4pOwogICAgIFRleHRSdW4gcnVuID0gY29uc3Ry dWN0VGV4dFJ1bihzdHlsZSwgZm9udCk7CiAKICAgICAvLyBDb21wdXRlIGFuZCBzdG9yZSB0aGUg cmVjdCBhc3NvY2lhdGVkIHdpdGggdGhpcyBtYXJrZXIuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvSW5saW5lVGV4dEJveC5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L0lubGluZVRleHRCb3guaAppbmRleCA3ZDNmNWI2NmVmZDgzMTk1NjQ4ZWZiODJiZDNkYmE5MDUz YTJkNGZjLi5lNjcyNzYzYTViZDEwYjJiMDNlMWZhZTk1MWRjNWIyNzU3ZjE0NzI1IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSW5saW5lVGV4dEJveC5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9JbmxpbmVUZXh0Qm94LmgKQEAgLTM0LDggKzM0LDggQEAgc3Ry dWN0IENvbXBvc2l0aW9uVW5kZXJsaW5lOwogY2xhc3MgRG9jdW1lbnRNYXJrZXI7CiBjbGFzcyBU ZXh0UGFpbnRlcjsKIAotY29uc3QgdW5zaWduZWQgc2hvcnQgY05vVHJ1bmNhdGlvbiA9IFVTSFJU X01BWDsKLWNvbnN0IHVuc2lnbmVkIHNob3J0IGNGdWxsVHJ1bmNhdGlvbiA9IFVTSFJUX01BWCAt IDE7Citjb25zdCB1bnNpZ25lZCBjTm9UcnVuY2F0aW9uID0gVUlOVF9NQVg7Citjb25zdCB1bnNp Z25lZCBjRnVsbFRydW5jYXRpb24gPSBVSU5UX01BWCAtIDE7CiAKIGNsYXNzIEJ1ZmZlckZvckFw cGVuZGluZ0h5cGhlbiA6IHB1YmxpYyBTdHJpbmdCdWlsZGVyIHsKIHB1YmxpYzoKQEAgLTc1LDcg Kzc1LDcgQEAgcHVibGljOgogCiAgICAgdm9pZCBvZmZzZXRSdW4oaW50IGQpIHsgQVNTRVJUKCFp c0RpcnR5KCkpOyBtX3N0YXJ0ICs9IGQ7IH0KIAotICAgIHVuc2lnbmVkIHNob3J0IHRydW5jYXRp b24oKSBjb25zdCB7IHJldHVybiBtX3RydW5jYXRpb247IH0KKyAgICB1bnNpZ25lZCB0cnVuY2F0 aW9uKCkgY29uc3QgeyByZXR1cm4gbV90cnVuY2F0aW9uOyB9CiAKICAgICB2aXJ0dWFsIHZvaWQg bWFya0RpcnR5KGJvb2wgZGlydHkgPSB0cnVlKSBvdmVycmlkZSBmaW5hbDsKIApAQCAtMTg4LDEx ICsxODgsMTEgQEAgcHJpdmF0ZToKICAgICBJbmxpbmVUZXh0Qm94KiBtX25leHRUZXh0Qm94OyAv LyBUaGUgbmV4dCBib3ggdGhhdCBhbHNvIHVzZXMgb3VyIFJlbmRlck9iamVjdAogCiAgICAgdW5z aWduZWQgbV9zdGFydDsKLSAgICB1bnNpZ25lZCBzaG9ydCBtX2xlbjsKKyAgICB1bnNpZ25lZCBt X2xlbjsKIAogICAgIC8vIFdoZXJlIHRvIHRydW5jYXRlIHdoZW4gdGV4dCBvdmVyZmxvdyBpcyBh cHBsaWVkLiBXZSB1c2Ugc3BlY2lhbCBjb25zdGFudHMgdG8KICAgICAvLyBkZW5vdGUgbm8gdHJ1 bmNhdGlvbiAodGhlIHdob2xlIHJ1biBwYWludHMpIGFuZCBmdWxsIHRydW5jYXRpb24gKG5vdGhp bmcgcGFpbnRzIGF0IGFsbCkuCi0gICAgdW5zaWduZWQgc2hvcnQgbV90cnVuY2F0aW9uOworICAg IHVuc2lnbmVkIG1fdHJ1bmNhdGlvbjsKIH07CiAKIElOTElORV9CT1hfT0JKRUNUX1RZUEVfQ0FT VFMoSW5saW5lVGV4dEJveCwgaXNJbmxpbmVUZXh0Qm94KCkpCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dExpbmVCb3hlcy5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyVGV4dExpbmVCb3hlcy5jcHAKaW5kZXggOGFlMGQ2MGMxYzczMzAz ZTE3NjhlMjlkYzMyMjBkYTk1ODhiYmYwNy4uM2FjNjhhNDVmMWQxNDRiYThiNGVjZWQyZGE2YzFi NGU1NmYxZDkyYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRl eHRMaW5lQm94ZXMuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0 TGluZUJveGVzLmNwcApAQCAtNDY0LDcgKzQ2NCw3IEBAIHZvaWQgUmVuZGVyVGV4dExpbmVCb3hl czo6c2V0U2VsZWN0aW9uU3RhdGUoUmVuZGVyVGV4dCYgcmVuZGVyZXIsIFJlbmRlck9iamVjdDo6 CiAKIHN0YXRpYyBJbnRSZWN0IGVsbGlwc2lzUmVjdEZvckJveChjb25zdCBJbmxpbmVUZXh0Qm94 JiBib3gsIHVuc2lnbmVkIHN0YXJ0LCB1bnNpZ25lZCBlbmQpCiB7Ci0gICAgdW5zaWduZWQgc2hv cnQgdHJ1bmNhdGlvbiA9IGJveC50cnVuY2F0aW9uKCk7CisgICAgdW5zaWduZWQgdHJ1bmNhdGlv biA9IGJveC50cnVuY2F0aW9uKCk7CiAgICAgaWYgKHRydW5jYXRpb24gPT0gY05vVHJ1bmNhdGlv bikKICAgICAgICAgcmV0dXJuIEludFJlY3QoKTsKIApAQCAtNDczLDggKzQ3Myw5IEBAIHN0YXRp YyBJbnRSZWN0IGVsbGlwc2lzUmVjdEZvckJveChjb25zdCBJbmxpbmVUZXh0Qm94JiBib3gsIHVu c2lnbmVkIHN0YXJ0LCB1bnNpCiAgICAgICAgIHJldHVybiBJbnRSZWN0KCk7CiAgICAgCiAgICAg SW50UmVjdCByZWN0OwotICAgIGludCBlbGxpcHNpc1N0YXJ0UG9zaXRpb24gPSBzdGQ6Om1heDxp bnQ+KHN0YXJ0IC0gYm94LnN0YXJ0KCksIDApOwotICAgIGludCBlbGxpcHNpc0VuZFBvc2l0aW9u ID0gc3RkOjptaW48aW50PihlbmQgLSBib3guc3RhcnQoKSwgYm94LmxlbigpKTsKKyAgICB1bnNp Z25lZCBlbGxpcHNpc1N0YXJ0UG9zaXRpb24gPSBzdGFydCA+IGJveC5zdGFydCgpID8gc3RhcnQg LSBib3guc3RhcnQoKSA6IDA7CisgICAgQVNTRVJUKGVuZCA+PSBib3guc3RhcnQoKSk7CisgICAg dW5zaWduZWQgZWxsaXBzaXNFbmRQb3NpdGlvbiA9IHN0ZDo6bWluKGVuZCAtIGJveC5zdGFydCgp LCBib3gubGVuKCkpOwogICAgIAogICAgIC8vIFRoZSBlbGxpcHNpcyBzaG91bGQgYmUgY29uc2lk ZXJlZCB0byBiZSBzZWxlY3RlZCBpZiB0aGUgZW5kIG9mCiAgICAgLy8gdGhlIHNlbGVjdGlvbiBp cyBwYXN0IHRoZSBiZWdpbm5pbmcgb2YgdGhlIHRydW5jYXRpb24gYW5kIHRoZQo=