155331 2016-03-10 15:22:02 -0800 Expose additional WKDataDetectorTypes 2016-03-10 21:45:02 -0800 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 enrica enrica commit-queue ddkilzer ryanhaddad sam thorton oldest_to_newest 1173392 0 enrica 2016-03-10 15:22:02 -0800 Adding support for flight, tracking numbers and spotlight suggestions. rdar://problem/24175813 1173393 1 273635 enrica 2016-03-10 15:27:00 -0800 Created attachment 273635 Patch 1173395 2 commit-queue 2016-03-10 15:28:32 -0800 Attachment 273635 did not pass style-queue: ERROR: Source/WebCore/platform/spi/cocoa/DataDetectorsCoreSPI.h:36: Alphabetical sorting problem. [build/include_order] [4] Total errors found: 1 in 9 files If any of these errors are false positives, please file a bug against check-webkit-style. 1173416 3 273635 thorton 2016-03-10 16:07:46 -0800 Comment on attachment 273635 Patch I think we need some naming changes here. Will discuss offline. 1173457 4 273653 enrica 2016-03-10 16:47:30 -0800 Created attachment 273653 Patch2 1173461 5 commit-queue 2016-03-10 16:50:17 -0800 Attachment 273653 did not pass style-queue: ERROR: Source/WebCore/editing/cocoa/DataDetection.mm:47: *SoftLink.h header should be included after all other headers. [build/include_order] [4] ERROR: Source/WebCore/platform/spi/cocoa/DataDetectorsCoreSPI.h:36: Alphabetical sorting problem. [build/include_order] [4] Total errors found: 2 in 9 files If any of these errors are false positives, please file a bug against check-webkit-style. 1173477 6 enrica 2016-03-10 17:06:55 -0800 Committed revision 197976. 1173483 7 ryanhaddad 2016-03-10 17:25:22 -0800 This change broke Mac and iOS builds <https://build.webkit.org/builders/Apple%20El%20Capitan%20Release%20%28Build%29/builds/4426> <https://build.webkit.org/builders/Apple%20iOS%209%20Simulator%20Release%20%28Build%29/builds/4356> 1173575 8 ddkilzer 2016-03-10 21:01:51 -0800 (In reply to comment #7) > This change broke Mac and iOS builds > > <https://build.webkit.org/builders/ > Apple%20El%20Capitan%20Release%20%28Build%29/builds/4426> > <https://build.webkit.org/builders/ > Apple%20iOS%209%20Simulator%20Release%20%28Build%29/builds/4356> Committed r197977: <http://trac.webkit.org/r197977> Additional fix for internal iOS 9.x SDK builds: Committed r197992: <http://trac.webkit.org/r197992> 1173582 9 thorton 2016-03-10 21:09:32 -0800 (In reply to comment #8) > (In reply to comment #7) > > This change broke Mac and iOS builds > > > > <https://build.webkit.org/builders/ > > Apple%20El%20Capitan%20Release%20%28Build%29/builds/4426> > > <https://build.webkit.org/builders/ > > Apple%20iOS%209%20Simulator%20Release%20%28Build%29/builds/4356> > > Committed r197977: <http://trac.webkit.org/r197977> > > Additional fix for internal iOS 9.x SDK builds: > > Committed r197992: <http://trac.webkit.org/r197992> I don't think that will fix anything by itself; I landed 197993 on top of it which should actually fix. 1173592 10 ddkilzer 2016-03-10 21:45:02 -0800 (In reply to comment #9) > (In reply to comment #8) > > (In reply to comment #7) > > > This change broke Mac and iOS builds > > > > > > <https://build.webkit.org/builders/ > > > Apple%20El%20Capitan%20Release%20%28Build%29/builds/4426> > > > <https://build.webkit.org/builders/ > > > Apple%20iOS%209%20Simulator%20Release%20%28Build%29/builds/4356> > > > > Committed r197977: <http://trac.webkit.org/r197977> > > > > Additional fix for internal iOS 9.x SDK builds: > > > > Committed r197992: <http://trac.webkit.org/r197992> > > I don't think that will fix anything by itself; I landed 197993 on top of it > which should actually fix. Yes, it wasn't a complete fix in hindsight; only addressed the missing DDOptionalSource.h header error. Thanks Tim! 273635 2016-03-10 15:27:00 -0800 2016-03-10 16:47:30 -0800 Patch spotlightsuggestions.txt text/plain 11241 enrica SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE5Nzk0NSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIyIEBACisyMDE2LTAzLTEwICBFbnJpY2Eg Q2FzdWNjaSAgPGVucmljYUBhcHBsZS5jb20+CisKKyAgICAgICAgRXhwb3NlIGFkZGl0aW9uYWwg V0tEYXRhRGV0ZWN0b3JUeXBlcy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTE1NTMzMQorICAgICAgICByZGFyOi8vcHJvYmxlbS8yNDE3NTgxMworCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZGluZyBzdXBw b3J0IGZvciBhZGRpdGlvbmFsIGRhdGEgZGV0ZWN0b3IgdHlwZXMgKHRyYWNraW5nCisgICAgICAg IG51bWJlcnMsIGZsaWdodCBpbmZvcm1hdGlvbiBhbmQgc3BvdGxpZ2h0IHN1Z2dlc3Rpb25zKS4K KworICAgICAgICAqIGVkaXRpbmcvY29jb2EvRGF0YURldGVjdGlvbi5oOgorICAgICAgICAqIGVk aXRpbmcvY29jb2EvRGF0YURldGVjdGlvbi5tbToKKyAgICAgICAgKFdlYkNvcmU6OmNvbnN0cnVj dFVSTFN0cmluZ0ZvclJlc3VsdCk6CisgICAgICAgIChXZWJDb3JlOjpEYXRhRGV0ZWN0aW9uOjpk ZXRlY3RDb250ZW50SW5SYW5nZSk6CisgICAgICAgICogcGxhdGZvcm0vY29jb2EvRGF0YURldGVj dG9yc0NvcmVTb2Z0TGluay5oOgorICAgICAgICAqIHBsYXRmb3JtL2NvY29hL0RhdGFEZXRlY3Rv cnNDb3JlU29mdExpbmsubW06CisgICAgICAgICogcGxhdGZvcm0vc3BpL2NvY29hL0RhdGFEZXRl Y3RvcnNDb3JlU1BJLmg6CisKIDIwMTYtMDMtMTAgIERhbmllbCBCYXRlcyAgPGRhYmF0ZXNAYXBw bGUuY29tPgogCiAgICAgICAgIENTUDogSW1wbGVtZW50IHN1cHBvcnQgZm9yIHNjcmlwdCBhbmQg c3R5bGUgbm9uY2VzCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL2NvY29hL0RhdGFEZXRl Y3Rpb24uaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL2NvY29hL0RhdGFE ZXRlY3Rpb24uaAkocmV2aXNpb24gMTk3OTQ1KQorKysgU291cmNlL1dlYkNvcmUvZWRpdGluZy9j b2NvYS9EYXRhRGV0ZWN0aW9uLmgJKHdvcmtpbmcgY29weSkKQEAgLTQ2LDggKzQ2LDkgQEAgZW51 bSBEYXRhRGV0ZWN0b3JUeXBlcyB7CiAgICAgRGF0YURldGVjdG9yVHlwZUxpbmsgPSAxIDw8IDEs CiAgICAgRGF0YURldGVjdG9yVHlwZUFkZHJlc3MgPSAxIDw8IDIsCiAgICAgRGF0YURldGVjdG9y VHlwZUNhbGVuZGFyRXZlbnQgPSAxIDw8IDMsCi0gICAgRGF0YURldGVjdG9yVHlwZVRyYWNraW5n TnVtYmVyID0gMSA8PCA0LCAvLyBOb3QgaW5kaXZpZHVhbGx5IHNlbGVjdGFibGUgd2l0aCB0aGUg QVBJCi0gICAgRGF0YURldGVjdG9yVHlwZUZsaWdodCA9IDEgPDwgNSwgLy8gTm90IGluZGl2aWR1 YWxseSBzZWxlY3RhYmxlIHdpdGggdGhlIEFQSQorICAgIERhdGFEZXRlY3RvclR5cGVUcmFja2lu Z051bWJlciA9IDEgPDwgNCwKKyAgICBEYXRhRGV0ZWN0b3JUeXBlRmxpZ2h0TnVtYmVyID0gMSA8 PCA1LAorICAgIERhdGFEZXRlY3RvclR5cGVTcG90bGlnaHRTdWdnZXN0aW9uID0gMSA8PCA2LAog ICAgIERhdGFEZXRlY3RvclR5cGVBbGwgPSBVTE9OR19NQVgKIH07CiAKSW5kZXg6IFNvdXJjZS9X ZWJDb3JlL2VkaXRpbmcvY29jb2EvRGF0YURldGVjdGlvbi5tbQo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViQ29yZS9lZGl0aW5nL2NvY29hL0RhdGFEZXRlY3Rpb24ubW0JKHJldmlzaW9uIDE5Nzk0 NSkKKysrIFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvY29jb2EvRGF0YURldGVjdGlvbi5tbQkod29y a2luZyBjb3B5KQpAQCAtMTk5LDcgKzE5OSw4IEBAIHN0YXRpYyBOU1N0cmluZyAqY29uc3RydWN0 VVJMU3RyaW5nRm9yUmUKICAgICAKICAgICBpZiAoKChkZXRlY3Rpb25UeXBlcyAmIERhdGFEZXRl Y3RvclR5cGVBZGRyZXNzKSAmJiAoRERSZXN1bHRDYXRlZ29yeUFkZHJlc3MgPT0gY2F0ZWdvcnkp KQogICAgICAgICB8fCAoKGRldGVjdGlvblR5cGVzICYgRGF0YURldGVjdG9yVHlwZVRyYWNraW5n TnVtYmVyKSAmJiAoQ0ZTdHJpbmdDb21wYXJlKGdldF9EYXRhRGV0ZWN0b3JzQ29yZV9EREJpbmRl clRyYWNraW5nTnVtYmVyS2V5KCksIHR5cGUsIDApID09IGtDRkNvbXBhcmVFcXVhbFRvKSkKLSAg ICAgICAgfHwgKChkZXRlY3Rpb25UeXBlcyAmIERhdGFEZXRlY3RvclR5cGVGbGlnaHQpICYmIChD RlN0cmluZ0NvbXBhcmUoZ2V0X0RhdGFEZXRlY3RvcnNDb3JlX0REQmluZGVyRmxpZ2h0SW5mb3Jt YXRpb25LZXkoKSwgdHlwZSwgMCkgPT0ga0NGQ29tcGFyZUVxdWFsVG8pKQorICAgICAgICB8fCAo KGRldGVjdGlvblR5cGVzICYgRGF0YURldGVjdG9yVHlwZUZsaWdodE51bWJlcikgJiYgKENGU3Ry aW5nQ29tcGFyZShnZXRfRGF0YURldGVjdG9yc0NvcmVfRERCaW5kZXJGbGlnaHRJbmZvcm1hdGlv bktleSgpLCB0eXBlLCAwKSA9PSBrQ0ZDb21wYXJlRXF1YWxUbykpCisgICAgICAgIHx8ICgoZGV0 ZWN0aW9uVHlwZXMgJiBEYXRhRGV0ZWN0b3JUeXBlU3BvdGxpZ2h0U3VnZ2VzdGlvbikgJiYgKENG U3RyaW5nQ29tcGFyZShnZXRfRGF0YURldGVjdG9yc0NvcmVfRERCaW5kZXJQYXJzZWNTb3VyY2VL ZXkoKSwgdHlwZSwgMCkgPT0ga0NGQ29tcGFyZUVxdWFsVG8pKQogICAgICAgICB8fCAoKGRldGVj dGlvblR5cGVzICYgRGF0YURldGVjdG9yVHlwZVBob25lTnVtYmVyKSAmJiAoRERSZXN1bHRDYXRl Z29yeVBob25lTnVtYmVyID09IGNhdGVnb3J5KSkKICAgICAgICAgfHwgKChkZXRlY3Rpb25UeXBl cyAmIERhdGFEZXRlY3RvclR5cGVMaW5rKSAmJiByZXN1bHRJc1VSTChjdXJyZW50UmVzdWx0KSkp IHsKICAgICAgICAgCkBAIC00MjcsNiArNDI4LDkgQEAgTlNBcnJheSAqRGF0YURldGVjdGlvbjo6 ZGV0ZWN0Q29udGVudEluUgogICAgIFJldGFpblB0cjxERFNjYW5RdWVyeVJlZj4gc2NhblF1ZXJ5 ID0gYWRvcHRDRihzb2Z0TGlua19EYXRhRGV0ZWN0b3JzQ29yZV9ERFNjYW5RdWVyeUNyZWF0ZShO VUxMKSk7CiAgICAgYnVpbGRRdWVyeShzY2FuUXVlcnkuZ2V0KCksIGNvbnRleHRSYW5nZS5nZXQo KSk7CiAgICAgCisgICAgaWYgKHR5cGVzICYgRGF0YURldGVjdG9yVHlwZVNwb3RsaWdodFN1Z2dl c3Rpb24pCisgICAgICAgIHNvZnRMaW5rX0RhdGFEZXRlY3RvcnNDb3JlX0REU2Nhbm5lckVuYWJs ZU9wdGlvbmFsU291cmNlKHNjYW5uZXIuZ2V0KCksIEREU2Nhbm5lclNvdXJjZVBhcnNlYywgdHJ1 ZSk7CisgICAgCiAgICAgLy8gRklYTUU6IHdlIHNob3VsZCBhZGQgYSB0aW1lb3V0IHRvIHRoaXMg Y2FsbCB0byBtYWtlIHN1cmUgaXQgZG9lc24ndCB0YWtlIHRvbyBtdWNoIHRpbWUuCiAgICAgaWYg KCFzb2Z0TGlua19EYXRhRGV0ZWN0b3JzQ29yZV9ERFNjYW5uZXJTY2FuUXVlcnkoc2Nhbm5lci5n ZXQoKSwgc2NhblF1ZXJ5LmdldCgpKSkKICAgICAgICAgcmV0dXJuIG5pbDsKSW5kZXg6IFNvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2NvY29hL0RhdGFEZXRlY3RvcnNDb3JlU29mdExpbmsuaAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jb2NvYS9EYXRhRGV0ZWN0b3JzQ29y ZVNvZnRMaW5rLmgJKHJldmlzaW9uIDE5Nzk0NSkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2NvY29hL0RhdGFEZXRlY3RvcnNDb3JlU29mdExpbmsuaAkod29ya2luZyBjb3B5KQpAQCAtMzYs NiArMzYsNyBAQCBTT0ZUX0xJTktfRlVOQ1RJT05fRk9SX0hFQURFUihXZWJDb3JlLCBECiBTT0ZU X0xJTktfRlVOQ1RJT05fRk9SX0hFQURFUihXZWJDb3JlLCBEYXRhRGV0ZWN0b3JzQ29yZSwgRERT Y2FubmVyU2NhblF1ZXJ5LCBCb29sZWFuLCAoRERTY2FubmVyUmVmIHNjYW5uZXIsIEREU2NhblF1 ZXJ5UmVmIHF1ZXJ5KSwgKHNjYW5uZXIsIHF1ZXJ5KSkKIFNPRlRfTElOS19GVU5DVElPTl9GT1Jf SEVBREVSKFdlYkNvcmUsIERhdGFEZXRlY3RvcnNDb3JlLCBERFNjYW5RdWVyeUNyZWF0ZSwgRERT Y2FuUXVlcnlSZWYsIChDRkFsbG9jYXRvclJlZiBhbGxvY2F0b3IpLCAoYWxsb2NhdG9yKSkKIFNP RlRfTElOS19GVU5DVElPTl9GT1JfSEVBREVSKFdlYkNvcmUsIERhdGFEZXRlY3RvcnNDb3JlLCBE RFNjYW5uZXJDb3B5UmVzdWx0c1dpdGhPcHRpb25zLCBDRkFycmF5UmVmLCAoRERTY2FubmVyUmVm IHNjYW5uZXIsIEREU2Nhbm5lckNvcHlSZXN1bHRzT3B0aW9ucyBvcHRpb25zKSwgKHNjYW5uZXIs IG9wdGlvbnMpKQorU09GVF9MSU5LX0ZVTkNUSU9OX0ZPUl9IRUFERVIoV2ViQ29yZSwgRGF0YURl dGVjdG9yc0NvcmUsIEREU2Nhbm5lckVuYWJsZU9wdGlvbmFsU291cmNlLCB2b2lkLCAoRERTY2Fu bmVyUmVmIHNjYW5uZXIsIEREU2Nhbm5lclNvdXJjZSBzb3VyY2UsIEJvb2xlYW4gZW5hYmxlKSwg KHNjYW5uZXIsIHNvdXJjZSwgZW5hYmxlKSkKIFNPRlRfTElOS19GVU5DVElPTl9GT1JfSEVBREVS KFdlYkNvcmUsIERhdGFEZXRlY3RvcnNDb3JlLCBERFJlc3VsdEdldFJhbmdlLCBDRlJhbmdlLCAo RERSZXN1bHRSZWYgcmVzdWx0KSwgKHJlc3VsdCkpCiBTT0ZUX0xJTktfRlVOQ1RJT05fRk9SX0hF QURFUihXZWJDb3JlLCBEYXRhRGV0ZWN0b3JzQ29yZSwgRERSZXN1bHRHZXRUeXBlLCBDRlN0cmlu Z1JlZiwgKEREUmVzdWx0UmVmIHJlc3VsdCksIChyZXN1bHQpKQogU09GVF9MSU5LX0ZVTkNUSU9O X0ZPUl9IRUFERVIoV2ViQ29yZSwgRGF0YURldGVjdG9yc0NvcmUsIEREUmVzdWx0R2V0Q2F0ZWdv cnksIEREUmVzdWx0Q2F0ZWdvcnksIChERFJlc3VsdFJlZiByZXN1bHQpLCAocmVzdWx0KSkKQEAg LTU1LDYgKzU2LDcgQEAgU09GVF9MSU5LX1BPSU5URVJfRk9SX0hFQURFUihXZWJDb3JlLCBEYQog U09GVF9MSU5LX1BPSU5URVJfRk9SX0hFQURFUihXZWJDb3JlLCBEYXRhRGV0ZWN0b3JzQ29yZSwg RERCaW5kZXJFbWFpbEtleSwgQ0ZTdHJpbmdSZWYpCiBTT0ZUX0xJTktfUE9JTlRFUl9GT1JfSEVB REVSKFdlYkNvcmUsIERhdGFEZXRlY3RvcnNDb3JlLCBEREJpbmRlclRyYWNraW5nTnVtYmVyS2V5 LCBDRlN0cmluZ1JlZikKIFNPRlRfTElOS19QT0lOVEVSX0ZPUl9IRUFERVIoV2ViQ29yZSwgRGF0 YURldGVjdG9yc0NvcmUsIEREQmluZGVyRmxpZ2h0SW5mb3JtYXRpb25LZXksIENGU3RyaW5nUmVm KQorU09GVF9MSU5LX1BPSU5URVJfRk9SX0hFQURFUihXZWJDb3JlLCBEYXRhRGV0ZWN0b3JzQ29y ZSwgRERCaW5kZXJQYXJzZWNTb3VyY2VLZXksIENGU3RyaW5nUmVmKQogU09GVF9MSU5LX1BPSU5U RVJfRk9SX0hFQURFUihXZWJDb3JlLCBEYXRhRGV0ZWN0b3JzQ29yZSwgRERCaW5kZXJTaWduYXR1 cmVCbG9ja0tleSwgQ0ZTdHJpbmdSZWYpCiBTT0ZUX0xJTktfUE9JTlRFUl9GT1JfSEVBREVSKFdl YkNvcmUsIERhdGFEZXRlY3RvcnNDb3JlLCBERFVSTFNjaGVtZSwgTlNTdHJpbmcgKikKIFNPRlRf TElOS19DT05TVEFOVF9GT1JfSEVBREVSKFdlYkNvcmUsIERhdGFEZXRlY3RvcnNDb3JlLCBERFNj YW5uZXJDb3B5UmVzdWx0c09wdGlvbnNGb3JQYXNzaXZlVXNlLCBERFNjYW5uZXJDb3B5UmVzdWx0 c09wdGlvbnMpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jb2NvYS9EYXRhRGV0ZWN0 b3JzQ29yZVNvZnRMaW5rLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2NvY29hL0RhdGFEZXRlY3RvcnNDb3JlU29mdExpbmsubW0JKHJldmlzaW9uIDE5Nzk0NSkKKysr IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2NvY29hL0RhdGFEZXRlY3RvcnNDb3JlU29mdExpbmsu bW0JKHdvcmtpbmcgY29weSkKQEAgLTM1LDYgKzM1LDcgQEAgU09GVF9MSU5LX0ZVTkNUSU9OX0ZP Ul9TT1VSQ0UoV2ViQ29yZSwgRAogU09GVF9MSU5LX0ZVTkNUSU9OX0ZPUl9TT1VSQ0UoV2ViQ29y ZSwgRGF0YURldGVjdG9yc0NvcmUsIEREU2Nhbm5lclNjYW5RdWVyeSwgQm9vbGVhbiwgKEREU2Nh bm5lclJlZiBzY2FubmVyLCBERFNjYW5RdWVyeVJlZiBxdWVyeSksIChzY2FubmVyLCBxdWVyeSkp CiBTT0ZUX0xJTktfRlVOQ1RJT05fRk9SX1NPVVJDRShXZWJDb3JlLCBEYXRhRGV0ZWN0b3JzQ29y ZSwgRERTY2FuUXVlcnlDcmVhdGUsIEREU2NhblF1ZXJ5UmVmLCAoQ0ZBbGxvY2F0b3JSZWYgYWxs b2NhdG9yKSwgKGFsbG9jYXRvcikpCiBTT0ZUX0xJTktfRlVOQ1RJT05fRk9SX1NPVVJDRShXZWJD b3JlLCBEYXRhRGV0ZWN0b3JzQ29yZSwgRERTY2FubmVyQ29weVJlc3VsdHNXaXRoT3B0aW9ucywg Q0ZBcnJheVJlZiwgKEREU2Nhbm5lclJlZiBzY2FubmVyLCBERFNjYW5uZXJDb3B5UmVzdWx0c09w dGlvbnMgb3B0aW9ucyksIChzY2FubmVyLCBvcHRpb25zKSkKK1NPRlRfTElOS19GVU5DVElPTl9G T1JfU09VUkNFKFdlYkNvcmUsIERhdGFEZXRlY3RvcnNDb3JlLCBERFNjYW5uZXJFbmFibGVPcHRp b25hbFNvdXJjZSwgdm9pZCwgKEREU2Nhbm5lclJlZiBzY2FubmVyLCBERFNjYW5uZXJTb3VyY2Ug c291cmNlLCBCb29sZWFuIGVuYWJsZSksIChzY2FubmVyLCBzb3VyY2UsIGVuYWJsZSkpCiBTT0ZU X0xJTktfRlVOQ1RJT05fRk9SX1NPVVJDRShXZWJDb3JlLCBEYXRhRGV0ZWN0b3JzQ29yZSwgRERS ZXN1bHRHZXRSYW5nZSwgQ0ZSYW5nZSwgKEREUmVzdWx0UmVmIHJlc3VsdCksIChyZXN1bHQpKQog U09GVF9MSU5LX0ZVTkNUSU9OX0ZPUl9TT1VSQ0UoV2ViQ29yZSwgRGF0YURldGVjdG9yc0NvcmUs IEREUmVzdWx0R2V0VHlwZSwgQ0ZTdHJpbmdSZWYsIChERFJlc3VsdFJlZiByZXN1bHQpLCAocmVz dWx0KSkKIFNPRlRfTElOS19GVU5DVElPTl9GT1JfU09VUkNFKFdlYkNvcmUsIERhdGFEZXRlY3Rv cnNDb3JlLCBERFJlc3VsdEdldENhdGVnb3J5LCBERFJlc3VsdENhdGVnb3J5LCAoRERSZXN1bHRS ZWYgcmVzdWx0KSwgKHJlc3VsdCkpCkBAIC01NCw2ICs1NSw3IEBAIFNPRlRfTElOS19QT0lOVEVS X0ZPUl9TT1VSQ0UoV2ViQ29yZSwgRGEKIFNPRlRfTElOS19QT0lOVEVSX0ZPUl9TT1VSQ0UoV2Vi Q29yZSwgRGF0YURldGVjdG9yc0NvcmUsIEREQmluZGVyRW1haWxLZXksIENGU3RyaW5nUmVmKQog U09GVF9MSU5LX1BPSU5URVJfRk9SX1NPVVJDRShXZWJDb3JlLCBEYXRhRGV0ZWN0b3JzQ29yZSwg RERCaW5kZXJUcmFja2luZ051bWJlcktleSwgQ0ZTdHJpbmdSZWYpCiBTT0ZUX0xJTktfUE9JTlRF Ul9GT1JfU09VUkNFKFdlYkNvcmUsIERhdGFEZXRlY3RvcnNDb3JlLCBEREJpbmRlckZsaWdodElu Zm9ybWF0aW9uS2V5LCBDRlN0cmluZ1JlZikKK1NPRlRfTElOS19QT0lOVEVSX0ZPUl9TT1VSQ0Uo V2ViQ29yZSwgRGF0YURldGVjdG9yc0NvcmUsIEREQmluZGVyUGFyc2VjU291cmNlS2V5LCBDRlN0 cmluZ1JlZikKIFNPRlRfTElOS19QT0lOVEVSX0ZPUl9TT1VSQ0UoV2ViQ29yZSwgRGF0YURldGVj dG9yc0NvcmUsIEREQmluZGVyU2lnbmF0dXJlQmxvY2tLZXksIENGU3RyaW5nUmVmKQogU09GVF9M SU5LX1BPSU5URVJfRk9SX1NPVVJDRShXZWJDb3JlLCBEYXRhRGV0ZWN0b3JzQ29yZSwgRERVUkxT Y2hlbWUsIE5TU3RyaW5nICopCiBTT0ZUX0xJTktfQ09OU1RBTlRfRk9SX1NPVVJDRShXZWJDb3Jl LCBEYXRhRGV0ZWN0b3JzQ29yZSwgRERTY2FubmVyQ29weVJlc3VsdHNPcHRpb25zRm9yUGFzc2l2 ZVVzZSwgRERTY2FubmVyQ29weVJlc3VsdHNPcHRpb25zKQpJbmRleDogU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vc3BpL2NvY29hL0RhdGFEZXRlY3RvcnNDb3JlU1BJLmgKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vc3BpL2NvY29hL0RhdGFEZXRlY3RvcnNDb3JlU1BJLmgJ KHJldmlzaW9uIDE5Nzk0NSkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3NwaS9jb2NvYS9E YXRhRGV0ZWN0b3JzQ29yZVNQSS5oCSh3b3JraW5nIGNvcHkpCkBAIC0zMyw2ICszMyw3IEBACiAj aW1wb3J0IDxEYXRhRGV0ZWN0b3JzQ29yZS9EYXRhRGV0ZWN0b3JzQ29yZS5oPgogI2lmIFBMQVRG T1JNKElPUykKICNpbXBvcnQgPERhdGFEZXRlY3RvcnNDb3JlL0REVVJMaWZpZXIuaD4KKyNpbXBv cnQgPERhdGFEZXRlY3RvcnNDb3JlL0RET3B0aW9uYWxTb3VyY2UuaD4KICNlbmRpZgogI2Vsc2Ug Ly8gIVVTRShBUFBMRV9JTlRFUk5BTF9TREspCiAKQEAgLTQ5LDYgKzUwLDExIEBAIGVudW0gewog fTsKIAogZW51bSB7CisgICAgRERTY2FubmVyU291cmNlUGFyc2VjID0gMTw8MSwKK307Cit0eXBl ZGVmIENGSW5kZXggRERTY2FubmVyU291cmNlOworCitlbnVtIHsKICAgICBERFVSTGlmaWVyUGhv bmVOdW1iZXJEZXRlY3Rpb25Ob25lID0gMCwKICAgICBERFVSTGlmaWVyUGhvbmVOdW1iZXJEZXRl Y3Rpb25SZWd1bGFyID0gMSA8PCAxLAogICAgIEREVVJMaWZpZXJQaG9uZU51bWJlckRldGVjdGlv blF1b3RlZFNob3J0cyA9IDEgPDwgMiwKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE5Nzk2MSkK KysrIFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4 IEBACisyMDE2LTAzLTEwICBFbnJpY2EgQ2FzdWNjaSAgPGVucmljYUBhcHBsZS5jb20+CisKKyAg ICAgICAgRXhwb3NlIGFkZGl0aW9uYWwgV0tEYXRhRGV0ZWN0b3JUeXBlcy4KKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1NTMzMQorICAgICAgICByZGFy Oi8vcHJvYmxlbS8yNDE3NTgxMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIEFkZGluZyBBUEkgdG8gZW5hYmxlIGRhdGEgZGV0ZWN0aW9uIG9mIHRyYWNr aW5nIG51bWJlcnMsCisgICAgICAgIGZsaWdodCBudW1iZXIgYW5kIHNwb3RsaWdodCBzdWdnZXN0 aW9ucy4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tOgorICAg ICAgICAoZnJvbVdLRGF0YURldGVjdG9yVHlwZXMpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkv Q29jb2EvV0tXZWJWaWV3Q29uZmlndXJhdGlvbi5oOgorCiAyMDE2LTAzLTA3ICBKZXIgTm9ibGUg IDxqZXIubm9ibGVAYXBwbGUuY29tPgogCiAgICAgICAgIEFkZCBzZXBhcmF0ZSBXSyBhbmQgV0sy IHByZWZlcmVuY2VzIGZvciByZXF1aXJpbmcgdXNlciBnZXN0dXJlcyBmb3IgdmlkZW8gbWVkaWEs IGRpc3RpbmN0IGZyb20gdXNlciBnZXN0dXJlcyBmb3IgbWVkaWEgZ2VuZXJhbGx5CkluZGV4OiBT b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbQo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbQkocmV2 aXNpb24gMTk3OTQ1KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dl YlZpZXcubW0JKHdvcmtpbmcgY29weSkKQEAgLTMzMyw3ICszMzMsMTMgQEAgc3RhdGljIFdlYkNv cmU6OkRhdGFEZXRlY3RvclR5cGVzIGZyb21XSwogICAgICAgICB2YWx1ZSB8PSBXZWJDb3JlOjpE YXRhRGV0ZWN0b3JUeXBlQWRkcmVzczsKICAgICBpZiAodHlwZXMgJiBXS0RhdGFEZXRlY3RvclR5 cGVDYWxlbmRhckV2ZW50KQogICAgICAgICB2YWx1ZSB8PSBXZWJDb3JlOjpEYXRhRGV0ZWN0b3JU eXBlQ2FsZW5kYXJFdmVudDsKLSAgICAKKyAgICBpZiAodHlwZXMgJiBXS0RhdGFEZXRlY3RvclR5 cGVUcmFja2luZ051bWJlcikKKyAgICAgICAgdmFsdWUgfD0gV2ViQ29yZTo6RGF0YURldGVjdG9y VHlwZVRyYWNraW5nTnVtYmVyOworICAgIGlmICh0eXBlcyAmIFdLRGF0YURldGVjdG9yVHlwZUZs aWdodE51bWJlcikKKyAgICAgICAgdmFsdWUgfD0gV2ViQ29yZTo6RGF0YURldGVjdG9yVHlwZUZs aWdodE51bWJlcjsKKyAgICBpZiAodHlwZXMgJiBXS0RhdGFEZXRlY3RvclR5cGVTcG90bGlnaHRT dWdnZXN0aW9uKQorICAgICAgICB2YWx1ZSB8PSBXZWJDb3JlOjpEYXRhRGV0ZWN0b3JUeXBlU3Bv dGxpZ2h0U3VnZ2VzdGlvbjsKKwogICAgIHJldHVybiBzdGF0aWNfY2FzdDxXZWJDb3JlOjpEYXRh RGV0ZWN0b3JUeXBlcz4odmFsdWUpOwogfQogI2VuZGlmCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlld0NvbmZpZ3VyYXRpb24uaAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlld0NvbmZpZ3VyYXRp b24uaAkocmV2aXNpb24gMTk3OTQ1KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9D b2NvYS9XS1dlYlZpZXdDb25maWd1cmF0aW9uLmgJKHdvcmtpbmcgY29weSkKQEAgLTY3LDYgKzY3 LDkgQEAgdHlwZWRlZiBOU19PUFRJT05TKE5TVUludGVnZXIsIFdLRGF0YURldAogICAgIFdLRGF0 YURldGVjdG9yVHlwZUxpbmsgPSAxIDw8IDEsCiAgICAgV0tEYXRhRGV0ZWN0b3JUeXBlQWRkcmVz cyA9IDEgPDwgMiwKICAgICBXS0RhdGFEZXRlY3RvclR5cGVDYWxlbmRhckV2ZW50ID0gMSA8PCAz LAorICAgIFdLRGF0YURldGVjdG9yVHlwZVRyYWNraW5nTnVtYmVyID0gMSA8PCA0LAorICAgIFdL RGF0YURldGVjdG9yVHlwZUZsaWdodE51bWJlciA9IDEgPDwgNSwKKyAgICBXS0RhdGFEZXRlY3Rv clR5cGVTcG90bGlnaHRTdWdnZXN0aW9uID0gMSA8PCA2LAogICAgIFdLRGF0YURldGVjdG9yVHlw ZUFsbCA9IE5TVUludGVnZXJNYXgKIH0gV0tfRU5VTV9BVkFJTEFCTEUoV0tfTUFDX1RCQSwgV0tf SU9TX1RCQSk7CiAK 273653 2016-03-10 16:47:30 -0800 2016-03-10 16:49:24 -0800 Patch2 spotlightsuggestions.txt text/plain 10214 enrica SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE5Nzk0NSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIyIEBACisyMDE2LTAzLTEwICBFbnJpY2Eg Q2FzdWNjaSAgPGVucmljYUBhcHBsZS5jb20+CisKKyAgICAgICAgRXhwb3NlIGFkZGl0aW9uYWwg V0tEYXRhRGV0ZWN0b3JUeXBlcy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTE1NTMzMQorICAgICAgICByZGFyOi8vcHJvYmxlbS8yNDE3NTgxMworCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZGluZyBzdXBw b3J0IGZvciBhZGRpdGlvbmFsIGRhdGEgZGV0ZWN0b3IgdHlwZXMgKHRyYWNraW5nCisgICAgICAg IG51bWJlcnMsIGZsaWdodCBpbmZvcm1hdGlvbiBhbmQgc3BvdGxpZ2h0IHN1Z2dlc3Rpb25zKS4K KworICAgICAgICAqIGVkaXRpbmcvY29jb2EvRGF0YURldGVjdGlvbi5oOgorICAgICAgICAqIGVk aXRpbmcvY29jb2EvRGF0YURldGVjdGlvbi5tbToKKyAgICAgICAgKFdlYkNvcmU6OmNvbnN0cnVj dFVSTFN0cmluZ0ZvclJlc3VsdCk6CisgICAgICAgIChXZWJDb3JlOjpEYXRhRGV0ZWN0aW9uOjpk ZXRlY3RDb250ZW50SW5SYW5nZSk6CisgICAgICAgICogcGxhdGZvcm0vY29jb2EvRGF0YURldGVj dG9yc0NvcmVTb2Z0TGluay5oOgorICAgICAgICAqIHBsYXRmb3JtL2NvY29hL0RhdGFEZXRlY3Rv cnNDb3JlU29mdExpbmsubW06CisgICAgICAgICogcGxhdGZvcm0vc3BpL2NvY29hL0RhdGFEZXRl Y3RvcnNDb3JlU1BJLmg6CisKIDIwMTYtMDMtMTAgIERhbmllbCBCYXRlcyAgPGRhYmF0ZXNAYXBw bGUuY29tPgogCiAgICAgICAgIENTUDogSW1wbGVtZW50IHN1cHBvcnQgZm9yIHNjcmlwdCBhbmQg c3R5bGUgbm9uY2VzCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL2NvY29hL0RhdGFEZXRl Y3Rpb24uaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL2NvY29hL0RhdGFE ZXRlY3Rpb24uaAkocmV2aXNpb24gMTk3OTQ1KQorKysgU291cmNlL1dlYkNvcmUvZWRpdGluZy9j b2NvYS9EYXRhRGV0ZWN0aW9uLmgJKHdvcmtpbmcgY29weSkKQEAgLTQ2LDggKzQ2LDkgQEAgZW51 bSBEYXRhRGV0ZWN0b3JUeXBlcyB7CiAgICAgRGF0YURldGVjdG9yVHlwZUxpbmsgPSAxIDw8IDEs CiAgICAgRGF0YURldGVjdG9yVHlwZUFkZHJlc3MgPSAxIDw8IDIsCiAgICAgRGF0YURldGVjdG9y VHlwZUNhbGVuZGFyRXZlbnQgPSAxIDw8IDMsCi0gICAgRGF0YURldGVjdG9yVHlwZVRyYWNraW5n TnVtYmVyID0gMSA8PCA0LCAvLyBOb3QgaW5kaXZpZHVhbGx5IHNlbGVjdGFibGUgd2l0aCB0aGUg QVBJCi0gICAgRGF0YURldGVjdG9yVHlwZUZsaWdodCA9IDEgPDwgNSwgLy8gTm90IGluZGl2aWR1 YWxseSBzZWxlY3RhYmxlIHdpdGggdGhlIEFQSQorICAgIERhdGFEZXRlY3RvclR5cGVUcmFja2lu Z051bWJlciA9IDEgPDwgNCwKKyAgICBEYXRhRGV0ZWN0b3JUeXBlRmxpZ2h0TnVtYmVyID0gMSA8 PCA1LAorICAgIERhdGFEZXRlY3RvclR5cGVTcG90bGlnaHRTdWdnZXN0aW9uID0gMSA8PCA2LAog ICAgIERhdGFEZXRlY3RvclR5cGVBbGwgPSBVTE9OR19NQVgKIH07CiAKSW5kZXg6IFNvdXJjZS9X ZWJDb3JlL2VkaXRpbmcvY29jb2EvRGF0YURldGVjdGlvbi5tbQo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViQ29yZS9lZGl0aW5nL2NvY29hL0RhdGFEZXRlY3Rpb24ubW0JKHJldmlzaW9uIDE5Nzk0 NSkKKysrIFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvY29jb2EvRGF0YURldGVjdGlvbi5tbQkod29y a2luZyBjb3B5KQpAQCAtNDQsNiArNDQsNyBAQAogI2ltcG9ydCAiVmlzaWJsZVBvc2l0aW9uLmgi CiAjaW1wb3J0ICJWaXNpYmxlVW5pdHMuaCIKICNpbXBvcnQgImh0bWxlZGl0aW5nLmgiCisjaW1w b3J0IDxXZWJLaXRBZGRpdGlvbnMvRGF0YURldGVjdG9yc0FkZGl0aW9ucy5oPgogCiBjb25zdCBj aGFyICpkYXRhRGV0ZWN0b3JzVVJMU2NoZW1lID0gIngtYXBwbGUtZGF0YS1kZXRlY3RvcnMiOwog Y29uc3QgY2hhciAqZGF0YURldGVjdG9yc0F0dHJpYnV0ZVR5cGVLZXkgPSAieC1hcHBsZS1kYXRh LWRldGVjdG9ycy10eXBlIjsKQEAgLTE5OSw3ICsyMDAsOCBAQCBzdGF0aWMgTlNTdHJpbmcgKmNv bnN0cnVjdFVSTFN0cmluZ0ZvclJlCiAgICAgCiAgICAgaWYgKCgoZGV0ZWN0aW9uVHlwZXMgJiBE YXRhRGV0ZWN0b3JUeXBlQWRkcmVzcykgJiYgKEREUmVzdWx0Q2F0ZWdvcnlBZGRyZXNzID09IGNh dGVnb3J5KSkKICAgICAgICAgfHwgKChkZXRlY3Rpb25UeXBlcyAmIERhdGFEZXRlY3RvclR5cGVU cmFja2luZ051bWJlcikgJiYgKENGU3RyaW5nQ29tcGFyZShnZXRfRGF0YURldGVjdG9yc0NvcmVf RERCaW5kZXJUcmFja2luZ051bWJlcktleSgpLCB0eXBlLCAwKSA9PSBrQ0ZDb21wYXJlRXF1YWxU bykpCi0gICAgICAgIHx8ICgoZGV0ZWN0aW9uVHlwZXMgJiBEYXRhRGV0ZWN0b3JUeXBlRmxpZ2h0 KSAmJiAoQ0ZTdHJpbmdDb21wYXJlKGdldF9EYXRhRGV0ZWN0b3JzQ29yZV9EREJpbmRlckZsaWdo dEluZm9ybWF0aW9uS2V5KCksIHR5cGUsIDApID09IGtDRkNvbXBhcmVFcXVhbFRvKSkKKyAgICAg ICAgfHwgKChkZXRlY3Rpb25UeXBlcyAmIERhdGFEZXRlY3RvclR5cGVGbGlnaHROdW1iZXIpICYm IChDRlN0cmluZ0NvbXBhcmUoZ2V0X0RhdGFEZXRlY3RvcnNDb3JlX0REQmluZGVyRmxpZ2h0SW5m b3JtYXRpb25LZXkoKSwgdHlwZSwgMCkgPT0ga0NGQ29tcGFyZUVxdWFsVG8pKQorICAgICAgICB8 fCAoKGRldGVjdGlvblR5cGVzICYgRGF0YURldGVjdG9yVHlwZVNwb3RsaWdodFN1Z2dlc3Rpb24p ICYmIChDRlN0cmluZ0NvbXBhcmUoRERCaW5kZXJTcG90bGlnaHRTb3VyY2VLZXksIHR5cGUsIDAp ID09IGtDRkNvbXBhcmVFcXVhbFRvKSkKICAgICAgICAgfHwgKChkZXRlY3Rpb25UeXBlcyAmIERh dGFEZXRlY3RvclR5cGVQaG9uZU51bWJlcikgJiYgKEREUmVzdWx0Q2F0ZWdvcnlQaG9uZU51bWJl ciA9PSBjYXRlZ29yeSkpCiAgICAgICAgIHx8ICgoZGV0ZWN0aW9uVHlwZXMgJiBEYXRhRGV0ZWN0 b3JUeXBlTGluaykgJiYgcmVzdWx0SXNVUkwoY3VycmVudFJlc3VsdCkpKSB7CiAgICAgICAgIApA QCAtNDI3LDYgKzQyOSw5IEBAIE5TQXJyYXkgKkRhdGFEZXRlY3Rpb246OmRldGVjdENvbnRlbnRJ blIKICAgICBSZXRhaW5QdHI8RERTY2FuUXVlcnlSZWY+IHNjYW5RdWVyeSA9IGFkb3B0Q0Yoc29m dExpbmtfRGF0YURldGVjdG9yc0NvcmVfRERTY2FuUXVlcnlDcmVhdGUoTlVMTCkpOwogICAgIGJ1 aWxkUXVlcnkoc2NhblF1ZXJ5LmdldCgpLCBjb250ZXh0UmFuZ2UuZ2V0KCkpOwogICAgIAorICAg IGlmICh0eXBlcyAmIERhdGFEZXRlY3RvclR5cGVTcG90bGlnaHRTdWdnZXN0aW9uKQorICAgICAg ICBzb2Z0TGlua19EYXRhRGV0ZWN0b3JzQ29yZV9ERFNjYW5uZXJFbmFibGVPcHRpb25hbFNvdXJj ZShzY2FubmVyLmdldCgpLCBERFNjYW5uZXJTb3VyY2VTcG90bGlnaHQsIHRydWUpOworICAgIAog ICAgIC8vIEZJWE1FOiB3ZSBzaG91bGQgYWRkIGEgdGltZW91dCB0byB0aGlzIGNhbGwgdG8gbWFr ZSBzdXJlIGl0IGRvZXNuJ3QgdGFrZSB0b28gbXVjaCB0aW1lLgogICAgIGlmICghc29mdExpbmtf RGF0YURldGVjdG9yc0NvcmVfRERTY2FubmVyU2NhblF1ZXJ5KHNjYW5uZXIuZ2V0KCksIHNjYW5R dWVyeS5nZXQoKSkpCiAgICAgICAgIHJldHVybiBuaWw7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9jb2NvYS9EYXRhRGV0ZWN0b3JzQ29yZVNvZnRMaW5rLmgKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY29jb2EvRGF0YURldGVjdG9yc0NvcmVTb2Z0TGluay5o CShyZXZpc2lvbiAxOTc5NDUpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jb2NvYS9EYXRh RGV0ZWN0b3JzQ29yZVNvZnRMaW5rLmgJKHdvcmtpbmcgY29weSkKQEAgLTM2LDYgKzM2LDcgQEAg U09GVF9MSU5LX0ZVTkNUSU9OX0ZPUl9IRUFERVIoV2ViQ29yZSwgRAogU09GVF9MSU5LX0ZVTkNU SU9OX0ZPUl9IRUFERVIoV2ViQ29yZSwgRGF0YURldGVjdG9yc0NvcmUsIEREU2Nhbm5lclNjYW5R dWVyeSwgQm9vbGVhbiwgKEREU2Nhbm5lclJlZiBzY2FubmVyLCBERFNjYW5RdWVyeVJlZiBxdWVy eSksIChzY2FubmVyLCBxdWVyeSkpCiBTT0ZUX0xJTktfRlVOQ1RJT05fRk9SX0hFQURFUihXZWJD b3JlLCBEYXRhRGV0ZWN0b3JzQ29yZSwgRERTY2FuUXVlcnlDcmVhdGUsIEREU2NhblF1ZXJ5UmVm LCAoQ0ZBbGxvY2F0b3JSZWYgYWxsb2NhdG9yKSwgKGFsbG9jYXRvcikpCiBTT0ZUX0xJTktfRlVO Q1RJT05fRk9SX0hFQURFUihXZWJDb3JlLCBEYXRhRGV0ZWN0b3JzQ29yZSwgRERTY2FubmVyQ29w eVJlc3VsdHNXaXRoT3B0aW9ucywgQ0ZBcnJheVJlZiwgKEREU2Nhbm5lclJlZiBzY2FubmVyLCBE RFNjYW5uZXJDb3B5UmVzdWx0c09wdGlvbnMgb3B0aW9ucyksIChzY2FubmVyLCBvcHRpb25zKSkK K1NPRlRfTElOS19GVU5DVElPTl9GT1JfSEVBREVSKFdlYkNvcmUsIERhdGFEZXRlY3RvcnNDb3Jl LCBERFNjYW5uZXJFbmFibGVPcHRpb25hbFNvdXJjZSwgdm9pZCwgKEREU2Nhbm5lclJlZiBzY2Fu bmVyLCBERFNjYW5uZXJTb3VyY2Ugc291cmNlLCBCb29sZWFuIGVuYWJsZSksIChzY2FubmVyLCBz b3VyY2UsIGVuYWJsZSkpCiBTT0ZUX0xJTktfRlVOQ1RJT05fRk9SX0hFQURFUihXZWJDb3JlLCBE YXRhRGV0ZWN0b3JzQ29yZSwgRERSZXN1bHRHZXRSYW5nZSwgQ0ZSYW5nZSwgKEREUmVzdWx0UmVm IHJlc3VsdCksIChyZXN1bHQpKQogU09GVF9MSU5LX0ZVTkNUSU9OX0ZPUl9IRUFERVIoV2ViQ29y ZSwgRGF0YURldGVjdG9yc0NvcmUsIEREUmVzdWx0R2V0VHlwZSwgQ0ZTdHJpbmdSZWYsIChERFJl c3VsdFJlZiByZXN1bHQpLCAocmVzdWx0KSkKIFNPRlRfTElOS19GVU5DVElPTl9GT1JfSEVBREVS KFdlYkNvcmUsIERhdGFEZXRlY3RvcnNDb3JlLCBERFJlc3VsdEdldENhdGVnb3J5LCBERFJlc3Vs dENhdGVnb3J5LCAoRERSZXN1bHRSZWYgcmVzdWx0KSwgKHJlc3VsdCkpCkluZGV4OiBTb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9jb2NvYS9EYXRhRGV0ZWN0b3JzQ29yZVNvZnRMaW5rLm1tCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2NvY29hL0RhdGFEZXRlY3RvcnNDb3Jl U29mdExpbmsubW0JKHJldmlzaW9uIDE5Nzk0NSkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2NvY29hL0RhdGFEZXRlY3RvcnNDb3JlU29mdExpbmsubW0JKHdvcmtpbmcgY29weSkKQEAgLTM1 LDYgKzM1LDcgQEAgU09GVF9MSU5LX0ZVTkNUSU9OX0ZPUl9TT1VSQ0UoV2ViQ29yZSwgRAogU09G VF9MSU5LX0ZVTkNUSU9OX0ZPUl9TT1VSQ0UoV2ViQ29yZSwgRGF0YURldGVjdG9yc0NvcmUsIERE U2Nhbm5lclNjYW5RdWVyeSwgQm9vbGVhbiwgKEREU2Nhbm5lclJlZiBzY2FubmVyLCBERFNjYW5R dWVyeVJlZiBxdWVyeSksIChzY2FubmVyLCBxdWVyeSkpCiBTT0ZUX0xJTktfRlVOQ1RJT05fRk9S X1NPVVJDRShXZWJDb3JlLCBEYXRhRGV0ZWN0b3JzQ29yZSwgRERTY2FuUXVlcnlDcmVhdGUsIERE U2NhblF1ZXJ5UmVmLCAoQ0ZBbGxvY2F0b3JSZWYgYWxsb2NhdG9yKSwgKGFsbG9jYXRvcikpCiBT T0ZUX0xJTktfRlVOQ1RJT05fRk9SX1NPVVJDRShXZWJDb3JlLCBEYXRhRGV0ZWN0b3JzQ29yZSwg RERTY2FubmVyQ29weVJlc3VsdHNXaXRoT3B0aW9ucywgQ0ZBcnJheVJlZiwgKEREU2Nhbm5lclJl ZiBzY2FubmVyLCBERFNjYW5uZXJDb3B5UmVzdWx0c09wdGlvbnMgb3B0aW9ucyksIChzY2FubmVy LCBvcHRpb25zKSkKK1NPRlRfTElOS19GVU5DVElPTl9GT1JfU09VUkNFKFdlYkNvcmUsIERhdGFE ZXRlY3RvcnNDb3JlLCBERFNjYW5uZXJFbmFibGVPcHRpb25hbFNvdXJjZSwgdm9pZCwgKEREU2Nh bm5lclJlZiBzY2FubmVyLCBERFNjYW5uZXJTb3VyY2Ugc291cmNlLCBCb29sZWFuIGVuYWJsZSks IChzY2FubmVyLCBzb3VyY2UsIGVuYWJsZSkpCiBTT0ZUX0xJTktfRlVOQ1RJT05fRk9SX1NPVVJD RShXZWJDb3JlLCBEYXRhRGV0ZWN0b3JzQ29yZSwgRERSZXN1bHRHZXRSYW5nZSwgQ0ZSYW5nZSwg KEREUmVzdWx0UmVmIHJlc3VsdCksIChyZXN1bHQpKQogU09GVF9MSU5LX0ZVTkNUSU9OX0ZPUl9T T1VSQ0UoV2ViQ29yZSwgRGF0YURldGVjdG9yc0NvcmUsIEREUmVzdWx0R2V0VHlwZSwgQ0ZTdHJp bmdSZWYsIChERFJlc3VsdFJlZiByZXN1bHQpLCAocmVzdWx0KSkKIFNPRlRfTElOS19GVU5DVElP Tl9GT1JfU09VUkNFKFdlYkNvcmUsIERhdGFEZXRlY3RvcnNDb3JlLCBERFJlc3VsdEdldENhdGVn b3J5LCBERFJlc3VsdENhdGVnb3J5LCAoRERSZXN1bHRSZWYgcmVzdWx0KSwgKHJlc3VsdCkpCklu ZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9zcGkvY29jb2EvRGF0YURldGVjdG9yc0NvcmVT UEkuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9zcGkvY29jb2EvRGF0 YURldGVjdG9yc0NvcmVTUEkuaAkocmV2aXNpb24gMTk3OTQ1KQorKysgU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vc3BpL2NvY29hL0RhdGFEZXRlY3RvcnNDb3JlU1BJLmgJKHdvcmtpbmcgY29weSkK QEAgLTMzLDYgKzMzLDcgQEAKICNpbXBvcnQgPERhdGFEZXRlY3RvcnNDb3JlL0RhdGFEZXRlY3Rv cnNDb3JlLmg+CiAjaWYgUExBVEZPUk0oSU9TKQogI2ltcG9ydCA8RGF0YURldGVjdG9yc0NvcmUv RERVUkxpZmllci5oPgorI2ltcG9ydCA8RGF0YURldGVjdG9yc0NvcmUvRERPcHRpb25hbFNvdXJj ZS5oPgogI2VuZGlmCiAjZWxzZSAvLyAhVVNFKEFQUExFX0lOVEVSTkFMX1NESykKIApAQCAtNDgs NiArNDksOCBAQCBlbnVtIHsKICAgICBERFNjYW5uZXJDb3B5UmVzdWx0c09wdGlvbnNDb2FsZXNj ZVNpZ25hdHVyZXMgPSAxIDw8IDEsCiB9OwogCit0eXBlZGVmIENGSW5kZXggRERTY2FubmVyU291 cmNlOworCiBlbnVtIHsKICAgICBERFVSTGlmaWVyUGhvbmVOdW1iZXJEZXRlY3Rpb25Ob25lID0g MCwKICAgICBERFVSTGlmaWVyUGhvbmVOdW1iZXJEZXRlY3Rpb25SZWd1bGFyID0gMSA8PCAxLApA QCAtMTEzLDYgKzExNiwxMCBAQCB0eXBlZGVmIHN0cnVjdCBfX0REU2Nhbm5lciAqRERTY2FubmVy UmVmCiB0eXBlZGVmIENGSW5kZXggRERTY2FubmVyQ29weVJlc3VsdHNPcHRpb25zOwogdHlwZWRl ZiBDRkluZGV4IEREU2Nhbm5lck9wdGlvbnM7CiAKK2VudW0geworICAgIEREU2Nhbm5lclNvdXJj ZVNwb3RsaWdodCA9IDE8PDEsCit9OworCiBleHRlcm4gIkMiIHsKIAogZXh0ZXJuIGNvbnN0IERE U2Nhbm5lckNvcHlSZXN1bHRzT3B0aW9ucyBERFNjYW5uZXJDb3B5UmVzdWx0c09wdGlvbnNGb3JQ YXNzaXZlVXNlOwpJbmRleDogU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwkocmV2aXNpb24gMTk3OTY5KQorKysgU291cmNlL1dl YktpdDIvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTggQEAKKzIwMTYtMDMt MTAgIEVucmljYSBDYXN1Y2NpICA8ZW5yaWNhQGFwcGxlLmNvbT4KKworICAgICAgICBFeHBvc2Ug YWRkaXRpb25hbCBXS0RhdGFEZXRlY3RvclR5cGVzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU1MzMxCisgICAgICAgIHJkYXI6Ly9wcm9ibGVtLzI0 MTc1ODEzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg QWRkaW5nIEFQSSB0byBlbmFibGUgZGF0YSBkZXRlY3Rpb24gb2YgdHJhY2tpbmcgbnVtYmVycywK KyAgICAgICAgZmxpZ2h0IG51bWJlciBhbmQgc3BvdGxpZ2h0IHN1Z2dlc3Rpb25zLgorCisgICAg ICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW06CisgICAgICAgIChmcm9tV0tE YXRhRGV0ZWN0b3JUeXBlcyk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZp ZXdDb25maWd1cmF0aW9uLmg6CisKIDIwMTYtMDMtMTAgIEplciBOb2JsZSAgPGplci5ub2JsZUBh cHBsZS5jb20+CiAKICAgICAgICAgQWRkIFdlYkNvcmUsIFdlYktpdCwgJiBXZWJLaXQyIHByZWZl cmVuY2Uvc2V0dGluZyB0byBlbmFibGUgTWFpbiBDb250ZW50IGhldXJpc3RpYy4KSW5kZXg6IFNv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tCShyZXZp c2lvbiAxOTc5NDUpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2Vi Vmlldy5tbQkod29ya2luZyBjb3B5KQpAQCAtMzMzLDcgKzMzMywxMyBAQCBzdGF0aWMgV2ViQ29y ZTo6RGF0YURldGVjdG9yVHlwZXMgZnJvbVdLCiAgICAgICAgIHZhbHVlIHw9IFdlYkNvcmU6OkRh dGFEZXRlY3RvclR5cGVBZGRyZXNzOwogICAgIGlmICh0eXBlcyAmIFdLRGF0YURldGVjdG9yVHlw ZUNhbGVuZGFyRXZlbnQpCiAgICAgICAgIHZhbHVlIHw9IFdlYkNvcmU6OkRhdGFEZXRlY3RvclR5 cGVDYWxlbmRhckV2ZW50OwotICAgIAorICAgIGlmICh0eXBlcyAmIFdLRGF0YURldGVjdG9yVHlw ZVRyYWNraW5nTnVtYmVyKQorICAgICAgICB2YWx1ZSB8PSBXZWJDb3JlOjpEYXRhRGV0ZWN0b3JU eXBlVHJhY2tpbmdOdW1iZXI7CisgICAgaWYgKHR5cGVzICYgV0tEYXRhRGV0ZWN0b3JUeXBlRmxp Z2h0TnVtYmVyKQorICAgICAgICB2YWx1ZSB8PSBXZWJDb3JlOjpEYXRhRGV0ZWN0b3JUeXBlRmxp Z2h0TnVtYmVyOworICAgIGlmICh0eXBlcyAmIFdLRGF0YURldGVjdG9yVHlwZVNwb3RsaWdodFN1 Z2dlc3Rpb24pCisgICAgICAgIHZhbHVlIHw9IFdlYkNvcmU6OkRhdGFEZXRlY3RvclR5cGVTcG90 bGlnaHRTdWdnZXN0aW9uOworCiAgICAgcmV0dXJuIHN0YXRpY19jYXN0PFdlYkNvcmU6OkRhdGFE ZXRlY3RvclR5cGVzPih2YWx1ZSk7CiB9CiAjZW5kaWYKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Q29uZmlndXJhdGlvbi5oCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Q29uZmlndXJhdGlv bi5oCShyZXZpc2lvbiAxOTc5NDUpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0Nv Y29hL1dLV2ViVmlld0NvbmZpZ3VyYXRpb24uaAkod29ya2luZyBjb3B5KQpAQCAtNjcsNiArNjcs OSBAQCB0eXBlZGVmIE5TX09QVElPTlMoTlNVSW50ZWdlciwgV0tEYXRhRGV0CiAgICAgV0tEYXRh RGV0ZWN0b3JUeXBlTGluayA9IDEgPDwgMSwKICAgICBXS0RhdGFEZXRlY3RvclR5cGVBZGRyZXNz ID0gMSA8PCAyLAogICAgIFdLRGF0YURldGVjdG9yVHlwZUNhbGVuZGFyRXZlbnQgPSAxIDw8IDMs CisgICAgV0tEYXRhRGV0ZWN0b3JUeXBlVHJhY2tpbmdOdW1iZXIgPSAxIDw8IDQsCisgICAgV0tE YXRhRGV0ZWN0b3JUeXBlRmxpZ2h0TnVtYmVyID0gMSA8PCA1LAorICAgIFdLRGF0YURldGVjdG9y VHlwZVNwb3RsaWdodFN1Z2dlc3Rpb24gPSAxIDw8IDYsCiAgICAgV0tEYXRhRGV0ZWN0b3JUeXBl QWxsID0gTlNVSW50ZWdlck1heAogfSBXS19FTlVNX0FWQUlMQUJMRShXS19NQUNfVEJBLCBXS19J T1NfVEJBKTsKIAo=