66499 2011-08-18 14:40:27 -0700 Rename VisiblePosition::honorEditableBoundary* to VisiblePosition::honorEditingBoundary* 2011-08-19 15:20:37 -0700 1 1 1 Unclassified WebKit HTML Editing 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 rniwa webkit-unassigned ap cshu darin justin.garcia leviw vanlam webkit.review.bot xji oldest_to_newest 453364 0 rniwa 2011-08-18 14:40:27 -0700 The following member functions of VisiblePosition use the non-standard term edit*able* boundary. We should rename these functions to use edit*ing* boundary for consistency. VisiblePosition honorEditableBoundaryAtOrBefore(const VisiblePosition&) const; VisiblePosition honorEditableBoundaryAtOrAfter(const VisiblePosition&) const; 453917 1 104524 vanlam 2011-08-19 10:39:44 -0700 Created attachment 104524 Patch 453924 2 104524 rniwa 2011-08-19 10:47:11 -0700 Comment on attachment 104524 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=104524&action=review > Source/WebCore/ChangeLog:8 > + No new tests. (OOPS!) Nit: you should remove this line. 454049 3 104558 vanlam 2011-08-19 13:50:59 -0700 Created attachment 104558 Revised patch Removed the "no new tests" line from changelog. 454067 4 104561 vanlam 2011-08-19 14:03:40 -0700 Created attachment 104561 Revised patch Fixed changelog. 454140 5 104561 webkit.review.bot 2011-08-19 15:20:32 -0700 Comment on attachment 104561 Revised patch Clearing flags on attachment: 104561 Committed r93443: <http://trac.webkit.org/changeset/93443> 454141 6 webkit.review.bot 2011-08-19 15:20:37 -0700 All reviewed patches have been landed. Closing bug. 104524 2011-08-19 10:39:44 -0700 2011-08-19 13:50:59 -0700 Patch vanlam-renaming text/plain 8727 vanlam SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDkzNDIxKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzUgQEAKKzIwMTEtMDgtMTkgIFZhbiBMYW0g IDx2YW5sYW1AZ29vZ2xlLmNvbT4KKworICAgICAgICBSZW5hbWUgVmlzaWJsZVBvc2l0aW9uOjpo b25vckVkaXRhYmxlQm91bmRhcnkqIHRvIFZpc2libGVQb3NpdGlvbjo6aG9ub3JFZGl0aW5nQm91 bmRhcnkqCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02 NjQ5OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5v IG5ldyB0ZXN0cy4gKE9PUFMhKQorCisgICAgICAgIFJlbmFtZWQgVmlzaWJsZVBvc2l0aW9uOjpo b25vckVkaXRhYmxlQm91bmRhcnkqIHRvCisgICAgICAgIGhvbm9yRWRpdGluZ0JvdW5kYXJ5Lgor CisgICAgICAgICogZWRpdGluZy9WaXNpYmxlUG9zaXRpb24uY3BwOgorICAgICAgICAoV2ViQ29y ZTo6VmlzaWJsZVBvc2l0aW9uOjpuZXh0KToKKyAgICAgICAgKFdlYkNvcmU6OlZpc2libGVQb3Np dGlvbjo6cHJldmlvdXMpOgorICAgICAgICAoV2ViQ29yZTo6VmlzaWJsZVBvc2l0aW9uOjpsZWZ0 KToKKyAgICAgICAgKFdlYkNvcmU6OlZpc2libGVQb3NpdGlvbjo6cmlnaHQpOgorICAgICAgICAo V2ViQ29yZTo6VmlzaWJsZVBvc2l0aW9uOjpob25vckVkaXRpbmdCb3VuZGFyeUF0T3JCZWZvcmUp OgorICAgICAgICAoV2ViQ29yZTo6VmlzaWJsZVBvc2l0aW9uOjpob25vckVkaXRpbmdCb3VuZGFy eUF0T3JBZnRlcik6CisgICAgICAgICogZWRpdGluZy9WaXNpYmxlUG9zaXRpb24uaDoKKyAgICAg ICAgKiBlZGl0aW5nL3Zpc2libGVfdW5pdHMuY3BwOgorICAgICAgICAoV2ViQ29yZTo6cHJldmlv dXNXb3JkUG9zaXRpb24pOgorICAgICAgICAoV2ViQ29yZTo6bmV4dFdvcmRQb3NpdGlvbik6Cisg ICAgICAgIChXZWJDb3JlOjpzdGFydE9mTGluZSk6CisgICAgICAgIChXZWJDb3JlOjplbmRPZkxp bmUpOgorICAgICAgICAoV2ViQ29yZTo6cHJldmlvdXNTZW50ZW5jZVBvc2l0aW9uKToKKyAgICAg ICAgKFdlYkNvcmU6Om5leHRTZW50ZW5jZVBvc2l0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6Omxv Z2ljYWxTdGFydE9mTGluZSk6CisgICAgICAgIChXZWJDb3JlOjpsb2dpY2FsRW5kT2ZMaW5lKToK KyAgICAgICAgKFdlYkNvcmU6OmxlZnRXb3JkUG9zaXRpb24pOgorICAgICAgICAoV2ViQ29yZTo6 cmlnaHRXb3JkUG9zaXRpb24pOgorCiAyMDExLTA4LTE5ICBEYW4gQmVybnN0ZWluICA8bWl0ekBh cHBsZS5jb20+CiAKICAgICAgICAgQmV0dGVyIGJ1aWxkIGZpeCBhZnRlciByOTMzODQuCkluZGV4 OiBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL1Zpc2libGVQb3NpdGlvbi5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYkNvcmUvZWRpdGluZy9WaXNpYmxlUG9zaXRpb24uY3BwCShyZXZpc2lvbiA5 MzQyMSkKKysrIFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvVmlzaWJsZVBvc2l0aW9uLmNwcAkod29y a2luZyBjb3B5KQpAQCAtNzAsNyArNzAsNyBAQCBWaXNpYmxlUG9zaXRpb24gVmlzaWJsZVBvc2l0 aW9uOjpuZXh0KEVkCiAgICAgaWYgKHJ1bGUgPT0gQ2FuQ3Jvc3NFZGl0aW5nQm91bmRhcnkpCiAg ICAgICAgIHJldHVybiBuZXh0OwogCi0gICAgcmV0dXJuIGhvbm9yRWRpdGFibGVCb3VuZGFyeUF0 T3JBZnRlcihuZXh0KTsKKyAgICByZXR1cm4gaG9ub3JFZGl0aW5nQm91bmRhcnlBdE9yQWZ0ZXIo bmV4dCk7CiB9CiAKIFZpc2libGVQb3NpdGlvbiBWaXNpYmxlUG9zaXRpb246OnByZXZpb3VzKEVk aXRpbmdCb3VuZGFyeUNyb3NzaW5nUnVsZSBydWxlKSBjb25zdApAQCAtMTAwLDcgKzEwMCw3IEBA IFZpc2libGVQb3NpdGlvbiBWaXNpYmxlUG9zaXRpb246OnByZXZpb3UKICAgICBpZiAocnVsZSA9 PSBDYW5Dcm9zc0VkaXRpbmdCb3VuZGFyeSkKICAgICAgICAgcmV0dXJuIHByZXY7CiAgICAgCi0g ICAgcmV0dXJuIGhvbm9yRWRpdGFibGVCb3VuZGFyeUF0T3JCZWZvcmUocHJldik7CisgICAgcmV0 dXJuIGhvbm9yRWRpdGluZ0JvdW5kYXJ5QXRPckJlZm9yZShwcmV2KTsKIH0KIAogUG9zaXRpb24g VmlzaWJsZVBvc2l0aW9uOjpsZWZ0VmlzdWFsbHlEaXN0aW5jdENhbmRpZGF0ZSgpIGNvbnN0CkBA IC0yNTEsNyArMjUxLDcgQEAgVmlzaWJsZVBvc2l0aW9uIFZpc2libGVQb3NpdGlvbjo6bGVmdChi bwogICAgICAgICByZXR1cm4gbGVmdDsKIAogICAgIC8vIEZJWE1FOiBUaGlzIG1heSBuZWVkIHRv IGRvIHNvbWV0aGluZyBkaWZmZXJlbnQgZnJvbSAiYmVmb3JlIi4KLSAgICByZXR1cm4gaG9ub3JF ZGl0YWJsZUJvdW5kYXJ5QXRPckJlZm9yZShsZWZ0KTsKKyAgICByZXR1cm4gaG9ub3JFZGl0aW5n Qm91bmRhcnlBdE9yQmVmb3JlKGxlZnQpOwogfQogCiBQb3NpdGlvbiBWaXNpYmxlUG9zaXRpb246 OnJpZ2h0VmlzdWFsbHlEaXN0aW5jdENhbmRpZGF0ZSgpIGNvbnN0CkBAIC00MDMsMTAgKzQwMywx MCBAQCBWaXNpYmxlUG9zaXRpb24gVmlzaWJsZVBvc2l0aW9uOjpyaWdodChiCiAgICAgICAgIHJl dHVybiByaWdodDsKIAogICAgIC8vIEZJWE1FOiBUaGlzIG1heSBuZWVkIHRvIGRvIHNvbWV0aGlu ZyBkaWZmZXJlbnQgZnJvbSAiYWZ0ZXIiLgotICAgIHJldHVybiBob25vckVkaXRhYmxlQm91bmRh cnlBdE9yQWZ0ZXIocmlnaHQpOworICAgIHJldHVybiBob25vckVkaXRpbmdCb3VuZGFyeUF0T3JB ZnRlcihyaWdodCk7CiB9CiAKLVZpc2libGVQb3NpdGlvbiBWaXNpYmxlUG9zaXRpb246Omhvbm9y RWRpdGFibGVCb3VuZGFyeUF0T3JCZWZvcmUoY29uc3QgVmlzaWJsZVBvc2l0aW9uICZwb3MpIGNv bnN0CitWaXNpYmxlUG9zaXRpb24gVmlzaWJsZVBvc2l0aW9uOjpob25vckVkaXRpbmdCb3VuZGFy eUF0T3JCZWZvcmUoY29uc3QgVmlzaWJsZVBvc2l0aW9uICZwb3MpIGNvbnN0CiB7CiAgICAgaWYg KHBvcy5pc051bGwoKSkKICAgICAgICAgcmV0dXJuIHBvczsKQEAgLTQzMiw3ICs0MzIsNyBAQCBW aXNpYmxlUG9zaXRpb24gVmlzaWJsZVBvc2l0aW9uOjpob25vckVkCiAgICAgcmV0dXJuIGxhc3RF ZGl0YWJsZVBvc2l0aW9uQmVmb3JlUG9zaXRpb25JblJvb3QocG9zLmRlZXBFcXVpdmFsZW50KCks IGhpZ2hlc3RSb290KTsKIH0KIAotVmlzaWJsZVBvc2l0aW9uIFZpc2libGVQb3NpdGlvbjo6aG9u b3JFZGl0YWJsZUJvdW5kYXJ5QXRPckFmdGVyKGNvbnN0IFZpc2libGVQb3NpdGlvbiAmcG9zKSBj b25zdAorVmlzaWJsZVBvc2l0aW9uIFZpc2libGVQb3NpdGlvbjo6aG9ub3JFZGl0aW5nQm91bmRh cnlBdE9yQWZ0ZXIoY29uc3QgVmlzaWJsZVBvc2l0aW9uICZwb3MpIGNvbnN0CiB7CiAgICAgaWYg KHBvcy5pc051bGwoKSkKICAgICAgICAgcmV0dXJuIHBvczsKSW5kZXg6IFNvdXJjZS9XZWJDb3Jl L2VkaXRpbmcvVmlzaWJsZVBvc2l0aW9uLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUv ZWRpdGluZy9WaXNpYmxlUG9zaXRpb24uaAkocmV2aXNpb24gOTM0MjEpCisrKyBTb3VyY2UvV2Vi Q29yZS9lZGl0aW5nL1Zpc2libGVQb3NpdGlvbi5oCSh3b3JraW5nIGNvcHkpCkBAIC03MCw4ICs3 MCw4IEBAIHB1YmxpYzoKICAgICAvLyBuZXh0KCkgYW5kIHByZXZpb3VzKCkgd2lsbCBpbmNyZW1l bnQvZGVjcmVtZW50IGJ5IGEgY2hhcmFjdGVyIGNsdXN0ZXIuCiAgICAgVmlzaWJsZVBvc2l0aW9u IG5leHQoRWRpdGluZ0JvdW5kYXJ5Q3Jvc3NpbmdSdWxlID0gQ2FuQ3Jvc3NFZGl0aW5nQm91bmRh cnkpIGNvbnN0OwogICAgIFZpc2libGVQb3NpdGlvbiBwcmV2aW91cyhFZGl0aW5nQm91bmRhcnlD cm9zc2luZ1J1bGUgPSBDYW5Dcm9zc0VkaXRpbmdCb3VuZGFyeSkgY29uc3Q7Ci0gICAgVmlzaWJs ZVBvc2l0aW9uIGhvbm9yRWRpdGFibGVCb3VuZGFyeUF0T3JCZWZvcmUoY29uc3QgVmlzaWJsZVBv c2l0aW9uJikgY29uc3Q7Ci0gICAgVmlzaWJsZVBvc2l0aW9uIGhvbm9yRWRpdGFibGVCb3VuZGFy eUF0T3JBZnRlcihjb25zdCBWaXNpYmxlUG9zaXRpb24mKSBjb25zdDsKKyAgICBWaXNpYmxlUG9z aXRpb24gaG9ub3JFZGl0aW5nQm91bmRhcnlBdE9yQmVmb3JlKGNvbnN0IFZpc2libGVQb3NpdGlv biYpIGNvbnN0OworICAgIFZpc2libGVQb3NpdGlvbiBob25vckVkaXRpbmdCb3VuZGFyeUF0T3JB ZnRlcihjb25zdCBWaXNpYmxlUG9zaXRpb24mKSBjb25zdDsKIAogICAgIFZpc2libGVQb3NpdGlv biBsZWZ0KGJvb2wgc3RheUluRWRpdGFibGVDb250ZW50ID0gZmFsc2UpIGNvbnN0OwogICAgIFZp c2libGVQb3NpdGlvbiByaWdodChib29sIHN0YXlJbkVkaXRhYmxlQ29udGVudCA9IGZhbHNlKSBj b25zdDsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvdmlzaWJsZV91bml0cy5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvZWRpdGluZy92aXNpYmxlX3VuaXRzLmNwcAkocmV2 aXNpb24gOTM0MjEpCisrKyBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL3Zpc2libGVfdW5pdHMuY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC0yOTIsNyArMjkyLDcgQEAgc3RhdGljIHVuc2lnbmVkIHByZXZp b3VzV29yZFBvc2l0aW9uQm91bgogVmlzaWJsZVBvc2l0aW9uIHByZXZpb3VzV29yZFBvc2l0aW9u KGNvbnN0IFZpc2libGVQb3NpdGlvbiAmYykKIHsKICAgICBWaXNpYmxlUG9zaXRpb24gcHJldiA9 IHByZXZpb3VzQm91bmRhcnkoYywgcHJldmlvdXNXb3JkUG9zaXRpb25Cb3VuZGFyeSk7Ci0gICAg cmV0dXJuIGMuaG9ub3JFZGl0YWJsZUJvdW5kYXJ5QXRPckJlZm9yZShwcmV2KTsKKyAgICByZXR1 cm4gYy5ob25vckVkaXRpbmdCb3VuZGFyeUF0T3JCZWZvcmUocHJldik7CiB9CiAKIHN0YXRpYyB1 bnNpZ25lZCBuZXh0V29yZFBvc2l0aW9uQm91bmRhcnkoY29uc3QgVUNoYXIqIGNoYXJhY3RlcnMs IHVuc2lnbmVkIGxlbmd0aCwgdW5zaWduZWQgb2Zmc2V0LCBCb3VuZGFyeVNlYXJjaENvbnRleHRB dmFpbGFiaWxpdHkgbWF5SGF2ZU1vcmVDb250ZXh0LCBib29sJiBuZWVkTW9yZUNvbnRleHQpCkBA IC0zMDgsNyArMzA4LDcgQEAgc3RhdGljIHVuc2lnbmVkIG5leHRXb3JkUG9zaXRpb25Cb3VuZGFy eQogVmlzaWJsZVBvc2l0aW9uIG5leHRXb3JkUG9zaXRpb24oY29uc3QgVmlzaWJsZVBvc2l0aW9u ICZjKQogewogICAgIFZpc2libGVQb3NpdGlvbiBuZXh0ID0gbmV4dEJvdW5kYXJ5KGMsIG5leHRX b3JkUG9zaXRpb25Cb3VuZGFyeSk7ICAgIAotICAgIHJldHVybiBjLmhvbm9yRWRpdGFibGVCb3Vu ZGFyeUF0T3JBZnRlcihuZXh0KTsKKyAgICByZXR1cm4gYy5ob25vckVkaXRpbmdCb3VuZGFyeUF0 T3JBZnRlcihuZXh0KTsKIH0KIAogYm9vbCBpc1N0YXJ0T2ZXb3JkKGNvbnN0IFZpc2libGVQb3Np dGlvbiYgcCkKQEAgLTM3Myw3ICszNzMsNyBAQCBWaXNpYmxlUG9zaXRpb24gc3RhcnRPZkxpbmUo Y29uc3QgVmlzaWJsCiB7CiAgICAgVmlzaWJsZVBvc2l0aW9uIHZpc1BvcyA9IHN0YXJ0UG9zaXRp b25Gb3JMaW5lKGMpOwogCi0gICAgcmV0dXJuIGMuaG9ub3JFZGl0YWJsZUJvdW5kYXJ5QXRPckJl Zm9yZSh2aXNQb3MpOworICAgIHJldHVybiBjLmhvbm9yRWRpdGluZ0JvdW5kYXJ5QXRPckJlZm9y ZSh2aXNQb3MpOwogfQogCiBzdGF0aWMgVmlzaWJsZVBvc2l0aW9uIGVuZFBvc2l0aW9uRm9yTGlu ZShjb25zdCBWaXNpYmxlUG9zaXRpb24mIGMpCkBAIC00NDIsNyArNDQyLDcgQEAgVmlzaWJsZVBv c2l0aW9uIGVuZE9mTGluZShjb25zdCBWaXNpYmxlUAogICAgICAgICB2aXNQb3MgPSBlbmRQb3Np dGlvbkZvckxpbmUodmlzUG9zKTsKICAgICB9CiAgICAgCi0gICAgcmV0dXJuIGMuaG9ub3JFZGl0 YWJsZUJvdW5kYXJ5QXRPckFmdGVyKHZpc1Bvcyk7CisgICAgcmV0dXJuIGMuaG9ub3JFZGl0aW5n Qm91bmRhcnlBdE9yQWZ0ZXIodmlzUG9zKTsKIH0KIAogYm9vbCBpblNhbWVMaW5lKGNvbnN0IFZp c2libGVQb3NpdGlvbiAmYSwgY29uc3QgVmlzaWJsZVBvc2l0aW9uICZiKQpAQCAtNzA1LDcgKzcw NSw3IEBAIHN0YXRpYyB1bnNpZ25lZCBwcmV2aW91c1NlbnRlbmNlUG9zaXRpb24KIFZpc2libGVQ b3NpdGlvbiBwcmV2aW91c1NlbnRlbmNlUG9zaXRpb24oY29uc3QgVmlzaWJsZVBvc2l0aW9uICZj KQogewogICAgIFZpc2libGVQb3NpdGlvbiBwcmV2ID0gcHJldmlvdXNCb3VuZGFyeShjLCBwcmV2 aW91c1NlbnRlbmNlUG9zaXRpb25Cb3VuZGFyeSk7Ci0gICAgcmV0dXJuIGMuaG9ub3JFZGl0YWJs ZUJvdW5kYXJ5QXRPckJlZm9yZShwcmV2KTsKKyAgICByZXR1cm4gYy5ob25vckVkaXRpbmdCb3Vu ZGFyeUF0T3JCZWZvcmUocHJldik7CiB9CiAKIHN0YXRpYyB1bnNpZ25lZCBuZXh0U2VudGVuY2VQ b3NpdGlvbkJvdW5kYXJ5KGNvbnN0IFVDaGFyKiBjaGFyYWN0ZXJzLCB1bnNpZ25lZCBsZW5ndGgs IHVuc2lnbmVkLCBCb3VuZGFyeVNlYXJjaENvbnRleHRBdmFpbGFiaWxpdHksIGJvb2wmKQpAQCAt NzE5LDcgKzcxOSw3IEBAIHN0YXRpYyB1bnNpZ25lZCBuZXh0U2VudGVuY2VQb3NpdGlvbkJvdW4K IFZpc2libGVQb3NpdGlvbiBuZXh0U2VudGVuY2VQb3NpdGlvbihjb25zdCBWaXNpYmxlUG9zaXRp b24gJmMpCiB7CiAgICAgVmlzaWJsZVBvc2l0aW9uIG5leHQgPSBuZXh0Qm91bmRhcnkoYywgbmV4 dFNlbnRlbmNlUG9zaXRpb25Cb3VuZGFyeSk7ICAgIAotICAgIHJldHVybiBjLmhvbm9yRWRpdGFi bGVCb3VuZGFyeUF0T3JBZnRlcihuZXh0KTsKKyAgICByZXR1cm4gYy5ob25vckVkaXRpbmdCb3Vu ZGFyeUF0T3JBZnRlcihuZXh0KTsKIH0KIAogVmlzaWJsZVBvc2l0aW9uIHN0YXJ0T2ZQYXJhZ3Jh cGgoY29uc3QgVmlzaWJsZVBvc2l0aW9uJiBjLCBFZGl0aW5nQm91bmRhcnlDcm9zc2luZ1J1bGUg Ym91bmRhcnlDcm9zc2luZ1J1bGUpCkBAIC0xMDY3LDcgKzEwNjcsNyBAQCBWaXNpYmxlUG9zaXRp b24gbG9naWNhbFN0YXJ0T2ZMaW5lKGNvbnN0CiAgICAgICAgIGlmICghZWRpdGFibGVSb290LT5j b250YWlucyh2aXNQb3MuZGVlcEVxdWl2YWxlbnQoKS5jb250YWluZXJOb2RlKCkpKQogICAgICAg ICAgICAgcmV0dXJuIGZpcnN0UG9zaXRpb25Jbk5vZGUoZWRpdGFibGVSb290KTsKICAgICB9Ci0g ICAgcmV0dXJuIGMuaG9ub3JFZGl0YWJsZUJvdW5kYXJ5QXRPckJlZm9yZSh2aXNQb3MpOworICAg IHJldHVybiBjLmhvbm9yRWRpdGluZ0JvdW5kYXJ5QXRPckJlZm9yZSh2aXNQb3MpOwogfQogCiBz dGF0aWMgVmlzaWJsZVBvc2l0aW9uIGxvZ2ljYWxFbmRQb3NpdGlvbkZvckxpbmUoY29uc3QgVmlz aWJsZVBvc2l0aW9uJiBjKQpAQCAtMTEzMCw3ICsxMTMwLDcgQEAgVmlzaWJsZVBvc2l0aW9uIGxv Z2ljYWxFbmRPZkxpbmUoY29uc3QgVgogICAgICAgICBpZiAoIWVkaXRhYmxlUm9vdC0+Y29udGFp bnModmlzUG9zLmRlZXBFcXVpdmFsZW50KCkuY29udGFpbmVyTm9kZSgpKSkKICAgICAgICAgICAg IHJldHVybiBsYXN0UG9zaXRpb25Jbk5vZGUoZWRpdGFibGVSb290KTsKICAgICB9Ci0gICAgcmV0 dXJuIGMuaG9ub3JFZGl0YWJsZUJvdW5kYXJ5QXRPckFmdGVyKHZpc1Bvcyk7CisgICAgcmV0dXJu IGMuaG9ub3JFZGl0aW5nQm91bmRhcnlBdE9yQWZ0ZXIodmlzUG9zKTsKIH0KIAogVmlzaWJsZVBv c2l0aW9uIGxlZnRCb3VuZGFyeU9mTGluZShjb25zdCBWaXNpYmxlUG9zaXRpb24mIGMsIFRleHRE aXJlY3Rpb24gZGlyZWN0aW9uKQpAQCAtMTY3OSw3ICsxNjc5LDcgQEAgVmlzaWJsZVBvc2l0aW9u IGxlZnRXb3JkUG9zaXRpb24oY29uc3QgVgogICAgICAgICByZXR1cm4gVmlzaWJsZVBvc2l0aW9u KCk7CiAKICAgICBWaXNpYmxlUG9zaXRpb24gbGVmdFdvcmRCcmVhayA9IGxlZnRXb3JkUG9zaXRp b25JZ25vcmluZ0VkaXRpbmdCb3VuZGFyeSh2aXNpYmxlUG9zaXRpb24pOwotICAgIHJldHVybiB2 aXNpYmxlUG9zaXRpb24uaG9ub3JFZGl0YWJsZUJvdW5kYXJ5QXRPckJlZm9yZShsZWZ0V29yZEJy ZWFrKTsKKyAgICByZXR1cm4gdmlzaWJsZVBvc2l0aW9uLmhvbm9yRWRpdGluZ0JvdW5kYXJ5QXRP ckJlZm9yZShsZWZ0V29yZEJyZWFrKTsKIH0KIAogVmlzaWJsZVBvc2l0aW9uIHJpZ2h0V29yZFBv c2l0aW9uKGNvbnN0IFZpc2libGVQb3NpdGlvbiYgdmlzaWJsZVBvc2l0aW9uKQpAQCAtMTY4OCw3 ICsxNjg4LDcgQEAgVmlzaWJsZVBvc2l0aW9uIHJpZ2h0V29yZFBvc2l0aW9uKGNvbnN0IAogICAg ICAgICByZXR1cm4gVmlzaWJsZVBvc2l0aW9uKCk7CiAKICAgICBWaXNpYmxlUG9zaXRpb24gcmln aHRXb3JkQnJlYWsgPSByaWdodFdvcmRQb3NpdGlvbklnbm9yaW5nRWRpdGluZ0JvdW5kYXJ5KHZp c2libGVQb3NpdGlvbik7Ci0gICAgcmV0dXJuIHZpc2libGVQb3NpdGlvbi5ob25vckVkaXRhYmxl Qm91bmRhcnlBdE9yQmVmb3JlKHJpZ2h0V29yZEJyZWFrKTsKKyAgICByZXR1cm4gdmlzaWJsZVBv c2l0aW9uLmhvbm9yRWRpdGluZ0JvdW5kYXJ5QXRPckJlZm9yZShyaWdodFdvcmRCcmVhayk7CiB9 CiAKIH0K 104558 2011-08-19 13:50:59 -0700 2011-08-19 14:03:40 -0700 Revised patch vanlam-renaming text/plain 8694 vanlam SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDkzNDIxKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzUgQEAKKzIwMTEtMDgtMTkgIFZhbiBMYW0g IDx2YW5sYW1AZ29vZ2xlLmNvbT4KKworICAgICAgICBSZW5hbWUgVmlzaWJsZVBvc2l0aW9uOjpo b25vckVkaXRhYmxlQm91bmRhcnkqIHRvIFZpc2libGVQb3NpdGlvbjo6aG9ub3JFZGl0aW5nQm91 bmRhcnkqCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02 NjQ5OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJl bmFtZWQgVmlzaWJsZVBvc2l0aW9uOjpob25vckVkaXRhYmxlQm91bmRhcnkqIHRvCisgICAgICAg IGhvbm9yRWRpdGluZ0JvdW5kYXJ5LgorCisgICAgICAgICogZWRpdGluZy9WaXNpYmxlUG9zaXRp b24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6VmlzaWJsZVBvc2l0aW9uOjpuZXh0KToKKyAgICAg ICAgKFdlYkNvcmU6OlZpc2libGVQb3NpdGlvbjo6cHJldmlvdXMpOgorICAgICAgICAoV2ViQ29y ZTo6VmlzaWJsZVBvc2l0aW9uOjpsZWZ0KToKKyAgICAgICAgKFdlYkNvcmU6OlZpc2libGVQb3Np dGlvbjo6cmlnaHQpOgorICAgICAgICAoV2ViQ29yZTo6VmlzaWJsZVBvc2l0aW9uOjpob25vckVk aXRpbmdCb3VuZGFyeUF0T3JCZWZvcmUpOgorICAgICAgICAoV2ViQ29yZTo6VmlzaWJsZVBvc2l0 aW9uOjpob25vckVkaXRpbmdCb3VuZGFyeUF0T3JBZnRlcik6CisgICAgICAgICogZWRpdGluZy9W aXNpYmxlUG9zaXRpb24uaDoKKyAgICAgICAgKiBlZGl0aW5nL3Zpc2libGVfdW5pdHMuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6cHJldmlvdXNXb3JkUG9zaXRpb24pOgorICAgICAgICAoV2ViQ29y ZTo6bmV4dFdvcmRQb3NpdGlvbik6CisgICAgICAgIChXZWJDb3JlOjpzdGFydE9mTGluZSk6Cisg ICAgICAgIChXZWJDb3JlOjplbmRPZkxpbmUpOgorICAgICAgICAoV2ViQ29yZTo6cHJldmlvdXNT ZW50ZW5jZVBvc2l0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6Om5leHRTZW50ZW5jZVBvc2l0aW9u KToKKyAgICAgICAgKFdlYkNvcmU6OmxvZ2ljYWxTdGFydE9mTGluZSk6CisgICAgICAgIChXZWJD b3JlOjpsb2dpY2FsRW5kT2ZMaW5lKToKKyAgICAgICAgKFdlYkNvcmU6OmxlZnRXb3JkUG9zaXRp b24pOgorICAgICAgICAoV2ViQ29yZTo6cmlnaHRXb3JkUG9zaXRpb24pOgorCiAyMDExLTA4LTE5 ICBEYW4gQmVybnN0ZWluICA8bWl0ekBhcHBsZS5jb20+CiAKICAgICAgICAgQmV0dGVyIGJ1aWxk IGZpeCBhZnRlciByOTMzODQuCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL1Zpc2libGVQ b3NpdGlvbi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvZWRpdGluZy9WaXNpYmxl UG9zaXRpb24uY3BwCShyZXZpc2lvbiA5MzQyMSkKKysrIFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcv VmlzaWJsZVBvc2l0aW9uLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNzAsNyArNzAsNyBAQCBWaXNp YmxlUG9zaXRpb24gVmlzaWJsZVBvc2l0aW9uOjpuZXh0KEVkCiAgICAgaWYgKHJ1bGUgPT0gQ2Fu Q3Jvc3NFZGl0aW5nQm91bmRhcnkpCiAgICAgICAgIHJldHVybiBuZXh0OwogCi0gICAgcmV0dXJu IGhvbm9yRWRpdGFibGVCb3VuZGFyeUF0T3JBZnRlcihuZXh0KTsKKyAgICByZXR1cm4gaG9ub3JF ZGl0aW5nQm91bmRhcnlBdE9yQWZ0ZXIobmV4dCk7CiB9CiAKIFZpc2libGVQb3NpdGlvbiBWaXNp YmxlUG9zaXRpb246OnByZXZpb3VzKEVkaXRpbmdCb3VuZGFyeUNyb3NzaW5nUnVsZSBydWxlKSBj b25zdApAQCAtMTAwLDcgKzEwMCw3IEBAIFZpc2libGVQb3NpdGlvbiBWaXNpYmxlUG9zaXRpb246 OnByZXZpb3UKICAgICBpZiAocnVsZSA9PSBDYW5Dcm9zc0VkaXRpbmdCb3VuZGFyeSkKICAgICAg ICAgcmV0dXJuIHByZXY7CiAgICAgCi0gICAgcmV0dXJuIGhvbm9yRWRpdGFibGVCb3VuZGFyeUF0 T3JCZWZvcmUocHJldik7CisgICAgcmV0dXJuIGhvbm9yRWRpdGluZ0JvdW5kYXJ5QXRPckJlZm9y ZShwcmV2KTsKIH0KIAogUG9zaXRpb24gVmlzaWJsZVBvc2l0aW9uOjpsZWZ0VmlzdWFsbHlEaXN0 aW5jdENhbmRpZGF0ZSgpIGNvbnN0CkBAIC0yNTEsNyArMjUxLDcgQEAgVmlzaWJsZVBvc2l0aW9u IFZpc2libGVQb3NpdGlvbjo6bGVmdChibwogICAgICAgICByZXR1cm4gbGVmdDsKIAogICAgIC8v IEZJWE1FOiBUaGlzIG1heSBuZWVkIHRvIGRvIHNvbWV0aGluZyBkaWZmZXJlbnQgZnJvbSAiYmVm b3JlIi4KLSAgICByZXR1cm4gaG9ub3JFZGl0YWJsZUJvdW5kYXJ5QXRPckJlZm9yZShsZWZ0KTsK KyAgICByZXR1cm4gaG9ub3JFZGl0aW5nQm91bmRhcnlBdE9yQmVmb3JlKGxlZnQpOwogfQogCiBQ b3NpdGlvbiBWaXNpYmxlUG9zaXRpb246OnJpZ2h0VmlzdWFsbHlEaXN0aW5jdENhbmRpZGF0ZSgp IGNvbnN0CkBAIC00MDMsMTAgKzQwMywxMCBAQCBWaXNpYmxlUG9zaXRpb24gVmlzaWJsZVBvc2l0 aW9uOjpyaWdodChiCiAgICAgICAgIHJldHVybiByaWdodDsKIAogICAgIC8vIEZJWE1FOiBUaGlz IG1heSBuZWVkIHRvIGRvIHNvbWV0aGluZyBkaWZmZXJlbnQgZnJvbSAiYWZ0ZXIiLgotICAgIHJl dHVybiBob25vckVkaXRhYmxlQm91bmRhcnlBdE9yQWZ0ZXIocmlnaHQpOworICAgIHJldHVybiBo b25vckVkaXRpbmdCb3VuZGFyeUF0T3JBZnRlcihyaWdodCk7CiB9CiAKLVZpc2libGVQb3NpdGlv biBWaXNpYmxlUG9zaXRpb246Omhvbm9yRWRpdGFibGVCb3VuZGFyeUF0T3JCZWZvcmUoY29uc3Qg VmlzaWJsZVBvc2l0aW9uICZwb3MpIGNvbnN0CitWaXNpYmxlUG9zaXRpb24gVmlzaWJsZVBvc2l0 aW9uOjpob25vckVkaXRpbmdCb3VuZGFyeUF0T3JCZWZvcmUoY29uc3QgVmlzaWJsZVBvc2l0aW9u ICZwb3MpIGNvbnN0CiB7CiAgICAgaWYgKHBvcy5pc051bGwoKSkKICAgICAgICAgcmV0dXJuIHBv czsKQEAgLTQzMiw3ICs0MzIsNyBAQCBWaXNpYmxlUG9zaXRpb24gVmlzaWJsZVBvc2l0aW9uOjpo b25vckVkCiAgICAgcmV0dXJuIGxhc3RFZGl0YWJsZVBvc2l0aW9uQmVmb3JlUG9zaXRpb25JblJv b3QocG9zLmRlZXBFcXVpdmFsZW50KCksIGhpZ2hlc3RSb290KTsKIH0KIAotVmlzaWJsZVBvc2l0 aW9uIFZpc2libGVQb3NpdGlvbjo6aG9ub3JFZGl0YWJsZUJvdW5kYXJ5QXRPckFmdGVyKGNvbnN0 IFZpc2libGVQb3NpdGlvbiAmcG9zKSBjb25zdAorVmlzaWJsZVBvc2l0aW9uIFZpc2libGVQb3Np dGlvbjo6aG9ub3JFZGl0aW5nQm91bmRhcnlBdE9yQWZ0ZXIoY29uc3QgVmlzaWJsZVBvc2l0aW9u ICZwb3MpIGNvbnN0CiB7CiAgICAgaWYgKHBvcy5pc051bGwoKSkKICAgICAgICAgcmV0dXJuIHBv czsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvVmlzaWJsZVBvc2l0aW9uLmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkNvcmUvZWRpdGluZy9WaXNpYmxlUG9zaXRpb24uaAkocmV2aXNp b24gOTM0MjEpCisrKyBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL1Zpc2libGVQb3NpdGlvbi5oCSh3 b3JraW5nIGNvcHkpCkBAIC03MCw4ICs3MCw4IEBAIHB1YmxpYzoKICAgICAvLyBuZXh0KCkgYW5k IHByZXZpb3VzKCkgd2lsbCBpbmNyZW1lbnQvZGVjcmVtZW50IGJ5IGEgY2hhcmFjdGVyIGNsdXN0 ZXIuCiAgICAgVmlzaWJsZVBvc2l0aW9uIG5leHQoRWRpdGluZ0JvdW5kYXJ5Q3Jvc3NpbmdSdWxl ID0gQ2FuQ3Jvc3NFZGl0aW5nQm91bmRhcnkpIGNvbnN0OwogICAgIFZpc2libGVQb3NpdGlvbiBw cmV2aW91cyhFZGl0aW5nQm91bmRhcnlDcm9zc2luZ1J1bGUgPSBDYW5Dcm9zc0VkaXRpbmdCb3Vu ZGFyeSkgY29uc3Q7Ci0gICAgVmlzaWJsZVBvc2l0aW9uIGhvbm9yRWRpdGFibGVCb3VuZGFyeUF0 T3JCZWZvcmUoY29uc3QgVmlzaWJsZVBvc2l0aW9uJikgY29uc3Q7Ci0gICAgVmlzaWJsZVBvc2l0 aW9uIGhvbm9yRWRpdGFibGVCb3VuZGFyeUF0T3JBZnRlcihjb25zdCBWaXNpYmxlUG9zaXRpb24m KSBjb25zdDsKKyAgICBWaXNpYmxlUG9zaXRpb24gaG9ub3JFZGl0aW5nQm91bmRhcnlBdE9yQmVm b3JlKGNvbnN0IFZpc2libGVQb3NpdGlvbiYpIGNvbnN0OworICAgIFZpc2libGVQb3NpdGlvbiBo b25vckVkaXRpbmdCb3VuZGFyeUF0T3JBZnRlcihjb25zdCBWaXNpYmxlUG9zaXRpb24mKSBjb25z dDsKIAogICAgIFZpc2libGVQb3NpdGlvbiBsZWZ0KGJvb2wgc3RheUluRWRpdGFibGVDb250ZW50 ID0gZmFsc2UpIGNvbnN0OwogICAgIFZpc2libGVQb3NpdGlvbiByaWdodChib29sIHN0YXlJbkVk aXRhYmxlQ29udGVudCA9IGZhbHNlKSBjb25zdDsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2VkaXRp bmcvdmlzaWJsZV91bml0cy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvZWRpdGlu Zy92aXNpYmxlX3VuaXRzLmNwcAkocmV2aXNpb24gOTM0MjEpCisrKyBTb3VyY2UvV2ViQ29yZS9l ZGl0aW5nL3Zpc2libGVfdW5pdHMuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yOTIsNyArMjkyLDcg QEAgc3RhdGljIHVuc2lnbmVkIHByZXZpb3VzV29yZFBvc2l0aW9uQm91bgogVmlzaWJsZVBvc2l0 aW9uIHByZXZpb3VzV29yZFBvc2l0aW9uKGNvbnN0IFZpc2libGVQb3NpdGlvbiAmYykKIHsKICAg ICBWaXNpYmxlUG9zaXRpb24gcHJldiA9IHByZXZpb3VzQm91bmRhcnkoYywgcHJldmlvdXNXb3Jk UG9zaXRpb25Cb3VuZGFyeSk7Ci0gICAgcmV0dXJuIGMuaG9ub3JFZGl0YWJsZUJvdW5kYXJ5QXRP ckJlZm9yZShwcmV2KTsKKyAgICByZXR1cm4gYy5ob25vckVkaXRpbmdCb3VuZGFyeUF0T3JCZWZv cmUocHJldik7CiB9CiAKIHN0YXRpYyB1bnNpZ25lZCBuZXh0V29yZFBvc2l0aW9uQm91bmRhcnko Y29uc3QgVUNoYXIqIGNoYXJhY3RlcnMsIHVuc2lnbmVkIGxlbmd0aCwgdW5zaWduZWQgb2Zmc2V0 LCBCb3VuZGFyeVNlYXJjaENvbnRleHRBdmFpbGFiaWxpdHkgbWF5SGF2ZU1vcmVDb250ZXh0LCBi b29sJiBuZWVkTW9yZUNvbnRleHQpCkBAIC0zMDgsNyArMzA4LDcgQEAgc3RhdGljIHVuc2lnbmVk IG5leHRXb3JkUG9zaXRpb25Cb3VuZGFyeQogVmlzaWJsZVBvc2l0aW9uIG5leHRXb3JkUG9zaXRp b24oY29uc3QgVmlzaWJsZVBvc2l0aW9uICZjKQogewogICAgIFZpc2libGVQb3NpdGlvbiBuZXh0 ID0gbmV4dEJvdW5kYXJ5KGMsIG5leHRXb3JkUG9zaXRpb25Cb3VuZGFyeSk7ICAgIAotICAgIHJl dHVybiBjLmhvbm9yRWRpdGFibGVCb3VuZGFyeUF0T3JBZnRlcihuZXh0KTsKKyAgICByZXR1cm4g Yy5ob25vckVkaXRpbmdCb3VuZGFyeUF0T3JBZnRlcihuZXh0KTsKIH0KIAogYm9vbCBpc1N0YXJ0 T2ZXb3JkKGNvbnN0IFZpc2libGVQb3NpdGlvbiYgcCkKQEAgLTM3Myw3ICszNzMsNyBAQCBWaXNp YmxlUG9zaXRpb24gc3RhcnRPZkxpbmUoY29uc3QgVmlzaWJsCiB7CiAgICAgVmlzaWJsZVBvc2l0 aW9uIHZpc1BvcyA9IHN0YXJ0UG9zaXRpb25Gb3JMaW5lKGMpOwogCi0gICAgcmV0dXJuIGMuaG9u b3JFZGl0YWJsZUJvdW5kYXJ5QXRPckJlZm9yZSh2aXNQb3MpOworICAgIHJldHVybiBjLmhvbm9y RWRpdGluZ0JvdW5kYXJ5QXRPckJlZm9yZSh2aXNQb3MpOwogfQogCiBzdGF0aWMgVmlzaWJsZVBv c2l0aW9uIGVuZFBvc2l0aW9uRm9yTGluZShjb25zdCBWaXNpYmxlUG9zaXRpb24mIGMpCkBAIC00 NDIsNyArNDQyLDcgQEAgVmlzaWJsZVBvc2l0aW9uIGVuZE9mTGluZShjb25zdCBWaXNpYmxlUAog ICAgICAgICB2aXNQb3MgPSBlbmRQb3NpdGlvbkZvckxpbmUodmlzUG9zKTsKICAgICB9CiAgICAg Ci0gICAgcmV0dXJuIGMuaG9ub3JFZGl0YWJsZUJvdW5kYXJ5QXRPckFmdGVyKHZpc1Bvcyk7Cisg ICAgcmV0dXJuIGMuaG9ub3JFZGl0aW5nQm91bmRhcnlBdE9yQWZ0ZXIodmlzUG9zKTsKIH0KIAog Ym9vbCBpblNhbWVMaW5lKGNvbnN0IFZpc2libGVQb3NpdGlvbiAmYSwgY29uc3QgVmlzaWJsZVBv c2l0aW9uICZiKQpAQCAtNzA1LDcgKzcwNSw3IEBAIHN0YXRpYyB1bnNpZ25lZCBwcmV2aW91c1Nl bnRlbmNlUG9zaXRpb24KIFZpc2libGVQb3NpdGlvbiBwcmV2aW91c1NlbnRlbmNlUG9zaXRpb24o Y29uc3QgVmlzaWJsZVBvc2l0aW9uICZjKQogewogICAgIFZpc2libGVQb3NpdGlvbiBwcmV2ID0g cHJldmlvdXNCb3VuZGFyeShjLCBwcmV2aW91c1NlbnRlbmNlUG9zaXRpb25Cb3VuZGFyeSk7Ci0g ICAgcmV0dXJuIGMuaG9ub3JFZGl0YWJsZUJvdW5kYXJ5QXRPckJlZm9yZShwcmV2KTsKKyAgICBy ZXR1cm4gYy5ob25vckVkaXRpbmdCb3VuZGFyeUF0T3JCZWZvcmUocHJldik7CiB9CiAKIHN0YXRp YyB1bnNpZ25lZCBuZXh0U2VudGVuY2VQb3NpdGlvbkJvdW5kYXJ5KGNvbnN0IFVDaGFyKiBjaGFy YWN0ZXJzLCB1bnNpZ25lZCBsZW5ndGgsIHVuc2lnbmVkLCBCb3VuZGFyeVNlYXJjaENvbnRleHRB dmFpbGFiaWxpdHksIGJvb2wmKQpAQCAtNzE5LDcgKzcxOSw3IEBAIHN0YXRpYyB1bnNpZ25lZCBu ZXh0U2VudGVuY2VQb3NpdGlvbkJvdW4KIFZpc2libGVQb3NpdGlvbiBuZXh0U2VudGVuY2VQb3Np dGlvbihjb25zdCBWaXNpYmxlUG9zaXRpb24gJmMpCiB7CiAgICAgVmlzaWJsZVBvc2l0aW9uIG5l eHQgPSBuZXh0Qm91bmRhcnkoYywgbmV4dFNlbnRlbmNlUG9zaXRpb25Cb3VuZGFyeSk7ICAgIAot ICAgIHJldHVybiBjLmhvbm9yRWRpdGFibGVCb3VuZGFyeUF0T3JBZnRlcihuZXh0KTsKKyAgICBy ZXR1cm4gYy5ob25vckVkaXRpbmdCb3VuZGFyeUF0T3JBZnRlcihuZXh0KTsKIH0KIAogVmlzaWJs ZVBvc2l0aW9uIHN0YXJ0T2ZQYXJhZ3JhcGgoY29uc3QgVmlzaWJsZVBvc2l0aW9uJiBjLCBFZGl0 aW5nQm91bmRhcnlDcm9zc2luZ1J1bGUgYm91bmRhcnlDcm9zc2luZ1J1bGUpCkBAIC0xMDY3LDcg KzEwNjcsNyBAQCBWaXNpYmxlUG9zaXRpb24gbG9naWNhbFN0YXJ0T2ZMaW5lKGNvbnN0CiAgICAg ICAgIGlmICghZWRpdGFibGVSb290LT5jb250YWlucyh2aXNQb3MuZGVlcEVxdWl2YWxlbnQoKS5j b250YWluZXJOb2RlKCkpKQogICAgICAgICAgICAgcmV0dXJuIGZpcnN0UG9zaXRpb25Jbk5vZGUo ZWRpdGFibGVSb290KTsKICAgICB9Ci0gICAgcmV0dXJuIGMuaG9ub3JFZGl0YWJsZUJvdW5kYXJ5 QXRPckJlZm9yZSh2aXNQb3MpOworICAgIHJldHVybiBjLmhvbm9yRWRpdGluZ0JvdW5kYXJ5QXRP ckJlZm9yZSh2aXNQb3MpOwogfQogCiBzdGF0aWMgVmlzaWJsZVBvc2l0aW9uIGxvZ2ljYWxFbmRQ b3NpdGlvbkZvckxpbmUoY29uc3QgVmlzaWJsZVBvc2l0aW9uJiBjKQpAQCAtMTEzMCw3ICsxMTMw LDcgQEAgVmlzaWJsZVBvc2l0aW9uIGxvZ2ljYWxFbmRPZkxpbmUoY29uc3QgVgogICAgICAgICBp ZiAoIWVkaXRhYmxlUm9vdC0+Y29udGFpbnModmlzUG9zLmRlZXBFcXVpdmFsZW50KCkuY29udGFp bmVyTm9kZSgpKSkKICAgICAgICAgICAgIHJldHVybiBsYXN0UG9zaXRpb25Jbk5vZGUoZWRpdGFi bGVSb290KTsKICAgICB9Ci0gICAgcmV0dXJuIGMuaG9ub3JFZGl0YWJsZUJvdW5kYXJ5QXRPckFm dGVyKHZpc1Bvcyk7CisgICAgcmV0dXJuIGMuaG9ub3JFZGl0aW5nQm91bmRhcnlBdE9yQWZ0ZXIo dmlzUG9zKTsKIH0KIAogVmlzaWJsZVBvc2l0aW9uIGxlZnRCb3VuZGFyeU9mTGluZShjb25zdCBW aXNpYmxlUG9zaXRpb24mIGMsIFRleHREaXJlY3Rpb24gZGlyZWN0aW9uKQpAQCAtMTY3OSw3ICsx Njc5LDcgQEAgVmlzaWJsZVBvc2l0aW9uIGxlZnRXb3JkUG9zaXRpb24oY29uc3QgVgogICAgICAg ICByZXR1cm4gVmlzaWJsZVBvc2l0aW9uKCk7CiAKICAgICBWaXNpYmxlUG9zaXRpb24gbGVmdFdv cmRCcmVhayA9IGxlZnRXb3JkUG9zaXRpb25JZ25vcmluZ0VkaXRpbmdCb3VuZGFyeSh2aXNpYmxl UG9zaXRpb24pOwotICAgIHJldHVybiB2aXNpYmxlUG9zaXRpb24uaG9ub3JFZGl0YWJsZUJvdW5k YXJ5QXRPckJlZm9yZShsZWZ0V29yZEJyZWFrKTsKKyAgICByZXR1cm4gdmlzaWJsZVBvc2l0aW9u Lmhvbm9yRWRpdGluZ0JvdW5kYXJ5QXRPckJlZm9yZShsZWZ0V29yZEJyZWFrKTsKIH0KIAogVmlz aWJsZVBvc2l0aW9uIHJpZ2h0V29yZFBvc2l0aW9uKGNvbnN0IFZpc2libGVQb3NpdGlvbiYgdmlz aWJsZVBvc2l0aW9uKQpAQCAtMTY4OCw3ICsxNjg4LDcgQEAgVmlzaWJsZVBvc2l0aW9uIHJpZ2h0 V29yZFBvc2l0aW9uKGNvbnN0IAogICAgICAgICByZXR1cm4gVmlzaWJsZVBvc2l0aW9uKCk7CiAK ICAgICBWaXNpYmxlUG9zaXRpb24gcmlnaHRXb3JkQnJlYWsgPSByaWdodFdvcmRQb3NpdGlvbkln bm9yaW5nRWRpdGluZ0JvdW5kYXJ5KHZpc2libGVQb3NpdGlvbik7Ci0gICAgcmV0dXJuIHZpc2li bGVQb3NpdGlvbi5ob25vckVkaXRhYmxlQm91bmRhcnlBdE9yQmVmb3JlKHJpZ2h0V29yZEJyZWFr KTsKKyAgICByZXR1cm4gdmlzaWJsZVBvc2l0aW9uLmhvbm9yRWRpdGluZ0JvdW5kYXJ5QXRPckJl Zm9yZShyaWdodFdvcmRCcmVhayk7CiB9CiAKIH0K 104561 2011-08-19 14:03:40 -0700 2011-08-19 15:20:32 -0700 Revised patch vanlam-renaming text/plain 8694 vanlam SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDkzNDIxKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzMgQEAKKzIwMTEtMDgtMTkgIFZhbiBMYW0g IDx2YW5sYW1AZ29vZ2xlLmNvbT4KKworICAgICAgICBSZW5hbWUgVmlzaWJsZVBvc2l0aW9uOjpo b25vckVkaXRhYmxlQm91bmRhcnkqIHRvIFZpc2libGVQb3NpdGlvbjo6aG9ub3JFZGl0aW5nQm91 bmRhcnkqCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02 NjQ5OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJl bmFtZWQgVmlzaWJsZVBvc2l0aW9uOjpob25vckVkaXRhYmxlQm91bmRhcnkqIHRvCisgICAgICAg IGhvbm9yRWRpdGluZ0JvdW5kYXJ5LgorCisgICAgICAgICogZWRpdGluZy9WaXNpYmxlUG9zaXRp b24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6VmlzaWJsZVBvc2l0aW9uOjpuZXh0KToKKyAgICAg ICAgKFdlYkNvcmU6OlZpc2libGVQb3NpdGlvbjo6cHJldmlvdXMpOgorICAgICAgICAoV2ViQ29y ZTo6VmlzaWJsZVBvc2l0aW9uOjpsZWZ0KToKKyAgICAgICAgKFdlYkNvcmU6OlZpc2libGVQb3Np dGlvbjo6cmlnaHQpOgorICAgICAgICAoV2ViQ29yZTo6VmlzaWJsZVBvc2l0aW9uOjpob25vckVk aXRpbmdCb3VuZGFyeUF0T3JCZWZvcmUpOgorICAgICAgICAoV2ViQ29yZTo6VmlzaWJsZVBvc2l0 aW9uOjpob25vckVkaXRpbmdCb3VuZGFyeUF0T3JBZnRlcik6CisgICAgICAgICogZWRpdGluZy9W aXNpYmxlUG9zaXRpb24uaDoKKyAgICAgICAgKiBlZGl0aW5nL3Zpc2libGVfdW5pdHMuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6cHJldmlvdXNXb3JkUG9zaXRpb24pOgorICAgICAgICAoV2ViQ29y ZTo6bmV4dFdvcmRQb3NpdGlvbik6CisgICAgICAgIChXZWJDb3JlOjpzdGFydE9mTGluZSk6Cisg ICAgICAgIChXZWJDb3JlOjplbmRPZkxpbmUpOgorICAgICAgICAoV2ViQ29yZTo6cHJldmlvdXNT ZW50ZW5jZVBvc2l0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6Om5leHRTZW50ZW5jZVBvc2l0aW9u KToKKyAgICAgICAgKFdlYkNvcmU6OmxvZ2ljYWxTdGFydE9mTGluZSk6CisgICAgICAgIChXZWJD b3JlOjpsb2dpY2FsRW5kT2ZMaW5lKToKKyAgICAgICAgKFdlYkNvcmU6OmxlZnRXb3JkUG9zaXRp b24pOgorICAgICAgICAoV2ViQ29yZTo6cmlnaHRXb3JkUG9zaXRpb24pOgorCiAyMDExLTA4LTE5 ICBEYW4gQmVybnN0ZWluICA8bWl0ekBhcHBsZS5jb20+CiAKICAgICAgICAgQmV0dGVyIGJ1aWxk IGZpeCBhZnRlciByOTMzODQuCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL1Zpc2libGVQ b3NpdGlvbi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvZWRpdGluZy9WaXNpYmxl UG9zaXRpb24uY3BwCShyZXZpc2lvbiA5MzQyMSkKKysrIFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcv VmlzaWJsZVBvc2l0aW9uLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNzAsNyArNzAsNyBAQCBWaXNp YmxlUG9zaXRpb24gVmlzaWJsZVBvc2l0aW9uOjpuZXh0KEVkCiAgICAgaWYgKHJ1bGUgPT0gQ2Fu Q3Jvc3NFZGl0aW5nQm91bmRhcnkpCiAgICAgICAgIHJldHVybiBuZXh0OwogCi0gICAgcmV0dXJu IGhvbm9yRWRpdGFibGVCb3VuZGFyeUF0T3JBZnRlcihuZXh0KTsKKyAgICByZXR1cm4gaG9ub3JF ZGl0aW5nQm91bmRhcnlBdE9yQWZ0ZXIobmV4dCk7CiB9CiAKIFZpc2libGVQb3NpdGlvbiBWaXNp YmxlUG9zaXRpb246OnByZXZpb3VzKEVkaXRpbmdCb3VuZGFyeUNyb3NzaW5nUnVsZSBydWxlKSBj b25zdApAQCAtMTAwLDcgKzEwMCw3IEBAIFZpc2libGVQb3NpdGlvbiBWaXNpYmxlUG9zaXRpb246 OnByZXZpb3UKICAgICBpZiAocnVsZSA9PSBDYW5Dcm9zc0VkaXRpbmdCb3VuZGFyeSkKICAgICAg ICAgcmV0dXJuIHByZXY7CiAgICAgCi0gICAgcmV0dXJuIGhvbm9yRWRpdGFibGVCb3VuZGFyeUF0 T3JCZWZvcmUocHJldik7CisgICAgcmV0dXJuIGhvbm9yRWRpdGluZ0JvdW5kYXJ5QXRPckJlZm9y ZShwcmV2KTsKIH0KIAogUG9zaXRpb24gVmlzaWJsZVBvc2l0aW9uOjpsZWZ0VmlzdWFsbHlEaXN0 aW5jdENhbmRpZGF0ZSgpIGNvbnN0CkBAIC0yNTEsNyArMjUxLDcgQEAgVmlzaWJsZVBvc2l0aW9u IFZpc2libGVQb3NpdGlvbjo6bGVmdChibwogICAgICAgICByZXR1cm4gbGVmdDsKIAogICAgIC8v IEZJWE1FOiBUaGlzIG1heSBuZWVkIHRvIGRvIHNvbWV0aGluZyBkaWZmZXJlbnQgZnJvbSAiYmVm b3JlIi4KLSAgICByZXR1cm4gaG9ub3JFZGl0YWJsZUJvdW5kYXJ5QXRPckJlZm9yZShsZWZ0KTsK KyAgICByZXR1cm4gaG9ub3JFZGl0aW5nQm91bmRhcnlBdE9yQmVmb3JlKGxlZnQpOwogfQogCiBQ b3NpdGlvbiBWaXNpYmxlUG9zaXRpb246OnJpZ2h0VmlzdWFsbHlEaXN0aW5jdENhbmRpZGF0ZSgp IGNvbnN0CkBAIC00MDMsMTAgKzQwMywxMCBAQCBWaXNpYmxlUG9zaXRpb24gVmlzaWJsZVBvc2l0 aW9uOjpyaWdodChiCiAgICAgICAgIHJldHVybiByaWdodDsKIAogICAgIC8vIEZJWE1FOiBUaGlz IG1heSBuZWVkIHRvIGRvIHNvbWV0aGluZyBkaWZmZXJlbnQgZnJvbSAiYWZ0ZXIiLgotICAgIHJl dHVybiBob25vckVkaXRhYmxlQm91bmRhcnlBdE9yQWZ0ZXIocmlnaHQpOworICAgIHJldHVybiBo b25vckVkaXRpbmdCb3VuZGFyeUF0T3JBZnRlcihyaWdodCk7CiB9CiAKLVZpc2libGVQb3NpdGlv biBWaXNpYmxlUG9zaXRpb246Omhvbm9yRWRpdGFibGVCb3VuZGFyeUF0T3JCZWZvcmUoY29uc3Qg VmlzaWJsZVBvc2l0aW9uICZwb3MpIGNvbnN0CitWaXNpYmxlUG9zaXRpb24gVmlzaWJsZVBvc2l0 aW9uOjpob25vckVkaXRpbmdCb3VuZGFyeUF0T3JCZWZvcmUoY29uc3QgVmlzaWJsZVBvc2l0aW9u ICZwb3MpIGNvbnN0CiB7CiAgICAgaWYgKHBvcy5pc051bGwoKSkKICAgICAgICAgcmV0dXJuIHBv czsKQEAgLTQzMiw3ICs0MzIsNyBAQCBWaXNpYmxlUG9zaXRpb24gVmlzaWJsZVBvc2l0aW9uOjpo b25vckVkCiAgICAgcmV0dXJuIGxhc3RFZGl0YWJsZVBvc2l0aW9uQmVmb3JlUG9zaXRpb25JblJv b3QocG9zLmRlZXBFcXVpdmFsZW50KCksIGhpZ2hlc3RSb290KTsKIH0KIAotVmlzaWJsZVBvc2l0 aW9uIFZpc2libGVQb3NpdGlvbjo6aG9ub3JFZGl0YWJsZUJvdW5kYXJ5QXRPckFmdGVyKGNvbnN0 IFZpc2libGVQb3NpdGlvbiAmcG9zKSBjb25zdAorVmlzaWJsZVBvc2l0aW9uIFZpc2libGVQb3Np dGlvbjo6aG9ub3JFZGl0aW5nQm91bmRhcnlBdE9yQWZ0ZXIoY29uc3QgVmlzaWJsZVBvc2l0aW9u ICZwb3MpIGNvbnN0CiB7CiAgICAgaWYgKHBvcy5pc051bGwoKSkKICAgICAgICAgcmV0dXJuIHBv czsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvVmlzaWJsZVBvc2l0aW9uLmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkNvcmUvZWRpdGluZy9WaXNpYmxlUG9zaXRpb24uaAkocmV2aXNp b24gOTM0MjEpCisrKyBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL1Zpc2libGVQb3NpdGlvbi5oCSh3 b3JraW5nIGNvcHkpCkBAIC03MCw4ICs3MCw4IEBAIHB1YmxpYzoKICAgICAvLyBuZXh0KCkgYW5k IHByZXZpb3VzKCkgd2lsbCBpbmNyZW1lbnQvZGVjcmVtZW50IGJ5IGEgY2hhcmFjdGVyIGNsdXN0 ZXIuCiAgICAgVmlzaWJsZVBvc2l0aW9uIG5leHQoRWRpdGluZ0JvdW5kYXJ5Q3Jvc3NpbmdSdWxl ID0gQ2FuQ3Jvc3NFZGl0aW5nQm91bmRhcnkpIGNvbnN0OwogICAgIFZpc2libGVQb3NpdGlvbiBw cmV2aW91cyhFZGl0aW5nQm91bmRhcnlDcm9zc2luZ1J1bGUgPSBDYW5Dcm9zc0VkaXRpbmdCb3Vu ZGFyeSkgY29uc3Q7Ci0gICAgVmlzaWJsZVBvc2l0aW9uIGhvbm9yRWRpdGFibGVCb3VuZGFyeUF0 T3JCZWZvcmUoY29uc3QgVmlzaWJsZVBvc2l0aW9uJikgY29uc3Q7Ci0gICAgVmlzaWJsZVBvc2l0 aW9uIGhvbm9yRWRpdGFibGVCb3VuZGFyeUF0T3JBZnRlcihjb25zdCBWaXNpYmxlUG9zaXRpb24m KSBjb25zdDsKKyAgICBWaXNpYmxlUG9zaXRpb24gaG9ub3JFZGl0aW5nQm91bmRhcnlBdE9yQmVm b3JlKGNvbnN0IFZpc2libGVQb3NpdGlvbiYpIGNvbnN0OworICAgIFZpc2libGVQb3NpdGlvbiBo b25vckVkaXRpbmdCb3VuZGFyeUF0T3JBZnRlcihjb25zdCBWaXNpYmxlUG9zaXRpb24mKSBjb25z dDsKIAogICAgIFZpc2libGVQb3NpdGlvbiBsZWZ0KGJvb2wgc3RheUluRWRpdGFibGVDb250ZW50 ID0gZmFsc2UpIGNvbnN0OwogICAgIFZpc2libGVQb3NpdGlvbiByaWdodChib29sIHN0YXlJbkVk aXRhYmxlQ29udGVudCA9IGZhbHNlKSBjb25zdDsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2VkaXRp bmcvdmlzaWJsZV91bml0cy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvZWRpdGlu Zy92aXNpYmxlX3VuaXRzLmNwcAkocmV2aXNpb24gOTM0MjEpCisrKyBTb3VyY2UvV2ViQ29yZS9l ZGl0aW5nL3Zpc2libGVfdW5pdHMuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yOTIsNyArMjkyLDcg QEAgc3RhdGljIHVuc2lnbmVkIHByZXZpb3VzV29yZFBvc2l0aW9uQm91bgogVmlzaWJsZVBvc2l0 aW9uIHByZXZpb3VzV29yZFBvc2l0aW9uKGNvbnN0IFZpc2libGVQb3NpdGlvbiAmYykKIHsKICAg ICBWaXNpYmxlUG9zaXRpb24gcHJldiA9IHByZXZpb3VzQm91bmRhcnkoYywgcHJldmlvdXNXb3Jk UG9zaXRpb25Cb3VuZGFyeSk7Ci0gICAgcmV0dXJuIGMuaG9ub3JFZGl0YWJsZUJvdW5kYXJ5QXRP ckJlZm9yZShwcmV2KTsKKyAgICByZXR1cm4gYy5ob25vckVkaXRpbmdCb3VuZGFyeUF0T3JCZWZv cmUocHJldik7CiB9CiAKIHN0YXRpYyB1bnNpZ25lZCBuZXh0V29yZFBvc2l0aW9uQm91bmRhcnko Y29uc3QgVUNoYXIqIGNoYXJhY3RlcnMsIHVuc2lnbmVkIGxlbmd0aCwgdW5zaWduZWQgb2Zmc2V0 LCBCb3VuZGFyeVNlYXJjaENvbnRleHRBdmFpbGFiaWxpdHkgbWF5SGF2ZU1vcmVDb250ZXh0LCBi b29sJiBuZWVkTW9yZUNvbnRleHQpCkBAIC0zMDgsNyArMzA4LDcgQEAgc3RhdGljIHVuc2lnbmVk IG5leHRXb3JkUG9zaXRpb25Cb3VuZGFyeQogVmlzaWJsZVBvc2l0aW9uIG5leHRXb3JkUG9zaXRp b24oY29uc3QgVmlzaWJsZVBvc2l0aW9uICZjKQogewogICAgIFZpc2libGVQb3NpdGlvbiBuZXh0 ID0gbmV4dEJvdW5kYXJ5KGMsIG5leHRXb3JkUG9zaXRpb25Cb3VuZGFyeSk7ICAgIAotICAgIHJl dHVybiBjLmhvbm9yRWRpdGFibGVCb3VuZGFyeUF0T3JBZnRlcihuZXh0KTsKKyAgICByZXR1cm4g Yy5ob25vckVkaXRpbmdCb3VuZGFyeUF0T3JBZnRlcihuZXh0KTsKIH0KIAogYm9vbCBpc1N0YXJ0 T2ZXb3JkKGNvbnN0IFZpc2libGVQb3NpdGlvbiYgcCkKQEAgLTM3Myw3ICszNzMsNyBAQCBWaXNp YmxlUG9zaXRpb24gc3RhcnRPZkxpbmUoY29uc3QgVmlzaWJsCiB7CiAgICAgVmlzaWJsZVBvc2l0 aW9uIHZpc1BvcyA9IHN0YXJ0UG9zaXRpb25Gb3JMaW5lKGMpOwogCi0gICAgcmV0dXJuIGMuaG9u b3JFZGl0YWJsZUJvdW5kYXJ5QXRPckJlZm9yZSh2aXNQb3MpOworICAgIHJldHVybiBjLmhvbm9y RWRpdGluZ0JvdW5kYXJ5QXRPckJlZm9yZSh2aXNQb3MpOwogfQogCiBzdGF0aWMgVmlzaWJsZVBv c2l0aW9uIGVuZFBvc2l0aW9uRm9yTGluZShjb25zdCBWaXNpYmxlUG9zaXRpb24mIGMpCkBAIC00 NDIsNyArNDQyLDcgQEAgVmlzaWJsZVBvc2l0aW9uIGVuZE9mTGluZShjb25zdCBWaXNpYmxlUAog ICAgICAgICB2aXNQb3MgPSBlbmRQb3NpdGlvbkZvckxpbmUodmlzUG9zKTsKICAgICB9CiAgICAg Ci0gICAgcmV0dXJuIGMuaG9ub3JFZGl0YWJsZUJvdW5kYXJ5QXRPckFmdGVyKHZpc1Bvcyk7Cisg ICAgcmV0dXJuIGMuaG9ub3JFZGl0aW5nQm91bmRhcnlBdE9yQWZ0ZXIodmlzUG9zKTsKIH0KIAog Ym9vbCBpblNhbWVMaW5lKGNvbnN0IFZpc2libGVQb3NpdGlvbiAmYSwgY29uc3QgVmlzaWJsZVBv c2l0aW9uICZiKQpAQCAtNzA1LDcgKzcwNSw3IEBAIHN0YXRpYyB1bnNpZ25lZCBwcmV2aW91c1Nl bnRlbmNlUG9zaXRpb24KIFZpc2libGVQb3NpdGlvbiBwcmV2aW91c1NlbnRlbmNlUG9zaXRpb24o Y29uc3QgVmlzaWJsZVBvc2l0aW9uICZjKQogewogICAgIFZpc2libGVQb3NpdGlvbiBwcmV2ID0g cHJldmlvdXNCb3VuZGFyeShjLCBwcmV2aW91c1NlbnRlbmNlUG9zaXRpb25Cb3VuZGFyeSk7Ci0g ICAgcmV0dXJuIGMuaG9ub3JFZGl0YWJsZUJvdW5kYXJ5QXRPckJlZm9yZShwcmV2KTsKKyAgICBy ZXR1cm4gYy5ob25vckVkaXRpbmdCb3VuZGFyeUF0T3JCZWZvcmUocHJldik7CiB9CiAKIHN0YXRp YyB1bnNpZ25lZCBuZXh0U2VudGVuY2VQb3NpdGlvbkJvdW5kYXJ5KGNvbnN0IFVDaGFyKiBjaGFy YWN0ZXJzLCB1bnNpZ25lZCBsZW5ndGgsIHVuc2lnbmVkLCBCb3VuZGFyeVNlYXJjaENvbnRleHRB dmFpbGFiaWxpdHksIGJvb2wmKQpAQCAtNzE5LDcgKzcxOSw3IEBAIHN0YXRpYyB1bnNpZ25lZCBu ZXh0U2VudGVuY2VQb3NpdGlvbkJvdW4KIFZpc2libGVQb3NpdGlvbiBuZXh0U2VudGVuY2VQb3Np dGlvbihjb25zdCBWaXNpYmxlUG9zaXRpb24gJmMpCiB7CiAgICAgVmlzaWJsZVBvc2l0aW9uIG5l eHQgPSBuZXh0Qm91bmRhcnkoYywgbmV4dFNlbnRlbmNlUG9zaXRpb25Cb3VuZGFyeSk7ICAgIAot ICAgIHJldHVybiBjLmhvbm9yRWRpdGFibGVCb3VuZGFyeUF0T3JBZnRlcihuZXh0KTsKKyAgICBy ZXR1cm4gYy5ob25vckVkaXRpbmdCb3VuZGFyeUF0T3JBZnRlcihuZXh0KTsKIH0KIAogVmlzaWJs ZVBvc2l0aW9uIHN0YXJ0T2ZQYXJhZ3JhcGgoY29uc3QgVmlzaWJsZVBvc2l0aW9uJiBjLCBFZGl0 aW5nQm91bmRhcnlDcm9zc2luZ1J1bGUgYm91bmRhcnlDcm9zc2luZ1J1bGUpCkBAIC0xMDY3LDcg KzEwNjcsNyBAQCBWaXNpYmxlUG9zaXRpb24gbG9naWNhbFN0YXJ0T2ZMaW5lKGNvbnN0CiAgICAg ICAgIGlmICghZWRpdGFibGVSb290LT5jb250YWlucyh2aXNQb3MuZGVlcEVxdWl2YWxlbnQoKS5j b250YWluZXJOb2RlKCkpKQogICAgICAgICAgICAgcmV0dXJuIGZpcnN0UG9zaXRpb25Jbk5vZGUo ZWRpdGFibGVSb290KTsKICAgICB9Ci0gICAgcmV0dXJuIGMuaG9ub3JFZGl0YWJsZUJvdW5kYXJ5 QXRPckJlZm9yZSh2aXNQb3MpOworICAgIHJldHVybiBjLmhvbm9yRWRpdGluZ0JvdW5kYXJ5QXRP ckJlZm9yZSh2aXNQb3MpOwogfQogCiBzdGF0aWMgVmlzaWJsZVBvc2l0aW9uIGxvZ2ljYWxFbmRQ b3NpdGlvbkZvckxpbmUoY29uc3QgVmlzaWJsZVBvc2l0aW9uJiBjKQpAQCAtMTEzMCw3ICsxMTMw LDcgQEAgVmlzaWJsZVBvc2l0aW9uIGxvZ2ljYWxFbmRPZkxpbmUoY29uc3QgVgogICAgICAgICBp ZiAoIWVkaXRhYmxlUm9vdC0+Y29udGFpbnModmlzUG9zLmRlZXBFcXVpdmFsZW50KCkuY29udGFp bmVyTm9kZSgpKSkKICAgICAgICAgICAgIHJldHVybiBsYXN0UG9zaXRpb25Jbk5vZGUoZWRpdGFi bGVSb290KTsKICAgICB9Ci0gICAgcmV0dXJuIGMuaG9ub3JFZGl0YWJsZUJvdW5kYXJ5QXRPckFm dGVyKHZpc1Bvcyk7CisgICAgcmV0dXJuIGMuaG9ub3JFZGl0aW5nQm91bmRhcnlBdE9yQWZ0ZXIo dmlzUG9zKTsKIH0KIAogVmlzaWJsZVBvc2l0aW9uIGxlZnRCb3VuZGFyeU9mTGluZShjb25zdCBW aXNpYmxlUG9zaXRpb24mIGMsIFRleHREaXJlY3Rpb24gZGlyZWN0aW9uKQpAQCAtMTY3OSw3ICsx Njc5LDcgQEAgVmlzaWJsZVBvc2l0aW9uIGxlZnRXb3JkUG9zaXRpb24oY29uc3QgVgogICAgICAg ICByZXR1cm4gVmlzaWJsZVBvc2l0aW9uKCk7CiAKICAgICBWaXNpYmxlUG9zaXRpb24gbGVmdFdv cmRCcmVhayA9IGxlZnRXb3JkUG9zaXRpb25JZ25vcmluZ0VkaXRpbmdCb3VuZGFyeSh2aXNpYmxl UG9zaXRpb24pOwotICAgIHJldHVybiB2aXNpYmxlUG9zaXRpb24uaG9ub3JFZGl0YWJsZUJvdW5k YXJ5QXRPckJlZm9yZShsZWZ0V29yZEJyZWFrKTsKKyAgICByZXR1cm4gdmlzaWJsZVBvc2l0aW9u Lmhvbm9yRWRpdGluZ0JvdW5kYXJ5QXRPckJlZm9yZShsZWZ0V29yZEJyZWFrKTsKIH0KIAogVmlz aWJsZVBvc2l0aW9uIHJpZ2h0V29yZFBvc2l0aW9uKGNvbnN0IFZpc2libGVQb3NpdGlvbiYgdmlz aWJsZVBvc2l0aW9uKQpAQCAtMTY4OCw3ICsxNjg4LDcgQEAgVmlzaWJsZVBvc2l0aW9uIHJpZ2h0 V29yZFBvc2l0aW9uKGNvbnN0IAogICAgICAgICByZXR1cm4gVmlzaWJsZVBvc2l0aW9uKCk7CiAK ICAgICBWaXNpYmxlUG9zaXRpb24gcmlnaHRXb3JkQnJlYWsgPSByaWdodFdvcmRQb3NpdGlvbkln bm9yaW5nRWRpdGluZ0JvdW5kYXJ5KHZpc2libGVQb3NpdGlvbik7Ci0gICAgcmV0dXJuIHZpc2li bGVQb3NpdGlvbi5ob25vckVkaXRhYmxlQm91bmRhcnlBdE9yQmVmb3JlKHJpZ2h0V29yZEJyZWFr KTsKKyAgICByZXR1cm4gdmlzaWJsZVBvc2l0aW9uLmhvbm9yRWRpdGluZ0JvdW5kYXJ5QXRPckJl Zm9yZShyaWdodFdvcmRCcmVhayk7CiB9CiAKIH0K