177130 2017-09-19 03:43:43 -0700 [css-grid] Small refactoring adding RenderGrid::contentAlignment() 2017-09-27 12:29:55 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 rego rego bfulgham buildbot commit-queue jfernandez simon.fraser svillar webkit-bug-importer zalan oldest_to_newest 1350280 0 rego 2017-09-19 03:43:43 -0700 [css-grid] Small refactoring adding RenderGrid::contentAlignment() 1350281 1 321194 rego 2017-09-19 03:44:38 -0700 Created attachment 321194 Patch 1350282 2 buildbot 2017-09-19 03:46:45 -0700 Attachment 321194 did not pass style-queue: ERROR: Source/WebCore/rendering/RenderGrid.cpp:1586: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Total errors found: 1 in 6 files If any of these errors are false positives, please file a bug against check-webkit-style. 1350283 3 321195 rego 2017-09-19 03:55:21 -0700 Created attachment 321195 Patch 1350287 4 321195 jfernandez 2017-09-19 05:29:31 -0700 Comment on attachment 321195 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=321195&action=review The change looks good to me. > Source/WebCore/ChangeLog:10 > + that is from RenderGrid and GridTrackSizingAlgorithm. I think there is something missing in this sentence; perhaps "accessible" ? 1350288 5 321195 rego 2017-09-19 06:18:30 -0700 Comment on attachment 321195 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=321195&action=review Thanks for the review, uploading new version fixing ChangeLog. >> Source/WebCore/ChangeLog:10 >> + that is from RenderGrid and GridTrackSizingAlgorithm. > > I think there is something missing in this sentence; perhaps "accessible" ? Actually I was thinking in "that is used from", but indeed I didn't write it. 1350296 6 321197 rego 2017-09-19 07:06:37 -0700 Created attachment 321197 Patch 1351588 7 321197 svillar 2017-09-22 02:46:35 -0700 Comment on attachment 321197 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=321197&action=review > Source/WebCore/rendering/GridTrackSizingAlgorithm.cpp:1078 > + || (m_renderGrid->contentAlignment(m_direction).distribution() != ContentDistributionStretch)) Very nice. Do we still need resolvedJustifyContentPosition() and resolvedJustifyContentDistribution() ? 1351589 8 321197 jfernandez 2017-09-22 02:50:11 -0700 Comment on attachment 321197 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=321197&action=review >> Source/WebCore/rendering/GridTrackSizingAlgorithm.cpp:1078 >> + || (m_renderGrid->contentAlignment(m_direction).distribution() != ContentDistributionStretch)) > > Very nice. Do we still need resolvedJustifyContentPosition() and resolvedJustifyContentDistribution() ? Perhaps not, but I think they are both useful functions when only needing specific content alignment values. 1352147 9 rego 2017-09-25 00:33:32 -0700 (In reply to Sergio Villar Senin from comment #7) > Comment on attachment 321197 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=321197&action=review > > > Source/WebCore/rendering/GridTrackSizingAlgorithm.cpp:1078 > > + || (m_renderGrid->contentAlignment(m_direction).distribution() != ContentDistributionStretch)) > > Very nice. Do we still need resolvedJustifyContentPosition() and > resolvedJustifyContentDistribution() ? Some of these are still used by RenderFlexibleBox so I guess it's not an issue to keep them. 1352148 10 321197 commit-queue 2017-09-25 00:34:36 -0700 Comment on attachment 321197 Patch Rejecting attachment 321197 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-02', 'apply-attachment', '--no-update', '--non-interactive', 321197, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit Last 500 characters of output: 71. 1 out of 1 hunk FAILED -- saving rejects to file Source/WebCore/rendering/GridTrackSizingAlgorithm.cpp.rej patching file Source/WebCore/rendering/RenderGrid.cpp patching file Source/WebCore/rendering/RenderGrid.h patching file Source/WebCore/rendering/style/RenderStyle.cpp patching file Source/WebCore/rendering/style/RenderStyle.h Failed to run "[u'/Volumes/Data/EWS/WebKit/Tools/Scripts/svn-apply', '--force', '--reviewer', u'Sergio Villar Senin']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Full output: http://webkit-queues.webkit.org/results/4647172 1352151 11 321673 rego 2017-09-25 00:55:44 -0700 Created attachment 321673 =Patch for landing 1352154 12 321673 commit-queue 2017-09-25 01:39:52 -0700 Comment on attachment 321673 =Patch for landing Clearing flags on attachment: 321673 Committed r222441: <http://trac.webkit.org/changeset/222441> 1352155 13 commit-queue 2017-09-25 01:39:54 -0700 All reviewed patches have been landed. Closing bug. 1353429 14 webkit-bug-importer 2017-09-27 12:29:55 -0700 <rdar://problem/34693381> 321194 2017-09-19 03:44:38 -0700 2017-09-19 03:55:18 -0700 Patch bug-177130-20170919124436.patch text/plain 9445 rego U3VidmVyc2lvbiBSZXZpc2lvbjogMjIyMjA1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTc3Y2M3MGJjNDg2YmUx ZDdkNWJkNDAwNjNhYTU5NTk1OGY0MGFhNS4uMzU1NTgzNDY1YjJkMzcxMWYyN2IwZjRiY2FlMjJh OGUzY2ExMTllNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDE3LTA5LTE5ICBNYW51 ZWwgUmVnbyBDYXNhc25vdmFzICA8cmVnb0BpZ2FsaWEuY29tPgorCisgICAgICAgIFtjc3MtZ3Jp ZF0gU21hbGwgcmVmYWN0b3JpbmcgYWRkaW5nIFJlbmRlckdyaWQ6OmNvbnRlbnRBbGlnbm1lbnQo KQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc3MTMw CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQXMgYSBm b2xsb3ctdXAgb2YgcjIyMTkzMSwgdGhpcyBwYXRjaCBkb2VzIGEgc21hbGwgcmVmYWN0b3JpbmcK KyAgICAgICAgYWRkaW5nIGEgbmV3IG1ldGhvZCBSZW5kZXJHcmlkOjpjb250ZW50QWxpZ25tZW50 KCkKKyAgICAgICAgdGhhdCBpcyBmcm9tIFJlbmRlckdyaWQgYW5kIEdyaWRUcmFja1NpemluZ0Fs Z29yaXRobS4KKworICAgICAgICBObyBuZXcgdGVzdHMsIG5vIGNoYW5nZSBvZiBiZWhhdmlvci4K KworICAgICAgICAqIHJlbmRlcmluZy9HcmlkVHJhY2tTaXppbmdBbGdvcml0aG0uY3BwOgorICAg ICAgICAoV2ViQ29yZTo6R3JpZFRyYWNrU2l6aW5nQWxnb3JpdGhtOjpzdHJldGNoQXV0b1RyYWNr cyk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckdyaWQuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6Y29udGVudEFsaWdubWVudE5vcm1hbEJlaGF2aW9yR3JpZCk6CisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJHcmlkOjpjb250ZW50QWxpZ25tZW50IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6 OlJlbmRlckdyaWQ6OmNvbXB1dGVDb250ZW50UG9zaXRpb25BbmREaXN0cmlidXRpb25PZmZzZXQg Y29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyR3JpZDo6Y29udGVudEFsaWdubWVudE5v cm1hbEJlaGF2aW9yR3JpZCk6IERlbGV0ZWQuCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckdy aWQuaDoKKyAgICAgICAgKiByZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6cmVzb2x2ZWRDb250ZW50QWxpZ25tZW50KToKKyAgICAgICAgKFdlYkNvcmU6 OlJlbmRlclN0eWxlOjpyZXNvbHZlZEFsaWduQ29udGVudCBjb25zdCk6CisgICAgICAgIChXZWJD b3JlOjpSZW5kZXJTdHlsZTo6cmVzb2x2ZWRKdXN0aWZ5Q29udGVudCBjb25zdCk6CisgICAgICAg ICogcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmg6CisKIDIwMTctMDktMTkgIE5hZWwgT3Vl ZHJhb2dvICA8bmFlbC5vdWVkcmFvZ29AY3JmLmNhbm9uLmZyPgogCiAgICAgICAgIFtHVEtdIFRo ZSBiaW5kaW5nIGNvZGUgb2YgTWVkaWEgU291cmNlIEV4dGVuc2lvbiBvZiBBdWRpb1RyYWNrLCBW aWRlb1RyYWNrIGFuZCBUZXh0VHJhY2sgaXMgbm90IGdlbmVyYXRlZApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0dyaWRUcmFja1NpemluZ0FsZ29yaXRobS5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvR3JpZFRyYWNrU2l6aW5nQWxnb3JpdGhtLmNwcAppbmRleCAz YTNlYjk1ODE5ZmU5N2VkYzI5ZWZkMzliNjgyOGU4NmM5OTdhMTkwLi5hZWU3OTg1YzhhYTllNTUw ODc1Y2Q1ZGExYmZhZGFjZTU4YTlmMDcwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvR3JpZFRyYWNrU2l6aW5nQWxnb3JpdGhtLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvR3JpZFRyYWNrU2l6aW5nQWxnb3JpdGhtLmNwcApAQCAtMTA3MSwxNCArMTA3MSwx MSBAQCB2b2lkIEdyaWRUcmFja1NpemluZ0FsZ29yaXRobTo6c3RyZXRjaEZsZXhpYmxlVHJhY2tz KHN0ZDo6b3B0aW9uYWw8TGF5b3V0VW5pdD4gZgogCiB2b2lkIEdyaWRUcmFja1NpemluZ0FsZ29y aXRobTo6c3RyZXRjaEF1dG9UcmFja3MoKQogewotICAgIGlmIChtX2F1dG9TaXplZFRyYWNrc0lu ZGV4LmlzRW1wdHkoKSkKLSAgICAgICAgcmV0dXJuOwotCiAgICAgYXV0byBjdXJyZW50RnJlZVNw YWNlID0gZnJlZVNwYWNlKG1fZGlyZWN0aW9uKTsKLSAgICBpZiAoIWN1cnJlbnRGcmVlU3BhY2UK KyAgICBpZiAobV9hdXRvU2l6ZWRUcmFja3NJbmRleC5pc0VtcHR5KCkKKyAgICAgICAgfHwgIWN1 cnJlbnRGcmVlU3BhY2UKICAgICAgICAgfHwgY3VycmVudEZyZWVTcGFjZS52YWx1ZSgpIDw9IDAK LSAgICAgICAgfHwgKG1fZGlyZWN0aW9uID09IEZvckNvbHVtbnMgJiYgbV9yZW5kZXJHcmlkLT5z dHlsZSgpLnJlc29sdmVkSnVzdGlmeUNvbnRlbnREaXN0cmlidXRpb24obV9yZW5kZXJHcmlkLT5j b250ZW50QWxpZ25tZW50Tm9ybWFsQmVoYXZpb3JHcmlkKCkpICE9IENvbnRlbnREaXN0cmlidXRp b25TdHJldGNoKQotICAgICAgICB8fCAobV9kaXJlY3Rpb24gPT0gRm9yUm93cyAmJiBtX3JlbmRl ckdyaWQtPnN0eWxlKCkucmVzb2x2ZWRBbGlnbkNvbnRlbnREaXN0cmlidXRpb24obV9yZW5kZXJH cmlkLT5jb250ZW50QWxpZ25tZW50Tm9ybWFsQmVoYXZpb3JHcmlkKCkpICE9IENvbnRlbnREaXN0 cmlidXRpb25TdHJldGNoKSkKKyAgICAgICAgfHwgKG1fcmVuZGVyR3JpZC0+Y29udGVudEFsaWdu bWVudChtX2RpcmVjdGlvbikuZGlzdHJpYnV0aW9uKCkgIT0gQ29udGVudERpc3RyaWJ1dGlvblN0 cmV0Y2gpKQogICAgICAgICByZXR1cm47CiAKICAgICBWZWN0b3I8R3JpZFRyYWNrPiYgYWxsVHJh Y2tzID0gdHJhY2tzKG1fZGlyZWN0aW9uKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJHcmlkLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJH cmlkLmNwcAppbmRleCA2Y2ZjMzdiZDQ1NjZmM2JkMWM4ODNlZGU0YzNhYjI0MWU5ODFkYTEwLi45 MTRiMzdiYjMzYWVkNzZhNjExN2IyMGJmNWQ0MDA0ZWM1ZGU5MTlmIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyR3JpZC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckdyaWQuY3BwCkBAIC04NzcsNyArODc3LDcgQEAgVmVjdG9yPExheW91 dFVuaXQ+IFJlbmRlckdyaWQ6OnRyYWNrU2l6ZXNGb3JDb21wdXRlZFN0eWxlKEdyaWRUcmFja1Np emluZ0RpcmVjdGkKICAgICByZXR1cm4gdHJhY2tzOwogfQogCi1jb25zdCBTdHlsZUNvbnRlbnRB bGlnbm1lbnREYXRhJiBSZW5kZXJHcmlkOjpjb250ZW50QWxpZ25tZW50Tm9ybWFsQmVoYXZpb3JH cmlkKCkKK3N0YXRpYyBjb25zdCBTdHlsZUNvbnRlbnRBbGlnbm1lbnREYXRhJiBjb250ZW50QWxp Z25tZW50Tm9ybWFsQmVoYXZpb3JHcmlkKCkKIHsKICAgICBzdGF0aWMgY29uc3QgU3R5bGVDb250 ZW50QWxpZ25tZW50RGF0YSBub3JtYWxCZWhhdmlvciA9IHtDb250ZW50UG9zaXRpb25Ob3JtYWws IENvbnRlbnREaXN0cmlidXRpb25TdHJldGNofTsKICAgICByZXR1cm4gbm9ybWFsQmVoYXZpb3I7 CkBAIC0xNTgxLDE5ICsxNTgxLDIzIEBAIHN0YXRpYyBDb250ZW50QWxpZ25tZW50RGF0YSBjb250 ZW50RGlzdHJpYnV0aW9uT2Zmc2V0KGNvbnN0IExheW91dFVuaXQmIGF2YWlsYWJsCiAgICAgcmV0 dXJuIENvbnRlbnRBbGlnbm1lbnREYXRhOjpkZWZhdWx0T2Zmc2V0cygpOwogfQogCitTdHlsZUNv bnRlbnRBbGlnbm1lbnREYXRhIFJlbmRlckdyaWQ6OmNvbnRlbnRBbGlnbm1lbnQoCisgICAgR3Jp ZFRyYWNrU2l6aW5nRGlyZWN0aW9uIGRpcmVjdGlvbikgY29uc3QgeworICByZXR1cm4gZGlyZWN0 aW9uID09IEZvckNvbHVtbnMgPyBzdHlsZSgpLnJlc29sdmVkSnVzdGlmeUNvbnRlbnQoY29udGVu dEFsaWdubWVudE5vcm1hbEJlaGF2aW9yR3JpZCgpKSA6IHN0eWxlKCkucmVzb2x2ZWRBbGlnbkNv bnRlbnQoY29udGVudEFsaWdubWVudE5vcm1hbEJlaGF2aW9yR3JpZCgpKTsKK30KKwogQ29udGVu dEFsaWdubWVudERhdGEgUmVuZGVyR3JpZDo6Y29tcHV0ZUNvbnRlbnRQb3NpdGlvbkFuZERpc3Ry aWJ1dGlvbk9mZnNldChHcmlkVHJhY2tTaXppbmdEaXJlY3Rpb24gZGlyZWN0aW9uLCBjb25zdCBM YXlvdXRVbml0JiBhdmFpbGFibGVGcmVlU3BhY2UsIHVuc2lnbmVkIG51bWJlck9mR3JpZFRyYWNr cykgY29uc3QKIHsKICAgICBib29sIGlzUm93QXhpcyA9IGRpcmVjdGlvbiA9PSBGb3JDb2x1bW5z OwotICAgIGF1dG8gcG9zaXRpb24gPSBpc1Jvd0F4aXMgPyBzdHlsZSgpLnJlc29sdmVkSnVzdGlm eUNvbnRlbnRQb3NpdGlvbihjb250ZW50QWxpZ25tZW50Tm9ybWFsQmVoYXZpb3JHcmlkKCkpIDog c3R5bGUoKS5yZXNvbHZlZEFsaWduQ29udGVudFBvc2l0aW9uKGNvbnRlbnRBbGlnbm1lbnROb3Jt YWxCZWhhdmlvckdyaWQoKSk7Ci0gICAgYXV0byBkaXN0cmlidXRpb24gPSBpc1Jvd0F4aXMgPyBz dHlsZSgpLnJlc29sdmVkSnVzdGlmeUNvbnRlbnREaXN0cmlidXRpb24oY29udGVudEFsaWdubWVu dE5vcm1hbEJlaGF2aW9yR3JpZCgpKSA6IHN0eWxlKCkucmVzb2x2ZWRBbGlnbkNvbnRlbnREaXN0 cmlidXRpb24oY29udGVudEFsaWdubWVudE5vcm1hbEJlaGF2aW9yR3JpZCgpKTsKKyAgICBhdXRv IGNvbnRlbnRBbGlnbm1lbnREYXRhID0gY29udGVudEFsaWdubWVudChkaXJlY3Rpb24pOworICAg IGF1dG8gcG9zaXRpb24gPSBjb250ZW50QWxpZ25tZW50RGF0YS5wb3NpdGlvbigpOwogICAgIC8v IElmIDxjb250ZW50LWRpc3RyaWJ1dGlvbj4gdmFsdWUgY2FuJ3QgYmUgYXBwbGllZCwgJ3Bvc2l0 aW9uJyB3aWxsIGJlY29tZSB0aGUgYXNzb2NpYXRlZAogICAgIC8vIDxjb250ZW50LXBvc2l0aW9u PiBmYWxsYmFjayB2YWx1ZS4KLSAgICBhdXRvIGNvbnRlbnRBbGlnbm1lbnQgPSBjb250ZW50RGlz dHJpYnV0aW9uT2Zmc2V0KGF2YWlsYWJsZUZyZWVTcGFjZSwgcG9zaXRpb24sIGRpc3RyaWJ1dGlv biwgbnVtYmVyT2ZHcmlkVHJhY2tzKTsKKyAgICBhdXRvIGNvbnRlbnRBbGlnbm1lbnQgPSBjb250 ZW50RGlzdHJpYnV0aW9uT2Zmc2V0KGF2YWlsYWJsZUZyZWVTcGFjZSwgcG9zaXRpb24sIGNvbnRl bnRBbGlnbm1lbnREYXRhLmRpc3RyaWJ1dGlvbigpLCBudW1iZXJPZkdyaWRUcmFja3MpOwogICAg IGlmIChjb250ZW50QWxpZ25tZW50LmlzVmFsaWQoKSkKICAgICAgICAgcmV0dXJuIGNvbnRlbnRB bGlnbm1lbnQ7CiAKLSAgICBhdXRvIG92ZXJmbG93ID0gKGlzUm93QXhpcyA/IHN0eWxlKCkuanVz dGlmeUNvbnRlbnQoKSA6IHN0eWxlKCkuYWxpZ25Db250ZW50KCkpLm92ZXJmbG93KCk7Ci0gICAg aWYgKGF2YWlsYWJsZUZyZWVTcGFjZSA8PSAwICYmIG92ZXJmbG93ID09IE92ZXJmbG93QWxpZ25t ZW50U2FmZSkKKyAgICBpZiAoYXZhaWxhYmxlRnJlZVNwYWNlIDw9IDAgJiYgY29udGVudEFsaWdu bWVudERhdGEub3ZlcmZsb3coKSA9PSBPdmVyZmxvd0FsaWdubWVudFNhZmUpCiAgICAgICAgIHJl dHVybiB7MCwgMH07CiAKICAgICBzd2l0Y2ggKHBvc2l0aW9uKSB7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyR3JpZC5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckdyaWQuaAppbmRleCA0OGI0NGNmYzlkOWQ1ZDgzYzVhYmJkMTNiNGNjNTIyNmM0 YzRlMjNhLi5jYTAyNWU2NzZmYWNkMzc3YzY4MTYzNDk3MjU1ZmVhNmQ1OTBjOWM5IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyR3JpZC5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmgKQEAgLTY1LDcgKzY1LDcgQEAgcHVibGljOgog ICAgIGJvb2wgaXNPcnRob2dvbmFsQ2hpbGQoY29uc3QgUmVuZGVyQm94JikgY29uc3Q7CiAgICAg TGF5b3V0VW5pdCBndXR0ZXJzU2l6ZShjb25zdCBHcmlkJiwgR3JpZFRyYWNrU2l6aW5nRGlyZWN0 aW9uLCB1bnNpZ25lZCBzdGFydExpbmUsIHVuc2lnbmVkIHNwYW4sIHN0ZDo6b3B0aW9uYWw8TGF5 b3V0VW5pdD4gYXZhaWxhYmxlU2l6ZSkgY29uc3Q7CiAKLSAgICBzdGF0aWMgY29uc3QgU3R5bGVD b250ZW50QWxpZ25tZW50RGF0YSYgY29udGVudEFsaWdubWVudE5vcm1hbEJlaGF2aW9yR3JpZCgp OworICAgIFN0eWxlQ29udGVudEFsaWdubWVudERhdGEgY29udGVudEFsaWdubWVudChHcmlkVHJh Y2tTaXppbmdEaXJlY3Rpb24pIGNvbnN0OwogCiBwcm90ZWN0ZWQ6CiAgICAgSXRlbVBvc2l0aW9u IHNlbGZBbGlnbm1lbnROb3JtYWxCZWhhdmlvcihjb25zdCBSZW5kZXJCb3gqIGNoaWxkID0gbnVs bHB0cikgY29uc3Qgb3ZlcnJpZGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9zdHlsZS9SZW5kZXJTdHlsZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUv UmVuZGVyU3R5bGUuY3BwCmluZGV4IDkyY2Q4Yjc3OTlhYmQyNTA2YzUyY2YzNzM5NDVmOWE0N2Vl Y2VmZTQuLmQwNDQyZjkzOTNmM2YwNWMzYTI2YmRmMDFlN2RhMzE5NDM1MDQ1MDcgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmNwcApAQCAtMjgwLDYg KzI4MCwyMyBAQCBTdHlsZVNlbGZBbGlnbm1lbnREYXRhIFJlbmRlclN0eWxlOjpyZXNvbHZlZEp1 c3RpZnlTZWxmKGNvbnN0IFJlbmRlclN0eWxlKiBwYXJlbgogICAgIHJldHVybiBwYXJlbnRTdHls ZS0+cmVzb2x2ZWRKdXN0aWZ5SXRlbXMobm9ybWFsVmFsdWVCZWhhdmlvdXIpOwogfQogCitzdGF0 aWMgaW5saW5lIFN0eWxlQ29udGVudEFsaWdubWVudERhdGEgcmVzb2x2ZWRDb250ZW50QWxpZ25t ZW50KGNvbnN0IFN0eWxlQ29udGVudEFsaWdubWVudERhdGEmIHZhbHVlLCBjb25zdCBTdHlsZUNv bnRlbnRBbGlnbm1lbnREYXRhJiBub3JtYWxWYWx1ZUJlaGF2aW9yKQoreworICAgIHJldHVybiAo dmFsdWUucG9zaXRpb24oKSA9PSBDb250ZW50UG9zaXRpb25Ob3JtYWwgJiYgdmFsdWUuZGlzdHJp YnV0aW9uKCkgPT0gQ29udGVudERpc3RyaWJ1dGlvbkRlZmF1bHQpID8gbm9ybWFsVmFsdWVCZWhh dmlvciA6IHZhbHVlOworfQorCitTdHlsZUNvbnRlbnRBbGlnbm1lbnREYXRhIFJlbmRlclN0eWxl OjpyZXNvbHZlZEFsaWduQ29udGVudChjb25zdCBTdHlsZUNvbnRlbnRBbGlnbm1lbnREYXRhJiBu b3JtYWxWYWx1ZUJlaGF2aW9yKSBjb25zdAoreworICAgIC8vIFdlIHdpbGwgcmV0dXJuIHRoZSBi ZWhhdmlvdXIgb2YgJ25vcm1hbCcgdmFsdWUgaWYgbmVlZGVkLCB3aGljaCBpcyBzcGVjaWZpYyBv ZiBlYWNoIGxheW91dCBtb2RlbC4KKyAgICByZXR1cm4gcmVzb2x2ZWRDb250ZW50QWxpZ25tZW50 KGFsaWduQ29udGVudCgpLCBub3JtYWxWYWx1ZUJlaGF2aW9yKTsKK30KKworU3R5bGVDb250ZW50 QWxpZ25tZW50RGF0YSBSZW5kZXJTdHlsZTo6cmVzb2x2ZWRKdXN0aWZ5Q29udGVudChjb25zdCBT dHlsZUNvbnRlbnRBbGlnbm1lbnREYXRhJiBub3JtYWxWYWx1ZUJlaGF2aW9yKSBjb25zdAorewor ICAgIC8vIFdlIHdpbGwgcmV0dXJuIHRoZSBiZWhhdmlvdXIgb2YgJ25vcm1hbCcgdmFsdWUgaWYg bmVlZGVkLCB3aGljaCBpcyBzcGVjaWZpYyBvZiBlYWNoIGxheW91dCBtb2RlbC4KKyAgICByZXR1 cm4gcmVzb2x2ZWRDb250ZW50QWxpZ25tZW50KGp1c3RpZnlDb250ZW50KCksIG5vcm1hbFZhbHVl QmVoYXZpb3IpOworfQorCiBzdGF0aWMgaW5saW5lIENvbnRlbnRQb3NpdGlvbiByZXNvbHZlZENv bnRlbnRBbGlnbm1lbnRQb3NpdGlvbihjb25zdCBTdHlsZUNvbnRlbnRBbGlnbm1lbnREYXRhJiB2 YWx1ZSwgY29uc3QgU3R5bGVDb250ZW50QWxpZ25tZW50RGF0YSYgbm9ybWFsVmFsdWVCZWhhdmlv cikKIHsKICAgICByZXR1cm4gKHZhbHVlLnBvc2l0aW9uKCkgPT0gQ29udGVudFBvc2l0aW9uTm9y bWFsICYmIHZhbHVlLmRpc3RyaWJ1dGlvbigpID09IENvbnRlbnREaXN0cmlidXRpb25EZWZhdWx0 KSA/IG5vcm1hbFZhbHVlQmVoYXZpb3IucG9zaXRpb24oKSA6IHZhbHVlLnBvc2l0aW9uKCk7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuaCBi L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5oCmluZGV4IDFjMTQ5 MDVjZTllMmM3M2U1ZTJmNWVkZjNlYjhhNzExMTljYzAxY2QuLmY2OGJkNTFkMmJhYTg0OGFkYTNl MmQxMmRiMjUzODA3ZjkzOWVhZmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9zdHlsZS9SZW5kZXJTdHlsZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHls ZS9SZW5kZXJTdHlsZS5oCkBAIC0xNjYsOCArMTY2LDEwIEBAIHB1YmxpYzoKICAgICBDb250ZW50 RGlzdHJpYnV0aW9uVHlwZSByZXNvbHZlZEFsaWduQ29udGVudERpc3RyaWJ1dGlvbihjb25zdCBT dHlsZUNvbnRlbnRBbGlnbm1lbnREYXRhJiBub3JtYWxWYWx1ZUJlaGF2aW9yKSBjb25zdDsKICAg ICBTdHlsZVNlbGZBbGlnbm1lbnREYXRhIHJlc29sdmVkQWxpZ25JdGVtcyhJdGVtUG9zaXRpb24g bm9ybWFsVmFsdWVCZWhhdmlvdXIpIGNvbnN0OwogICAgIFN0eWxlU2VsZkFsaWdubWVudERhdGEg cmVzb2x2ZWRBbGlnblNlbGYoY29uc3QgUmVuZGVyU3R5bGUqIHBhcmVudFN0eWxlLCBJdGVtUG9z aXRpb24gbm9ybWFsVmFsdWVCZWhhdmlvdXIpIGNvbnN0OworICAgIFN0eWxlQ29udGVudEFsaWdu bWVudERhdGEgcmVzb2x2ZWRBbGlnbkNvbnRlbnQoY29uc3QgU3R5bGVDb250ZW50QWxpZ25tZW50 RGF0YSYgbm9ybWFsVmFsdWVCZWhhdmlvdXIpIGNvbnN0OwogICAgIFN0eWxlU2VsZkFsaWdubWVu dERhdGEgcmVzb2x2ZWRKdXN0aWZ5SXRlbXMoSXRlbVBvc2l0aW9uIG5vcm1hbFZhbHVlQmVoYXZp b3VyKSBjb25zdDsKICAgICBTdHlsZVNlbGZBbGlnbm1lbnREYXRhIHJlc29sdmVkSnVzdGlmeVNl bGYoY29uc3QgUmVuZGVyU3R5bGUqIHBhcmVudFN0eWxlLCBJdGVtUG9zaXRpb24gbm9ybWFsVmFs dWVCZWhhdmlvdXIpIGNvbnN0OworICAgIFN0eWxlQ29udGVudEFsaWdubWVudERhdGEgcmVzb2x2 ZWRKdXN0aWZ5Q29udGVudChjb25zdCBTdHlsZUNvbnRlbnRBbGlnbm1lbnREYXRhJiBub3JtYWxW YWx1ZUJlaGF2aW91cikgY29uc3Q7CiAKICAgICBQc2V1ZG9JZCBzdHlsZVR5cGUoKSBjb25zdCB7 IHJldHVybiBzdGF0aWNfY2FzdDxQc2V1ZG9JZD4obV9ub25Jbmhlcml0ZWRGbGFncy5zdHlsZVR5 cGUpOyB9CiAgICAgdm9pZCBzZXRTdHlsZVR5cGUoUHNldWRvSWQgc3R5bGVUeXBlKSB7IG1fbm9u SW5oZXJpdGVkRmxhZ3Muc3R5bGVUeXBlID0gc3R5bGVUeXBlOyB9Cg== 321195 2017-09-19 03:55:21 -0700 2017-09-19 07:06:33 -0700 Patch bug-177130-20170919125520.patch text/plain 9442 rego U3VidmVyc2lvbiBSZXZpc2lvbjogMjIyMjA1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTc3Y2M3MGJjNDg2YmUx ZDdkNWJkNDAwNjNhYTU5NTk1OGY0MGFhNS4uMzU1NTgzNDY1YjJkMzcxMWYyN2IwZjRiY2FlMjJh OGUzY2ExMTllNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDE3LTA5LTE5ICBNYW51 ZWwgUmVnbyBDYXNhc25vdmFzICA8cmVnb0BpZ2FsaWEuY29tPgorCisgICAgICAgIFtjc3MtZ3Jp ZF0gU21hbGwgcmVmYWN0b3JpbmcgYWRkaW5nIFJlbmRlckdyaWQ6OmNvbnRlbnRBbGlnbm1lbnQo KQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc3MTMw CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQXMgYSBm b2xsb3ctdXAgb2YgcjIyMTkzMSwgdGhpcyBwYXRjaCBkb2VzIGEgc21hbGwgcmVmYWN0b3JpbmcK KyAgICAgICAgYWRkaW5nIGEgbmV3IG1ldGhvZCBSZW5kZXJHcmlkOjpjb250ZW50QWxpZ25tZW50 KCkKKyAgICAgICAgdGhhdCBpcyBmcm9tIFJlbmRlckdyaWQgYW5kIEdyaWRUcmFja1NpemluZ0Fs Z29yaXRobS4KKworICAgICAgICBObyBuZXcgdGVzdHMsIG5vIGNoYW5nZSBvZiBiZWhhdmlvci4K KworICAgICAgICAqIHJlbmRlcmluZy9HcmlkVHJhY2tTaXppbmdBbGdvcml0aG0uY3BwOgorICAg ICAgICAoV2ViQ29yZTo6R3JpZFRyYWNrU2l6aW5nQWxnb3JpdGhtOjpzdHJldGNoQXV0b1RyYWNr cyk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckdyaWQuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6Y29udGVudEFsaWdubWVudE5vcm1hbEJlaGF2aW9yR3JpZCk6CisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJHcmlkOjpjb250ZW50QWxpZ25tZW50IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6 OlJlbmRlckdyaWQ6OmNvbXB1dGVDb250ZW50UG9zaXRpb25BbmREaXN0cmlidXRpb25PZmZzZXQg Y29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyR3JpZDo6Y29udGVudEFsaWdubWVudE5v cm1hbEJlaGF2aW9yR3JpZCk6IERlbGV0ZWQuCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckdy aWQuaDoKKyAgICAgICAgKiByZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6cmVzb2x2ZWRDb250ZW50QWxpZ25tZW50KToKKyAgICAgICAgKFdlYkNvcmU6 OlJlbmRlclN0eWxlOjpyZXNvbHZlZEFsaWduQ29udGVudCBjb25zdCk6CisgICAgICAgIChXZWJD b3JlOjpSZW5kZXJTdHlsZTo6cmVzb2x2ZWRKdXN0aWZ5Q29udGVudCBjb25zdCk6CisgICAgICAg ICogcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmg6CisKIDIwMTctMDktMTkgIE5hZWwgT3Vl ZHJhb2dvICA8bmFlbC5vdWVkcmFvZ29AY3JmLmNhbm9uLmZyPgogCiAgICAgICAgIFtHVEtdIFRo ZSBiaW5kaW5nIGNvZGUgb2YgTWVkaWEgU291cmNlIEV4dGVuc2lvbiBvZiBBdWRpb1RyYWNrLCBW aWRlb1RyYWNrIGFuZCBUZXh0VHJhY2sgaXMgbm90IGdlbmVyYXRlZApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0dyaWRUcmFja1NpemluZ0FsZ29yaXRobS5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvR3JpZFRyYWNrU2l6aW5nQWxnb3JpdGhtLmNwcAppbmRleCAz YTNlYjk1ODE5ZmU5N2VkYzI5ZWZkMzliNjgyOGU4NmM5OTdhMTkwLi5hZWU3OTg1YzhhYTllNTUw ODc1Y2Q1ZGExYmZhZGFjZTU4YTlmMDcwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvR3JpZFRyYWNrU2l6aW5nQWxnb3JpdGhtLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvR3JpZFRyYWNrU2l6aW5nQWxnb3JpdGhtLmNwcApAQCAtMTA3MSwxNCArMTA3MSwx MSBAQCB2b2lkIEdyaWRUcmFja1NpemluZ0FsZ29yaXRobTo6c3RyZXRjaEZsZXhpYmxlVHJhY2tz KHN0ZDo6b3B0aW9uYWw8TGF5b3V0VW5pdD4gZgogCiB2b2lkIEdyaWRUcmFja1NpemluZ0FsZ29y aXRobTo6c3RyZXRjaEF1dG9UcmFja3MoKQogewotICAgIGlmIChtX2F1dG9TaXplZFRyYWNrc0lu ZGV4LmlzRW1wdHkoKSkKLSAgICAgICAgcmV0dXJuOwotCiAgICAgYXV0byBjdXJyZW50RnJlZVNw YWNlID0gZnJlZVNwYWNlKG1fZGlyZWN0aW9uKTsKLSAgICBpZiAoIWN1cnJlbnRGcmVlU3BhY2UK KyAgICBpZiAobV9hdXRvU2l6ZWRUcmFja3NJbmRleC5pc0VtcHR5KCkKKyAgICAgICAgfHwgIWN1 cnJlbnRGcmVlU3BhY2UKICAgICAgICAgfHwgY3VycmVudEZyZWVTcGFjZS52YWx1ZSgpIDw9IDAK LSAgICAgICAgfHwgKG1fZGlyZWN0aW9uID09IEZvckNvbHVtbnMgJiYgbV9yZW5kZXJHcmlkLT5z dHlsZSgpLnJlc29sdmVkSnVzdGlmeUNvbnRlbnREaXN0cmlidXRpb24obV9yZW5kZXJHcmlkLT5j b250ZW50QWxpZ25tZW50Tm9ybWFsQmVoYXZpb3JHcmlkKCkpICE9IENvbnRlbnREaXN0cmlidXRp b25TdHJldGNoKQotICAgICAgICB8fCAobV9kaXJlY3Rpb24gPT0gRm9yUm93cyAmJiBtX3JlbmRl ckdyaWQtPnN0eWxlKCkucmVzb2x2ZWRBbGlnbkNvbnRlbnREaXN0cmlidXRpb24obV9yZW5kZXJH cmlkLT5jb250ZW50QWxpZ25tZW50Tm9ybWFsQmVoYXZpb3JHcmlkKCkpICE9IENvbnRlbnREaXN0 cmlidXRpb25TdHJldGNoKSkKKyAgICAgICAgfHwgKG1fcmVuZGVyR3JpZC0+Y29udGVudEFsaWdu bWVudChtX2RpcmVjdGlvbikuZGlzdHJpYnV0aW9uKCkgIT0gQ29udGVudERpc3RyaWJ1dGlvblN0 cmV0Y2gpKQogICAgICAgICByZXR1cm47CiAKICAgICBWZWN0b3I8R3JpZFRyYWNrPiYgYWxsVHJh Y2tzID0gdHJhY2tzKG1fZGlyZWN0aW9uKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJHcmlkLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJH cmlkLmNwcAppbmRleCA2Y2ZjMzdiZDQ1NjZmM2JkMWM4ODNlZGU0YzNhYjI0MWU5ODFkYTEwLi5l NDM3YWQ3ZTRjZDlkNzdiMDJjYzFhYWI2M2JjMWE3OTMxYzFjYzBiIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyR3JpZC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckdyaWQuY3BwCkBAIC04NzcsNyArODc3LDcgQEAgVmVjdG9yPExheW91 dFVuaXQ+IFJlbmRlckdyaWQ6OnRyYWNrU2l6ZXNGb3JDb21wdXRlZFN0eWxlKEdyaWRUcmFja1Np emluZ0RpcmVjdGkKICAgICByZXR1cm4gdHJhY2tzOwogfQogCi1jb25zdCBTdHlsZUNvbnRlbnRB bGlnbm1lbnREYXRhJiBSZW5kZXJHcmlkOjpjb250ZW50QWxpZ25tZW50Tm9ybWFsQmVoYXZpb3JH cmlkKCkKK3N0YXRpYyBjb25zdCBTdHlsZUNvbnRlbnRBbGlnbm1lbnREYXRhJiBjb250ZW50QWxp Z25tZW50Tm9ybWFsQmVoYXZpb3JHcmlkKCkKIHsKICAgICBzdGF0aWMgY29uc3QgU3R5bGVDb250 ZW50QWxpZ25tZW50RGF0YSBub3JtYWxCZWhhdmlvciA9IHtDb250ZW50UG9zaXRpb25Ob3JtYWws IENvbnRlbnREaXN0cmlidXRpb25TdHJldGNofTsKICAgICByZXR1cm4gbm9ybWFsQmVoYXZpb3I7 CkBAIC0xNTgxLDE5ICsxNTgxLDIzIEBAIHN0YXRpYyBDb250ZW50QWxpZ25tZW50RGF0YSBjb250 ZW50RGlzdHJpYnV0aW9uT2Zmc2V0KGNvbnN0IExheW91dFVuaXQmIGF2YWlsYWJsCiAgICAgcmV0 dXJuIENvbnRlbnRBbGlnbm1lbnREYXRhOjpkZWZhdWx0T2Zmc2V0cygpOwogfQogCitTdHlsZUNv bnRlbnRBbGlnbm1lbnREYXRhIFJlbmRlckdyaWQ6OmNvbnRlbnRBbGlnbm1lbnQoR3JpZFRyYWNr U2l6aW5nRGlyZWN0aW9uIGRpcmVjdGlvbikgY29uc3QKK3sKKyAgICByZXR1cm4gZGlyZWN0aW9u ID09IEZvckNvbHVtbnMgPyBzdHlsZSgpLnJlc29sdmVkSnVzdGlmeUNvbnRlbnQoY29udGVudEFs aWdubWVudE5vcm1hbEJlaGF2aW9yR3JpZCgpKSA6IHN0eWxlKCkucmVzb2x2ZWRBbGlnbkNvbnRl bnQoY29udGVudEFsaWdubWVudE5vcm1hbEJlaGF2aW9yR3JpZCgpKTsKK30KKwogQ29udGVudEFs aWdubWVudERhdGEgUmVuZGVyR3JpZDo6Y29tcHV0ZUNvbnRlbnRQb3NpdGlvbkFuZERpc3RyaWJ1 dGlvbk9mZnNldChHcmlkVHJhY2tTaXppbmdEaXJlY3Rpb24gZGlyZWN0aW9uLCBjb25zdCBMYXlv dXRVbml0JiBhdmFpbGFibGVGcmVlU3BhY2UsIHVuc2lnbmVkIG51bWJlck9mR3JpZFRyYWNrcykg Y29uc3QKIHsKICAgICBib29sIGlzUm93QXhpcyA9IGRpcmVjdGlvbiA9PSBGb3JDb2x1bW5zOwot ICAgIGF1dG8gcG9zaXRpb24gPSBpc1Jvd0F4aXMgPyBzdHlsZSgpLnJlc29sdmVkSnVzdGlmeUNv bnRlbnRQb3NpdGlvbihjb250ZW50QWxpZ25tZW50Tm9ybWFsQmVoYXZpb3JHcmlkKCkpIDogc3R5 bGUoKS5yZXNvbHZlZEFsaWduQ29udGVudFBvc2l0aW9uKGNvbnRlbnRBbGlnbm1lbnROb3JtYWxC ZWhhdmlvckdyaWQoKSk7Ci0gICAgYXV0byBkaXN0cmlidXRpb24gPSBpc1Jvd0F4aXMgPyBzdHls ZSgpLnJlc29sdmVkSnVzdGlmeUNvbnRlbnREaXN0cmlidXRpb24oY29udGVudEFsaWdubWVudE5v cm1hbEJlaGF2aW9yR3JpZCgpKSA6IHN0eWxlKCkucmVzb2x2ZWRBbGlnbkNvbnRlbnREaXN0cmli dXRpb24oY29udGVudEFsaWdubWVudE5vcm1hbEJlaGF2aW9yR3JpZCgpKTsKKyAgICBhdXRvIGNv bnRlbnRBbGlnbm1lbnREYXRhID0gY29udGVudEFsaWdubWVudChkaXJlY3Rpb24pOworICAgIGF1 dG8gcG9zaXRpb24gPSBjb250ZW50QWxpZ25tZW50RGF0YS5wb3NpdGlvbigpOwogICAgIC8vIElm IDxjb250ZW50LWRpc3RyaWJ1dGlvbj4gdmFsdWUgY2FuJ3QgYmUgYXBwbGllZCwgJ3Bvc2l0aW9u JyB3aWxsIGJlY29tZSB0aGUgYXNzb2NpYXRlZAogICAgIC8vIDxjb250ZW50LXBvc2l0aW9uPiBm YWxsYmFjayB2YWx1ZS4KLSAgICBhdXRvIGNvbnRlbnRBbGlnbm1lbnQgPSBjb250ZW50RGlzdHJp YnV0aW9uT2Zmc2V0KGF2YWlsYWJsZUZyZWVTcGFjZSwgcG9zaXRpb24sIGRpc3RyaWJ1dGlvbiwg bnVtYmVyT2ZHcmlkVHJhY2tzKTsKKyAgICBhdXRvIGNvbnRlbnRBbGlnbm1lbnQgPSBjb250ZW50 RGlzdHJpYnV0aW9uT2Zmc2V0KGF2YWlsYWJsZUZyZWVTcGFjZSwgcG9zaXRpb24sIGNvbnRlbnRB bGlnbm1lbnREYXRhLmRpc3RyaWJ1dGlvbigpLCBudW1iZXJPZkdyaWRUcmFja3MpOwogICAgIGlm IChjb250ZW50QWxpZ25tZW50LmlzVmFsaWQoKSkKICAgICAgICAgcmV0dXJuIGNvbnRlbnRBbGln bm1lbnQ7CiAKLSAgICBhdXRvIG92ZXJmbG93ID0gKGlzUm93QXhpcyA/IHN0eWxlKCkuanVzdGlm eUNvbnRlbnQoKSA6IHN0eWxlKCkuYWxpZ25Db250ZW50KCkpLm92ZXJmbG93KCk7Ci0gICAgaWYg KGF2YWlsYWJsZUZyZWVTcGFjZSA8PSAwICYmIG92ZXJmbG93ID09IE92ZXJmbG93QWxpZ25tZW50 U2FmZSkKKyAgICBpZiAoYXZhaWxhYmxlRnJlZVNwYWNlIDw9IDAgJiYgY29udGVudEFsaWdubWVu dERhdGEub3ZlcmZsb3coKSA9PSBPdmVyZmxvd0FsaWdubWVudFNhZmUpCiAgICAgICAgIHJldHVy biB7MCwgMH07CiAKICAgICBzd2l0Y2ggKHBvc2l0aW9uKSB7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyR3JpZC5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckdyaWQuaAppbmRleCA0OGI0NGNmYzlkOWQ1ZDgzYzVhYmJkMTNiNGNjNTIyNmM0YzRl MjNhLi5jYTAyNWU2NzZmYWNkMzc3YzY4MTYzNDk3MjU1ZmVhNmQ1OTBjOWM5IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyR3JpZC5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmgKQEAgLTY1LDcgKzY1LDcgQEAgcHVibGljOgogICAg IGJvb2wgaXNPcnRob2dvbmFsQ2hpbGQoY29uc3QgUmVuZGVyQm94JikgY29uc3Q7CiAgICAgTGF5 b3V0VW5pdCBndXR0ZXJzU2l6ZShjb25zdCBHcmlkJiwgR3JpZFRyYWNrU2l6aW5nRGlyZWN0aW9u LCB1bnNpZ25lZCBzdGFydExpbmUsIHVuc2lnbmVkIHNwYW4sIHN0ZDo6b3B0aW9uYWw8TGF5b3V0 VW5pdD4gYXZhaWxhYmxlU2l6ZSkgY29uc3Q7CiAKLSAgICBzdGF0aWMgY29uc3QgU3R5bGVDb250 ZW50QWxpZ25tZW50RGF0YSYgY29udGVudEFsaWdubWVudE5vcm1hbEJlaGF2aW9yR3JpZCgpOwor ICAgIFN0eWxlQ29udGVudEFsaWdubWVudERhdGEgY29udGVudEFsaWdubWVudChHcmlkVHJhY2tT aXppbmdEaXJlY3Rpb24pIGNvbnN0OwogCiBwcm90ZWN0ZWQ6CiAgICAgSXRlbVBvc2l0aW9uIHNl bGZBbGlnbm1lbnROb3JtYWxCZWhhdmlvcihjb25zdCBSZW5kZXJCb3gqIGNoaWxkID0gbnVsbHB0 cikgY29uc3Qgb3ZlcnJpZGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9z dHlsZS9SZW5kZXJTdHlsZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVu ZGVyU3R5bGUuY3BwCmluZGV4IDkyY2Q4Yjc3OTlhYmQyNTA2YzUyY2YzNzM5NDVmOWE0N2VlY2Vm ZTQuLmQwNDQyZjkzOTNmM2YwNWMzYTI2YmRmMDFlN2RhMzE5NDM1MDQ1MDcgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmNwcApAQCAtMjgwLDYgKzI4 MCwyMyBAQCBTdHlsZVNlbGZBbGlnbm1lbnREYXRhIFJlbmRlclN0eWxlOjpyZXNvbHZlZEp1c3Rp ZnlTZWxmKGNvbnN0IFJlbmRlclN0eWxlKiBwYXJlbgogICAgIHJldHVybiBwYXJlbnRTdHlsZS0+ cmVzb2x2ZWRKdXN0aWZ5SXRlbXMobm9ybWFsVmFsdWVCZWhhdmlvdXIpOwogfQogCitzdGF0aWMg aW5saW5lIFN0eWxlQ29udGVudEFsaWdubWVudERhdGEgcmVzb2x2ZWRDb250ZW50QWxpZ25tZW50 KGNvbnN0IFN0eWxlQ29udGVudEFsaWdubWVudERhdGEmIHZhbHVlLCBjb25zdCBTdHlsZUNvbnRl bnRBbGlnbm1lbnREYXRhJiBub3JtYWxWYWx1ZUJlaGF2aW9yKQoreworICAgIHJldHVybiAodmFs dWUucG9zaXRpb24oKSA9PSBDb250ZW50UG9zaXRpb25Ob3JtYWwgJiYgdmFsdWUuZGlzdHJpYnV0 aW9uKCkgPT0gQ29udGVudERpc3RyaWJ1dGlvbkRlZmF1bHQpID8gbm9ybWFsVmFsdWVCZWhhdmlv ciA6IHZhbHVlOworfQorCitTdHlsZUNvbnRlbnRBbGlnbm1lbnREYXRhIFJlbmRlclN0eWxlOjpy ZXNvbHZlZEFsaWduQ29udGVudChjb25zdCBTdHlsZUNvbnRlbnRBbGlnbm1lbnREYXRhJiBub3Jt YWxWYWx1ZUJlaGF2aW9yKSBjb25zdAoreworICAgIC8vIFdlIHdpbGwgcmV0dXJuIHRoZSBiZWhh dmlvdXIgb2YgJ25vcm1hbCcgdmFsdWUgaWYgbmVlZGVkLCB3aGljaCBpcyBzcGVjaWZpYyBvZiBl YWNoIGxheW91dCBtb2RlbC4KKyAgICByZXR1cm4gcmVzb2x2ZWRDb250ZW50QWxpZ25tZW50KGFs aWduQ29udGVudCgpLCBub3JtYWxWYWx1ZUJlaGF2aW9yKTsKK30KKworU3R5bGVDb250ZW50QWxp Z25tZW50RGF0YSBSZW5kZXJTdHlsZTo6cmVzb2x2ZWRKdXN0aWZ5Q29udGVudChjb25zdCBTdHls ZUNvbnRlbnRBbGlnbm1lbnREYXRhJiBub3JtYWxWYWx1ZUJlaGF2aW9yKSBjb25zdAoreworICAg IC8vIFdlIHdpbGwgcmV0dXJuIHRoZSBiZWhhdmlvdXIgb2YgJ25vcm1hbCcgdmFsdWUgaWYgbmVl ZGVkLCB3aGljaCBpcyBzcGVjaWZpYyBvZiBlYWNoIGxheW91dCBtb2RlbC4KKyAgICByZXR1cm4g cmVzb2x2ZWRDb250ZW50QWxpZ25tZW50KGp1c3RpZnlDb250ZW50KCksIG5vcm1hbFZhbHVlQmVo YXZpb3IpOworfQorCiBzdGF0aWMgaW5saW5lIENvbnRlbnRQb3NpdGlvbiByZXNvbHZlZENvbnRl bnRBbGlnbm1lbnRQb3NpdGlvbihjb25zdCBTdHlsZUNvbnRlbnRBbGlnbm1lbnREYXRhJiB2YWx1 ZSwgY29uc3QgU3R5bGVDb250ZW50QWxpZ25tZW50RGF0YSYgbm9ybWFsVmFsdWVCZWhhdmlvcikK IHsKICAgICByZXR1cm4gKHZhbHVlLnBvc2l0aW9uKCkgPT0gQ29udGVudFBvc2l0aW9uTm9ybWFs ICYmIHZhbHVlLmRpc3RyaWJ1dGlvbigpID09IENvbnRlbnREaXN0cmlidXRpb25EZWZhdWx0KSA/ IG5vcm1hbFZhbHVlQmVoYXZpb3IucG9zaXRpb24oKSA6IHZhbHVlLnBvc2l0aW9uKCk7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuaCBiL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5oCmluZGV4IDFjMTQ5MDVj ZTllMmM3M2U1ZTJmNWVkZjNlYjhhNzExMTljYzAxY2QuLmY2OGJkNTFkMmJhYTg0OGFkYTNlMmQx MmRiMjUzODA3ZjkzOWVhZmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9z dHlsZS9SZW5kZXJTdHlsZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9S ZW5kZXJTdHlsZS5oCkBAIC0xNjYsOCArMTY2LDEwIEBAIHB1YmxpYzoKICAgICBDb250ZW50RGlz dHJpYnV0aW9uVHlwZSByZXNvbHZlZEFsaWduQ29udGVudERpc3RyaWJ1dGlvbihjb25zdCBTdHls ZUNvbnRlbnRBbGlnbm1lbnREYXRhJiBub3JtYWxWYWx1ZUJlaGF2aW9yKSBjb25zdDsKICAgICBT dHlsZVNlbGZBbGlnbm1lbnREYXRhIHJlc29sdmVkQWxpZ25JdGVtcyhJdGVtUG9zaXRpb24gbm9y bWFsVmFsdWVCZWhhdmlvdXIpIGNvbnN0OwogICAgIFN0eWxlU2VsZkFsaWdubWVudERhdGEgcmVz b2x2ZWRBbGlnblNlbGYoY29uc3QgUmVuZGVyU3R5bGUqIHBhcmVudFN0eWxlLCBJdGVtUG9zaXRp b24gbm9ybWFsVmFsdWVCZWhhdmlvdXIpIGNvbnN0OworICAgIFN0eWxlQ29udGVudEFsaWdubWVu dERhdGEgcmVzb2x2ZWRBbGlnbkNvbnRlbnQoY29uc3QgU3R5bGVDb250ZW50QWxpZ25tZW50RGF0 YSYgbm9ybWFsVmFsdWVCZWhhdmlvdXIpIGNvbnN0OwogICAgIFN0eWxlU2VsZkFsaWdubWVudERh dGEgcmVzb2x2ZWRKdXN0aWZ5SXRlbXMoSXRlbVBvc2l0aW9uIG5vcm1hbFZhbHVlQmVoYXZpb3Vy KSBjb25zdDsKICAgICBTdHlsZVNlbGZBbGlnbm1lbnREYXRhIHJlc29sdmVkSnVzdGlmeVNlbGYo Y29uc3QgUmVuZGVyU3R5bGUqIHBhcmVudFN0eWxlLCBJdGVtUG9zaXRpb24gbm9ybWFsVmFsdWVC ZWhhdmlvdXIpIGNvbnN0OworICAgIFN0eWxlQ29udGVudEFsaWdubWVudERhdGEgcmVzb2x2ZWRK dXN0aWZ5Q29udGVudChjb25zdCBTdHlsZUNvbnRlbnRBbGlnbm1lbnREYXRhJiBub3JtYWxWYWx1 ZUJlaGF2aW91cikgY29uc3Q7CiAKICAgICBQc2V1ZG9JZCBzdHlsZVR5cGUoKSBjb25zdCB7IHJl dHVybiBzdGF0aWNfY2FzdDxQc2V1ZG9JZD4obV9ub25Jbmhlcml0ZWRGbGFncy5zdHlsZVR5cGUp OyB9CiAgICAgdm9pZCBzZXRTdHlsZVR5cGUoUHNldWRvSWQgc3R5bGVUeXBlKSB7IG1fbm9uSW5o ZXJpdGVkRmxhZ3Muc3R5bGVUeXBlID0gc3R5bGVUeXBlOyB9Cg== 321197 2017-09-19 07:06:37 -0700 2017-09-25 00:55:40 -0700 Patch bug-177130-20170919160636.patch text/plain 9447 rego U3VidmVyc2lvbiBSZXZpc2lvbjogMjIyMjA1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTc3Y2M3MGJjNDg2YmUx ZDdkNWJkNDAwNjNhYTU5NTk1OGY0MGFhNS4uMjVlMjNiMjUyY2UzYWU0NzMzNzgxZTE1NjhhYTc1 ZTk4OWNlNTg1YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDE3LTA5LTE5ICBNYW51 ZWwgUmVnbyBDYXNhc25vdmFzICA8cmVnb0BpZ2FsaWEuY29tPgorCisgICAgICAgIFtjc3MtZ3Jp ZF0gU21hbGwgcmVmYWN0b3JpbmcgYWRkaW5nIFJlbmRlckdyaWQ6OmNvbnRlbnRBbGlnbm1lbnQo KQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc3MTMw CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQXMgYSBm b2xsb3ctdXAgb2YgcjIyMTkzMSwgdGhpcyBwYXRjaCBkb2VzIGEgc21hbGwgcmVmYWN0b3JpbmcK KyAgICAgICAgYWRkaW5nIGEgbmV3IG1ldGhvZCBSZW5kZXJHcmlkOjpjb250ZW50QWxpZ25tZW50 KCkKKyAgICAgICAgdGhhdCBpcyB1c2VkIGZyb20gUmVuZGVyR3JpZCBhbmQgR3JpZFRyYWNrU2l6 aW5nQWxnb3JpdGhtLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cywgbm8gY2hhbmdlIG9mIGJlaGF2 aW9yLgorCisgICAgICAgICogcmVuZGVyaW5nL0dyaWRUcmFja1NpemluZ0FsZ29yaXRobS5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpHcmlkVHJhY2tTaXppbmdBbGdvcml0aG06OnN0cmV0Y2hBdXRv VHJhY2tzKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyR3JpZC5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpjb250ZW50QWxpZ25tZW50Tm9ybWFsQmVoYXZpb3JHcmlkKToKKyAgICAgICAgKFdl YkNvcmU6OlJlbmRlckdyaWQ6OmNvbnRlbnRBbGlnbm1lbnQgY29uc3QpOgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyR3JpZDo6Y29tcHV0ZUNvbnRlbnRQb3NpdGlvbkFuZERpc3RyaWJ1dGlvbk9m ZnNldCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJHcmlkOjpjb250ZW50QWxpZ25t ZW50Tm9ybWFsQmVoYXZpb3JHcmlkKTogRGVsZXRlZC4KKyAgICAgICAgKiByZW5kZXJpbmcvUmVu ZGVyR3JpZC5oOgorICAgICAgICAqIHJlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpyZXNvbHZlZENvbnRlbnRBbGlnbm1lbnQpOgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyU3R5bGU6OnJlc29sdmVkQWxpZ25Db250ZW50IGNvbnN0KToKKyAgICAgICAg KFdlYkNvcmU6OlJlbmRlclN0eWxlOjpyZXNvbHZlZEp1c3RpZnlDb250ZW50IGNvbnN0KToKKyAg ICAgICAgKiByZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuaDoKKwogMjAxNy0wOS0xOSAgTmFl bCBPdWVkcmFvZ28gIDxuYWVsLm91ZWRyYW9nb0BjcmYuY2Fub24uZnI+CiAKICAgICAgICAgW0dU S10gVGhlIGJpbmRpbmcgY29kZSBvZiBNZWRpYSBTb3VyY2UgRXh0ZW5zaW9uIG9mIEF1ZGlvVHJh Y2ssIFZpZGVvVHJhY2sgYW5kIFRleHRUcmFjayBpcyBub3QgZ2VuZXJhdGVkCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvR3JpZFRyYWNrU2l6aW5nQWxnb3JpdGhtLmNwcCBi L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9HcmlkVHJhY2tTaXppbmdBbGdvcml0aG0uY3BwCmlu ZGV4IDNhM2ViOTU4MTlmZTk3ZWRjMjllZmQzOWI2ODI4ZTg2Yzk5N2ExOTAuLmFlZTc5ODVjOGFh OWU1NTA4NzVjZDVkYTFiZmFkYWNlNThhOWYwNzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9HcmlkVHJhY2tTaXppbmdBbGdvcml0aG0uY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9HcmlkVHJhY2tTaXppbmdBbGdvcml0aG0uY3BwCkBAIC0xMDcxLDE0ICsx MDcxLDExIEBAIHZvaWQgR3JpZFRyYWNrU2l6aW5nQWxnb3JpdGhtOjpzdHJldGNoRmxleGlibGVU cmFja3Moc3RkOjpvcHRpb25hbDxMYXlvdXRVbml0PiBmCiAKIHZvaWQgR3JpZFRyYWNrU2l6aW5n QWxnb3JpdGhtOjpzdHJldGNoQXV0b1RyYWNrcygpCiB7Ci0gICAgaWYgKG1fYXV0b1NpemVkVHJh Y2tzSW5kZXguaXNFbXB0eSgpKQotICAgICAgICByZXR1cm47Ci0KICAgICBhdXRvIGN1cnJlbnRG cmVlU3BhY2UgPSBmcmVlU3BhY2UobV9kaXJlY3Rpb24pOwotICAgIGlmICghY3VycmVudEZyZWVT cGFjZQorICAgIGlmIChtX2F1dG9TaXplZFRyYWNrc0luZGV4LmlzRW1wdHkoKQorICAgICAgICB8 fCAhY3VycmVudEZyZWVTcGFjZQogICAgICAgICB8fCBjdXJyZW50RnJlZVNwYWNlLnZhbHVlKCkg PD0gMAotICAgICAgICB8fCAobV9kaXJlY3Rpb24gPT0gRm9yQ29sdW1ucyAmJiBtX3JlbmRlckdy aWQtPnN0eWxlKCkucmVzb2x2ZWRKdXN0aWZ5Q29udGVudERpc3RyaWJ1dGlvbihtX3JlbmRlckdy aWQtPmNvbnRlbnRBbGlnbm1lbnROb3JtYWxCZWhhdmlvckdyaWQoKSkgIT0gQ29udGVudERpc3Ry aWJ1dGlvblN0cmV0Y2gpCi0gICAgICAgIHx8IChtX2RpcmVjdGlvbiA9PSBGb3JSb3dzICYmIG1f cmVuZGVyR3JpZC0+c3R5bGUoKS5yZXNvbHZlZEFsaWduQ29udGVudERpc3RyaWJ1dGlvbihtX3Jl bmRlckdyaWQtPmNvbnRlbnRBbGlnbm1lbnROb3JtYWxCZWhhdmlvckdyaWQoKSkgIT0gQ29udGVu dERpc3RyaWJ1dGlvblN0cmV0Y2gpKQorICAgICAgICB8fCAobV9yZW5kZXJHcmlkLT5jb250ZW50 QWxpZ25tZW50KG1fZGlyZWN0aW9uKS5kaXN0cmlidXRpb24oKSAhPSBDb250ZW50RGlzdHJpYnV0 aW9uU3RyZXRjaCkpCiAgICAgICAgIHJldHVybjsKIAogICAgIFZlY3RvcjxHcmlkVHJhY2s+JiBh bGxUcmFja3MgPSB0cmFja3MobV9kaXJlY3Rpb24pOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckdyaWQuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckdyaWQuY3BwCmluZGV4IDZjZmMzN2JkNDU2NmYzYmQxYzg4M2VkZTRjM2FiMjQxZTk4MWRh MTAuLmU0MzdhZDdlNGNkOWQ3N2IwMmNjMWFhYjYzYmMxYTc5MzFjMWNjMGIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyR3JpZC5jcHAKQEAgLTg3Nyw3ICs4NzcsNyBAQCBWZWN0b3I8 TGF5b3V0VW5pdD4gUmVuZGVyR3JpZDo6dHJhY2tTaXplc0ZvckNvbXB1dGVkU3R5bGUoR3JpZFRy YWNrU2l6aW5nRGlyZWN0aQogICAgIHJldHVybiB0cmFja3M7CiB9CiAKLWNvbnN0IFN0eWxlQ29u dGVudEFsaWdubWVudERhdGEmIFJlbmRlckdyaWQ6OmNvbnRlbnRBbGlnbm1lbnROb3JtYWxCZWhh dmlvckdyaWQoKQorc3RhdGljIGNvbnN0IFN0eWxlQ29udGVudEFsaWdubWVudERhdGEmIGNvbnRl bnRBbGlnbm1lbnROb3JtYWxCZWhhdmlvckdyaWQoKQogewogICAgIHN0YXRpYyBjb25zdCBTdHls ZUNvbnRlbnRBbGlnbm1lbnREYXRhIG5vcm1hbEJlaGF2aW9yID0ge0NvbnRlbnRQb3NpdGlvbk5v cm1hbCwgQ29udGVudERpc3RyaWJ1dGlvblN0cmV0Y2h9OwogICAgIHJldHVybiBub3JtYWxCZWhh dmlvcjsKQEAgLTE1ODEsMTkgKzE1ODEsMjMgQEAgc3RhdGljIENvbnRlbnRBbGlnbm1lbnREYXRh IGNvbnRlbnREaXN0cmlidXRpb25PZmZzZXQoY29uc3QgTGF5b3V0VW5pdCYgYXZhaWxhYmwKICAg ICByZXR1cm4gQ29udGVudEFsaWdubWVudERhdGE6OmRlZmF1bHRPZmZzZXRzKCk7CiB9CiAKK1N0 eWxlQ29udGVudEFsaWdubWVudERhdGEgUmVuZGVyR3JpZDo6Y29udGVudEFsaWdubWVudChHcmlk VHJhY2tTaXppbmdEaXJlY3Rpb24gZGlyZWN0aW9uKSBjb25zdAoreworICAgIHJldHVybiBkaXJl Y3Rpb24gPT0gRm9yQ29sdW1ucyA/IHN0eWxlKCkucmVzb2x2ZWRKdXN0aWZ5Q29udGVudChjb250 ZW50QWxpZ25tZW50Tm9ybWFsQmVoYXZpb3JHcmlkKCkpIDogc3R5bGUoKS5yZXNvbHZlZEFsaWdu Q29udGVudChjb250ZW50QWxpZ25tZW50Tm9ybWFsQmVoYXZpb3JHcmlkKCkpOworfQorCiBDb250 ZW50QWxpZ25tZW50RGF0YSBSZW5kZXJHcmlkOjpjb21wdXRlQ29udGVudFBvc2l0aW9uQW5kRGlz dHJpYnV0aW9uT2Zmc2V0KEdyaWRUcmFja1NpemluZ0RpcmVjdGlvbiBkaXJlY3Rpb24sIGNvbnN0 IExheW91dFVuaXQmIGF2YWlsYWJsZUZyZWVTcGFjZSwgdW5zaWduZWQgbnVtYmVyT2ZHcmlkVHJh Y2tzKSBjb25zdAogewogICAgIGJvb2wgaXNSb3dBeGlzID0gZGlyZWN0aW9uID09IEZvckNvbHVt bnM7Ci0gICAgYXV0byBwb3NpdGlvbiA9IGlzUm93QXhpcyA/IHN0eWxlKCkucmVzb2x2ZWRKdXN0 aWZ5Q29udGVudFBvc2l0aW9uKGNvbnRlbnRBbGlnbm1lbnROb3JtYWxCZWhhdmlvckdyaWQoKSkg OiBzdHlsZSgpLnJlc29sdmVkQWxpZ25Db250ZW50UG9zaXRpb24oY29udGVudEFsaWdubWVudE5v cm1hbEJlaGF2aW9yR3JpZCgpKTsKLSAgICBhdXRvIGRpc3RyaWJ1dGlvbiA9IGlzUm93QXhpcyA/ IHN0eWxlKCkucmVzb2x2ZWRKdXN0aWZ5Q29udGVudERpc3RyaWJ1dGlvbihjb250ZW50QWxpZ25t ZW50Tm9ybWFsQmVoYXZpb3JHcmlkKCkpIDogc3R5bGUoKS5yZXNvbHZlZEFsaWduQ29udGVudERp c3RyaWJ1dGlvbihjb250ZW50QWxpZ25tZW50Tm9ybWFsQmVoYXZpb3JHcmlkKCkpOworICAgIGF1 dG8gY29udGVudEFsaWdubWVudERhdGEgPSBjb250ZW50QWxpZ25tZW50KGRpcmVjdGlvbik7Cisg ICAgYXV0byBwb3NpdGlvbiA9IGNvbnRlbnRBbGlnbm1lbnREYXRhLnBvc2l0aW9uKCk7CiAgICAg Ly8gSWYgPGNvbnRlbnQtZGlzdHJpYnV0aW9uPiB2YWx1ZSBjYW4ndCBiZSBhcHBsaWVkLCAncG9z aXRpb24nIHdpbGwgYmVjb21lIHRoZSBhc3NvY2lhdGVkCiAgICAgLy8gPGNvbnRlbnQtcG9zaXRp b24+IGZhbGxiYWNrIHZhbHVlLgotICAgIGF1dG8gY29udGVudEFsaWdubWVudCA9IGNvbnRlbnRE aXN0cmlidXRpb25PZmZzZXQoYXZhaWxhYmxlRnJlZVNwYWNlLCBwb3NpdGlvbiwgZGlzdHJpYnV0 aW9uLCBudW1iZXJPZkdyaWRUcmFja3MpOworICAgIGF1dG8gY29udGVudEFsaWdubWVudCA9IGNv bnRlbnREaXN0cmlidXRpb25PZmZzZXQoYXZhaWxhYmxlRnJlZVNwYWNlLCBwb3NpdGlvbiwgY29u dGVudEFsaWdubWVudERhdGEuZGlzdHJpYnV0aW9uKCksIG51bWJlck9mR3JpZFRyYWNrcyk7CiAg ICAgaWYgKGNvbnRlbnRBbGlnbm1lbnQuaXNWYWxpZCgpKQogICAgICAgICByZXR1cm4gY29udGVu dEFsaWdubWVudDsKIAotICAgIGF1dG8gb3ZlcmZsb3cgPSAoaXNSb3dBeGlzID8gc3R5bGUoKS5q dXN0aWZ5Q29udGVudCgpIDogc3R5bGUoKS5hbGlnbkNvbnRlbnQoKSkub3ZlcmZsb3coKTsKLSAg ICBpZiAoYXZhaWxhYmxlRnJlZVNwYWNlIDw9IDAgJiYgb3ZlcmZsb3cgPT0gT3ZlcmZsb3dBbGln bm1lbnRTYWZlKQorICAgIGlmIChhdmFpbGFibGVGcmVlU3BhY2UgPD0gMCAmJiBjb250ZW50QWxp Z25tZW50RGF0YS5vdmVyZmxvdygpID09IE92ZXJmbG93QWxpZ25tZW50U2FmZSkKICAgICAgICAg cmV0dXJuIHswLCAwfTsKIAogICAgIHN3aXRjaCAocG9zaXRpb24pIHsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyR3JpZC5oCmluZGV4IDQ4YjQ0Y2ZjOWQ5ZDVkODNjNWFiYmQxM2I0Y2M1MjI2 YzRjNGUyM2EuLmNhMDI1ZTY3NmZhY2QzNzdjNjgxNjM0OTcyNTVmZWE2ZDU5MGM5YzkgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmgKKysrIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckdyaWQuaApAQCAtNjUsNyArNjUsNyBAQCBwdWJsaWM6 CiAgICAgYm9vbCBpc09ydGhvZ29uYWxDaGlsZChjb25zdCBSZW5kZXJCb3gmKSBjb25zdDsKICAg ICBMYXlvdXRVbml0IGd1dHRlcnNTaXplKGNvbnN0IEdyaWQmLCBHcmlkVHJhY2tTaXppbmdEaXJl Y3Rpb24sIHVuc2lnbmVkIHN0YXJ0TGluZSwgdW5zaWduZWQgc3Bhbiwgc3RkOjpvcHRpb25hbDxM YXlvdXRVbml0PiBhdmFpbGFibGVTaXplKSBjb25zdDsKIAotICAgIHN0YXRpYyBjb25zdCBTdHls ZUNvbnRlbnRBbGlnbm1lbnREYXRhJiBjb250ZW50QWxpZ25tZW50Tm9ybWFsQmVoYXZpb3JHcmlk KCk7CisgICAgU3R5bGVDb250ZW50QWxpZ25tZW50RGF0YSBjb250ZW50QWxpZ25tZW50KEdyaWRU cmFja1NpemluZ0RpcmVjdGlvbikgY29uc3Q7CiAKIHByb3RlY3RlZDoKICAgICBJdGVtUG9zaXRp b24gc2VsZkFsaWdubWVudE5vcm1hbEJlaGF2aW9yKGNvbnN0IFJlbmRlckJveCogY2hpbGQgPSBu dWxscHRyKSBjb25zdCBvdmVycmlkZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL3N0eWxlL1JlbmRlclN0eWxlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHls ZS9SZW5kZXJTdHlsZS5jcHAKaW5kZXggOTJjZDhiNzc5OWFiZDI1MDZjNTJjZjM3Mzk0NWY5YTQ3 ZWVjZWZlNC4uZDA0NDJmOTM5M2YzZjA1YzNhMjZiZGYwMWU3ZGEzMTk0MzUwNDUwNyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuY3BwCkBAIC0yODAs NiArMjgwLDIzIEBAIFN0eWxlU2VsZkFsaWdubWVudERhdGEgUmVuZGVyU3R5bGU6OnJlc29sdmVk SnVzdGlmeVNlbGYoY29uc3QgUmVuZGVyU3R5bGUqIHBhcmVuCiAgICAgcmV0dXJuIHBhcmVudFN0 eWxlLT5yZXNvbHZlZEp1c3RpZnlJdGVtcyhub3JtYWxWYWx1ZUJlaGF2aW91cik7CiB9CiAKK3N0 YXRpYyBpbmxpbmUgU3R5bGVDb250ZW50QWxpZ25tZW50RGF0YSByZXNvbHZlZENvbnRlbnRBbGln bm1lbnQoY29uc3QgU3R5bGVDb250ZW50QWxpZ25tZW50RGF0YSYgdmFsdWUsIGNvbnN0IFN0eWxl Q29udGVudEFsaWdubWVudERhdGEmIG5vcm1hbFZhbHVlQmVoYXZpb3IpCit7CisgICAgcmV0dXJu ICh2YWx1ZS5wb3NpdGlvbigpID09IENvbnRlbnRQb3NpdGlvbk5vcm1hbCAmJiB2YWx1ZS5kaXN0 cmlidXRpb24oKSA9PSBDb250ZW50RGlzdHJpYnV0aW9uRGVmYXVsdCkgPyBub3JtYWxWYWx1ZUJl aGF2aW9yIDogdmFsdWU7Cit9CisKK1N0eWxlQ29udGVudEFsaWdubWVudERhdGEgUmVuZGVyU3R5 bGU6OnJlc29sdmVkQWxpZ25Db250ZW50KGNvbnN0IFN0eWxlQ29udGVudEFsaWdubWVudERhdGEm IG5vcm1hbFZhbHVlQmVoYXZpb3IpIGNvbnN0Cit7CisgICAgLy8gV2Ugd2lsbCByZXR1cm4gdGhl IGJlaGF2aW91ciBvZiAnbm9ybWFsJyB2YWx1ZSBpZiBuZWVkZWQsIHdoaWNoIGlzIHNwZWNpZmlj IG9mIGVhY2ggbGF5b3V0IG1vZGVsLgorICAgIHJldHVybiByZXNvbHZlZENvbnRlbnRBbGlnbm1l bnQoYWxpZ25Db250ZW50KCksIG5vcm1hbFZhbHVlQmVoYXZpb3IpOworfQorCitTdHlsZUNvbnRl bnRBbGlnbm1lbnREYXRhIFJlbmRlclN0eWxlOjpyZXNvbHZlZEp1c3RpZnlDb250ZW50KGNvbnN0 IFN0eWxlQ29udGVudEFsaWdubWVudERhdGEmIG5vcm1hbFZhbHVlQmVoYXZpb3IpIGNvbnN0Cit7 CisgICAgLy8gV2Ugd2lsbCByZXR1cm4gdGhlIGJlaGF2aW91ciBvZiAnbm9ybWFsJyB2YWx1ZSBp ZiBuZWVkZWQsIHdoaWNoIGlzIHNwZWNpZmljIG9mIGVhY2ggbGF5b3V0IG1vZGVsLgorICAgIHJl dHVybiByZXNvbHZlZENvbnRlbnRBbGlnbm1lbnQoanVzdGlmeUNvbnRlbnQoKSwgbm9ybWFsVmFs dWVCZWhhdmlvcik7Cit9CisKIHN0YXRpYyBpbmxpbmUgQ29udGVudFBvc2l0aW9uIHJlc29sdmVk Q29udGVudEFsaWdubWVudFBvc2l0aW9uKGNvbnN0IFN0eWxlQ29udGVudEFsaWdubWVudERhdGEm IHZhbHVlLCBjb25zdCBTdHlsZUNvbnRlbnRBbGlnbm1lbnREYXRhJiBub3JtYWxWYWx1ZUJlaGF2 aW9yKQogewogICAgIHJldHVybiAodmFsdWUucG9zaXRpb24oKSA9PSBDb250ZW50UG9zaXRpb25O b3JtYWwgJiYgdmFsdWUuZGlzdHJpYnV0aW9uKCkgPT0gQ29udGVudERpc3RyaWJ1dGlvbkRlZmF1 bHQpID8gbm9ybWFsVmFsdWVCZWhhdmlvci5wb3NpdGlvbigpIDogdmFsdWUucG9zaXRpb24oKTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5o IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmgKaW5kZXggMWMx NDkwNWNlOWUyYzczZTVlMmY1ZWRmM2ViOGE3MTExOWNjMDFjZC4uZjY4YmQ1MWQyYmFhODQ4YWRh M2UyZDEyZGIyNTM4MDdmOTM5ZWFmZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL3N0eWxlL1JlbmRlclN0eWxlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0 eWxlL1JlbmRlclN0eWxlLmgKQEAgLTE2Niw4ICsxNjYsMTAgQEAgcHVibGljOgogICAgIENvbnRl bnREaXN0cmlidXRpb25UeXBlIHJlc29sdmVkQWxpZ25Db250ZW50RGlzdHJpYnV0aW9uKGNvbnN0 IFN0eWxlQ29udGVudEFsaWdubWVudERhdGEmIG5vcm1hbFZhbHVlQmVoYXZpb3IpIGNvbnN0Owog ICAgIFN0eWxlU2VsZkFsaWdubWVudERhdGEgcmVzb2x2ZWRBbGlnbkl0ZW1zKEl0ZW1Qb3NpdGlv biBub3JtYWxWYWx1ZUJlaGF2aW91cikgY29uc3Q7CiAgICAgU3R5bGVTZWxmQWxpZ25tZW50RGF0 YSByZXNvbHZlZEFsaWduU2VsZihjb25zdCBSZW5kZXJTdHlsZSogcGFyZW50U3R5bGUsIEl0ZW1Q b3NpdGlvbiBub3JtYWxWYWx1ZUJlaGF2aW91cikgY29uc3Q7CisgICAgU3R5bGVDb250ZW50QWxp Z25tZW50RGF0YSByZXNvbHZlZEFsaWduQ29udGVudChjb25zdCBTdHlsZUNvbnRlbnRBbGlnbm1l bnREYXRhJiBub3JtYWxWYWx1ZUJlaGF2aW91cikgY29uc3Q7CiAgICAgU3R5bGVTZWxmQWxpZ25t ZW50RGF0YSByZXNvbHZlZEp1c3RpZnlJdGVtcyhJdGVtUG9zaXRpb24gbm9ybWFsVmFsdWVCZWhh dmlvdXIpIGNvbnN0OwogICAgIFN0eWxlU2VsZkFsaWdubWVudERhdGEgcmVzb2x2ZWRKdXN0aWZ5 U2VsZihjb25zdCBSZW5kZXJTdHlsZSogcGFyZW50U3R5bGUsIEl0ZW1Qb3NpdGlvbiBub3JtYWxW YWx1ZUJlaGF2aW91cikgY29uc3Q7CisgICAgU3R5bGVDb250ZW50QWxpZ25tZW50RGF0YSByZXNv bHZlZEp1c3RpZnlDb250ZW50KGNvbnN0IFN0eWxlQ29udGVudEFsaWdubWVudERhdGEmIG5vcm1h bFZhbHVlQmVoYXZpb3VyKSBjb25zdDsKIAogICAgIFBzZXVkb0lkIHN0eWxlVHlwZSgpIGNvbnN0 IHsgcmV0dXJuIHN0YXRpY19jYXN0PFBzZXVkb0lkPihtX25vbkluaGVyaXRlZEZsYWdzLnN0eWxl VHlwZSk7IH0KICAgICB2b2lkIHNldFN0eWxlVHlwZShQc2V1ZG9JZCBzdHlsZVR5cGUpIHsgbV9u b25Jbmhlcml0ZWRGbGFncy5zdHlsZVR5cGUgPSBzdHlsZVR5cGU7IH0K 321673 2017-09-25 00:55:44 -0700 2017-09-25 01:39:52 -0700 =Patch for landing bug-177130-20170925095543.patch text/plain 9412 rego U3VidmVyc2lvbiBSZXZpc2lvbjogMjIyNDQwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmE2MGY3MTUwYjcyNGJh NzIwMzEwZGJkM2FmMDQ4NmQyZTFkYTNmMy4uZmJhOWMzNTM2NjQ4YTBiNmM2NGVkYjQ0MmM1MDZl MTliOTZhMWJlOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDE3LTA5LTE5ICBNYW51 ZWwgUmVnbyBDYXNhc25vdmFzICA8cmVnb0BpZ2FsaWEuY29tPgorCisgICAgICAgIFtjc3MtZ3Jp ZF0gU21hbGwgcmVmYWN0b3JpbmcgYWRkaW5nIFJlbmRlckdyaWQ6OmNvbnRlbnRBbGlnbm1lbnQo KQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc3MTMw CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgU2VyZ2lvIFZpbGxhciBTZW5pbi4KKworICAgICAgICBB cyBhIGZvbGxvdy11cCBvZiByMjIxOTMxLCB0aGlzIHBhdGNoIGRvZXMgYSBzbWFsbCByZWZhY3Rv cmluZworICAgICAgICBhZGRpbmcgYSBuZXcgbWV0aG9kIFJlbmRlckdyaWQ6OmNvbnRlbnRBbGln bm1lbnQoKQorICAgICAgICB0aGF0IGlzIHVzZWQgZnJvbSBSZW5kZXJHcmlkIGFuZCBHcmlkVHJh Y2tTaXppbmdBbGdvcml0aG0uCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBubyBjaGFuZ2Ugb2Yg YmVoYXZpb3IuCisKKyAgICAgICAgKiByZW5kZXJpbmcvR3JpZFRyYWNrU2l6aW5nQWxnb3JpdGht LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkdyaWRUcmFja1NpemluZ0FsZ29yaXRobTo6c3RyZXRj aEF1dG9UcmFja3MpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJHcmlkLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OmNvbnRlbnRBbGlnbm1lbnROb3JtYWxCZWhhdmlvckdyaWQpOgorICAgICAg ICAoV2ViQ29yZTo6UmVuZGVyR3JpZDo6Y29udGVudEFsaWdubWVudCBjb25zdCk6CisgICAgICAg IChXZWJDb3JlOjpSZW5kZXJHcmlkOjpjb21wdXRlQ29udGVudFBvc2l0aW9uQW5kRGlzdHJpYnV0 aW9uT2Zmc2V0IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckdyaWQ6OmNvbnRlbnRB bGlnbm1lbnROb3JtYWxCZWhhdmlvckdyaWQpOiBEZWxldGVkLgorICAgICAgICAqIHJlbmRlcmlu Zy9SZW5kZXJHcmlkLmg6CisgICAgICAgICogcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OnJlc29sdmVkQ29udGVudEFsaWdubWVudCk6CisgICAgICAg IChXZWJDb3JlOjpSZW5kZXJTdHlsZTo6cmVzb2x2ZWRBbGlnbkNvbnRlbnQgY29uc3QpOgorICAg ICAgICAoV2ViQ29yZTo6UmVuZGVyU3R5bGU6OnJlc29sdmVkSnVzdGlmeUNvbnRlbnQgY29uc3Qp OgorICAgICAgICAqIHJlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5oOgorCiAyMDE3LTA5LTI1 ICBNYW51ZWwgUmVnbyBDYXNhc25vdmFzICA8cmVnb0BpZ2FsaWEuY29tPgogCiAgICAgICAgIFtj c3MtZ3JpZF0gZml0LWNvbnRlbnQoKSB0cmFja3Mgc2hvdWxkbid0IHN0cmV0Y2gKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9HcmlkVHJhY2tTaXppbmdBbGdvcml0aG0uY3Bw IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0dyaWRUcmFja1NpemluZ0FsZ29yaXRobS5jcHAK aW5kZXggNGUzN2FhM2NiMDE2OThmMWI0YTBhMWYzNDUwOGE1MzQ0MzlmMzlkZi4uZmZlZjlhYmQx YTI3NDA4OGRjNzc0MjY1OGM0ZmM3NTMxZTQ2YTIxMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL0dyaWRUcmFja1NpemluZ0FsZ29yaXRobS5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL0dyaWRUcmFja1NpemluZ0FsZ29yaXRobS5jcHAKQEAgLTEwNzEsMTQg KzEwNzEsMTEgQEAgdm9pZCBHcmlkVHJhY2tTaXppbmdBbGdvcml0aG06OnN0cmV0Y2hGbGV4aWJs ZVRyYWNrcyhzdGQ6Om9wdGlvbmFsPExheW91dFVuaXQ+IGYKIAogdm9pZCBHcmlkVHJhY2tTaXpp bmdBbGdvcml0aG06OnN0cmV0Y2hBdXRvVHJhY2tzKCkKIHsKLSAgICBpZiAobV9hdXRvU2l6ZWRU cmFja3NGb3JTdHJldGNoSW5kZXguaXNFbXB0eSgpKQotICAgICAgICByZXR1cm47Ci0KICAgICBh dXRvIGN1cnJlbnRGcmVlU3BhY2UgPSBmcmVlU3BhY2UobV9kaXJlY3Rpb24pOwotICAgIGlmICgh Y3VycmVudEZyZWVTcGFjZQorICAgIGlmIChtX2F1dG9TaXplZFRyYWNrc0ZvclN0cmV0Y2hJbmRl eC5pc0VtcHR5KCkKKyAgICAgICAgfHwgIWN1cnJlbnRGcmVlU3BhY2UKICAgICAgICAgfHwgY3Vy cmVudEZyZWVTcGFjZS52YWx1ZSgpIDw9IDAKLSAgICAgICAgfHwgKG1fZGlyZWN0aW9uID09IEZv ckNvbHVtbnMgJiYgbV9yZW5kZXJHcmlkLT5zdHlsZSgpLnJlc29sdmVkSnVzdGlmeUNvbnRlbnRE aXN0cmlidXRpb24obV9yZW5kZXJHcmlkLT5jb250ZW50QWxpZ25tZW50Tm9ybWFsQmVoYXZpb3JH cmlkKCkpICE9IENvbnRlbnREaXN0cmlidXRpb25TdHJldGNoKQotICAgICAgICB8fCAobV9kaXJl Y3Rpb24gPT0gRm9yUm93cyAmJiBtX3JlbmRlckdyaWQtPnN0eWxlKCkucmVzb2x2ZWRBbGlnbkNv bnRlbnREaXN0cmlidXRpb24obV9yZW5kZXJHcmlkLT5jb250ZW50QWxpZ25tZW50Tm9ybWFsQmVo YXZpb3JHcmlkKCkpICE9IENvbnRlbnREaXN0cmlidXRpb25TdHJldGNoKSkKKyAgICAgICAgfHwg KG1fcmVuZGVyR3JpZC0+Y29udGVudEFsaWdubWVudChtX2RpcmVjdGlvbikuZGlzdHJpYnV0aW9u KCkgIT0gQ29udGVudERpc3RyaWJ1dGlvblN0cmV0Y2gpKQogICAgICAgICByZXR1cm47CiAKICAg ICBWZWN0b3I8R3JpZFRyYWNrPiYgYWxsVHJhY2tzID0gdHJhY2tzKG1fZGlyZWN0aW9uKTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmNwcAppbmRleCA2Y2ZjMzdiZDQ1NjZmM2Jk MWM4ODNlZGU0YzNhYjI0MWU5ODFkYTEwLi5lNDM3YWQ3ZTRjZDlkNzdiMDJjYzFhYWI2M2JjMWE3 OTMxYzFjYzBiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyR3Jp ZC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckdyaWQuY3BwCkBAIC04 NzcsNyArODc3LDcgQEAgVmVjdG9yPExheW91dFVuaXQ+IFJlbmRlckdyaWQ6OnRyYWNrU2l6ZXNG b3JDb21wdXRlZFN0eWxlKEdyaWRUcmFja1NpemluZ0RpcmVjdGkKICAgICByZXR1cm4gdHJhY2tz OwogfQogCi1jb25zdCBTdHlsZUNvbnRlbnRBbGlnbm1lbnREYXRhJiBSZW5kZXJHcmlkOjpjb250 ZW50QWxpZ25tZW50Tm9ybWFsQmVoYXZpb3JHcmlkKCkKK3N0YXRpYyBjb25zdCBTdHlsZUNvbnRl bnRBbGlnbm1lbnREYXRhJiBjb250ZW50QWxpZ25tZW50Tm9ybWFsQmVoYXZpb3JHcmlkKCkKIHsK ICAgICBzdGF0aWMgY29uc3QgU3R5bGVDb250ZW50QWxpZ25tZW50RGF0YSBub3JtYWxCZWhhdmlv ciA9IHtDb250ZW50UG9zaXRpb25Ob3JtYWwsIENvbnRlbnREaXN0cmlidXRpb25TdHJldGNofTsK ICAgICByZXR1cm4gbm9ybWFsQmVoYXZpb3I7CkBAIC0xNTgxLDE5ICsxNTgxLDIzIEBAIHN0YXRp YyBDb250ZW50QWxpZ25tZW50RGF0YSBjb250ZW50RGlzdHJpYnV0aW9uT2Zmc2V0KGNvbnN0IExh eW91dFVuaXQmIGF2YWlsYWJsCiAgICAgcmV0dXJuIENvbnRlbnRBbGlnbm1lbnREYXRhOjpkZWZh dWx0T2Zmc2V0cygpOwogfQogCitTdHlsZUNvbnRlbnRBbGlnbm1lbnREYXRhIFJlbmRlckdyaWQ6 OmNvbnRlbnRBbGlnbm1lbnQoR3JpZFRyYWNrU2l6aW5nRGlyZWN0aW9uIGRpcmVjdGlvbikgY29u c3QKK3sKKyAgICByZXR1cm4gZGlyZWN0aW9uID09IEZvckNvbHVtbnMgPyBzdHlsZSgpLnJlc29s dmVkSnVzdGlmeUNvbnRlbnQoY29udGVudEFsaWdubWVudE5vcm1hbEJlaGF2aW9yR3JpZCgpKSA6 IHN0eWxlKCkucmVzb2x2ZWRBbGlnbkNvbnRlbnQoY29udGVudEFsaWdubWVudE5vcm1hbEJlaGF2 aW9yR3JpZCgpKTsKK30KKwogQ29udGVudEFsaWdubWVudERhdGEgUmVuZGVyR3JpZDo6Y29tcHV0 ZUNvbnRlbnRQb3NpdGlvbkFuZERpc3RyaWJ1dGlvbk9mZnNldChHcmlkVHJhY2tTaXppbmdEaXJl Y3Rpb24gZGlyZWN0aW9uLCBjb25zdCBMYXlvdXRVbml0JiBhdmFpbGFibGVGcmVlU3BhY2UsIHVu c2lnbmVkIG51bWJlck9mR3JpZFRyYWNrcykgY29uc3QKIHsKICAgICBib29sIGlzUm93QXhpcyA9 IGRpcmVjdGlvbiA9PSBGb3JDb2x1bW5zOwotICAgIGF1dG8gcG9zaXRpb24gPSBpc1Jvd0F4aXMg PyBzdHlsZSgpLnJlc29sdmVkSnVzdGlmeUNvbnRlbnRQb3NpdGlvbihjb250ZW50QWxpZ25tZW50 Tm9ybWFsQmVoYXZpb3JHcmlkKCkpIDogc3R5bGUoKS5yZXNvbHZlZEFsaWduQ29udGVudFBvc2l0 aW9uKGNvbnRlbnRBbGlnbm1lbnROb3JtYWxCZWhhdmlvckdyaWQoKSk7Ci0gICAgYXV0byBkaXN0 cmlidXRpb24gPSBpc1Jvd0F4aXMgPyBzdHlsZSgpLnJlc29sdmVkSnVzdGlmeUNvbnRlbnREaXN0 cmlidXRpb24oY29udGVudEFsaWdubWVudE5vcm1hbEJlaGF2aW9yR3JpZCgpKSA6IHN0eWxlKCku cmVzb2x2ZWRBbGlnbkNvbnRlbnREaXN0cmlidXRpb24oY29udGVudEFsaWdubWVudE5vcm1hbEJl aGF2aW9yR3JpZCgpKTsKKyAgICBhdXRvIGNvbnRlbnRBbGlnbm1lbnREYXRhID0gY29udGVudEFs aWdubWVudChkaXJlY3Rpb24pOworICAgIGF1dG8gcG9zaXRpb24gPSBjb250ZW50QWxpZ25tZW50 RGF0YS5wb3NpdGlvbigpOwogICAgIC8vIElmIDxjb250ZW50LWRpc3RyaWJ1dGlvbj4gdmFsdWUg Y2FuJ3QgYmUgYXBwbGllZCwgJ3Bvc2l0aW9uJyB3aWxsIGJlY29tZSB0aGUgYXNzb2NpYXRlZAog ICAgIC8vIDxjb250ZW50LXBvc2l0aW9uPiBmYWxsYmFjayB2YWx1ZS4KLSAgICBhdXRvIGNvbnRl bnRBbGlnbm1lbnQgPSBjb250ZW50RGlzdHJpYnV0aW9uT2Zmc2V0KGF2YWlsYWJsZUZyZWVTcGFj ZSwgcG9zaXRpb24sIGRpc3RyaWJ1dGlvbiwgbnVtYmVyT2ZHcmlkVHJhY2tzKTsKKyAgICBhdXRv IGNvbnRlbnRBbGlnbm1lbnQgPSBjb250ZW50RGlzdHJpYnV0aW9uT2Zmc2V0KGF2YWlsYWJsZUZy ZWVTcGFjZSwgcG9zaXRpb24sIGNvbnRlbnRBbGlnbm1lbnREYXRhLmRpc3RyaWJ1dGlvbigpLCBu dW1iZXJPZkdyaWRUcmFja3MpOwogICAgIGlmIChjb250ZW50QWxpZ25tZW50LmlzVmFsaWQoKSkK ICAgICAgICAgcmV0dXJuIGNvbnRlbnRBbGlnbm1lbnQ7CiAKLSAgICBhdXRvIG92ZXJmbG93ID0g KGlzUm93QXhpcyA/IHN0eWxlKCkuanVzdGlmeUNvbnRlbnQoKSA6IHN0eWxlKCkuYWxpZ25Db250 ZW50KCkpLm92ZXJmbG93KCk7Ci0gICAgaWYgKGF2YWlsYWJsZUZyZWVTcGFjZSA8PSAwICYmIG92 ZXJmbG93ID09IE92ZXJmbG93QWxpZ25tZW50U2FmZSkKKyAgICBpZiAoYXZhaWxhYmxlRnJlZVNw YWNlIDw9IDAgJiYgY29udGVudEFsaWdubWVudERhdGEub3ZlcmZsb3coKSA9PSBPdmVyZmxvd0Fs aWdubWVudFNhZmUpCiAgICAgICAgIHJldHVybiB7MCwgMH07CiAKICAgICBzd2l0Y2ggKHBvc2l0 aW9uKSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyR3JpZC5o IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckdyaWQuaAppbmRleCA0OGI0NGNmYzlk OWQ1ZDgzYzVhYmJkMTNiNGNjNTIyNmM0YzRlMjNhLi5jYTAyNWU2NzZmYWNkMzc3YzY4MTYzNDk3 MjU1ZmVhNmQ1OTBjOWM5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyR3JpZC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmgKQEAg LTY1LDcgKzY1LDcgQEAgcHVibGljOgogICAgIGJvb2wgaXNPcnRob2dvbmFsQ2hpbGQoY29uc3Qg UmVuZGVyQm94JikgY29uc3Q7CiAgICAgTGF5b3V0VW5pdCBndXR0ZXJzU2l6ZShjb25zdCBHcmlk JiwgR3JpZFRyYWNrU2l6aW5nRGlyZWN0aW9uLCB1bnNpZ25lZCBzdGFydExpbmUsIHVuc2lnbmVk IHNwYW4sIHN0ZDo6b3B0aW9uYWw8TGF5b3V0VW5pdD4gYXZhaWxhYmxlU2l6ZSkgY29uc3Q7CiAK LSAgICBzdGF0aWMgY29uc3QgU3R5bGVDb250ZW50QWxpZ25tZW50RGF0YSYgY29udGVudEFsaWdu bWVudE5vcm1hbEJlaGF2aW9yR3JpZCgpOworICAgIFN0eWxlQ29udGVudEFsaWdubWVudERhdGEg Y29udGVudEFsaWdubWVudChHcmlkVHJhY2tTaXppbmdEaXJlY3Rpb24pIGNvbnN0OwogCiBwcm90 ZWN0ZWQ6CiAgICAgSXRlbVBvc2l0aW9uIHNlbGZBbGlnbm1lbnROb3JtYWxCZWhhdmlvcihjb25z dCBSZW5kZXJCb3gqIGNoaWxkID0gbnVsbHB0cikgY29uc3Qgb3ZlcnJpZGUKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuY3BwCmluZGV4IDUzYTg2ZDhlYTkz ZGE2YzJkZjYwNzY0NzVlNDM2MDVlNjI3NWJjZmIuLjFlZjQ2OGJhYWFjZDc2MmI3NzMwZDZjNWRk MmUxNzIzYjhmMzBjMzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHls ZS9SZW5kZXJTdHlsZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1Jl bmRlclN0eWxlLmNwcApAQCAtMjgwLDYgKzI4MCwyMyBAQCBTdHlsZVNlbGZBbGlnbm1lbnREYXRh IFJlbmRlclN0eWxlOjpyZXNvbHZlZEp1c3RpZnlTZWxmKGNvbnN0IFJlbmRlclN0eWxlKiBwYXJl bgogICAgIHJldHVybiBwYXJlbnRTdHlsZS0+cmVzb2x2ZWRKdXN0aWZ5SXRlbXMobm9ybWFsVmFs dWVCZWhhdmlvdXIpOwogfQogCitzdGF0aWMgaW5saW5lIFN0eWxlQ29udGVudEFsaWdubWVudERh dGEgcmVzb2x2ZWRDb250ZW50QWxpZ25tZW50KGNvbnN0IFN0eWxlQ29udGVudEFsaWdubWVudERh dGEmIHZhbHVlLCBjb25zdCBTdHlsZUNvbnRlbnRBbGlnbm1lbnREYXRhJiBub3JtYWxWYWx1ZUJl aGF2aW9yKQoreworICAgIHJldHVybiAodmFsdWUucG9zaXRpb24oKSA9PSBDb250ZW50UG9zaXRp b25Ob3JtYWwgJiYgdmFsdWUuZGlzdHJpYnV0aW9uKCkgPT0gQ29udGVudERpc3RyaWJ1dGlvbkRl ZmF1bHQpID8gbm9ybWFsVmFsdWVCZWhhdmlvciA6IHZhbHVlOworfQorCitTdHlsZUNvbnRlbnRB bGlnbm1lbnREYXRhIFJlbmRlclN0eWxlOjpyZXNvbHZlZEFsaWduQ29udGVudChjb25zdCBTdHls ZUNvbnRlbnRBbGlnbm1lbnREYXRhJiBub3JtYWxWYWx1ZUJlaGF2aW9yKSBjb25zdAoreworICAg IC8vIFdlIHdpbGwgcmV0dXJuIHRoZSBiZWhhdmlvdXIgb2YgJ25vcm1hbCcgdmFsdWUgaWYgbmVl ZGVkLCB3aGljaCBpcyBzcGVjaWZpYyBvZiBlYWNoIGxheW91dCBtb2RlbC4KKyAgICByZXR1cm4g cmVzb2x2ZWRDb250ZW50QWxpZ25tZW50KGFsaWduQ29udGVudCgpLCBub3JtYWxWYWx1ZUJlaGF2 aW9yKTsKK30KKworU3R5bGVDb250ZW50QWxpZ25tZW50RGF0YSBSZW5kZXJTdHlsZTo6cmVzb2x2 ZWRKdXN0aWZ5Q29udGVudChjb25zdCBTdHlsZUNvbnRlbnRBbGlnbm1lbnREYXRhJiBub3JtYWxW YWx1ZUJlaGF2aW9yKSBjb25zdAoreworICAgIC8vIFdlIHdpbGwgcmV0dXJuIHRoZSBiZWhhdmlv dXIgb2YgJ25vcm1hbCcgdmFsdWUgaWYgbmVlZGVkLCB3aGljaCBpcyBzcGVjaWZpYyBvZiBlYWNo IGxheW91dCBtb2RlbC4KKyAgICByZXR1cm4gcmVzb2x2ZWRDb250ZW50QWxpZ25tZW50KGp1c3Rp ZnlDb250ZW50KCksIG5vcm1hbFZhbHVlQmVoYXZpb3IpOworfQorCiBzdGF0aWMgaW5saW5lIENv bnRlbnRQb3NpdGlvbiByZXNvbHZlZENvbnRlbnRBbGlnbm1lbnRQb3NpdGlvbihjb25zdCBTdHls ZUNvbnRlbnRBbGlnbm1lbnREYXRhJiB2YWx1ZSwgY29uc3QgU3R5bGVDb250ZW50QWxpZ25tZW50 RGF0YSYgbm9ybWFsVmFsdWVCZWhhdmlvcikKIHsKICAgICByZXR1cm4gKHZhbHVlLnBvc2l0aW9u KCkgPT0gQ29udGVudFBvc2l0aW9uTm9ybWFsICYmIHZhbHVlLmRpc3RyaWJ1dGlvbigpID09IENv bnRlbnREaXN0cmlidXRpb25EZWZhdWx0KSA/IG5vcm1hbFZhbHVlQmVoYXZpb3IucG9zaXRpb24o KSA6IHZhbHVlLnBvc2l0aW9uKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvc3R5bGUvUmVuZGVyU3R5bGUuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9S ZW5kZXJTdHlsZS5oCmluZGV4IGUyODYyNDhhNGNhN2Y5OWRhNzkwMWFjY2JkZGJjNGQzZTlhNTZm Y2MuLjc2NGUwOTJjMGQ2MDUyYTcxZDE1OGQ1NmVjNTI3YWIyNzg2YmNkM2YgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5oCkBAIC0xNjYsOCArMTY2LDEw IEBAIHB1YmxpYzoKICAgICBDb250ZW50RGlzdHJpYnV0aW9uVHlwZSByZXNvbHZlZEFsaWduQ29u dGVudERpc3RyaWJ1dGlvbihjb25zdCBTdHlsZUNvbnRlbnRBbGlnbm1lbnREYXRhJiBub3JtYWxW YWx1ZUJlaGF2aW9yKSBjb25zdDsKICAgICBTdHlsZVNlbGZBbGlnbm1lbnREYXRhIHJlc29sdmVk QWxpZ25JdGVtcyhJdGVtUG9zaXRpb24gbm9ybWFsVmFsdWVCZWhhdmlvdXIpIGNvbnN0OwogICAg IFN0eWxlU2VsZkFsaWdubWVudERhdGEgcmVzb2x2ZWRBbGlnblNlbGYoY29uc3QgUmVuZGVyU3R5 bGUqIHBhcmVudFN0eWxlLCBJdGVtUG9zaXRpb24gbm9ybWFsVmFsdWVCZWhhdmlvdXIpIGNvbnN0 OworICAgIFN0eWxlQ29udGVudEFsaWdubWVudERhdGEgcmVzb2x2ZWRBbGlnbkNvbnRlbnQoY29u c3QgU3R5bGVDb250ZW50QWxpZ25tZW50RGF0YSYgbm9ybWFsVmFsdWVCZWhhdmlvdXIpIGNvbnN0 OwogICAgIFN0eWxlU2VsZkFsaWdubWVudERhdGEgcmVzb2x2ZWRKdXN0aWZ5SXRlbXMoSXRlbVBv c2l0aW9uIG5vcm1hbFZhbHVlQmVoYXZpb3VyKSBjb25zdDsKICAgICBTdHlsZVNlbGZBbGlnbm1l bnREYXRhIHJlc29sdmVkSnVzdGlmeVNlbGYoY29uc3QgUmVuZGVyU3R5bGUqIHBhcmVudFN0eWxl LCBJdGVtUG9zaXRpb24gbm9ybWFsVmFsdWVCZWhhdmlvdXIpIGNvbnN0OworICAgIFN0eWxlQ29u dGVudEFsaWdubWVudERhdGEgcmVzb2x2ZWRKdXN0aWZ5Q29udGVudChjb25zdCBTdHlsZUNvbnRl bnRBbGlnbm1lbnREYXRhJiBub3JtYWxWYWx1ZUJlaGF2aW91cikgY29uc3Q7CiAKICAgICBQc2V1 ZG9JZCBzdHlsZVR5cGUoKSBjb25zdCB7IHJldHVybiBzdGF0aWNfY2FzdDxQc2V1ZG9JZD4obV9u b25Jbmhlcml0ZWRGbGFncy5zdHlsZVR5cGUpOyB9CiAgICAgdm9pZCBzZXRTdHlsZVR5cGUoUHNl dWRvSWQgc3R5bGVUeXBlKSB7IG1fbm9uSW5oZXJpdGVkRmxhZ3Muc3R5bGVUeXBlID0gc3R5bGVU eXBlOyB9Cg==