114278 2013-04-09 06:24:10 -0700 [Texmap] TextureMapperLayer refactor for readiblity 2013-04-09 07:12:05 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 113732 1 bruno.abinader bruno.abinader cmarcelo commit-queue gtk-ews luiz noam webkit.review.bot xan.lopez oldest_to_newest 871727 0 bruno.abinader 2013-04-09 06:24:10 -0700 TSIA. 871730 1 197067 bruno.abinader 2013-04-09 06:30:01 -0700 Created attachment 197067 Proposed patch 871731 2 197067 gtk-ews 2013-04-09 06:33:36 -0700 Comment on attachment 197067 Proposed patch Attachment 197067 did not pass gtk-ews (gtk): Output: http://webkit-commit-queue.appspot.com/results/17725003 871732 3 197068 bruno.abinader 2013-04-09 06:37:13 -0700 Created attachment 197068 Proposed patch 871809 4 197068 commit-queue 2013-04-09 07:12:02 -0700 Comment on attachment 197068 Proposed patch Clearing flags on attachment: 197068 Committed r148020: <http://trac.webkit.org/changeset/148020> 871810 5 commit-queue 2013-04-09 07:12:05 -0700 All reviewed patches have been landed. Closing bug. 197067 2013-04-09 06:30:01 -0700 2013-04-09 06:37:07 -0700 Proposed patch bug-114278-20130409092943.patch text/plain 11618 bruno.abinader U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ3OTEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDFhYWNmOTAzNGM5MTMw ODc4ZTQ2YjU5NGE3NTRhNTgxYTYxMzFmOC4uZDJjNjE4MzBiOTcxMjMwNTZmMTQ0Y2JkMjFjOTcy NDA1ZmE3NjM2YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDEzLTA0LTA5ICBCcnVu byBkZSBPbGl2ZWlyYSBBYmluYWRlciAgPGJydW5vLmFiaW5hZGVyQGJhc3lza29tLmNvbT4KKwor ICAgICAgICBbVGV4bWFwXSBUZXh0dXJlTWFwcGVyTGF5ZXIgcmVmYWN0b3J5IGZvciByZWFkaWJs aXR5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTQy NzgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW1v dmVzIG5vbi1uZWVkZWQgcmV0dXJuIHZhbHVlcywgZnVuY3Rpb24gcGFyYW1ldGVycyBhbmQgY2hh bmdlcworICAgICAgICBib29sZWFuIHZhbHVlcyB3aXRoIGVudW1zIGZvciByZWFkaWJpbGl0eS4g QWxzbyBhc3N1cmluZyBmbG9hdCB2YWx1ZXMKKyAgICAgICAgd2hlbmV2ZXIgcG9zc2libGUuCisK KyAgICAgICAgTm8gYmVoYXZpb3JhbCBjaGFuZ2VzLCB0aHVzIG5vIHRlc3RzLgorCisgICAgICAg ICogcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJMYXllci5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpUZXh0dXJlTWFwcGVyTGF5ZXI6OmNvbXB1dGVUcmFuc2Zvcm1zUmVjdXJz aXZlKToKKyAgICAgICAgKFdlYkNvcmU6OmJsZW5kV2l0aE9wYWNpdHkpOgorICAgICAgICAoV2Vi Q29yZTo6VGV4dHVyZU1hcHBlckxheWVyOjpwYWludFNlbGYpOgorICAgICAgICAoV2ViQ29yZTo6 VGV4dHVyZU1hcHBlckxheWVyOjpzb3J0QnlaT3JkZXIpOgorICAgICAgICAoV2ViQ29yZTo6VGV4 dHVyZU1hcHBlckxheWVyOjpzaG91bGRCbGVuZCk6CisgICAgICAgIChXZWJDb3JlOjpUZXh0dXJl TWFwcGVyTGF5ZXI6OmlzVmlzaWJsZSk6CisgICAgICAgIChXZWJDb3JlOjpUZXh0dXJlTWFwcGVy TGF5ZXI6OmNvbXB1dGVPdmVybGFwUmVnaW9ucyk6CisgICAgICAgIChXZWJDb3JlOjpUZXh0dXJl TWFwcGVyTGF5ZXI6OnBhaW50VXNpbmdPdmVybGFwUmVnaW9ucyk6CisgICAgICAgIChXZWJDb3Jl Ojpjb21taXRTdXJmYWNlKToKKyAgICAgICAgKFdlYkNvcmU6OlRleHR1cmVNYXBwZXJMYXllcjo6 cGFpbnRXaXRoSW50ZXJtZWRpYXRlU3VyZmFjZSk6CisgICAgICAgIChXZWJDb3JlOjpUZXh0dXJl TWFwcGVyTGF5ZXI6OnBhaW50UmVjdXJzaXZlKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGlj cy90ZXhtYXAvVGV4dHVyZU1hcHBlckxheWVyLmg6CisgICAgICAgIChUZXh0dXJlTWFwcGVyTGF5 ZXIpOgorCiAyMDEzLTA0LTA4ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlh LmNvbT4KIAogICAgICAgICBEcmFnSW1hZ2Ugc2hvdWxkIG5vdCBkZXBlbmQgb24gRnJhbWUgYW5k IENhY2hlZEltYWdlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy90ZXhtYXAvVGV4dHVyZU1hcHBlckxheWVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyTGF5ZXIuY3BwCmluZGV4IDYxZTk3NWY1YTgw YzJiNjc3MWQ1NGIwZmVmZWVmZWVmMzkzNWZkNjkuLjlmNjcwZmE1Mzk0NGZiNmZlMDRhYmQxZDg4 OWEwNDZmYTUyNjM1ZDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyTGF5ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyTGF5ZXIuY3BwCkBAIC03Nyw3ICs3 Nyw3IEBAIHZvaWQgVGV4dHVyZU1hcHBlckxheWVyOjpjb21wdXRlVHJhbnNmb3Jtc1JlY3Vyc2l2 ZSgpCiAKICAgICAvLyBSZW9yZGVyIGNoaWxkcmVuIGlmIG5lZWRlZCBvbiB0aGUgd2F5IGJhY2sg dXAuCiAgICAgaWYgKG1fc3RhdGUucHJlc2VydmVzM0QpCi0gICAgICAgIHNvcnRCeVpPcmRlciht X2NoaWxkcmVuLCAwLCBtX2NoaWxkcmVuLnNpemUoKSk7CisgICAgICAgIHNvcnRCeVpPcmRlciht X2NoaWxkcmVuKTsKIH0KIAogdm9pZCBUZXh0dXJlTWFwcGVyTGF5ZXI6OnBhaW50KCkKQEAgLTk0 LDcgKzk0LDcgQEAgc3RhdGljIENvbG9yIGJsZW5kV2l0aE9wYWNpdHkoY29uc3QgQ29sb3ImIGNv bG9yLCBmbG9hdCBvcGFjaXR5KQogewogICAgIFJHQkEzMiByZ2JhID0gY29sb3IucmdiKCk7CiAg ICAgLy8gU2VlIENvbG9yOjpnZXRSR0JBKCkgdG8ga25vdyBob3cgdG8gZXh0cmFjdCBhbHBoYSBm cm9tIGNvbG9yLgotICAgIGZsb2F0IGFscGhhID0gYWxwaGFDaGFubmVsKHJnYmEpIC8gMjU1LjsK KyAgICBmbG9hdCBhbHBoYSA9IGFscGhhQ2hhbm5lbChyZ2JhKSAvIDI1NS4wZjsKICAgICBmbG9h dCBlZmZlY3RpdmVBbHBoYSA9IGFscGhhICogb3BhY2l0eTsKICAgICByZXR1cm4gQ29sb3IoY29s b3JXaXRoT3ZlcnJpZGVBbHBoYShyZ2JhLCBlZmZlY3RpdmVBbHBoYSkpOwogfQpAQCAtMTEwLDkg KzExMCw4IEBAIHZvaWQgVGV4dHVyZU1hcHBlckxheWVyOjpwYWludFNlbGYoY29uc3QgVGV4dHVy ZU1hcHBlclBhaW50T3B0aW9ucyYgb3B0aW9ucykKICAgICB0cmFuc2Zvcm0ubXVsdGlwbHkob3B0 aW9ucy50cmFuc2Zvcm0pOwogICAgIHRyYW5zZm9ybS5tdWx0aXBseShtX2N1cnJlbnRUcmFuc2Zv cm0uY29tYmluZWQoKSk7CiAKLSAgICBmbG9hdCBvcGFjaXR5ID0gb3B0aW9ucy5vcGFjaXR5Owog ICAgIGlmIChtX3N0YXRlLnNvbGlkQ29sb3IuaXNWYWxpZCgpICYmICFtX3N0YXRlLmNvbnRlbnRz UmVjdC5pc0VtcHR5KCkpIHsKLSAgICAgICAgb3B0aW9ucy50ZXh0dXJlTWFwcGVyLT5kcmF3U29s aWRDb2xvcihtX3N0YXRlLmNvbnRlbnRzUmVjdCwgdHJhbnNmb3JtLCBibGVuZFdpdGhPcGFjaXR5 KG1fc3RhdGUuc29saWRDb2xvciwgb3BhY2l0eSkpOworICAgICAgICBvcHRpb25zLnRleHR1cmVN YXBwZXItPmRyYXdTb2xpZENvbG9yKG1fc3RhdGUuY29udGVudHNSZWN0LCB0cmFuc2Zvcm0sIGJs ZW5kV2l0aE9wYWNpdHkobV9zdGF0ZS5zb2xpZENvbG9yLCBvcHRpb25zLm9wYWNpdHkpKTsKICAg ICAgICAgaWYgKG1fc3RhdGUuc2hvd0RlYnVnQm9yZGVycykKICAgICAgICAgICAgIG9wdGlvbnMu dGV4dHVyZU1hcHBlci0+ZHJhd0JvcmRlcihtX3N0YXRlLmRlYnVnQm9yZGVyQ29sb3IsIG1fc3Rh dGUuZGVidWdCb3JkZXJXaWR0aCwgbGF5ZXJSZWN0KCksIHRyYW5zZm9ybSk7CiAgICAgICAgIHJl dHVybjsKQEAgLTEyMSw3ICsxMjAsNyBAQCB2b2lkIFRleHR1cmVNYXBwZXJMYXllcjo6cGFpbnRT ZWxmKGNvbnN0IFRleHR1cmVNYXBwZXJQYWludE9wdGlvbnMmIG9wdGlvbnMpCiAgICAgaWYgKG1f YmFja2luZ1N0b3JlKSB7CiAgICAgICAgIEFTU0VSVChtX3N0YXRlLmRyYXdzQ29udGVudCAmJiBt X3N0YXRlLmNvbnRlbnRzVmlzaWJsZSAmJiAhbV9zdGF0ZS5zaXplLmlzRW1wdHkoKSk7CiAgICAg ICAgIEFTU0VSVCghbGF5ZXJSZWN0KCkuaXNFbXB0eSgpKTsKLSAgICAgICAgbV9iYWNraW5nU3Rv cmUtPnBhaW50VG9UZXh0dXJlTWFwcGVyKG9wdGlvbnMudGV4dHVyZU1hcHBlciwgbGF5ZXJSZWN0 KCksIHRyYW5zZm9ybSwgb3BhY2l0eSk7CisgICAgICAgIG1fYmFja2luZ1N0b3JlLT5wYWludFRv VGV4dHVyZU1hcHBlcihvcHRpb25zLnRleHR1cmVNYXBwZXIsIGxheWVyUmVjdCgpLCB0cmFuc2Zv cm0sIG9wdGlvbnMub3BhY2l0eSk7CiAgICAgICAgIGlmIChtX3N0YXRlLnNob3dEZWJ1Z0JvcmRl cnMpCiAgICAgICAgICAgICBtX2JhY2tpbmdTdG9yZS0+ZHJhd0JvcmRlcihvcHRpb25zLnRleHR1 cmVNYXBwZXIsIG1fc3RhdGUuZGVidWdCb3JkZXJDb2xvciwgbV9zdGF0ZS5kZWJ1Z0JvcmRlcldp ZHRoLCBsYXllclJlY3QoKSwgdHJhbnNmb3JtKTsKICAgICAgICAgLy8gT25seSBkcmF3IHJlcGFp bnQgY291bnQgZm9yIHRoZSBtYWluIGJhY2tpbmcgc3RvcmUuCkBAIC0xMzEsNyArMTMwLDcgQEAg dm9pZCBUZXh0dXJlTWFwcGVyTGF5ZXI6OnBhaW50U2VsZihjb25zdCBUZXh0dXJlTWFwcGVyUGFp bnRPcHRpb25zJiBvcHRpb25zKQogCiAgICAgaWYgKG1fY29udGVudHNMYXllcikgewogICAgICAg ICBBU1NFUlQoIWxheWVyUmVjdCgpLmlzRW1wdHkoKSk7Ci0gICAgICAgIG1fY29udGVudHNMYXll ci0+cGFpbnRUb1RleHR1cmVNYXBwZXIob3B0aW9ucy50ZXh0dXJlTWFwcGVyLCBtX3N0YXRlLmNv bnRlbnRzUmVjdCwgdHJhbnNmb3JtLCBvcGFjaXR5KTsKKyAgICAgICAgbV9jb250ZW50c0xheWVy LT5wYWludFRvVGV4dHVyZU1hcHBlcihvcHRpb25zLnRleHR1cmVNYXBwZXIsIG1fc3RhdGUuY29u dGVudHNSZWN0LCB0cmFuc2Zvcm0sIG9wdGlvbnMub3BhY2l0eSk7CiAgICAgICAgIGlmIChtX3N0 YXRlLnNob3dEZWJ1Z0JvcmRlcnMpCiAgICAgICAgICAgICBtX2NvbnRlbnRzTGF5ZXItPmRyYXdC b3JkZXIob3B0aW9ucy50ZXh0dXJlTWFwcGVyLCBtX3N0YXRlLmRlYnVnQm9yZGVyQ29sb3IsIG1f c3RhdGUuZGVidWdCb3JkZXJXaWR0aCwgbV9zdGF0ZS5jb250ZW50c1JlY3QsIHRyYW5zZm9ybSk7 CiAgICAgfQpAQCAtMTQ0LDcgKzE0Myw3IEBAIGludCBUZXh0dXJlTWFwcGVyTGF5ZXI6OmNvbXBh cmVHcmFwaGljc0xheWVyc1pWYWx1ZShjb25zdCB2b2lkKiBhLCBjb25zdCB2b2lkKiBiCiAgICAg cmV0dXJuIGludCgoKCpsYXllckEpLT5tX2NlbnRlclogLSAoKmxheWVyQiktPm1fY2VudGVyWikg KiAxMDAwKTsKIH0KIAotdm9pZCBUZXh0dXJlTWFwcGVyTGF5ZXI6OnNvcnRCeVpPcmRlcihWZWN0 b3I8VGV4dHVyZU1hcHBlckxheWVyKiA+JiBhcnJheSwgaW50IC8qIGZpcnN0ICovLCBpbnQgLyog bGFzdCAqLykKK3ZvaWQgVGV4dHVyZU1hcHBlckxheWVyOjpzb3J0QnlaT3JkZXIoVmVjdG9yPFRl eHR1cmVNYXBwZXJMYXllciogPiYgYXJyYXkpCiB7CiAgICAgcXNvcnQoYXJyYXkuZGF0YSgpLCBh cnJheS5zaXplKCksIHNpemVvZihUZXh0dXJlTWFwcGVyTGF5ZXIqKSwgY29tcGFyZUdyYXBoaWNz TGF5ZXJzWlZhbHVlKTsKIH0KQEAgLTE3Niw3ICsxNzUsNyBAQCBib29sIFRleHR1cmVNYXBwZXJM YXllcjo6c2hvdWxkQmxlbmQoKSBjb25zdAogICAgIGlmIChtX2N1cnJlbnRGaWx0ZXJzLnNpemUo KSkKICAgICAgICAgcmV0dXJuIHRydWU7CiAjZW5kaWYKLSAgICByZXR1cm4gbV9jdXJyZW50T3Bh Y2l0eSA8IDEgfHwgbV9zdGF0ZS5tYXNrTGF5ZXIgfHwgKG1fc3RhdGUucmVwbGljYUxheWVyICYm IG1fc3RhdGUucmVwbGljYUxheWVyLT5tX3N0YXRlLm1hc2tMYXllcik7CisgICAgcmV0dXJuIG1f Y3VycmVudE9wYWNpdHkgPCAxLjBmIHx8IG1fc3RhdGUubWFza0xheWVyIHx8IChtX3N0YXRlLnJl cGxpY2FMYXllciAmJiBtX3N0YXRlLnJlcGxpY2FMYXllci0+bV9zdGF0ZS5tYXNrTGF5ZXIpOwog fQogCiBib29sIFRleHR1cmVNYXBwZXJMYXllcjo6aXNWaXNpYmxlKCkgY29uc3QKQEAgLTE4Nyw3 ICsxODYsNyBAQCBib29sIFRleHR1cmVNYXBwZXJMYXllcjo6aXNWaXNpYmxlKCkgY29uc3QKICAg ICAgICAgcmV0dXJuIGZhbHNlOwogICAgIGlmICghbV9zdGF0ZS5jb250ZW50c1Zpc2libGUgJiYg bV9jaGlsZHJlbi5pc0VtcHR5KCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICBpZiAobV9j dXJyZW50T3BhY2l0eSA8IDAuMDEpCisgICAgaWYgKG1fY3VycmVudE9wYWNpdHkgPCAwLjAxZikK ICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIHJldHVybiB0cnVlOwogfQpAQCAtMjYyLDcgKzI2 MSw3IEBAIHN0YXRpYyB2b2lkIHJlc29sdmVPdmVybGFwcyhSZWdpb24gbmV3UmVnaW9uLCBSZWdp b24mIG92ZXJsYXBSZWdpb24sIFJlZ2lvbiYgbm9uCiAgICAgbm9uT3ZlcmxhcFJlZ2lvbi51bml0 ZShuZXdSZWdpb24pOwogfQogCi12b2lkIFRleHR1cmVNYXBwZXJMYXllcjo6Y29tcHV0ZU92ZXJs YXBSZWdpb25zKFJlZ2lvbiYgb3ZlcmxhcFJlZ2lvbiwgUmVnaW9uJiBub25PdmVybGFwUmVnaW9u LCBib29sIGFsd2F5c1Jlc29sdmVTZWxmT3ZlcmxhcCkKK3ZvaWQgVGV4dHVyZU1hcHBlckxheWVy Ojpjb21wdXRlT3ZlcmxhcFJlZ2lvbnMoUmVnaW9uJiBvdmVybGFwUmVnaW9uLCBSZWdpb24mIG5v bk92ZXJsYXBSZWdpb24sIFJlc29sdmVTZWxmT3ZlcmxhcE1vZGUgbW9kZSkKIHsKICAgICBpZiAo IW1fc3RhdGUudmlzaWJsZSB8fCAhbV9zdGF0ZS5jb250ZW50c1Zpc2libGUpCiAgICAgICAgIHJl dHVybjsKQEAgLTMwNSw4ICszMDQsNyBAQCB2b2lkIFRleHR1cmVNYXBwZXJMYXllcjo6Y29tcHV0 ZU92ZXJsYXBSZWdpb25zKFJlZ2lvbiYgb3ZlcmxhcFJlZ2lvbiwgUmVnaW9uJiBubwogICAgIGlm ICghbV9zdGF0ZS5tYXNrc1RvQm91bmRzKSB7CiAgICAgICAgIGZvciAoc2l6ZV90IGkgPSAwOyBp IDwgbV9jaGlsZHJlbi5zaXplKCk7ICsraSkgewogICAgICAgICAgICAgVGV4dHVyZU1hcHBlckxh eWVyKiBjaGlsZCA9IG1fY2hpbGRyZW5baV07Ci0gICAgICAgICAgICBib29sIGFsd2F5c1Jlc29s dmVTZWxmT3ZlcmxhcEZvckNoaWxkcmVuID0gZmFsc2U7Ci0gICAgICAgICAgICBjaGlsZC0+Y29t cHV0ZU92ZXJsYXBSZWdpb25zKG5ld092ZXJsYXBSZWdpb24sIG5ld05vbk92ZXJsYXBSZWdpb24s IGFsd2F5c1Jlc29sdmVTZWxmT3ZlcmxhcEZvckNoaWxkcmVuKTsKKyAgICAgICAgICAgIGNoaWxk LT5jb21wdXRlT3ZlcmxhcFJlZ2lvbnMobmV3T3ZlcmxhcFJlZ2lvbiwgbmV3Tm9uT3ZlcmxhcFJl Z2lvbiwgUmVzb2x2ZVNlbGZPdmVybGFwSWZOZWVkZWQpOwogICAgICAgICB9CiAgICAgfQogCkBA IC0zMTYsNyArMzE0LDcgQEAgdm9pZCBUZXh0dXJlTWFwcGVyTGF5ZXI6OmNvbXB1dGVPdmVybGFw UmVnaW9ucyhSZWdpb24mIG92ZXJsYXBSZWdpb24sIFJlZ2lvbiYgbm8KICAgICAgICAgcmVzb2x2 ZU92ZXJsYXBzKHJlcGxpY2FSZWdpb24sIG5ld092ZXJsYXBSZWdpb24sIG5ld05vbk92ZXJsYXBS ZWdpb24pOwogICAgIH0KIAotICAgIGlmICghYWx3YXlzUmVzb2x2ZVNlbGZPdmVybGFwICYmIHNo b3VsZEJsZW5kKCkpIHsKKyAgICBpZiAoKG1vZGUgIT0gUmVzb2x2ZVNlbGZPdmVybGFwQWx3YXlz KSAmJiBzaG91bGRCbGVuZCgpKSB7CiAgICAgICAgIG5ld05vbk92ZXJsYXBSZWdpb24udW5pdGUo bmV3T3ZlcmxhcFJlZ2lvbik7CiAgICAgICAgIG5ld092ZXJsYXBSZWdpb24gPSBSZWdpb24oKTsK ICAgICB9CkBAIC0zMjksNyArMzI3LDcgQEAgdm9pZCBUZXh0dXJlTWFwcGVyTGF5ZXI6OnBhaW50 VXNpbmdPdmVybGFwUmVnaW9ucyhjb25zdCBUZXh0dXJlTWFwcGVyUGFpbnRPcHRpb24KIHsKICAg ICBSZWdpb24gb3ZlcmxhcFJlZ2lvbjsKICAgICBSZWdpb24gbm9uT3ZlcmxhcFJlZ2lvbjsKLSAg ICBjb21wdXRlT3ZlcmxhcFJlZ2lvbnMob3ZlcmxhcFJlZ2lvbiwgbm9uT3ZlcmxhcFJlZ2lvbik7 CisgICAgY29tcHV0ZU92ZXJsYXBSZWdpb25zKG92ZXJsYXBSZWdpb24sIG5vbk92ZXJsYXBSZWdp b24sIFJlc29sdmVTZWxmT3ZlcmxhcEFsd2F5cyk7CiAgICAgaWYgKG92ZXJsYXBSZWdpb24uaXNF bXB0eSgpKSB7CiAgICAgICAgIHBhaW50U2VsZkFuZENoaWxkcmVuV2l0aFJlcGxpY2Eob3B0aW9u cyk7CiAgICAgICAgIHJldHVybjsKQEAgLTM0NCw4ICszNDIsOSBAQCB2b2lkIFRleHR1cmVNYXBw ZXJMYXllcjo6cGFpbnRVc2luZ092ZXJsYXBSZWdpb25zKGNvbnN0IFRleHR1cmVNYXBwZXJQYWlu dE9wdGlvbgogCiAgICAgcmVjdHMgPSBvdmVybGFwUmVnaW9uLnJlY3RzKCk7CiAgICAgSW50U2l6 ZSBtYXhUZXh0dXJlU2l6ZSA9IG9wdGlvbnMudGV4dHVyZU1hcHBlci0+bWF4VGV4dHVyZVNpemUo KTsKKyAgICBJbnRSZWN0IHJlY3Q7CiAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCByZWN0cy5z aXplKCk7ICsraSkgewotICAgICAgICBJbnRSZWN0IHJlY3QgPSByZWN0c1tpXTsKKyAgICAgICAg cmVjdCA9IHJlY3RzW2ldOwogICAgICAgICBmb3IgKGludCB4ID0gcmVjdC54KCk7IHggPCByZWN0 Lm1heFgoKTsgeCArPSBtYXhUZXh0dXJlU2l6ZS53aWR0aCgpKSB7CiAgICAgICAgICAgICBmb3Ig KGludCB5ID0gcmVjdC55KCk7IHkgPCByZWN0Lm1heFkoKTsgeSArPSBtYXhUZXh0dXJlU2l6ZS5o ZWlnaHQoKSkgewogICAgICAgICAgICAgICAgIEludFJlY3QgdGlsZVJlY3QoSW50UG9pbnQoeCwg eSksIG1heFRleHR1cmVTaXplKTsKQEAgLTM3OCwxNCArMzc3LDEzIEBAIFBhc3NSZWZQdHI8Qml0 bWFwVGV4dHVyZT4gVGV4dHVyZU1hcHBlckxheWVyOjpwYWludEludG9TdXJmYWNlKGNvbnN0IFRl eHR1cmVNYXBwCiAgICAgcmV0dXJuIHN1cmZhY2U7CiB9CiAKLXN0YXRpYyBQYXNzUmVmUHRyPEJp dG1hcFRleHR1cmU+IGNvbW1pdFN1cmZhY2UoY29uc3QgVGV4dHVyZU1hcHBlclBhaW50T3B0aW9u cyYgb3B0aW9ucywgUGFzc1JlZlB0cjxCaXRtYXBUZXh0dXJlPiBzdXJmYWNlLCBjb25zdCBJbnRS ZWN0JiByZWN0LCBmbG9hdCBvcGFjaXR5KQorc3RhdGljIHZvaWQgY29tbWl0U3VyZmFjZShjb25z dCBUZXh0dXJlTWFwcGVyUGFpbnRPcHRpb25zJiBvcHRpb25zLCBQYXNzUmVmUHRyPEJpdG1hcFRl eHR1cmU+IHN1cmZhY2UsIGNvbnN0IEludFJlY3QmIHJlY3QsIGZsb2F0IG9wYWNpdHkpCiB7CiAg ICAgb3B0aW9ucy50ZXh0dXJlTWFwcGVyLT5iaW5kU3VyZmFjZShvcHRpb25zLnN1cmZhY2UuZ2V0 KCkpOwogICAgIFRyYW5zZm9ybWF0aW9uTWF0cml4IHRhcmdldFRyYW5zZm9ybTsKICAgICB0YXJn ZXRUcmFuc2Zvcm0udHJhbnNsYXRlKG9wdGlvbnMub2Zmc2V0LndpZHRoKCksIG9wdGlvbnMub2Zm c2V0LmhlaWdodCgpKTsKICAgICB0YXJnZXRUcmFuc2Zvcm0ubXVsdGlwbHkob3B0aW9ucy50cmFu c2Zvcm0pOwogICAgIG9wdGlvbnMudGV4dHVyZU1hcHBlci0+ZHJhd1RleHR1cmUoKnN1cmZhY2Uu Z2V0KCksIHJlY3QsIHRhcmdldFRyYW5zZm9ybSwgb3BhY2l0eSk7Ci0gICAgcmV0dXJuIDA7CiB9 CiAKIHZvaWQgVGV4dHVyZU1hcHBlckxheWVyOjpwYWludFdpdGhJbnRlcm1lZGlhdGVTdXJmYWNl KGNvbnN0IFRleHR1cmVNYXBwZXJQYWludE9wdGlvbnMmIG9wdGlvbnMsIGNvbnN0IEludFJlY3Qm IHJlY3QpCkBAIC00MDQsOCArNDAyLDEwIEBAIHZvaWQgVGV4dHVyZU1hcHBlckxheWVyOjpwYWlu dFdpdGhJbnRlcm1lZGlhdGVTdXJmYWNlKGNvbnN0IFRleHR1cmVNYXBwZXJQYWludE9wCiAgICAg ICAgICAgICBtX3N0YXRlLnJlcGxpY2FMYXllci0+bV9zdGF0ZS5tYXNrTGF5ZXItPmFwcGx5TWFz ayhwYWludE9wdGlvbnMpOwogICAgIH0KIAotICAgIGlmIChyZXBsaWNhU3VyZmFjZSAmJiBvcHRp b25zLm9wYWNpdHkgPT0gMSkKLSAgICAgICAgcmVwbGljYVN1cmZhY2UgPSBjb21taXRTdXJmYWNl KG9wdGlvbnMsIHJlcGxpY2FTdXJmYWNlLCByZWN0LCAxKTsKKyAgICBpZiAocmVwbGljYVN1cmZh Y2UgJiYgb3B0aW9ucy5vcGFjaXR5ID09IDEpIHsKKyAgICAgICAgY29tbWl0U3VyZmFjZShvcHRp b25zLCByZXBsaWNhU3VyZmFjZSwgcmVjdCwgMSk7CisgICAgICAgIHJlcGxpY2FTdXJmYWNlLmNs ZWFyKCk7CisgICAgfQogCiAgICAgbWFpblN1cmZhY2UgPSBwYWludEludG9TdXJmYWNlKHBhaW50 T3B0aW9ucywgcmVjdC5zaXplKCkpOwogICAgIGlmIChyZXBsaWNhU3VyZmFjZSkgewpAQCAtNDIz LDcgKzQyMyw3IEBAIHZvaWQgVGV4dHVyZU1hcHBlckxheWVyOjpwYWludFJlY3Vyc2l2ZShjb25z dCBUZXh0dXJlTWFwcGVyUGFpbnRPcHRpb25zJiBvcHRpb25zCiAgICAgICAgIHJldHVybjsKIAog ICAgIFRleHR1cmVNYXBwZXJQYWludE9wdGlvbnMgcGFpbnRPcHRpb25zKG9wdGlvbnMpOwotICAg IHBhaW50T3B0aW9ucy5vcGFjaXR5ID0gb3B0aW9ucy5vcGFjaXR5ICogbV9jdXJyZW50T3BhY2l0 eTsKKyAgICBwYWludE9wdGlvbnMub3BhY2l0eSAqPSBtX2N1cnJlbnRPcGFjaXR5OwogCiAgICAg aWYgKCFzaG91bGRCbGVuZCgpKSB7CiAgICAgICAgIHBhaW50U2VsZkFuZENoaWxkcmVuV2l0aFJl cGxpY2EocGFpbnRPcHRpb25zKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyTGF5ZXIuaCBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyTGF5ZXIuaAppbmRleCAxZDNjNjc4 MTE3YjZiOTE3MWFiZmJmNTIxNTJjNTRkZTI4MGMxMzlkLi5lZTc2ZDFhODIyYTEzNjYwNTBmYWIz N2E1YTc5MjhmMjgwNWVkYmFmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlckxheWVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJMYXllci5oCkBAIC0xMjYsNyAr MTI2LDcgQEAgcHJpdmF0ZToKICAgICB2b2lkIGNvbXB1dGVUcmFuc2Zvcm1zUmVjdXJzaXZlKCk7 CiAKICAgICBzdGF0aWMgaW50IGNvbXBhcmVHcmFwaGljc0xheWVyc1pWYWx1ZShjb25zdCB2b2lk KiBhLCBjb25zdCB2b2lkKiBiKTsKLSAgICBzdGF0aWMgdm9pZCBzb3J0QnlaT3JkZXIoVmVjdG9y PFRleHR1cmVNYXBwZXJMYXllciogPiYgYXJyYXksIGludCBmaXJzdCwgaW50IGxhc3QpOworICAg IHN0YXRpYyB2b2lkIHNvcnRCeVpPcmRlcihWZWN0b3I8VGV4dHVyZU1hcHBlckxheWVyKiA+JiBh cnJheSk7CiAKICAgICBQYXNzUmVmUHRyPEJpdG1hcFRleHR1cmU+IHRleHR1cmUoKSB7IHJldHVy biBtX2JhY2tpbmdTdG9yZSA/IG1fYmFja2luZ1N0b3JlLT50ZXh0dXJlKCkgOiAwOyB9CiAgICAg RmxvYXRQb2ludCBhZGp1c3RlZFBvc2l0aW9uKCkgY29uc3QgeyByZXR1cm4gbV9zdGF0ZS5wb3Mg KyBtX3Njcm9sbFBvc2l0aW9uRGVsdGEgLSBtX3VzZXJTY3JvbGxPZmZzZXQ7IH0KQEAgLTEzNiw3 ICsxMzYsMTEgQEAgcHJpdmF0ZToKICAgICB2b2lkIHJlbW92ZUZyb21QYXJlbnQoKTsKICAgICB2 b2lkIHJlbW92ZUFsbENoaWxkcmVuKCk7CiAKLSAgICB2b2lkIGNvbXB1dGVPdmVybGFwUmVnaW9u cyhSZWdpb24mIG92ZXJsYXBSZWdpb24sIFJlZ2lvbiYgbm9uT3ZlcmxhcFJlZ2lvbiwgYm9vbCBh bHdheXNSZXNvbHZlU2VsZk92ZXJsYXAgPSB0cnVlKTsKKyAgICBlbnVtIFJlc29sdmVTZWxmT3Zl cmxhcE1vZGUgeworICAgICAgICBSZXNvbHZlU2VsZk92ZXJsYXBBbHdheXMgPSAwLAorICAgICAg ICBSZXNvbHZlU2VsZk92ZXJsYXBJZk5lZWRlZAorICAgIH07CisgICAgdm9pZCBjb21wdXRlT3Zl cmxhcFJlZ2lvbnMoUmVnaW9uJiBvdmVybGFwUmVnaW9uLCBSZWdpb24mIG5vbk92ZXJsYXBSZWdp b24sIFJlc29sdmVTZWxmT3ZlcmxhcE1vZGUpOwogCiAgICAgdm9pZCBwYWludFJlY3Vyc2l2ZShj b25zdCBUZXh0dXJlTWFwcGVyUGFpbnRPcHRpb25zJik7CiAgICAgdm9pZCBwYWludFVzaW5nT3Zl cmxhcFJlZ2lvbnMoY29uc3QgVGV4dHVyZU1hcHBlclBhaW50T3B0aW9ucyYpOwo= 197068 2013-04-09 06:37:13 -0700 2013-04-09 07:12:02 -0700 Proposed patch bug-114278-20130409093655.patch text/plain 10315 bruno.abinader U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ3OTEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDFhYWNmOTAzNGM5MTMw ODc4ZTQ2YjU5NGE3NTRhNTgxYTYxMzFmOC4uOWZiMjRhNDA3NjAxMjNmMjM5MjAxMGZhMzIxNmRl ZGUwMzZhOTE5YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDEzLTA0LTA5ICBCcnVu byBkZSBPbGl2ZWlyYSBBYmluYWRlciAgPGJydW5vLmFiaW5hZGVyQGJhc3lza29tLmNvbT4KKwor ICAgICAgICBbVGV4bWFwXSBUZXh0dXJlTWFwcGVyTGF5ZXIgcmVmYWN0b3IgZm9yIHJlYWRpYmxp dHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExNDI3 OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlbW92 ZXMgbm9uLW5lZWRlZCByZXR1cm4gdmFsdWVzLCBmdW5jdGlvbiBwYXJhbWV0ZXJzIGFuZCBjaGFu Z2VzCisgICAgICAgIGJvb2xlYW4gdmFsdWVzIHdpdGggZW51bXMgZm9yIHJlYWRpYmlsaXR5Lgor CisgICAgICAgIE5vIGJlaGF2aW9yYWwgY2hhbmdlcywgdGh1cyBubyB0ZXN0cy4KKworICAgICAg ICAqIHBsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyTGF5ZXIuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6VGV4dHVyZU1hcHBlckxheWVyOjpjb21wdXRlVHJhbnNmb3Jtc1JlY3Vy c2l2ZSk6CisgICAgICAgIChXZWJDb3JlOjpUZXh0dXJlTWFwcGVyTGF5ZXI6OnBhaW50U2VsZik6 CisgICAgICAgIChXZWJDb3JlOjpUZXh0dXJlTWFwcGVyTGF5ZXI6OnNvcnRCeVpPcmRlcik6Cisg ICAgICAgIChXZWJDb3JlOjpUZXh0dXJlTWFwcGVyTGF5ZXI6OmNvbXB1dGVPdmVybGFwUmVnaW9u cyk6CisgICAgICAgIChXZWJDb3JlOjpUZXh0dXJlTWFwcGVyTGF5ZXI6OnBhaW50VXNpbmdPdmVy bGFwUmVnaW9ucyk6CisgICAgICAgIChXZWJDb3JlOjpjb21taXRTdXJmYWNlKToKKyAgICAgICAg KFdlYkNvcmU6OlRleHR1cmVNYXBwZXJMYXllcjo6cGFpbnRXaXRoSW50ZXJtZWRpYXRlU3VyZmFj ZSk6CisgICAgICAgIChXZWJDb3JlOjpUZXh0dXJlTWFwcGVyTGF5ZXI6OnBhaW50UmVjdXJzaXZl KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlckxheWVy Lmg6CisgICAgICAgIChUZXh0dXJlTWFwcGVyTGF5ZXIpOgorCiAyMDEzLTA0LTA4ICBDYXJsb3Mg R2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBEcmFnSW1hZ2Ug c2hvdWxkIG5vdCBkZXBlbmQgb24gRnJhbWUgYW5kIENhY2hlZEltYWdlCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlckxheWVy LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFw cGVyTGF5ZXIuY3BwCmluZGV4IDYxZTk3NWY1YTgwYzJiNjc3MWQ1NGIwZmVmZWVmZWVmMzkzNWZk NjkuLmM2ZTU5MzY1NGUxODdjMzkwMDhiNjQwYzkxY2RkNjhjYmE4NDk4ZDkgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyTGF5 ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0 dXJlTWFwcGVyTGF5ZXIuY3BwCkBAIC03Nyw3ICs3Nyw3IEBAIHZvaWQgVGV4dHVyZU1hcHBlckxh eWVyOjpjb21wdXRlVHJhbnNmb3Jtc1JlY3Vyc2l2ZSgpCiAKICAgICAvLyBSZW9yZGVyIGNoaWxk cmVuIGlmIG5lZWRlZCBvbiB0aGUgd2F5IGJhY2sgdXAuCiAgICAgaWYgKG1fc3RhdGUucHJlc2Vy dmVzM0QpCi0gICAgICAgIHNvcnRCeVpPcmRlcihtX2NoaWxkcmVuLCAwLCBtX2NoaWxkcmVuLnNp emUoKSk7CisgICAgICAgIHNvcnRCeVpPcmRlcihtX2NoaWxkcmVuKTsKIH0KIAogdm9pZCBUZXh0 dXJlTWFwcGVyTGF5ZXI6OnBhaW50KCkKQEAgLTExMCw5ICsxMTAsOCBAQCB2b2lkIFRleHR1cmVN YXBwZXJMYXllcjo6cGFpbnRTZWxmKGNvbnN0IFRleHR1cmVNYXBwZXJQYWludE9wdGlvbnMmIG9w dGlvbnMpCiAgICAgdHJhbnNmb3JtLm11bHRpcGx5KG9wdGlvbnMudHJhbnNmb3JtKTsKICAgICB0 cmFuc2Zvcm0ubXVsdGlwbHkobV9jdXJyZW50VHJhbnNmb3JtLmNvbWJpbmVkKCkpOwogCi0gICAg ZmxvYXQgb3BhY2l0eSA9IG9wdGlvbnMub3BhY2l0eTsKICAgICBpZiAobV9zdGF0ZS5zb2xpZENv bG9yLmlzVmFsaWQoKSAmJiAhbV9zdGF0ZS5jb250ZW50c1JlY3QuaXNFbXB0eSgpKSB7Ci0gICAg ICAgIG9wdGlvbnMudGV4dHVyZU1hcHBlci0+ZHJhd1NvbGlkQ29sb3IobV9zdGF0ZS5jb250ZW50 c1JlY3QsIHRyYW5zZm9ybSwgYmxlbmRXaXRoT3BhY2l0eShtX3N0YXRlLnNvbGlkQ29sb3IsIG9w YWNpdHkpKTsKKyAgICAgICAgb3B0aW9ucy50ZXh0dXJlTWFwcGVyLT5kcmF3U29saWRDb2xvciht X3N0YXRlLmNvbnRlbnRzUmVjdCwgdHJhbnNmb3JtLCBibGVuZFdpdGhPcGFjaXR5KG1fc3RhdGUu c29saWRDb2xvciwgb3B0aW9ucy5vcGFjaXR5KSk7CiAgICAgICAgIGlmIChtX3N0YXRlLnNob3dE ZWJ1Z0JvcmRlcnMpCiAgICAgICAgICAgICBvcHRpb25zLnRleHR1cmVNYXBwZXItPmRyYXdCb3Jk ZXIobV9zdGF0ZS5kZWJ1Z0JvcmRlckNvbG9yLCBtX3N0YXRlLmRlYnVnQm9yZGVyV2lkdGgsIGxh eWVyUmVjdCgpLCB0cmFuc2Zvcm0pOwogICAgICAgICByZXR1cm47CkBAIC0xMjEsNyArMTIwLDcg QEAgdm9pZCBUZXh0dXJlTWFwcGVyTGF5ZXI6OnBhaW50U2VsZihjb25zdCBUZXh0dXJlTWFwcGVy UGFpbnRPcHRpb25zJiBvcHRpb25zKQogICAgIGlmIChtX2JhY2tpbmdTdG9yZSkgewogICAgICAg ICBBU1NFUlQobV9zdGF0ZS5kcmF3c0NvbnRlbnQgJiYgbV9zdGF0ZS5jb250ZW50c1Zpc2libGUg JiYgIW1fc3RhdGUuc2l6ZS5pc0VtcHR5KCkpOwogICAgICAgICBBU1NFUlQoIWxheWVyUmVjdCgp LmlzRW1wdHkoKSk7Ci0gICAgICAgIG1fYmFja2luZ1N0b3JlLT5wYWludFRvVGV4dHVyZU1hcHBl cihvcHRpb25zLnRleHR1cmVNYXBwZXIsIGxheWVyUmVjdCgpLCB0cmFuc2Zvcm0sIG9wYWNpdHkp OworICAgICAgICBtX2JhY2tpbmdTdG9yZS0+cGFpbnRUb1RleHR1cmVNYXBwZXIob3B0aW9ucy50 ZXh0dXJlTWFwcGVyLCBsYXllclJlY3QoKSwgdHJhbnNmb3JtLCBvcHRpb25zLm9wYWNpdHkpOwog ICAgICAgICBpZiAobV9zdGF0ZS5zaG93RGVidWdCb3JkZXJzKQogICAgICAgICAgICAgbV9iYWNr aW5nU3RvcmUtPmRyYXdCb3JkZXIob3B0aW9ucy50ZXh0dXJlTWFwcGVyLCBtX3N0YXRlLmRlYnVn Qm9yZGVyQ29sb3IsIG1fc3RhdGUuZGVidWdCb3JkZXJXaWR0aCwgbGF5ZXJSZWN0KCksIHRyYW5z Zm9ybSk7CiAgICAgICAgIC8vIE9ubHkgZHJhdyByZXBhaW50IGNvdW50IGZvciB0aGUgbWFpbiBi YWNraW5nIHN0b3JlLgpAQCAtMTMxLDcgKzEzMCw3IEBAIHZvaWQgVGV4dHVyZU1hcHBlckxheWVy OjpwYWludFNlbGYoY29uc3QgVGV4dHVyZU1hcHBlclBhaW50T3B0aW9ucyYgb3B0aW9ucykKIAog ICAgIGlmIChtX2NvbnRlbnRzTGF5ZXIpIHsKICAgICAgICAgQVNTRVJUKCFsYXllclJlY3QoKS5p c0VtcHR5KCkpOwotICAgICAgICBtX2NvbnRlbnRzTGF5ZXItPnBhaW50VG9UZXh0dXJlTWFwcGVy KG9wdGlvbnMudGV4dHVyZU1hcHBlciwgbV9zdGF0ZS5jb250ZW50c1JlY3QsIHRyYW5zZm9ybSwg b3BhY2l0eSk7CisgICAgICAgIG1fY29udGVudHNMYXllci0+cGFpbnRUb1RleHR1cmVNYXBwZXIo b3B0aW9ucy50ZXh0dXJlTWFwcGVyLCBtX3N0YXRlLmNvbnRlbnRzUmVjdCwgdHJhbnNmb3JtLCBv cHRpb25zLm9wYWNpdHkpOwogICAgICAgICBpZiAobV9zdGF0ZS5zaG93RGVidWdCb3JkZXJzKQog ICAgICAgICAgICAgbV9jb250ZW50c0xheWVyLT5kcmF3Qm9yZGVyKG9wdGlvbnMudGV4dHVyZU1h cHBlciwgbV9zdGF0ZS5kZWJ1Z0JvcmRlckNvbG9yLCBtX3N0YXRlLmRlYnVnQm9yZGVyV2lkdGgs IG1fc3RhdGUuY29udGVudHNSZWN0LCB0cmFuc2Zvcm0pOwogICAgIH0KQEAgLTE0NCw3ICsxNDMs NyBAQCBpbnQgVGV4dHVyZU1hcHBlckxheWVyOjpjb21wYXJlR3JhcGhpY3NMYXllcnNaVmFsdWUo Y29uc3Qgdm9pZCogYSwgY29uc3Qgdm9pZCogYgogICAgIHJldHVybiBpbnQoKCgqbGF5ZXJBKS0+ bV9jZW50ZXJaIC0gKCpsYXllckIpLT5tX2NlbnRlclopICogMTAwMCk7CiB9CiAKLXZvaWQgVGV4 dHVyZU1hcHBlckxheWVyOjpzb3J0QnlaT3JkZXIoVmVjdG9yPFRleHR1cmVNYXBwZXJMYXllciog PiYgYXJyYXksIGludCAvKiBmaXJzdCAqLywgaW50IC8qIGxhc3QgKi8pCit2b2lkIFRleHR1cmVN YXBwZXJMYXllcjo6c29ydEJ5Wk9yZGVyKFZlY3RvcjxUZXh0dXJlTWFwcGVyTGF5ZXIqID4mIGFy cmF5KQogewogICAgIHFzb3J0KGFycmF5LmRhdGEoKSwgYXJyYXkuc2l6ZSgpLCBzaXplb2YoVGV4 dHVyZU1hcHBlckxheWVyKiksIGNvbXBhcmVHcmFwaGljc0xheWVyc1pWYWx1ZSk7CiB9CkBAIC0y NjIsNyArMjYxLDcgQEAgc3RhdGljIHZvaWQgcmVzb2x2ZU92ZXJsYXBzKFJlZ2lvbiBuZXdSZWdp b24sIFJlZ2lvbiYgb3ZlcmxhcFJlZ2lvbiwgUmVnaW9uJiBub24KICAgICBub25PdmVybGFwUmVn aW9uLnVuaXRlKG5ld1JlZ2lvbik7CiB9CiAKLXZvaWQgVGV4dHVyZU1hcHBlckxheWVyOjpjb21w dXRlT3ZlcmxhcFJlZ2lvbnMoUmVnaW9uJiBvdmVybGFwUmVnaW9uLCBSZWdpb24mIG5vbk92ZXJs YXBSZWdpb24sIGJvb2wgYWx3YXlzUmVzb2x2ZVNlbGZPdmVybGFwKQordm9pZCBUZXh0dXJlTWFw cGVyTGF5ZXI6OmNvbXB1dGVPdmVybGFwUmVnaW9ucyhSZWdpb24mIG92ZXJsYXBSZWdpb24sIFJl Z2lvbiYgbm9uT3ZlcmxhcFJlZ2lvbiwgUmVzb2x2ZVNlbGZPdmVybGFwTW9kZSBtb2RlKQogewog ICAgIGlmICghbV9zdGF0ZS52aXNpYmxlIHx8ICFtX3N0YXRlLmNvbnRlbnRzVmlzaWJsZSkKICAg ICAgICAgcmV0dXJuOwpAQCAtMzA1LDggKzMwNCw3IEBAIHZvaWQgVGV4dHVyZU1hcHBlckxheWVy Ojpjb21wdXRlT3ZlcmxhcFJlZ2lvbnMoUmVnaW9uJiBvdmVybGFwUmVnaW9uLCBSZWdpb24mIG5v CiAgICAgaWYgKCFtX3N0YXRlLm1hc2tzVG9Cb3VuZHMpIHsKICAgICAgICAgZm9yIChzaXplX3Qg aSA9IDA7IGkgPCBtX2NoaWxkcmVuLnNpemUoKTsgKytpKSB7CiAgICAgICAgICAgICBUZXh0dXJl TWFwcGVyTGF5ZXIqIGNoaWxkID0gbV9jaGlsZHJlbltpXTsKLSAgICAgICAgICAgIGJvb2wgYWx3 YXlzUmVzb2x2ZVNlbGZPdmVybGFwRm9yQ2hpbGRyZW4gPSBmYWxzZTsKLSAgICAgICAgICAgIGNo aWxkLT5jb21wdXRlT3ZlcmxhcFJlZ2lvbnMobmV3T3ZlcmxhcFJlZ2lvbiwgbmV3Tm9uT3Zlcmxh cFJlZ2lvbiwgYWx3YXlzUmVzb2x2ZVNlbGZPdmVybGFwRm9yQ2hpbGRyZW4pOworICAgICAgICAg ICAgY2hpbGQtPmNvbXB1dGVPdmVybGFwUmVnaW9ucyhuZXdPdmVybGFwUmVnaW9uLCBuZXdOb25P dmVybGFwUmVnaW9uLCBSZXNvbHZlU2VsZk92ZXJsYXBJZk5lZWRlZCk7CiAgICAgICAgIH0KICAg ICB9CiAKQEAgLTMxNiw3ICszMTQsNyBAQCB2b2lkIFRleHR1cmVNYXBwZXJMYXllcjo6Y29tcHV0 ZU92ZXJsYXBSZWdpb25zKFJlZ2lvbiYgb3ZlcmxhcFJlZ2lvbiwgUmVnaW9uJiBubwogICAgICAg ICByZXNvbHZlT3ZlcmxhcHMocmVwbGljYVJlZ2lvbiwgbmV3T3ZlcmxhcFJlZ2lvbiwgbmV3Tm9u T3ZlcmxhcFJlZ2lvbik7CiAgICAgfQogCi0gICAgaWYgKCFhbHdheXNSZXNvbHZlU2VsZk92ZXJs YXAgJiYgc2hvdWxkQmxlbmQoKSkgeworICAgIGlmICgobW9kZSAhPSBSZXNvbHZlU2VsZk92ZXJs YXBBbHdheXMpICYmIHNob3VsZEJsZW5kKCkpIHsKICAgICAgICAgbmV3Tm9uT3ZlcmxhcFJlZ2lv bi51bml0ZShuZXdPdmVybGFwUmVnaW9uKTsKICAgICAgICAgbmV3T3ZlcmxhcFJlZ2lvbiA9IFJl Z2lvbigpOwogICAgIH0KQEAgLTMyOSw3ICszMjcsNyBAQCB2b2lkIFRleHR1cmVNYXBwZXJMYXll cjo6cGFpbnRVc2luZ092ZXJsYXBSZWdpb25zKGNvbnN0IFRleHR1cmVNYXBwZXJQYWludE9wdGlv bgogewogICAgIFJlZ2lvbiBvdmVybGFwUmVnaW9uOwogICAgIFJlZ2lvbiBub25PdmVybGFwUmVn aW9uOwotICAgIGNvbXB1dGVPdmVybGFwUmVnaW9ucyhvdmVybGFwUmVnaW9uLCBub25PdmVybGFw UmVnaW9uKTsKKyAgICBjb21wdXRlT3ZlcmxhcFJlZ2lvbnMob3ZlcmxhcFJlZ2lvbiwgbm9uT3Zl cmxhcFJlZ2lvbiwgUmVzb2x2ZVNlbGZPdmVybGFwQWx3YXlzKTsKICAgICBpZiAob3ZlcmxhcFJl Z2lvbi5pc0VtcHR5KCkpIHsKICAgICAgICAgcGFpbnRTZWxmQW5kQ2hpbGRyZW5XaXRoUmVwbGlj YShvcHRpb25zKTsKICAgICAgICAgcmV0dXJuOwpAQCAtMzQ0LDggKzM0Miw5IEBAIHZvaWQgVGV4 dHVyZU1hcHBlckxheWVyOjpwYWludFVzaW5nT3ZlcmxhcFJlZ2lvbnMoY29uc3QgVGV4dHVyZU1h cHBlclBhaW50T3B0aW9uCiAKICAgICByZWN0cyA9IG92ZXJsYXBSZWdpb24ucmVjdHMoKTsKICAg ICBJbnRTaXplIG1heFRleHR1cmVTaXplID0gb3B0aW9ucy50ZXh0dXJlTWFwcGVyLT5tYXhUZXh0 dXJlU2l6ZSgpOworICAgIEludFJlY3QgcmVjdDsKICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8 IHJlY3RzLnNpemUoKTsgKytpKSB7Ci0gICAgICAgIEludFJlY3QgcmVjdCA9IHJlY3RzW2ldOwor ICAgICAgICByZWN0ID0gcmVjdHNbaV07CiAgICAgICAgIGZvciAoaW50IHggPSByZWN0LngoKTsg eCA8IHJlY3QubWF4WCgpOyB4ICs9IG1heFRleHR1cmVTaXplLndpZHRoKCkpIHsKICAgICAgICAg ICAgIGZvciAoaW50IHkgPSByZWN0LnkoKTsgeSA8IHJlY3QubWF4WSgpOyB5ICs9IG1heFRleHR1 cmVTaXplLmhlaWdodCgpKSB7CiAgICAgICAgICAgICAgICAgSW50UmVjdCB0aWxlUmVjdChJbnRQ b2ludCh4LCB5KSwgbWF4VGV4dHVyZVNpemUpOwpAQCAtMzc4LDE0ICszNzcsMTMgQEAgUGFzc1Jl ZlB0cjxCaXRtYXBUZXh0dXJlPiBUZXh0dXJlTWFwcGVyTGF5ZXI6OnBhaW50SW50b1N1cmZhY2Uo Y29uc3QgVGV4dHVyZU1hcHAKICAgICByZXR1cm4gc3VyZmFjZTsKIH0KIAotc3RhdGljIFBhc3NS ZWZQdHI8Qml0bWFwVGV4dHVyZT4gY29tbWl0U3VyZmFjZShjb25zdCBUZXh0dXJlTWFwcGVyUGFp bnRPcHRpb25zJiBvcHRpb25zLCBQYXNzUmVmUHRyPEJpdG1hcFRleHR1cmU+IHN1cmZhY2UsIGNv bnN0IEludFJlY3QmIHJlY3QsIGZsb2F0IG9wYWNpdHkpCitzdGF0aWMgdm9pZCBjb21taXRTdXJm YWNlKGNvbnN0IFRleHR1cmVNYXBwZXJQYWludE9wdGlvbnMmIG9wdGlvbnMsIFBhc3NSZWZQdHI8 Qml0bWFwVGV4dHVyZT4gc3VyZmFjZSwgY29uc3QgSW50UmVjdCYgcmVjdCwgZmxvYXQgb3BhY2l0 eSkKIHsKICAgICBvcHRpb25zLnRleHR1cmVNYXBwZXItPmJpbmRTdXJmYWNlKG9wdGlvbnMuc3Vy ZmFjZS5nZXQoKSk7CiAgICAgVHJhbnNmb3JtYXRpb25NYXRyaXggdGFyZ2V0VHJhbnNmb3JtOwog ICAgIHRhcmdldFRyYW5zZm9ybS50cmFuc2xhdGUob3B0aW9ucy5vZmZzZXQud2lkdGgoKSwgb3B0 aW9ucy5vZmZzZXQuaGVpZ2h0KCkpOwogICAgIHRhcmdldFRyYW5zZm9ybS5tdWx0aXBseShvcHRp b25zLnRyYW5zZm9ybSk7CiAgICAgb3B0aW9ucy50ZXh0dXJlTWFwcGVyLT5kcmF3VGV4dHVyZSgq c3VyZmFjZS5nZXQoKSwgcmVjdCwgdGFyZ2V0VHJhbnNmb3JtLCBvcGFjaXR5KTsKLSAgICByZXR1 cm4gMDsKIH0KIAogdm9pZCBUZXh0dXJlTWFwcGVyTGF5ZXI6OnBhaW50V2l0aEludGVybWVkaWF0 ZVN1cmZhY2UoY29uc3QgVGV4dHVyZU1hcHBlclBhaW50T3B0aW9ucyYgb3B0aW9ucywgY29uc3Qg SW50UmVjdCYgcmVjdCkKQEAgLTQwNCw4ICs0MDIsMTAgQEAgdm9pZCBUZXh0dXJlTWFwcGVyTGF5 ZXI6OnBhaW50V2l0aEludGVybWVkaWF0ZVN1cmZhY2UoY29uc3QgVGV4dHVyZU1hcHBlclBhaW50 T3AKICAgICAgICAgICAgIG1fc3RhdGUucmVwbGljYUxheWVyLT5tX3N0YXRlLm1hc2tMYXllci0+ YXBwbHlNYXNrKHBhaW50T3B0aW9ucyk7CiAgICAgfQogCi0gICAgaWYgKHJlcGxpY2FTdXJmYWNl ICYmIG9wdGlvbnMub3BhY2l0eSA9PSAxKQotICAgICAgICByZXBsaWNhU3VyZmFjZSA9IGNvbW1p dFN1cmZhY2Uob3B0aW9ucywgcmVwbGljYVN1cmZhY2UsIHJlY3QsIDEpOworICAgIGlmIChyZXBs aWNhU3VyZmFjZSAmJiBvcHRpb25zLm9wYWNpdHkgPT0gMSkgeworICAgICAgICBjb21taXRTdXJm YWNlKG9wdGlvbnMsIHJlcGxpY2FTdXJmYWNlLCByZWN0LCAxKTsKKyAgICAgICAgcmVwbGljYVN1 cmZhY2UuY2xlYXIoKTsKKyAgICB9CiAKICAgICBtYWluU3VyZmFjZSA9IHBhaW50SW50b1N1cmZh Y2UocGFpbnRPcHRpb25zLCByZWN0LnNpemUoKSk7CiAgICAgaWYgKHJlcGxpY2FTdXJmYWNlKSB7 CkBAIC00MjMsNyArNDIzLDcgQEAgdm9pZCBUZXh0dXJlTWFwcGVyTGF5ZXI6OnBhaW50UmVjdXJz aXZlKGNvbnN0IFRleHR1cmVNYXBwZXJQYWludE9wdGlvbnMmIG9wdGlvbnMKICAgICAgICAgcmV0 dXJuOwogCiAgICAgVGV4dHVyZU1hcHBlclBhaW50T3B0aW9ucyBwYWludE9wdGlvbnMob3B0aW9u cyk7Ci0gICAgcGFpbnRPcHRpb25zLm9wYWNpdHkgPSBvcHRpb25zLm9wYWNpdHkgKiBtX2N1cnJl bnRPcGFjaXR5OworICAgIHBhaW50T3B0aW9ucy5vcGFjaXR5ICo9IG1fY3VycmVudE9wYWNpdHk7 CiAKICAgICBpZiAoIXNob3VsZEJsZW5kKCkpIHsKICAgICAgICAgcGFpbnRTZWxmQW5kQ2hpbGRy ZW5XaXRoUmVwbGljYShwYWludE9wdGlvbnMpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJMYXllci5oIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJMYXllci5oCmluZGV4 IDFkM2M2NzgxMTdiNmI5MTcxYWJmYmY1MjE1MmM1NGRlMjgwYzEzOWQuLmVlNzZkMWE4MjJhMTM2 NjA1MGZhYjM3YTVhNzkyOGYyODA1ZWRiYWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyTGF5ZXIuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlckxheWVyLmgKQEAg LTEyNiw3ICsxMjYsNyBAQCBwcml2YXRlOgogICAgIHZvaWQgY29tcHV0ZVRyYW5zZm9ybXNSZWN1 cnNpdmUoKTsKIAogICAgIHN0YXRpYyBpbnQgY29tcGFyZUdyYXBoaWNzTGF5ZXJzWlZhbHVlKGNv bnN0IHZvaWQqIGEsIGNvbnN0IHZvaWQqIGIpOwotICAgIHN0YXRpYyB2b2lkIHNvcnRCeVpPcmRl cihWZWN0b3I8VGV4dHVyZU1hcHBlckxheWVyKiA+JiBhcnJheSwgaW50IGZpcnN0LCBpbnQgbGFz dCk7CisgICAgc3RhdGljIHZvaWQgc29ydEJ5Wk9yZGVyKFZlY3RvcjxUZXh0dXJlTWFwcGVyTGF5 ZXIqID4mIGFycmF5KTsKIAogICAgIFBhc3NSZWZQdHI8Qml0bWFwVGV4dHVyZT4gdGV4dHVyZSgp IHsgcmV0dXJuIG1fYmFja2luZ1N0b3JlID8gbV9iYWNraW5nU3RvcmUtPnRleHR1cmUoKSA6IDA7 IH0KICAgICBGbG9hdFBvaW50IGFkanVzdGVkUG9zaXRpb24oKSBjb25zdCB7IHJldHVybiBtX3N0 YXRlLnBvcyArIG1fc2Nyb2xsUG9zaXRpb25EZWx0YSAtIG1fdXNlclNjcm9sbE9mZnNldDsgfQpA QCAtMTM2LDcgKzEzNiwxMSBAQCBwcml2YXRlOgogICAgIHZvaWQgcmVtb3ZlRnJvbVBhcmVudCgp OwogICAgIHZvaWQgcmVtb3ZlQWxsQ2hpbGRyZW4oKTsKIAotICAgIHZvaWQgY29tcHV0ZU92ZXJs YXBSZWdpb25zKFJlZ2lvbiYgb3ZlcmxhcFJlZ2lvbiwgUmVnaW9uJiBub25PdmVybGFwUmVnaW9u LCBib29sIGFsd2F5c1Jlc29sdmVTZWxmT3ZlcmxhcCA9IHRydWUpOworICAgIGVudW0gUmVzb2x2 ZVNlbGZPdmVybGFwTW9kZSB7CisgICAgICAgIFJlc29sdmVTZWxmT3ZlcmxhcEFsd2F5cyA9IDAs CisgICAgICAgIFJlc29sdmVTZWxmT3ZlcmxhcElmTmVlZGVkCisgICAgfTsKKyAgICB2b2lkIGNv bXB1dGVPdmVybGFwUmVnaW9ucyhSZWdpb24mIG92ZXJsYXBSZWdpb24sIFJlZ2lvbiYgbm9uT3Zl cmxhcFJlZ2lvbiwgUmVzb2x2ZVNlbGZPdmVybGFwTW9kZSk7CiAKICAgICB2b2lkIHBhaW50UmVj dXJzaXZlKGNvbnN0IFRleHR1cmVNYXBwZXJQYWludE9wdGlvbnMmKTsKICAgICB2b2lkIHBhaW50 VXNpbmdPdmVybGFwUmVnaW9ucyhjb25zdCBUZXh0dXJlTWFwcGVyUGFpbnRPcHRpb25zJik7Cg==