87169 2012-05-22 14:30:44 -0700 Move some CSS regions properties to CSSParser::isValidKeywordPropertyAndValue. 2012-05-22 16:58:27 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 menard menard macpherson tony webkit.review.bot oldest_to_newest 630767 0 menard 2012-05-22 14:30:44 -0700 Move some CSS regions properties to CSSParser::isValidKeywordPropertyAndValue. 630773 1 143365 menard 2012-05-22 14:32:15 -0700 Created attachment 143365 Patch 630778 2 143365 tony 2012-05-22 14:37:54 -0700 Comment on attachment 143365 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=143365&action=review OK > Source/WebCore/css/CSSParser.cpp:588 > + case CSSPropertyWebkitColumnBreakBefore: > + case CSSPropertyWebkitRegionBreakAfter: > + case CSSPropertyWebkitRegionBreakBefore: > + if (valueID == CSSValueAuto || valueID == CSSValueAlways || valueID == CSSValueAvoid || valueID == CSSValueLeft || valueID == CSSValueRight) > + return ((propertyId == CSSPropertyWebkitRegionBreakAfter) || (propertyId == CSSPropertyWebkitRegionBreakBefore)) ? parserContext.isCSSRegionsEnabled : true; Should we split the region properties into a separate part of the switch statement? It would avoid the extra check for the non-region properties. 630788 3 menard 2012-05-22 14:48:27 -0700 (In reply to comment #2) > (From update of attachment 143365 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=143365&action=review > > OK > > > Source/WebCore/css/CSSParser.cpp:588 > > + case CSSPropertyWebkitColumnBreakBefore: > > + case CSSPropertyWebkitRegionBreakAfter: > > + case CSSPropertyWebkitRegionBreakBefore: > > + if (valueID == CSSValueAuto || valueID == CSSValueAlways || valueID == CSSValueAvoid || valueID == CSSValueLeft || valueID == CSSValueRight) > > + return ((propertyId == CSSPropertyWebkitRegionBreakAfter) || (propertyId == CSSPropertyWebkitRegionBreakBefore)) ? parserContext.isCSSRegionsEnabled : true; > > Should we split the region properties into a separate part of the switch statement? It would avoid the extra check for the non-region properties. Ok make sense. 630799 4 143371 menard 2012-05-22 14:57:50 -0700 Created attachment 143371 Patch for landing 630802 5 143372 menard 2012-05-22 15:01:37 -0700 Created attachment 143372 Patch for landing 630931 6 143372 webkit.review.bot 2012-05-22 16:58:22 -0700 Comment on attachment 143372 Patch for landing Clearing flags on attachment: 143372 Committed r118082: <http://trac.webkit.org/changeset/118082> 630933 7 webkit.review.bot 2012-05-22 16:58:27 -0700 All reviewed patches have been landed. Closing bug. 143365 2012-05-22 14:32:15 -0700 2012-05-22 14:57:44 -0700 Patch bug-87169-20120522183154.patch text/plain 6374 menard U3VidmVyc2lvbiBSZXZpc2lvbjogMTE4MDQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGMwNWRkYmNlNGM0NTQz YWNlM2QyMmQyZjlkMDZjMzQ0Yjk1N2JlMi4uZGFhNmRjNjI5NzI1MjQyYzc4OTVmNGZjNDZjNzg3 OWE1MGYyZWVlMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEyLTA1LTIyICBBbGV4 aXMgTWVuYXJkICA8YWxleGlzLm1lbmFyZEBvcGVuYm9zc2Eub3JnPgorCisgICAgICAgIE1vdmUg c29tZSBDU1MgcmVnaW9ucyBwcm9wZXJ0aWVzIHRvIENTU1BhcnNlcjo6aXNWYWxpZEtleXdvcmRQ cm9wZXJ0eUFuZFZhbHVlLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9ODcxNjkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBNb3ZlIHNvbWUgQ1NTIHJlZ2lvbnMgcHJvcGVydGllcyB0byB0aGUgZmFzdCBwYXRo IGltcGxlbWVudGVkIGJ5CisgICAgICAgIENTU1BhcnNlcjo6aXNWYWxpZEtleXdvcmRQcm9wZXJ0 eUFuZFZhbHVlLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyA6IEV4aXN0aW5nIHRlc3RzIHNob3Vs ZCBjb3Zlci4KKworICAgICAgICAqIGNzcy9DU1NQYXJzZXIuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6aXNWYWxpZEtleXdvcmRQcm9wZXJ0eUFuZFZhbHVlKToKKyAgICAgICAgKFdlYkNvcmU6Omlz S2V5d29yZFByb3BlcnR5SUQpOgorICAgICAgICAoV2ViQ29yZTo6Q1NTUGFyc2VyOjpwYXJzZVZh bHVlKToKKwogMjAxMi0wNS0yMiAgVG9ueSBDaGFuZyAgPHRvbnlAY2hyb21pdW0ub3JnPgogCiAg ICAgICAgIFJFR1JFU1NJT04ocjExNzYxMyk6IERyb21hZW8vanNsaWItc3R5bGUtcHJvdG90eXBl IHJlZ3Jlc3NlZCBieSAyMCUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQYXJz ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU1BhcnNlci5jcHAKaW5kZXggMmZlNzM3YTdl ZjUwODdlNjRjNDRhZGU2NTM3OWMwZDRkM2YxYjFlMS4uZjY2YTA5M2JlMjUzZTA3MjAzMzBhOTJj MTg3ZDJmYWZmNzZhM2I0ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU1BhcnNl ci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU1BhcnNlci5jcHAKQEAgLTU3OCw2ICs1 NzgsMjEgQEAgc3RhdGljIGlubGluZSBib29sIGlzVmFsaWRLZXl3b3JkUHJvcGVydHlBbmRWYWx1 ZShDU1NQcm9wZXJ0eUlEIHByb3BlcnR5SWQsIGludAogICAgICAgICBpZiAodmFsdWVJRCA9PSBD U1NWYWx1ZVZpc2libGUgfHwgdmFsdWVJRCA9PSBDU1NWYWx1ZUhpZGRlbiB8fCB2YWx1ZUlEID09 IENTU1ZhbHVlU2Nyb2xsIHx8IHZhbHVlSUQgPT0gQ1NTVmFsdWVBdXRvIHx8IHZhbHVlSUQgPT0g Q1NTVmFsdWVPdmVybGF5IHx8IHZhbHVlSUQgPT0gQ1NTVmFsdWVXZWJraXRNYXJxdWVlKQogICAg ICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgICAgIGJyZWFrOworICAgIGNhc2UgQ1NTUHJvcGVy dHlQYWdlQnJlYWtBZnRlcjogLy8gYXV0byB8IGFsd2F5cyB8IGF2b2lkIHwgbGVmdCB8IHJpZ2h0 IHwgaW5oZXJpdAorICAgIGNhc2UgQ1NTUHJvcGVydHlQYWdlQnJlYWtCZWZvcmU6CisgICAgY2Fz ZSBDU1NQcm9wZXJ0eVdlYmtpdENvbHVtbkJyZWFrQWZ0ZXI6CisgICAgY2FzZSBDU1NQcm9wZXJ0 eVdlYmtpdENvbHVtbkJyZWFrQmVmb3JlOgorICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRSZWdp b25CcmVha0FmdGVyOgorICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRSZWdpb25CcmVha0JlZm9y ZToKKyAgICAgICAgaWYgKHZhbHVlSUQgPT0gQ1NTVmFsdWVBdXRvIHx8IHZhbHVlSUQgPT0gQ1NT VmFsdWVBbHdheXMgfHwgdmFsdWVJRCA9PSBDU1NWYWx1ZUF2b2lkIHx8IHZhbHVlSUQgPT0gQ1NT VmFsdWVMZWZ0IHx8IHZhbHVlSUQgPT0gQ1NTVmFsdWVSaWdodCkKKyAgICAgICAgICAgIHJldHVy biAoKHByb3BlcnR5SWQgPT0gQ1NTUHJvcGVydHlXZWJraXRSZWdpb25CcmVha0FmdGVyKSB8fCAo cHJvcGVydHlJZCA9PSBDU1NQcm9wZXJ0eVdlYmtpdFJlZ2lvbkJyZWFrQmVmb3JlKSkgPyBwYXJz ZXJDb250ZXh0LmlzQ1NTUmVnaW9uc0VuYWJsZWQgOiB0cnVlOworICAgICAgICBicmVhazsKKyAg ICBjYXNlIENTU1Byb3BlcnR5UGFnZUJyZWFrSW5zaWRlOiAvLyBhdm9pZCB8IGF1dG8gfCBpbmhl cml0CisgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdENvbHVtbkJyZWFrSW5zaWRlOgorICAgIGNh c2UgQ1NTUHJvcGVydHlXZWJraXRSZWdpb25CcmVha0luc2lkZToKKyAgICAgICAgaWYgKHZhbHVl SUQgPT0gQ1NTVmFsdWVBdXRvIHx8IHZhbHVlSUQgPT0gQ1NTVmFsdWVBdm9pZCkKKyAgICAgICAg ICAgIHJldHVybiAocHJvcGVydHlJZCA9PSBDU1NQcm9wZXJ0eVdlYmtpdFJlZ2lvbkJyZWFrSW5z aWRlKSA/IHBhcnNlckNvbnRleHQuaXNDU1NSZWdpb25zRW5hYmxlZCA6IHRydWU7CisgICAgICAg IGJyZWFrOwogICAgIGNhc2UgQ1NTUHJvcGVydHlQb2ludGVyRXZlbnRzOgogICAgICAgICAvLyBu b25lIHwgdmlzaWJsZVBhaW50ZWQgfCB2aXNpYmxlRmlsbCB8IHZpc2libGVTdHJva2UgfCB2aXNp YmxlIHwKICAgICAgICAgLy8gcGFpbnRlZCB8IGZpbGwgfCBzdHJva2UgfCBhdXRvIHwgYWxsIHwg aW5oZXJpdApAQCAtNzQ2LDYgKzc2MSwxMCBAQCBzdGF0aWMgaW5saW5lIGJvb2wgaXNWYWxpZEtl eXdvcmRQcm9wZXJ0eUFuZFZhbHVlKENTU1Byb3BlcnR5SUQgcHJvcGVydHlJZCwgaW50CiAgICAg ICAgIGlmICh2YWx1ZUlEID09IENTU1ZhbHVlRXhhY3QgfHwgdmFsdWVJRCA9PSBDU1NWYWx1ZUVj b25vbXkpCiAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICAgICAgYnJlYWs7CisgICAgY2Fz ZSBDU1NQcm9wZXJ0eVdlYmtpdFJlZ2lvbk92ZXJmbG93OgorICAgICAgICBpZiAocGFyc2VyQ29u dGV4dC5pc0NTU1JlZ2lvbnNFbmFibGVkICYmICh2YWx1ZUlEID09IENTU1ZhbHVlQXV0byB8fCB2 YWx1ZUlEID09IENTU1ZhbHVlQnJlYWspKQorICAgICAgICAgICAgcmV0dXJuIHRydWU7CisgICAg ICAgIGJyZWFrOwogICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRSdGxPcmRlcmluZzoKICAgICAg ICAgaWYgKHZhbHVlSUQgPT0gQ1NTVmFsdWVMb2dpY2FsIHx8IHZhbHVlSUQgPT0gQ1NTVmFsdWVW aXN1YWwpCiAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKQEAgLTg0MCw2ICs4NTksOSBAQCBzdGF0 aWMgaW5saW5lIGJvb2wgaXNLZXl3b3JkUHJvcGVydHlJRChDU1NQcm9wZXJ0eUlEIHByb3BlcnR5 SWQpCiAgICAgY2FzZSBDU1NQcm9wZXJ0eU91dGxpbmVTdHlsZToKICAgICBjYXNlIENTU1Byb3Bl cnR5T3ZlcmZsb3dYOgogICAgIGNhc2UgQ1NTUHJvcGVydHlPdmVyZmxvd1k6CisgICAgY2FzZSBD U1NQcm9wZXJ0eVBhZ2VCcmVha0FmdGVyOgorICAgIGNhc2UgQ1NTUHJvcGVydHlQYWdlQnJlYWtC ZWZvcmU6CisgICAgY2FzZSBDU1NQcm9wZXJ0eVBhZ2VCcmVha0luc2lkZToKICAgICBjYXNlIENT U1Byb3BlcnR5UG9pbnRlckV2ZW50czoKICAgICBjYXNlIENTU1Byb3BlcnR5UG9zaXRpb246CiAg ICAgY2FzZSBDU1NQcm9wZXJ0eVJlc2l6ZToKQEAgLTg2OCw2ICs4OTAsNyBAQCBzdGF0aWMgaW5s aW5lIGJvb2wgaXNLZXl3b3JkUHJvcGVydHlJRChDU1NQcm9wZXJ0eUlEIHByb3BlcnR5SWQpCiAg ICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdEJveE9yaWVudDoKICAgICBjYXNlIENTU1Byb3BlcnR5 V2Via2l0Qm94UGFjazoKICAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0Q29sb3JDb3JyZWN0aW9u OgorICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRDb2x1bW5CcmVha0luc2lkZToKICAgICBjYXNl IENTU1Byb3BlcnR5V2Via2l0Q29sdW1uUnVsZVN0eWxlOgogICAgIGNhc2UgQ1NTUHJvcGVydHlX ZWJraXRGbGV4QWxpZ246CiAgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdEZsZXhEaXJlY3Rpb246 CkBAIC04OTMsNiArOTE2LDEwIEBAIHN0YXRpYyBpbmxpbmUgYm9vbCBpc0tleXdvcmRQcm9wZXJ0 eUlEKENTU1Byb3BlcnR5SUQgcHJvcGVydHlJZCkKICAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0 T3ZlcmZsb3dTY3JvbGxpbmc6CiAjZW5kaWYKICAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0UHJp bnRDb2xvckFkanVzdDoKKyAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0UmVnaW9uQnJlYWtBZnRl cjoKKyAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0UmVnaW9uQnJlYWtCZWZvcmU6CisgICAgY2Fz ZSBDU1NQcm9wZXJ0eVdlYmtpdFJlZ2lvbkJyZWFrSW5zaWRlOgorICAgIGNhc2UgQ1NTUHJvcGVy dHlXZWJraXRSZWdpb25PdmVyZmxvdzoKICAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0UnRsT3Jk ZXJpbmc6CiAgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdFRleHRDb21iaW5lOgogICAgIGNhc2Ug Q1NTUHJvcGVydHlXZWJraXRUZXh0RW1waGFzaXNQb3NpdGlvbjoKQEAgLTE1MDQsMjcgKzE1MzEs NiBAQCBib29sIENTU1BhcnNlcjo6cGFyc2VWYWx1ZShDU1NQcm9wZXJ0eUlEIHByb3BJZCwgYm9v bCBpbXBvcnRhbnQpCiAgICAgICAgIH0KICAgICAgICAgYnJlYWs7CiAKLSAgICBjYXNlIENTU1By b3BlcnR5UGFnZUJyZWFrQWZ0ZXI6ICAgICAgIC8vIGF1dG8gfCBhbHdheXMgfCBhdm9pZCB8IGxl ZnQgfCByaWdodCB8IGluaGVyaXQKLSAgICBjYXNlIENTU1Byb3BlcnR5UGFnZUJyZWFrQmVmb3Jl OgotICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRDb2x1bW5CcmVha0FmdGVyOgotICAgIGNhc2Ug Q1NTUHJvcGVydHlXZWJraXRDb2x1bW5CcmVha0JlZm9yZToKLSAgICBjYXNlIENTU1Byb3BlcnR5 V2Via2l0UmVnaW9uQnJlYWtBZnRlcjoKLSAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0UmVnaW9u QnJlYWtCZWZvcmU6Ci0gICAgICAgIGlmIChpZCA9PSBDU1NWYWx1ZUF1dG8KLSAgICAgICAgICAg IHx8IGlkID09IENTU1ZhbHVlQWx3YXlzCi0gICAgICAgICAgICB8fCBpZCA9PSBDU1NWYWx1ZUF2 b2lkCi0gICAgICAgICAgICB8fCBpZCA9PSBDU1NWYWx1ZUxlZnQKLSAgICAgICAgICAgIHx8IGlk ID09IENTU1ZhbHVlUmlnaHQpCi0gICAgICAgICAgICB2YWxpZFByaW1pdGl2ZSA9ICgocHJvcElk ID09IENTU1Byb3BlcnR5V2Via2l0UmVnaW9uQnJlYWtBZnRlcikgfHwgKHByb3BJZCA9PSBDU1NQ cm9wZXJ0eVdlYmtpdFJlZ2lvbkJyZWFrQmVmb3JlKSkgPyBjc3NSZWdpb25zRW5hYmxlZCgpIDog dHJ1ZTsKLSAgICAgICAgYnJlYWs7Ci0KLSAgICBjYXNlIENTU1Byb3BlcnR5UGFnZUJyZWFrSW5z aWRlOiAgICAgLy8gYXZvaWQgfCBhdXRvIHwgaW5oZXJpdAotICAgIGNhc2UgQ1NTUHJvcGVydHlX ZWJraXRDb2x1bW5CcmVha0luc2lkZToKLSAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0UmVnaW9u QnJlYWtJbnNpZGU6Ci0gICAgICAgIGlmIChpZCA9PSBDU1NWYWx1ZUF1dG8gfHwgaWQgPT0gQ1NT VmFsdWVBdm9pZCkKLSAgICAgICAgICAgIHZhbGlkUHJpbWl0aXZlID0gKHByb3BJZCA9PSBDU1NQ cm9wZXJ0eVdlYmtpdFJlZ2lvbkJyZWFrSW5zaWRlKSA/IGNzc1JlZ2lvbnNFbmFibGVkKCkgOiB0 cnVlOwotICAgICAgICBicmVhazsKLQogICAgIGNhc2UgQ1NTUHJvcGVydHlDb250ZW50OiAgICAg ICAgICAgICAgLy8gWyA8c3RyaW5nPiB8IDx1cmk+IHwgPGNvdW50ZXI+IHwgYXR0cihYKSB8IG9w ZW4tcXVvdGUgfAogICAgICAgICAvLyBjbG9zZS1xdW90ZSB8IG5vLW9wZW4tcXVvdGUgfCBuby1j bG9zZS1xdW90ZSBdKyB8IGluaGVyaXQKICAgICAgICAgcmV0dXJuIHBhcnNlQ29udGVudChwcm9w SWQsIGltcG9ydGFudCk7CkBAIC0yMTAxLDEwICsyMTA3LDYgQEAgYm9vbCBDU1NQYXJzZXI6OnBh cnNlVmFsdWUoQ1NTUHJvcGVydHlJRCBwcm9wSWQsIGJvb2wgaW1wb3J0YW50KQogICAgICAgICBp ZiAoIWNzc1JlZ2lvbnNFbmFibGVkKCkpCiAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAg ICAgIHJldHVybiBwYXJzZVJlZ2lvblRocmVhZChwcm9wSWQsIGltcG9ydGFudCk7Ci0gICAgY2Fz ZSBDU1NQcm9wZXJ0eVdlYmtpdFJlZ2lvbk92ZXJmbG93OgotICAgICAgICBpZiAoY3NzUmVnaW9u c0VuYWJsZWQoKSAmJiAoaWQgPT0gQ1NTVmFsdWVBdXRvIHx8IGlkID09IENTU1ZhbHVlQnJlYWsp KQotICAgICAgICAgICAgdmFsaWRQcmltaXRpdmUgPSB0cnVlOwotICAgICAgICBicmVhazsKICAg ICBjYXNlIENTU1Byb3BlcnR5V2Via2l0VHJhbnNmb3JtOgogICAgICAgICBpZiAoaWQgPT0gQ1NT VmFsdWVOb25lKQogICAgICAgICAgICAgdmFsaWRQcmltaXRpdmUgPSB0cnVlOwo= 143371 2012-05-22 14:57:50 -0700 2012-05-22 15:01:30 -0700 Patch for landing bug-87169-20120522185730.patch text/plain 6515 menard U3VidmVyc2lvbiBSZXZpc2lvbjogMTE4MDQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGMwNWRkYmNlNGM0NTQz YWNlM2QyMmQyZjlkMDZjMzQ0Yjk1N2JlMi4uNDBhYmQ2MzIwMmQ1YjUyN2I0ODA1MGExMzI0Nzdk YzQzNWY2MDYyMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEyLTA1LTIyICBBbGV4 aXMgTWVuYXJkICA8YWxleGlzLm1lbmFyZEBvcGVuYm9zc2Eub3JnPgorCisgICAgICAgIE1vdmUg c29tZSBDU1MgcmVnaW9ucyBwcm9wZXJ0aWVzIHRvIENTU1BhcnNlcjo6aXNWYWxpZEtleXdvcmRQ cm9wZXJ0eUFuZFZhbHVlLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9ODcxNjkKKworICAgICAgICBSZXZpZXdlZCBieSBUb255IENoYW5nLgorCisgICAg ICAgIE1vdmUgc29tZSBDU1MgcmVnaW9ucyBwcm9wZXJ0aWVzIHRvIHRoZSBmYXN0IHBhdGggaW1w bGVtZW50ZWQgYnkKKyAgICAgICAgQ1NTUGFyc2VyOjppc1ZhbGlkS2V5d29yZFByb3BlcnR5QW5k VmFsdWUuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIDogRXhpc3RpbmcgdGVzdHMgc2hvdWxkIGNv dmVyLgorCisgICAgICAgICogY3NzL0NTU1BhcnNlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpp c1ZhbGlkS2V5d29yZFByb3BlcnR5QW5kVmFsdWUpOgorICAgICAgICAoV2ViQ29yZTo6aXNLZXl3 b3JkUHJvcGVydHlJRCk6CisgICAgICAgIChXZWJDb3JlOjpDU1NQYXJzZXI6OnBhcnNlVmFsdWUp OgorCiAyMDEyLTA1LTIyICBUb255IENoYW5nICA8dG9ueUBjaHJvbWl1bS5vcmc+CiAKICAgICAg ICAgUkVHUkVTU0lPTihyMTE3NjEzKTogRHJvbWFlby9qc2xpYi1zdHlsZS1wcm90b3R5cGUgcmVn cmVzc2VkIGJ5IDIwJQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU1BhcnNlci5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUGFyc2VyLmNwcAppbmRleCAyZmU3MzdhN2VmNTA4 N2U2NGM0NGFkZTY1Mzc5YzBkNGQzZjFiMWUxLi5mMTdjMDc4ZGNhODg5MWQ4NmRmYWJhN2U4NGQ3 ZDQ1NDU5MTMwZDE3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUGFyc2VyLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUGFyc2VyLmNwcApAQCAtNTc4LDYgKzU3OCwx OCBAQCBzdGF0aWMgaW5saW5lIGJvb2wgaXNWYWxpZEtleXdvcmRQcm9wZXJ0eUFuZFZhbHVlKENT U1Byb3BlcnR5SUQgcHJvcGVydHlJZCwgaW50CiAgICAgICAgIGlmICh2YWx1ZUlEID09IENTU1Zh bHVlVmlzaWJsZSB8fCB2YWx1ZUlEID09IENTU1ZhbHVlSGlkZGVuIHx8IHZhbHVlSUQgPT0gQ1NT VmFsdWVTY3JvbGwgfHwgdmFsdWVJRCA9PSBDU1NWYWx1ZUF1dG8gfHwgdmFsdWVJRCA9PSBDU1NW YWx1ZU92ZXJsYXkgfHwgdmFsdWVJRCA9PSBDU1NWYWx1ZVdlYmtpdE1hcnF1ZWUpCiAgICAgICAg ICAgICByZXR1cm4gdHJ1ZTsKICAgICAgICAgYnJlYWs7CisgICAgY2FzZSBDU1NQcm9wZXJ0eVBh Z2VCcmVha0FmdGVyOiAvLyBhdXRvIHwgYWx3YXlzIHwgYXZvaWQgfCBsZWZ0IHwgcmlnaHQgfCBp bmhlcml0CisgICAgY2FzZSBDU1NQcm9wZXJ0eVBhZ2VCcmVha0JlZm9yZToKKyAgICBjYXNlIENT U1Byb3BlcnR5V2Via2l0Q29sdW1uQnJlYWtBZnRlcjoKKyAgICBjYXNlIENTU1Byb3BlcnR5V2Vi a2l0Q29sdW1uQnJlYWtCZWZvcmU6CisgICAgICAgIGlmICh2YWx1ZUlEID09IENTU1ZhbHVlQXV0 byB8fCB2YWx1ZUlEID09IENTU1ZhbHVlQWx3YXlzIHx8IHZhbHVlSUQgPT0gQ1NTVmFsdWVBdm9p ZCB8fCB2YWx1ZUlEID09IENTU1ZhbHVlTGVmdCB8fCB2YWx1ZUlEID09IENTU1ZhbHVlUmlnaHQp CisgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBDU1NQ cm9wZXJ0eVBhZ2VCcmVha0luc2lkZTogLy8gYXZvaWQgfCBhdXRvIHwgaW5oZXJpdAorICAgIGNh c2UgQ1NTUHJvcGVydHlXZWJraXRDb2x1bW5CcmVha0luc2lkZToKKyAgICAgICAgaWYgKHZhbHVl SUQgPT0gQ1NTVmFsdWVBdXRvIHx8IHZhbHVlSUQgPT0gQ1NTVmFsdWVBdm9pZCkKKyAgICAgICAg ICAgIHJldHVybiB0cnVlOworICAgICAgICBicmVhazsKICAgICBjYXNlIENTU1Byb3BlcnR5UG9p bnRlckV2ZW50czoKICAgICAgICAgLy8gbm9uZSB8IHZpc2libGVQYWludGVkIHwgdmlzaWJsZUZp bGwgfCB2aXNpYmxlU3Ryb2tlIHwgdmlzaWJsZSB8CiAgICAgICAgIC8vIHBhaW50ZWQgfCBmaWxs IHwgc3Ryb2tlIHwgYXV0byB8IGFsbCB8IGluaGVyaXQKQEAgLTc0Niw2ICs3NTgsMTkgQEAgc3Rh dGljIGlubGluZSBib29sIGlzVmFsaWRLZXl3b3JkUHJvcGVydHlBbmRWYWx1ZShDU1NQcm9wZXJ0 eUlEIHByb3BlcnR5SWQsIGludAogICAgICAgICBpZiAodmFsdWVJRCA9PSBDU1NWYWx1ZUV4YWN0 IHx8IHZhbHVlSUQgPT0gQ1NTVmFsdWVFY29ub215KQogICAgICAgICAgICAgcmV0dXJuIHRydWU7 CiAgICAgICAgIGJyZWFrOworICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRSZWdpb25CcmVha0Fm dGVyOgorICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRSZWdpb25CcmVha0JlZm9yZToKKyAgICAg ICAgaWYgKHBhcnNlckNvbnRleHQuaXNDU1NSZWdpb25zRW5hYmxlZCAmJiAodmFsdWVJRCA9PSBD U1NWYWx1ZUF1dG8gfHwgdmFsdWVJRCA9PSBDU1NWYWx1ZUFsd2F5cyB8fCB2YWx1ZUlEID09IENT U1ZhbHVlQXZvaWQgfHwgdmFsdWVJRCA9PSBDU1NWYWx1ZUxlZnQgfHwgdmFsdWVJRCA9PSBDU1NW YWx1ZVJpZ2h0KSkKKyAgICAgICAgICAgIHJldHVybiB0cnVlOworICAgICAgICBicmVhazsKKyAg ICBjYXNlIENTU1Byb3BlcnR5V2Via2l0UmVnaW9uQnJlYWtJbnNpZGU6CisgICAgICAgIGlmIChw YXJzZXJDb250ZXh0LmlzQ1NTUmVnaW9uc0VuYWJsZWQgJiYgKHZhbHVlSUQgPT0gQ1NTVmFsdWVB dXRvIHx8IHZhbHVlSUQgPT0gQ1NTVmFsdWVBdm9pZCkpCisgICAgICAgICAgICByZXR1cm4gdHJ1 ZTsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdFJlZ2lvbk92ZXJm bG93OgorICAgICAgICBpZiAocGFyc2VyQ29udGV4dC5pc0NTU1JlZ2lvbnNFbmFibGVkICYmICh2 YWx1ZUlEID09IENTU1ZhbHVlQXV0byB8fCB2YWx1ZUlEID09IENTU1ZhbHVlQnJlYWspKQorICAg ICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgIGJyZWFrOwogICAgIGNhc2UgQ1NTUHJvcGVy dHlXZWJraXRSdGxPcmRlcmluZzoKICAgICAgICAgaWYgKHZhbHVlSUQgPT0gQ1NTVmFsdWVMb2dp Y2FsIHx8IHZhbHVlSUQgPT0gQ1NTVmFsdWVWaXN1YWwpCiAgICAgICAgICAgICByZXR1cm4gdHJ1 ZTsKQEAgLTg0MCw2ICs4NjUsOSBAQCBzdGF0aWMgaW5saW5lIGJvb2wgaXNLZXl3b3JkUHJvcGVy dHlJRChDU1NQcm9wZXJ0eUlEIHByb3BlcnR5SWQpCiAgICAgY2FzZSBDU1NQcm9wZXJ0eU91dGxp bmVTdHlsZToKICAgICBjYXNlIENTU1Byb3BlcnR5T3ZlcmZsb3dYOgogICAgIGNhc2UgQ1NTUHJv cGVydHlPdmVyZmxvd1k6CisgICAgY2FzZSBDU1NQcm9wZXJ0eVBhZ2VCcmVha0FmdGVyOgorICAg IGNhc2UgQ1NTUHJvcGVydHlQYWdlQnJlYWtCZWZvcmU6CisgICAgY2FzZSBDU1NQcm9wZXJ0eVBh Z2VCcmVha0luc2lkZToKICAgICBjYXNlIENTU1Byb3BlcnR5UG9pbnRlckV2ZW50czoKICAgICBj YXNlIENTU1Byb3BlcnR5UG9zaXRpb246CiAgICAgY2FzZSBDU1NQcm9wZXJ0eVJlc2l6ZToKQEAg LTg2OCw2ICs4OTYsNyBAQCBzdGF0aWMgaW5saW5lIGJvb2wgaXNLZXl3b3JkUHJvcGVydHlJRChD U1NQcm9wZXJ0eUlEIHByb3BlcnR5SWQpCiAgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdEJveE9y aWVudDoKICAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0Qm94UGFjazoKICAgICBjYXNlIENTU1By b3BlcnR5V2Via2l0Q29sb3JDb3JyZWN0aW9uOgorICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRD b2x1bW5CcmVha0luc2lkZToKICAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0Q29sdW1uUnVsZVN0 eWxlOgogICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRGbGV4QWxpZ246CiAgICAgY2FzZSBDU1NQ cm9wZXJ0eVdlYmtpdEZsZXhEaXJlY3Rpb246CkBAIC04OTMsNiArOTIyLDEwIEBAIHN0YXRpYyBp bmxpbmUgYm9vbCBpc0tleXdvcmRQcm9wZXJ0eUlEKENTU1Byb3BlcnR5SUQgcHJvcGVydHlJZCkK ICAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0T3ZlcmZsb3dTY3JvbGxpbmc6CiAjZW5kaWYKICAg ICBjYXNlIENTU1Byb3BlcnR5V2Via2l0UHJpbnRDb2xvckFkanVzdDoKKyAgICBjYXNlIENTU1By b3BlcnR5V2Via2l0UmVnaW9uQnJlYWtBZnRlcjoKKyAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0 UmVnaW9uQnJlYWtCZWZvcmU6CisgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdFJlZ2lvbkJyZWFr SW5zaWRlOgorICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRSZWdpb25PdmVyZmxvdzoKICAgICBj YXNlIENTU1Byb3BlcnR5V2Via2l0UnRsT3JkZXJpbmc6CiAgICAgY2FzZSBDU1NQcm9wZXJ0eVdl YmtpdFRleHRDb21iaW5lOgogICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRUZXh0RW1waGFzaXNQ b3NpdGlvbjoKQEAgLTE1MDQsMjcgKzE1MzcsNiBAQCBib29sIENTU1BhcnNlcjo6cGFyc2VWYWx1 ZShDU1NQcm9wZXJ0eUlEIHByb3BJZCwgYm9vbCBpbXBvcnRhbnQpCiAgICAgICAgIH0KICAgICAg ICAgYnJlYWs7CiAKLSAgICBjYXNlIENTU1Byb3BlcnR5UGFnZUJyZWFrQWZ0ZXI6ICAgICAgIC8v IGF1dG8gfCBhbHdheXMgfCBhdm9pZCB8IGxlZnQgfCByaWdodCB8IGluaGVyaXQKLSAgICBjYXNl IENTU1Byb3BlcnR5UGFnZUJyZWFrQmVmb3JlOgotICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRD b2x1bW5CcmVha0FmdGVyOgotICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRDb2x1bW5CcmVha0Jl Zm9yZToKLSAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0UmVnaW9uQnJlYWtBZnRlcjoKLSAgICBj YXNlIENTU1Byb3BlcnR5V2Via2l0UmVnaW9uQnJlYWtCZWZvcmU6Ci0gICAgICAgIGlmIChpZCA9 PSBDU1NWYWx1ZUF1dG8KLSAgICAgICAgICAgIHx8IGlkID09IENTU1ZhbHVlQWx3YXlzCi0gICAg ICAgICAgICB8fCBpZCA9PSBDU1NWYWx1ZUF2b2lkCi0gICAgICAgICAgICB8fCBpZCA9PSBDU1NW YWx1ZUxlZnQKLSAgICAgICAgICAgIHx8IGlkID09IENTU1ZhbHVlUmlnaHQpCi0gICAgICAgICAg ICB2YWxpZFByaW1pdGl2ZSA9ICgocHJvcElkID09IENTU1Byb3BlcnR5V2Via2l0UmVnaW9uQnJl YWtBZnRlcikgfHwgKHByb3BJZCA9PSBDU1NQcm9wZXJ0eVdlYmtpdFJlZ2lvbkJyZWFrQmVmb3Jl KSkgPyBjc3NSZWdpb25zRW5hYmxlZCgpIDogdHJ1ZTsKLSAgICAgICAgYnJlYWs7Ci0KLSAgICBj YXNlIENTU1Byb3BlcnR5UGFnZUJyZWFrSW5zaWRlOiAgICAgLy8gYXZvaWQgfCBhdXRvIHwgaW5o ZXJpdAotICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRDb2x1bW5CcmVha0luc2lkZToKLSAgICBj YXNlIENTU1Byb3BlcnR5V2Via2l0UmVnaW9uQnJlYWtJbnNpZGU6Ci0gICAgICAgIGlmIChpZCA9 PSBDU1NWYWx1ZUF1dG8gfHwgaWQgPT0gQ1NTVmFsdWVBdm9pZCkKLSAgICAgICAgICAgIHZhbGlk UHJpbWl0aXZlID0gKHByb3BJZCA9PSBDU1NQcm9wZXJ0eVdlYmtpdFJlZ2lvbkJyZWFrSW5zaWRl KSA/IGNzc1JlZ2lvbnNFbmFibGVkKCkgOiB0cnVlOwotICAgICAgICBicmVhazsKLQogICAgIGNh c2UgQ1NTUHJvcGVydHlDb250ZW50OiAgICAgICAgICAgICAgLy8gWyA8c3RyaW5nPiB8IDx1cmk+ IHwgPGNvdW50ZXI+IHwgYXR0cihYKSB8IG9wZW4tcXVvdGUgfAogICAgICAgICAvLyBjbG9zZS1x dW90ZSB8IG5vLW9wZW4tcXVvdGUgfCBuby1jbG9zZS1xdW90ZSBdKyB8IGluaGVyaXQKICAgICAg ICAgcmV0dXJuIHBhcnNlQ29udGVudChwcm9wSWQsIGltcG9ydGFudCk7CkBAIC0yMTAxLDEwICsy MTEzLDYgQEAgYm9vbCBDU1NQYXJzZXI6OnBhcnNlVmFsdWUoQ1NTUHJvcGVydHlJRCBwcm9wSWQs IGJvb2wgaW1wb3J0YW50KQogICAgICAgICBpZiAoIWNzc1JlZ2lvbnNFbmFibGVkKCkpCiAgICAg ICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgICAgIHJldHVybiBwYXJzZVJlZ2lvblRocmVhZChw cm9wSWQsIGltcG9ydGFudCk7Ci0gICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdFJlZ2lvbk92ZXJm bG93OgotICAgICAgICBpZiAoY3NzUmVnaW9uc0VuYWJsZWQoKSAmJiAoaWQgPT0gQ1NTVmFsdWVB dXRvIHx8IGlkID09IENTU1ZhbHVlQnJlYWspKQotICAgICAgICAgICAgdmFsaWRQcmltaXRpdmUg PSB0cnVlOwotICAgICAgICBicmVhazsKICAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0VHJhbnNm b3JtOgogICAgICAgICBpZiAoaWQgPT0gQ1NTVmFsdWVOb25lKQogICAgICAgICAgICAgdmFsaWRQ cmltaXRpdmUgPSB0cnVlOwo= 143372 2012-05-22 15:01:37 -0700 2012-05-22 16:58:22 -0700 Patch for landing bug-87169-20120522190117.patch text/plain 6606 menard U3VidmVyc2lvbiBSZXZpc2lvbjogMTE4MDQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGMwNWRkYmNlNGM0NTQz YWNlM2QyMmQyZjlkMDZjMzQ0Yjk1N2JlMi4uNDBhYmQ2MzIwMmQ1YjUyN2I0ODA1MGExMzI0Nzdk YzQzNWY2MDYyMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEyLTA1LTIyICBBbGV4 aXMgTWVuYXJkICA8YWxleGlzLm1lbmFyZEBvcGVuYm9zc2Eub3JnPgorCisgICAgICAgIE1vdmUg c29tZSBDU1MgcmVnaW9ucyBwcm9wZXJ0aWVzIHRvIENTU1BhcnNlcjo6aXNWYWxpZEtleXdvcmRQ cm9wZXJ0eUFuZFZhbHVlLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9ODcxNjkKKworICAgICAgICBSZXZpZXdlZCBieSBUb255IENoYW5nLgorCisgICAg ICAgIE1vdmUgc29tZSBDU1MgcmVnaW9ucyBwcm9wZXJ0aWVzIHRvIHRoZSBmYXN0IHBhdGggaW1w bGVtZW50ZWQgYnkKKyAgICAgICAgQ1NTUGFyc2VyOjppc1ZhbGlkS2V5d29yZFByb3BlcnR5QW5k VmFsdWUuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIDogRXhpc3RpbmcgdGVzdHMgc2hvdWxkIGNv dmVyLgorCisgICAgICAgICogY3NzL0NTU1BhcnNlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpp c1ZhbGlkS2V5d29yZFByb3BlcnR5QW5kVmFsdWUpOgorICAgICAgICAoV2ViQ29yZTo6aXNLZXl3 b3JkUHJvcGVydHlJRCk6CisgICAgICAgIChXZWJDb3JlOjpDU1NQYXJzZXI6OnBhcnNlVmFsdWUp OgorCiAyMDEyLTA1LTIyICBUb255IENoYW5nICA8dG9ueUBjaHJvbWl1bS5vcmc+CiAKICAgICAg ICAgUkVHUkVTU0lPTihyMTE3NjEzKTogRHJvbWFlby9qc2xpYi1zdHlsZS1wcm90b3R5cGUgcmVn cmVzc2VkIGJ5IDIwJQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU1BhcnNlci5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUGFyc2VyLmNwcAppbmRleCAyZmU3MzdhN2VmNTA4 N2U2NGM0NGFkZTY1Mzc5YzBkNGQzZjFiMWUxLi45ZTI4MTJkZGMyZTJhNGRjNzEyYTJjOWY1ODdk ZmZlMDBmMjdkYmRmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUGFyc2VyLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUGFyc2VyLmNwcApAQCAtNTc4LDYgKzU3OCwx OCBAQCBzdGF0aWMgaW5saW5lIGJvb2wgaXNWYWxpZEtleXdvcmRQcm9wZXJ0eUFuZFZhbHVlKENT U1Byb3BlcnR5SUQgcHJvcGVydHlJZCwgaW50CiAgICAgICAgIGlmICh2YWx1ZUlEID09IENTU1Zh bHVlVmlzaWJsZSB8fCB2YWx1ZUlEID09IENTU1ZhbHVlSGlkZGVuIHx8IHZhbHVlSUQgPT0gQ1NT VmFsdWVTY3JvbGwgfHwgdmFsdWVJRCA9PSBDU1NWYWx1ZUF1dG8gfHwgdmFsdWVJRCA9PSBDU1NW YWx1ZU92ZXJsYXkgfHwgdmFsdWVJRCA9PSBDU1NWYWx1ZVdlYmtpdE1hcnF1ZWUpCiAgICAgICAg ICAgICByZXR1cm4gdHJ1ZTsKICAgICAgICAgYnJlYWs7CisgICAgY2FzZSBDU1NQcm9wZXJ0eVBh Z2VCcmVha0FmdGVyOiAvLyBhdXRvIHwgYWx3YXlzIHwgYXZvaWQgfCBsZWZ0IHwgcmlnaHQgfCBp bmhlcml0CisgICAgY2FzZSBDU1NQcm9wZXJ0eVBhZ2VCcmVha0JlZm9yZToKKyAgICBjYXNlIENT U1Byb3BlcnR5V2Via2l0Q29sdW1uQnJlYWtBZnRlcjoKKyAgICBjYXNlIENTU1Byb3BlcnR5V2Vi a2l0Q29sdW1uQnJlYWtCZWZvcmU6CisgICAgICAgIGlmICh2YWx1ZUlEID09IENTU1ZhbHVlQXV0 byB8fCB2YWx1ZUlEID09IENTU1ZhbHVlQWx3YXlzIHx8IHZhbHVlSUQgPT0gQ1NTVmFsdWVBdm9p ZCB8fCB2YWx1ZUlEID09IENTU1ZhbHVlTGVmdCB8fCB2YWx1ZUlEID09IENTU1ZhbHVlUmlnaHQp CisgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBDU1NQ cm9wZXJ0eVBhZ2VCcmVha0luc2lkZTogLy8gYXZvaWQgfCBhdXRvIHwgaW5oZXJpdAorICAgIGNh c2UgQ1NTUHJvcGVydHlXZWJraXRDb2x1bW5CcmVha0luc2lkZToKKyAgICAgICAgaWYgKHZhbHVl SUQgPT0gQ1NTVmFsdWVBdXRvIHx8IHZhbHVlSUQgPT0gQ1NTVmFsdWVBdm9pZCkKKyAgICAgICAg ICAgIHJldHVybiB0cnVlOworICAgICAgICBicmVhazsKICAgICBjYXNlIENTU1Byb3BlcnR5UG9p bnRlckV2ZW50czoKICAgICAgICAgLy8gbm9uZSB8IHZpc2libGVQYWludGVkIHwgdmlzaWJsZUZp bGwgfCB2aXNpYmxlU3Ryb2tlIHwgdmlzaWJsZSB8CiAgICAgICAgIC8vIHBhaW50ZWQgfCBmaWxs IHwgc3Ryb2tlIHwgYXV0byB8IGFsbCB8IGluaGVyaXQKQEAgLTc0Niw2ICs3NTgsMTkgQEAgc3Rh dGljIGlubGluZSBib29sIGlzVmFsaWRLZXl3b3JkUHJvcGVydHlBbmRWYWx1ZShDU1NQcm9wZXJ0 eUlEIHByb3BlcnR5SWQsIGludAogICAgICAgICBpZiAodmFsdWVJRCA9PSBDU1NWYWx1ZUV4YWN0 IHx8IHZhbHVlSUQgPT0gQ1NTVmFsdWVFY29ub215KQogICAgICAgICAgICAgcmV0dXJuIHRydWU7 CiAgICAgICAgIGJyZWFrOworICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRSZWdpb25CcmVha0Fm dGVyOgorICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRSZWdpb25CcmVha0JlZm9yZToKKyAgICAg ICAgaWYgKHBhcnNlckNvbnRleHQuaXNDU1NSZWdpb25zRW5hYmxlZCAmJiAodmFsdWVJRCA9PSBD U1NWYWx1ZUF1dG8gfHwgdmFsdWVJRCA9PSBDU1NWYWx1ZUFsd2F5cyB8fCB2YWx1ZUlEID09IENT U1ZhbHVlQXZvaWQgfHwgdmFsdWVJRCA9PSBDU1NWYWx1ZUxlZnQgfHwgdmFsdWVJRCA9PSBDU1NW YWx1ZVJpZ2h0KSkKKyAgICAgICAgICAgIHJldHVybiB0cnVlOworICAgICAgICBicmVhazsKKyAg ICBjYXNlIENTU1Byb3BlcnR5V2Via2l0UmVnaW9uQnJlYWtJbnNpZGU6CisgICAgICAgIGlmIChw YXJzZXJDb250ZXh0LmlzQ1NTUmVnaW9uc0VuYWJsZWQgJiYgKHZhbHVlSUQgPT0gQ1NTVmFsdWVB dXRvIHx8IHZhbHVlSUQgPT0gQ1NTVmFsdWVBdm9pZCkpCisgICAgICAgICAgICByZXR1cm4gdHJ1 ZTsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdFJlZ2lvbk92ZXJm bG93OgorICAgICAgICBpZiAocGFyc2VyQ29udGV4dC5pc0NTU1JlZ2lvbnNFbmFibGVkICYmICh2 YWx1ZUlEID09IENTU1ZhbHVlQXV0byB8fCB2YWx1ZUlEID09IENTU1ZhbHVlQnJlYWspKQorICAg ICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgIGJyZWFrOwogICAgIGNhc2UgQ1NTUHJvcGVy dHlXZWJraXRSdGxPcmRlcmluZzoKICAgICAgICAgaWYgKHZhbHVlSUQgPT0gQ1NTVmFsdWVMb2dp Y2FsIHx8IHZhbHVlSUQgPT0gQ1NTVmFsdWVWaXN1YWwpCiAgICAgICAgICAgICByZXR1cm4gdHJ1 ZTsKQEAgLTg0MCw2ICs4NjUsOSBAQCBzdGF0aWMgaW5saW5lIGJvb2wgaXNLZXl3b3JkUHJvcGVy dHlJRChDU1NQcm9wZXJ0eUlEIHByb3BlcnR5SWQpCiAgICAgY2FzZSBDU1NQcm9wZXJ0eU91dGxp bmVTdHlsZToKICAgICBjYXNlIENTU1Byb3BlcnR5T3ZlcmZsb3dYOgogICAgIGNhc2UgQ1NTUHJv cGVydHlPdmVyZmxvd1k6CisgICAgY2FzZSBDU1NQcm9wZXJ0eVBhZ2VCcmVha0FmdGVyOgorICAg IGNhc2UgQ1NTUHJvcGVydHlQYWdlQnJlYWtCZWZvcmU6CisgICAgY2FzZSBDU1NQcm9wZXJ0eVBh Z2VCcmVha0luc2lkZToKICAgICBjYXNlIENTU1Byb3BlcnR5UG9pbnRlckV2ZW50czoKICAgICBj YXNlIENTU1Byb3BlcnR5UG9zaXRpb246CiAgICAgY2FzZSBDU1NQcm9wZXJ0eVJlc2l6ZToKQEAg LTg2OCw2ICs4OTYsOSBAQCBzdGF0aWMgaW5saW5lIGJvb2wgaXNLZXl3b3JkUHJvcGVydHlJRChD U1NQcm9wZXJ0eUlEIHByb3BlcnR5SWQpCiAgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdEJveE9y aWVudDoKICAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0Qm94UGFjazoKICAgICBjYXNlIENTU1By b3BlcnR5V2Via2l0Q29sb3JDb3JyZWN0aW9uOgorICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRD b2x1bW5CcmVha0FmdGVyOgorICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRDb2x1bW5CcmVha0Jl Zm9yZToKKyAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0Q29sdW1uQnJlYWtJbnNpZGU6CiAgICAg Y2FzZSBDU1NQcm9wZXJ0eVdlYmtpdENvbHVtblJ1bGVTdHlsZToKICAgICBjYXNlIENTU1Byb3Bl cnR5V2Via2l0RmxleEFsaWduOgogICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRGbGV4RGlyZWN0 aW9uOgpAQCAtODkzLDYgKzkyNCwxMCBAQCBzdGF0aWMgaW5saW5lIGJvb2wgaXNLZXl3b3JkUHJv cGVydHlJRChDU1NQcm9wZXJ0eUlEIHByb3BlcnR5SWQpCiAgICAgY2FzZSBDU1NQcm9wZXJ0eVdl YmtpdE92ZXJmbG93U2Nyb2xsaW5nOgogI2VuZGlmCiAgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtp dFByaW50Q29sb3JBZGp1c3Q6CisgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdFJlZ2lvbkJyZWFr QWZ0ZXI6CisgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdFJlZ2lvbkJyZWFrQmVmb3JlOgorICAg IGNhc2UgQ1NTUHJvcGVydHlXZWJraXRSZWdpb25CcmVha0luc2lkZToKKyAgICBjYXNlIENTU1By b3BlcnR5V2Via2l0UmVnaW9uT3ZlcmZsb3c6CiAgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdFJ0 bE9yZGVyaW5nOgogICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRUZXh0Q29tYmluZToKICAgICBj YXNlIENTU1Byb3BlcnR5V2Via2l0VGV4dEVtcGhhc2lzUG9zaXRpb246CkBAIC0xNTA0LDI3ICsx NTM5LDYgQEAgYm9vbCBDU1NQYXJzZXI6OnBhcnNlVmFsdWUoQ1NTUHJvcGVydHlJRCBwcm9wSWQs IGJvb2wgaW1wb3J0YW50KQogICAgICAgICB9CiAgICAgICAgIGJyZWFrOwogCi0gICAgY2FzZSBD U1NQcm9wZXJ0eVBhZ2VCcmVha0FmdGVyOiAgICAgICAvLyBhdXRvIHwgYWx3YXlzIHwgYXZvaWQg fCBsZWZ0IHwgcmlnaHQgfCBpbmhlcml0Ci0gICAgY2FzZSBDU1NQcm9wZXJ0eVBhZ2VCcmVha0Jl Zm9yZToKLSAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0Q29sdW1uQnJlYWtBZnRlcjoKLSAgICBj YXNlIENTU1Byb3BlcnR5V2Via2l0Q29sdW1uQnJlYWtCZWZvcmU6Ci0gICAgY2FzZSBDU1NQcm9w ZXJ0eVdlYmtpdFJlZ2lvbkJyZWFrQWZ0ZXI6Ci0gICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdFJl Z2lvbkJyZWFrQmVmb3JlOgotICAgICAgICBpZiAoaWQgPT0gQ1NTVmFsdWVBdXRvCi0gICAgICAg ICAgICB8fCBpZCA9PSBDU1NWYWx1ZUFsd2F5cwotICAgICAgICAgICAgfHwgaWQgPT0gQ1NTVmFs dWVBdm9pZAotICAgICAgICAgICAgfHwgaWQgPT0gQ1NTVmFsdWVMZWZ0Ci0gICAgICAgICAgICB8 fCBpZCA9PSBDU1NWYWx1ZVJpZ2h0KQotICAgICAgICAgICAgdmFsaWRQcmltaXRpdmUgPSAoKHBy b3BJZCA9PSBDU1NQcm9wZXJ0eVdlYmtpdFJlZ2lvbkJyZWFrQWZ0ZXIpIHx8IChwcm9wSWQgPT0g Q1NTUHJvcGVydHlXZWJraXRSZWdpb25CcmVha0JlZm9yZSkpID8gY3NzUmVnaW9uc0VuYWJsZWQo KSA6IHRydWU7Ci0gICAgICAgIGJyZWFrOwotCi0gICAgY2FzZSBDU1NQcm9wZXJ0eVBhZ2VCcmVh a0luc2lkZTogICAgIC8vIGF2b2lkIHwgYXV0byB8IGluaGVyaXQKLSAgICBjYXNlIENTU1Byb3Bl cnR5V2Via2l0Q29sdW1uQnJlYWtJbnNpZGU6Ci0gICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdFJl Z2lvbkJyZWFrSW5zaWRlOgotICAgICAgICBpZiAoaWQgPT0gQ1NTVmFsdWVBdXRvIHx8IGlkID09 IENTU1ZhbHVlQXZvaWQpCi0gICAgICAgICAgICB2YWxpZFByaW1pdGl2ZSA9IChwcm9wSWQgPT0g Q1NTUHJvcGVydHlXZWJraXRSZWdpb25CcmVha0luc2lkZSkgPyBjc3NSZWdpb25zRW5hYmxlZCgp IDogdHJ1ZTsKLSAgICAgICAgYnJlYWs7Ci0KICAgICBjYXNlIENTU1Byb3BlcnR5Q29udGVudDog ICAgICAgICAgICAgIC8vIFsgPHN0cmluZz4gfCA8dXJpPiB8IDxjb3VudGVyPiB8IGF0dHIoWCkg fCBvcGVuLXF1b3RlIHwKICAgICAgICAgLy8gY2xvc2UtcXVvdGUgfCBuby1vcGVuLXF1b3RlIHwg bm8tY2xvc2UtcXVvdGUgXSsgfCBpbmhlcml0CiAgICAgICAgIHJldHVybiBwYXJzZUNvbnRlbnQo cHJvcElkLCBpbXBvcnRhbnQpOwpAQCAtMjEwMSwxMCArMjExNSw2IEBAIGJvb2wgQ1NTUGFyc2Vy OjpwYXJzZVZhbHVlKENTU1Byb3BlcnR5SUQgcHJvcElkLCBib29sIGltcG9ydGFudCkKICAgICAg ICAgaWYgKCFjc3NSZWdpb25zRW5hYmxlZCgpKQogICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwog ICAgICAgICByZXR1cm4gcGFyc2VSZWdpb25UaHJlYWQocHJvcElkLCBpbXBvcnRhbnQpOwotICAg IGNhc2UgQ1NTUHJvcGVydHlXZWJraXRSZWdpb25PdmVyZmxvdzoKLSAgICAgICAgaWYgKGNzc1Jl Z2lvbnNFbmFibGVkKCkgJiYgKGlkID09IENTU1ZhbHVlQXV0byB8fCBpZCA9PSBDU1NWYWx1ZUJy ZWFrKSkKLSAgICAgICAgICAgIHZhbGlkUHJpbWl0aXZlID0gdHJ1ZTsKLSAgICAgICAgYnJlYWs7 CiAgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdFRyYW5zZm9ybToKICAgICAgICAgaWYgKGlkID09 IENTU1ZhbHVlTm9uZSkKICAgICAgICAgICAgIHZhbGlkUHJpbWl0aXZlID0gdHJ1ZTsK