131192 2014-04-03 16:58:50 -0700 Use more const refs in ShapeOutsideInfo and some misc cleanup 2014-04-04 11:36:56 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 98664 1 bjonesbe bjonesbe commit-queue esprehn+autocc glenn kondapallykalyan zoltan oldest_to_newest 997378 0 bjonesbe 2014-04-03 16:58:50 -0700 Use more const refs in ShapeOutsideInfo and some misc cleanup 997379 1 228561 bjonesbe 2014-04-03 17:00:40 -0700 Created attachment 228561 Patch 997391 2 zoltan 2014-04-03 17:17:11 -0700 The change looks good to me. 997593 3 228561 krit 2014-04-04 09:37:31 -0700 Comment on attachment 228561 Patch r=me 997595 4 228561 commit-queue 2014-04-04 09:40:00 -0700 Comment on attachment 228561 Patch Rejecting attachment 228561 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.appspot.com', '--bot-id=webkit-cq-01', 'apply-attachment', '--no-update', '--non-interactive', 228561, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit Last 500 characters of output: le(s). patching file Source/WebCore/ChangeLog Hunk #1 succeeded at 1 with fuzz 3. patching file Source/WebCore/rendering/shapes/ShapeOutsideInfo.cpp Hunk #3 FAILED at 132. 1 out of 6 hunks FAILED -- saving rejects to file Source/WebCore/rendering/shapes/ShapeOutsideInfo.cpp.rej patching file Source/WebCore/rendering/shapes/ShapeOutsideInfo.h Failed to run "[u'/Volumes/Data/EWS/WebKit/Tools/Scripts/svn-apply', '--force', '--reviewer', u'Dirk Schulze']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Full output: http://webkit-queues.appspot.com/results/5822707933380608 997615 5 228601 bjonesbe 2014-04-04 10:33:58 -0700 Created attachment 228601 Patch for landing 997617 6 228603 bjonesbe 2014-04-04 10:35:09 -0700 Created attachment 228603 Patch for landing, this time with reviewer properly updated 997620 7 228603 commit-queue 2014-04-04 10:36:33 -0700 Comment on attachment 228603 Patch for landing, this time with reviewer properly updated Rejecting attachment 228603 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.appspot.com', '--bot-id=webkit-cq-01', 'apply-attachment', '--no-update', '--non-interactive', 228603, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit Last 500 characters of output: t Parsed 3 diffs from patch file(s). patching file Source/WebCore/ChangeLog Hunk #1 succeeded at 1 with fuzz 3. patching file Source/WebCore/rendering/shapes/ShapeOutsideInfo.cpp Hunk #4 FAILED at 159. 1 out of 6 hunks FAILED -- saving rejects to file Source/WebCore/rendering/shapes/ShapeOutsideInfo.cpp.rej patching file Source/WebCore/rendering/shapes/ShapeOutsideInfo.h Failed to run "[u'/Volumes/Data/EWS/WebKit/Tools/Scripts/svn-apply', '--force']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Full output: http://webkit-queues.appspot.com/results/5221472641482752 997651 8 bjonesbe 2014-04-04 11:36:56 -0700 Committed r166797: <http://trac.webkit.org/changeset/166797> 228561 2014-04-03 17:00:40 -0700 2014-04-04 10:33:55 -0700 Patch bug-131192-20140403170256.patch text/plain 9358 bjonesbe U3VidmVyc2lvbiBSZXZpc2lvbjogMTY2NzUzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTllMWIxOGVlYjAwNzAx OGMxYjcyNDUzMGU0OTYzZDg3MmNhZWIxZC4uZWQyOWJhM2JiOTdjYmUyMDk5Zjc1MDY4ODkzY2Jh ZjEwOTBhNGQ4ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI5IEBACiAyMDE0LTA0LTAzICBCZW0g Sm9uZXMtQmV5ICA8YmpvbmVzYmVAYWRvYmUuY29tPgogCisgICAgICAgIFVzZSBtb3JlIGNvbnN0 IHJlZnMgaW4gU2hhcGVPdXRzaWRlSW5mbyBhbmQgc29tZSBtaXNjIGNsZWFudXAKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMTE5MgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVzZSBjb25zdCByZWZzIGZv ciBwcmV0dHkgbXVjaCBldmVyeXRoaW5nIHRoYXQgY2FuJ3QgYmUgbnVsbC4gQWxzbworICAgICAg ICBjbGVhbnVwIHNvbWUgY29kZSB0aGF0IGdvdCBhIGJpdCBtZXNzeSB3aGVuIFNoYXBlSW5mbyB3 YXMgbWVyZ2VkIGludG8KKyAgICAgICAgU2hhcGVPdXRzaWRlSW5mby4KKworICAgICAgICBObyBu ZXcgdGVzdHMsIG5vIGJlaGF2aW9yIGNoYW5nZS4KKworICAgICAgICAqIHJlbmRlcmluZy9zaGFw ZXMvU2hhcGVPdXRzaWRlSW5mby5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTaGFwZU91dHNpZGVJ bmZvOjpzaGFwZVRvUmVuZGVyZXJQb2ludCk6CisgICAgICAgIChXZWJDb3JlOjpTaGFwZU91dHNp ZGVJbmZvOjpzaGFwZVRvUmVuZGVyZXJTaXplKToKKyAgICAgICAgKFdlYkNvcmU6OnJlZmVyZW5j ZUJveCk6CisgICAgICAgIChXZWJDb3JlOjpTaGFwZU91dHNpZGVJbmZvOjpzZXRSZWZlcmVuY2VC b3hMb2dpY2FsU2l6ZSk6CisgICAgICAgIChXZWJDb3JlOjpnZXRTaGFwZUltYWdlQW5kUmVjdCk6 CisgICAgICAgIChXZWJDb3JlOjpTaGFwZU91dHNpZGVJbmZvOjpjb21wdXRlZFNoYXBlKToKKyAg ICAgICAgKFdlYkNvcmU6OlNoYXBlT3V0c2lkZUluZm86OmxvZ2ljYWxUb3BPZmZzZXQpOgorICAg ICAgICAoV2ViQ29yZTo6U2hhcGVPdXRzaWRlSW5mbzo6bG9naWNhbExlZnRPZmZzZXQpOgorICAg ICAgICAqIHJlbmRlcmluZy9zaGFwZXMvU2hhcGVPdXRzaWRlSW5mby5oOgorCisyMDE0LTA0LTAz ICBCZW0gSm9uZXMtQmV5ICA8YmpvbmVzYmVAYWRvYmUuY29tPgorCiAgICAgICAgIE1lcmdlIFNo YXBlSW5mbyAmIFNoYXBlT3V0c2lkZUluZm8gbm93IHRoYXQgU2hhcGVJbnNpZGVJbmZvIGlzIG5v IG1vcmUKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEz MTE4MAogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc2hhcGVzL1NoYXBl T3V0c2lkZUluZm8uY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3NoYXBlcy9TaGFwZU91 dHNpZGVJbmZvLmNwcAppbmRleCAwNGU2NDY2YjE0YjQwMjk2MjkxY2Q4MjIwZThmNTE0ZGUxM2Vj MmEzLi4wNjA0ZmU3ZWZlYWU5NjEyMDcyY2IwMGFkMWQ0NWM4NWI4OTFiYzE1IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc2hhcGVzL1NoYXBlT3V0c2lkZUluZm8uY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zaGFwZXMvU2hhcGVPdXRzaWRlSW5mby5jcHAK QEAgLTU1LDcgKzU1LDcgQEAgTGF5b3V0UmVjdCBTaGFwZU91dHNpZGVJbmZvOjpjb21wdXRlZFNo YXBlUGh5c2ljYWxCb3VuZGluZ0JveCgpIGNvbnN0CiAgICAgcmV0dXJuIHBoeXNpY2FsQm91bmRp bmdCb3g7CiB9CiAKLUZsb2F0UG9pbnQgU2hhcGVPdXRzaWRlSW5mbzo6c2hhcGVUb1JlbmRlcmVy UG9pbnQoRmxvYXRQb2ludCBwb2ludCkgY29uc3QKK0Zsb2F0UG9pbnQgU2hhcGVPdXRzaWRlSW5m bzo6c2hhcGVUb1JlbmRlcmVyUG9pbnQoY29uc3QgRmxvYXRQb2ludCYgcG9pbnQpIGNvbnN0CiB7 CiAgICAgRmxvYXRQb2ludCByZXN1bHQgPSBGbG9hdFBvaW50KHBvaW50LngoKSArIGxvZ2ljYWxM ZWZ0T2Zmc2V0KCksIHBvaW50LnkoKSArIGxvZ2ljYWxUb3BPZmZzZXQoKSk7CiAgICAgaWYgKG1f cmVuZGVyZXIuc3R5bGUoKS5pc0ZsaXBwZWRCbG9ja3NXcml0aW5nTW9kZSgpKQpAQCAtNjUsMjcg KzY1LDI3IEBAIEZsb2F0UG9pbnQgU2hhcGVPdXRzaWRlSW5mbzo6c2hhcGVUb1JlbmRlcmVyUG9p bnQoRmxvYXRQb2ludCBwb2ludCkgY29uc3QKICAgICByZXR1cm4gcmVzdWx0OwogfQogCi1GbG9h dFNpemUgU2hhcGVPdXRzaWRlSW5mbzo6c2hhcGVUb1JlbmRlcmVyU2l6ZShGbG9hdFNpemUgc2l6 ZSkgY29uc3QKK0Zsb2F0U2l6ZSBTaGFwZU91dHNpZGVJbmZvOjpzaGFwZVRvUmVuZGVyZXJTaXpl KGNvbnN0IEZsb2F0U2l6ZSYgc2l6ZSkgY29uc3QKIHsKICAgICBpZiAoIW1fcmVuZGVyZXIuc3R5 bGUoKS5pc0hvcml6b250YWxXcml0aW5nTW9kZSgpKQogICAgICAgICByZXR1cm4gc2l6ZS50cmFu c3Bvc2VkU2l6ZSgpOwogICAgIHJldHVybiBzaXplOwogfQogCi1zdGF0aWMgaW5saW5lIENTU0Jv eFR5cGUgcmVmZXJlbmNlQm94KFNoYXBlVmFsdWUqIHNoYXBlVmFsdWUpCitzdGF0aWMgaW5saW5l IENTU0JveFR5cGUgcmVmZXJlbmNlQm94KGNvbnN0IFNoYXBlVmFsdWUmIHNoYXBlVmFsdWUpCiB7 Ci0gICAgaWYgKHNoYXBlVmFsdWUtPmNzc0JveCgpID09IEJveE1pc3NpbmcpIHsKLSAgICAgICAg aWYgKHNoYXBlVmFsdWUtPnR5cGUoKSA9PSBTaGFwZVZhbHVlOjpJbWFnZSkKKyAgICBpZiAoc2hh cGVWYWx1ZS5jc3NCb3goKSA9PSBCb3hNaXNzaW5nKSB7CisgICAgICAgIGlmIChzaGFwZVZhbHVl LnR5cGUoKSA9PSBTaGFwZVZhbHVlOjpJbWFnZSkKICAgICAgICAgICAgIHJldHVybiBDb250ZW50 Qm94OwogICAgICAgICByZXR1cm4gTWFyZ2luQm94OwogICAgIH0KLSAgICByZXR1cm4gc2hhcGVW YWx1ZS0+Y3NzQm94KCk7CisgICAgcmV0dXJuIHNoYXBlVmFsdWUuY3NzQm94KCk7CiB9CiAKIHZv aWQgU2hhcGVPdXRzaWRlSW5mbzo6c2V0UmVmZXJlbmNlQm94TG9naWNhbFNpemUoTGF5b3V0U2l6 ZSBuZXdSZWZlcmVuY2VCb3hMb2dpY2FsU2l6ZSkKIHsKICAgICBib29sIGlzSG9yaXpvbnRhbFdy aXRpbmdNb2RlID0gbV9yZW5kZXJlci5jb250YWluaW5nQmxvY2soKS0+c3R5bGUoKS5pc0hvcml6 b250YWxXcml0aW5nTW9kZSgpOwotICAgIHN3aXRjaCAocmVmZXJlbmNlQm94KG1fcmVuZGVyZXIu c3R5bGUoKS5zaGFwZU91dHNpZGUoKSkpIHsKKyAgICBzd2l0Y2ggKHJlZmVyZW5jZUJveCgqbV9y ZW5kZXJlci5zdHlsZSgpLnNoYXBlT3V0c2lkZSgpKSkgewogICAgIGNhc2UgTWFyZ2luQm94Ogog ICAgICAgICBpZiAoaXNIb3Jpem9udGFsV3JpdGluZ01vZGUpCiAgICAgICAgICAgICBuZXdSZWZl cmVuY2VCb3hMb2dpY2FsU2l6ZS5leHBhbmQobV9yZW5kZXJlci5ob3Jpem9udGFsTWFyZ2luRXh0 ZW50KCksIG1fcmVuZGVyZXIudmVydGljYWxNYXJnaW5FeHRlbnQoKSk7CkBAIC0xMzIsMTcgKzEz MiwxNyBAQCBzdGF0aWMgaW5saW5lIGJvb2wgY2hlY2tTaGFwZUltYWdlT3JpZ2luKERvY3VtZW50 JiBkb2N1bWVudCwgQ2FjaGVkSW1hZ2UmIGNhY2hlZAogICAgIHJldHVybiBmYWxzZTsKIH0KIAot c3RhdGljIHZvaWQgZ2V0U2hhcGVJbWFnZUFuZFJlY3QoY29uc3QgU2hhcGVWYWx1ZSogc2hhcGVW YWx1ZSwgY29uc3QgUmVuZGVyQm94KiByZW5kZXJCb3gsIGNvbnN0IExheW91dFNpemUmIHJlZmVy ZW5jZUJveFNpemUsIEltYWdlKiYgaW1hZ2UsIExheW91dFJlY3QmIHJlY3QpCitzdGF0aWMgdm9p ZCBnZXRTaGFwZUltYWdlQW5kUmVjdChjb25zdCBTaGFwZVZhbHVlJiBzaGFwZVZhbHVlLCBjb25z dCBSZW5kZXJCb3gmIHJlbmRlckJveCwgY29uc3QgTGF5b3V0U2l6ZSYgcmVmZXJlbmNlQm94U2l6 ZSwgSW1hZ2UqJiBpbWFnZSwgTGF5b3V0UmVjdCYgcmVjdCkKIHsKLSAgICBBU1NFUlQoc2hhcGVW YWx1ZS0+aXNJbWFnZVZhbGlkKCkpOwotICAgIFN0eWxlSW1hZ2UqIHN0eWxlSW1hZ2UgPSBzaGFw ZVZhbHVlLT5pbWFnZSgpOworICAgIEFTU0VSVChzaGFwZVZhbHVlLmlzSW1hZ2VWYWxpZCgpKTsK KyAgICBTdHlsZUltYWdlKiBzdHlsZUltYWdlID0gc2hhcGVWYWx1ZS5pbWFnZSgpOwogCi0gICAg Y29uc3QgSW50U2l6ZSYgaW1hZ2VTaXplID0gcmVuZGVyQm94LT5jYWxjdWxhdGVJbWFnZUludHJp bnNpY0RpbWVuc2lvbnMoc3R5bGVJbWFnZSwgcm91bmRlZEludFNpemUocmVmZXJlbmNlQm94U2l6 ZSksIFJlbmRlckltYWdlOjpTY2FsZUJ5RWZmZWN0aXZlWm9vbSk7Ci0gICAgc3R5bGVJbWFnZS0+ c2V0Q29udGFpbmVyU2l6ZUZvclJlbmRlcmVyKHJlbmRlckJveCwgaW1hZ2VTaXplLCByZW5kZXJC b3gtPnN0eWxlKCkuZWZmZWN0aXZlWm9vbSgpKTsKKyAgICBjb25zdCBJbnRTaXplJiBpbWFnZVNp emUgPSByZW5kZXJCb3guY2FsY3VsYXRlSW1hZ2VJbnRyaW5zaWNEaW1lbnNpb25zKHN0eWxlSW1h Z2UsIHJvdW5kZWRJbnRTaXplKHJlZmVyZW5jZUJveFNpemUpLCBSZW5kZXJJbWFnZTo6U2NhbGVC eUVmZmVjdGl2ZVpvb20pOworICAgIHN0eWxlSW1hZ2UtPnNldENvbnRhaW5lclNpemVGb3JSZW5k ZXJlcigmcmVuZGVyQm94LCBpbWFnZVNpemUsIHJlbmRlckJveC5zdHlsZSgpLmVmZmVjdGl2ZVpv b20oKSk7CiAKLSAgICBpbWFnZSA9IHN0eWxlSW1hZ2UtPmNhY2hlZEltYWdlKCktPmltYWdlRm9y UmVuZGVyZXIocmVuZGVyQm94KTsKLSAgICBpZiAocmVuZGVyQm94LT5pc1JlbmRlckltYWdlKCkp Ci0gICAgICAgIHJlY3QgPSB0b1JlbmRlckltYWdlKHJlbmRlckJveCktPnJlcGxhY2VkQ29udGVu dFJlY3QocmVuZGVyQm94LT5pbnRyaW5zaWNTaXplKCkpOworICAgIGltYWdlID0gc3R5bGVJbWFn ZS0+Y2FjaGVkSW1hZ2UoKS0+aW1hZ2VGb3JSZW5kZXJlcigmcmVuZGVyQm94KTsKKyAgICBpZiAo cmVuZGVyQm94LmlzUmVuZGVySW1hZ2UoKSkKKyAgICAgICAgcmVjdCA9IHRvUmVuZGVySW1hZ2Uo JnJlbmRlckJveCktPnJlcGxhY2VkQ29udGVudFJlY3QocmVuZGVyQm94LmludHJpbnNpY1NpemUo KSk7CiAgICAgZWxzZQogICAgICAgICByZWN0ID0gTGF5b3V0UmVjdChMYXlvdXRQb2ludCgpLCBp bWFnZVNpemUpOwogfQpAQCAtMTU5LDI4ICsxNTksMzEgQEAgY29uc3QgU2hhcGUmIFNoYXBlT3V0 c2lkZUluZm86OmNvbXB1dGVkU2hhcGUoKSBjb25zdAogICAgIGlmIChTaGFwZSogc2hhcGUgPSBt X3NoYXBlLmdldCgpKQogICAgICAgICByZXR1cm4gKnNoYXBlOwogCi0gICAgV3JpdGluZ01vZGUg d3JpdGluZ01vZGUgPSBtX3JlbmRlcmVyLmNvbnRhaW5pbmdCbG9jaygpLT5zdHlsZSgpLndyaXRp bmdNb2RlKCk7Ci0gICAgTGVuZ3RoIG1hcmdpbiA9IG1fcmVuZGVyZXIuc3R5bGUoKS5zaGFwZU1h cmdpbigpOwotICAgIGZsb2F0IHNoYXBlSW1hZ2VUaHJlc2hvbGQgPSBtX3JlbmRlcmVyLnN0eWxl KCkuc2hhcGVJbWFnZVRocmVzaG9sZCgpOwotICAgIGNvbnN0IFNoYXBlVmFsdWUqIHNoYXBlVmFs dWUgPSB0aGlzLT5tX3JlbmRlcmVyLnN0eWxlKCkuc2hhcGVPdXRzaWRlKCk7Ci0gICAgQVNTRVJU KHNoYXBlVmFsdWUpOworICAgIGNvbnN0IFJlbmRlclN0eWxlJiBzdHlsZSA9IG1fcmVuZGVyZXIu c3R5bGUoKTsKKyAgICBBU1NFUlQobV9yZW5kZXJlci5jb250YWluaW5nQmxvY2soKSk7CisgICAg Y29uc3QgUmVuZGVyU3R5bGUmIGNvbnRhaW5pbmdCbG9ja1N0eWxlID0gbV9yZW5kZXJlci5jb250 YWluaW5nQmxvY2soKS0+c3R5bGUoKTsKIAotICAgIHN3aXRjaCAoc2hhcGVWYWx1ZS0+dHlwZSgp KSB7CisgICAgV3JpdGluZ01vZGUgd3JpdGluZ01vZGUgPSBjb250YWluaW5nQmxvY2tTdHlsZS53 cml0aW5nTW9kZSgpOworICAgIExlbmd0aCBtYXJnaW4gPSBzdHlsZS5zaGFwZU1hcmdpbigpOwor ICAgIGZsb2F0IHNoYXBlSW1hZ2VUaHJlc2hvbGQgPSBzdHlsZS5zaGFwZUltYWdlVGhyZXNob2xk KCk7CisgICAgY29uc3QgU2hhcGVWYWx1ZSYgc2hhcGVWYWx1ZSA9ICpzdHlsZS5zaGFwZU91dHNp ZGUoKTsKKworICAgIHN3aXRjaCAoc2hhcGVWYWx1ZS50eXBlKCkpIHsKICAgICBjYXNlIFNoYXBl VmFsdWU6OlNoYXBlOgotICAgICAgICBBU1NFUlQoc2hhcGVWYWx1ZS0+c2hhcGUoKSk7Ci0gICAg ICAgIG1fc2hhcGUgPSBTaGFwZTo6Y3JlYXRlU2hhcGUoc2hhcGVWYWx1ZS0+c2hhcGUoKSwgbV9y ZWZlcmVuY2VCb3hMb2dpY2FsU2l6ZSwgd3JpdGluZ01vZGUsIG1hcmdpbik7CisgICAgICAgIEFT U0VSVChzaGFwZVZhbHVlLnNoYXBlKCkpOworICAgICAgICBtX3NoYXBlID0gU2hhcGU6OmNyZWF0 ZVNoYXBlKHNoYXBlVmFsdWUuc2hhcGUoKSwgbV9yZWZlcmVuY2VCb3hMb2dpY2FsU2l6ZSwgd3Jp dGluZ01vZGUsIG1hcmdpbik7CiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgU2hhcGVWYWx1ZTo6 SW1hZ2U6IHsKICAgICAgICAgSW1hZ2UqIGltYWdlOwogICAgICAgICBMYXlvdXRSZWN0IGltYWdl UmVjdDsKLSAgICAgICAgZ2V0U2hhcGVJbWFnZUFuZFJlY3Qoc2hhcGVWYWx1ZSwgJm1fcmVuZGVy ZXIsIG1fcmVmZXJlbmNlQm94TG9naWNhbFNpemUsIGltYWdlLCBpbWFnZVJlY3QpOworICAgICAg ICBnZXRTaGFwZUltYWdlQW5kUmVjdChzaGFwZVZhbHVlLCBtX3JlbmRlcmVyLCBtX3JlZmVyZW5j ZUJveExvZ2ljYWxTaXplLCBpbWFnZSwgaW1hZ2VSZWN0KTsKICAgICAgICAgY29uc3QgTGF5b3V0 UmVjdCYgbWFyZ2luUmVjdCA9IGdldFNoYXBlSW1hZ2VNYXJnaW5SZWN0KG1fcmVuZGVyZXIsIG1f cmVmZXJlbmNlQm94TG9naWNhbFNpemUpOwogICAgICAgICBtX3NoYXBlID0gU2hhcGU6OmNyZWF0 ZVJhc3RlclNoYXBlKGltYWdlLCBzaGFwZUltYWdlVGhyZXNob2xkLCBpbWFnZVJlY3QsIG1hcmdp blJlY3QsIHdyaXRpbmdNb2RlLCBtYXJnaW4pOwogICAgICAgICBicmVhazsKICAgICB9CiAgICAg Y2FzZSBTaGFwZVZhbHVlOjpCb3g6IHsKLSAgICAgICAgUm91bmRlZFJlY3Qgc2hhcGVSZWN0ID0g Y29tcHV0ZVJvdW5kZWRSZWN0Rm9yQm94U2hhcGUocmVmZXJlbmNlQm94KG1fcmVuZGVyZXIuc3R5 bGUoKS5zaGFwZU91dHNpZGUoKSksIG1fcmVuZGVyZXIpOwotICAgICAgICBpZiAoIW1fcmVuZGVy ZXIuY29udGFpbmluZ0Jsb2NrKCktPnN0eWxlKCkuaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSkK KyAgICAgICAgUm91bmRlZFJlY3Qgc2hhcGVSZWN0ID0gY29tcHV0ZVJvdW5kZWRSZWN0Rm9yQm94 U2hhcGUocmVmZXJlbmNlQm94KHNoYXBlVmFsdWUpLCBtX3JlbmRlcmVyKTsKKyAgICAgICAgaWYg KCFjb250YWluaW5nQmxvY2tTdHlsZS5pc0hvcml6b250YWxXcml0aW5nTW9kZSgpKQogICAgICAg ICAgICAgc2hhcGVSZWN0ID0gc2hhcGVSZWN0LnRyYW5zcG9zZWRSZWN0KCk7CiAgICAgICAgIG1f c2hhcGUgPSBTaGFwZTo6Y3JlYXRlQm94U2hhcGUoc2hhcGVSZWN0LCB3cml0aW5nTW9kZSwgbWFy Z2luKTsKICAgICAgICAgYnJlYWs7CkBAIC0yMjIsNyArMjI1LDcgQEAgc3RhdGljIGlubGluZSBM YXlvdXRVbml0IGJvcmRlckFuZFBhZGRpbmdCZWZvcmVJbldyaXRpbmdNb2RlKGNvbnN0IFJlbmRl ckJveCYgcmUKIAogTGF5b3V0VW5pdCBTaGFwZU91dHNpZGVJbmZvOjpsb2dpY2FsVG9wT2Zmc2V0 KCkgY29uc3QKIHsKLSAgICBzd2l0Y2ggKHJlZmVyZW5jZUJveChtX3JlbmRlcmVyLnN0eWxlKCku c2hhcGVPdXRzaWRlKCkpKSB7CisgICAgc3dpdGNoIChyZWZlcmVuY2VCb3goKm1fcmVuZGVyZXIu c3R5bGUoKS5zaGFwZU91dHNpZGUoKSkpIHsKICAgICBjYXNlIE1hcmdpbkJveDogcmV0dXJuIC1t X3JlbmRlcmVyLm1hcmdpbkJlZm9yZSgmbV9yZW5kZXJlci5jb250YWluaW5nQmxvY2soKS0+c3R5 bGUoKSk7CiAgICAgY2FzZSBCb3JkZXJCb3g6IHJldHVybiBMYXlvdXRVbml0KCk7CiAgICAgY2Fz ZSBQYWRkaW5nQm94OiByZXR1cm4gYm9yZGVyQmVmb3JlSW5Xcml0aW5nTW9kZShtX3JlbmRlcmVy LCBtX3JlbmRlcmVyLmNvbnRhaW5pbmdCbG9jaygpLT5zdHlsZSgpLndyaXRpbmdNb2RlKCkpOwpA QCAtMjcwLDcgKzI3Myw3IEBAIExheW91dFVuaXQgU2hhcGVPdXRzaWRlSW5mbzo6bG9naWNhbExl ZnRPZmZzZXQoKSBjb25zdAogICAgIGlmIChtX3JlbmRlcmVyLmlzUmVuZGVyUmVnaW9uKCkpCiAg ICAgICAgIHJldHVybiBMYXlvdXRVbml0KCk7CiAgICAgCi0gICAgc3dpdGNoIChyZWZlcmVuY2VC b3gobV9yZW5kZXJlci5zdHlsZSgpLnNoYXBlT3V0c2lkZSgpKSkgeworICAgIHN3aXRjaCAocmVm ZXJlbmNlQm94KCptX3JlbmRlcmVyLnN0eWxlKCkuc2hhcGVPdXRzaWRlKCkpKSB7CiAgICAgY2Fz ZSBNYXJnaW5Cb3g6IHJldHVybiAtbV9yZW5kZXJlci5tYXJnaW5TdGFydCgmbV9yZW5kZXJlci5j b250YWluaW5nQmxvY2soKS0+c3R5bGUoKSk7CiAgICAgY2FzZSBCb3JkZXJCb3g6IHJldHVybiBM YXlvdXRVbml0KCk7CiAgICAgY2FzZSBQYWRkaW5nQm94OiByZXR1cm4gYm9yZGVyU3RhcnRXaXRo U3R5bGVGb3JXcml0aW5nTW9kZShtX3JlbmRlcmVyLCBtX3JlbmRlcmVyLmNvbnRhaW5pbmdCbG9j aygpLT5zdHlsZSgpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zaGFw ZXMvU2hhcGVPdXRzaWRlSW5mby5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3NoYXBlcy9T aGFwZU91dHNpZGVJbmZvLmgKaW5kZXggZGQ3MzIxZWUwMzA3YmUyOThlZGI5N2M0M2ZmMzU5NWQy OWNmMjQ5NS4uZGQ5ZGZhZjU3YzY5MzM1NzUxYzFjZjkwYmY5YzFkMTcyOGUxNTU4MSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3NoYXBlcy9TaGFwZU91dHNpZGVJbmZvLmgK KysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3NoYXBlcy9TaGFwZU91dHNpZGVJbmZvLmgK QEAgLTgwLDggKzgwLDggQEAgcHVibGljOgogICAgIGJvb2wgaXNTaGFwZURpcnR5KCkgeyByZXR1 cm4gIW1fc2hhcGU7IH0KIAogICAgIExheW91dFJlY3QgY29tcHV0ZWRTaGFwZVBoeXNpY2FsQm91 bmRpbmdCb3goKSBjb25zdDsKLSAgICBGbG9hdFBvaW50IHNoYXBlVG9SZW5kZXJlclBvaW50KEZs b2F0UG9pbnQpIGNvbnN0OwotICAgIEZsb2F0U2l6ZSBzaGFwZVRvUmVuZGVyZXJTaXplKEZsb2F0 U2l6ZSkgY29uc3Q7CisgICAgRmxvYXRQb2ludCBzaGFwZVRvUmVuZGVyZXJQb2ludChjb25zdCBG bG9hdFBvaW50JikgY29uc3Q7CisgICAgRmxvYXRTaXplIHNoYXBlVG9SZW5kZXJlclNpemUoY29u c3QgRmxvYXRTaXplJikgY29uc3Q7CiAKICAgICBjb25zdCBTaGFwZSYgY29tcHV0ZWRTaGFwZSgp IGNvbnN0OwogCg== 228601 2014-04-04 10:33:58 -0700 2014-04-04 10:35:06 -0700 Patch for landing bug-131192-20140404103625.patch text/plain 9279 bjonesbe U3VidmVyc2lvbiBSZXZpc2lvbjogMTY2Nzg2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDgxN2EwOWYyZTYxNmY3 YmQxZWFlNzYxMGU4YzIxZWU3MWEzN2UxMC4uZmM2ODVjZGJjZTMzZTJiYTUxYjY2YTczMDZhMzE1 Njk5Yjg2NWMzZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE0LTA0LTA0ICBCZW0g Sm9uZXMtQmV5ICA8YmpvbmVzYmVAYWRvYmUuY29tPgorCisgICAgICAgIFVzZSBtb3JlIGNvbnN0 IHJlZnMgaW4gU2hhcGVPdXRzaWRlSW5mbyBhbmQgc29tZSBtaXNjIGNsZWFudXAKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMTE5MgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVzZSBjb25zdCByZWZzIGZv ciBwcmV0dHkgbXVjaCBldmVyeXRoaW5nIHRoYXQgY2FuJ3QgYmUgbnVsbC4gQWxzbworICAgICAg ICBjbGVhbnVwIHNvbWUgY29kZSB0aGF0IGdvdCBhIGJpdCBtZXNzeSB3aGVuIFNoYXBlSW5mbyB3 YXMgbWVyZ2VkIGludG8KKyAgICAgICAgU2hhcGVPdXRzaWRlSW5mby4KKworICAgICAgICBObyBu ZXcgdGVzdHMsIG5vIGJlaGF2aW9yIGNoYW5nZS4KKworICAgICAgICAqIHJlbmRlcmluZy9zaGFw ZXMvU2hhcGVPdXRzaWRlSW5mby5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTaGFwZU91dHNpZGVJ bmZvOjpzaGFwZVRvUmVuZGVyZXJQb2ludCk6CisgICAgICAgIChXZWJDb3JlOjpTaGFwZU91dHNp ZGVJbmZvOjpzaGFwZVRvUmVuZGVyZXJTaXplKToKKyAgICAgICAgKFdlYkNvcmU6OnJlZmVyZW5j ZUJveCk6CisgICAgICAgIChXZWJDb3JlOjpTaGFwZU91dHNpZGVJbmZvOjpzZXRSZWZlcmVuY2VC b3hMb2dpY2FsU2l6ZSk6CisgICAgICAgIChXZWJDb3JlOjpnZXRTaGFwZUltYWdlQW5kUmVjdCk6 CisgICAgICAgIChXZWJDb3JlOjpTaGFwZU91dHNpZGVJbmZvOjpjb21wdXRlZFNoYXBlKToKKyAg ICAgICAgKFdlYkNvcmU6OlNoYXBlT3V0c2lkZUluZm86OmxvZ2ljYWxUb3BPZmZzZXQpOgorICAg ICAgICAoV2ViQ29yZTo6U2hhcGVPdXRzaWRlSW5mbzo6bG9naWNhbExlZnRPZmZzZXQpOgorICAg ICAgICAqIHJlbmRlcmluZy9zaGFwZXMvU2hhcGVPdXRzaWRlSW5mby5oOgorCiAyMDE0LTA0LTA0 ICBab2x0YW4gSG9ydmF0aCAgPHpvbHRhbkB3ZWJraXQub3JnPgogCiAgICAgICAgIFtDU1MgU2hh cGVzXSBSZW1vdmUgb3V0c2lkZS1zaGFwZSBDU1MgdmFsdWUKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9zaGFwZXMvU2hhcGVPdXRzaWRlSW5mby5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvc2hhcGVzL1NoYXBlT3V0c2lkZUluZm8uY3BwCmluZGV4IGU4ZTdjNjFi N2U0Y2U0NDE2YjhmYTgzMGU5ZGZkMmI4ZmIxZDdlMmYuLmMzMmRiMWRjNjMyZWMyOWZiOTRmMjk3 NGZlOTlkNWNmNmIyNGQ1MmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9z aGFwZXMvU2hhcGVPdXRzaWRlSW5mby5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L3NoYXBlcy9TaGFwZU91dHNpZGVJbmZvLmNwcApAQCAtNTUsNyArNTUsNyBAQCBMYXlvdXRSZWN0 IFNoYXBlT3V0c2lkZUluZm86OmNvbXB1dGVkU2hhcGVQaHlzaWNhbEJvdW5kaW5nQm94KCkgY29u c3QKICAgICByZXR1cm4gcGh5c2ljYWxCb3VuZGluZ0JveDsKIH0KIAotRmxvYXRQb2ludCBTaGFw ZU91dHNpZGVJbmZvOjpzaGFwZVRvUmVuZGVyZXJQb2ludChGbG9hdFBvaW50IHBvaW50KSBjb25z dAorRmxvYXRQb2ludCBTaGFwZU91dHNpZGVJbmZvOjpzaGFwZVRvUmVuZGVyZXJQb2ludChjb25z dCBGbG9hdFBvaW50JiBwb2ludCkgY29uc3QKIHsKICAgICBGbG9hdFBvaW50IHJlc3VsdCA9IEZs b2F0UG9pbnQocG9pbnQueCgpICsgbG9naWNhbExlZnRPZmZzZXQoKSwgcG9pbnQueSgpICsgbG9n aWNhbFRvcE9mZnNldCgpKTsKICAgICBpZiAobV9yZW5kZXJlci5zdHlsZSgpLmlzRmxpcHBlZEJs b2Nrc1dyaXRpbmdNb2RlKCkpCkBAIC02NSwyNyArNjUsMjcgQEAgRmxvYXRQb2ludCBTaGFwZU91 dHNpZGVJbmZvOjpzaGFwZVRvUmVuZGVyZXJQb2ludChGbG9hdFBvaW50IHBvaW50KSBjb25zdAog ICAgIHJldHVybiByZXN1bHQ7CiB9CiAKLUZsb2F0U2l6ZSBTaGFwZU91dHNpZGVJbmZvOjpzaGFw ZVRvUmVuZGVyZXJTaXplKEZsb2F0U2l6ZSBzaXplKSBjb25zdAorRmxvYXRTaXplIFNoYXBlT3V0 c2lkZUluZm86OnNoYXBlVG9SZW5kZXJlclNpemUoY29uc3QgRmxvYXRTaXplJiBzaXplKSBjb25z dAogewogICAgIGlmICghbV9yZW5kZXJlci5zdHlsZSgpLmlzSG9yaXpvbnRhbFdyaXRpbmdNb2Rl KCkpCiAgICAgICAgIHJldHVybiBzaXplLnRyYW5zcG9zZWRTaXplKCk7CiAgICAgcmV0dXJuIHNp emU7CiB9CiAKLXN0YXRpYyBpbmxpbmUgQ1NTQm94VHlwZSByZWZlcmVuY2VCb3goU2hhcGVWYWx1 ZSogc2hhcGVWYWx1ZSkKK3N0YXRpYyBpbmxpbmUgQ1NTQm94VHlwZSByZWZlcmVuY2VCb3goY29u c3QgU2hhcGVWYWx1ZSYgc2hhcGVWYWx1ZSkKIHsKLSAgICBpZiAoc2hhcGVWYWx1ZS0+Y3NzQm94 KCkgPT0gQm94TWlzc2luZykgewotICAgICAgICBpZiAoc2hhcGVWYWx1ZS0+dHlwZSgpID09IFNo YXBlVmFsdWU6OkltYWdlKQorICAgIGlmIChzaGFwZVZhbHVlLmNzc0JveCgpID09IEJveE1pc3Np bmcpIHsKKyAgICAgICAgaWYgKHNoYXBlVmFsdWUudHlwZSgpID09IFNoYXBlVmFsdWU6OkltYWdl KQogICAgICAgICAgICAgcmV0dXJuIENvbnRlbnRCb3g7CiAgICAgICAgIHJldHVybiBNYXJnaW5C b3g7CiAgICAgfQotICAgIHJldHVybiBzaGFwZVZhbHVlLT5jc3NCb3goKTsKKyAgICByZXR1cm4g c2hhcGVWYWx1ZS5jc3NCb3goKTsKIH0KIAogdm9pZCBTaGFwZU91dHNpZGVJbmZvOjpzZXRSZWZl cmVuY2VCb3hMb2dpY2FsU2l6ZShMYXlvdXRTaXplIG5ld1JlZmVyZW5jZUJveExvZ2ljYWxTaXpl KQogewogICAgIGJvb2wgaXNIb3Jpem9udGFsV3JpdGluZ01vZGUgPSBtX3JlbmRlcmVyLmNvbnRh aW5pbmdCbG9jaygpLT5zdHlsZSgpLmlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCk7Ci0gICAgc3dp dGNoIChyZWZlcmVuY2VCb3gobV9yZW5kZXJlci5zdHlsZSgpLnNoYXBlT3V0c2lkZSgpKSkgewor ICAgIHN3aXRjaCAocmVmZXJlbmNlQm94KCptX3JlbmRlcmVyLnN0eWxlKCkuc2hhcGVPdXRzaWRl KCkpKSB7CiAgICAgY2FzZSBNYXJnaW5Cb3g6CiAgICAgICAgIGlmIChpc0hvcml6b250YWxXcml0 aW5nTW9kZSkKICAgICAgICAgICAgIG5ld1JlZmVyZW5jZUJveExvZ2ljYWxTaXplLmV4cGFuZCht X3JlbmRlcmVyLmhvcml6b250YWxNYXJnaW5FeHRlbnQoKSwgbV9yZW5kZXJlci52ZXJ0aWNhbE1h cmdpbkV4dGVudCgpKTsKQEAgLTEzMiwxNyArMTMyLDE3IEBAIHN0YXRpYyBpbmxpbmUgYm9vbCBj aGVja1NoYXBlSW1hZ2VPcmlnaW4oRG9jdW1lbnQmIGRvY3VtZW50LCBDYWNoZWRJbWFnZSYgY2Fj aGVkCiAgICAgcmV0dXJuIGZhbHNlOwogfQogCi1zdGF0aWMgdm9pZCBnZXRTaGFwZUltYWdlQW5k UmVjdChjb25zdCBTaGFwZVZhbHVlKiBzaGFwZVZhbHVlLCBjb25zdCBSZW5kZXJCb3gqIHJlbmRl ckJveCwgY29uc3QgTGF5b3V0U2l6ZSYgcmVmZXJlbmNlQm94U2l6ZSwgSW1hZ2UqJiBpbWFnZSwg TGF5b3V0UmVjdCYgcmVjdCkKK3N0YXRpYyB2b2lkIGdldFNoYXBlSW1hZ2VBbmRSZWN0KGNvbnN0 IFNoYXBlVmFsdWUmIHNoYXBlVmFsdWUsIGNvbnN0IFJlbmRlckJveCYgcmVuZGVyQm94LCBjb25z dCBMYXlvdXRTaXplJiByZWZlcmVuY2VCb3hTaXplLCBJbWFnZSomIGltYWdlLCBMYXlvdXRSZWN0 JiByZWN0KQogewotICAgIEFTU0VSVChzaGFwZVZhbHVlLT5pc0ltYWdlVmFsaWQoKSk7Ci0gICAg U3R5bGVJbWFnZSogc3R5bGVJbWFnZSA9IHNoYXBlVmFsdWUtPmltYWdlKCk7CisgICAgQVNTRVJU KHNoYXBlVmFsdWUuaXNJbWFnZVZhbGlkKCkpOworICAgIFN0eWxlSW1hZ2UqIHN0eWxlSW1hZ2Ug PSBzaGFwZVZhbHVlLmltYWdlKCk7CiAKLSAgICBjb25zdCBMYXlvdXRTaXplJiBpbWFnZVNpemUg PSByZW5kZXJCb3gtPmNhbGN1bGF0ZUltYWdlSW50cmluc2ljRGltZW5zaW9ucyhzdHlsZUltYWdl LCByb3VuZGVkSW50U2l6ZShyZWZlcmVuY2VCb3hTaXplKSwgUmVuZGVySW1hZ2U6OlNjYWxlQnlF ZmZlY3RpdmVab29tKTsKLSAgICBzdHlsZUltYWdlLT5zZXRDb250YWluZXJTaXplRm9yUmVuZGVy ZXIocmVuZGVyQm94LCBpbWFnZVNpemUsIHJlbmRlckJveC0+c3R5bGUoKS5lZmZlY3RpdmVab29t KCkpOworICAgIGNvbnN0IExheW91dFNpemUmIGltYWdlU2l6ZSA9IHJlbmRlckJveC5jYWxjdWxh dGVJbWFnZUludHJpbnNpY0RpbWVuc2lvbnMoc3R5bGVJbWFnZSwgcm91bmRlZEludFNpemUocmVm ZXJlbmNlQm94U2l6ZSksIFJlbmRlckltYWdlOjpTY2FsZUJ5RWZmZWN0aXZlWm9vbSk7CisgICAg c3R5bGVJbWFnZS0+c2V0Q29udGFpbmVyU2l6ZUZvclJlbmRlcmVyKCZyZW5kZXJCb3gsIGltYWdl U2l6ZSwgcmVuZGVyQm94LnN0eWxlKCkuZWZmZWN0aXZlWm9vbSgpKTsKIAotICAgIGltYWdlID0g c3R5bGVJbWFnZS0+Y2FjaGVkSW1hZ2UoKS0+aW1hZ2VGb3JSZW5kZXJlcihyZW5kZXJCb3gpOwot ICAgIGlmIChyZW5kZXJCb3gtPmlzUmVuZGVySW1hZ2UoKSkKLSAgICAgICAgcmVjdCA9IHRvUmVu ZGVySW1hZ2UocmVuZGVyQm94KS0+cmVwbGFjZWRDb250ZW50UmVjdChyZW5kZXJCb3gtPmludHJp bnNpY1NpemUoKSk7CisgICAgaW1hZ2UgPSBzdHlsZUltYWdlLT5jYWNoZWRJbWFnZSgpLT5pbWFn ZUZvclJlbmRlcmVyKCZyZW5kZXJCb3gpOworICAgIGlmIChyZW5kZXJCb3guaXNSZW5kZXJJbWFn ZSgpKQorICAgICAgICByZWN0ID0gdG9SZW5kZXJJbWFnZSgmcmVuZGVyQm94KS0+cmVwbGFjZWRD b250ZW50UmVjdChyZW5kZXJCb3guaW50cmluc2ljU2l6ZSgpKTsKICAgICBlbHNlCiAgICAgICAg IHJlY3QgPSBMYXlvdXRSZWN0KExheW91dFBvaW50KCksIGltYWdlU2l6ZSk7CiB9CkBAIC0xNTks MjggKzE1OSwzMSBAQCBjb25zdCBTaGFwZSYgU2hhcGVPdXRzaWRlSW5mbzo6Y29tcHV0ZWRTaGFw ZSgpIGNvbnN0CiAgICAgaWYgKFNoYXBlKiBzaGFwZSA9IG1fc2hhcGUuZ2V0KCkpCiAgICAgICAg IHJldHVybiAqc2hhcGU7CiAKLSAgICBXcml0aW5nTW9kZSB3cml0aW5nTW9kZSA9IG1fcmVuZGVy ZXIuY29udGFpbmluZ0Jsb2NrKCktPnN0eWxlKCkud3JpdGluZ01vZGUoKTsKLSAgICBMZW5ndGgg bWFyZ2luID0gbV9yZW5kZXJlci5zdHlsZSgpLnNoYXBlTWFyZ2luKCk7Ci0gICAgZmxvYXQgc2hh cGVJbWFnZVRocmVzaG9sZCA9IG1fcmVuZGVyZXIuc3R5bGUoKS5zaGFwZUltYWdlVGhyZXNob2xk KCk7Ci0gICAgY29uc3QgU2hhcGVWYWx1ZSogc2hhcGVWYWx1ZSA9IHRoaXMtPm1fcmVuZGVyZXIu c3R5bGUoKS5zaGFwZU91dHNpZGUoKTsKLSAgICBBU1NFUlQoc2hhcGVWYWx1ZSk7CisgICAgY29u c3QgUmVuZGVyU3R5bGUmIHN0eWxlID0gbV9yZW5kZXJlci5zdHlsZSgpOworICAgIEFTU0VSVCht X3JlbmRlcmVyLmNvbnRhaW5pbmdCbG9jaygpKTsKKyAgICBjb25zdCBSZW5kZXJTdHlsZSYgY29u dGFpbmluZ0Jsb2NrU3R5bGUgPSBtX3JlbmRlcmVyLmNvbnRhaW5pbmdCbG9jaygpLT5zdHlsZSgp OwogCi0gICAgc3dpdGNoIChzaGFwZVZhbHVlLT50eXBlKCkpIHsKKyAgICBXcml0aW5nTW9kZSB3 cml0aW5nTW9kZSA9IGNvbnRhaW5pbmdCbG9ja1N0eWxlLndyaXRpbmdNb2RlKCk7CisgICAgTGVu Z3RoIG1hcmdpbiA9IHN0eWxlLnNoYXBlTWFyZ2luKCk7CisgICAgZmxvYXQgc2hhcGVJbWFnZVRo cmVzaG9sZCA9IHN0eWxlLnNoYXBlSW1hZ2VUaHJlc2hvbGQoKTsKKyAgICBjb25zdCBTaGFwZVZh bHVlJiBzaGFwZVZhbHVlID0gKnN0eWxlLnNoYXBlT3V0c2lkZSgpOworCisgICAgc3dpdGNoIChz aGFwZVZhbHVlLnR5cGUoKSkgewogICAgIGNhc2UgU2hhcGVWYWx1ZTo6U2hhcGU6Ci0gICAgICAg IEFTU0VSVChzaGFwZVZhbHVlLT5zaGFwZSgpKTsKLSAgICAgICAgbV9zaGFwZSA9IFNoYXBlOjpj cmVhdGVTaGFwZShzaGFwZVZhbHVlLT5zaGFwZSgpLCBtX3JlZmVyZW5jZUJveExvZ2ljYWxTaXpl LCB3cml0aW5nTW9kZSwgbWFyZ2luKTsKKyAgICAgICAgQVNTRVJUKHNoYXBlVmFsdWUuc2hhcGUo KSk7CisgICAgICAgIG1fc2hhcGUgPSBTaGFwZTo6Y3JlYXRlU2hhcGUoc2hhcGVWYWx1ZS5zaGFw ZSgpLCBtX3JlZmVyZW5jZUJveExvZ2ljYWxTaXplLCB3cml0aW5nTW9kZSwgbWFyZ2luKTsKICAg ICAgICAgYnJlYWs7CiAgICAgY2FzZSBTaGFwZVZhbHVlOjpJbWFnZTogewogICAgICAgICBJbWFn ZSogaW1hZ2U7CiAgICAgICAgIExheW91dFJlY3QgaW1hZ2VSZWN0OwotICAgICAgICBnZXRTaGFw ZUltYWdlQW5kUmVjdChzaGFwZVZhbHVlLCAmbV9yZW5kZXJlciwgbV9yZWZlcmVuY2VCb3hMb2dp Y2FsU2l6ZSwgaW1hZ2UsIGltYWdlUmVjdCk7CisgICAgICAgIGdldFNoYXBlSW1hZ2VBbmRSZWN0 KHNoYXBlVmFsdWUsIG1fcmVuZGVyZXIsIG1fcmVmZXJlbmNlQm94TG9naWNhbFNpemUsIGltYWdl LCBpbWFnZVJlY3QpOwogICAgICAgICBjb25zdCBMYXlvdXRSZWN0JiBtYXJnaW5SZWN0ID0gZ2V0 U2hhcGVJbWFnZU1hcmdpblJlY3QobV9yZW5kZXJlciwgbV9yZWZlcmVuY2VCb3hMb2dpY2FsU2l6 ZSk7CiAgICAgICAgIG1fc2hhcGUgPSBTaGFwZTo6Y3JlYXRlUmFzdGVyU2hhcGUoaW1hZ2UsIHNo YXBlSW1hZ2VUaHJlc2hvbGQsIGltYWdlUmVjdCwgbWFyZ2luUmVjdCwgd3JpdGluZ01vZGUsIG1h cmdpbik7CiAgICAgICAgIGJyZWFrOwogICAgIH0KICAgICBjYXNlIFNoYXBlVmFsdWU6OkJveDog ewotICAgICAgICBSb3VuZGVkUmVjdCBzaGFwZVJlY3QgPSBjb21wdXRlUm91bmRlZFJlY3RGb3JC b3hTaGFwZShyZWZlcmVuY2VCb3gobV9yZW5kZXJlci5zdHlsZSgpLnNoYXBlT3V0c2lkZSgpKSwg bV9yZW5kZXJlcik7Ci0gICAgICAgIGlmICghbV9yZW5kZXJlci5jb250YWluaW5nQmxvY2soKS0+ c3R5bGUoKS5pc0hvcml6b250YWxXcml0aW5nTW9kZSgpKQorICAgICAgICBSb3VuZGVkUmVjdCBz aGFwZVJlY3QgPSBjb21wdXRlUm91bmRlZFJlY3RGb3JCb3hTaGFwZShyZWZlcmVuY2VCb3goc2hh cGVWYWx1ZSksIG1fcmVuZGVyZXIpOworICAgICAgICBpZiAoIWNvbnRhaW5pbmdCbG9ja1N0eWxl LmlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkpCiAgICAgICAgICAgICBzaGFwZVJlY3QgPSBzaGFw ZVJlY3QudHJhbnNwb3NlZFJlY3QoKTsKICAgICAgICAgbV9zaGFwZSA9IFNoYXBlOjpjcmVhdGVC b3hTaGFwZShzaGFwZVJlY3QsIHdyaXRpbmdNb2RlLCBtYXJnaW4pOwogICAgICAgICBicmVhazsK QEAgLTIxOSw3ICsyMjIsNyBAQCBzdGF0aWMgaW5saW5lIExheW91dFVuaXQgYm9yZGVyQW5kUGFk ZGluZ0JlZm9yZUluV3JpdGluZ01vZGUoY29uc3QgUmVuZGVyQm94JiByZQogCiBMYXlvdXRVbml0 IFNoYXBlT3V0c2lkZUluZm86OmxvZ2ljYWxUb3BPZmZzZXQoKSBjb25zdAogewotICAgIHN3aXRj aCAocmVmZXJlbmNlQm94KG1fcmVuZGVyZXIuc3R5bGUoKS5zaGFwZU91dHNpZGUoKSkpIHsKKyAg ICBzd2l0Y2ggKHJlZmVyZW5jZUJveCgqbV9yZW5kZXJlci5zdHlsZSgpLnNoYXBlT3V0c2lkZSgp KSkgewogICAgIGNhc2UgTWFyZ2luQm94OiByZXR1cm4gLW1fcmVuZGVyZXIubWFyZ2luQmVmb3Jl KCZtX3JlbmRlcmVyLmNvbnRhaW5pbmdCbG9jaygpLT5zdHlsZSgpKTsKICAgICBjYXNlIEJvcmRl ckJveDogcmV0dXJuIExheW91dFVuaXQoKTsKICAgICBjYXNlIFBhZGRpbmdCb3g6IHJldHVybiBi b3JkZXJCZWZvcmVJbldyaXRpbmdNb2RlKG1fcmVuZGVyZXIsIG1fcmVuZGVyZXIuY29udGFpbmlu Z0Jsb2NrKCktPnN0eWxlKCkud3JpdGluZ01vZGUoKSk7CkBAIC0yNjcsNyArMjcwLDcgQEAgTGF5 b3V0VW5pdCBTaGFwZU91dHNpZGVJbmZvOjpsb2dpY2FsTGVmdE9mZnNldCgpIGNvbnN0CiAgICAg aWYgKG1fcmVuZGVyZXIuaXNSZW5kZXJSZWdpb24oKSkKICAgICAgICAgcmV0dXJuIExheW91dFVu aXQoKTsKICAgICAKLSAgICBzd2l0Y2ggKHJlZmVyZW5jZUJveChtX3JlbmRlcmVyLnN0eWxlKCku c2hhcGVPdXRzaWRlKCkpKSB7CisgICAgc3dpdGNoIChyZWZlcmVuY2VCb3goKm1fcmVuZGVyZXIu c3R5bGUoKS5zaGFwZU91dHNpZGUoKSkpIHsKICAgICBjYXNlIE1hcmdpbkJveDogcmV0dXJuIC1t X3JlbmRlcmVyLm1hcmdpblN0YXJ0KCZtX3JlbmRlcmVyLmNvbnRhaW5pbmdCbG9jaygpLT5zdHls ZSgpKTsKICAgICBjYXNlIEJvcmRlckJveDogcmV0dXJuIExheW91dFVuaXQoKTsKICAgICBjYXNl IFBhZGRpbmdCb3g6IHJldHVybiBib3JkZXJTdGFydFdpdGhTdHlsZUZvcldyaXRpbmdNb2RlKG1f cmVuZGVyZXIsIG1fcmVuZGVyZXIuY29udGFpbmluZ0Jsb2NrKCktPnN0eWxlKCkpOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3NoYXBlcy9TaGFwZU91dHNpZGVJbmZvLmgg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc2hhcGVzL1NoYXBlT3V0c2lkZUluZm8uaAppbmRl eCBkZDczMjFlZTAzMDdiZTI5OGVkYjk3YzQzZmYzNTk1ZDI5Y2YyNDk1Li5kZDlkZmFmNTdjNjkz MzU3NTFjMWNmOTBiZjljMWQxNzI4ZTE1NTgxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvc2hhcGVzL1NoYXBlT3V0c2lkZUluZm8uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvc2hhcGVzL1NoYXBlT3V0c2lkZUluZm8uaApAQCAtODAsOCArODAsOCBAQCBwdWJs aWM6CiAgICAgYm9vbCBpc1NoYXBlRGlydHkoKSB7IHJldHVybiAhbV9zaGFwZTsgfQogCiAgICAg TGF5b3V0UmVjdCBjb21wdXRlZFNoYXBlUGh5c2ljYWxCb3VuZGluZ0JveCgpIGNvbnN0OwotICAg IEZsb2F0UG9pbnQgc2hhcGVUb1JlbmRlcmVyUG9pbnQoRmxvYXRQb2ludCkgY29uc3Q7Ci0gICAg RmxvYXRTaXplIHNoYXBlVG9SZW5kZXJlclNpemUoRmxvYXRTaXplKSBjb25zdDsKKyAgICBGbG9h dFBvaW50IHNoYXBlVG9SZW5kZXJlclBvaW50KGNvbnN0IEZsb2F0UG9pbnQmKSBjb25zdDsKKyAg ICBGbG9hdFNpemUgc2hhcGVUb1JlbmRlcmVyU2l6ZShjb25zdCBGbG9hdFNpemUmKSBjb25zdDsK IAogICAgIGNvbnN0IFNoYXBlJiBjb21wdXRlZFNoYXBlKCkgY29uc3Q7CiAK 228603 2014-04-04 10:35:09 -0700 2014-04-04 10:36:33 -0700 Patch for landing, this time with reviewer properly updated bug-131192-20140404103736.patch text/plain 9277 bjonesbe U3VidmVyc2lvbiBSZXZpc2lvbjogMTY2Nzg2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDgxN2EwOWYyZTYxNmY3 YmQxZWFlNzYxMGU4YzIxZWU3MWEzN2UxMC4uYjk1MDZmMzlmNzAwZWMxZWI4NjBlMDkwOGJmMWRk MTdhZDA2MDVkNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE0LTA0LTA0ICBCZW0g Sm9uZXMtQmV5ICA8YmpvbmVzYmVAYWRvYmUuY29tPgorCisgICAgICAgIFVzZSBtb3JlIGNvbnN0 IHJlZnMgaW4gU2hhcGVPdXRzaWRlSW5mbyBhbmQgc29tZSBtaXNjIGNsZWFudXAKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMTE5MgorCisgICAgICAg IFJldmlld2VkIGJ5IERpcmsgU2NodWx6ZS4KKworICAgICAgICBVc2UgY29uc3QgcmVmcyBmb3Ig cHJldHR5IG11Y2ggZXZlcnl0aGluZyB0aGF0IGNhbid0IGJlIG51bGwuIEFsc28KKyAgICAgICAg Y2xlYW51cCBzb21lIGNvZGUgdGhhdCBnb3QgYSBiaXQgbWVzc3kgd2hlbiBTaGFwZUluZm8gd2Fz IG1lcmdlZCBpbnRvCisgICAgICAgIFNoYXBlT3V0c2lkZUluZm8uCisKKyAgICAgICAgTm8gbmV3 IHRlc3RzLCBubyBiZWhhdmlvciBjaGFuZ2UuCisKKyAgICAgICAgKiByZW5kZXJpbmcvc2hhcGVz L1NoYXBlT3V0c2lkZUluZm8uY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2hhcGVPdXRzaWRlSW5m bzo6c2hhcGVUb1JlbmRlcmVyUG9pbnQpOgorICAgICAgICAoV2ViQ29yZTo6U2hhcGVPdXRzaWRl SW5mbzo6c2hhcGVUb1JlbmRlcmVyU2l6ZSk6CisgICAgICAgIChXZWJDb3JlOjpyZWZlcmVuY2VC b3gpOgorICAgICAgICAoV2ViQ29yZTo6U2hhcGVPdXRzaWRlSW5mbzo6c2V0UmVmZXJlbmNlQm94 TG9naWNhbFNpemUpOgorICAgICAgICAoV2ViQ29yZTo6Z2V0U2hhcGVJbWFnZUFuZFJlY3QpOgor ICAgICAgICAoV2ViQ29yZTo6U2hhcGVPdXRzaWRlSW5mbzo6Y29tcHV0ZWRTaGFwZSk6CisgICAg ICAgIChXZWJDb3JlOjpTaGFwZU91dHNpZGVJbmZvOjpsb2dpY2FsVG9wT2Zmc2V0KToKKyAgICAg ICAgKFdlYkNvcmU6OlNoYXBlT3V0c2lkZUluZm86OmxvZ2ljYWxMZWZ0T2Zmc2V0KToKKyAgICAg ICAgKiByZW5kZXJpbmcvc2hhcGVzL1NoYXBlT3V0c2lkZUluZm8uaDoKKwogMjAxNC0wNC0wNCAg Wm9sdGFuIEhvcnZhdGggIDx6b2x0YW5Ad2Via2l0Lm9yZz4KIAogICAgICAgICBbQ1NTIFNoYXBl c10gUmVtb3ZlIG91dHNpZGUtc2hhcGUgQ1NTIHZhbHVlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvc2hhcGVzL1NoYXBlT3V0c2lkZUluZm8uY3BwIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL3NoYXBlcy9TaGFwZU91dHNpZGVJbmZvLmNwcAppbmRleCBlOGU3YzYxYjdl NGNlNDQxNmI4ZmE4MzBlOWRmZDJiOGZiMWQ3ZTJmLi5jMzJkYjFkYzYzMmVjMjlmYjk0ZjI5NzRm ZTk5ZDVjZjZiMjRkNTJjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc2hh cGVzL1NoYXBlT3V0c2lkZUluZm8uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9z aGFwZXMvU2hhcGVPdXRzaWRlSW5mby5jcHAKQEAgLTU1LDcgKzU1LDcgQEAgTGF5b3V0UmVjdCBT aGFwZU91dHNpZGVJbmZvOjpjb21wdXRlZFNoYXBlUGh5c2ljYWxCb3VuZGluZ0JveCgpIGNvbnN0 CiAgICAgcmV0dXJuIHBoeXNpY2FsQm91bmRpbmdCb3g7CiB9CiAKLUZsb2F0UG9pbnQgU2hhcGVP dXRzaWRlSW5mbzo6c2hhcGVUb1JlbmRlcmVyUG9pbnQoRmxvYXRQb2ludCBwb2ludCkgY29uc3QK K0Zsb2F0UG9pbnQgU2hhcGVPdXRzaWRlSW5mbzo6c2hhcGVUb1JlbmRlcmVyUG9pbnQoY29uc3Qg RmxvYXRQb2ludCYgcG9pbnQpIGNvbnN0CiB7CiAgICAgRmxvYXRQb2ludCByZXN1bHQgPSBGbG9h dFBvaW50KHBvaW50LngoKSArIGxvZ2ljYWxMZWZ0T2Zmc2V0KCksIHBvaW50LnkoKSArIGxvZ2lj YWxUb3BPZmZzZXQoKSk7CiAgICAgaWYgKG1fcmVuZGVyZXIuc3R5bGUoKS5pc0ZsaXBwZWRCbG9j a3NXcml0aW5nTW9kZSgpKQpAQCAtNjUsMjcgKzY1LDI3IEBAIEZsb2F0UG9pbnQgU2hhcGVPdXRz aWRlSW5mbzo6c2hhcGVUb1JlbmRlcmVyUG9pbnQoRmxvYXRQb2ludCBwb2ludCkgY29uc3QKICAg ICByZXR1cm4gcmVzdWx0OwogfQogCi1GbG9hdFNpemUgU2hhcGVPdXRzaWRlSW5mbzo6c2hhcGVU b1JlbmRlcmVyU2l6ZShGbG9hdFNpemUgc2l6ZSkgY29uc3QKK0Zsb2F0U2l6ZSBTaGFwZU91dHNp ZGVJbmZvOjpzaGFwZVRvUmVuZGVyZXJTaXplKGNvbnN0IEZsb2F0U2l6ZSYgc2l6ZSkgY29uc3QK IHsKICAgICBpZiAoIW1fcmVuZGVyZXIuc3R5bGUoKS5pc0hvcml6b250YWxXcml0aW5nTW9kZSgp KQogICAgICAgICByZXR1cm4gc2l6ZS50cmFuc3Bvc2VkU2l6ZSgpOwogICAgIHJldHVybiBzaXpl OwogfQogCi1zdGF0aWMgaW5saW5lIENTU0JveFR5cGUgcmVmZXJlbmNlQm94KFNoYXBlVmFsdWUq IHNoYXBlVmFsdWUpCitzdGF0aWMgaW5saW5lIENTU0JveFR5cGUgcmVmZXJlbmNlQm94KGNvbnN0 IFNoYXBlVmFsdWUmIHNoYXBlVmFsdWUpCiB7Ci0gICAgaWYgKHNoYXBlVmFsdWUtPmNzc0JveCgp ID09IEJveE1pc3NpbmcpIHsKLSAgICAgICAgaWYgKHNoYXBlVmFsdWUtPnR5cGUoKSA9PSBTaGFw ZVZhbHVlOjpJbWFnZSkKKyAgICBpZiAoc2hhcGVWYWx1ZS5jc3NCb3goKSA9PSBCb3hNaXNzaW5n KSB7CisgICAgICAgIGlmIChzaGFwZVZhbHVlLnR5cGUoKSA9PSBTaGFwZVZhbHVlOjpJbWFnZSkK ICAgICAgICAgICAgIHJldHVybiBDb250ZW50Qm94OwogICAgICAgICByZXR1cm4gTWFyZ2luQm94 OwogICAgIH0KLSAgICByZXR1cm4gc2hhcGVWYWx1ZS0+Y3NzQm94KCk7CisgICAgcmV0dXJuIHNo YXBlVmFsdWUuY3NzQm94KCk7CiB9CiAKIHZvaWQgU2hhcGVPdXRzaWRlSW5mbzo6c2V0UmVmZXJl bmNlQm94TG9naWNhbFNpemUoTGF5b3V0U2l6ZSBuZXdSZWZlcmVuY2VCb3hMb2dpY2FsU2l6ZSkK IHsKICAgICBib29sIGlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlID0gbV9yZW5kZXJlci5jb250YWlu aW5nQmxvY2soKS0+c3R5bGUoKS5pc0hvcml6b250YWxXcml0aW5nTW9kZSgpOwotICAgIHN3aXRj aCAocmVmZXJlbmNlQm94KG1fcmVuZGVyZXIuc3R5bGUoKS5zaGFwZU91dHNpZGUoKSkpIHsKKyAg ICBzd2l0Y2ggKHJlZmVyZW5jZUJveCgqbV9yZW5kZXJlci5zdHlsZSgpLnNoYXBlT3V0c2lkZSgp KSkgewogICAgIGNhc2UgTWFyZ2luQm94OgogICAgICAgICBpZiAoaXNIb3Jpem9udGFsV3JpdGlu Z01vZGUpCiAgICAgICAgICAgICBuZXdSZWZlcmVuY2VCb3hMb2dpY2FsU2l6ZS5leHBhbmQobV9y ZW5kZXJlci5ob3Jpem9udGFsTWFyZ2luRXh0ZW50KCksIG1fcmVuZGVyZXIudmVydGljYWxNYXJn aW5FeHRlbnQoKSk7CkBAIC0xMzIsMTcgKzEzMiwxNyBAQCBzdGF0aWMgaW5saW5lIGJvb2wgY2hl Y2tTaGFwZUltYWdlT3JpZ2luKERvY3VtZW50JiBkb2N1bWVudCwgQ2FjaGVkSW1hZ2UmIGNhY2hl ZAogICAgIHJldHVybiBmYWxzZTsKIH0KIAotc3RhdGljIHZvaWQgZ2V0U2hhcGVJbWFnZUFuZFJl Y3QoY29uc3QgU2hhcGVWYWx1ZSogc2hhcGVWYWx1ZSwgY29uc3QgUmVuZGVyQm94KiByZW5kZXJC b3gsIGNvbnN0IExheW91dFNpemUmIHJlZmVyZW5jZUJveFNpemUsIEltYWdlKiYgaW1hZ2UsIExh eW91dFJlY3QmIHJlY3QpCitzdGF0aWMgdm9pZCBnZXRTaGFwZUltYWdlQW5kUmVjdChjb25zdCBT aGFwZVZhbHVlJiBzaGFwZVZhbHVlLCBjb25zdCBSZW5kZXJCb3gmIHJlbmRlckJveCwgY29uc3Qg TGF5b3V0U2l6ZSYgcmVmZXJlbmNlQm94U2l6ZSwgSW1hZ2UqJiBpbWFnZSwgTGF5b3V0UmVjdCYg cmVjdCkKIHsKLSAgICBBU1NFUlQoc2hhcGVWYWx1ZS0+aXNJbWFnZVZhbGlkKCkpOwotICAgIFN0 eWxlSW1hZ2UqIHN0eWxlSW1hZ2UgPSBzaGFwZVZhbHVlLT5pbWFnZSgpOworICAgIEFTU0VSVChz aGFwZVZhbHVlLmlzSW1hZ2VWYWxpZCgpKTsKKyAgICBTdHlsZUltYWdlKiBzdHlsZUltYWdlID0g c2hhcGVWYWx1ZS5pbWFnZSgpOwogCi0gICAgY29uc3QgTGF5b3V0U2l6ZSYgaW1hZ2VTaXplID0g cmVuZGVyQm94LT5jYWxjdWxhdGVJbWFnZUludHJpbnNpY0RpbWVuc2lvbnMoc3R5bGVJbWFnZSwg cm91bmRlZEludFNpemUocmVmZXJlbmNlQm94U2l6ZSksIFJlbmRlckltYWdlOjpTY2FsZUJ5RWZm ZWN0aXZlWm9vbSk7Ci0gICAgc3R5bGVJbWFnZS0+c2V0Q29udGFpbmVyU2l6ZUZvclJlbmRlcmVy KHJlbmRlckJveCwgaW1hZ2VTaXplLCByZW5kZXJCb3gtPnN0eWxlKCkuZWZmZWN0aXZlWm9vbSgp KTsKKyAgICBjb25zdCBMYXlvdXRTaXplJiBpbWFnZVNpemUgPSByZW5kZXJCb3guY2FsY3VsYXRl SW1hZ2VJbnRyaW5zaWNEaW1lbnNpb25zKHN0eWxlSW1hZ2UsIHJvdW5kZWRJbnRTaXplKHJlZmVy ZW5jZUJveFNpemUpLCBSZW5kZXJJbWFnZTo6U2NhbGVCeUVmZmVjdGl2ZVpvb20pOworICAgIHN0 eWxlSW1hZ2UtPnNldENvbnRhaW5lclNpemVGb3JSZW5kZXJlcigmcmVuZGVyQm94LCBpbWFnZVNp emUsIHJlbmRlckJveC5zdHlsZSgpLmVmZmVjdGl2ZVpvb20oKSk7CiAKLSAgICBpbWFnZSA9IHN0 eWxlSW1hZ2UtPmNhY2hlZEltYWdlKCktPmltYWdlRm9yUmVuZGVyZXIocmVuZGVyQm94KTsKLSAg ICBpZiAocmVuZGVyQm94LT5pc1JlbmRlckltYWdlKCkpCi0gICAgICAgIHJlY3QgPSB0b1JlbmRl ckltYWdlKHJlbmRlckJveCktPnJlcGxhY2VkQ29udGVudFJlY3QocmVuZGVyQm94LT5pbnRyaW5z aWNTaXplKCkpOworICAgIGltYWdlID0gc3R5bGVJbWFnZS0+Y2FjaGVkSW1hZ2UoKS0+aW1hZ2VG b3JSZW5kZXJlcigmcmVuZGVyQm94KTsKKyAgICBpZiAocmVuZGVyQm94LmlzUmVuZGVySW1hZ2Uo KSkKKyAgICAgICAgcmVjdCA9IHRvUmVuZGVySW1hZ2UoJnJlbmRlckJveCktPnJlcGxhY2VkQ29u dGVudFJlY3QocmVuZGVyQm94LmludHJpbnNpY1NpemUoKSk7CiAgICAgZWxzZQogICAgICAgICBy ZWN0ID0gTGF5b3V0UmVjdChMYXlvdXRQb2ludCgpLCBpbWFnZVNpemUpOwogfQpAQCAtMTU5LDI4 ICsxNTksMzEgQEAgY29uc3QgU2hhcGUmIFNoYXBlT3V0c2lkZUluZm86OmNvbXB1dGVkU2hhcGUo KSBjb25zdAogICAgIGlmIChTaGFwZSogc2hhcGUgPSBtX3NoYXBlLmdldCgpKQogICAgICAgICBy ZXR1cm4gKnNoYXBlOwogCi0gICAgV3JpdGluZ01vZGUgd3JpdGluZ01vZGUgPSBtX3JlbmRlcmVy LmNvbnRhaW5pbmdCbG9jaygpLT5zdHlsZSgpLndyaXRpbmdNb2RlKCk7Ci0gICAgTGVuZ3RoIG1h cmdpbiA9IG1fcmVuZGVyZXIuc3R5bGUoKS5zaGFwZU1hcmdpbigpOwotICAgIGZsb2F0IHNoYXBl SW1hZ2VUaHJlc2hvbGQgPSBtX3JlbmRlcmVyLnN0eWxlKCkuc2hhcGVJbWFnZVRocmVzaG9sZCgp OwotICAgIGNvbnN0IFNoYXBlVmFsdWUqIHNoYXBlVmFsdWUgPSB0aGlzLT5tX3JlbmRlcmVyLnN0 eWxlKCkuc2hhcGVPdXRzaWRlKCk7Ci0gICAgQVNTRVJUKHNoYXBlVmFsdWUpOworICAgIGNvbnN0 IFJlbmRlclN0eWxlJiBzdHlsZSA9IG1fcmVuZGVyZXIuc3R5bGUoKTsKKyAgICBBU1NFUlQobV9y ZW5kZXJlci5jb250YWluaW5nQmxvY2soKSk7CisgICAgY29uc3QgUmVuZGVyU3R5bGUmIGNvbnRh aW5pbmdCbG9ja1N0eWxlID0gbV9yZW5kZXJlci5jb250YWluaW5nQmxvY2soKS0+c3R5bGUoKTsK IAotICAgIHN3aXRjaCAoc2hhcGVWYWx1ZS0+dHlwZSgpKSB7CisgICAgV3JpdGluZ01vZGUgd3Jp dGluZ01vZGUgPSBjb250YWluaW5nQmxvY2tTdHlsZS53cml0aW5nTW9kZSgpOworICAgIExlbmd0 aCBtYXJnaW4gPSBzdHlsZS5zaGFwZU1hcmdpbigpOworICAgIGZsb2F0IHNoYXBlSW1hZ2VUaHJl c2hvbGQgPSBzdHlsZS5zaGFwZUltYWdlVGhyZXNob2xkKCk7CisgICAgY29uc3QgU2hhcGVWYWx1 ZSYgc2hhcGVWYWx1ZSA9ICpzdHlsZS5zaGFwZU91dHNpZGUoKTsKKworICAgIHN3aXRjaCAoc2hh cGVWYWx1ZS50eXBlKCkpIHsKICAgICBjYXNlIFNoYXBlVmFsdWU6OlNoYXBlOgotICAgICAgICBB U1NFUlQoc2hhcGVWYWx1ZS0+c2hhcGUoKSk7Ci0gICAgICAgIG1fc2hhcGUgPSBTaGFwZTo6Y3Jl YXRlU2hhcGUoc2hhcGVWYWx1ZS0+c2hhcGUoKSwgbV9yZWZlcmVuY2VCb3hMb2dpY2FsU2l6ZSwg d3JpdGluZ01vZGUsIG1hcmdpbik7CisgICAgICAgIEFTU0VSVChzaGFwZVZhbHVlLnNoYXBlKCkp OworICAgICAgICBtX3NoYXBlID0gU2hhcGU6OmNyZWF0ZVNoYXBlKHNoYXBlVmFsdWUuc2hhcGUo KSwgbV9yZWZlcmVuY2VCb3hMb2dpY2FsU2l6ZSwgd3JpdGluZ01vZGUsIG1hcmdpbik7CiAgICAg ICAgIGJyZWFrOwogICAgIGNhc2UgU2hhcGVWYWx1ZTo6SW1hZ2U6IHsKICAgICAgICAgSW1hZ2Uq IGltYWdlOwogICAgICAgICBMYXlvdXRSZWN0IGltYWdlUmVjdDsKLSAgICAgICAgZ2V0U2hhcGVJ bWFnZUFuZFJlY3Qoc2hhcGVWYWx1ZSwgJm1fcmVuZGVyZXIsIG1fcmVmZXJlbmNlQm94TG9naWNh bFNpemUsIGltYWdlLCBpbWFnZVJlY3QpOworICAgICAgICBnZXRTaGFwZUltYWdlQW5kUmVjdChz aGFwZVZhbHVlLCBtX3JlbmRlcmVyLCBtX3JlZmVyZW5jZUJveExvZ2ljYWxTaXplLCBpbWFnZSwg aW1hZ2VSZWN0KTsKICAgICAgICAgY29uc3QgTGF5b3V0UmVjdCYgbWFyZ2luUmVjdCA9IGdldFNo YXBlSW1hZ2VNYXJnaW5SZWN0KG1fcmVuZGVyZXIsIG1fcmVmZXJlbmNlQm94TG9naWNhbFNpemUp OwogICAgICAgICBtX3NoYXBlID0gU2hhcGU6OmNyZWF0ZVJhc3RlclNoYXBlKGltYWdlLCBzaGFw ZUltYWdlVGhyZXNob2xkLCBpbWFnZVJlY3QsIG1hcmdpblJlY3QsIHdyaXRpbmdNb2RlLCBtYXJn aW4pOwogICAgICAgICBicmVhazsKICAgICB9CiAgICAgY2FzZSBTaGFwZVZhbHVlOjpCb3g6IHsK LSAgICAgICAgUm91bmRlZFJlY3Qgc2hhcGVSZWN0ID0gY29tcHV0ZVJvdW5kZWRSZWN0Rm9yQm94 U2hhcGUocmVmZXJlbmNlQm94KG1fcmVuZGVyZXIuc3R5bGUoKS5zaGFwZU91dHNpZGUoKSksIG1f cmVuZGVyZXIpOwotICAgICAgICBpZiAoIW1fcmVuZGVyZXIuY29udGFpbmluZ0Jsb2NrKCktPnN0 eWxlKCkuaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSkKKyAgICAgICAgUm91bmRlZFJlY3Qgc2hh cGVSZWN0ID0gY29tcHV0ZVJvdW5kZWRSZWN0Rm9yQm94U2hhcGUocmVmZXJlbmNlQm94KHNoYXBl VmFsdWUpLCBtX3JlbmRlcmVyKTsKKyAgICAgICAgaWYgKCFjb250YWluaW5nQmxvY2tTdHlsZS5p c0hvcml6b250YWxXcml0aW5nTW9kZSgpKQogICAgICAgICAgICAgc2hhcGVSZWN0ID0gc2hhcGVS ZWN0LnRyYW5zcG9zZWRSZWN0KCk7CiAgICAgICAgIG1fc2hhcGUgPSBTaGFwZTo6Y3JlYXRlQm94 U2hhcGUoc2hhcGVSZWN0LCB3cml0aW5nTW9kZSwgbWFyZ2luKTsKICAgICAgICAgYnJlYWs7CkBA IC0yMTksNyArMjIyLDcgQEAgc3RhdGljIGlubGluZSBMYXlvdXRVbml0IGJvcmRlckFuZFBhZGRp bmdCZWZvcmVJbldyaXRpbmdNb2RlKGNvbnN0IFJlbmRlckJveCYgcmUKIAogTGF5b3V0VW5pdCBT aGFwZU91dHNpZGVJbmZvOjpsb2dpY2FsVG9wT2Zmc2V0KCkgY29uc3QKIHsKLSAgICBzd2l0Y2gg KHJlZmVyZW5jZUJveChtX3JlbmRlcmVyLnN0eWxlKCkuc2hhcGVPdXRzaWRlKCkpKSB7CisgICAg c3dpdGNoIChyZWZlcmVuY2VCb3goKm1fcmVuZGVyZXIuc3R5bGUoKS5zaGFwZU91dHNpZGUoKSkp IHsKICAgICBjYXNlIE1hcmdpbkJveDogcmV0dXJuIC1tX3JlbmRlcmVyLm1hcmdpbkJlZm9yZSgm bV9yZW5kZXJlci5jb250YWluaW5nQmxvY2soKS0+c3R5bGUoKSk7CiAgICAgY2FzZSBCb3JkZXJC b3g6IHJldHVybiBMYXlvdXRVbml0KCk7CiAgICAgY2FzZSBQYWRkaW5nQm94OiByZXR1cm4gYm9y ZGVyQmVmb3JlSW5Xcml0aW5nTW9kZShtX3JlbmRlcmVyLCBtX3JlbmRlcmVyLmNvbnRhaW5pbmdC bG9jaygpLT5zdHlsZSgpLndyaXRpbmdNb2RlKCkpOwpAQCAtMjY3LDcgKzI3MCw3IEBAIExheW91 dFVuaXQgU2hhcGVPdXRzaWRlSW5mbzo6bG9naWNhbExlZnRPZmZzZXQoKSBjb25zdAogICAgIGlm IChtX3JlbmRlcmVyLmlzUmVuZGVyUmVnaW9uKCkpCiAgICAgICAgIHJldHVybiBMYXlvdXRVbml0 KCk7CiAgICAgCi0gICAgc3dpdGNoIChyZWZlcmVuY2VCb3gobV9yZW5kZXJlci5zdHlsZSgpLnNo YXBlT3V0c2lkZSgpKSkgeworICAgIHN3aXRjaCAocmVmZXJlbmNlQm94KCptX3JlbmRlcmVyLnN0 eWxlKCkuc2hhcGVPdXRzaWRlKCkpKSB7CiAgICAgY2FzZSBNYXJnaW5Cb3g6IHJldHVybiAtbV9y ZW5kZXJlci5tYXJnaW5TdGFydCgmbV9yZW5kZXJlci5jb250YWluaW5nQmxvY2soKS0+c3R5bGUo KSk7CiAgICAgY2FzZSBCb3JkZXJCb3g6IHJldHVybiBMYXlvdXRVbml0KCk7CiAgICAgY2FzZSBQ YWRkaW5nQm94OiByZXR1cm4gYm9yZGVyU3RhcnRXaXRoU3R5bGVGb3JXcml0aW5nTW9kZShtX3Jl bmRlcmVyLCBtX3JlbmRlcmVyLmNvbnRhaW5pbmdCbG9jaygpLT5zdHlsZSgpKTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zaGFwZXMvU2hhcGVPdXRzaWRlSW5mby5oIGIv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3NoYXBlcy9TaGFwZU91dHNpZGVJbmZvLmgKaW5kZXgg ZGQ3MzIxZWUwMzA3YmUyOThlZGI5N2M0M2ZmMzU5NWQyOWNmMjQ5NS4uZGQ5ZGZhZjU3YzY5MzM1 NzUxYzFjZjkwYmY5YzFkMTcyOGUxNTU4MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL3NoYXBlcy9TaGFwZU91dHNpZGVJbmZvLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL3NoYXBlcy9TaGFwZU91dHNpZGVJbmZvLmgKQEAgLTgwLDggKzgwLDggQEAgcHVibGlj OgogICAgIGJvb2wgaXNTaGFwZURpcnR5KCkgeyByZXR1cm4gIW1fc2hhcGU7IH0KIAogICAgIExh eW91dFJlY3QgY29tcHV0ZWRTaGFwZVBoeXNpY2FsQm91bmRpbmdCb3goKSBjb25zdDsKLSAgICBG bG9hdFBvaW50IHNoYXBlVG9SZW5kZXJlclBvaW50KEZsb2F0UG9pbnQpIGNvbnN0OwotICAgIEZs b2F0U2l6ZSBzaGFwZVRvUmVuZGVyZXJTaXplKEZsb2F0U2l6ZSkgY29uc3Q7CisgICAgRmxvYXRQ b2ludCBzaGFwZVRvUmVuZGVyZXJQb2ludChjb25zdCBGbG9hdFBvaW50JikgY29uc3Q7CisgICAg RmxvYXRTaXplIHNoYXBlVG9SZW5kZXJlclNpemUoY29uc3QgRmxvYXRTaXplJikgY29uc3Q7CiAK ICAgICBjb25zdCBTaGFwZSYgY29tcHV0ZWRTaGFwZSgpIGNvbnN0OwogCg==