193842 2019-01-25 13:24:09 -0800 Remove FrameView::m_significantRenderedTextMilestonePending 2019-01-25 15:41:46 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham commit-queue simon.fraser webkit-bug-importer wenson_hsieh zalan oldest_to_newest 1498415 0 zalan 2019-01-25 13:24:09 -0800 see bug 193835 1498416 1 360152 zalan 2019-01-25 13:25:16 -0800 Created attachment 360152 Patch 1498451 2 360160 zalan 2019-01-25 13:58:19 -0800 Created attachment 360160 Patch 1498472 3 360164 zalan 2019-01-25 14:27:31 -0800 Created attachment 360164 Patch 1498522 4 360164 commit-queue 2019-01-25 15:40:29 -0800 Comment on attachment 360164 Patch Clearing flags on attachment: 360164 Committed r240519: <https://trac.webkit.org/changeset/240519> 1498523 5 commit-queue 2019-01-25 15:40:31 -0800 All reviewed patches have been landed. Closing bug. 1498525 6 webkit-bug-importer 2019-01-25 15:41:46 -0800 <rdar://problem/47564855> 360152 2019-01-25 13:25:16 -0800 2019-01-25 13:45:06 -0800 Patch bug-193842-20190125132509.patch text/plain 7167 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjQwNDk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTQ5ZDZkMTZiOWNmNjYx NTBkZGMwNjZiMDllZjc5NTgyYTU5ODA0Ny4uODhkODY2OTY5ZDRmMzJhZWJiNWI0MjY1N2Y4NzEz OWU0MDVjZjY3MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE5LTAxLTI1ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgUmVtb3ZlIEZyYW1lVmlldzo6 bV9zaWduaWZpY2FudFJlbmRlcmVkVGV4dE1pbGVzdG9uZVBlbmRpbmcKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5Mzg0MgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdJUC4KKworICAgICAgICAqIHBhZ2Uv RnJhbWVWaWV3LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6cmVzZXRMYXlvdXRN aWxlc3RvbmVzKToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6aW5jcmVtZW50VmlzdWFs bHlOb25FbXB0eUNoYXJhY3RlckNvdW50KToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6 aGFzUmVhY2hlZFNpZ25pZmljYW50UmVuZGVyZWRUZXh0VGhyZWFzaG9sZCk6CisgICAgICAgIChX ZWJDb3JlOjpGcmFtZVZpZXc6OnF1YWxpZmllc0FzU2lnbmlmaWNhbnRSZW5kZXJlZFRleHQgY29u c3QpOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVWaWV3OjpmaXJlTGF5b3V0UmVsYXRlZE1pbGVz dG9uZXNJZk5lZWRlZCk6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZVZpZXc6OnVwZGF0ZVNpZ25p ZmljYW50UmVuZGVyZWRUZXh0TWlsZXN0b25lSWZOZWVkZWQpOiBEZWxldGVkLgorICAgICAgICAq IHBhZ2UvRnJhbWVWaWV3Lmg6CisKIDIwMTktMDEtMjUgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFw cGxlLmNvbT4KIAogICAgICAgICBSZW1vdmUgRnJhbWVWaWV3OjptX2ZpcnN0VmlzdWFsbHlOb25F bXB0eUxheW91dENhbGxiYWNrUGVuZGluZwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFn ZS9GcmFtZVZpZXcuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCmluZGV4 IDRlMzdiYWE1YzllZDQzMTFmNDJmZjQwYWM0M2NiMmJiNDk5MWYwMjYuLjFkYTM5NDIwYjg3MTc2 MGQwYWVjY2FiNjU5ZGRmODQ5YmFjOTg5ODIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvRnJhbWVWaWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAK QEAgLTI5Myw3ICsyOTMsNyBAQCB2b2lkIEZyYW1lVmlldzo6cmVzZXRMYXlvdXRNaWxlc3RvbmVz KCkKIHsKICAgICBtX2ZpcnN0TGF5b3V0Q2FsbGJhY2tQZW5kaW5nID0gZmFsc2U7CiAgICAgbV9p c1Zpc3VhbGx5Tm9uRW1wdHkgPSBmYWxzZTsKLSAgICBtX3NpZ25pZmljYW50UmVuZGVyZWRUZXh0 TWlsZXN0b25lUGVuZGluZyA9IHRydWU7CisgICAgbV9oYXNSZWFjaGVkU2lnbmlmaWNhbnRSZW5k ZXJlZFRleHRUaHJlYXNob2xkID0gZmFsc2U7CiAgICAgbV9yZW5kZXJlZFNpZ25pZmljYW50QW1v dW50T2ZUZXh0ID0gZmFsc2U7CiAgICAgbV92aXN1YWxseU5vbkVtcHR5Q2hhcmFjdGVyQ291bnQg PSAwOwogICAgIG1fdmlzdWFsbHlOb25FbXB0eVBpeGVsQ291bnQgPSAwOwpAQCAtNDM4NywxMSAr NDM4Nyw5IEBAIHZvaWQgRnJhbWVWaWV3Ojp1cGRhdGVMYXlvdXRBbmRTdHlsZUlmTmVlZGVkUmVj dXJzaXZlKCkKIAogdm9pZCBGcmFtZVZpZXc6OmluY3JlbWVudFZpc3VhbGx5Tm9uRW1wdHlDaGFy YWN0ZXJDb3VudChjb25zdCBTdHJpbmcmIGlubGluZVRleHQpCiB7Ci0gICAgaWYgKG1fdmlzdWFs bHlOb25FbXB0eUNoYXJhY3RlckNvdW50ID4gdmlzdWFsQ2hhcmFjdGVyVGhyZXNob2xkICYmIG1f cmVuZGVyZWRTaWduaWZpY2FudEFtb3VudE9mVGV4dCkKKyAgICBpZiAobV92aXN1YWxseU5vbkVt cHR5Q2hhcmFjdGVyQ291bnQgPiB2aXN1YWxDaGFyYWN0ZXJUaHJlc2hvbGQgJiYgbV9oYXNSZWFj aGVkU2lnbmlmaWNhbnRSZW5kZXJlZFRleHRUaHJlYXNob2xkKQogICAgICAgICByZXR1cm47CiAK LSAgICArK21fdGV4dFJlbmRlcmVyQ291bnRGb3JWaXN1YWxseU5vbkVtcHR5Q2hhcmFjdGVyczsK LQogICAgIGF1dG8gbm9uV2hpdGVzcGFjZUxlbmd0aCA9IFtdKGF1dG8mIGlubGluZVRleHQpIHsK ICAgICAgICAgYXV0byBsZW5ndGggPSBpbmxpbmVUZXh0Lmxlbmd0aCgpOwogICAgICAgICBmb3Ig KHVuc2lnbmVkIGkgPSAwOyBpIDwgaW5saW5lVGV4dC5sZW5ndGgoKTsgKytpKSB7CkBAIC00NDAy LDkgKzQ0MDAsNyBAQCB2b2lkIEZyYW1lVmlldzo6aW5jcmVtZW50VmlzdWFsbHlOb25FbXB0eUNo YXJhY3RlckNvdW50KGNvbnN0IFN0cmluZyYgaW5saW5lVGV4dAogICAgICAgICByZXR1cm4gbGVu Z3RoOwogICAgIH07CiAgICAgbV92aXN1YWxseU5vbkVtcHR5Q2hhcmFjdGVyQ291bnQgKz0gbm9u V2hpdGVzcGFjZUxlbmd0aChpbmxpbmVUZXh0KTsKLQotICAgIGlmICghbV9yZW5kZXJlZFNpZ25p ZmljYW50QW1vdW50T2ZUZXh0KQotICAgICAgICB1cGRhdGVTaWduaWZpY2FudFJlbmRlcmVkVGV4 dE1pbGVzdG9uZUlmTmVlZGVkKCk7CisgICAgKyttX3RleHRSZW5kZXJlckNvdW50Rm9yVmlzdWFs bHlOb25FbXB0eUNoYXJhY3RlcnM7CiB9CiAKIHN0YXRpYyBib29sIGVsZW1lbnRPdmVyZmxvd1Jl Y3RJc0xhcmdlclRoYW5UaHJlc2hvbGQoY29uc3QgRWxlbWVudCYgZWxlbWVudCkKQEAgLTQ0OTAs MjkgKzQ0ODYsMzggQEAgYm9vbCBGcmFtZVZpZXc6OnF1YWxpZmllc0FzVmlzdWFsbHlOb25FbXB0 eSgpIGNvbnN0CiAgICAgcmV0dXJuIGZhbHNlOwogfQogCi12b2lkIEZyYW1lVmlldzo6dXBkYXRl U2lnbmlmaWNhbnRSZW5kZXJlZFRleHRNaWxlc3RvbmVJZk5lZWRlZCgpCitib29sIEZyYW1lVmll dzo6aGFzUmVhY2hlZFNpZ25pZmljYW50UmVuZGVyZWRUZXh0VGhyZWFzaG9sZCgpCiB7Ci0gICAg aWYgKG1fcmVuZGVyZWRTaWduaWZpY2FudEFtb3VudE9mVGV4dCkKLSAgICAgICAgcmV0dXJuOwor ICAgIGlmIChtX2hhc1JlYWNoZWRTaWduaWZpY2FudFJlbmRlcmVkVGV4dFRocmVhc2hvbGQpCisg ICAgICAgIHJldHVybiB0cnVlOworCisgICAgaWYgKCFmcmFtZSgpLmRvY3VtZW50KCkpCisgICAg ICAgIHJldHVybiBmYWxzZTsKKyAgICBhdXRvJiBkb2N1bWVudCA9ICpmcmFtZSgpLmRvY3VtZW50 KCk7CisgICAgYXV0byBjaGFyYWN0ZXJUaHJlc2hvbGQgPSBkb2N1bWVudC5oYXNNYWluQXJ0aWNs ZUVsZW1lbnQoKSA/IG1haW5BcnRpY2xlU2lnbmlmaWNhbnRSZW5kZXJlZFRleHRDaGFyYWN0ZXJU aHJlc2hvbGQgOiBkZWZhdWx0U2lnbmlmaWNhbnRSZW5kZXJlZFRleHRDaGFyYWN0ZXJUaHJlc2hv bGQ7CisgICAgaWYgKG1fdmlzdWFsbHlOb25FbXB0eUNoYXJhY3RlckNvdW50IDwgY2hhcmFjdGVy VGhyZXNob2xkKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICBhdXRvIG1lYW5MZW5ndGgg PSBkb2N1bWVudC5oYXNNYWluQXJ0aWNsZUVsZW1lbnQoKSA/IG1haW5BcnRpY2xlU2lnbmlmaWNh bnRSZW5kZXJlZFRleHRNZWFuTGVuZ3RoIDogZGVmYXVsdFNpZ25pZmljYW50UmVuZGVyZWRUZXh0 TWVhbkxlbmd0aDsKKyAgICBpZiAoIW1fdGV4dFJlbmRlcmVyQ291bnRGb3JWaXN1YWxseU5vbkVt cHR5Q2hhcmFjdGVycyB8fCBtX3Zpc3VhbGx5Tm9uRW1wdHlDaGFyYWN0ZXJDb3VudCAvIHN0YXRp Y19jYXN0PGZsb2F0PihtX3RleHRSZW5kZXJlckNvdW50Rm9yVmlzdWFsbHlOb25FbXB0eUNoYXJh Y3RlcnMpIDwgbWVhbkxlbmd0aCkKKyAgICAgICAgcmV0dXJuIGZhbHNlOwogCisgICAgbV9oYXNS ZWFjaGVkU2lnbmlmaWNhbnRSZW5kZXJlZFRleHRUaHJlYXNob2xkID0gdHJ1ZTsKKyAgICByZXR1 cm4gdHJ1ZTsKK30KKworYm9vbCBGcmFtZVZpZXc6OnF1YWxpZmllc0FzU2lnbmlmaWNhbnRSZW5k ZXJlZFRleHQoKSBjb25zdAoreworICAgIEFTU0VSVCghbV9yZW5kZXJlZFNpZ25pZmljYW50QW1v dW50T2ZUZXh0KTsKICAgICBhdXRvKiBkb2N1bWVudCA9IGZyYW1lKCkuZG9jdW1lbnQoKTsKICAg ICBpZiAoIWRvY3VtZW50IHx8IGRvY3VtZW50LT5zdHlsZVNjb3BlKCkuaGFzUGVuZGluZ1NoZWV0 c0JlZm9yZUJvZHkoKSkKLSAgICAgICAgcmV0dXJuOworICAgICAgICByZXR1cm4gZmFsc2U7CiAK ICAgICBhdXRvKiBkb2N1bWVudEVsZW1lbnQgPSBkb2N1bWVudC0+ZG9jdW1lbnRFbGVtZW50KCk7 CiAgICAgaWYgKCFkb2N1bWVudEVsZW1lbnQgfHwgIWVsZW1lbnRPdmVyZmxvd1JlY3RJc0xhcmdl clRoYW5UaHJlc2hvbGQoKmRvY3VtZW50RWxlbWVudCkpCi0gICAgICAgIHJldHVybjsKLQotICAg IGF1dG8gY2hhcmFjdGVyVGhyZXNob2xkID0gZG9jdW1lbnQtPmhhc01haW5BcnRpY2xlRWxlbWVu dCgpID8gbWFpbkFydGljbGVTaWduaWZpY2FudFJlbmRlcmVkVGV4dENoYXJhY3RlclRocmVzaG9s ZCA6IGRlZmF1bHRTaWduaWZpY2FudFJlbmRlcmVkVGV4dENoYXJhY3RlclRocmVzaG9sZDsKLSAg ICBhdXRvIG1lYW5MZW5ndGggPSBkb2N1bWVudC0+aGFzTWFpbkFydGljbGVFbGVtZW50KCkgPyBt YWluQXJ0aWNsZVNpZ25pZmljYW50UmVuZGVyZWRUZXh0TWVhbkxlbmd0aCA6IGRlZmF1bHRTaWdu aWZpY2FudFJlbmRlcmVkVGV4dE1lYW5MZW5ndGg7Ci0KLSAgICBpZiAobV92aXN1YWxseU5vbkVt cHR5Q2hhcmFjdGVyQ291bnQgPCBjaGFyYWN0ZXJUaHJlc2hvbGQpCi0gICAgICAgIHJldHVybjsK LQotICAgIGlmICghbV90ZXh0UmVuZGVyZXJDb3VudEZvclZpc3VhbGx5Tm9uRW1wdHlDaGFyYWN0 ZXJzIHx8IG1fdmlzdWFsbHlOb25FbXB0eUNoYXJhY3RlckNvdW50IC8gc3RhdGljX2Nhc3Q8Zmxv YXQ+KG1fdGV4dFJlbmRlcmVyQ291bnRGb3JWaXN1YWxseU5vbkVtcHR5Q2hhcmFjdGVycykgPCBt ZWFuTGVuZ3RoKQotICAgICAgICByZXR1cm47CisgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAg IG1fcmVuZGVyZWRTaWduaWZpY2FudEFtb3VudE9mVGV4dCA9IHRydWU7CisgICAgcmV0dXJuIG1f aGFzUmVhY2hlZFNpZ25pZmljYW50UmVuZGVyZWRUZXh0VGhyZWFzaG9sZDsKIH0KIAogYm9vbCBG cmFtZVZpZXc6OmlzVmlld0ZvckRvY3VtZW50SW5GcmFtZSgpIGNvbnN0CkBAIC01MTM2LDcgKzUx NDEsNiBAQCB2b2lkIEZyYW1lVmlldzo6ZmlyZUxheW91dFJlbGF0ZWRNaWxlc3RvbmVzSWZOZWVk ZWQoKQogICAgICAgICBpZiAoZnJhbWUoKS5pc01haW5GcmFtZSgpKQogICAgICAgICAgICAgcGFn ZS0+c3RhcnRDb3VudGluZ1JlbGV2YW50UmVwYWludGVkT2JqZWN0cygpOwogICAgIH0KLSAgICB1 cGRhdGVTaWduaWZpY2FudFJlbmRlcmVkVGV4dE1pbGVzdG9uZUlmTmVlZGVkKCk7CiAKICAgICBp ZiAoIW1faXNWaXN1YWxseU5vbkVtcHR5ICYmIHF1YWxpZmllc0FzVmlzdWFsbHlOb25FbXB0eSgp KSB7CiAgICAgICAgIG1faXNWaXN1YWxseU5vbkVtcHR5ID0gdHJ1ZTsKQEAgLTUxNDUsOCArNTE0 OSw4IEBAIHZvaWQgRnJhbWVWaWV3OjpmaXJlTGF5b3V0UmVsYXRlZE1pbGVzdG9uZXNJZk5lZWRl ZCgpCiAgICAgICAgICAgICBtaWxlc3RvbmVzQWNoaWV2ZWQuYWRkKERpZEZpcnN0VmlzdWFsbHlO b25FbXB0eUxheW91dCk7CiAgICAgfQogCi0gICAgaWYgKG1fcmVuZGVyZWRTaWduaWZpY2FudEFt b3VudE9mVGV4dCAmJiBtX3NpZ25pZmljYW50UmVuZGVyZWRUZXh0TWlsZXN0b25lUGVuZGluZykg ewotICAgICAgICBtX3NpZ25pZmljYW50UmVuZGVyZWRUZXh0TWlsZXN0b25lUGVuZGluZyA9IGZh bHNlOworICAgIGlmICghbV9yZW5kZXJlZFNpZ25pZmljYW50QW1vdW50T2ZUZXh0ICYmIHF1YWxp Zmllc0FzU2lnbmlmaWNhbnRSZW5kZXJlZFRleHQoKSkgeworICAgICAgICBtX3JlbmRlcmVkU2ln bmlmaWNhbnRBbW91bnRPZlRleHQgPSB0cnVlOwogICAgICAgICBpZiAocmVxdWVzdGVkTWlsZXN0 b25lcyAmIERpZFJlbmRlclNpZ25pZmljYW50QW1vdW50T2ZUZXh0KQogICAgICAgICAgICAgbWls ZXN0b25lc0FjaGlldmVkLmFkZChEaWRSZW5kZXJTaWduaWZpY2FudEFtb3VudE9mVGV4dCk7CiAg ICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuaCBiL1NvdXJj ZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmgKaW5kZXggZTg5YmQ4ZTk3YjJiNzg2YzU1ODg1MjU4 M2U2ODQ5NDRlZDY0YTRjNC4uMzhiOGE3NDM3YmY1ZjY5NGQ2NDkxNmIxMzdkZDhlMDU3NzUzMWRl MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5oCkBAIC03OTMsNiArNzkzLDkgQEAgcHJpdmF0ZToK ICAgICB2b2lkIG1hcmtSb290T3JCb2R5UmVuZGVyZXJEaXJ0eSgpIGNvbnN0OwogCiAgICAgYm9v bCBxdWFsaWZpZXNBc1Zpc3VhbGx5Tm9uRW1wdHkoKSBjb25zdDsKKyAgICBib29sIHF1YWxpZmll c0FzU2lnbmlmaWNhbnRSZW5kZXJlZFRleHQoKSBjb25zdDsKKyAgICBib29sIGhhc1JlYWNoZWRT aWduaWZpY2FudFJlbmRlcmVkVGV4dFRocmVhc2hvbGQoKTsKKwogICAgIGJvb2wgaXNWaWV3Rm9y RG9jdW1lbnRJbkZyYW1lKCkgY29uc3Q7CiAKICAgICBBWE9iamVjdENhY2hlKiBheE9iamVjdENh Y2hlKCkgY29uc3Q7CkBAIC04ODMsOCArODg2LDggQEAgcHJpdmF0ZToKICAgICB1bnNpZ25lZCBt X3Zpc3VhbGx5Tm9uRW1wdHlQaXhlbENvdW50IHsgMCB9OwogCiAgICAgdW5zaWduZWQgbV90ZXh0 UmVuZGVyZXJDb3VudEZvclZpc3VhbGx5Tm9uRW1wdHlDaGFyYWN0ZXJzIHsgMCB9OwotICAgIGJv b2wgbV9yZW5kZXJlZFNpZ25pZmljYW50QW1vdW50T2ZUZXh0OwotICAgIGJvb2wgbV9zaWduaWZp Y2FudFJlbmRlcmVkVGV4dE1pbGVzdG9uZVBlbmRpbmc7CisgICAgYm9vbCBtX3JlbmRlcmVkU2ln bmlmaWNhbnRBbW91bnRPZlRleHQgeyBmYWxzZSB9OworICAgIGJvb2wgbV9oYXNSZWFjaGVkU2ln bmlmaWNhbnRSZW5kZXJlZFRleHRUaHJlYXNob2xkIHsgZmFsc2UgfTsKIAogICAgIGJvb2wgbV9u ZWVkc0RlZmVycmVkU2Nyb2xsYmFyc1VwZGF0ZSB7IGZhbHNlIH07CiAK 360160 2019-01-25 13:58:19 -0800 2019-01-25 14:27:30 -0800 Patch bug-193842-20190125135813.patch text/plain 7589 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjQwNDk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTQ5ZDZkMTZiOWNmNjYx NTBkZGMwNjZiMDllZjc5NTgyYTU5ODA0Ny4uODhkODY2OTY5ZDRmMzJhZWJiNWI0MjY1N2Y4NzEz OWU0MDVjZjY3MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE5LTAxLTI1ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgUmVtb3ZlIEZyYW1lVmlldzo6 bV9zaWduaWZpY2FudFJlbmRlcmVkVGV4dE1pbGVzdG9uZVBlbmRpbmcKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5Mzg0MgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdJUC4KKworICAgICAgICAqIHBhZ2Uv RnJhbWVWaWV3LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6cmVzZXRMYXlvdXRN aWxlc3RvbmVzKToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6aW5jcmVtZW50VmlzdWFs bHlOb25FbXB0eUNoYXJhY3RlckNvdW50KToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6 aGFzUmVhY2hlZFNpZ25pZmljYW50UmVuZGVyZWRUZXh0VGhyZWFzaG9sZCk6CisgICAgICAgIChX ZWJDb3JlOjpGcmFtZVZpZXc6OnF1YWxpZmllc0FzU2lnbmlmaWNhbnRSZW5kZXJlZFRleHQgY29u c3QpOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVWaWV3OjpmaXJlTGF5b3V0UmVsYXRlZE1pbGVz dG9uZXNJZk5lZWRlZCk6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZVZpZXc6OnVwZGF0ZVNpZ25p ZmljYW50UmVuZGVyZWRUZXh0TWlsZXN0b25lSWZOZWVkZWQpOiBEZWxldGVkLgorICAgICAgICAq IHBhZ2UvRnJhbWVWaWV3Lmg6CisKIDIwMTktMDEtMjUgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFw cGxlLmNvbT4KIAogICAgICAgICBSZW1vdmUgRnJhbWVWaWV3OjptX2ZpcnN0VmlzdWFsbHlOb25F bXB0eUxheW91dENhbGxiYWNrUGVuZGluZwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFn ZS9GcmFtZVZpZXcuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCmluZGV4 IDRlMzdiYWE1YzllZDQzMTFmNDJmZjQwYWM0M2NiMmJiNDk5MWYwMjYuLjlkMGZhNmM4MzY1YTBh NmU5OGNmNzBlNDgwYjkwYTMyMjdmZmI0NTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvRnJhbWVWaWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAK QEAgLTI5Myw3ICsyOTMsNyBAQCB2b2lkIEZyYW1lVmlldzo6cmVzZXRMYXlvdXRNaWxlc3RvbmVz KCkKIHsKICAgICBtX2ZpcnN0TGF5b3V0Q2FsbGJhY2tQZW5kaW5nID0gZmFsc2U7CiAgICAgbV9p c1Zpc3VhbGx5Tm9uRW1wdHkgPSBmYWxzZTsKLSAgICBtX3NpZ25pZmljYW50UmVuZGVyZWRUZXh0 TWlsZXN0b25lUGVuZGluZyA9IHRydWU7CisgICAgbV9oYXNSZWFjaGVkU2lnbmlmaWNhbnRSZW5k ZXJlZFRleHRUaHJlc2hvbGQgPSBmYWxzZTsKICAgICBtX3JlbmRlcmVkU2lnbmlmaWNhbnRBbW91 bnRPZlRleHQgPSBmYWxzZTsKICAgICBtX3Zpc3VhbGx5Tm9uRW1wdHlDaGFyYWN0ZXJDb3VudCA9 IDA7CiAgICAgbV92aXN1YWxseU5vbkVtcHR5UGl4ZWxDb3VudCA9IDA7CkBAIC0zMzA3LDggKzMz MDcsNyBAQCB2b2lkIEZyYW1lVmlldzo6cGVyZm9ybVBvc3RMYXlvdXRUYXNrcygpCiB7CiAgICAg Ly8gRklYTUU6IFdlIHNob3VsZCBub3QgcnVuIGFueSBKYXZhU2NyaXB0IGNvZGUgaW4gdGhpcyBm dW5jdGlvbi4KICAgICBMT0coTGF5b3V0LCAiRnJhbWVWaWV3ICVwIHBlcmZvcm1Qb3N0TGF5b3V0 VGFza3MiLCB0aGlzKTsKLQotICAgIGZyYW1lKCkuZG9jdW1lbnQoKS0+dXBkYXRlTWFpbkFydGlj bGVFbGVtZW50QWZ0ZXJMYXlvdXQoKTsKKyAgICB1cGRhdGVIYXNSZWFjaGVkU2lnbmlmaWNhbnRS ZW5kZXJlZFRleHRUaHJlc2hvbGQoKTsKICAgICBmcmFtZSgpLnNlbGVjdGlvbigpLnVwZGF0ZUFw cGVhcmFuY2VBZnRlckxheW91dCgpOwogCiAgICAgZmx1c2hQb3N0TGF5b3V0VGFza3NRdWV1ZSgp OwpAQCAtNDM4NywxMSArNDM4Niw5IEBAIHZvaWQgRnJhbWVWaWV3Ojp1cGRhdGVMYXlvdXRBbmRT dHlsZUlmTmVlZGVkUmVjdXJzaXZlKCkKIAogdm9pZCBGcmFtZVZpZXc6OmluY3JlbWVudFZpc3Vh bGx5Tm9uRW1wdHlDaGFyYWN0ZXJDb3VudChjb25zdCBTdHJpbmcmIGlubGluZVRleHQpCiB7Ci0g ICAgaWYgKG1fdmlzdWFsbHlOb25FbXB0eUNoYXJhY3RlckNvdW50ID4gdmlzdWFsQ2hhcmFjdGVy VGhyZXNob2xkICYmIG1fcmVuZGVyZWRTaWduaWZpY2FudEFtb3VudE9mVGV4dCkKKyAgICBpZiAo bV92aXN1YWxseU5vbkVtcHR5Q2hhcmFjdGVyQ291bnQgPiB2aXN1YWxDaGFyYWN0ZXJUaHJlc2hv bGQgJiYgbV9oYXNSZWFjaGVkU2lnbmlmaWNhbnRSZW5kZXJlZFRleHRUaHJlc2hvbGQpCiAgICAg ICAgIHJldHVybjsKIAotICAgICsrbV90ZXh0UmVuZGVyZXJDb3VudEZvclZpc3VhbGx5Tm9uRW1w dHlDaGFyYWN0ZXJzOwotCiAgICAgYXV0byBub25XaGl0ZXNwYWNlTGVuZ3RoID0gW10oYXV0byYg aW5saW5lVGV4dCkgewogICAgICAgICBhdXRvIGxlbmd0aCA9IGlubGluZVRleHQubGVuZ3RoKCk7 CiAgICAgICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBpbmxpbmVUZXh0Lmxlbmd0aCgpOyAr K2kpIHsKQEAgLTQ0MDIsOSArNDM5OSw3IEBAIHZvaWQgRnJhbWVWaWV3OjppbmNyZW1lbnRWaXN1 YWxseU5vbkVtcHR5Q2hhcmFjdGVyQ291bnQoY29uc3QgU3RyaW5nJiBpbmxpbmVUZXh0CiAgICAg ICAgIHJldHVybiBsZW5ndGg7CiAgICAgfTsKICAgICBtX3Zpc3VhbGx5Tm9uRW1wdHlDaGFyYWN0 ZXJDb3VudCArPSBub25XaGl0ZXNwYWNlTGVuZ3RoKGlubGluZVRleHQpOwotCi0gICAgaWYgKCFt X3JlbmRlcmVkU2lnbmlmaWNhbnRBbW91bnRPZlRleHQpCi0gICAgICAgIHVwZGF0ZVNpZ25pZmlj YW50UmVuZGVyZWRUZXh0TWlsZXN0b25lSWZOZWVkZWQoKTsKKyAgICArK21fdGV4dFJlbmRlcmVy Q291bnRGb3JWaXN1YWxseU5vbkVtcHR5Q2hhcmFjdGVyczsKIH0KIAogc3RhdGljIGJvb2wgZWxl bWVudE92ZXJmbG93UmVjdElzTGFyZ2VyVGhhblRocmVzaG9sZChjb25zdCBFbGVtZW50JiBlbGVt ZW50KQpAQCAtNDQ5MCwyOSArNDQ4NSw0MCBAQCBib29sIEZyYW1lVmlldzo6cXVhbGlmaWVzQXNW aXN1YWxseU5vbkVtcHR5KCkgY29uc3QKICAgICByZXR1cm4gZmFsc2U7CiB9CiAKLXZvaWQgRnJh bWVWaWV3Ojp1cGRhdGVTaWduaWZpY2FudFJlbmRlcmVkVGV4dE1pbGVzdG9uZUlmTmVlZGVkKCkK K3ZvaWQgRnJhbWVWaWV3Ojp1cGRhdGVIYXNSZWFjaGVkU2lnbmlmaWNhbnRSZW5kZXJlZFRleHRU aHJlc2hvbGQoKQogewotICAgIGlmIChtX3JlbmRlcmVkU2lnbmlmaWNhbnRBbW91bnRPZlRleHQp Ci0gICAgICAgIHJldHVybjsKLQotICAgIGF1dG8qIGRvY3VtZW50ID0gZnJhbWUoKS5kb2N1bWVu dCgpOwotICAgIGlmICghZG9jdW1lbnQgfHwgZG9jdW1lbnQtPnN0eWxlU2NvcGUoKS5oYXNQZW5k aW5nU2hlZXRzQmVmb3JlQm9keSgpKQorICAgIGlmIChtX2hhc1JlYWNoZWRTaWduaWZpY2FudFJl bmRlcmVkVGV4dFRocmVzaG9sZCkKICAgICAgICAgcmV0dXJuOwogCi0gICAgYXV0byogZG9jdW1l bnRFbGVtZW50ID0gZG9jdW1lbnQtPmRvY3VtZW50RWxlbWVudCgpOwotICAgIGlmICghZG9jdW1l bnRFbGVtZW50IHx8ICFlbGVtZW50T3ZlcmZsb3dSZWN0SXNMYXJnZXJUaGFuVGhyZXNob2xkKCpk b2N1bWVudEVsZW1lbnQpKQorICAgIGF1dG8qIGRvY3VtZW50ID0gZnJhbWUoKS5kb2N1bWVudCgp OyAKKyAgICBpZiAoIWRvY3VtZW50KQogICAgICAgICByZXR1cm47CiAKLSAgICBhdXRvIGNoYXJh Y3RlclRocmVzaG9sZCA9IGRvY3VtZW50LT5oYXNNYWluQXJ0aWNsZUVsZW1lbnQoKSA/IG1haW5B cnRpY2xlU2lnbmlmaWNhbnRSZW5kZXJlZFRleHRDaGFyYWN0ZXJUaHJlc2hvbGQgOiBkZWZhdWx0 U2lnbmlmaWNhbnRSZW5kZXJlZFRleHRDaGFyYWN0ZXJUaHJlc2hvbGQ7Ci0gICAgYXV0byBtZWFu TGVuZ3RoID0gZG9jdW1lbnQtPmhhc01haW5BcnRpY2xlRWxlbWVudCgpID8gbWFpbkFydGljbGVT aWduaWZpY2FudFJlbmRlcmVkVGV4dE1lYW5MZW5ndGggOiBkZWZhdWx0U2lnbmlmaWNhbnRSZW5k ZXJlZFRleHRNZWFuTGVuZ3RoOwotCisgICAgZG9jdW1lbnQtPnVwZGF0ZU1haW5BcnRpY2xlRWxl bWVudEFmdGVyTGF5b3V0KCk7CisgICAgYXV0byBoYXNNYWluQXJ0aWNsZUVsZW1lbnQgPSBkb2N1 bWVudC0+aGFzTWFpbkFydGljbGVFbGVtZW50KCk7CisgICAgYXV0byBjaGFyYWN0ZXJUaHJlc2hv bGQgPSBoYXNNYWluQXJ0aWNsZUVsZW1lbnQgPyBtYWluQXJ0aWNsZVNpZ25pZmljYW50UmVuZGVy ZWRUZXh0Q2hhcmFjdGVyVGhyZXNob2xkIDogZGVmYXVsdFNpZ25pZmljYW50UmVuZGVyZWRUZXh0 Q2hhcmFjdGVyVGhyZXNob2xkOwogICAgIGlmIChtX3Zpc3VhbGx5Tm9uRW1wdHlDaGFyYWN0ZXJD b3VudCA8IGNoYXJhY3RlclRocmVzaG9sZCkKICAgICAgICAgcmV0dXJuOwogCisgICAgYXV0byBt ZWFuTGVuZ3RoID0gaGFzTWFpbkFydGljbGVFbGVtZW50ID8gbWFpbkFydGljbGVTaWduaWZpY2Fu dFJlbmRlcmVkVGV4dE1lYW5MZW5ndGggOiBkZWZhdWx0U2lnbmlmaWNhbnRSZW5kZXJlZFRleHRN ZWFuTGVuZ3RoOwogICAgIGlmICghbV90ZXh0UmVuZGVyZXJDb3VudEZvclZpc3VhbGx5Tm9uRW1w dHlDaGFyYWN0ZXJzIHx8IG1fdmlzdWFsbHlOb25FbXB0eUNoYXJhY3RlckNvdW50IC8gc3RhdGlj X2Nhc3Q8ZmxvYXQ+KG1fdGV4dFJlbmRlcmVyQ291bnRGb3JWaXN1YWxseU5vbkVtcHR5Q2hhcmFj dGVycykgPCBtZWFuTGVuZ3RoKQogICAgICAgICByZXR1cm47CiAKLSAgICBtX3JlbmRlcmVkU2ln bmlmaWNhbnRBbW91bnRPZlRleHQgPSB0cnVlOworICAgIG1faGFzUmVhY2hlZFNpZ25pZmljYW50 UmVuZGVyZWRUZXh0VGhyZXNob2xkID0gdHJ1ZTsKK30KKworYm9vbCBGcmFtZVZpZXc6OnF1YWxp Zmllc0FzU2lnbmlmaWNhbnRSZW5kZXJlZFRleHQoKSBjb25zdAoreworICAgIEFTU0VSVCghbV9y ZW5kZXJlZFNpZ25pZmljYW50QW1vdW50T2ZUZXh0KTsKKyAgICBhdXRvKiBkb2N1bWVudCA9IGZy YW1lKCkuZG9jdW1lbnQoKTsKKyAgICBpZiAoIWRvY3VtZW50IHx8IGRvY3VtZW50LT5zdHlsZVNj b3BlKCkuaGFzUGVuZGluZ1NoZWV0c0JlZm9yZUJvZHkoKSkKKyAgICAgICAgcmV0dXJuIGZhbHNl OworCisgICAgYXV0byogZG9jdW1lbnRFbGVtZW50ID0gZG9jdW1lbnQtPmRvY3VtZW50RWxlbWVu dCgpOworICAgIGlmICghZG9jdW1lbnRFbGVtZW50IHx8ICFlbGVtZW50T3ZlcmZsb3dSZWN0SXNM YXJnZXJUaGFuVGhyZXNob2xkKCpkb2N1bWVudEVsZW1lbnQpKQorICAgICAgICByZXR1cm4gZmFs c2U7CisKKyAgICByZXR1cm4gbV9oYXNSZWFjaGVkU2lnbmlmaWNhbnRSZW5kZXJlZFRleHRUaHJl c2hvbGQ7CiB9CiAKIGJvb2wgRnJhbWVWaWV3Ojppc1ZpZXdGb3JEb2N1bWVudEluRnJhbWUoKSBj b25zdApAQCAtNTEzNiw3ICs1MTQyLDYgQEAgdm9pZCBGcmFtZVZpZXc6OmZpcmVMYXlvdXRSZWxh dGVkTWlsZXN0b25lc0lmTmVlZGVkKCkKICAgICAgICAgaWYgKGZyYW1lKCkuaXNNYWluRnJhbWUo KSkKICAgICAgICAgICAgIHBhZ2UtPnN0YXJ0Q291bnRpbmdSZWxldmFudFJlcGFpbnRlZE9iamVj dHMoKTsKICAgICB9Ci0gICAgdXBkYXRlU2lnbmlmaWNhbnRSZW5kZXJlZFRleHRNaWxlc3RvbmVJ Zk5lZWRlZCgpOwogCiAgICAgaWYgKCFtX2lzVmlzdWFsbHlOb25FbXB0eSAmJiBxdWFsaWZpZXNB c1Zpc3VhbGx5Tm9uRW1wdHkoKSkgewogICAgICAgICBtX2lzVmlzdWFsbHlOb25FbXB0eSA9IHRy dWU7CkBAIC01MTQ1LDggKzUxNTAsOCBAQCB2b2lkIEZyYW1lVmlldzo6ZmlyZUxheW91dFJlbGF0 ZWRNaWxlc3RvbmVzSWZOZWVkZWQoKQogICAgICAgICAgICAgbWlsZXN0b25lc0FjaGlldmVkLmFk ZChEaWRGaXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXQpOwogICAgIH0KIAotICAgIGlmIChtX3Jl bmRlcmVkU2lnbmlmaWNhbnRBbW91bnRPZlRleHQgJiYgbV9zaWduaWZpY2FudFJlbmRlcmVkVGV4 dE1pbGVzdG9uZVBlbmRpbmcpIHsKLSAgICAgICAgbV9zaWduaWZpY2FudFJlbmRlcmVkVGV4dE1p bGVzdG9uZVBlbmRpbmcgPSBmYWxzZTsKKyAgICBpZiAoIW1fcmVuZGVyZWRTaWduaWZpY2FudEFt b3VudE9mVGV4dCAmJiBxdWFsaWZpZXNBc1NpZ25pZmljYW50UmVuZGVyZWRUZXh0KCkpIHsKKyAg ICAgICAgbV9yZW5kZXJlZFNpZ25pZmljYW50QW1vdW50T2ZUZXh0ID0gdHJ1ZTsKICAgICAgICAg aWYgKHJlcXVlc3RlZE1pbGVzdG9uZXMgJiBEaWRSZW5kZXJTaWduaWZpY2FudEFtb3VudE9mVGV4 dCkKICAgICAgICAgICAgIG1pbGVzdG9uZXNBY2hpZXZlZC5hZGQoRGlkUmVuZGVyU2lnbmlmaWNh bnRBbW91bnRPZlRleHQpOwogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv RnJhbWVWaWV3LmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5oCmluZGV4IGU4OWJk OGU5N2IyYjc4NmM1NTg4NTI1ODNlNjg0OTQ0ZWQ2NGE0YzQuLjFiMmZlMTAwYjVjN2U1ZTlhNDFi ZDFiZWQxOGIxMDE5NzhlZjY5NTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJh bWVWaWV3LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuaApAQCAtNzkzLDYg Kzc5Myw5IEBAIHByaXZhdGU6CiAgICAgdm9pZCBtYXJrUm9vdE9yQm9keVJlbmRlcmVyRGlydHko KSBjb25zdDsKIAogICAgIGJvb2wgcXVhbGlmaWVzQXNWaXN1YWxseU5vbkVtcHR5KCkgY29uc3Q7 CisgICAgYm9vbCBxdWFsaWZpZXNBc1NpZ25pZmljYW50UmVuZGVyZWRUZXh0KCkgY29uc3Q7Cisg ICAgdm9pZCB1cGRhdGVIYXNSZWFjaGVkU2lnbmlmaWNhbnRSZW5kZXJlZFRleHRUaHJlc2hvbGQo KTsKKwogICAgIGJvb2wgaXNWaWV3Rm9yRG9jdW1lbnRJbkZyYW1lKCkgY29uc3Q7CiAKICAgICBB WE9iamVjdENhY2hlKiBheE9iamVjdENhY2hlKCkgY29uc3Q7CkBAIC04ODMsOCArODg2LDggQEAg cHJpdmF0ZToKICAgICB1bnNpZ25lZCBtX3Zpc3VhbGx5Tm9uRW1wdHlQaXhlbENvdW50IHsgMCB9 OwogCiAgICAgdW5zaWduZWQgbV90ZXh0UmVuZGVyZXJDb3VudEZvclZpc3VhbGx5Tm9uRW1wdHlD aGFyYWN0ZXJzIHsgMCB9OwotICAgIGJvb2wgbV9yZW5kZXJlZFNpZ25pZmljYW50QW1vdW50T2ZU ZXh0OwotICAgIGJvb2wgbV9zaWduaWZpY2FudFJlbmRlcmVkVGV4dE1pbGVzdG9uZVBlbmRpbmc7 CisgICAgYm9vbCBtX3JlbmRlcmVkU2lnbmlmaWNhbnRBbW91bnRPZlRleHQgeyBmYWxzZSB9Owor ICAgIGJvb2wgbV9oYXNSZWFjaGVkU2lnbmlmaWNhbnRSZW5kZXJlZFRleHRUaHJlc2hvbGQgeyBm YWxzZSB9OwogCiAgICAgYm9vbCBtX25lZWRzRGVmZXJyZWRTY3JvbGxiYXJzVXBkYXRlIHsgZmFs c2UgfTsKIAo= 360164 2019-01-25 14:27:31 -0800 2019-01-25 15:40:29 -0800 Patch bug-193842-20190125142725.patch text/plain 8567 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjQwNDk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTQ5ZDZkMTZiOWNmNjYx NTBkZGMwNjZiMDllZjc5NTgyYTU5ODA0Ny4uOTM5NGQ3ODVmOGYzNzdlNDViMzcxNzQ2Y2VjMGMz NzIwZmIxMmNiYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE5LTAxLTI1ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgUmVtb3ZlIEZyYW1lVmlldzo6 bV9zaWduaWZpY2FudFJlbmRlcmVkVGV4dE1pbGVzdG9uZVBlbmRpbmcKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5Mzg0MgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEN1cnJlbnRseSB3ZSBrZWVwIHByb2Nl c3NpbmcgdGhlIGluY29taW5nIHRleHQgY29udGVudCB1bnRpbCBhZnRlciB0aGUgIlNpZ25pZmlj YW50UmVuZGVyZWRUZXh0TWlsZXN0b25lIiBoYXMgYmVlbiByZWFjaGVkLgorICAgICAgICBXZSBj YW4gYWN0dWFsbHkgc3RvcCBkb2luZyBpdCByaWdodCB3aGVuIHRoZSB0ZXh0IGNvbnRlbnQgaXMg YWJvdmUgdGhlIHRocmVzaG9sZCAocmVnYXJkbGVzcyBvZiB3aGV0aGVyIGFsbCB0aGUgY29uZGl0 aW9ucyBhcmUgbWV0IGZvciB0aGUgbWlsZXN0b25lKS4KKyAgICAgICAgVGhpcyBwYXRjaCBhbHNv IGVuc3VyZXMgdGhhdCB3ZSBkb24ndCB1cGRhdGUgRG9jdW1lbnQ6Om1fbWFpbkFydGljbGVFbGVt ZW50IG9uY2UgdGhlIHRocmVzaG9sZCBpcyByZWFjaGVkLgorCisgICAgICAgICogcGFnZS9GcmFt ZVZpZXcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVWaWV3OjpyZXNldExheW91dE1pbGVz dG9uZXMpOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVWaWV3OjppbmNyZW1lbnRWaXN1YWxseU5v bkVtcHR5Q2hhcmFjdGVyQ291bnQpOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVWaWV3OjpoYXNS ZWFjaGVkU2lnbmlmaWNhbnRSZW5kZXJlZFRleHRUaHJlYXNob2xkKToKKyAgICAgICAgKFdlYkNv cmU6OkZyYW1lVmlldzo6cXVhbGlmaWVzQXNTaWduaWZpY2FudFJlbmRlcmVkVGV4dCBjb25zdCk6 CisgICAgICAgIChXZWJDb3JlOjpGcmFtZVZpZXc6OmZpcmVMYXlvdXRSZWxhdGVkTWlsZXN0b25l c0lmTmVlZGVkKToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6dXBkYXRlU2lnbmlmaWNh bnRSZW5kZXJlZFRleHRNaWxlc3RvbmVJZk5lZWRlZCk6IERlbGV0ZWQuCisgICAgICAgICogcGFn ZS9GcmFtZVZpZXcuaDoKKwogMjAxOS0wMS0yNSAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUu Y29tPgogCiAgICAgICAgIFJlbW92ZSBGcmFtZVZpZXc6Om1fZmlyc3RWaXN1YWxseU5vbkVtcHR5 TGF5b3V0Q2FsbGJhY2tQZW5kaW5nCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0Zy YW1lVmlldy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKaW5kZXggNGUz N2JhYTVjOWVkNDMxMWY0MmZmNDBhYzQzY2IyYmI0OTkxZjAyNi4uYzkzYjA0ZWI2YTk0M2JjNjI0 NzRlYTRmZTU5YjUyYmQ1NGVkOWE1ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9G cmFtZVZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcApAQCAt MjkzLDcgKzI5Myw3IEBAIHZvaWQgRnJhbWVWaWV3OjpyZXNldExheW91dE1pbGVzdG9uZXMoKQog ewogICAgIG1fZmlyc3RMYXlvdXRDYWxsYmFja1BlbmRpbmcgPSBmYWxzZTsKICAgICBtX2lzVmlz dWFsbHlOb25FbXB0eSA9IGZhbHNlOwotICAgIG1fc2lnbmlmaWNhbnRSZW5kZXJlZFRleHRNaWxl c3RvbmVQZW5kaW5nID0gdHJ1ZTsKKyAgICBtX2hhc1JlYWNoZWRTaWduaWZpY2FudFJlbmRlcmVk VGV4dFRocmVzaG9sZCA9IGZhbHNlOwogICAgIG1fcmVuZGVyZWRTaWduaWZpY2FudEFtb3VudE9m VGV4dCA9IGZhbHNlOwogICAgIG1fdmlzdWFsbHlOb25FbXB0eUNoYXJhY3RlckNvdW50ID0gMDsK ICAgICBtX3Zpc3VhbGx5Tm9uRW1wdHlQaXhlbENvdW50ID0gMDsKQEAgLTMzMDcsOCArMzMwNyw3 IEBAIHZvaWQgRnJhbWVWaWV3OjpwZXJmb3JtUG9zdExheW91dFRhc2tzKCkKIHsKICAgICAvLyBG SVhNRTogV2Ugc2hvdWxkIG5vdCBydW4gYW55IEphdmFTY3JpcHQgY29kZSBpbiB0aGlzIGZ1bmN0 aW9uLgogICAgIExPRyhMYXlvdXQsICJGcmFtZVZpZXcgJXAgcGVyZm9ybVBvc3RMYXlvdXRUYXNr cyIsIHRoaXMpOwotCi0gICAgZnJhbWUoKS5kb2N1bWVudCgpLT51cGRhdGVNYWluQXJ0aWNsZUVs ZW1lbnRBZnRlckxheW91dCgpOworICAgIHVwZGF0ZUhhc1JlYWNoZWRTaWduaWZpY2FudFJlbmRl cmVkVGV4dFRocmVzaG9sZCgpOwogICAgIGZyYW1lKCkuc2VsZWN0aW9uKCkudXBkYXRlQXBwZWFy YW5jZUFmdGVyTGF5b3V0KCk7CiAKICAgICBmbHVzaFBvc3RMYXlvdXRUYXNrc1F1ZXVlKCk7CkBA IC00Mzg3LDExICs0Mzg2LDkgQEAgdm9pZCBGcmFtZVZpZXc6OnVwZGF0ZUxheW91dEFuZFN0eWxl SWZOZWVkZWRSZWN1cnNpdmUoKQogCiB2b2lkIEZyYW1lVmlldzo6aW5jcmVtZW50VmlzdWFsbHlO b25FbXB0eUNoYXJhY3RlckNvdW50KGNvbnN0IFN0cmluZyYgaW5saW5lVGV4dCkKIHsKLSAgICBp ZiAobV92aXN1YWxseU5vbkVtcHR5Q2hhcmFjdGVyQ291bnQgPiB2aXN1YWxDaGFyYWN0ZXJUaHJl c2hvbGQgJiYgbV9yZW5kZXJlZFNpZ25pZmljYW50QW1vdW50T2ZUZXh0KQorICAgIGlmIChtX3Zp c3VhbGx5Tm9uRW1wdHlDaGFyYWN0ZXJDb3VudCA+IHZpc3VhbENoYXJhY3RlclRocmVzaG9sZCAm JiBtX2hhc1JlYWNoZWRTaWduaWZpY2FudFJlbmRlcmVkVGV4dFRocmVzaG9sZCkKICAgICAgICAg cmV0dXJuOwogCi0gICAgKyttX3RleHRSZW5kZXJlckNvdW50Rm9yVmlzdWFsbHlOb25FbXB0eUNo YXJhY3RlcnM7Ci0KICAgICBhdXRvIG5vbldoaXRlc3BhY2VMZW5ndGggPSBbXShhdXRvJiBpbmxp bmVUZXh0KSB7CiAgICAgICAgIGF1dG8gbGVuZ3RoID0gaW5saW5lVGV4dC5sZW5ndGgoKTsKICAg ICAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IGlubGluZVRleHQubGVuZ3RoKCk7ICsraSkg ewpAQCAtNDQwMiw5ICs0Mzk5LDcgQEAgdm9pZCBGcmFtZVZpZXc6OmluY3JlbWVudFZpc3VhbGx5 Tm9uRW1wdHlDaGFyYWN0ZXJDb3VudChjb25zdCBTdHJpbmcmIGlubGluZVRleHQKICAgICAgICAg cmV0dXJuIGxlbmd0aDsKICAgICB9OwogICAgIG1fdmlzdWFsbHlOb25FbXB0eUNoYXJhY3RlckNv dW50ICs9IG5vbldoaXRlc3BhY2VMZW5ndGgoaW5saW5lVGV4dCk7Ci0KLSAgICBpZiAoIW1fcmVu ZGVyZWRTaWduaWZpY2FudEFtb3VudE9mVGV4dCkKLSAgICAgICAgdXBkYXRlU2lnbmlmaWNhbnRS ZW5kZXJlZFRleHRNaWxlc3RvbmVJZk5lZWRlZCgpOworICAgICsrbV90ZXh0UmVuZGVyZXJDb3Vu dEZvclZpc3VhbGx5Tm9uRW1wdHlDaGFyYWN0ZXJzOwogfQogCiBzdGF0aWMgYm9vbCBlbGVtZW50 T3ZlcmZsb3dSZWN0SXNMYXJnZXJUaGFuVGhyZXNob2xkKGNvbnN0IEVsZW1lbnQmIGVsZW1lbnQp CkBAIC00NDE4LDYgKzQ0MTMsNDIgQEAgc3RhdGljIGJvb2wgZWxlbWVudE92ZXJmbG93UmVjdElz TGFyZ2VyVGhhblRocmVzaG9sZChjb25zdCBFbGVtZW50JiBlbGVtZW50KQogICAgIHJldHVybiBm YWxzZTsKIH0KIAordm9pZCBGcmFtZVZpZXc6OnVwZGF0ZUhhc1JlYWNoZWRTaWduaWZpY2FudFJl bmRlcmVkVGV4dFRocmVzaG9sZCgpCit7CisgICAgaWYgKG1faGFzUmVhY2hlZFNpZ25pZmljYW50 UmVuZGVyZWRUZXh0VGhyZXNob2xkKQorICAgICAgICByZXR1cm47CisKKyAgICBhdXRvKiBkb2N1 bWVudCA9IGZyYW1lKCkuZG9jdW1lbnQoKTsKKyAgICBpZiAoIWRvY3VtZW50KQorICAgICAgICBy ZXR1cm47CisKKyAgICBkb2N1bWVudC0+dXBkYXRlTWFpbkFydGljbGVFbGVtZW50QWZ0ZXJMYXlv dXQoKTsKKyAgICBhdXRvIGhhc01haW5BcnRpY2xlRWxlbWVudCA9IGRvY3VtZW50LT5oYXNNYWlu QXJ0aWNsZUVsZW1lbnQoKTsKKyAgICBhdXRvIGNoYXJhY3RlclRocmVzaG9sZCA9IGhhc01haW5B cnRpY2xlRWxlbWVudCA/IG1haW5BcnRpY2xlU2lnbmlmaWNhbnRSZW5kZXJlZFRleHRDaGFyYWN0 ZXJUaHJlc2hvbGQgOiBkZWZhdWx0U2lnbmlmaWNhbnRSZW5kZXJlZFRleHRDaGFyYWN0ZXJUaHJl c2hvbGQ7CisgICAgaWYgKG1fdmlzdWFsbHlOb25FbXB0eUNoYXJhY3RlckNvdW50IDwgY2hhcmFj dGVyVGhyZXNob2xkKQorICAgICAgICByZXR1cm47CisKKyAgICBhdXRvIG1lYW5MZW5ndGggPSBo YXNNYWluQXJ0aWNsZUVsZW1lbnQgPyBtYWluQXJ0aWNsZVNpZ25pZmljYW50UmVuZGVyZWRUZXh0 TWVhbkxlbmd0aCA6IGRlZmF1bHRTaWduaWZpY2FudFJlbmRlcmVkVGV4dE1lYW5MZW5ndGg7Cisg ICAgaWYgKCFtX3RleHRSZW5kZXJlckNvdW50Rm9yVmlzdWFsbHlOb25FbXB0eUNoYXJhY3RlcnMg fHwgbV92aXN1YWxseU5vbkVtcHR5Q2hhcmFjdGVyQ291bnQgLyBzdGF0aWNfY2FzdDxmbG9hdD4o bV90ZXh0UmVuZGVyZXJDb3VudEZvclZpc3VhbGx5Tm9uRW1wdHlDaGFyYWN0ZXJzKSA8IG1lYW5M ZW5ndGgpCisgICAgICAgIHJldHVybjsKKworICAgIG1faGFzUmVhY2hlZFNpZ25pZmljYW50UmVu ZGVyZWRUZXh0VGhyZXNob2xkID0gdHJ1ZTsKK30KKworYm9vbCBGcmFtZVZpZXc6OnF1YWxpZmll c0FzU2lnbmlmaWNhbnRSZW5kZXJlZFRleHQoKSBjb25zdAoreworICAgIEFTU0VSVCghbV9yZW5k ZXJlZFNpZ25pZmljYW50QW1vdW50T2ZUZXh0KTsKKyAgICBhdXRvKiBkb2N1bWVudCA9IGZyYW1l KCkuZG9jdW1lbnQoKTsKKyAgICBpZiAoIWRvY3VtZW50IHx8IGRvY3VtZW50LT5zdHlsZVNjb3Bl KCkuaGFzUGVuZGluZ1NoZWV0c0JlZm9yZUJvZHkoKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOwor CisgICAgYXV0byogZG9jdW1lbnRFbGVtZW50ID0gZG9jdW1lbnQtPmRvY3VtZW50RWxlbWVudCgp OworICAgIGlmICghZG9jdW1lbnRFbGVtZW50IHx8ICFlbGVtZW50T3ZlcmZsb3dSZWN0SXNMYXJn ZXJUaGFuVGhyZXNob2xkKCpkb2N1bWVudEVsZW1lbnQpKQorICAgICAgICByZXR1cm4gZmFsc2U7 CisKKyAgICByZXR1cm4gbV9oYXNSZWFjaGVkU2lnbmlmaWNhbnRSZW5kZXJlZFRleHRUaHJlc2hv bGQ7Cit9CisKIGJvb2wgRnJhbWVWaWV3OjpxdWFsaWZpZXNBc1Zpc3VhbGx5Tm9uRW1wdHkoKSBj b25zdAogewogICAgIC8vIE5vIGNvbnRlbnQgeWV0LgpAQCAtNDQ5MCwzMSArNDUyMSw2IEBAIGJv b2wgRnJhbWVWaWV3OjpxdWFsaWZpZXNBc1Zpc3VhbGx5Tm9uRW1wdHkoKSBjb25zdAogICAgIHJl dHVybiBmYWxzZTsKIH0KIAotdm9pZCBGcmFtZVZpZXc6OnVwZGF0ZVNpZ25pZmljYW50UmVuZGVy ZWRUZXh0TWlsZXN0b25lSWZOZWVkZWQoKQotewotICAgIGlmIChtX3JlbmRlcmVkU2lnbmlmaWNh bnRBbW91bnRPZlRleHQpCi0gICAgICAgIHJldHVybjsKLQotICAgIGF1dG8qIGRvY3VtZW50ID0g ZnJhbWUoKS5kb2N1bWVudCgpOwotICAgIGlmICghZG9jdW1lbnQgfHwgZG9jdW1lbnQtPnN0eWxl U2NvcGUoKS5oYXNQZW5kaW5nU2hlZXRzQmVmb3JlQm9keSgpKQotICAgICAgICByZXR1cm47Ci0K LSAgICBhdXRvKiBkb2N1bWVudEVsZW1lbnQgPSBkb2N1bWVudC0+ZG9jdW1lbnRFbGVtZW50KCk7 Ci0gICAgaWYgKCFkb2N1bWVudEVsZW1lbnQgfHwgIWVsZW1lbnRPdmVyZmxvd1JlY3RJc0xhcmdl clRoYW5UaHJlc2hvbGQoKmRvY3VtZW50RWxlbWVudCkpCi0gICAgICAgIHJldHVybjsKLQotICAg IGF1dG8gY2hhcmFjdGVyVGhyZXNob2xkID0gZG9jdW1lbnQtPmhhc01haW5BcnRpY2xlRWxlbWVu dCgpID8gbWFpbkFydGljbGVTaWduaWZpY2FudFJlbmRlcmVkVGV4dENoYXJhY3RlclRocmVzaG9s ZCA6IGRlZmF1bHRTaWduaWZpY2FudFJlbmRlcmVkVGV4dENoYXJhY3RlclRocmVzaG9sZDsKLSAg ICBhdXRvIG1lYW5MZW5ndGggPSBkb2N1bWVudC0+aGFzTWFpbkFydGljbGVFbGVtZW50KCkgPyBt YWluQXJ0aWNsZVNpZ25pZmljYW50UmVuZGVyZWRUZXh0TWVhbkxlbmd0aCA6IGRlZmF1bHRTaWdu aWZpY2FudFJlbmRlcmVkVGV4dE1lYW5MZW5ndGg7Ci0KLSAgICBpZiAobV92aXN1YWxseU5vbkVt cHR5Q2hhcmFjdGVyQ291bnQgPCBjaGFyYWN0ZXJUaHJlc2hvbGQpCi0gICAgICAgIHJldHVybjsK LQotICAgIGlmICghbV90ZXh0UmVuZGVyZXJDb3VudEZvclZpc3VhbGx5Tm9uRW1wdHlDaGFyYWN0 ZXJzIHx8IG1fdmlzdWFsbHlOb25FbXB0eUNoYXJhY3RlckNvdW50IC8gc3RhdGljX2Nhc3Q8Zmxv YXQ+KG1fdGV4dFJlbmRlcmVyQ291bnRGb3JWaXN1YWxseU5vbkVtcHR5Q2hhcmFjdGVycykgPCBt ZWFuTGVuZ3RoKQotICAgICAgICByZXR1cm47Ci0KLSAgICBtX3JlbmRlcmVkU2lnbmlmaWNhbnRB bW91bnRPZlRleHQgPSB0cnVlOwotfQotCiBib29sIEZyYW1lVmlldzo6aXNWaWV3Rm9yRG9jdW1l bnRJbkZyYW1lKCkgY29uc3QKIHsKICAgICBSZW5kZXJWaWV3KiByZW5kZXJWaWV3ID0gdGhpcy0+ cmVuZGVyVmlldygpOwpAQCAtNTEzNiw3ICs1MTQyLDYgQEAgdm9pZCBGcmFtZVZpZXc6OmZpcmVM YXlvdXRSZWxhdGVkTWlsZXN0b25lc0lmTmVlZGVkKCkKICAgICAgICAgaWYgKGZyYW1lKCkuaXNN YWluRnJhbWUoKSkKICAgICAgICAgICAgIHBhZ2UtPnN0YXJ0Q291bnRpbmdSZWxldmFudFJlcGFp bnRlZE9iamVjdHMoKTsKICAgICB9Ci0gICAgdXBkYXRlU2lnbmlmaWNhbnRSZW5kZXJlZFRleHRN aWxlc3RvbmVJZk5lZWRlZCgpOwogCiAgICAgaWYgKCFtX2lzVmlzdWFsbHlOb25FbXB0eSAmJiBx dWFsaWZpZXNBc1Zpc3VhbGx5Tm9uRW1wdHkoKSkgewogICAgICAgICBtX2lzVmlzdWFsbHlOb25F bXB0eSA9IHRydWU7CkBAIC01MTQ1LDggKzUxNTAsOCBAQCB2b2lkIEZyYW1lVmlldzo6ZmlyZUxh eW91dFJlbGF0ZWRNaWxlc3RvbmVzSWZOZWVkZWQoKQogICAgICAgICAgICAgbWlsZXN0b25lc0Fj aGlldmVkLmFkZChEaWRGaXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXQpOwogICAgIH0KIAotICAg IGlmIChtX3JlbmRlcmVkU2lnbmlmaWNhbnRBbW91bnRPZlRleHQgJiYgbV9zaWduaWZpY2FudFJl bmRlcmVkVGV4dE1pbGVzdG9uZVBlbmRpbmcpIHsKLSAgICAgICAgbV9zaWduaWZpY2FudFJlbmRl cmVkVGV4dE1pbGVzdG9uZVBlbmRpbmcgPSBmYWxzZTsKKyAgICBpZiAoIW1fcmVuZGVyZWRTaWdu aWZpY2FudEFtb3VudE9mVGV4dCAmJiBxdWFsaWZpZXNBc1NpZ25pZmljYW50UmVuZGVyZWRUZXh0 KCkpIHsKKyAgICAgICAgbV9yZW5kZXJlZFNpZ25pZmljYW50QW1vdW50T2ZUZXh0ID0gdHJ1ZTsK ICAgICAgICAgaWYgKHJlcXVlc3RlZE1pbGVzdG9uZXMgJiBEaWRSZW5kZXJTaWduaWZpY2FudEFt b3VudE9mVGV4dCkKICAgICAgICAgICAgIG1pbGVzdG9uZXNBY2hpZXZlZC5hZGQoRGlkUmVuZGVy U2lnbmlmaWNhbnRBbW91bnRPZlRleHQpOwogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BhZ2UvRnJhbWVWaWV3LmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5oCmlu ZGV4IGU4OWJkOGU5N2IyYjc4NmM1NTg4NTI1ODNlNjg0OTQ0ZWQ2NGE0YzQuLjFiMmZlMTAwYjVj N2U1ZTlhNDFiZDFiZWQxOGIxMDE5NzhlZjY5NTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BhZ2UvRnJhbWVWaWV3LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuaApA QCAtNzkzLDYgKzc5Myw5IEBAIHByaXZhdGU6CiAgICAgdm9pZCBtYXJrUm9vdE9yQm9keVJlbmRl cmVyRGlydHkoKSBjb25zdDsKIAogICAgIGJvb2wgcXVhbGlmaWVzQXNWaXN1YWxseU5vbkVtcHR5 KCkgY29uc3Q7CisgICAgYm9vbCBxdWFsaWZpZXNBc1NpZ25pZmljYW50UmVuZGVyZWRUZXh0KCkg Y29uc3Q7CisgICAgdm9pZCB1cGRhdGVIYXNSZWFjaGVkU2lnbmlmaWNhbnRSZW5kZXJlZFRleHRU aHJlc2hvbGQoKTsKKwogICAgIGJvb2wgaXNWaWV3Rm9yRG9jdW1lbnRJbkZyYW1lKCkgY29uc3Q7 CiAKICAgICBBWE9iamVjdENhY2hlKiBheE9iamVjdENhY2hlKCkgY29uc3Q7CkBAIC04ODMsOCAr ODg2LDggQEAgcHJpdmF0ZToKICAgICB1bnNpZ25lZCBtX3Zpc3VhbGx5Tm9uRW1wdHlQaXhlbENv dW50IHsgMCB9OwogCiAgICAgdW5zaWduZWQgbV90ZXh0UmVuZGVyZXJDb3VudEZvclZpc3VhbGx5 Tm9uRW1wdHlDaGFyYWN0ZXJzIHsgMCB9OwotICAgIGJvb2wgbV9yZW5kZXJlZFNpZ25pZmljYW50 QW1vdW50T2ZUZXh0OwotICAgIGJvb2wgbV9zaWduaWZpY2FudFJlbmRlcmVkVGV4dE1pbGVzdG9u ZVBlbmRpbmc7CisgICAgYm9vbCBtX3JlbmRlcmVkU2lnbmlmaWNhbnRBbW91bnRPZlRleHQgeyBm YWxzZSB9OworICAgIGJvb2wgbV9oYXNSZWFjaGVkU2lnbmlmaWNhbnRSZW5kZXJlZFRleHRUaHJl c2hvbGQgeyBmYWxzZSB9OwogCiAgICAgYm9vbCBtX25lZWRzRGVmZXJyZWRTY3JvbGxiYXJzVXBk YXRlIHsgZmFsc2UgfTsKIAo=