97752 2012-09-26 19:27:57 -0700 Implement reviewer feedback that I missed on bug 95930. 2012-09-28 10:39:37 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 95930 1 macpherson macpherson cmarcelo macpherson menard tony webkit.review.bot oldest_to_newest 729149 0 macpherson 2012-09-26 19:27:57 -0700 Implement reviewer feedback that I missed on bug 95930. 729151 1 165918 macpherson 2012-09-26 19:29:48 -0700 Created attachment 165918 Patch 729692 2 165918 darin 2012-09-27 10:47:39 -0700 Comment on attachment 165918 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=165918&action=review > Source/WebCore/css/CSSBasicShapes.cpp:153 > + size_t length = 19 + (3 * (points.size() / 2)); This mystery equation ought to have a comment and maybe even some named constants. It seems it would be easy for this to get out of sync with the code if we changed the code below. > Source/WebCore/css/Rect.h:128 > + result.reserveCapacity(top.length() + right.length() + bottom.length() + left.length() + 3); The “3” here needs a brief comment. 729829 3 165918 tony 2012-09-27 13:50:03 -0700 Comment on attachment 165918 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=165918&action=review > Source/WebCore/css/CSSBasicShapes.cpp:43 > + result.reserveCapacity(22 + x.length() + y.length() + width.length() + height.length() + radiusX.length() + radiusY.length()); I would move the string literals into const char foo[] variables and use sizeof instead of hard coding 22. You could use a similar trick for buildPolygonString's 19. 729830 4 165918 tony 2012-09-27 13:50:30 -0700 Comment on attachment 165918 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=165918&action=review >> Source/WebCore/css/CSSBasicShapes.cpp:43 >> + result.reserveCapacity(22 + x.length() + y.length() + width.length() + height.length() + radiusX.length() + radiusY.length()); > > I would move the string literals into const char foo[] variables and use sizeof instead of hard coding 22. You could use a similar trick for buildPolygonString's 19. Err, sizeof - 1. 730103 5 166111 macpherson 2012-09-27 18:49:05 -0700 Created attachment 166111 Patch for landing 730124 6 166111 webkit.review.bot 2012-09-27 19:16:22 -0700 Comment on attachment 166111 Patch for landing Clearing flags on attachment: 166111 Committed r129831: <http://trac.webkit.org/changeset/129831> 730125 7 webkit.review.bot 2012-09-27 19:16:25 -0700 All reviewed patches have been landed. Closing bug. 730792 8 166111 tony 2012-09-28 10:39:37 -0700 Comment on attachment 166111 Patch for landing View in context: https://bugs.webkit.org/attachment.cgi?id=166111&action=review > Source/WebCore/css/CSSBasicShapes.cpp:168 > + // add length of two strings, plus one for the space separator. Nit: Capitalize the first letter of sentences. > Source/WebCore/css/Rect.h:128 > + // reserve space for the four strings, plus three space separator characters. Nit: Capitalize the first letter of sentences. 165918 2012-09-26 19:29:48 -0700 2012-09-27 18:48:59 -0700 Patch bug-97752-20120927122906.patch text/plain 7781 macpherson U3VidmVyc2lvbiBSZXZpc2lvbjogMTI5NzIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2M4OTJlM2RiNDU0MTRl YjMzYWEwYmJiOTk0NGE5YjljMGM2MGU5My4uYzFlYzc1OTE3YjYzNzY4MWNiOWI4MTRiOTAwNmUz NWZjZmNiMGNmOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDEyLTA5LTI2ICBMdWtl IE1hY3BoZXJzb24gICA8bWFjcGhlcnNvbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgSW1wbGVt ZW50IHJldmlld2VyIGZlZWRiYWNrIHRoYXQgSSBtaXNzZWQgb24gYnVnIDk1OTMwLgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTc3NTIKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIHBhdGNoIHVwZGF0 ZXMgdGhlIGluZGVudGF0aW9uIG9mIGZ1bmN0aW9uIHBhcmFtZXRlcnMgaW4gYSBmZXcgcGxhY2Vz LAorICAgICAgICBhbmQgcmVzZXJ2ZXMgYW4gYXBwcm9wcmlhdGUgYW1vdW50IG9mIHNwYWNlIHdo ZW4gdXNpbmcgU3RyaW5nQnVpbGRlci4KKworICAgICAgICAqIGNzcy9DU1NCYXNpY1NoYXBlcy5j cHA6CisgICAgICAgIChXZWJDb3JlOjpidWlsZFJlY3RhbmdsZVN0cmluZyk6CisgICAgICAgIChX ZWJDb3JlOjpDU1NCYXNpY1NoYXBlUmVjdGFuZ2xlOjpjc3NUZXh0KToKKyAgICAgICAgKFdlYkNv cmU6OkNTU0Jhc2ljU2hhcGVSZWN0YW5nbGU6OnNlcmlhbGl6ZVJlc29sdmluZ1ZhcmlhYmxlcyk6 CisgICAgICAgIChXZWJDb3JlOjpDU1NCYXNpY1NoYXBlQ2lyY2xlOjpzZXJpYWxpemVSZXNvbHZp bmdWYXJpYWJsZXMpOgorICAgICAgICAoV2ViQ29yZTo6Q1NTQmFzaWNTaGFwZUVsbGlwc2U6OnNl cmlhbGl6ZVJlc29sdmluZ1ZhcmlhYmxlcyk6CisgICAgICAgIChXZWJDb3JlOjpidWlsZFBvbHln b25TdHJpbmcpOgorICAgICAgICAqIGNzcy9SZWN0Lmg6CisgICAgICAgIChXZWJDb3JlOjpSZWN0 OjpzZXJpYWxpemVSZXNvbHZpbmdWYXJpYWJsZXMpOgorICAgICAgICAoV2ViQ29yZTo6UXVhZDo6 c2VyaWFsaXplUmVzb2x2aW5nVmFyaWFibGVzKToKKyAgICAgICAgKFdlYkNvcmU6OlF1YWQ6Omdl bmVyYXRlQ1NTU3RyaW5nKToKKwogMjAxMi0wOC0wOSAgVGFrYXNoaSBTYWthbW90byAgPHRhc2Fr QGdvb2dsZS5jb20+CiAKICAgICAgICAgTW92ZSBJREwgZXh0ZW5kZWQgYXR0cmlidXRlcyB0byB0 aGUgbG9jYXRpb24gc3BlY2lmaWVkIGluIFdlYklETApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvY3NzL0NTU0Jhc2ljU2hhcGVzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NCYXNpY1No YXBlcy5jcHAKaW5kZXggMzczMzVmZmNhZDdjNTQyZGQ1MGM2ZDEyMzBhZmY2NzY3OTBjZmY3NC4u ZGJmN2I2ZjI4ZDQ0MmYzYjVlNDRlODAyOTcyMjUyNmM3YzgxMTRhNyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvY3NzL0NTU0Jhc2ljU2hhcGVzLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9j c3MvQ1NTQmFzaWNTaGFwZXMuY3BwCkBAIC00MCw2ICs0MCw3IEBAIG5hbWVzcGFjZSBXZWJDb3Jl IHsKIHN0YXRpYyBTdHJpbmcgYnVpbGRSZWN0YW5nbGVTdHJpbmcoY29uc3QgU3RyaW5nJiB4LCBj b25zdCBTdHJpbmcmIHksIGNvbnN0IFN0cmluZyYgd2lkdGgsIGNvbnN0IFN0cmluZyYgaGVpZ2h0 LCBjb25zdCBTdHJpbmcmIHJhZGl1c1gsIGNvbnN0IFN0cmluZyYgcmFkaXVzWSkKIHsKICAgICBT dHJpbmdCdWlsZGVyIHJlc3VsdDsKKyAgICByZXN1bHQucmVzZXJ2ZUNhcGFjaXR5KDIyICsgeC5s ZW5ndGgoKSArIHkubGVuZ3RoKCkgKyB3aWR0aC5sZW5ndGgoKSArIGhlaWdodC5sZW5ndGgoKSAr IHJhZGl1c1gubGVuZ3RoKCkgKyByYWRpdXNZLmxlbmd0aCgpKTsKICAgICByZXN1bHQuYXBwZW5k TGl0ZXJhbCgicmVjdGFuZ2xlKCIpOwogICAgIHJlc3VsdC5hcHBlbmQoeCk7CiAgICAgcmVzdWx0 LmFwcGVuZExpdGVyYWwoIiwgIik7CkBAIC02MywyMiArNjQsMjIgQEAgc3RhdGljIFN0cmluZyBi dWlsZFJlY3RhbmdsZVN0cmluZyhjb25zdCBTdHJpbmcmIHgsIGNvbnN0IFN0cmluZyYgeSwgY29u c3QgU3RyaW4KIFN0cmluZyBDU1NCYXNpY1NoYXBlUmVjdGFuZ2xlOjpjc3NUZXh0KCkgY29uc3QK IHsKICAgICByZXR1cm4gYnVpbGRSZWN0YW5nbGVTdHJpbmcobV94LT5jc3NUZXh0KCksCi0gICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1feS0+Y3NzVGV4dCgpLAotICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBtX3dpZHRoLT5jc3NUZXh0KCksCi0gICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIG1faGVpZ2h0LT5jc3NUZXh0KCksCi0gICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIG1fcmFkaXVzWC5nZXQoKSA/IG1fcmFkaXVzWC0+Y3NzVGV4dCgpIDogU3Ry aW5nKCksCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1fcmFkaXVzWS5nZXQoKSA/ IG1fcmFkaXVzWS0+Y3NzVGV4dCgpIDogU3RyaW5nKCkpOworICAgICAgICBtX3ktPmNzc1RleHQo KSwKKyAgICAgICAgbV93aWR0aC0+Y3NzVGV4dCgpLAorICAgICAgICBtX2hlaWdodC0+Y3NzVGV4 dCgpLAorICAgICAgICBtX3JhZGl1c1guZ2V0KCkgPyBtX3JhZGl1c1gtPmNzc1RleHQoKSA6IFN0 cmluZygpLAorICAgICAgICBtX3JhZGl1c1kuZ2V0KCkgPyBtX3JhZGl1c1ktPmNzc1RleHQoKSA6 IFN0cmluZygpKTsKIH0KIAogI2lmIEVOQUJMRShDU1NfVkFSSUFCTEVTKQogU3RyaW5nIENTU0Jh c2ljU2hhcGVSZWN0YW5nbGU6OnNlcmlhbGl6ZVJlc29sdmluZ1ZhcmlhYmxlcyhjb25zdCBIYXNo TWFwPEF0b21pY1N0cmluZywgU3RyaW5nPiYgdmFyaWFibGVzKSBjb25zdAogewogICAgIHJldHVy biBidWlsZFJlY3RhbmdsZVN0cmluZyhtX3gtPnNlcmlhbGl6ZVJlc29sdmluZ1ZhcmlhYmxlcyh2 YXJpYWJsZXMpLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBtX3ktPnNlcmlhbGl6 ZVJlc29sdmluZ1ZhcmlhYmxlcyh2YXJpYWJsZXMpLAotICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBtX3dpZHRoLT5zZXJpYWxpemVSZXNvbHZpbmdWYXJpYWJsZXModmFyaWFibGVzKSwK LSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbV9oZWlnaHQtPnNlcmlhbGl6ZVJlc29s dmluZ1ZhcmlhYmxlcyh2YXJpYWJsZXMpLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBtX3JhZGl1c1guZ2V0KCkgPyBtX3JhZGl1c1gtPnNlcmlhbGl6ZVJlc29sdmluZ1ZhcmlhYmxl cyh2YXJpYWJsZXMpIDogU3RyaW5nKCksCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IG1fcmFkaXVzWS5nZXQoKSA/IG1fcmFkaXVzWS0+c2VyaWFsaXplUmVzb2x2aW5nVmFyaWFibGVz KHZhcmlhYmxlcykgOiBTdHJpbmcoKSk7CisgICAgICAgIG1feS0+c2VyaWFsaXplUmVzb2x2aW5n VmFyaWFibGVzKHZhcmlhYmxlcyksCisgICAgICAgIG1fd2lkdGgtPnNlcmlhbGl6ZVJlc29sdmlu Z1ZhcmlhYmxlcyh2YXJpYWJsZXMpLAorICAgICAgICBtX2hlaWdodC0+c2VyaWFsaXplUmVzb2x2 aW5nVmFyaWFibGVzKHZhcmlhYmxlcyksCisgICAgICAgIG1fcmFkaXVzWC5nZXQoKSA/IG1fcmFk aXVzWC0+c2VyaWFsaXplUmVzb2x2aW5nVmFyaWFibGVzKHZhcmlhYmxlcykgOiBTdHJpbmcoKSwK KyAgICAgICAgbV9yYWRpdXNZLmdldCgpID8gbV9yYWRpdXNZLT5zZXJpYWxpemVSZXNvbHZpbmdW YXJpYWJsZXModmFyaWFibGVzKSA6IFN0cmluZygpKTsKIH0KIAogYm9vbCBDU1NCYXNpY1NoYXBl UmVjdGFuZ2xlOjpoYXNWYXJpYWJsZVJlZmVyZW5jZSgpIGNvbnN0CkBAIC0xMDYsOCArMTA3LDgg QEAgU3RyaW5nIENTU0Jhc2ljU2hhcGVDaXJjbGU6OmNzc1RleHQoKSBjb25zdAogU3RyaW5nIENT U0Jhc2ljU2hhcGVDaXJjbGU6OnNlcmlhbGl6ZVJlc29sdmluZ1ZhcmlhYmxlcyhjb25zdCBIYXNo TWFwPEF0b21pY1N0cmluZywgU3RyaW5nPiYgdmFyaWFibGVzKSBjb25zdAogewogICAgIHJldHVy biBidWlsZENpcmNsZVN0cmluZyhtX2NlbnRlclgtPnNlcmlhbGl6ZVJlc29sdmluZ1ZhcmlhYmxl cyh2YXJpYWJsZXMpLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICBtX2NlbnRlclktPnNl cmlhbGl6ZVJlc29sdmluZ1ZhcmlhYmxlcyh2YXJpYWJsZXMpLAotICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBtX3JhZGl1cy0+c2VyaWFsaXplUmVzb2x2aW5nVmFyaWFibGVzKHZhcmlhYmxl cykpOworICAgICAgICBtX2NlbnRlclktPnNlcmlhbGl6ZVJlc29sdmluZ1ZhcmlhYmxlcyh2YXJp YWJsZXMpLAorICAgICAgICBtX3JhZGl1cy0+c2VyaWFsaXplUmVzb2x2aW5nVmFyaWFibGVzKHZh cmlhYmxlcykpOwogfQogCiBib29sIENTU0Jhc2ljU2hhcGVDaXJjbGU6Omhhc1ZhcmlhYmxlUmVm ZXJlbmNlKCkgY29uc3QKQEAgLTEzMiw5ICsxMzMsOSBAQCBTdHJpbmcgQ1NTQmFzaWNTaGFwZUVs bGlwc2U6OmNzc1RleHQoKSBjb25zdAogU3RyaW5nIENTU0Jhc2ljU2hhcGVFbGxpcHNlOjpzZXJp YWxpemVSZXNvbHZpbmdWYXJpYWJsZXMoY29uc3QgSGFzaE1hcDxBdG9taWNTdHJpbmcsIFN0cmlu Zz4mIHZhcmlhYmxlcykgY29uc3QKIHsKICAgICByZXR1cm4gYnVpbGRFbGxpcHNlU3RyaW5nKG1f Y2VudGVyWC0+c2VyaWFsaXplUmVzb2x2aW5nVmFyaWFibGVzKHZhcmlhYmxlcyksCi0gICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBtX2NlbnRlclktPnNlcmlhbGl6ZVJlc29sdmluZ1Zhcmlh Ymxlcyh2YXJpYWJsZXMpLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbV9yYWRpdXNY LT5zZXJpYWxpemVSZXNvbHZpbmdWYXJpYWJsZXModmFyaWFibGVzKSwKLSAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIG1fcmFkaXVzWS0+c2VyaWFsaXplUmVzb2x2aW5nVmFyaWFibGVzKHZh cmlhYmxlcykpOworICAgICAgICBtX2NlbnRlclktPnNlcmlhbGl6ZVJlc29sdmluZ1ZhcmlhYmxl cyh2YXJpYWJsZXMpLAorICAgICAgICBtX3JhZGl1c1gtPnNlcmlhbGl6ZVJlc29sdmluZ1Zhcmlh Ymxlcyh2YXJpYWJsZXMpLAorICAgICAgICBtX3JhZGl1c1ktPnNlcmlhbGl6ZVJlc29sdmluZ1Zh cmlhYmxlcyh2YXJpYWJsZXMpKTsKIH0KIAogYm9vbCBDU1NCYXNpY1NoYXBlRWxsaXBzZTo6aGFz VmFyaWFibGVSZWZlcmVuY2UoKSBjb25zdApAQCAtMTQ5LDYgKzE1MCwxMCBAQCBib29sIENTU0Jh c2ljU2hhcGVFbGxpcHNlOjpoYXNWYXJpYWJsZVJlZmVyZW5jZSgpIGNvbnN0CiBzdGF0aWMgU3Ry aW5nIGJ1aWxkUG9seWdvblN0cmluZyhjb25zdCBXaW5kUnVsZSYgd2luZFJ1bGUsIGNvbnN0IFZl Y3RvcjxTdHJpbmc+JiBwb2ludHMpCiB7CiAgICAgU3RyaW5nQnVpbGRlciByZXN1bHQ7CisgICAg c2l6ZV90IGxlbmd0aCA9IDE5ICsgKDMgKiAocG9pbnRzLnNpemUoKSAvIDIpKTsKKyAgICBmb3Ig KHNpemVfdCBpID0gMDsgaSA8IHBvaW50cy5zaXplKCk7ICsraSkKKyAgICAgICAgbGVuZ3RoICs9 IHBvaW50c1tpXS5sZW5ndGgoKTsKKyAgICByZXN1bHQucmVzZXJ2ZUNhcGFjaXR5KGxlbmd0aCk7 CiAKICAgICBpZiAod2luZFJ1bGUgPT0gUlVMRV9FVkVOT0REKQogICAgICAgICByZXN1bHQuYXBw ZW5kTGl0ZXJhbCgicG9seWdvbihldmVub2RkLCAiKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2Nzcy9SZWN0LmggYi9Tb3VyY2UvV2ViQ29yZS9jc3MvUmVjdC5oCmluZGV4IDc2NjZmMTk5 Yzc2Mjg0OWZlNzJjYzY5NTgzNGM4ODdkOGEzMTA5YzIuLjMwMjdmOGE5MWYxYWZlNWQ4YjdlZDli ODY4NzUxZGU1ZTA2M2ZjYzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9SZWN0LmgK KysrIGIvU291cmNlL1dlYkNvcmUvY3NzL1JlY3QuaApAQCAtODMsOSArODMsOSBAQCBwdWJsaWM6 CiAgICAgU3RyaW5nIHNlcmlhbGl6ZVJlc29sdmluZ1ZhcmlhYmxlcyhjb25zdCBIYXNoTWFwPEF0 b21pY1N0cmluZywgU3RyaW5nPiYgdmFyaWFibGVzKSBjb25zdAogICAgIHsKICAgICAgICAgcmV0 dXJuIGdlbmVyYXRlQ1NTU3RyaW5nKHRvcCgpLT5jdXN0b21TZXJpYWxpemVSZXNvbHZpbmdWYXJp YWJsZXModmFyaWFibGVzKSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJpZ2h0 KCktPmN1c3RvbVNlcmlhbGl6ZVJlc29sdmluZ1ZhcmlhYmxlcyh2YXJpYWJsZXMpLAotICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgYm90dG9tKCktPmN1c3RvbVNlcmlhbGl6ZVJlc29s dmluZ1ZhcmlhYmxlcyh2YXJpYWJsZXMpLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgbGVmdCgpLT5jdXN0b21TZXJpYWxpemVSZXNvbHZpbmdWYXJpYWJsZXModmFyaWFibGVzKSk7 CisgICAgICAgICAgICByaWdodCgpLT5jdXN0b21TZXJpYWxpemVSZXNvbHZpbmdWYXJpYWJsZXMo dmFyaWFibGVzKSwKKyAgICAgICAgICAgIGJvdHRvbSgpLT5jdXN0b21TZXJpYWxpemVSZXNvbHZp bmdWYXJpYWJsZXModmFyaWFibGVzKSwKKyAgICAgICAgICAgIGxlZnQoKS0+Y3VzdG9tU2VyaWFs aXplUmVzb2x2aW5nVmFyaWFibGVzKHZhcmlhYmxlcykpOwogICAgIH0KICNlbmRpZgogCkBAIC0x MTMsOSArMTEzLDkgQEAgcHVibGljOgogICAgIFN0cmluZyBzZXJpYWxpemVSZXNvbHZpbmdWYXJp YWJsZXMoY29uc3QgSGFzaE1hcDxBdG9taWNTdHJpbmcsIFN0cmluZz4mIHZhcmlhYmxlcykgY29u c3QKICAgICB7CiAgICAgICAgIHJldHVybiBnZW5lcmF0ZUNTU1N0cmluZyh0b3AoKS0+Y3VzdG9t U2VyaWFsaXplUmVzb2x2aW5nVmFyaWFibGVzKHZhcmlhYmxlcyksCi0gICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICByaWdodCgpLT5jdXN0b21TZXJpYWxpemVSZXNvbHZpbmdWYXJpYWJs ZXModmFyaWFibGVzKSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJvdHRvbSgp LT5jdXN0b21TZXJpYWxpemVSZXNvbHZpbmdWYXJpYWJsZXModmFyaWFibGVzKSwKLSAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIGxlZnQoKS0+Y3VzdG9tU2VyaWFsaXplUmVzb2x2aW5n VmFyaWFibGVzKHZhcmlhYmxlcykpOworICAgICAgICAgICAgcmlnaHQoKS0+Y3VzdG9tU2VyaWFs aXplUmVzb2x2aW5nVmFyaWFibGVzKHZhcmlhYmxlcyksCisgICAgICAgICAgICBib3R0b20oKS0+ Y3VzdG9tU2VyaWFsaXplUmVzb2x2aW5nVmFyaWFibGVzKHZhcmlhYmxlcyksCisgICAgICAgICAg ICBsZWZ0KCktPmN1c3RvbVNlcmlhbGl6ZVJlc29sdmluZ1ZhcmlhYmxlcyh2YXJpYWJsZXMpKTsK ICAgICB9CiAjZW5kaWYKIApAQCAtMTI1LDYgKzEyNSw3IEBAIHByaXZhdGU6CiAgICAgc3RhdGlj IFN0cmluZyBnZW5lcmF0ZUNTU1N0cmluZyhjb25zdCBTdHJpbmcmIHRvcCwgY29uc3QgU3RyaW5n JiByaWdodCwgY29uc3QgU3RyaW5nJiBib3R0b20sIGNvbnN0IFN0cmluZyYgbGVmdCkKICAgICB7 CiAgICAgICAgIFN0cmluZ0J1aWxkZXIgcmVzdWx0OworICAgICAgICByZXN1bHQucmVzZXJ2ZUNh cGFjaXR5KHRvcC5sZW5ndGgoKSArIHJpZ2h0Lmxlbmd0aCgpICsgYm90dG9tLmxlbmd0aCgpICsg bGVmdC5sZW5ndGgoKSArIDMpOwogICAgICAgICByZXN1bHQuYXBwZW5kKHRvcCk7CiAgICAgICAg IGlmIChyaWdodCAhPSB0b3AgfHwgYm90dG9tICE9IHRvcCB8fCBsZWZ0ICE9IHRvcCkgewogICAg ICAgICAgICAgcmVzdWx0LmFwcGVuZCgnICcpOwo= 166111 2012-09-27 18:49:05 -0700 2012-09-28 10:39:37 -0700 Patch for landing bug-97752-20120928114822.patch text/plain 9716 macpherson U3VidmVyc2lvbiBSZXZpc2lvbjogMTI5NzMwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjU1MmZlN2Q1YzQwM2Nm NjBiYWJlMGZmOTE5Mjk1MmQzNmNhYzdmOS4uZWFiNzNhMDdjOTU1ODM2YTRiNzgyMjdmZjMzNjUy ZTdkZjJiOWIwOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDEyLTA5LTI2ICBMdWtl IE1hY3BoZXJzb24gICA8bWFjcGhlcnNvbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgSW1wbGVt ZW50IHJldmlld2VyIGZlZWRiYWNrIHRoYXQgSSBtaXNzZWQgb24gYnVnIDk1OTMwLgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTc3NTIKKworICAgICAg ICBSZXZpZXdlZCBieSBBbGV4ZXkgUHJvc2t1cnlha292LgorCisgICAgICAgIFRoaXMgcGF0Y2gg dXBkYXRlcyB0aGUgaW5kZW50YXRpb24gb2YgZnVuY3Rpb24gcGFyYW1ldGVycyBpbiBhIGZldyBw bGFjZXMsCisgICAgICAgIGFuZCByZXNlcnZlcyBhbiBhcHByb3ByaWF0ZSBhbW91bnQgb2Ygc3Bh Y2Ugd2hlbiB1c2luZyBTdHJpbmdCdWlsZGVyLgorCisgICAgICAgICogY3NzL0NTU0Jhc2ljU2hh cGVzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmJ1aWxkUmVjdGFuZ2xlU3RyaW5nKToKKyAgICAg ICAgKFdlYkNvcmU6OkNTU0Jhc2ljU2hhcGVSZWN0YW5nbGU6OmNzc1RleHQpOgorICAgICAgICAo V2ViQ29yZTo6Q1NTQmFzaWNTaGFwZVJlY3RhbmdsZTo6c2VyaWFsaXplUmVzb2x2aW5nVmFyaWFi bGVzKToKKyAgICAgICAgKFdlYkNvcmU6OkNTU0Jhc2ljU2hhcGVDaXJjbGU6OnNlcmlhbGl6ZVJl c29sdmluZ1ZhcmlhYmxlcyk6CisgICAgICAgIChXZWJDb3JlOjpDU1NCYXNpY1NoYXBlRWxsaXBz ZTo6c2VyaWFsaXplUmVzb2x2aW5nVmFyaWFibGVzKToKKyAgICAgICAgKFdlYkNvcmU6OmJ1aWxk UG9seWdvblN0cmluZyk6CisgICAgICAgICogY3NzL1JlY3QuaDoKKyAgICAgICAgKFdlYkNvcmU6 OlJlY3Q6OnNlcmlhbGl6ZVJlc29sdmluZ1ZhcmlhYmxlcyk6CisgICAgICAgIChXZWJDb3JlOjpR dWFkOjpzZXJpYWxpemVSZXNvbHZpbmdWYXJpYWJsZXMpOgorICAgICAgICAoV2ViQ29yZTo6UXVh ZDo6Z2VuZXJhdGVDU1NTdHJpbmcpOgorCiAyMDEyLTA5LTI2ICBZb3NoaWZ1bWkgSW5vdWUgIDx5 b3NpbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW0Zvcm1zXSBNb3ZlIG11bHRpcGxlIGZpZWxk cyByZWxhdGVkIGZ1bmN0aW9ucyB0byBCYXNlRGF0ZUFuZFRpbWVJbnB1dFR5cGUgZnJvbSBUaW1l SW5wdXRUeXBlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTQmFzaWNTaGFwZXMu Y3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU0Jhc2ljU2hhcGVzLmNwcAppbmRleCAzNzMzNWZm Y2FkN2M1NDJkZDUwYzZkMTIzMGFmZjY3Njc5MGNmZjc0Li4zZmRhNmIxZDFlZWIzZTc3YjA3NmQ5 YWE0ZmVkYjJkNzQyYzdhYTcxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTQmFz aWNTaGFwZXMuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NCYXNpY1NoYXBlcy5jcHAK QEAgLTM5LDIwICszOSwyNCBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIHN0YXRpYyBTdHJpbmcg YnVpbGRSZWN0YW5nbGVTdHJpbmcoY29uc3QgU3RyaW5nJiB4LCBjb25zdCBTdHJpbmcmIHksIGNv bnN0IFN0cmluZyYgd2lkdGgsIGNvbnN0IFN0cmluZyYgaGVpZ2h0LCBjb25zdCBTdHJpbmcmIHJh ZGl1c1gsIGNvbnN0IFN0cmluZyYgcmFkaXVzWSkKIHsKKyAgICBjaGFyIG9wZW5pbmdbXSA9ICJy ZWN0YW5nbGUoIjsKKyAgICBjaGFyIHNlcGFyYXRvcltdID0gIiwgIjsKICAgICBTdHJpbmdCdWls ZGVyIHJlc3VsdDsKLSAgICByZXN1bHQuYXBwZW5kTGl0ZXJhbCgicmVjdGFuZ2xlKCIpOworICAg IC8vIENvbXB1dGUgdGhlIHJlcXVpcmVkIGNhcGFjaXR5IGluIGFkdmFuY2UgdG8gcmVkdWNlIGFs bG9jYXRpb25zLgorICAgIHJlc3VsdC5yZXNlcnZlQ2FwYWNpdHkoKHNpemVvZihvcGVuaW5nKSAt IDEpICsgKDUgKiAoc2l6ZW9mKHNlcGFyYXRvcikgLTEgKSkgKyAxICsgeC5sZW5ndGgoKSArIHku bGVuZ3RoKCkgKyB3aWR0aC5sZW5ndGgoKSArIGhlaWdodC5sZW5ndGgoKSArIHJhZGl1c1gubGVu Z3RoKCkgKyByYWRpdXNZLmxlbmd0aCgpKTsKKyAgICByZXN1bHQuYXBwZW5kTGl0ZXJhbChvcGVu aW5nKTsKICAgICByZXN1bHQuYXBwZW5kKHgpOwotICAgIHJlc3VsdC5hcHBlbmRMaXRlcmFsKCIs ICIpOworICAgIHJlc3VsdC5hcHBlbmRMaXRlcmFsKHNlcGFyYXRvcik7CiAgICAgcmVzdWx0LmFw cGVuZCh5KTsKLSAgICByZXN1bHQuYXBwZW5kTGl0ZXJhbCgiLCAiKTsKKyAgICByZXN1bHQuYXBw ZW5kTGl0ZXJhbChzZXBhcmF0b3IpOwogICAgIHJlc3VsdC5hcHBlbmQod2lkdGgpOwotICAgIHJl c3VsdC5hcHBlbmRMaXRlcmFsKCIsICIpOworICAgIHJlc3VsdC5hcHBlbmRMaXRlcmFsKHNlcGFy YXRvcik7CiAgICAgcmVzdWx0LmFwcGVuZChoZWlnaHQpOwogICAgIGlmICghcmFkaXVzWC5pc051 bGwoKSkgewotICAgICAgICByZXN1bHQuYXBwZW5kTGl0ZXJhbCgiLCAiKTsKKyAgICAgICAgcmVz dWx0LmFwcGVuZExpdGVyYWwoc2VwYXJhdG9yKTsKICAgICAgICAgcmVzdWx0LmFwcGVuZChyYWRp dXNYKTsKICAgICAgICAgaWYgKCFyYWRpdXNZLmlzTnVsbCgpKSB7Ci0gICAgICAgICAgICByZXN1 bHQuYXBwZW5kTGl0ZXJhbCgiLCAiKTsKKyAgICAgICAgICAgIHJlc3VsdC5hcHBlbmRMaXRlcmFs KHNlcGFyYXRvcik7CiAgICAgICAgICAgICByZXN1bHQuYXBwZW5kKHJhZGl1c1kpOwogICAgICAg ICB9CiAgICAgfQpAQCAtNjMsMjIgKzY3LDIyIEBAIHN0YXRpYyBTdHJpbmcgYnVpbGRSZWN0YW5n bGVTdHJpbmcoY29uc3QgU3RyaW5nJiB4LCBjb25zdCBTdHJpbmcmIHksIGNvbnN0IFN0cmluCiBT dHJpbmcgQ1NTQmFzaWNTaGFwZVJlY3RhbmdsZTo6Y3NzVGV4dCgpIGNvbnN0CiB7CiAgICAgcmV0 dXJuIGJ1aWxkUmVjdGFuZ2xlU3RyaW5nKG1feC0+Y3NzVGV4dCgpLAotICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBtX3ktPmNzc1RleHQoKSwKLSAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgbV93aWR0aC0+Y3NzVGV4dCgpLAotICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBtX2hlaWdodC0+Y3NzVGV4dCgpLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBtX3JhZGl1c1guZ2V0KCkgPyBtX3JhZGl1c1gtPmNzc1RleHQoKSA6IFN0cmluZygpLAotICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBtX3JhZGl1c1kuZ2V0KCkgPyBtX3JhZGl1c1kt PmNzc1RleHQoKSA6IFN0cmluZygpKTsKKyAgICAgICAgbV95LT5jc3NUZXh0KCksCisgICAgICAg IG1fd2lkdGgtPmNzc1RleHQoKSwKKyAgICAgICAgbV9oZWlnaHQtPmNzc1RleHQoKSwKKyAgICAg ICAgbV9yYWRpdXNYLmdldCgpID8gbV9yYWRpdXNYLT5jc3NUZXh0KCkgOiBTdHJpbmcoKSwKKyAg ICAgICAgbV9yYWRpdXNZLmdldCgpID8gbV9yYWRpdXNZLT5jc3NUZXh0KCkgOiBTdHJpbmcoKSk7 CiB9CiAKICNpZiBFTkFCTEUoQ1NTX1ZBUklBQkxFUykKIFN0cmluZyBDU1NCYXNpY1NoYXBlUmVj dGFuZ2xlOjpzZXJpYWxpemVSZXNvbHZpbmdWYXJpYWJsZXMoY29uc3QgSGFzaE1hcDxBdG9taWNT dHJpbmcsIFN0cmluZz4mIHZhcmlhYmxlcykgY29uc3QKIHsKICAgICByZXR1cm4gYnVpbGRSZWN0 YW5nbGVTdHJpbmcobV94LT5zZXJpYWxpemVSZXNvbHZpbmdWYXJpYWJsZXModmFyaWFibGVzKSwK LSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbV95LT5zZXJpYWxpemVSZXNvbHZpbmdW YXJpYWJsZXModmFyaWFibGVzKSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbV93 aWR0aC0+c2VyaWFsaXplUmVzb2x2aW5nVmFyaWFibGVzKHZhcmlhYmxlcyksCi0gICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIG1faGVpZ2h0LT5zZXJpYWxpemVSZXNvbHZpbmdWYXJpYWJs ZXModmFyaWFibGVzKSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbV9yYWRpdXNY LmdldCgpID8gbV9yYWRpdXNYLT5zZXJpYWxpemVSZXNvbHZpbmdWYXJpYWJsZXModmFyaWFibGVz KSA6IFN0cmluZygpLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBtX3JhZGl1c1ku Z2V0KCkgPyBtX3JhZGl1c1ktPnNlcmlhbGl6ZVJlc29sdmluZ1ZhcmlhYmxlcyh2YXJpYWJsZXMp IDogU3RyaW5nKCkpOworICAgICAgICBtX3ktPnNlcmlhbGl6ZVJlc29sdmluZ1ZhcmlhYmxlcyh2 YXJpYWJsZXMpLAorICAgICAgICBtX3dpZHRoLT5zZXJpYWxpemVSZXNvbHZpbmdWYXJpYWJsZXMo dmFyaWFibGVzKSwKKyAgICAgICAgbV9oZWlnaHQtPnNlcmlhbGl6ZVJlc29sdmluZ1ZhcmlhYmxl cyh2YXJpYWJsZXMpLAorICAgICAgICBtX3JhZGl1c1guZ2V0KCkgPyBtX3JhZGl1c1gtPnNlcmlh bGl6ZVJlc29sdmluZ1ZhcmlhYmxlcyh2YXJpYWJsZXMpIDogU3RyaW5nKCksCisgICAgICAgIG1f cmFkaXVzWS5nZXQoKSA/IG1fcmFkaXVzWS0+c2VyaWFsaXplUmVzb2x2aW5nVmFyaWFibGVzKHZh cmlhYmxlcykgOiBTdHJpbmcoKSk7CiB9CiAKIGJvb2wgQ1NTQmFzaWNTaGFwZVJlY3RhbmdsZTo6 aGFzVmFyaWFibGVSZWZlcmVuY2UoKSBjb25zdApAQCAtMTA2LDggKzExMCw4IEBAIFN0cmluZyBD U1NCYXNpY1NoYXBlQ2lyY2xlOjpjc3NUZXh0KCkgY29uc3QKIFN0cmluZyBDU1NCYXNpY1NoYXBl Q2lyY2xlOjpzZXJpYWxpemVSZXNvbHZpbmdWYXJpYWJsZXMoY29uc3QgSGFzaE1hcDxBdG9taWNT dHJpbmcsIFN0cmluZz4mIHZhcmlhYmxlcykgY29uc3QKIHsKICAgICByZXR1cm4gYnVpbGRDaXJj bGVTdHJpbmcobV9jZW50ZXJYLT5zZXJpYWxpemVSZXNvbHZpbmdWYXJpYWJsZXModmFyaWFibGVz KSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbV9jZW50ZXJZLT5zZXJpYWxpemVSZXNv bHZpbmdWYXJpYWJsZXModmFyaWFibGVzKSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAg bV9yYWRpdXMtPnNlcmlhbGl6ZVJlc29sdmluZ1ZhcmlhYmxlcyh2YXJpYWJsZXMpKTsKKyAgICAg ICAgbV9jZW50ZXJZLT5zZXJpYWxpemVSZXNvbHZpbmdWYXJpYWJsZXModmFyaWFibGVzKSwKKyAg ICAgICAgbV9yYWRpdXMtPnNlcmlhbGl6ZVJlc29sdmluZ1ZhcmlhYmxlcyh2YXJpYWJsZXMpKTsK IH0KIAogYm9vbCBDU1NCYXNpY1NoYXBlQ2lyY2xlOjpoYXNWYXJpYWJsZVJlZmVyZW5jZSgpIGNv bnN0CkBAIC0xMzIsOSArMTM2LDkgQEAgU3RyaW5nIENTU0Jhc2ljU2hhcGVFbGxpcHNlOjpjc3NU ZXh0KCkgY29uc3QKIFN0cmluZyBDU1NCYXNpY1NoYXBlRWxsaXBzZTo6c2VyaWFsaXplUmVzb2x2 aW5nVmFyaWFibGVzKGNvbnN0IEhhc2hNYXA8QXRvbWljU3RyaW5nLCBTdHJpbmc+JiB2YXJpYWJs ZXMpIGNvbnN0CiB7CiAgICAgcmV0dXJuIGJ1aWxkRWxsaXBzZVN0cmluZyhtX2NlbnRlclgtPnNl cmlhbGl6ZVJlc29sdmluZ1ZhcmlhYmxlcyh2YXJpYWJsZXMpLAotICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgbV9jZW50ZXJZLT5zZXJpYWxpemVSZXNvbHZpbmdWYXJpYWJsZXModmFyaWFi bGVzKSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1fcmFkaXVzWC0+c2VyaWFsaXpl UmVzb2x2aW5nVmFyaWFibGVzKHZhcmlhYmxlcyksCi0gICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBtX3JhZGl1c1ktPnNlcmlhbGl6ZVJlc29sdmluZ1ZhcmlhYmxlcyh2YXJpYWJsZXMpKTsK KyAgICAgICAgbV9jZW50ZXJZLT5zZXJpYWxpemVSZXNvbHZpbmdWYXJpYWJsZXModmFyaWFibGVz KSwKKyAgICAgICAgbV9yYWRpdXNYLT5zZXJpYWxpemVSZXNvbHZpbmdWYXJpYWJsZXModmFyaWFi bGVzKSwKKyAgICAgICAgbV9yYWRpdXNZLT5zZXJpYWxpemVSZXNvbHZpbmdWYXJpYWJsZXModmFy aWFibGVzKSk7CiB9CiAKIGJvb2wgQ1NTQmFzaWNTaGFwZUVsbGlwc2U6Omhhc1ZhcmlhYmxlUmVm ZXJlbmNlKCkgY29uc3QKQEAgLTE0OCwxOCArMTUyLDMyIEBAIGJvb2wgQ1NTQmFzaWNTaGFwZUVs bGlwc2U6Omhhc1ZhcmlhYmxlUmVmZXJlbmNlKCkgY29uc3QKIAogc3RhdGljIFN0cmluZyBidWls ZFBvbHlnb25TdHJpbmcoY29uc3QgV2luZFJ1bGUmIHdpbmRSdWxlLCBjb25zdCBWZWN0b3I8U3Ry aW5nPiYgcG9pbnRzKQogeworICAgIEFTU0VSVCghKHBvaW50cy5zaXplKCkgJSAyKSk7CisKICAg ICBTdHJpbmdCdWlsZGVyIHJlc3VsdDsKKyAgICBjaGFyIGV2ZW5PZGRPcGVuaW5nW10gPSAicG9s eWdvbihldmVub2RkLCAiOworICAgIGNoYXIgbm9uWmVyb09wZW5pbmdbXSA9ICJwb2x5Z29uKG5v bnplcm8sICI7CisgICAgY2hhciBjb21tYVNlcGFyYXRvcltdID0gIiwgIjsKKyAgICBDT01QSUxF X0FTU0VSVChzaXplb2YoZXZlbk9kZE9wZW5pbmcpID09IHNpemVvZihub25aZXJvT3BlbmluZyks IHBvbHlnb25fc3RyaW5nX29wZW5pbmdzX2hhdmVfc2FtZV9sZW5ndGgpOworICAgIAorICAgIC8v IENvbXB1dGUgdGhlIHJlcXVpcmVkIGNhcGFjaXR5IGluIGFkdmFuY2UgdG8gcmVkdWNlIGFsbG9j YXRpb25zLgorICAgIHNpemVfdCBsZW5ndGggPSBzaXplb2YoZXZlbk9kZE9wZW5pbmcpIC0gMTsK KyAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IHBvaW50cy5zaXplKCk7IGkgKz0gMikgeworICAg ICAgICBpZiAoaSkKKyAgICAgICAgICAgIGxlbmd0aCArPSAoc2l6ZW9mKGNvbW1hU2VwYXJhdG9y KSAtIDEpOworICAgICAgICAvLyBhZGQgbGVuZ3RoIG9mIHR3byBzdHJpbmdzLCBwbHVzIG9uZSBm b3IgdGhlIHNwYWNlIHNlcGFyYXRvci4KKyAgICAgICAgbGVuZ3RoICs9IHBvaW50c1tpXS5sZW5n dGgoKSArIDEgKyBwb2ludHNbaSArIDFdLmxlbmd0aCgpOworICAgIH0KKyAgICByZXN1bHQucmVz ZXJ2ZUNhcGFjaXR5KGxlbmd0aCk7CiAKICAgICBpZiAod2luZFJ1bGUgPT0gUlVMRV9FVkVOT0RE KQotICAgICAgICByZXN1bHQuYXBwZW5kTGl0ZXJhbCgicG9seWdvbihldmVub2RkLCAiKTsKKyAg ICAgICAgcmVzdWx0LmFwcGVuZExpdGVyYWwoZXZlbk9kZE9wZW5pbmcpOwogICAgIGVsc2UKLSAg ICAgICAgcmVzdWx0LmFwcGVuZExpdGVyYWwoInBvbHlnb24obm9uemVybywgIik7Ci0KLSAgICBB U1NFUlQoIShwb2ludHMuc2l6ZSgpICUgMikpOworICAgICAgICByZXN1bHQuYXBwZW5kTGl0ZXJh bChub25aZXJvT3BlbmluZyk7CiAKICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IHBvaW50cy5z aXplKCk7IGkgKz0gMikgewogICAgICAgICBpZiAoaSkKLSAgICAgICAgICAgIHJlc3VsdC5hcHBl bmRMaXRlcmFsKCIsICIpOworICAgICAgICAgICAgcmVzdWx0LmFwcGVuZExpdGVyYWwoY29tbWFT ZXBhcmF0b3IpOwogICAgICAgICByZXN1bHQuYXBwZW5kKHBvaW50c1tpXSk7CiAgICAgICAgIHJl c3VsdC5hcHBlbmQoJyAnKTsKICAgICAgICAgcmVzdWx0LmFwcGVuZChwb2ludHNbaSArIDFdKTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9SZWN0LmggYi9Tb3VyY2UvV2ViQ29yZS9j c3MvUmVjdC5oCmluZGV4IDc2NjZmMTk5Yzc2Mjg0OWZlNzJjYzY5NTgzNGM4ODdkOGEzMTA5YzIu LmZlZWY4NzUyMDM2ZDEzNDIwMjRhMDkzYjE0NWFlNWFmOWRmZGZkZTEgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2Nzcy9SZWN0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL1JlY3QuaApA QCAtODMsOSArODMsOSBAQCBwdWJsaWM6CiAgICAgU3RyaW5nIHNlcmlhbGl6ZVJlc29sdmluZ1Zh cmlhYmxlcyhjb25zdCBIYXNoTWFwPEF0b21pY1N0cmluZywgU3RyaW5nPiYgdmFyaWFibGVzKSBj b25zdAogICAgIHsKICAgICAgICAgcmV0dXJuIGdlbmVyYXRlQ1NTU3RyaW5nKHRvcCgpLT5jdXN0 b21TZXJpYWxpemVSZXNvbHZpbmdWYXJpYWJsZXModmFyaWFibGVzKSwKLSAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIHJpZ2h0KCktPmN1c3RvbVNlcmlhbGl6ZVJlc29sdmluZ1Zhcmlh Ymxlcyh2YXJpYWJsZXMpLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYm90dG9t KCktPmN1c3RvbVNlcmlhbGl6ZVJlc29sdmluZ1ZhcmlhYmxlcyh2YXJpYWJsZXMpLAotICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgbGVmdCgpLT5jdXN0b21TZXJpYWxpemVSZXNvbHZp bmdWYXJpYWJsZXModmFyaWFibGVzKSk7CisgICAgICAgICAgICByaWdodCgpLT5jdXN0b21TZXJp YWxpemVSZXNvbHZpbmdWYXJpYWJsZXModmFyaWFibGVzKSwKKyAgICAgICAgICAgIGJvdHRvbSgp LT5jdXN0b21TZXJpYWxpemVSZXNvbHZpbmdWYXJpYWJsZXModmFyaWFibGVzKSwKKyAgICAgICAg ICAgIGxlZnQoKS0+Y3VzdG9tU2VyaWFsaXplUmVzb2x2aW5nVmFyaWFibGVzKHZhcmlhYmxlcykp OwogICAgIH0KICNlbmRpZgogCkBAIC0xMTMsOSArMTEzLDkgQEAgcHVibGljOgogICAgIFN0cmlu ZyBzZXJpYWxpemVSZXNvbHZpbmdWYXJpYWJsZXMoY29uc3QgSGFzaE1hcDxBdG9taWNTdHJpbmcs IFN0cmluZz4mIHZhcmlhYmxlcykgY29uc3QKICAgICB7CiAgICAgICAgIHJldHVybiBnZW5lcmF0 ZUNTU1N0cmluZyh0b3AoKS0+Y3VzdG9tU2VyaWFsaXplUmVzb2x2aW5nVmFyaWFibGVzKHZhcmlh YmxlcyksCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICByaWdodCgpLT5jdXN0b21T ZXJpYWxpemVSZXNvbHZpbmdWYXJpYWJsZXModmFyaWFibGVzKSwKLSAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGJvdHRvbSgpLT5jdXN0b21TZXJpYWxpemVSZXNvbHZpbmdWYXJpYWJs ZXModmFyaWFibGVzKSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGxlZnQoKS0+ Y3VzdG9tU2VyaWFsaXplUmVzb2x2aW5nVmFyaWFibGVzKHZhcmlhYmxlcykpOworICAgICAgICAg ICAgcmlnaHQoKS0+Y3VzdG9tU2VyaWFsaXplUmVzb2x2aW5nVmFyaWFibGVzKHZhcmlhYmxlcyks CisgICAgICAgICAgICBib3R0b20oKS0+Y3VzdG9tU2VyaWFsaXplUmVzb2x2aW5nVmFyaWFibGVz KHZhcmlhYmxlcyksCisgICAgICAgICAgICBsZWZ0KCktPmN1c3RvbVNlcmlhbGl6ZVJlc29sdmlu Z1ZhcmlhYmxlcyh2YXJpYWJsZXMpKTsKICAgICB9CiAjZW5kaWYKIApAQCAtMTI1LDYgKzEyNSw4 IEBAIHByaXZhdGU6CiAgICAgc3RhdGljIFN0cmluZyBnZW5lcmF0ZUNTU1N0cmluZyhjb25zdCBT dHJpbmcmIHRvcCwgY29uc3QgU3RyaW5nJiByaWdodCwgY29uc3QgU3RyaW5nJiBib3R0b20sIGNv bnN0IFN0cmluZyYgbGVmdCkKICAgICB7CiAgICAgICAgIFN0cmluZ0J1aWxkZXIgcmVzdWx0Owor ICAgICAgICAvLyByZXNlcnZlIHNwYWNlIGZvciB0aGUgZm91ciBzdHJpbmdzLCBwbHVzIHRocmVl IHNwYWNlIHNlcGFyYXRvciBjaGFyYWN0ZXJzLgorICAgICAgICByZXN1bHQucmVzZXJ2ZUNhcGFj aXR5KHRvcC5sZW5ndGgoKSArIHJpZ2h0Lmxlbmd0aCgpICsgYm90dG9tLmxlbmd0aCgpICsgbGVm dC5sZW5ndGgoKSArIDMpOwogICAgICAgICByZXN1bHQuYXBwZW5kKHRvcCk7CiAgICAgICAgIGlm IChyaWdodCAhPSB0b3AgfHwgYm90dG9tICE9IHRvcCB8fCBsZWZ0ICE9IHRvcCkgewogICAgICAg ICAgICAgcmVzdWx0LmFwcGVuZCgnICcpOwo=