118271 2013-07-01 18:48:02 -0700 Unexpose EditingPropertiesToInclude in EditingStyle.h after r151772 2013-07-02 05:21:04 -0700 1 1 1 Unclassified WebKit HTML Editing 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 rniwa rniwa commit-queue darin enrica g.czajkowski kling koivisto oldest_to_newest 905202 0 rniwa 2013-07-01 18:48:02 -0700 I realized that we don’t have to expose EditingPropertiesToInclude in EditingStyle.h since removeAllButEditingProperties doesn’t need to be a member function. We can do other cleanups as well. 905214 1 205853 rniwa 2013-07-01 19:17:06 -0700 Created attachment 205853 Cleanup 905215 2 205854 rniwa 2013-07-01 19:18:28 -0700 Created attachment 205854 Cleanup 905344 3 205854 kling 2013-07-02 05:00:05 -0700 Comment on attachment 205854 Cleanup Great cleanup. r=me. 905356 4 205854 commit-queue 2013-07-02 05:21:02 -0700 Comment on attachment 205854 Cleanup Clearing flags on attachment: 205854 Committed r152286: <http://trac.webkit.org/changeset/152286> 905357 5 commit-queue 2013-07-02 05:21:04 -0700 All reviewed patches have been landed. Closing bug. 205853 2013-07-01 19:17:06 -0700 2013-07-01 19:18:21 -0700 Cleanup bug-118271-20130701191507.patch text/plain 11388 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1MjI3NykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI3IEBACisyMDEzLTA3LTAxICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIFVuZXhwb3NlIEVkaXRpbmdQcm9w ZXJ0aWVzVG9JbmNsdWRlIGluIEVkaXRpbmdTdHlsZS5oIGFmdGVyIHIxNTE3NzIKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExODI3MQorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyAoT09Q UyEpLgorCisgICAgICAgICogZWRpdGluZy9FZGl0aW5nU3R5bGUuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6Y29weUVkaXRpbmdQcm9wZXJ0aWVzKTogVXNlIG5ld2x5IGRlZmluZWQgbnVtQWxsRWRp dGluZ1Byb3BlcnRpZXMgYW5kIG51bUluaGVyaXRhYmxlRWRpdGluZ1Byb3BlcnRpZXMKKyAgICAg ICAgaW5zdGVhZCBvZiBhIG1hZ2ljIG51bWJlciBvZiAyLgorICAgICAgICAoV2ViQ29yZTo6Y29w eVByb3BlcnRpZXNGcm9tQ29tcHV0ZWRTdHlsZSk6IFJlbmFtZWQgZnJvbSBlZGl0aW5nU3R5bGVG cm9tQ29tcHV0ZWRTdHlsZS4gSXQgbm93IHRha2VzIENvbXB1dGVkU3R5bGVFeHRyYWN0b3IgYW5k CisgICAgICAgIFByb3BlcnRpZXNUb0luY2x1ZGUgaW5zdGVhZCBvZiBOb2RlKiBhbmQgRWRpdGlu Z1Byb3BlcnRpZXNUb0luY2x1ZGUgYW5kIGhhbmRsZXMgQWxsUHJvcGVydGllcy4gQWxzbyBhZGRl ZCBhIGhlbHBlciB0aGF0IHRha2VzIE5vZGUqLgorICAgICAgICAoV2ViQ29yZTo6RWRpdGluZ1N0 eWxlOjppbml0KTogQ2FsbHMgY29weVByb3BlcnRpZXNGcm9tQ29tcHV0ZWRTdHlsZS4gVW5mb3J0 dW5hdGVseSwgd2UgbmVlZCB0byBzcGVjaWFsLWNhc2UgRWRpdGluZ1Byb3BlcnRpZXNJbkVmZmVj dAorICAgICAgICBhbmQgbm90IHNldCBiYWNrZ3JvdW5kLWNvbG9yIGFuZCB0ZXh0LWRlY29yYXRp b24uIFRoaXMgaXMgcmVxdWlyZWQgcHJvYmFibHkgZHVlIHRvIGEgYnVnIGVsc2V3aGVyZS4KKyAg ICAgICAgKFdlYkNvcmU6OkVkaXRpbmdTdHlsZTo6cmVtb3ZlU3R5bGVBZGRlZEJ5Tm9kZSk6Cisg ICAgICAgIChXZWJDb3JlOjpFZGl0aW5nU3R5bGU6OnJlbW92ZVN0eWxlQ29uZmxpY3RpbmdXaXRo U3R5bGVPZk5vZGUpOgorICAgICAgICAoV2ViQ29yZTo6ZXh0cmFjdEVkaXRpbmdQcm9wZXJ0aWVz KTogUmVuYW1lZCBmcm9tIEVkaXRpbmdTdHlsZTo6cmVtb3ZlQWxsQnV0RWRpdGluZ1Byb3BlcnRp ZXM7IHRha2VzIFByb3BlcnRpZXNUb0luY2x1ZGUgaW5zdGVhZCBvZgorICAgICAgICBFZGl0aW5n UHJvcGVydGllc1RvSW5jbHVkZSBzaW5jZSB0aGUgb25seSBjYWxsZXIgb2YgdGhpcyBmdW5jdGlv biwgRWRpdGluZ1N0eWxlOjptZXJnZUlubGluZUFuZEltcGxpY2l0U3R5bGVPZkVsZW1lbnQsIHdh cyBjb252ZXJ0aW5nCisgICAgICAgIHRoZSB0eXBlLgorICAgICAgICAoV2ViQ29yZTo6RWRpdGlu Z1N0eWxlOjptZXJnZUlubGluZUFuZEltcGxpY2l0U3R5bGVPZkVsZW1lbnQpOgorICAgICAgICAq IGVkaXRpbmcvRWRpdGluZ1N0eWxlLmg6CisKIDIwMTMtMDctMDEgIEFsZXggQ2hyaXN0ZW5zZW4g IDxhY2hyaXN0ZW5zZW5AYXBwbGUuY29tPgogCiAgICAgICAgIFdpbmRvd3Mgc2hvdWxkIGJlIGlu Y2x1ZGVkIGluIHRoZSBsaXN0IG9mIHBsYXRmb3JtcyB0aGF0IGNhbiB1c2UgT3BlbkdMIEVTIDIu CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRpbmdTdHlsZS5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvZWRpdGluZy9FZGl0aW5nU3R5bGUuY3BwCShyZXZpc2lvbiAx NTIyNzQpCisrKyBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRpbmdTdHlsZS5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTU3LDEwICs1Nyw2IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIC8vIEVkaXRp bmcgc3R5bGUgcHJvcGVydGllcyBtdXN0IGJlIHByZXNlcnZlZCBkdXJpbmcgZWRpdGluZyBvcGVy YXRpb24uCiAvLyBlLmcuIHdoZW4gYSB1c2VyIGluc2VydHMgYSBuZXcgcGFyYWdyYXBoLCBhbGwg cHJvcGVydGllcyBsaXN0ZWQgaGVyZSBtdXN0IGJlIGNvcGllZCB0byB0aGUgbmV3IHBhcmFncmFw aC4KIHN0YXRpYyBjb25zdCBDU1NQcm9wZXJ0eUlEIGVkaXRpbmdQcm9wZXJ0aWVzW10gPSB7Ci0g ICAgQ1NTUHJvcGVydHlCYWNrZ3JvdW5kQ29sb3IsCi0gICAgQ1NTUHJvcGVydHlUZXh0RGVjb3Jh dGlvbiwKLQotICAgIC8vIENTUyBpbmhlcml0YWJsZSBwcm9wZXJ0aWVzCiAgICAgQ1NTUHJvcGVy dHlDb2xvciwKICAgICBDU1NQcm9wZXJ0eUZvbnRGYW1pbHksCiAgICAgQ1NTUHJvcGVydHlGb250 U2l6ZSwKQEAgLTgwLDE0ICs3NiwyMiBAQCBzdGF0aWMgY29uc3QgQ1NTUHJvcGVydHlJRCBlZGl0 aW5nUHJvcGVyCiAgICAgQ1NTUHJvcGVydHlXZWJraXRUZXh0RmlsbENvbG9yLAogICAgIENTU1By b3BlcnR5V2Via2l0VGV4dFN0cm9rZUNvbG9yLAogICAgIENTU1Byb3BlcnR5V2Via2l0VGV4dFN0 cm9rZVdpZHRoLAorCisgICAgLy8gTm9uLWluaGVyaXRhYmxlIHByb3BlcnRpZXMKKyAgICBDU1NQ cm9wZXJ0eUJhY2tncm91bmRDb2xvciwKKyAgICBDU1NQcm9wZXJ0eVRleHREZWNvcmF0aW9uLAog fTsKIAorY29uc3QgdW5zaWduZWQgbnVtQWxsRWRpdGluZ1Byb3BlcnRpZXMgPSBXVEZfQVJSQVlf TEVOR1RIKGVkaXRpbmdQcm9wZXJ0aWVzKTsKK2NvbnN0IHVuc2lnbmVkIG51bUluaGVyaXRhYmxl RWRpdGluZ1Byb3BlcnRpZXMgPSBudW1BbGxFZGl0aW5nUHJvcGVydGllcyAtIDI7CisKK2VudW0g RWRpdGluZ1Byb3BlcnRpZXNUb0luY2x1ZGUgeyBPbmx5SW5oZXJpdGFibGVFZGl0aW5nUHJvcGVy dGllcywgQWxsRWRpdGluZ1Byb3BlcnRpZXMgfTsKIHRlbXBsYXRlIDxjbGFzcyBTdHlsZURlY2xh cmF0aW9uVHlwZT4KLXN0YXRpYyBQYXNzUmVmUHRyPE11dGFibGVTdHlsZVByb3BlcnR5U2V0PiBj b3B5RWRpdGluZ1Byb3BlcnRpZXMoU3R5bGVEZWNsYXJhdGlvblR5cGUqIHN0eWxlLCBFZGl0aW5n U3R5bGU6OkVkaXRpbmdQcm9wZXJ0aWVzVG9JbmNsdWRlIHR5cGUgPSBFZGl0aW5nU3R5bGU6Ok9u bHlJbmhlcml0YWJsZUVkaXRpbmdQcm9wZXJ0aWVzKQorc3RhdGljIFBhc3NSZWZQdHI8TXV0YWJs ZVN0eWxlUHJvcGVydHlTZXQ+IGNvcHlFZGl0aW5nUHJvcGVydGllcyhTdHlsZURlY2xhcmF0aW9u VHlwZSogc3R5bGUsIEVkaXRpbmdQcm9wZXJ0aWVzVG9JbmNsdWRlIHR5cGUpCiB7Ci0gICAgaWYg KHR5cGUgPT0gRWRpdGluZ1N0eWxlOjpBbGxFZGl0aW5nUHJvcGVydGllcykKLSAgICAgICAgcmV0 dXJuIHN0eWxlLT5jb3B5UHJvcGVydGllc0luU2V0KGVkaXRpbmdQcm9wZXJ0aWVzLCBXVEZfQVJS QVlfTEVOR1RIKGVkaXRpbmdQcm9wZXJ0aWVzKSk7Ci0gICAgcmV0dXJuIHN0eWxlLT5jb3B5UHJv cGVydGllc0luU2V0KGVkaXRpbmdQcm9wZXJ0aWVzICsgMiwgV1RGX0FSUkFZX0xFTkdUSChlZGl0 aW5nUHJvcGVydGllcykgLSAyKTsKKyAgICBpZiAodHlwZSA9PSBBbGxFZGl0aW5nUHJvcGVydGll cykKKyAgICAgICAgcmV0dXJuIHN0eWxlLT5jb3B5UHJvcGVydGllc0luU2V0KGVkaXRpbmdQcm9w ZXJ0aWVzLCBudW1BbGxFZGl0aW5nUHJvcGVydGllcyk7CisgICAgcmV0dXJuIHN0eWxlLT5jb3B5 UHJvcGVydGllc0luU2V0KGVkaXRpbmdQcm9wZXJ0aWVzLCBudW1Jbmhlcml0YWJsZUVkaXRpbmdQ cm9wZXJ0aWVzKTsKIH0KIAogc3RhdGljIGlubGluZSBib29sIGlzRWRpdGluZ1Byb3BlcnR5KGlu dCBpZCkKQEAgLTk5LDEwICsxMDMsMjQgQEAgc3RhdGljIGlubGluZSBib29sIGlzRWRpdGluZ1By b3BlcnR5KGludAogICAgIHJldHVybiBmYWxzZTsKIH0KIAotc3RhdGljIFBhc3NSZWZQdHI8TXV0 YWJsZVN0eWxlUHJvcGVydHlTZXQ+IGVkaXRpbmdTdHlsZUZyb21Db21wdXRlZFN0eWxlKFBhc3NS ZWZQdHI8Tm9kZT4gbm9kZSwgRWRpdGluZ1N0eWxlOjpFZGl0aW5nUHJvcGVydGllc1RvSW5jbHVk ZSB0eXBlID0gRWRpdGluZ1N0eWxlOjpPbmx5SW5oZXJpdGFibGVFZGl0aW5nUHJvcGVydGllcykK K3N0YXRpYyBQYXNzUmVmUHRyPE11dGFibGVTdHlsZVByb3BlcnR5U2V0PiBjb3B5UHJvcGVydGll c0Zyb21Db21wdXRlZFN0eWxlKENvbXB1dGVkU3R5bGVFeHRyYWN0b3ImIGNvbXB1dGVkU3R5bGUs IEVkaXRpbmdTdHlsZTo6UHJvcGVydGllc1RvSW5jbHVkZSBwcm9wZXJ0aWVzVG9JbmNsdWRlKQor eworICAgIHN3aXRjaCAocHJvcGVydGllc1RvSW5jbHVkZSkgeworICAgIGNhc2UgRWRpdGluZ1N0 eWxlOjpBbGxQcm9wZXJ0aWVzOgorICAgICAgICByZXR1cm4gY29tcHV0ZWRTdHlsZS5jb3B5UHJv cGVydGllcygpOworICAgIGNhc2UgRWRpdGluZ1N0eWxlOjpPbmx5RWRpdGluZ0luaGVyaXRhYmxl UHJvcGVydGllczoKKyAgICAgICAgcmV0dXJuIGNvcHlFZGl0aW5nUHJvcGVydGllcygmY29tcHV0 ZWRTdHlsZSwgT25seUluaGVyaXRhYmxlRWRpdGluZ1Byb3BlcnRpZXMpOworICAgIGNhc2UgRWRp dGluZ1N0eWxlOjpFZGl0aW5nUHJvcGVydGllc0luRWZmZWN0OgorICAgICAgICByZXR1cm4gY29w eUVkaXRpbmdQcm9wZXJ0aWVzKCZjb21wdXRlZFN0eWxlLCBBbGxFZGl0aW5nUHJvcGVydGllcyk7 CisgICAgfQorICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAgIHJldHVybiAwOworfQorCitz dGF0aWMgUGFzc1JlZlB0cjxNdXRhYmxlU3R5bGVQcm9wZXJ0eVNldD4gY29weVByb3BlcnRpZXNG cm9tQ29tcHV0ZWRTdHlsZShOb2RlKiBub2RlLCBFZGl0aW5nU3R5bGU6OlByb3BlcnRpZXNUb0lu Y2x1ZGUgcHJvcGVydGllc1RvSW5jbHVkZSkKIHsKICAgICBDb21wdXRlZFN0eWxlRXh0cmFjdG9y IGNvbXB1dGVkU3R5bGUobm9kZSk7Ci0gICAgcmV0dXJuIGNvcHlFZGl0aW5nUHJvcGVydGllcygm Y29tcHV0ZWRTdHlsZSwgdHlwZSk7CisgICAgcmV0dXJuIGNvcHlQcm9wZXJ0aWVzRnJvbUNvbXB1 dGVkU3R5bGUoY29tcHV0ZWRTdHlsZSwgcHJvcGVydGllc1RvSW5jbHVkZSk7CiB9CiAKIHN0YXRp YyBQYXNzUmVmUHRyPENTU1ZhbHVlPiBleHRyYWN0UHJvcGVydHlWYWx1ZShjb25zdCBTdHlsZVBy b3BlcnR5U2V0KiBzdHlsZSwgQ1NTUHJvcGVydHlJRCBwcm9wZXJ0eUlEKQpAQCAtMTE1LDIwICsx MzMsNiBAQCBzdGF0aWMgUGFzc1JlZlB0cjxDU1NWYWx1ZT4gZXh0cmFjdFByb3BlCiAgICAgcmV0 dXJuIGNvbXB1dGVkU3R5bGUtPnByb3BlcnR5VmFsdWUocHJvcGVydHlJRCk7CiB9CiAKLXN0YXRp YyBpbmxpbmUgRWRpdGluZ1N0eWxlOjpFZGl0aW5nUHJvcGVydGllc1RvSW5jbHVkZSB0b0VkaXRp bmdQcm9wZXJ0aWVzKEVkaXRpbmdTdHlsZTo6UHJvcGVydGllc1RvSW5jbHVkZSBwcm9wZXJ0aWVz KQotewotICAgIHN3aXRjaCAocHJvcGVydGllcykgewotICAgIGNhc2UgRWRpdGluZ1N0eWxlOjpB bGxQcm9wZXJ0aWVzOgotICAgIGNhc2UgRWRpdGluZ1N0eWxlOjpFZGl0aW5nUHJvcGVydGllc0lu RWZmZWN0OgotICAgICAgICByZXR1cm4gRWRpdGluZ1N0eWxlOjpBbGxFZGl0aW5nUHJvcGVydGll czsKLSAgICBjYXNlIEVkaXRpbmdTdHlsZTo6T25seUVkaXRpbmdJbmhlcml0YWJsZVByb3BlcnRp ZXM6Ci0gICAgICAgIHJldHVybiBFZGl0aW5nU3R5bGU6Ok9ubHlJbmhlcml0YWJsZUVkaXRpbmdQ cm9wZXJ0aWVzOwotICAgIH0KLQotICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwotICAgIHJldHVy biBFZGl0aW5nU3R5bGU6Ok9ubHlJbmhlcml0YWJsZUVkaXRpbmdQcm9wZXJ0aWVzOwotfQotCiB0 ZW1wbGF0ZTx0eXBlbmFtZSBUPgogaW50IGlkZW50aWZpZXJGb3JTdHlsZVByb3BlcnR5KFQqIHN0 eWxlLCBDU1NQcm9wZXJ0eUlEIHByb3BlcnR5SUQpCiB7CkBAIC00MzEsNyArNDM1LDEwIEBAIHZv aWQgRWRpdGluZ1N0eWxlOjppbml0KE5vZGUqIG5vZGUsIFByb3AKICAgICAgICAgbm9kZSA9IG5v ZGUtPnBhcmVudE5vZGUoKTsKIAogICAgIENvbXB1dGVkU3R5bGVFeHRyYWN0b3IgY29tcHV0ZWRT dHlsZUF0UG9zaXRpb24obm9kZSk7Ci0gICAgbV9tdXRhYmxlU3R5bGUgPSBwcm9wZXJ0aWVzVG9J bmNsdWRlID09IEFsbFByb3BlcnRpZXMgPyBjb21wdXRlZFN0eWxlQXRQb3NpdGlvbi5jb3B5UHJv cGVydGllcygpIDogZWRpdGluZ1N0eWxlRnJvbUNvbXB1dGVkU3R5bGUobm9kZSk7CisgICAgLy8g RklYTUU6IEl0J3Mgc3RyYW5nZSB0byBub3Qgc2V0IGJhY2tncm91bmQtY29sb3IgYW5kIHRleHQt ZGVjb3JhdGlvbiB3aGVuIHByb3BlcnRpZXNUb0luY2x1ZGUgaXMgRWRpdGluZ1Byb3BlcnRpZXNJ bkVmZmVjdC4KKyAgICAvLyBIb3dldmVyIGVkaXRpbmcvc2VsZWN0aW9uL2NvbnRhaW5zLWJvdW5k YXJpZXMuaHRtbCBmYWlscyB3aXRob3V0IHRoaXMgdGVybmFyeS4KKyAgICBtX211dGFibGVTdHls ZSA9IGNvcHlQcm9wZXJ0aWVzRnJvbUNvbXB1dGVkU3R5bGUoY29tcHV0ZWRTdHlsZUF0UG9zaXRp b24sCisgICAgICAgIHByb3BlcnRpZXNUb0luY2x1ZGUgPT0gRWRpdGluZ1Byb3BlcnRpZXNJbkVm ZmVjdCA/IE9ubHlFZGl0aW5nSW5oZXJpdGFibGVQcm9wZXJ0aWVzIDogcHJvcGVydGllc1RvSW5j bHVkZSk7CiAKICAgICBpZiAocHJvcGVydGllc1RvSW5jbHVkZSA9PSBFZGl0aW5nUHJvcGVydGll c0luRWZmZWN0KSB7CiAgICAgICAgIGlmIChSZWZQdHI8Q1NTVmFsdWU+IHZhbHVlID0gYmFja2dy b3VuZENvbG9ySW5FZmZlY3Qobm9kZSkpCkBAIC01OTksOCArNjA2LDggQEAgdm9pZCBFZGl0aW5n U3R5bGU6OnJlbW92ZVN0eWxlQWRkZWRCeU5vZAogewogICAgIGlmICghbm9kZSB8fCAhbm9kZS0+ cGFyZW50Tm9kZSgpKQogICAgICAgICByZXR1cm47Ci0gICAgUmVmUHRyPE11dGFibGVTdHlsZVBy b3BlcnR5U2V0PiBwYXJlbnRTdHlsZSA9IGVkaXRpbmdTdHlsZUZyb21Db21wdXRlZFN0eWxlKG5v ZGUtPnBhcmVudE5vZGUoKSwgQWxsRWRpdGluZ1Byb3BlcnRpZXMpOwotICAgIFJlZlB0cjxNdXRh YmxlU3R5bGVQcm9wZXJ0eVNldD4gbm9kZVN0eWxlID0gZWRpdGluZ1N0eWxlRnJvbUNvbXB1dGVk U3R5bGUobm9kZSwgQWxsRWRpdGluZ1Byb3BlcnRpZXMpOworICAgIFJlZlB0cjxNdXRhYmxlU3R5 bGVQcm9wZXJ0eVNldD4gcGFyZW50U3R5bGUgPSBjb3B5UHJvcGVydGllc0Zyb21Db21wdXRlZFN0 eWxlKG5vZGUtPnBhcmVudE5vZGUoKSwgRWRpdGluZ1Byb3BlcnRpZXNJbkVmZmVjdCk7CisgICAg UmVmUHRyPE11dGFibGVTdHlsZVByb3BlcnR5U2V0PiBub2RlU3R5bGUgPSBjb3B5UHJvcGVydGll c0Zyb21Db21wdXRlZFN0eWxlKG5vZGUsIEVkaXRpbmdQcm9wZXJ0aWVzSW5FZmZlY3QpOwogICAg IG5vZGVTdHlsZS0+cmVtb3ZlRXF1aXZhbGVudFByb3BlcnRpZXMocGFyZW50U3R5bGUuZ2V0KCkp OwogICAgIG1fbXV0YWJsZVN0eWxlLT5yZW1vdmVFcXVpdmFsZW50UHJvcGVydGllcyhub2RlU3R5 bGUuZ2V0KCkpOwogfQpAQCAtNjEwLDggKzYxNyw4IEBAIHZvaWQgRWRpdGluZ1N0eWxlOjpyZW1v dmVTdHlsZUNvbmZsaWN0aW4KICAgICBpZiAoIW5vZGUgfHwgIW5vZGUtPnBhcmVudE5vZGUoKSB8 fCAhbV9tdXRhYmxlU3R5bGUpCiAgICAgICAgIHJldHVybjsKIAotICAgIFJlZlB0cjxNdXRhYmxl U3R5bGVQcm9wZXJ0eVNldD4gcGFyZW50U3R5bGUgPSBlZGl0aW5nU3R5bGVGcm9tQ29tcHV0ZWRT dHlsZShub2RlLT5wYXJlbnROb2RlKCksIEFsbEVkaXRpbmdQcm9wZXJ0aWVzKTsKLSAgICBSZWZQ dHI8TXV0YWJsZVN0eWxlUHJvcGVydHlTZXQ+IG5vZGVTdHlsZSA9IGVkaXRpbmdTdHlsZUZyb21D b21wdXRlZFN0eWxlKG5vZGUsIEFsbEVkaXRpbmdQcm9wZXJ0aWVzKTsKKyAgICBSZWZQdHI8TXV0 YWJsZVN0eWxlUHJvcGVydHlTZXQ+IHBhcmVudFN0eWxlID0gY29weVByb3BlcnRpZXNGcm9tQ29t cHV0ZWRTdHlsZShub2RlLT5wYXJlbnROb2RlKCksIEVkaXRpbmdQcm9wZXJ0aWVzSW5FZmZlY3Qp OworICAgIFJlZlB0cjxNdXRhYmxlU3R5bGVQcm9wZXJ0eVNldD4gbm9kZVN0eWxlID0gY29weVBy b3BlcnRpZXNGcm9tQ29tcHV0ZWRTdHlsZShub2RlLCBFZGl0aW5nUHJvcGVydGllc0luRWZmZWN0 KTsKICAgICBub2RlU3R5bGUtPnJlbW92ZUVxdWl2YWxlbnRQcm9wZXJ0aWVzKHBhcmVudFN0eWxl LmdldCgpKTsKIAogICAgIHVuc2lnbmVkIHByb3BlcnR5Q291bnQgPSBub2RlU3R5bGUtPnByb3Bl cnR5Q291bnQoKTsKQEAgLTYxOSwxMiArNjI2LDYgQEAgdm9pZCBFZGl0aW5nU3R5bGU6OnJlbW92 ZVN0eWxlQ29uZmxpY3RpbgogICAgICAgICBtX211dGFibGVTdHlsZS0+cmVtb3ZlUHJvcGVydHko bm9kZVN0eWxlLT5wcm9wZXJ0eUF0KGkpLmlkKCkpOwogfQogCi12b2lkIEVkaXRpbmdTdHlsZTo6 cmVtb3ZlQWxsQnV0RWRpdGluZ1Byb3BlcnRpZXMoRWRpdGluZ1Byb3BlcnRpZXNUb0luY2x1ZGUg cHJvcGVydGllc1RvSW5jbHVkZSkKLXsKLSAgICBpZiAobV9tdXRhYmxlU3R5bGUpCi0gICAgICAg IG1fbXV0YWJsZVN0eWxlID0gY29weUVkaXRpbmdQcm9wZXJ0aWVzKG1fbXV0YWJsZVN0eWxlLmdl dCgpLCBwcm9wZXJ0aWVzVG9JbmNsdWRlKTsKLX0KLQogdm9pZCBFZGl0aW5nU3R5bGU6OmNvbGxh cHNlVGV4dERlY29yYXRpb25Qcm9wZXJ0aWVzKCkKIHsKICAgICBpZiAoIW1fbXV0YWJsZVN0eWxl KQpAQCAtOTgxLDExICs5ODIsMjggQEAgc3RhdGljIGlubGluZSBib29sIGVsZW1lbnRNYXRjaGVz QW5kUHJvcAogICAgICAgICAmJiAobW9kZSA9PSBFZGl0aW5nU3R5bGU6Ok92ZXJyaWRlVmFsdWVz IHx8ICFlcXVpdmFsZW50LT5wcm9wZXJ0eUV4aXN0c0luU3R5bGUoc3R5bGUpKTsKIH0KIAorc3Rh dGljIFBhc3NSZWZQdHI8TXV0YWJsZVN0eWxlUHJvcGVydHlTZXQ+IGV4dHJhY3RFZGl0aW5nUHJv cGVydGllcyhjb25zdCBTdHlsZVByb3BlcnR5U2V0KiBzdHlsZSwgRWRpdGluZ1N0eWxlOjpQcm9w ZXJ0aWVzVG9JbmNsdWRlIHByb3BlcnRpZXNUb0luY2x1ZGUpCit7CisgICAgaWYgKCFzdHlsZSkK KyAgICAgICAgcmV0dXJuIDA7CisKKyAgICBzd2l0Y2ggKHByb3BlcnRpZXNUb0luY2x1ZGUpIHsK KyAgICBjYXNlIEVkaXRpbmdTdHlsZTo6QWxsUHJvcGVydGllczoKKyAgICBjYXNlIEVkaXRpbmdT dHlsZTo6RWRpdGluZ1Byb3BlcnRpZXNJbkVmZmVjdDoKKyAgICAgICAgcmV0dXJuIGNvcHlFZGl0 aW5nUHJvcGVydGllcyhzdHlsZSwgQWxsRWRpdGluZ1Byb3BlcnRpZXMpOworICAgIGNhc2UgRWRp dGluZ1N0eWxlOjpPbmx5RWRpdGluZ0luaGVyaXRhYmxlUHJvcGVydGllczoKKyAgICAgICAgcmV0 dXJuIGNvcHlFZGl0aW5nUHJvcGVydGllcyhzdHlsZSwgT25seUluaGVyaXRhYmxlRWRpdGluZ1By b3BlcnRpZXMpOworICAgIH0KKworICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAgIHJldHVy biAwOworfQorCiB2b2lkIEVkaXRpbmdTdHlsZTo6bWVyZ2VJbmxpbmVBbmRJbXBsaWNpdFN0eWxl T2ZFbGVtZW50KFN0eWxlZEVsZW1lbnQqIGVsZW1lbnQsIENTU1Byb3BlcnR5T3ZlcnJpZGVNb2Rl IG1vZGUsIFByb3BlcnRpZXNUb0luY2x1ZGUgcHJvcGVydGllc1RvSW5jbHVkZSkKIHsKICAgICBS ZWZQdHI8RWRpdGluZ1N0eWxlPiBzdHlsZUZyb21SdWxlcyA9IEVkaXRpbmdTdHlsZTo6Y3JlYXRl KCk7CiAgICAgc3R5bGVGcm9tUnVsZXMtPm1lcmdlU3R5bGVGcm9tUnVsZXNGb3JTZXJpYWxpemF0 aW9uKGVsZW1lbnQpOwotICAgIHN0eWxlRnJvbVJ1bGVzLT5yZW1vdmVBbGxCdXRFZGl0aW5nUHJv cGVydGllcyh0b0VkaXRpbmdQcm9wZXJ0aWVzKHByb3BlcnRpZXNUb0luY2x1ZGUpKTsKKyAgICBz dHlsZUZyb21SdWxlcy0+bV9tdXRhYmxlU3R5bGUgPSBleHRyYWN0RWRpdGluZ1Byb3BlcnRpZXMo c3R5bGVGcm9tUnVsZXMtPm1fbXV0YWJsZVN0eWxlLmdldCgpLCBwcm9wZXJ0aWVzVG9JbmNsdWRl KTsKICAgICBtZXJnZVN0eWxlKHN0eWxlRnJvbVJ1bGVzLT5tX211dGFibGVTdHlsZS5nZXQoKSwg bW9kZSk7CiAKICAgICBtZXJnZUlubGluZVN0eWxlT2ZFbGVtZW50KGVsZW1lbnQsIG1vZGUsIHBy b3BlcnRpZXNUb0luY2x1ZGUpOwpJbmRleDogU291cmNlL1dlYkNvcmUvZWRpdGluZy9FZGl0aW5n U3R5bGUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRpbmdTdHls ZS5oCShyZXZpc2lvbiAxNTIyNzQpCisrKyBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRpbmdT dHlsZS5oCSh3b3JraW5nIGNvcHkpCkBAIC02NCw3ICs2NCw2IEBAIGNsYXNzIEVkaXRpbmdTdHls ZSA6IHB1YmxpYyBSZWZDb3VudGVkPEUKIHB1YmxpYzoKIAogICAgIGVudW0gUHJvcGVydGllc1Rv SW5jbHVkZSB7IEFsbFByb3BlcnRpZXMsIE9ubHlFZGl0aW5nSW5oZXJpdGFibGVQcm9wZXJ0aWVz LCBFZGl0aW5nUHJvcGVydGllc0luRWZmZWN0IH07Ci0gICAgZW51bSBFZGl0aW5nUHJvcGVydGll c1RvSW5jbHVkZSB7IE9ubHlJbmhlcml0YWJsZUVkaXRpbmdQcm9wZXJ0aWVzLCBBbGxFZGl0aW5n UHJvcGVydGllcyB9OwogCiAgICAgZW51bSBTaG91bGRQcmVzZXJ2ZVdyaXRpbmdEaXJlY3Rpb24g eyBQcmVzZXJ2ZVdyaXRpbmdEaXJlY3Rpb24sIERvTm90UHJlc2VydmVXcml0aW5nRGlyZWN0aW9u IH07CiAgICAgZW51bSBTaG91bGRFeHRyYWN0TWF0Y2hpbmdTdHlsZSB7IEV4dHJhY3RNYXRjaGlu Z1N0eWxlLCBEb05vdEV4dHJhY3RNYXRjaGluZ1N0eWxlIH07CkBAIC0xMDksNyArMTA4LDYgQEAg cHVibGljOgogICAgIHZvaWQgcmVtb3ZlQmxvY2tQcm9wZXJ0aWVzKCk7CiAgICAgdm9pZCByZW1v dmVTdHlsZUFkZGVkQnlOb2RlKE5vZGUqKTsKICAgICB2b2lkIHJlbW92ZVN0eWxlQ29uZmxpY3Rp bmdXaXRoU3R5bGVPZk5vZGUoTm9kZSopOwotICAgIHZvaWQgcmVtb3ZlQWxsQnV0RWRpdGluZ1By b3BlcnRpZXMoRWRpdGluZ1Byb3BlcnRpZXNUb0luY2x1ZGUgPSBPbmx5SW5oZXJpdGFibGVFZGl0 aW5nUHJvcGVydGllcyk7CiAgICAgdm9pZCBjb2xsYXBzZVRleHREZWNvcmF0aW9uUHJvcGVydGll cygpOwogICAgIGVudW0gU2hvdWxkSWdub3JlVGV4dE9ubHlQcm9wZXJ0aWVzIHsgSWdub3JlVGV4 dE9ubHlQcm9wZXJ0aWVzLCBEb05vdElnbm9yZVRleHRPbmx5UHJvcGVydGllcyB9OwogICAgIFRy aVN0YXRlIHRyaVN0YXRlT2ZTdHlsZShFZGl0aW5nU3R5bGUqKSBjb25zdDsK 205854 2013-07-01 19:18:28 -0700 2013-07-02 05:21:01 -0700 Cleanup bug-118271-20130701191628.patch text/plain 11534 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1MjI3NykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI5IEBACisyMDEzLTA3LTAxICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIFVuZXhwb3NlIEVkaXRpbmdQcm9w ZXJ0aWVzVG9JbmNsdWRlIGluIEVkaXRpbmdTdHlsZS5oIGFmdGVyIHIxNTE3NzIKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExODI3MQorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIERvbid0IGV4cG9zZSBFZGl0 aW5nUHJvcGVydGllc1RvSW5jbHVkZSBpbiBFZGl0aW5nU3R5bGUuaCBhbmQgZG8gb3RoZXIgY2xl YW51cHMgYXMgZGVzY3JpYmVkIGJlbG93LgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyBzaW5jZSB0 aGVyZSBzaG91bGQgYmUgbm8gYmVoYXZpb3JhbCBjaGFuZ2UuCisKKyAgICAgICAgKiBlZGl0aW5n L0VkaXRpbmdTdHlsZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpjb3B5RWRpdGluZ1Byb3BlcnRp ZXMpOiBVc2UgbmV3bHkgZGVmaW5lZCBudW1BbGxFZGl0aW5nUHJvcGVydGllcyBhbmQgbnVtSW5o ZXJpdGFibGVFZGl0aW5nUHJvcGVydGllcworICAgICAgICBpbnN0ZWFkIG9mIGEgbWFnaWMgbnVt YmVyIG9mIDIuCisgICAgICAgIChXZWJDb3JlOjpjb3B5UHJvcGVydGllc0Zyb21Db21wdXRlZFN0 eWxlKTogUmVuYW1lZCBmcm9tIGVkaXRpbmdTdHlsZUZyb21Db21wdXRlZFN0eWxlLiBJdCBub3cg dGFrZXMgQ29tcHV0ZWRTdHlsZUV4dHJhY3RvciBhbmQKKyAgICAgICAgUHJvcGVydGllc1RvSW5j bHVkZSBpbnN0ZWFkIG9mIE5vZGUqIGFuZCBFZGl0aW5nUHJvcGVydGllc1RvSW5jbHVkZSBhbmQg aGFuZGxlcyBBbGxQcm9wZXJ0aWVzLiBBbHNvIGFkZGVkIGEgaGVscGVyIHRoYXQgdGFrZXMgTm9k ZSouCisgICAgICAgIChXZWJDb3JlOjpFZGl0aW5nU3R5bGU6OmluaXQpOiBDYWxscyBjb3B5UHJv cGVydGllc0Zyb21Db21wdXRlZFN0eWxlLiBVbmZvcnR1bmF0ZWx5LCB3ZSBuZWVkIHRvIHNwZWNp YWwtY2FzZSBFZGl0aW5nUHJvcGVydGllc0luRWZmZWN0CisgICAgICAgIGFuZCBub3Qgc2V0IGJh Y2tncm91bmQtY29sb3IgYW5kIHRleHQtZGVjb3JhdGlvbi4gVGhpcyBpcyByZXF1aXJlZCBwcm9i YWJseSBkdWUgdG8gYSBidWcgZWxzZXdoZXJlLgorICAgICAgICAoV2ViQ29yZTo6RWRpdGluZ1N0 eWxlOjpyZW1vdmVTdHlsZUFkZGVkQnlOb2RlKToKKyAgICAgICAgKFdlYkNvcmU6OkVkaXRpbmdT dHlsZTo6cmVtb3ZlU3R5bGVDb25mbGljdGluZ1dpdGhTdHlsZU9mTm9kZSk6CisgICAgICAgIChX ZWJDb3JlOjpleHRyYWN0RWRpdGluZ1Byb3BlcnRpZXMpOiBSZW5hbWVkIGZyb20gRWRpdGluZ1N0 eWxlOjpyZW1vdmVBbGxCdXRFZGl0aW5nUHJvcGVydGllczsgdGFrZXMgUHJvcGVydGllc1RvSW5j bHVkZSBpbnN0ZWFkIG9mCisgICAgICAgIEVkaXRpbmdQcm9wZXJ0aWVzVG9JbmNsdWRlIHNpbmNl IHRoZSBvbmx5IGNhbGxlciBvZiB0aGlzIGZ1bmN0aW9uLCBFZGl0aW5nU3R5bGU6Om1lcmdlSW5s aW5lQW5kSW1wbGljaXRTdHlsZU9mRWxlbWVudCwgd2FzIGNvbnZlcnRpbmcKKyAgICAgICAgdGhl IHR5cGUuCisgICAgICAgIChXZWJDb3JlOjpFZGl0aW5nU3R5bGU6Om1lcmdlSW5saW5lQW5kSW1w bGljaXRTdHlsZU9mRWxlbWVudCk6CisgICAgICAgICogZWRpdGluZy9FZGl0aW5nU3R5bGUuaDoK KwogMjAxMy0wNy0wMSAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkBhcHBsZS5jb20+ CiAKICAgICAgICAgV2luZG93cyBzaG91bGQgYmUgaW5jbHVkZWQgaW4gdGhlIGxpc3Qgb2YgcGxh dGZvcm1zIHRoYXQgY2FuIHVzZSBPcGVuR0wgRVMgMi4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2Vk aXRpbmcvRWRpdGluZ1N0eWxlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9lZGl0 aW5nL0VkaXRpbmdTdHlsZS5jcHAJKHJldmlzaW9uIDE1MjI3NCkKKysrIFNvdXJjZS9XZWJDb3Jl L2VkaXRpbmcvRWRpdGluZ1N0eWxlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTcsMTAgKzU3LDYg QEAgbmFtZXNwYWNlIFdlYkNvcmUgewogLy8gRWRpdGluZyBzdHlsZSBwcm9wZXJ0aWVzIG11c3Qg YmUgcHJlc2VydmVkIGR1cmluZyBlZGl0aW5nIG9wZXJhdGlvbi4KIC8vIGUuZy4gd2hlbiBhIHVz ZXIgaW5zZXJ0cyBhIG5ldyBwYXJhZ3JhcGgsIGFsbCBwcm9wZXJ0aWVzIGxpc3RlZCBoZXJlIG11 c3QgYmUgY29waWVkIHRvIHRoZSBuZXcgcGFyYWdyYXBoLgogc3RhdGljIGNvbnN0IENTU1Byb3Bl cnR5SUQgZWRpdGluZ1Byb3BlcnRpZXNbXSA9IHsKLSAgICBDU1NQcm9wZXJ0eUJhY2tncm91bmRD b2xvciwKLSAgICBDU1NQcm9wZXJ0eVRleHREZWNvcmF0aW9uLAotCi0gICAgLy8gQ1NTIGluaGVy aXRhYmxlIHByb3BlcnRpZXMKICAgICBDU1NQcm9wZXJ0eUNvbG9yLAogICAgIENTU1Byb3BlcnR5 Rm9udEZhbWlseSwKICAgICBDU1NQcm9wZXJ0eUZvbnRTaXplLApAQCAtODAsMTQgKzc2LDIyIEBA IHN0YXRpYyBjb25zdCBDU1NQcm9wZXJ0eUlEIGVkaXRpbmdQcm9wZXIKICAgICBDU1NQcm9wZXJ0 eVdlYmtpdFRleHRGaWxsQ29sb3IsCiAgICAgQ1NTUHJvcGVydHlXZWJraXRUZXh0U3Ryb2tlQ29s b3IsCiAgICAgQ1NTUHJvcGVydHlXZWJraXRUZXh0U3Ryb2tlV2lkdGgsCisKKyAgICAvLyBOb24t aW5oZXJpdGFibGUgcHJvcGVydGllcworICAgIENTU1Byb3BlcnR5QmFja2dyb3VuZENvbG9yLAor ICAgIENTU1Byb3BlcnR5VGV4dERlY29yYXRpb24sCiB9OwogCitjb25zdCB1bnNpZ25lZCBudW1B bGxFZGl0aW5nUHJvcGVydGllcyA9IFdURl9BUlJBWV9MRU5HVEgoZWRpdGluZ1Byb3BlcnRpZXMp OworY29uc3QgdW5zaWduZWQgbnVtSW5oZXJpdGFibGVFZGl0aW5nUHJvcGVydGllcyA9IG51bUFs bEVkaXRpbmdQcm9wZXJ0aWVzIC0gMjsKKworZW51bSBFZGl0aW5nUHJvcGVydGllc1RvSW5jbHVk ZSB7IE9ubHlJbmhlcml0YWJsZUVkaXRpbmdQcm9wZXJ0aWVzLCBBbGxFZGl0aW5nUHJvcGVydGll cyB9OwogdGVtcGxhdGUgPGNsYXNzIFN0eWxlRGVjbGFyYXRpb25UeXBlPgotc3RhdGljIFBhc3NS ZWZQdHI8TXV0YWJsZVN0eWxlUHJvcGVydHlTZXQ+IGNvcHlFZGl0aW5nUHJvcGVydGllcyhTdHls ZURlY2xhcmF0aW9uVHlwZSogc3R5bGUsIEVkaXRpbmdTdHlsZTo6RWRpdGluZ1Byb3BlcnRpZXNU b0luY2x1ZGUgdHlwZSA9IEVkaXRpbmdTdHlsZTo6T25seUluaGVyaXRhYmxlRWRpdGluZ1Byb3Bl cnRpZXMpCitzdGF0aWMgUGFzc1JlZlB0cjxNdXRhYmxlU3R5bGVQcm9wZXJ0eVNldD4gY29weUVk aXRpbmdQcm9wZXJ0aWVzKFN0eWxlRGVjbGFyYXRpb25UeXBlKiBzdHlsZSwgRWRpdGluZ1Byb3Bl cnRpZXNUb0luY2x1ZGUgdHlwZSkKIHsKLSAgICBpZiAodHlwZSA9PSBFZGl0aW5nU3R5bGU6OkFs bEVkaXRpbmdQcm9wZXJ0aWVzKQotICAgICAgICByZXR1cm4gc3R5bGUtPmNvcHlQcm9wZXJ0aWVz SW5TZXQoZWRpdGluZ1Byb3BlcnRpZXMsIFdURl9BUlJBWV9MRU5HVEgoZWRpdGluZ1Byb3BlcnRp ZXMpKTsKLSAgICByZXR1cm4gc3R5bGUtPmNvcHlQcm9wZXJ0aWVzSW5TZXQoZWRpdGluZ1Byb3Bl cnRpZXMgKyAyLCBXVEZfQVJSQVlfTEVOR1RIKGVkaXRpbmdQcm9wZXJ0aWVzKSAtIDIpOworICAg IGlmICh0eXBlID09IEFsbEVkaXRpbmdQcm9wZXJ0aWVzKQorICAgICAgICByZXR1cm4gc3R5bGUt PmNvcHlQcm9wZXJ0aWVzSW5TZXQoZWRpdGluZ1Byb3BlcnRpZXMsIG51bUFsbEVkaXRpbmdQcm9w ZXJ0aWVzKTsKKyAgICByZXR1cm4gc3R5bGUtPmNvcHlQcm9wZXJ0aWVzSW5TZXQoZWRpdGluZ1By b3BlcnRpZXMsIG51bUluaGVyaXRhYmxlRWRpdGluZ1Byb3BlcnRpZXMpOwogfQogCiBzdGF0aWMg aW5saW5lIGJvb2wgaXNFZGl0aW5nUHJvcGVydHkoaW50IGlkKQpAQCAtOTksMTAgKzEwMywyNCBA QCBzdGF0aWMgaW5saW5lIGJvb2wgaXNFZGl0aW5nUHJvcGVydHkoaW50CiAgICAgcmV0dXJuIGZh bHNlOwogfQogCi1zdGF0aWMgUGFzc1JlZlB0cjxNdXRhYmxlU3R5bGVQcm9wZXJ0eVNldD4gZWRp dGluZ1N0eWxlRnJvbUNvbXB1dGVkU3R5bGUoUGFzc1JlZlB0cjxOb2RlPiBub2RlLCBFZGl0aW5n U3R5bGU6OkVkaXRpbmdQcm9wZXJ0aWVzVG9JbmNsdWRlIHR5cGUgPSBFZGl0aW5nU3R5bGU6Ok9u bHlJbmhlcml0YWJsZUVkaXRpbmdQcm9wZXJ0aWVzKQorc3RhdGljIFBhc3NSZWZQdHI8TXV0YWJs ZVN0eWxlUHJvcGVydHlTZXQ+IGNvcHlQcm9wZXJ0aWVzRnJvbUNvbXB1dGVkU3R5bGUoQ29tcHV0 ZWRTdHlsZUV4dHJhY3RvciYgY29tcHV0ZWRTdHlsZSwgRWRpdGluZ1N0eWxlOjpQcm9wZXJ0aWVz VG9JbmNsdWRlIHByb3BlcnRpZXNUb0luY2x1ZGUpCit7CisgICAgc3dpdGNoIChwcm9wZXJ0aWVz VG9JbmNsdWRlKSB7CisgICAgY2FzZSBFZGl0aW5nU3R5bGU6OkFsbFByb3BlcnRpZXM6CisgICAg ICAgIHJldHVybiBjb21wdXRlZFN0eWxlLmNvcHlQcm9wZXJ0aWVzKCk7CisgICAgY2FzZSBFZGl0 aW5nU3R5bGU6Ok9ubHlFZGl0aW5nSW5oZXJpdGFibGVQcm9wZXJ0aWVzOgorICAgICAgICByZXR1 cm4gY29weUVkaXRpbmdQcm9wZXJ0aWVzKCZjb21wdXRlZFN0eWxlLCBPbmx5SW5oZXJpdGFibGVF ZGl0aW5nUHJvcGVydGllcyk7CisgICAgY2FzZSBFZGl0aW5nU3R5bGU6OkVkaXRpbmdQcm9wZXJ0 aWVzSW5FZmZlY3Q6CisgICAgICAgIHJldHVybiBjb3B5RWRpdGluZ1Byb3BlcnRpZXMoJmNvbXB1 dGVkU3R5bGUsIEFsbEVkaXRpbmdQcm9wZXJ0aWVzKTsKKyAgICB9CisgICAgQVNTRVJUX05PVF9S RUFDSEVEKCk7CisgICAgcmV0dXJuIDA7Cit9CisKK3N0YXRpYyBQYXNzUmVmUHRyPE11dGFibGVT dHlsZVByb3BlcnR5U2V0PiBjb3B5UHJvcGVydGllc0Zyb21Db21wdXRlZFN0eWxlKE5vZGUqIG5v ZGUsIEVkaXRpbmdTdHlsZTo6UHJvcGVydGllc1RvSW5jbHVkZSBwcm9wZXJ0aWVzVG9JbmNsdWRl KQogewogICAgIENvbXB1dGVkU3R5bGVFeHRyYWN0b3IgY29tcHV0ZWRTdHlsZShub2RlKTsKLSAg ICByZXR1cm4gY29weUVkaXRpbmdQcm9wZXJ0aWVzKCZjb21wdXRlZFN0eWxlLCB0eXBlKTsKKyAg ICByZXR1cm4gY29weVByb3BlcnRpZXNGcm9tQ29tcHV0ZWRTdHlsZShjb21wdXRlZFN0eWxlLCBw cm9wZXJ0aWVzVG9JbmNsdWRlKTsKIH0KIAogc3RhdGljIFBhc3NSZWZQdHI8Q1NTVmFsdWU+IGV4 dHJhY3RQcm9wZXJ0eVZhbHVlKGNvbnN0IFN0eWxlUHJvcGVydHlTZXQqIHN0eWxlLCBDU1NQcm9w ZXJ0eUlEIHByb3BlcnR5SUQpCkBAIC0xMTUsMjAgKzEzMyw2IEBAIHN0YXRpYyBQYXNzUmVmUHRy PENTU1ZhbHVlPiBleHRyYWN0UHJvcGUKICAgICByZXR1cm4gY29tcHV0ZWRTdHlsZS0+cHJvcGVy dHlWYWx1ZShwcm9wZXJ0eUlEKTsKIH0KIAotc3RhdGljIGlubGluZSBFZGl0aW5nU3R5bGU6OkVk aXRpbmdQcm9wZXJ0aWVzVG9JbmNsdWRlIHRvRWRpdGluZ1Byb3BlcnRpZXMoRWRpdGluZ1N0eWxl OjpQcm9wZXJ0aWVzVG9JbmNsdWRlIHByb3BlcnRpZXMpCi17Ci0gICAgc3dpdGNoIChwcm9wZXJ0 aWVzKSB7Ci0gICAgY2FzZSBFZGl0aW5nU3R5bGU6OkFsbFByb3BlcnRpZXM6Ci0gICAgY2FzZSBF ZGl0aW5nU3R5bGU6OkVkaXRpbmdQcm9wZXJ0aWVzSW5FZmZlY3Q6Ci0gICAgICAgIHJldHVybiBF ZGl0aW5nU3R5bGU6OkFsbEVkaXRpbmdQcm9wZXJ0aWVzOwotICAgIGNhc2UgRWRpdGluZ1N0eWxl OjpPbmx5RWRpdGluZ0luaGVyaXRhYmxlUHJvcGVydGllczoKLSAgICAgICAgcmV0dXJuIEVkaXRp bmdTdHlsZTo6T25seUluaGVyaXRhYmxlRWRpdGluZ1Byb3BlcnRpZXM7Ci0gICAgfQotCi0gICAg QVNTRVJUX05PVF9SRUFDSEVEKCk7Ci0gICAgcmV0dXJuIEVkaXRpbmdTdHlsZTo6T25seUluaGVy aXRhYmxlRWRpdGluZ1Byb3BlcnRpZXM7Ci19Ci0KIHRlbXBsYXRlPHR5cGVuYW1lIFQ+CiBpbnQg aWRlbnRpZmllckZvclN0eWxlUHJvcGVydHkoVCogc3R5bGUsIENTU1Byb3BlcnR5SUQgcHJvcGVy dHlJRCkKIHsKQEAgLTQzMSw3ICs0MzUsMTAgQEAgdm9pZCBFZGl0aW5nU3R5bGU6OmluaXQoTm9k ZSogbm9kZSwgUHJvcAogICAgICAgICBub2RlID0gbm9kZS0+cGFyZW50Tm9kZSgpOwogCiAgICAg Q29tcHV0ZWRTdHlsZUV4dHJhY3RvciBjb21wdXRlZFN0eWxlQXRQb3NpdGlvbihub2RlKTsKLSAg ICBtX211dGFibGVTdHlsZSA9IHByb3BlcnRpZXNUb0luY2x1ZGUgPT0gQWxsUHJvcGVydGllcyA/ IGNvbXB1dGVkU3R5bGVBdFBvc2l0aW9uLmNvcHlQcm9wZXJ0aWVzKCkgOiBlZGl0aW5nU3R5bGVG cm9tQ29tcHV0ZWRTdHlsZShub2RlKTsKKyAgICAvLyBGSVhNRTogSXQncyBzdHJhbmdlIHRvIG5v dCBzZXQgYmFja2dyb3VuZC1jb2xvciBhbmQgdGV4dC1kZWNvcmF0aW9uIHdoZW4gcHJvcGVydGll c1RvSW5jbHVkZSBpcyBFZGl0aW5nUHJvcGVydGllc0luRWZmZWN0LgorICAgIC8vIEhvd2V2ZXIg ZWRpdGluZy9zZWxlY3Rpb24vY29udGFpbnMtYm91bmRhcmllcy5odG1sIGZhaWxzIHdpdGhvdXQg dGhpcyB0ZXJuYXJ5LgorICAgIG1fbXV0YWJsZVN0eWxlID0gY29weVByb3BlcnRpZXNGcm9tQ29t cHV0ZWRTdHlsZShjb21wdXRlZFN0eWxlQXRQb3NpdGlvbiwKKyAgICAgICAgcHJvcGVydGllc1Rv SW5jbHVkZSA9PSBFZGl0aW5nUHJvcGVydGllc0luRWZmZWN0ID8gT25seUVkaXRpbmdJbmhlcml0 YWJsZVByb3BlcnRpZXMgOiBwcm9wZXJ0aWVzVG9JbmNsdWRlKTsKIAogICAgIGlmIChwcm9wZXJ0 aWVzVG9JbmNsdWRlID09IEVkaXRpbmdQcm9wZXJ0aWVzSW5FZmZlY3QpIHsKICAgICAgICAgaWYg KFJlZlB0cjxDU1NWYWx1ZT4gdmFsdWUgPSBiYWNrZ3JvdW5kQ29sb3JJbkVmZmVjdChub2RlKSkK QEAgLTU5OSw4ICs2MDYsOCBAQCB2b2lkIEVkaXRpbmdTdHlsZTo6cmVtb3ZlU3R5bGVBZGRlZEJ5 Tm9kCiB7CiAgICAgaWYgKCFub2RlIHx8ICFub2RlLT5wYXJlbnROb2RlKCkpCiAgICAgICAgIHJl dHVybjsKLSAgICBSZWZQdHI8TXV0YWJsZVN0eWxlUHJvcGVydHlTZXQ+IHBhcmVudFN0eWxlID0g ZWRpdGluZ1N0eWxlRnJvbUNvbXB1dGVkU3R5bGUobm9kZS0+cGFyZW50Tm9kZSgpLCBBbGxFZGl0 aW5nUHJvcGVydGllcyk7Ci0gICAgUmVmUHRyPE11dGFibGVTdHlsZVByb3BlcnR5U2V0PiBub2Rl U3R5bGUgPSBlZGl0aW5nU3R5bGVGcm9tQ29tcHV0ZWRTdHlsZShub2RlLCBBbGxFZGl0aW5nUHJv cGVydGllcyk7CisgICAgUmVmUHRyPE11dGFibGVTdHlsZVByb3BlcnR5U2V0PiBwYXJlbnRTdHls ZSA9IGNvcHlQcm9wZXJ0aWVzRnJvbUNvbXB1dGVkU3R5bGUobm9kZS0+cGFyZW50Tm9kZSgpLCBF ZGl0aW5nUHJvcGVydGllc0luRWZmZWN0KTsKKyAgICBSZWZQdHI8TXV0YWJsZVN0eWxlUHJvcGVy dHlTZXQ+IG5vZGVTdHlsZSA9IGNvcHlQcm9wZXJ0aWVzRnJvbUNvbXB1dGVkU3R5bGUobm9kZSwg RWRpdGluZ1Byb3BlcnRpZXNJbkVmZmVjdCk7CiAgICAgbm9kZVN0eWxlLT5yZW1vdmVFcXVpdmFs ZW50UHJvcGVydGllcyhwYXJlbnRTdHlsZS5nZXQoKSk7CiAgICAgbV9tdXRhYmxlU3R5bGUtPnJl bW92ZUVxdWl2YWxlbnRQcm9wZXJ0aWVzKG5vZGVTdHlsZS5nZXQoKSk7CiB9CkBAIC02MTAsOCAr NjE3LDggQEAgdm9pZCBFZGl0aW5nU3R5bGU6OnJlbW92ZVN0eWxlQ29uZmxpY3RpbgogICAgIGlm ICghbm9kZSB8fCAhbm9kZS0+cGFyZW50Tm9kZSgpIHx8ICFtX211dGFibGVTdHlsZSkKICAgICAg ICAgcmV0dXJuOwogCi0gICAgUmVmUHRyPE11dGFibGVTdHlsZVByb3BlcnR5U2V0PiBwYXJlbnRT dHlsZSA9IGVkaXRpbmdTdHlsZUZyb21Db21wdXRlZFN0eWxlKG5vZGUtPnBhcmVudE5vZGUoKSwg QWxsRWRpdGluZ1Byb3BlcnRpZXMpOwotICAgIFJlZlB0cjxNdXRhYmxlU3R5bGVQcm9wZXJ0eVNl dD4gbm9kZVN0eWxlID0gZWRpdGluZ1N0eWxlRnJvbUNvbXB1dGVkU3R5bGUobm9kZSwgQWxsRWRp dGluZ1Byb3BlcnRpZXMpOworICAgIFJlZlB0cjxNdXRhYmxlU3R5bGVQcm9wZXJ0eVNldD4gcGFy ZW50U3R5bGUgPSBjb3B5UHJvcGVydGllc0Zyb21Db21wdXRlZFN0eWxlKG5vZGUtPnBhcmVudE5v ZGUoKSwgRWRpdGluZ1Byb3BlcnRpZXNJbkVmZmVjdCk7CisgICAgUmVmUHRyPE11dGFibGVTdHls ZVByb3BlcnR5U2V0PiBub2RlU3R5bGUgPSBjb3B5UHJvcGVydGllc0Zyb21Db21wdXRlZFN0eWxl KG5vZGUsIEVkaXRpbmdQcm9wZXJ0aWVzSW5FZmZlY3QpOwogICAgIG5vZGVTdHlsZS0+cmVtb3Zl RXF1aXZhbGVudFByb3BlcnRpZXMocGFyZW50U3R5bGUuZ2V0KCkpOwogCiAgICAgdW5zaWduZWQg cHJvcGVydHlDb3VudCA9IG5vZGVTdHlsZS0+cHJvcGVydHlDb3VudCgpOwpAQCAtNjE5LDEyICs2 MjYsNiBAQCB2b2lkIEVkaXRpbmdTdHlsZTo6cmVtb3ZlU3R5bGVDb25mbGljdGluCiAgICAgICAg IG1fbXV0YWJsZVN0eWxlLT5yZW1vdmVQcm9wZXJ0eShub2RlU3R5bGUtPnByb3BlcnR5QXQoaSku aWQoKSk7CiB9CiAKLXZvaWQgRWRpdGluZ1N0eWxlOjpyZW1vdmVBbGxCdXRFZGl0aW5nUHJvcGVy dGllcyhFZGl0aW5nUHJvcGVydGllc1RvSW5jbHVkZSBwcm9wZXJ0aWVzVG9JbmNsdWRlKQotewot ICAgIGlmIChtX211dGFibGVTdHlsZSkKLSAgICAgICAgbV9tdXRhYmxlU3R5bGUgPSBjb3B5RWRp dGluZ1Byb3BlcnRpZXMobV9tdXRhYmxlU3R5bGUuZ2V0KCksIHByb3BlcnRpZXNUb0luY2x1ZGUp OwotfQotCiB2b2lkIEVkaXRpbmdTdHlsZTo6Y29sbGFwc2VUZXh0RGVjb3JhdGlvblByb3BlcnRp ZXMoKQogewogICAgIGlmICghbV9tdXRhYmxlU3R5bGUpCkBAIC05ODEsMTEgKzk4MiwyOCBAQCBz dGF0aWMgaW5saW5lIGJvb2wgZWxlbWVudE1hdGNoZXNBbmRQcm9wCiAgICAgICAgICYmIChtb2Rl ID09IEVkaXRpbmdTdHlsZTo6T3ZlcnJpZGVWYWx1ZXMgfHwgIWVxdWl2YWxlbnQtPnByb3BlcnR5 RXhpc3RzSW5TdHlsZShzdHlsZSkpOwogfQogCitzdGF0aWMgUGFzc1JlZlB0cjxNdXRhYmxlU3R5 bGVQcm9wZXJ0eVNldD4gZXh0cmFjdEVkaXRpbmdQcm9wZXJ0aWVzKGNvbnN0IFN0eWxlUHJvcGVy dHlTZXQqIHN0eWxlLCBFZGl0aW5nU3R5bGU6OlByb3BlcnRpZXNUb0luY2x1ZGUgcHJvcGVydGll c1RvSW5jbHVkZSkKK3sKKyAgICBpZiAoIXN0eWxlKQorICAgICAgICByZXR1cm4gMDsKKworICAg IHN3aXRjaCAocHJvcGVydGllc1RvSW5jbHVkZSkgeworICAgIGNhc2UgRWRpdGluZ1N0eWxlOjpB bGxQcm9wZXJ0aWVzOgorICAgIGNhc2UgRWRpdGluZ1N0eWxlOjpFZGl0aW5nUHJvcGVydGllc0lu RWZmZWN0OgorICAgICAgICByZXR1cm4gY29weUVkaXRpbmdQcm9wZXJ0aWVzKHN0eWxlLCBBbGxF ZGl0aW5nUHJvcGVydGllcyk7CisgICAgY2FzZSBFZGl0aW5nU3R5bGU6Ok9ubHlFZGl0aW5nSW5o ZXJpdGFibGVQcm9wZXJ0aWVzOgorICAgICAgICByZXR1cm4gY29weUVkaXRpbmdQcm9wZXJ0aWVz KHN0eWxlLCBPbmx5SW5oZXJpdGFibGVFZGl0aW5nUHJvcGVydGllcyk7CisgICAgfQorCisgICAg QVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAgcmV0dXJuIDA7Cit9CisKIHZvaWQgRWRpdGluZ1N0 eWxlOjptZXJnZUlubGluZUFuZEltcGxpY2l0U3R5bGVPZkVsZW1lbnQoU3R5bGVkRWxlbWVudCog ZWxlbWVudCwgQ1NTUHJvcGVydHlPdmVycmlkZU1vZGUgbW9kZSwgUHJvcGVydGllc1RvSW5jbHVk ZSBwcm9wZXJ0aWVzVG9JbmNsdWRlKQogewogICAgIFJlZlB0cjxFZGl0aW5nU3R5bGU+IHN0eWxl RnJvbVJ1bGVzID0gRWRpdGluZ1N0eWxlOjpjcmVhdGUoKTsKICAgICBzdHlsZUZyb21SdWxlcy0+ bWVyZ2VTdHlsZUZyb21SdWxlc0ZvclNlcmlhbGl6YXRpb24oZWxlbWVudCk7Ci0gICAgc3R5bGVG cm9tUnVsZXMtPnJlbW92ZUFsbEJ1dEVkaXRpbmdQcm9wZXJ0aWVzKHRvRWRpdGluZ1Byb3BlcnRp ZXMocHJvcGVydGllc1RvSW5jbHVkZSkpOworICAgIHN0eWxlRnJvbVJ1bGVzLT5tX211dGFibGVT dHlsZSA9IGV4dHJhY3RFZGl0aW5nUHJvcGVydGllcyhzdHlsZUZyb21SdWxlcy0+bV9tdXRhYmxl U3R5bGUuZ2V0KCksIHByb3BlcnRpZXNUb0luY2x1ZGUpOwogICAgIG1lcmdlU3R5bGUoc3R5bGVG cm9tUnVsZXMtPm1fbXV0YWJsZVN0eWxlLmdldCgpLCBtb2RlKTsKIAogICAgIG1lcmdlSW5saW5l U3R5bGVPZkVsZW1lbnQoZWxlbWVudCwgbW9kZSwgcHJvcGVydGllc1RvSW5jbHVkZSk7CkluZGV4 OiBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRpbmdTdHlsZS5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJDb3JlL2VkaXRpbmcvRWRpdGluZ1N0eWxlLmgJKHJldmlzaW9uIDE1MjI3NCkKKysr IFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRWRpdGluZ1N0eWxlLmgJKHdvcmtpbmcgY29weSkKQEAg LTY0LDcgKzY0LDYgQEAgY2xhc3MgRWRpdGluZ1N0eWxlIDogcHVibGljIFJlZkNvdW50ZWQ8RQog cHVibGljOgogCiAgICAgZW51bSBQcm9wZXJ0aWVzVG9JbmNsdWRlIHsgQWxsUHJvcGVydGllcywg T25seUVkaXRpbmdJbmhlcml0YWJsZVByb3BlcnRpZXMsIEVkaXRpbmdQcm9wZXJ0aWVzSW5FZmZl Y3QgfTsKLSAgICBlbnVtIEVkaXRpbmdQcm9wZXJ0aWVzVG9JbmNsdWRlIHsgT25seUluaGVyaXRh YmxlRWRpdGluZ1Byb3BlcnRpZXMsIEFsbEVkaXRpbmdQcm9wZXJ0aWVzIH07CiAKICAgICBlbnVt IFNob3VsZFByZXNlcnZlV3JpdGluZ0RpcmVjdGlvbiB7IFByZXNlcnZlV3JpdGluZ0RpcmVjdGlv biwgRG9Ob3RQcmVzZXJ2ZVdyaXRpbmdEaXJlY3Rpb24gfTsKICAgICBlbnVtIFNob3VsZEV4dHJh Y3RNYXRjaGluZ1N0eWxlIHsgRXh0cmFjdE1hdGNoaW5nU3R5bGUsIERvTm90RXh0cmFjdE1hdGNo aW5nU3R5bGUgfTsKQEAgLTEwOSw3ICsxMDgsNiBAQCBwdWJsaWM6CiAgICAgdm9pZCByZW1vdmVC bG9ja1Byb3BlcnRpZXMoKTsKICAgICB2b2lkIHJlbW92ZVN0eWxlQWRkZWRCeU5vZGUoTm9kZSop OwogICAgIHZvaWQgcmVtb3ZlU3R5bGVDb25mbGljdGluZ1dpdGhTdHlsZU9mTm9kZShOb2RlKik7 Ci0gICAgdm9pZCByZW1vdmVBbGxCdXRFZGl0aW5nUHJvcGVydGllcyhFZGl0aW5nUHJvcGVydGll c1RvSW5jbHVkZSA9IE9ubHlJbmhlcml0YWJsZUVkaXRpbmdQcm9wZXJ0aWVzKTsKICAgICB2b2lk IGNvbGxhcHNlVGV4dERlY29yYXRpb25Qcm9wZXJ0aWVzKCk7CiAgICAgZW51bSBTaG91bGRJZ25v cmVUZXh0T25seVByb3BlcnRpZXMgeyBJZ25vcmVUZXh0T25seVByb3BlcnRpZXMsIERvTm90SWdu b3JlVGV4dE9ubHlQcm9wZXJ0aWVzIH07CiAgICAgVHJpU3RhdGUgdHJpU3RhdGVPZlN0eWxlKEVk aXRpbmdTdHlsZSopIGNvbnN0Owo=