74895 2011-12-19 15:38:29 -0800 Make all calls to NamedNodeMap::setAttributes go through Element 2011-12-19 23:49:37 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 adamk adamk darin rniwa webkit.review.bot oldest_to_newest 524231 0 adamk 2011-12-19 15:38:29 -0800 Make all calls to NamedNodeMap::setAttributes go through Element 524241 1 119932 adamk 2011-12-19 15:52:39 -0800 Created attachment 119932 Patch 524244 2 119932 rniwa 2011-12-19 15:55:31 -0800 Comment on attachment 119932 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=119932&action=review > Source/WebCore/editing/ReplaceNodeWithSpanCommand.cpp:66 > - newNode->attributes()->setAttributes(*nodeToReplace->attributes()); > + newNode->setAttributesFromElement(*nodeToReplace); I thought we're fixing this. 524245 3 119932 adamk 2011-12-19 16:01:01 -0800 Comment on attachment 119932 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=119932&action=review >> Source/WebCore/editing/ReplaceNodeWithSpanCommand.cpp:66 >> + newNode->setAttributesFromElement(*nodeToReplace); > > I thought we're fixing this. See the second paragraph of my ChangeLog; I want to do that in a followup, making this change just a refactor. I've added a FIXME. 524246 4 119933 adamk 2011-12-19 16:01:25 -0800 Created attachment 119933 Added FIXME 524254 5 119933 rniwa 2011-12-19 16:12:30 -0800 Comment on attachment 119933 Added FIXME View in context: https://bugs.webkit.org/attachment.cgi?id=119933&action=review > Source/WebCore/editing/ReplaceNodeWithSpanCommand.cpp:66 > + // FIXME: Fix this to send the proper MutationRecords of MutationObservers are present. s/of/when/ ? 524257 6 119938 adamk 2011-12-19 16:13:56 -0800 Created attachment 119938 Patch for landing 524460 7 119938 webkit.review.bot 2011-12-19 23:49:32 -0800 Comment on attachment 119938 Patch for landing Clearing flags on attachment: 119938 Committed r103307: <http://trac.webkit.org/changeset/103307> 524461 8 webkit.review.bot 2011-12-19 23:49:37 -0800 All reviewed patches have been landed. Closing bug. 119932 2011-12-19 15:52:39 -0800 2011-12-19 16:01:22 -0800 Patch bug-74895-20111219155238.patch text/plain 8291 adamk U3VidmVyc2lvbiBSZXZpc2lvbjogMTAzMjQwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDk1Nzk2NDk4YTU2Nzdl YmZmNTc2YmQxYTc1NDhjYzdhZGU0NmU0ZS4uMzE0MTQ0MzEwMzM1ZjkyMGMzNGJlZDA2NDM5ZmUy MDEyY2Q5NjUxZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM5IEBACisyMDExLTEyLTE5ICBBZGFt IEtsZWluICA8YWRhbWtAY2hyb21pdW0ub3JnPgorCisgICAgICAgIE1ha2UgYWxsIGNhbGxzIHRv IE5hbWVkTm9kZU1hcDo6c2V0QXR0cmlidXRlcyBnbyB0aHJvdWdoIEVsZW1lbnQKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc0ODk1CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlcmUgYXJlIHR3byByZWFz b25zIGZvciB0aGlzIGNoYW5nZS4gT25lIGlzIGFuIG9wdGltaXphdGlvbjogc29tZQorICAgICAg ICBjYWxsZXJzIHdlcmUgcHJldmlvdXNseSBhbHdheXMgY3JlYXRpbmcgYSBOYW1lZE5vZGVNYXAg ZXZlbiBpZiB0aGUKKyAgICAgICAgc291cmNlIGRpZG4ndCBoYXZlIGFueSBhdHRyaWJ1dGVzLgor CisgICAgICAgIFRoZSBvdGhlciByZWFzb24gaXMgZm9yd2FyZC1sb29raW5nOiBzZXRBdHRyaWJ1 dGVzJyBiZWhhdmlvciBpcyBzdWJ0bHkKKyAgICAgICAgd3JvbmcgaW4gdGhlIHByZXNlbmNlIG9m IE11dGF0aW9uT2JzZXJ2ZXJzLiBUaGlzIGRvZXNuJ3QgbWF0dGVyCisgICAgICAgIGZvciBtb3N0 IGNhbGxlcnMgc2luY2UgdGhlIGVsZW1lbnQgb24gd2hpY2ggc2V0QXR0cmlidXRlc0Zyb21FbGVt ZW50CisgICAgICAgIGlzIGNhbGxlZCBpcyBuZXdseS1jcmVhdGVkLiBJbiB0aGUgZWRpdGluZyBj YXNlLCBob3dldmVyLCBpdCBjb3VsZAorICAgICAgICBtYWtlIGEgZGlmZmVyZW5jZSBpbiBiZWhh dmlvciwgd2hpY2ggSSBob3BlIHRvIGZpeCBpbiBhIGZ1dHVyZSBjaGFuZ2UKKyAgICAgICAgd2l0 aG91dCBzYWNyaWZpY2luZyB0aGUgcGVyZm9ybWFuY2Ugb2YgY2xvbmVOb2RlKCkgb24gYW4gRWxl bWVudAorICAgICAgICAod2hpY2ggaXMgd2hhdCBOYW1lZE5vZGVNYXA6OnNldEF0dHJpYnV0ZXMg aXMgZGVzaWduZWQgZm9yKS4KKworICAgICAgICBObyBuZXcgdGVzdHMsIG5vIGNoYW5nZSBpbiBi ZWhhdmlvci4KKworICAgICAgICAqIGRvbS9FbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkVsZW1lbnQ6OmNsb25lRWxlbWVudFdpdGhvdXRDaGlsZHJlbik6IENhbGwgc2V0QXR0cmlidXRl c0Zyb21FbGVtZW50LgorICAgICAgICAqIGRvbS9FbGVtZW50Lmg6CisgICAgICAgIChXZWJDb3Jl OjpFbGVtZW50OjpzZXRBdHRyaWJ1dGVzRnJvbUVsZW1lbnQpOiBDcmVhdGUgbmV3IGlubGluZSBo ZWxwZXIgbWV0aG9kCisgICAgICAgIHdoaWNoIGNvbmRpdGlvbmFsbHkgZm9yd2FyZHMgdG8gTmFt ZWROb2RlTWFwOjpzZXRBdHRyaWJ1dGUuCisgICAgICAgICogZG9tL05hbWVkTm9kZU1hcC5oOiBN YWtlIHNldEF0dHJpYnV0ZXMgcHJpdmF0ZSAoRWxlbWVudCBpcyBhbHJlYWR5IGEgZnJpZW5kKS4K KyAgICAgICAgKiBlZGl0aW5nL1JlcGxhY2VOb2RlV2l0aFNwYW5Db21tYW5kLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OnN3YXBJbk5vZGVQcmVzZXJ2aW5nQXR0cmlidXRlc0FuZENoaWxkcmVuKTog Q2FsbCBzZXRBdHRyaWJ1dGVzRnJvbUVsZW1lbnQuCisgICAgICAgICogaW5zcGVjdG9yL0luc3Bl Y3RvckRPTUFnZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckRPTUFnZW50Ojpz ZXROb2RlTmFtZSk6IENhbGwgc2V0QXR0cmlidXRlc0Zyb21FbGVtZW50LgorICAgICAgICAqIHN2 Zy9TVkdVc2VFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNWR1VzZUVsZW1lbnQ6OmV4 cGFuZFN5bWJvbEVsZW1lbnRzSW5TaGFkb3dUcmVlKTogQ2FsbCBzZXRBdHRyaWJ1dGVzRnJvbUVs ZW1lbnQuCisgICAgICAgIChXZWJDb3JlOjpTVkdVc2VFbGVtZW50Ojp0cmFuc2ZlclVzZUF0dHJp YnV0ZXNUb1JlcGxhY2VkRWxlbWVudCk6IENhbGwgc2V0QXR0cmlidXRlc0Zyb21FbGVtZW50Cisg ICAgICAgIGFuZCBtYWtlIHVzZSBvZiBBU1NFUlRfTk9fRVhDRVBUSU9OIHRvIG1ha2UgY29kZSBl YXNpZXIgdG8gcmVhZC4KKwogMjAxMS0xMi0xOSAgRXJpYyBDYXJsc29uICA8ZXJpYy5jYXJsc29u QGFwcGxlLmNvbT4KIAogICAgICAgICBFbmFibGUgPHRyYWNrPiBmb3IgTWFjIGJ1aWxkCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9k b20vRWxlbWVudC5jcHAKaW5kZXggMjdmMzQ2OWE0NmM2NzU0ZGE2NDljZDQ2YzgzMWY4YzJkY2Q2 MThjMy4uMzkxYTNmMTQ4YTkwNTIxY2U3NjA2YTYzYzIzYzMzNTY4YjliODQ4OCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Rv bS9FbGVtZW50LmNwcApAQCAtMTYzLDEwICsxNjMsNyBAQCBQYXNzUmVmUHRyPEVsZW1lbnQ+IEVs ZW1lbnQ6OmNsb25lRWxlbWVudFdpdGhvdXRDaGlsZHJlbigpCiAgICAgLy8gVGhpcyBpcyBhIHNh bml0eSBjaGVjayBhcyBIVE1MIG92ZXJsb2FkcyBzb21lIG9mIHRoZSBET00gbWV0aG9kcy4KICAg ICBBU1NFUlQoaXNIVE1MRWxlbWVudCgpID09IGNsb25lLT5pc0hUTUxFbGVtZW50KCkpOwogCi0g ICAgLy8gQ2FsbCBhdHRyaWJ1dGVzKHRydWUpIHRvIGZvcmNlIGF0dHJpYnV0ZSBzeW5jaHJvbml6 YXRpb24gdG8gb2NjdXIgZm9yIFNWRyBhbmQgc3R5bGUgYXR0cmlidXRlcy4KLSAgICBpZiAoTmFt ZWROb2RlTWFwKiBhdHRyaWJ1dGVNYXAgPSBhdHRyaWJ1dGVzKHRydWUpKQotICAgICAgICBjbG9u ZS0+YXR0cmlidXRlcygpLT5zZXRBdHRyaWJ1dGVzKCphdHRyaWJ1dGVNYXApOwotCisgICAgY2xv bmUtPnNldEF0dHJpYnV0ZXNGcm9tRWxlbWVudCgqdGhpcyk7CiAgICAgY2xvbmUtPmNvcHlOb25B dHRyaWJ1dGVQcm9wZXJ0aWVzKHRoaXMpOwogCiAgICAgcmV0dXJuIGNsb25lLnJlbGVhc2UoKTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50LmggYi9Tb3VyY2UvV2ViQ29y ZS9kb20vRWxlbWVudC5oCmluZGV4IDliMzljZDBjMmVkZmY0NDI2YmQ2MWVmYzRjYzg5NTFhMmIz NTZjNWQuLjExM2I0YWQxYjgzMGE0NGEwOTA2MTM2Y2JjZDQ3ZjlkOWQ1OTRlMjkgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUvZG9t L0VsZW1lbnQuaApAQCAtMjIxLDYgKzIyMSw4IEBAIHB1YmxpYzoKICAgICB2b2lkIHNldEF0dHJp YnV0ZU1hcChQYXNzUmVmUHRyPE5hbWVkTm9kZU1hcD4sIEZyYWdtZW50U2NyaXB0aW5nUGVybWlz c2lvbiA9IEZyYWdtZW50U2NyaXB0aW5nQWxsb3dlZCk7CiAgICAgTmFtZWROb2RlTWFwKiBhdHRy aWJ1dGVNYXAoKSBjb25zdCB7IHJldHVybiBtX2F0dHJpYnV0ZU1hcC5nZXQoKTsgfQogCisgICAg dm9pZCBzZXRBdHRyaWJ1dGVzRnJvbUVsZW1lbnQoY29uc3QgRWxlbWVudCYpOworCiAgICAgdmly dHVhbCB2b2lkIGNvcHlOb25BdHRyaWJ1dGVQcm9wZXJ0aWVzKGNvbnN0IEVsZW1lbnQqIHNvdXJj ZSk7CiAKICAgICB2aXJ0dWFsIHZvaWQgYXR0YWNoKCk7CkBAIC00OTcsNiArNDk5LDEyIEBAIGlu bGluZSBOYW1lZE5vZGVNYXAqIEVsZW1lbnQ6OmF0dHJpYnV0ZXMoYm9vbCByZWFkb25seSkgY29u c3QKICAgICByZXR1cm4gbV9hdHRyaWJ1dGVNYXAuZ2V0KCk7CiB9CiAKK2lubGluZSB2b2lkIEVs ZW1lbnQ6OnNldEF0dHJpYnV0ZXNGcm9tRWxlbWVudChjb25zdCBFbGVtZW50JiBvdGhlcikKK3sK KyAgICBpZiAoTmFtZWROb2RlTWFwKiBhdHRyaWJ1dGVNYXAgPSBvdGhlci5hdHRyaWJ1dGVzKHRy dWUpKQorICAgICAgICBhdHRyaWJ1dGVzKGZhbHNlKS0+c2V0QXR0cmlidXRlcygqYXR0cmlidXRl TWFwKTsKK30KKwogaW5saW5lIHZvaWQgRWxlbWVudDo6dXBkYXRlSWQoY29uc3QgQXRvbWljU3Ry aW5nJiBvbGRJZCwgY29uc3QgQXRvbWljU3RyaW5nJiBuZXdJZCkKIHsKICAgICBpZiAoIWluRG9j dW1lbnQoKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9OYW1lZE5vZGVNYXAuaCBi L1NvdXJjZS9XZWJDb3JlL2RvbS9OYW1lZE5vZGVNYXAuaAppbmRleCBjM2MyY2Q5YjIzZTBjNTZm MGE5ODI0NDNlMzVmOGZhNjg1YTA4YmM2Li4zNGYzODYwNDY3Y2ZlY2Y1YzlkMmFlMGY4NTkwMzUx ZWFhZThhYTY0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vTmFtZWROb2RlTWFwLmgK KysrIGIvU291cmNlL1dlYkNvcmUvZG9tL05hbWVkTm9kZU1hcC5oCkBAIC02Myw4ICs2Myw2IEBA IHB1YmxpYzoKIAogICAgIC8vIEludGVybmFsIGludGVyZmFjZS4KIAotICAgIHZvaWQgc2V0QXR0 cmlidXRlcyhjb25zdCBOYW1lZE5vZGVNYXAmKTsKLQogICAgIEF0dHJpYnV0ZSogYXR0cmlidXRl SXRlbSh1bnNpZ25lZCBpbmRleCkgY29uc3QgeyByZXR1cm4gbV9hdHRyaWJ1dGVzW2luZGV4XS5n ZXQoKTsgfQogICAgIEF0dHJpYnV0ZSogZ2V0QXR0cmlidXRlSXRlbShjb25zdCBRdWFsaWZpZWRO YW1lJikgY29uc3Q7CiAKQEAgLTExMyw2ICsxMTEsNyBAQCBwcml2YXRlOgogICAgIHZvaWQgZGV0 YWNoRnJvbUVsZW1lbnQoKTsKICAgICBBdHRyaWJ1dGUqIGdldEF0dHJpYnV0ZUl0ZW0oY29uc3Qg U3RyaW5nJiBuYW1lLCBib29sIHNob3VsZElnbm9yZUF0dHJpYnV0ZUNhc2UpIGNvbnN0OwogICAg IEF0dHJpYnV0ZSogZ2V0QXR0cmlidXRlSXRlbVNsb3dDYXNlKGNvbnN0IFN0cmluZyYgbmFtZSwg Ym9vbCBzaG91bGRJZ25vcmVBdHRyaWJ1dGVDYXNlKSBjb25zdDsKKyAgICB2b2lkIHNldEF0dHJp YnV0ZXMoY29uc3QgTmFtZWROb2RlTWFwJik7CiAgICAgdm9pZCBjbGVhckF0dHJpYnV0ZXMoKTsK ICAgICBpbnQgZGVjbENvdW50KCkgY29uc3Q7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2VkaXRpbmcvUmVwbGFjZU5vZGVXaXRoU3BhbkNvbW1hbmQuY3BwIGIvU291cmNlL1dlYkNvcmUv ZWRpdGluZy9SZXBsYWNlTm9kZVdpdGhTcGFuQ29tbWFuZC5jcHAKaW5kZXggMzFkNmE3YjVjZTQy MjcyZDk5OWRiYjgyYTFlMWZiMGQ5YzMxY2M2NC4uOWQ3YTQ0Y2Y0NGNiMGVmMjkwYTY0OGNmNjgz YWFhOGIwZmY1MjY2NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9SZXBsYWNl Tm9kZVdpdGhTcGFuQ29tbWFuZC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9SZXBs YWNlTm9kZVdpdGhTcGFuQ29tbWFuZC5jcHAKQEAgLTYzLDcgKzYzLDcgQEAgc3RhdGljIHZvaWQg c3dhcEluTm9kZVByZXNlcnZpbmdBdHRyaWJ1dGVzQW5kQ2hpbGRyZW4oSFRNTEVsZW1lbnQqIG5l d05vZGUsIEhUTUwKICAgICAgICAgQVNTRVJUKCFlYyk7CiAgICAgfQogCi0gICAgbmV3Tm9kZS0+ YXR0cmlidXRlcygpLT5zZXRBdHRyaWJ1dGVzKCpub2RlVG9SZXBsYWNlLT5hdHRyaWJ1dGVzKCkp OworICAgIG5ld05vZGUtPnNldEF0dHJpYnV0ZXNGcm9tRWxlbWVudCgqbm9kZVRvUmVwbGFjZSk7 CiAKICAgICBwYXJlbnROb2RlLT5yZW1vdmVDaGlsZChub2RlVG9SZXBsYWNlLCBlYyk7CiAgICAg QVNTRVJUKCFlYyk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVj dG9yRE9NQWdlbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRPTUFn ZW50LmNwcAppbmRleCBiZjA4ZjNjNGYxY2I1YmFlNzI3MDZmY2YzYWVkMGIyNTA1NzkxMmU5Li5l NDIyZDg0ZDgwZGRhZTk4NDFlOTE1MTkxYjkwM2MzOWMzMzVmNTkxIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9NQWdlbnQuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JET01BZ2VudC5jcHAKQEAgLTU5OCw5ICs1OTgsNyBA QCB2b2lkIEluc3BlY3RvckRPTUFnZW50OjpzZXROb2RlTmFtZShFcnJvclN0cmluZyosIGludCBu b2RlSWQsIGNvbnN0IFN0cmluZyYgdGFnTgogICAgICAgICByZXR1cm47CiAKICAgICAvLyBDb3B5 IG92ZXIgdGhlIG9yaWdpbmFsIG5vZGUncyBhdHRyaWJ1dGVzLgotICAgIEVsZW1lbnQqIG9sZEVs ZW0gPSBzdGF0aWNfY2FzdDxFbGVtZW50Kj4ob2xkTm9kZSk7Ci0gICAgaWYgKG9sZEVsZW0tPmF0 dHJpYnV0ZXMoKSkKLSAgICAgICAgbmV3RWxlbS0+YXR0cmlidXRlcygpLT5zZXRBdHRyaWJ1dGVz KCoob2xkRWxlbS0+YXR0cmlidXRlcyh0cnVlKSkpOworICAgIG5ld0VsZW0tPnNldEF0dHJpYnV0 ZXNGcm9tRWxlbWVudCgqdG9FbGVtZW50KG9sZE5vZGUpKTsKIAogICAgIC8vIENvcHkgb3ZlciB0 aGUgb3JpZ2luYWwgbm9kZSdzIGNoaWxkcmVuLgogICAgIE5vZGUqIGNoaWxkOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvc3ZnL1NWR1VzZUVsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUv c3ZnL1NWR1VzZUVsZW1lbnQuY3BwCmluZGV4IDA4MTIwYWFlNzJjZDQ4MjY5NGIyYWMxMjg1NGVl YzYzYjM3M2VhMmQuLjVlNjdmZjUyYTUyMDUyNWRlMzk0YzViMmEwNmY2MTRkOGFhZjAzNDAgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3N2Zy9TVkdVc2VFbGVtZW50LmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9zdmcvU1ZHVXNlRWxlbWVudC5jcHAKQEAgLTg5Niw3ICs4OTYsNyBAQCB2b2lk IFNWR1VzZUVsZW1lbnQ6OmV4cGFuZFN5bWJvbEVsZW1lbnRzSW5TaGFkb3dUcmVlKE5vZGUqIGVs ZW1lbnQpCiAgICAgICAgIFJlZlB0cjxTVkdTVkdFbGVtZW50PiBzdmdFbGVtZW50ID0gU1ZHU1ZH RWxlbWVudDo6Y3JlYXRlKFNWR05hbWVzOjpzdmdUYWcsIGRvY3VtZW50KCkpOwogCiAgICAgICAg IC8vIFRyYW5zZmVyIGFsbCBhdHRyaWJ1dGVzIGZyb20gPHN5bWJvbD4gdG8gdGhlIG5ldyA8c3Zn PiBlbGVtZW50Ci0gICAgICAgIHN2Z0VsZW1lbnQtPmF0dHJpYnV0ZXMoKS0+c2V0QXR0cmlidXRl cygqZWxlbWVudC0+YXR0cmlidXRlcygpKTsKKyAgICAgICAgc3ZnRWxlbWVudC0+c2V0QXR0cmli dXRlc0Zyb21FbGVtZW50KCp0b0VsZW1lbnQoZWxlbWVudCkpOwogCiAgICAgICAgIC8vIE9ubHkg Y2xvbmUgc3ltYm9sIGNoaWxkcmVuLCBhbmQgYWRkIHRoZW0gdG8gdGhlIG5ldyA8c3ZnPiBlbGVt ZW50ICAgIAogICAgICAgICBFeGNlcHRpb25Db2RlIGVjID0gMDsKQEAgLTEwMzMsMjQgKzEwMzMs MTMgQEAgdm9pZCBTVkdVc2VFbGVtZW50Ojp0cmFuc2ZlclVzZUF0dHJpYnV0ZXNUb1JlcGxhY2Vk RWxlbWVudChTVkdFbGVtZW50KiBmcm9tLCBTVkcKICAgICBBU1NFUlQoZnJvbSk7CiAgICAgQVNT RVJUKHRvKTsKIAotICAgIHRvLT5hdHRyaWJ1dGVzKCktPnNldEF0dHJpYnV0ZXMoKmZyb20tPmF0 dHJpYnV0ZXMoKSk7CisgICAgdG8tPnNldEF0dHJpYnV0ZXNGcm9tRWxlbWVudCgqZnJvbSk7CiAK LSAgICBFeGNlcHRpb25Db2RlIGVjID0gMDsKLQotICAgIHRvLT5yZW1vdmVBdHRyaWJ1dGUoU1ZH TmFtZXM6OnhBdHRyLCBlYyk7Ci0gICAgQVNTRVJUKCFlYyk7Ci0KLSAgICB0by0+cmVtb3ZlQXR0 cmlidXRlKFNWR05hbWVzOjp5QXR0ciwgZWMpOwotICAgIEFTU0VSVCghZWMpOwotCi0gICAgdG8t PnJlbW92ZUF0dHJpYnV0ZShTVkdOYW1lczo6d2lkdGhBdHRyLCBlYyk7Ci0gICAgQVNTRVJUKCFl Yyk7Ci0KLSAgICB0by0+cmVtb3ZlQXR0cmlidXRlKFNWR05hbWVzOjpoZWlnaHRBdHRyLCBlYyk7 Ci0gICAgQVNTRVJUKCFlYyk7Ci0KLSAgICB0by0+cmVtb3ZlQXR0cmlidXRlKFhMaW5rTmFtZXM6 OmhyZWZBdHRyLCBlYyk7Ci0gICAgQVNTRVJUKCFlYyk7CisgICAgdG8tPnJlbW92ZUF0dHJpYnV0 ZShTVkdOYW1lczo6eEF0dHIsIEFTU0VSVF9OT19FWENFUFRJT04pOworICAgIHRvLT5yZW1vdmVB dHRyaWJ1dGUoU1ZHTmFtZXM6OnlBdHRyLCBBU1NFUlRfTk9fRVhDRVBUSU9OKTsKKyAgICB0by0+ cmVtb3ZlQXR0cmlidXRlKFNWR05hbWVzOjp3aWR0aEF0dHIsIEFTU0VSVF9OT19FWENFUFRJT04p OworICAgIHRvLT5yZW1vdmVBdHRyaWJ1dGUoU1ZHTmFtZXM6OmhlaWdodEF0dHIsIEFTU0VSVF9O T19FWENFUFRJT04pOworICAgIHRvLT5yZW1vdmVBdHRyaWJ1dGUoWExpbmtOYW1lczo6aHJlZkF0 dHIsIEFTU0VSVF9OT19FWENFUFRJT04pOwogfQogCiBib29sIFNWR1VzZUVsZW1lbnQ6OnNlbGZI YXNSZWxhdGl2ZUxlbmd0aHMoKSBjb25zdAo= 119933 2011-12-19 16:01:25 -0800 2011-12-19 16:13:53 -0800 Added FIXME bug-74895-20111219160124.patch text/plain 8384 adamk U3VidmVyc2lvbiBSZXZpc2lvbjogMTAzMjQwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDk1Nzk2NDk4YTU2Nzdl YmZmNTc2YmQxYTc1NDhjYzdhZGU0NmU0ZS4uMzE0MTQ0MzEwMzM1ZjkyMGMzNGJlZDA2NDM5ZmUy MDEyY2Q5NjUxZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM5IEBACisyMDExLTEyLTE5ICBBZGFt IEtsZWluICA8YWRhbWtAY2hyb21pdW0ub3JnPgorCisgICAgICAgIE1ha2UgYWxsIGNhbGxzIHRv IE5hbWVkTm9kZU1hcDo6c2V0QXR0cmlidXRlcyBnbyB0aHJvdWdoIEVsZW1lbnQKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc0ODk1CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlcmUgYXJlIHR3byByZWFz b25zIGZvciB0aGlzIGNoYW5nZS4gT25lIGlzIGFuIG9wdGltaXphdGlvbjogc29tZQorICAgICAg ICBjYWxsZXJzIHdlcmUgcHJldmlvdXNseSBhbHdheXMgY3JlYXRpbmcgYSBOYW1lZE5vZGVNYXAg ZXZlbiBpZiB0aGUKKyAgICAgICAgc291cmNlIGRpZG4ndCBoYXZlIGFueSBhdHRyaWJ1dGVzLgor CisgICAgICAgIFRoZSBvdGhlciByZWFzb24gaXMgZm9yd2FyZC1sb29raW5nOiBzZXRBdHRyaWJ1 dGVzJyBiZWhhdmlvciBpcyBzdWJ0bHkKKyAgICAgICAgd3JvbmcgaW4gdGhlIHByZXNlbmNlIG9m IE11dGF0aW9uT2JzZXJ2ZXJzLiBUaGlzIGRvZXNuJ3QgbWF0dGVyCisgICAgICAgIGZvciBtb3N0 IGNhbGxlcnMgc2luY2UgdGhlIGVsZW1lbnQgb24gd2hpY2ggc2V0QXR0cmlidXRlc0Zyb21FbGVt ZW50CisgICAgICAgIGlzIGNhbGxlZCBpcyBuZXdseS1jcmVhdGVkLiBJbiB0aGUgZWRpdGluZyBj YXNlLCBob3dldmVyLCBpdCBjb3VsZAorICAgICAgICBtYWtlIGEgZGlmZmVyZW5jZSBpbiBiZWhh dmlvciwgd2hpY2ggSSBob3BlIHRvIGZpeCBpbiBhIGZ1dHVyZSBjaGFuZ2UKKyAgICAgICAgd2l0 aG91dCBzYWNyaWZpY2luZyB0aGUgcGVyZm9ybWFuY2Ugb2YgY2xvbmVOb2RlKCkgb24gYW4gRWxl bWVudAorICAgICAgICAod2hpY2ggaXMgd2hhdCBOYW1lZE5vZGVNYXA6OnNldEF0dHJpYnV0ZXMg aXMgZGVzaWduZWQgZm9yKS4KKworICAgICAgICBObyBuZXcgdGVzdHMsIG5vIGNoYW5nZSBpbiBi ZWhhdmlvci4KKworICAgICAgICAqIGRvbS9FbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkVsZW1lbnQ6OmNsb25lRWxlbWVudFdpdGhvdXRDaGlsZHJlbik6IENhbGwgc2V0QXR0cmlidXRl c0Zyb21FbGVtZW50LgorICAgICAgICAqIGRvbS9FbGVtZW50Lmg6CisgICAgICAgIChXZWJDb3Jl OjpFbGVtZW50OjpzZXRBdHRyaWJ1dGVzRnJvbUVsZW1lbnQpOiBDcmVhdGUgbmV3IGlubGluZSBo ZWxwZXIgbWV0aG9kCisgICAgICAgIHdoaWNoIGNvbmRpdGlvbmFsbHkgZm9yd2FyZHMgdG8gTmFt ZWROb2RlTWFwOjpzZXRBdHRyaWJ1dGUuCisgICAgICAgICogZG9tL05hbWVkTm9kZU1hcC5oOiBN YWtlIHNldEF0dHJpYnV0ZXMgcHJpdmF0ZSAoRWxlbWVudCBpcyBhbHJlYWR5IGEgZnJpZW5kKS4K KyAgICAgICAgKiBlZGl0aW5nL1JlcGxhY2VOb2RlV2l0aFNwYW5Db21tYW5kLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OnN3YXBJbk5vZGVQcmVzZXJ2aW5nQXR0cmlidXRlc0FuZENoaWxkcmVuKTog Q2FsbCBzZXRBdHRyaWJ1dGVzRnJvbUVsZW1lbnQuCisgICAgICAgICogaW5zcGVjdG9yL0luc3Bl Y3RvckRPTUFnZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckRPTUFnZW50Ojpz ZXROb2RlTmFtZSk6IENhbGwgc2V0QXR0cmlidXRlc0Zyb21FbGVtZW50LgorICAgICAgICAqIHN2 Zy9TVkdVc2VFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNWR1VzZUVsZW1lbnQ6OmV4 cGFuZFN5bWJvbEVsZW1lbnRzSW5TaGFkb3dUcmVlKTogQ2FsbCBzZXRBdHRyaWJ1dGVzRnJvbUVs ZW1lbnQuCisgICAgICAgIChXZWJDb3JlOjpTVkdVc2VFbGVtZW50Ojp0cmFuc2ZlclVzZUF0dHJp YnV0ZXNUb1JlcGxhY2VkRWxlbWVudCk6IENhbGwgc2V0QXR0cmlidXRlc0Zyb21FbGVtZW50Cisg ICAgICAgIGFuZCBtYWtlIHVzZSBvZiBBU1NFUlRfTk9fRVhDRVBUSU9OIHRvIG1ha2UgY29kZSBl YXNpZXIgdG8gcmVhZC4KKwogMjAxMS0xMi0xOSAgRXJpYyBDYXJsc29uICA8ZXJpYy5jYXJsc29u QGFwcGxlLmNvbT4KIAogICAgICAgICBFbmFibGUgPHRyYWNrPiBmb3IgTWFjIGJ1aWxkCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9k b20vRWxlbWVudC5jcHAKaW5kZXggMjdmMzQ2OWE0NmM2NzU0ZGE2NDljZDQ2YzgzMWY4YzJkY2Q2 MThjMy4uMzkxYTNmMTQ4YTkwNTIxY2U3NjA2YTYzYzIzYzMzNTY4YjliODQ4OCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Rv bS9FbGVtZW50LmNwcApAQCAtMTYzLDEwICsxNjMsNyBAQCBQYXNzUmVmUHRyPEVsZW1lbnQ+IEVs ZW1lbnQ6OmNsb25lRWxlbWVudFdpdGhvdXRDaGlsZHJlbigpCiAgICAgLy8gVGhpcyBpcyBhIHNh bml0eSBjaGVjayBhcyBIVE1MIG92ZXJsb2FkcyBzb21lIG9mIHRoZSBET00gbWV0aG9kcy4KICAg ICBBU1NFUlQoaXNIVE1MRWxlbWVudCgpID09IGNsb25lLT5pc0hUTUxFbGVtZW50KCkpOwogCi0g ICAgLy8gQ2FsbCBhdHRyaWJ1dGVzKHRydWUpIHRvIGZvcmNlIGF0dHJpYnV0ZSBzeW5jaHJvbml6 YXRpb24gdG8gb2NjdXIgZm9yIFNWRyBhbmQgc3R5bGUgYXR0cmlidXRlcy4KLSAgICBpZiAoTmFt ZWROb2RlTWFwKiBhdHRyaWJ1dGVNYXAgPSBhdHRyaWJ1dGVzKHRydWUpKQotICAgICAgICBjbG9u ZS0+YXR0cmlidXRlcygpLT5zZXRBdHRyaWJ1dGVzKCphdHRyaWJ1dGVNYXApOwotCisgICAgY2xv bmUtPnNldEF0dHJpYnV0ZXNGcm9tRWxlbWVudCgqdGhpcyk7CiAgICAgY2xvbmUtPmNvcHlOb25B dHRyaWJ1dGVQcm9wZXJ0aWVzKHRoaXMpOwogCiAgICAgcmV0dXJuIGNsb25lLnJlbGVhc2UoKTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50LmggYi9Tb3VyY2UvV2ViQ29y ZS9kb20vRWxlbWVudC5oCmluZGV4IDliMzljZDBjMmVkZmY0NDI2YmQ2MWVmYzRjYzg5NTFhMmIz NTZjNWQuLjExM2I0YWQxYjgzMGE0NGEwOTA2MTM2Y2JjZDQ3ZjlkOWQ1OTRlMjkgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUvZG9t L0VsZW1lbnQuaApAQCAtMjIxLDYgKzIyMSw4IEBAIHB1YmxpYzoKICAgICB2b2lkIHNldEF0dHJp YnV0ZU1hcChQYXNzUmVmUHRyPE5hbWVkTm9kZU1hcD4sIEZyYWdtZW50U2NyaXB0aW5nUGVybWlz c2lvbiA9IEZyYWdtZW50U2NyaXB0aW5nQWxsb3dlZCk7CiAgICAgTmFtZWROb2RlTWFwKiBhdHRy aWJ1dGVNYXAoKSBjb25zdCB7IHJldHVybiBtX2F0dHJpYnV0ZU1hcC5nZXQoKTsgfQogCisgICAg dm9pZCBzZXRBdHRyaWJ1dGVzRnJvbUVsZW1lbnQoY29uc3QgRWxlbWVudCYpOworCiAgICAgdmly dHVhbCB2b2lkIGNvcHlOb25BdHRyaWJ1dGVQcm9wZXJ0aWVzKGNvbnN0IEVsZW1lbnQqIHNvdXJj ZSk7CiAKICAgICB2aXJ0dWFsIHZvaWQgYXR0YWNoKCk7CkBAIC00OTcsNiArNDk5LDEyIEBAIGlu bGluZSBOYW1lZE5vZGVNYXAqIEVsZW1lbnQ6OmF0dHJpYnV0ZXMoYm9vbCByZWFkb25seSkgY29u c3QKICAgICByZXR1cm4gbV9hdHRyaWJ1dGVNYXAuZ2V0KCk7CiB9CiAKK2lubGluZSB2b2lkIEVs ZW1lbnQ6OnNldEF0dHJpYnV0ZXNGcm9tRWxlbWVudChjb25zdCBFbGVtZW50JiBvdGhlcikKK3sK KyAgICBpZiAoTmFtZWROb2RlTWFwKiBhdHRyaWJ1dGVNYXAgPSBvdGhlci5hdHRyaWJ1dGVzKHRy dWUpKQorICAgICAgICBhdHRyaWJ1dGVzKGZhbHNlKS0+c2V0QXR0cmlidXRlcygqYXR0cmlidXRl TWFwKTsKK30KKwogaW5saW5lIHZvaWQgRWxlbWVudDo6dXBkYXRlSWQoY29uc3QgQXRvbWljU3Ry aW5nJiBvbGRJZCwgY29uc3QgQXRvbWljU3RyaW5nJiBuZXdJZCkKIHsKICAgICBpZiAoIWluRG9j dW1lbnQoKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9OYW1lZE5vZGVNYXAuaCBi L1NvdXJjZS9XZWJDb3JlL2RvbS9OYW1lZE5vZGVNYXAuaAppbmRleCBjM2MyY2Q5YjIzZTBjNTZm MGE5ODI0NDNlMzVmOGZhNjg1YTA4YmM2Li4zNGYzODYwNDY3Y2ZlY2Y1YzlkMmFlMGY4NTkwMzUx ZWFhZThhYTY0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vTmFtZWROb2RlTWFwLmgK KysrIGIvU291cmNlL1dlYkNvcmUvZG9tL05hbWVkTm9kZU1hcC5oCkBAIC02Myw4ICs2Myw2IEBA IHB1YmxpYzoKIAogICAgIC8vIEludGVybmFsIGludGVyZmFjZS4KIAotICAgIHZvaWQgc2V0QXR0 cmlidXRlcyhjb25zdCBOYW1lZE5vZGVNYXAmKTsKLQogICAgIEF0dHJpYnV0ZSogYXR0cmlidXRl SXRlbSh1bnNpZ25lZCBpbmRleCkgY29uc3QgeyByZXR1cm4gbV9hdHRyaWJ1dGVzW2luZGV4XS5n ZXQoKTsgfQogICAgIEF0dHJpYnV0ZSogZ2V0QXR0cmlidXRlSXRlbShjb25zdCBRdWFsaWZpZWRO YW1lJikgY29uc3Q7CiAKQEAgLTExMyw2ICsxMTEsNyBAQCBwcml2YXRlOgogICAgIHZvaWQgZGV0 YWNoRnJvbUVsZW1lbnQoKTsKICAgICBBdHRyaWJ1dGUqIGdldEF0dHJpYnV0ZUl0ZW0oY29uc3Qg U3RyaW5nJiBuYW1lLCBib29sIHNob3VsZElnbm9yZUF0dHJpYnV0ZUNhc2UpIGNvbnN0OwogICAg IEF0dHJpYnV0ZSogZ2V0QXR0cmlidXRlSXRlbVNsb3dDYXNlKGNvbnN0IFN0cmluZyYgbmFtZSwg Ym9vbCBzaG91bGRJZ25vcmVBdHRyaWJ1dGVDYXNlKSBjb25zdDsKKyAgICB2b2lkIHNldEF0dHJp YnV0ZXMoY29uc3QgTmFtZWROb2RlTWFwJik7CiAgICAgdm9pZCBjbGVhckF0dHJpYnV0ZXMoKTsK ICAgICBpbnQgZGVjbENvdW50KCkgY29uc3Q7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2VkaXRpbmcvUmVwbGFjZU5vZGVXaXRoU3BhbkNvbW1hbmQuY3BwIGIvU291cmNlL1dlYkNvcmUv ZWRpdGluZy9SZXBsYWNlTm9kZVdpdGhTcGFuQ29tbWFuZC5jcHAKaW5kZXggMzFkNmE3YjVjZTQy MjcyZDk5OWRiYjgyYTFlMWZiMGQ5YzMxY2M2NC4uMTQ5ODEzOGNmYTdlZDJiNTE1MDlhZjIzOTlm MjIwZDY2YTM5ZDg2YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9SZXBsYWNl Tm9kZVdpdGhTcGFuQ29tbWFuZC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9SZXBs YWNlTm9kZVdpdGhTcGFuQ29tbWFuZC5jcHAKQEAgLTYzLDcgKzYzLDggQEAgc3RhdGljIHZvaWQg c3dhcEluTm9kZVByZXNlcnZpbmdBdHRyaWJ1dGVzQW5kQ2hpbGRyZW4oSFRNTEVsZW1lbnQqIG5l d05vZGUsIEhUTUwKICAgICAgICAgQVNTRVJUKCFlYyk7CiAgICAgfQogCi0gICAgbmV3Tm9kZS0+ YXR0cmlidXRlcygpLT5zZXRBdHRyaWJ1dGVzKCpub2RlVG9SZXBsYWNlLT5hdHRyaWJ1dGVzKCkp OworICAgIC8vIEZJWE1FOiBGaXggdGhpcyB0byBzZW5kIHRoZSBwcm9wZXIgTXV0YXRpb25SZWNv cmRzIG9mIE11dGF0aW9uT2JzZXJ2ZXJzIGFyZSBwcmVzZW50LgorICAgIG5ld05vZGUtPnNldEF0 dHJpYnV0ZXNGcm9tRWxlbWVudCgqbm9kZVRvUmVwbGFjZSk7CiAKICAgICBwYXJlbnROb2RlLT5y ZW1vdmVDaGlsZChub2RlVG9SZXBsYWNlLCBlYyk7CiAgICAgQVNTRVJUKCFlYyk7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9NQWdlbnQuY3BwIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRPTUFnZW50LmNwcAppbmRleCBiZjA4ZjNj NGYxY2I1YmFlNzI3MDZmY2YzYWVkMGIyNTA1NzkxMmU5Li5lNDIyZDg0ZDgwZGRhZTk4NDFlOTE1 MTkxYjkwM2MzOWMzMzVmNTkxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv SW5zcGVjdG9yRE9NQWdlbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNw ZWN0b3JET01BZ2VudC5jcHAKQEAgLTU5OCw5ICs1OTgsNyBAQCB2b2lkIEluc3BlY3RvckRPTUFn ZW50OjpzZXROb2RlTmFtZShFcnJvclN0cmluZyosIGludCBub2RlSWQsIGNvbnN0IFN0cmluZyYg dGFnTgogICAgICAgICByZXR1cm47CiAKICAgICAvLyBDb3B5IG92ZXIgdGhlIG9yaWdpbmFsIG5v ZGUncyBhdHRyaWJ1dGVzLgotICAgIEVsZW1lbnQqIG9sZEVsZW0gPSBzdGF0aWNfY2FzdDxFbGVt ZW50Kj4ob2xkTm9kZSk7Ci0gICAgaWYgKG9sZEVsZW0tPmF0dHJpYnV0ZXMoKSkKLSAgICAgICAg bmV3RWxlbS0+YXR0cmlidXRlcygpLT5zZXRBdHRyaWJ1dGVzKCoob2xkRWxlbS0+YXR0cmlidXRl cyh0cnVlKSkpOworICAgIG5ld0VsZW0tPnNldEF0dHJpYnV0ZXNGcm9tRWxlbWVudCgqdG9FbGVt ZW50KG9sZE5vZGUpKTsKIAogICAgIC8vIENvcHkgb3ZlciB0aGUgb3JpZ2luYWwgbm9kZSdzIGNo aWxkcmVuLgogICAgIE5vZGUqIGNoaWxkOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvc3Zn L1NWR1VzZUVsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvc3ZnL1NWR1VzZUVsZW1lbnQuY3Bw CmluZGV4IDA4MTIwYWFlNzJjZDQ4MjY5NGIyYWMxMjg1NGVlYzYzYjM3M2VhMmQuLjVlNjdmZjUy YTUyMDUyNWRlMzk0YzViMmEwNmY2MTRkOGFhZjAzNDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3N2Zy9TVkdVc2VFbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9zdmcvU1ZHVXNl RWxlbWVudC5jcHAKQEAgLTg5Niw3ICs4OTYsNyBAQCB2b2lkIFNWR1VzZUVsZW1lbnQ6OmV4cGFu ZFN5bWJvbEVsZW1lbnRzSW5TaGFkb3dUcmVlKE5vZGUqIGVsZW1lbnQpCiAgICAgICAgIFJlZlB0 cjxTVkdTVkdFbGVtZW50PiBzdmdFbGVtZW50ID0gU1ZHU1ZHRWxlbWVudDo6Y3JlYXRlKFNWR05h bWVzOjpzdmdUYWcsIGRvY3VtZW50KCkpOwogCiAgICAgICAgIC8vIFRyYW5zZmVyIGFsbCBhdHRy aWJ1dGVzIGZyb20gPHN5bWJvbD4gdG8gdGhlIG5ldyA8c3ZnPiBlbGVtZW50Ci0gICAgICAgIHN2 Z0VsZW1lbnQtPmF0dHJpYnV0ZXMoKS0+c2V0QXR0cmlidXRlcygqZWxlbWVudC0+YXR0cmlidXRl cygpKTsKKyAgICAgICAgc3ZnRWxlbWVudC0+c2V0QXR0cmlidXRlc0Zyb21FbGVtZW50KCp0b0Vs ZW1lbnQoZWxlbWVudCkpOwogCiAgICAgICAgIC8vIE9ubHkgY2xvbmUgc3ltYm9sIGNoaWxkcmVu LCBhbmQgYWRkIHRoZW0gdG8gdGhlIG5ldyA8c3ZnPiBlbGVtZW50ICAgIAogICAgICAgICBFeGNl cHRpb25Db2RlIGVjID0gMDsKQEAgLTEwMzMsMjQgKzEwMzMsMTMgQEAgdm9pZCBTVkdVc2VFbGVt ZW50Ojp0cmFuc2ZlclVzZUF0dHJpYnV0ZXNUb1JlcGxhY2VkRWxlbWVudChTVkdFbGVtZW50KiBm cm9tLCBTVkcKICAgICBBU1NFUlQoZnJvbSk7CiAgICAgQVNTRVJUKHRvKTsKIAotICAgIHRvLT5h dHRyaWJ1dGVzKCktPnNldEF0dHJpYnV0ZXMoKmZyb20tPmF0dHJpYnV0ZXMoKSk7CisgICAgdG8t PnNldEF0dHJpYnV0ZXNGcm9tRWxlbWVudCgqZnJvbSk7CiAKLSAgICBFeGNlcHRpb25Db2RlIGVj ID0gMDsKLQotICAgIHRvLT5yZW1vdmVBdHRyaWJ1dGUoU1ZHTmFtZXM6OnhBdHRyLCBlYyk7Ci0g ICAgQVNTRVJUKCFlYyk7Ci0KLSAgICB0by0+cmVtb3ZlQXR0cmlidXRlKFNWR05hbWVzOjp5QXR0 ciwgZWMpOwotICAgIEFTU0VSVCghZWMpOwotCi0gICAgdG8tPnJlbW92ZUF0dHJpYnV0ZShTVkdO YW1lczo6d2lkdGhBdHRyLCBlYyk7Ci0gICAgQVNTRVJUKCFlYyk7Ci0KLSAgICB0by0+cmVtb3Zl QXR0cmlidXRlKFNWR05hbWVzOjpoZWlnaHRBdHRyLCBlYyk7Ci0gICAgQVNTRVJUKCFlYyk7Ci0K LSAgICB0by0+cmVtb3ZlQXR0cmlidXRlKFhMaW5rTmFtZXM6OmhyZWZBdHRyLCBlYyk7Ci0gICAg QVNTRVJUKCFlYyk7CisgICAgdG8tPnJlbW92ZUF0dHJpYnV0ZShTVkdOYW1lczo6eEF0dHIsIEFT U0VSVF9OT19FWENFUFRJT04pOworICAgIHRvLT5yZW1vdmVBdHRyaWJ1dGUoU1ZHTmFtZXM6OnlB dHRyLCBBU1NFUlRfTk9fRVhDRVBUSU9OKTsKKyAgICB0by0+cmVtb3ZlQXR0cmlidXRlKFNWR05h bWVzOjp3aWR0aEF0dHIsIEFTU0VSVF9OT19FWENFUFRJT04pOworICAgIHRvLT5yZW1vdmVBdHRy aWJ1dGUoU1ZHTmFtZXM6OmhlaWdodEF0dHIsIEFTU0VSVF9OT19FWENFUFRJT04pOworICAgIHRv LT5yZW1vdmVBdHRyaWJ1dGUoWExpbmtOYW1lczo6aHJlZkF0dHIsIEFTU0VSVF9OT19FWENFUFRJ T04pOwogfQogCiBib29sIFNWR1VzZUVsZW1lbnQ6OnNlbGZIYXNSZWxhdGl2ZUxlbmd0aHMoKSBj b25zdAo= 119938 2011-12-19 16:13:56 -0800 2011-12-19 23:49:31 -0800 Patch for landing bug-74895-20111219161355.patch text/plain 8384 adamk U3VidmVyc2lvbiBSZXZpc2lvbjogMTAzMjQwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDk1Nzk2NDk4YTU2Nzdl YmZmNTc2YmQxYTc1NDhjYzdhZGU0NmU0ZS4uZTJmZDk3ZDUyMWFhNWUwOTZlYjNiMjVmNjNhMDMx OWNhODFiODE1YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM5IEBACisyMDExLTEyLTE5ICBBZGFt IEtsZWluICA8YWRhbWtAY2hyb21pdW0ub3JnPgorCisgICAgICAgIE1ha2UgYWxsIGNhbGxzIHRv IE5hbWVkTm9kZU1hcDo6c2V0QXR0cmlidXRlcyBnbyB0aHJvdWdoIEVsZW1lbnQKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc0ODk1CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgUnlvc3VrZSBOaXdhLgorCisgICAgICAgIFRoZXJlIGFyZSB0d28gcmVhc29u cyBmb3IgdGhpcyBjaGFuZ2UuIE9uZSBpcyBhbiBvcHRpbWl6YXRpb246IHNvbWUKKyAgICAgICAg Y2FsbGVycyB3ZXJlIHByZXZpb3VzbHkgYWx3YXlzIGNyZWF0aW5nIGEgTmFtZWROb2RlTWFwIGV2 ZW4gaWYgdGhlCisgICAgICAgIHNvdXJjZSBkaWRuJ3QgaGF2ZSBhbnkgYXR0cmlidXRlcy4KKwor ICAgICAgICBUaGUgb3RoZXIgcmVhc29uIGlzIGZvcndhcmQtbG9va2luZzogc2V0QXR0cmlidXRl cycgYmVoYXZpb3IgaXMgc3VidGx5CisgICAgICAgIHdyb25nIGluIHRoZSBwcmVzZW5jZSBvZiBN dXRhdGlvbk9ic2VydmVycy4gVGhpcyBkb2Vzbid0IG1hdHRlcgorICAgICAgICBmb3IgbW9zdCBj YWxsZXJzIHNpbmNlIHRoZSBlbGVtZW50IG9uIHdoaWNoIHNldEF0dHJpYnV0ZXNGcm9tRWxlbWVu dAorICAgICAgICBpcyBjYWxsZWQgaXMgbmV3bHktY3JlYXRlZC4gSW4gdGhlIGVkaXRpbmcgY2Fz ZSwgaG93ZXZlciwgaXQgY291bGQKKyAgICAgICAgbWFrZSBhIGRpZmZlcmVuY2UgaW4gYmVoYXZp b3IsIHdoaWNoIEkgaG9wZSB0byBmaXggaW4gYSBmdXR1cmUgY2hhbmdlCisgICAgICAgIHdpdGhv dXQgc2FjcmlmaWNpbmcgdGhlIHBlcmZvcm1hbmNlIG9mIGNsb25lTm9kZSgpIG9uIGFuIEVsZW1l bnQKKyAgICAgICAgKHdoaWNoIGlzIHdoYXQgTmFtZWROb2RlTWFwOjpzZXRBdHRyaWJ1dGVzIGlz IGRlc2lnbmVkIGZvcikuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBubyBjaGFuZ2UgaW4gYmVo YXZpb3IuCisKKyAgICAgICAgKiBkb20vRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpF bGVtZW50OjpjbG9uZUVsZW1lbnRXaXRob3V0Q2hpbGRyZW4pOiBDYWxsIHNldEF0dHJpYnV0ZXNG cm9tRWxlbWVudC4KKyAgICAgICAgKiBkb20vRWxlbWVudC5oOgorICAgICAgICAoV2ViQ29yZTo6 RWxlbWVudDo6c2V0QXR0cmlidXRlc0Zyb21FbGVtZW50KTogQ3JlYXRlIG5ldyBpbmxpbmUgaGVs cGVyIG1ldGhvZAorICAgICAgICB3aGljaCBjb25kaXRpb25hbGx5IGZvcndhcmRzIHRvIE5hbWVk Tm9kZU1hcDo6c2V0QXR0cmlidXRlLgorICAgICAgICAqIGRvbS9OYW1lZE5vZGVNYXAuaDogTWFr ZSBzZXRBdHRyaWJ1dGVzIHByaXZhdGUgKEVsZW1lbnQgaXMgYWxyZWFkeSBhIGZyaWVuZCkuCisg ICAgICAgICogZWRpdGluZy9SZXBsYWNlTm9kZVdpdGhTcGFuQ29tbWFuZC5jcHA6CisgICAgICAg IChXZWJDb3JlOjpzd2FwSW5Ob2RlUHJlc2VydmluZ0F0dHJpYnV0ZXNBbmRDaGlsZHJlbik6IENh bGwgc2V0QXR0cmlidXRlc0Zyb21FbGVtZW50LgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0 b3JET01BZ2VudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JET01BZ2VudDo6c2V0 Tm9kZU5hbWUpOiBDYWxsIHNldEF0dHJpYnV0ZXNGcm9tRWxlbWVudC4KKyAgICAgICAgKiBzdmcv U1ZHVXNlRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTVkdVc2VFbGVtZW50OjpleHBh bmRTeW1ib2xFbGVtZW50c0luU2hhZG93VHJlZSk6IENhbGwgc2V0QXR0cmlidXRlc0Zyb21FbGVt ZW50LgorICAgICAgICAoV2ViQ29yZTo6U1ZHVXNlRWxlbWVudDo6dHJhbnNmZXJVc2VBdHRyaWJ1 dGVzVG9SZXBsYWNlZEVsZW1lbnQpOiBDYWxsIHNldEF0dHJpYnV0ZXNGcm9tRWxlbWVudAorICAg ICAgICBhbmQgbWFrZSB1c2Ugb2YgQVNTRVJUX05PX0VYQ0VQVElPTiB0byBtYWtlIGNvZGUgZWFz aWVyIHRvIHJlYWQuCisKIDIwMTEtMTItMTkgIEVyaWMgQ2FybHNvbiAgPGVyaWMuY2FybHNvbkBh cHBsZS5jb20+CiAKICAgICAgICAgRW5hYmxlIDx0cmFjaz4gZm9yIE1hYyBidWlsZApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9t L0VsZW1lbnQuY3BwCmluZGV4IDI3ZjM0NjlhNDZjNjc1NGRhNjQ5Y2Q0NmM4MzFmOGMyZGNkNjE4 YzMuLjM5MWEzZjE0OGE5MDUyMWNlNzYwNmE2M2MyM2MzMzU2OGI5Yjg0ODggMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20v RWxlbWVudC5jcHAKQEAgLTE2MywxMCArMTYzLDcgQEAgUGFzc1JlZlB0cjxFbGVtZW50PiBFbGVt ZW50OjpjbG9uZUVsZW1lbnRXaXRob3V0Q2hpbGRyZW4oKQogICAgIC8vIFRoaXMgaXMgYSBzYW5p dHkgY2hlY2sgYXMgSFRNTCBvdmVybG9hZHMgc29tZSBvZiB0aGUgRE9NIG1ldGhvZHMuCiAgICAg QVNTRVJUKGlzSFRNTEVsZW1lbnQoKSA9PSBjbG9uZS0+aXNIVE1MRWxlbWVudCgpKTsKIAotICAg IC8vIENhbGwgYXR0cmlidXRlcyh0cnVlKSB0byBmb3JjZSBhdHRyaWJ1dGUgc3luY2hyb25pemF0 aW9uIHRvIG9jY3VyIGZvciBTVkcgYW5kIHN0eWxlIGF0dHJpYnV0ZXMuCi0gICAgaWYgKE5hbWVk Tm9kZU1hcCogYXR0cmlidXRlTWFwID0gYXR0cmlidXRlcyh0cnVlKSkKLSAgICAgICAgY2xvbmUt PmF0dHJpYnV0ZXMoKS0+c2V0QXR0cmlidXRlcygqYXR0cmlidXRlTWFwKTsKLQorICAgIGNsb25l LT5zZXRBdHRyaWJ1dGVzRnJvbUVsZW1lbnQoKnRoaXMpOwogICAgIGNsb25lLT5jb3B5Tm9uQXR0 cmlidXRlUHJvcGVydGllcyh0aGlzKTsKIAogICAgIHJldHVybiBjbG9uZS5yZWxlYXNlKCk7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5oIGIvU291cmNlL1dlYkNvcmUv ZG9tL0VsZW1lbnQuaAppbmRleCA5YjM5Y2QwYzJlZGZmNDQyNmJkNjFlZmM0Y2M4OTUxYTJiMzU2 YzVkLi4xMTNiNGFkMWI4MzBhNDRhMDkwNjEzNmNiY2Q0N2Y5ZDlkNTk0ZTI5IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9F bGVtZW50LmgKQEAgLTIyMSw2ICsyMjEsOCBAQCBwdWJsaWM6CiAgICAgdm9pZCBzZXRBdHRyaWJ1 dGVNYXAoUGFzc1JlZlB0cjxOYW1lZE5vZGVNYXA+LCBGcmFnbWVudFNjcmlwdGluZ1Blcm1pc3Np b24gPSBGcmFnbWVudFNjcmlwdGluZ0FsbG93ZWQpOwogICAgIE5hbWVkTm9kZU1hcCogYXR0cmli dXRlTWFwKCkgY29uc3QgeyByZXR1cm4gbV9hdHRyaWJ1dGVNYXAuZ2V0KCk7IH0KIAorICAgIHZv aWQgc2V0QXR0cmlidXRlc0Zyb21FbGVtZW50KGNvbnN0IEVsZW1lbnQmKTsKKwogICAgIHZpcnR1 YWwgdm9pZCBjb3B5Tm9uQXR0cmlidXRlUHJvcGVydGllcyhjb25zdCBFbGVtZW50KiBzb3VyY2Up OwogCiAgICAgdmlydHVhbCB2b2lkIGF0dGFjaCgpOwpAQCAtNDk3LDYgKzQ5OSwxMiBAQCBpbmxp bmUgTmFtZWROb2RlTWFwKiBFbGVtZW50OjphdHRyaWJ1dGVzKGJvb2wgcmVhZG9ubHkpIGNvbnN0 CiAgICAgcmV0dXJuIG1fYXR0cmlidXRlTWFwLmdldCgpOwogfQogCitpbmxpbmUgdm9pZCBFbGVt ZW50OjpzZXRBdHRyaWJ1dGVzRnJvbUVsZW1lbnQoY29uc3QgRWxlbWVudCYgb3RoZXIpCit7Cisg ICAgaWYgKE5hbWVkTm9kZU1hcCogYXR0cmlidXRlTWFwID0gb3RoZXIuYXR0cmlidXRlcyh0cnVl KSkKKyAgICAgICAgYXR0cmlidXRlcyhmYWxzZSktPnNldEF0dHJpYnV0ZXMoKmF0dHJpYnV0ZU1h cCk7Cit9CisKIGlubGluZSB2b2lkIEVsZW1lbnQ6OnVwZGF0ZUlkKGNvbnN0IEF0b21pY1N0cmlu ZyYgb2xkSWQsIGNvbnN0IEF0b21pY1N0cmluZyYgbmV3SWQpCiB7CiAgICAgaWYgKCFpbkRvY3Vt ZW50KCkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vTmFtZWROb2RlTWFwLmggYi9T b3VyY2UvV2ViQ29yZS9kb20vTmFtZWROb2RlTWFwLmgKaW5kZXggYzNjMmNkOWIyM2UwYzU2ZjBh OTgyNDQzZTM1ZjhmYTY4NWEwOGJjNi4uMzRmMzg2MDQ2N2NmZWNmNWM5ZDJhZTBmODU5MDM1MWVh YWU4YWE2NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL05hbWVkTm9kZU1hcC5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9OYW1lZE5vZGVNYXAuaApAQCAtNjMsOCArNjMsNiBAQCBw dWJsaWM6CiAKICAgICAvLyBJbnRlcm5hbCBpbnRlcmZhY2UuCiAKLSAgICB2b2lkIHNldEF0dHJp YnV0ZXMoY29uc3QgTmFtZWROb2RlTWFwJik7Ci0KICAgICBBdHRyaWJ1dGUqIGF0dHJpYnV0ZUl0 ZW0odW5zaWduZWQgaW5kZXgpIGNvbnN0IHsgcmV0dXJuIG1fYXR0cmlidXRlc1tpbmRleF0uZ2V0 KCk7IH0KICAgICBBdHRyaWJ1dGUqIGdldEF0dHJpYnV0ZUl0ZW0oY29uc3QgUXVhbGlmaWVkTmFt ZSYpIGNvbnN0OwogCkBAIC0xMTMsNiArMTExLDcgQEAgcHJpdmF0ZToKICAgICB2b2lkIGRldGFj aEZyb21FbGVtZW50KCk7CiAgICAgQXR0cmlidXRlKiBnZXRBdHRyaWJ1dGVJdGVtKGNvbnN0IFN0 cmluZyYgbmFtZSwgYm9vbCBzaG91bGRJZ25vcmVBdHRyaWJ1dGVDYXNlKSBjb25zdDsKICAgICBB dHRyaWJ1dGUqIGdldEF0dHJpYnV0ZUl0ZW1TbG93Q2FzZShjb25zdCBTdHJpbmcmIG5hbWUsIGJv b2wgc2hvdWxkSWdub3JlQXR0cmlidXRlQ2FzZSkgY29uc3Q7CisgICAgdm9pZCBzZXRBdHRyaWJ1 dGVzKGNvbnN0IE5hbWVkTm9kZU1hcCYpOwogICAgIHZvaWQgY2xlYXJBdHRyaWJ1dGVzKCk7CiAg ICAgaW50IGRlY2xDb3VudCgpIGNvbnN0OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9l ZGl0aW5nL1JlcGxhY2VOb2RlV2l0aFNwYW5Db21tYW5kLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Vk aXRpbmcvUmVwbGFjZU5vZGVXaXRoU3BhbkNvbW1hbmQuY3BwCmluZGV4IDMxZDZhN2I1Y2U0MjI3 MmQ5OTlkYmI4MmExZTFmYjBkOWMzMWNjNjQuLjE3YTcwOWRkOTliMjM0MDQ0ODljNjMzNjMyMjUz ZWIzMmJlYTQ3MjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvUmVwbGFjZU5v ZGVXaXRoU3BhbkNvbW1hbmQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvUmVwbGFj ZU5vZGVXaXRoU3BhbkNvbW1hbmQuY3BwCkBAIC02Myw3ICs2Myw4IEBAIHN0YXRpYyB2b2lkIHN3 YXBJbk5vZGVQcmVzZXJ2aW5nQXR0cmlidXRlc0FuZENoaWxkcmVuKEhUTUxFbGVtZW50KiBuZXdO b2RlLCBIVE1MCiAgICAgICAgIEFTU0VSVCghZWMpOwogICAgIH0KIAotICAgIG5ld05vZGUtPmF0 dHJpYnV0ZXMoKS0+c2V0QXR0cmlidXRlcygqbm9kZVRvUmVwbGFjZS0+YXR0cmlidXRlcygpKTsK KyAgICAvLyBGSVhNRTogRml4IHRoaXMgdG8gc2VuZCB0aGUgcHJvcGVyIE11dGF0aW9uUmVjb3Jk cyB3aGVuIE11dGF0aW9uT2JzZXJ2ZXJzIGFyZSBwcmVzZW50LgorICAgIG5ld05vZGUtPnNldEF0 dHJpYnV0ZXNGcm9tRWxlbWVudCgqbm9kZVRvUmVwbGFjZSk7CiAKICAgICBwYXJlbnROb2RlLT5y ZW1vdmVDaGlsZChub2RlVG9SZXBsYWNlLCBlYyk7CiAgICAgQVNTRVJUKCFlYyk7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9NQWdlbnQuY3BwIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRPTUFnZW50LmNwcAppbmRleCBiZjA4ZjNj NGYxY2I1YmFlNzI3MDZmY2YzYWVkMGIyNTA1NzkxMmU5Li5lNDIyZDg0ZDgwZGRhZTk4NDFlOTE1 MTkxYjkwM2MzOWMzMzVmNTkxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv SW5zcGVjdG9yRE9NQWdlbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNw ZWN0b3JET01BZ2VudC5jcHAKQEAgLTU5OCw5ICs1OTgsNyBAQCB2b2lkIEluc3BlY3RvckRPTUFn ZW50OjpzZXROb2RlTmFtZShFcnJvclN0cmluZyosIGludCBub2RlSWQsIGNvbnN0IFN0cmluZyYg dGFnTgogICAgICAgICByZXR1cm47CiAKICAgICAvLyBDb3B5IG92ZXIgdGhlIG9yaWdpbmFsIG5v ZGUncyBhdHRyaWJ1dGVzLgotICAgIEVsZW1lbnQqIG9sZEVsZW0gPSBzdGF0aWNfY2FzdDxFbGVt ZW50Kj4ob2xkTm9kZSk7Ci0gICAgaWYgKG9sZEVsZW0tPmF0dHJpYnV0ZXMoKSkKLSAgICAgICAg bmV3RWxlbS0+YXR0cmlidXRlcygpLT5zZXRBdHRyaWJ1dGVzKCoob2xkRWxlbS0+YXR0cmlidXRl cyh0cnVlKSkpOworICAgIG5ld0VsZW0tPnNldEF0dHJpYnV0ZXNGcm9tRWxlbWVudCgqdG9FbGVt ZW50KG9sZE5vZGUpKTsKIAogICAgIC8vIENvcHkgb3ZlciB0aGUgb3JpZ2luYWwgbm9kZSdzIGNo aWxkcmVuLgogICAgIE5vZGUqIGNoaWxkOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvc3Zn L1NWR1VzZUVsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvc3ZnL1NWR1VzZUVsZW1lbnQuY3Bw CmluZGV4IDA4MTIwYWFlNzJjZDQ4MjY5NGIyYWMxMjg1NGVlYzYzYjM3M2VhMmQuLjVlNjdmZjUy YTUyMDUyNWRlMzk0YzViMmEwNmY2MTRkOGFhZjAzNDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3N2Zy9TVkdVc2VFbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9zdmcvU1ZHVXNl RWxlbWVudC5jcHAKQEAgLTg5Niw3ICs4OTYsNyBAQCB2b2lkIFNWR1VzZUVsZW1lbnQ6OmV4cGFu ZFN5bWJvbEVsZW1lbnRzSW5TaGFkb3dUcmVlKE5vZGUqIGVsZW1lbnQpCiAgICAgICAgIFJlZlB0 cjxTVkdTVkdFbGVtZW50PiBzdmdFbGVtZW50ID0gU1ZHU1ZHRWxlbWVudDo6Y3JlYXRlKFNWR05h bWVzOjpzdmdUYWcsIGRvY3VtZW50KCkpOwogCiAgICAgICAgIC8vIFRyYW5zZmVyIGFsbCBhdHRy aWJ1dGVzIGZyb20gPHN5bWJvbD4gdG8gdGhlIG5ldyA8c3ZnPiBlbGVtZW50Ci0gICAgICAgIHN2 Z0VsZW1lbnQtPmF0dHJpYnV0ZXMoKS0+c2V0QXR0cmlidXRlcygqZWxlbWVudC0+YXR0cmlidXRl cygpKTsKKyAgICAgICAgc3ZnRWxlbWVudC0+c2V0QXR0cmlidXRlc0Zyb21FbGVtZW50KCp0b0Vs ZW1lbnQoZWxlbWVudCkpOwogCiAgICAgICAgIC8vIE9ubHkgY2xvbmUgc3ltYm9sIGNoaWxkcmVu LCBhbmQgYWRkIHRoZW0gdG8gdGhlIG5ldyA8c3ZnPiBlbGVtZW50ICAgIAogICAgICAgICBFeGNl cHRpb25Db2RlIGVjID0gMDsKQEAgLTEwMzMsMjQgKzEwMzMsMTMgQEAgdm9pZCBTVkdVc2VFbGVt ZW50Ojp0cmFuc2ZlclVzZUF0dHJpYnV0ZXNUb1JlcGxhY2VkRWxlbWVudChTVkdFbGVtZW50KiBm cm9tLCBTVkcKICAgICBBU1NFUlQoZnJvbSk7CiAgICAgQVNTRVJUKHRvKTsKIAotICAgIHRvLT5h dHRyaWJ1dGVzKCktPnNldEF0dHJpYnV0ZXMoKmZyb20tPmF0dHJpYnV0ZXMoKSk7CisgICAgdG8t PnNldEF0dHJpYnV0ZXNGcm9tRWxlbWVudCgqZnJvbSk7CiAKLSAgICBFeGNlcHRpb25Db2RlIGVj ID0gMDsKLQotICAgIHRvLT5yZW1vdmVBdHRyaWJ1dGUoU1ZHTmFtZXM6OnhBdHRyLCBlYyk7Ci0g ICAgQVNTRVJUKCFlYyk7Ci0KLSAgICB0by0+cmVtb3ZlQXR0cmlidXRlKFNWR05hbWVzOjp5QXR0 ciwgZWMpOwotICAgIEFTU0VSVCghZWMpOwotCi0gICAgdG8tPnJlbW92ZUF0dHJpYnV0ZShTVkdO YW1lczo6d2lkdGhBdHRyLCBlYyk7Ci0gICAgQVNTRVJUKCFlYyk7Ci0KLSAgICB0by0+cmVtb3Zl QXR0cmlidXRlKFNWR05hbWVzOjpoZWlnaHRBdHRyLCBlYyk7Ci0gICAgQVNTRVJUKCFlYyk7Ci0K LSAgICB0by0+cmVtb3ZlQXR0cmlidXRlKFhMaW5rTmFtZXM6OmhyZWZBdHRyLCBlYyk7Ci0gICAg QVNTRVJUKCFlYyk7CisgICAgdG8tPnJlbW92ZUF0dHJpYnV0ZShTVkdOYW1lczo6eEF0dHIsIEFT U0VSVF9OT19FWENFUFRJT04pOworICAgIHRvLT5yZW1vdmVBdHRyaWJ1dGUoU1ZHTmFtZXM6OnlB dHRyLCBBU1NFUlRfTk9fRVhDRVBUSU9OKTsKKyAgICB0by0+cmVtb3ZlQXR0cmlidXRlKFNWR05h bWVzOjp3aWR0aEF0dHIsIEFTU0VSVF9OT19FWENFUFRJT04pOworICAgIHRvLT5yZW1vdmVBdHRy aWJ1dGUoU1ZHTmFtZXM6OmhlaWdodEF0dHIsIEFTU0VSVF9OT19FWENFUFRJT04pOworICAgIHRv LT5yZW1vdmVBdHRyaWJ1dGUoWExpbmtOYW1lczo6aHJlZkF0dHIsIEFTU0VSVF9OT19FWENFUFRJ T04pOwogfQogCiBib29sIFNWR1VzZUVsZW1lbnQ6OnNlbGZIYXNSZWxhdGl2ZUxlbmd0aHMoKSBj b25zdAo=