184336 2018-04-05 11:26:16 -0700 When recording the drawing, the DisplayList should be initialized with the GraphicsContextState of the underlying GraphicsContext 2018-04-06 12:20:33 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 178750 1 sabouhallawa sabouhallawa bfulgham cdumez commit-queue esprehn+autocc ews-watchlist gyuyoung.kim koivisto mmaxfield simon.fraser thorton webkit-bug-importer zalan oldest_to_newest 1412115 0 sabouhallawa 2018-04-05 11:26:16 -0700 The state of the drawing context has to be transfered to the recording DisplayList before recording. Many recording GraphicsContext functions will behave wrongly if get the default state. Here is a scenario of the bug: -- context.m_state.fillColor = RED (context is the underlying GraphicsContext for the recorded DisplayList) -- displayListRecorder is created to start recording. -- displayListRecorder.m_stateStack[0].lastDrawingState.fillColor = BALCK (Because lastDrawingState was initialized by the default GraphicsContextState) -- displayListContext is created which encapsulates the displayListRecorder -- displayListContext.setFillColor(BALCK) is called -- displayListContext.fillRect(rect) is called -- displayListRecorder is replayed back into context Result: -- displayListContext.fillRect() will end up calling Recorder::willAppendItem() which will call GraphicsContextStateChange::changesFromState() -- GraphicsContextStateChange::changesFromState() will not find a change in the fillColor. The recording GraphicsContext has it BALCK and it was BALCK. So there is no change here and the flag FillColorChange will not be returned -- Recorder::willAppendItem() will not append a new SetState item in the DisplayList -- The rectangle is filled with the current fillColor which is RED instead of BALCK as the caller wanted 1412116 1 337281 sabouhallawa 2018-04-05 11:36:09 -0700 Created attachment 337281 Patch 1412117 2 337282 sabouhallawa 2018-04-05 11:43:21 -0700 Created attachment 337282 Patch 1412431 3 337282 commit-queue 2018-04-06 12:19:46 -0700 Comment on attachment 337282 Patch Clearing flags on attachment: 337282 Committed r230347: <https://trac.webkit.org/changeset/230347> 1412432 4 commit-queue 2018-04-06 12:19:48 -0700 All reviewed patches have been landed. Closing bug. 1412433 5 webkit-bug-importer 2018-04-06 12:20:33 -0700 <rdar://problem/39245569> 337281 2018-04-05 11:36:09 -0700 2018-04-05 11:43:20 -0700 Patch bug-184336-20180405113609.patch text/plain 8332 sabouhallawa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIzMDMwNCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMxIEBACisyMDE4LTA0LTA1ICBTYWlkIEFi b3UtSGFsbGF3YSAgPHNhYm91aGFsbGF3YUBhcHBsZS5jb20+CisKKyAgICAgICAgV2hlbiByZWNv ZGluZyB0aGUgZHJhd2luZywgdGhlIERpc3BsYXlMaXN0IHNob3VsZCBiZSBpbml0aWFsaXplZCB3 aXRoIHRoZSBHcmFwaGljc0NvbnRleHRTdGF0ZSBvZiB0aGUgdW5kZXJseWluZyBHcmFwaGljc0Nv bnRleHQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4 NDMzNgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRo ZSBzdGF0ZSBvZiB0aGUgZHJhd2luZyBjb250ZXh0IGhhcyB0byBiZSB0cmFuc2ZlcmVkIHRvIHRo ZSByZWNvcmRpbmcgCisgICAgICAgIERpc3BsYXlMaXN0IGJlZm9yZSByZWNvcmRpbmcuIE1hbnkg cmVjb3JkaW5nIEdyYXBoaWNzQ29udGV4dCBmdW5jdGlvbnMgCisgICAgICAgIHdpbGwgYmVoYXZl IHdyb25nbHkgaWYgaXQgZ2V0cyB0aGUgZGVmYXVsdCBzdGF0ZS4KKworICAgICAgICAqIGh0bWwv Y2FudmFzL0NhbnZhc1JlbmRlcmluZ0NvbnRleHQyREJhc2UuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6RGlzcGxheUxpc3REcmF3aW5nQ29udGV4dDo6RGlzcGxheUxpc3REcmF3aW5nQ29udGV4dCk6 CisgICAgICAgIChXZWJDb3JlOjpDYW52YXNSZW5kZXJpbmdDb250ZXh0MkRCYXNlOjpkcmF3aW5n Q29udGV4dCBjb25zdCk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2EvR3JhcGhpY3NM YXllckNBLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXJDQTo6cmVjdXJzaXZl Q29tbWl0Q2hhbmdlcyk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZGlzcGxheWxpc3Rz L0Rpc3BsYXlMaXN0UmVjb3JkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RGlzcGxheUxpc3Q6 OlJlY29yZGVyOjpSZWNvcmRlcik6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZGlzcGxh eWxpc3RzL0Rpc3BsYXlMaXN0UmVjb3JkZXIuaDoKKyAgICAgICAgKFdlYkNvcmU6OkRpc3BsYXlM aXN0OjpSZWNvcmRlcjo6Q29udGV4dFN0YXRlOjpDb250ZXh0U3RhdGUpOgorICAgICAgICAoV2Vi Q29yZTo6RGlzcGxheUxpc3Q6OlJlY29yZGVyOjpDb250ZXh0U3RhdGU6OmNsb25lRm9yU2F2ZSBj b25zdCk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZGlzcGxheWxpc3RzL0Rpc3BsYXlM aXN0UmVwbGF5ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RGlzcGxheUxpc3Q6OlJlcGxheWVy OjpyZXBsYXkpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Rpc3BsYXlsaXN0cy9EaXNw bGF5TGlzdFJlcGxheWVyLmg6CisgICAgICAgIChXZWJDb3JlOjpEaXNwbGF5TGlzdDo6UmVwbGF5 ZXI6OnJlcGxheSk6IElmIHdlIGRvIG5vdCBoYXZlIGEgY2xpcHBpbmcKKyAgICAgICAgcmVjdGFu Z2xlIGFuZCB3ZSB3YW50IHRvIHJlY29yZCBhbGwgdGhlIGRyYXdpbmcsIHdlIG5lZWQgYSBkZWZh dWx0IHZhbHVlCisgICAgICAgIGZvciB0aGUgY2xpcHBpbmcgcmVjdGFuZ2xlIGFuZCB3ZSB3YW50 IG5vIGNsaXBwaW5nIHRvIGhhcHBlbi4KKwogMjAxOC0wNC0wNSAgWXVzdWtlIFN1enVraSAgPHV0 YXRhbmUudGVhQGdtYWlsLmNvbT4KIAogICAgICAgICBbV1RGXSBSZW1vdmUgU3RhdGljTG9jawpJ bmRleDogU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJE QmFzZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvQ2FudmFz UmVuZGVyaW5nQ29udGV4dDJEQmFzZS5jcHAJKHJldmlzaW9uIDIzMDI3NCkKKysrIFNvdXJjZS9X ZWJDb3JlL2h0bWwvY2FudmFzL0NhbnZhc1JlbmRlcmluZ0NvbnRleHQyREJhc2UuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC04Nyw5ICs4Nyw5IEBAIHB1YmxpYzoKICAgICBHcmFwaGljc0NvbnRleHQg Y29udGV4dDsKICAgICBEaXNwbGF5TGlzdDo6RGlzcGxheUxpc3QgZGlzcGxheUxpc3Q7CiAgICAg Ci0gICAgRGlzcGxheUxpc3REcmF3aW5nQ29udGV4dChjb25zdCBGbG9hdFJlY3QmIGNsaXApCi0g ICAgICAgIDogY29udGV4dChbJl0oR3JhcGhpY3NDb250ZXh0JiBjb250ZXh0KSB7Ci0gICAgICAg ICAgICByZXR1cm4gc3RkOjptYWtlX3VuaXF1ZTxEaXNwbGF5TGlzdDo6UmVjb3JkZXI+KGNvbnRl eHQsIGRpc3BsYXlMaXN0LCBjbGlwLCBBZmZpbmVUcmFuc2Zvcm0oKSk7CisgICAgRGlzcGxheUxp c3REcmF3aW5nQ29udGV4dChHcmFwaGljc0NvbnRleHQmIGNvbnRleHQsIGNvbnN0IEZsb2F0UmVj dCYgY2xpcCkKKyAgICAgICAgOiBjb250ZXh0KFsmXShHcmFwaGljc0NvbnRleHQmIGRpc3BsYXlM aXN0Q29udGV4dCkgeworICAgICAgICAgICAgcmV0dXJuIHN0ZDo6bWFrZV91bmlxdWU8RGlzcGxh eUxpc3Q6OlJlY29yZGVyPihkaXNwbGF5TGlzdENvbnRleHQsIGRpc3BsYXlMaXN0LCBjb250ZXh0 LnN0YXRlKCksIGNsaXAsIEFmZmluZVRyYW5zZm9ybSgpKTsKICAgICAgICAgfSkKICAgICB7CiAg ICAgfQpAQCAtMjA4Niw3ICsyMDg2LDcgQEAgR3JhcGhpY3NDb250ZXh0KiBDYW52YXNSZW5kZXJp bmdDb250ZXh0MgogICAgIGF1dG8mIGNhbnZhcyA9IGRvd25jYXN0PEhUTUxDYW52YXNFbGVtZW50 PihjYW52YXNCYXNlKCkpOwogICAgIGlmIChVTkxJS0VMWShtX3VzZXNEaXNwbGF5TGlzdERyYXdp bmcpKSB7CiAgICAgICAgIGlmICghbV9yZWNvcmRpbmdDb250ZXh0KQotICAgICAgICAgICAgbV9y ZWNvcmRpbmdDb250ZXh0ID0gc3RkOjptYWtlX3VuaXF1ZTxEaXNwbGF5TGlzdERyYXdpbmdDb250 ZXh0PihGbG9hdFJlY3QoRmxvYXRQb2ludDo6emVybygpLCBjYW52YXMuc2l6ZSgpKSk7CisgICAg ICAgICAgICBtX3JlY29yZGluZ0NvbnRleHQgPSBzdGQ6Om1ha2VfdW5pcXVlPERpc3BsYXlMaXN0 RHJhd2luZ0NvbnRleHQ+KCpjYW52YXMuZHJhd2luZ0NvbnRleHQoKSwgRmxvYXRSZWN0KEZsb2F0 UG9pbnQ6Onplcm8oKSwgY2FudmFzLnNpemUoKSkpOwogICAgICAgICByZXR1cm4gJm1fcmVjb3Jk aW5nQ29udGV4dC0+Y29udGV4dDsKICAgICB9CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2NhL0dyYXBoaWNzTGF5ZXJDQS5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2EvR3JhcGhpY3NMYXllckNBLmNwcAkocmV2aXNp b24gMjMwMjc0KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2EvR3JhcGhp Y3NMYXllckNBLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTU4NSw3ICsxNTg1LDcgQEAgdm9pZCBH cmFwaGljc0xheWVyQ0E6OnJlY3Vyc2l2ZUNvbW1pdENoYQogICAgICAgICBGbG9hdFJlY3QgaW5p dGlhbENsaXAoYm91bmRzT3JpZ2luKCksIHNpemUoKSk7CiAKICAgICAgICAgR3JhcGhpY3NDb250 ZXh0IGNvbnRleHQoWyZdKEdyYXBoaWNzQ29udGV4dCYgY29udGV4dCkgewotICAgICAgICAgICAg cmV0dXJuIHN0ZDo6bWFrZV91bmlxdWU8RGlzcGxheUxpc3Q6OlJlY29yZGVyPihjb250ZXh0LCAq bV9kaXNwbGF5TGlzdCwgaW5pdGlhbENsaXAsIEFmZmluZVRyYW5zZm9ybSgpKTsKKyAgICAgICAg ICAgIHJldHVybiBzdGQ6Om1ha2VfdW5pcXVlPERpc3BsYXlMaXN0OjpSZWNvcmRlcj4oY29udGV4 dCwgKm1fZGlzcGxheUxpc3QsIEdyYXBoaWNzQ29udGV4dFN0YXRlKCksIGluaXRpYWxDbGlwLCBB ZmZpbmVUcmFuc2Zvcm0oKSk7CiAgICAgICAgIH0pOwogICAgICAgICBwYWludEdyYXBoaWNzTGF5 ZXJDb250ZW50cyhjb250ZXh0LCBGbG9hdFJlY3QoRmxvYXRQb2ludCgpLCBzaXplKCkpKTsKICAg ICB9CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9kaXNwbGF5bGlzdHMv RGlzcGxheUxpc3RSZWNvcmRlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvZGlzcGxheWxpc3RzL0Rpc3BsYXlMaXN0UmVjb3JkZXIuY3BwCShyZXZp c2lvbiAyMzAyNzQpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9kaXNwbGF5 bGlzdHMvRGlzcGxheUxpc3RSZWNvcmRlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM2LDEyICsz NiwxMiBAQAogbmFtZXNwYWNlIFdlYkNvcmUgewogbmFtZXNwYWNlIERpc3BsYXlMaXN0IHsKIAot UmVjb3JkZXI6OlJlY29yZGVyKEdyYXBoaWNzQ29udGV4dCYgY29udGV4dCwgRGlzcGxheUxpc3Qm IGRpc3BsYXlMaXN0LCBjb25zdCBGbG9hdFJlY3QmIGluaXRpYWxDbGlwLCBjb25zdCBBZmZpbmVU cmFuc2Zvcm0mIGJhc2VDVE0pCitSZWNvcmRlcjo6UmVjb3JkZXIoR3JhcGhpY3NDb250ZXh0JiBj b250ZXh0LCBEaXNwbGF5TGlzdCYgZGlzcGxheUxpc3QsIGNvbnN0IEdyYXBoaWNzQ29udGV4dFN0 YXRlJiBzdGF0ZSwgY29uc3QgRmxvYXRSZWN0JiBpbml0aWFsQ2xpcCwgY29uc3QgQWZmaW5lVHJh bnNmb3JtJiBiYXNlQ1RNKQogICAgIDogR3JhcGhpY3NDb250ZXh0SW1wbChjb250ZXh0LCBpbml0 aWFsQ2xpcCwgYmFzZUNUTSkKICAgICAsIG1fZGlzcGxheUxpc3QoZGlzcGxheUxpc3QpCiB7CiAg ICAgTE9HX1dJVEhfU1RSRUFNKERpc3BsYXlMaXN0cywgc3RyZWFtIDw8ICJcblJlY29yZGluZyB3 aXRoIGNsaXAgIiA8PCBpbml0aWFsQ2xpcCk7Ci0gICAgbV9zdGF0ZVN0YWNrLmFwcGVuZChDb250 ZXh0U3RhdGUoYmFzZUNUTSwgaW5pdGlhbENsaXApKTsKKyAgICBtX3N0YXRlU3RhY2suYXBwZW5k KENvbnRleHRTdGF0ZShzdGF0ZSwgYmFzZUNUTSwgaW5pdGlhbENsaXApKTsKIH0KIAogUmVjb3Jk ZXI6On5SZWNvcmRlcigpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9k aXNwbGF5bGlzdHMvRGlzcGxheUxpc3RSZWNvcmRlci5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Rpc3BsYXlsaXN0cy9EaXNwbGF5TGlzdFJlY29yZGVy LmgJKHJldmlzaW9uIDIzMDI3NCkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2Rpc3BsYXlsaXN0cy9EaXNwbGF5TGlzdFJlY29yZGVyLmgJKHdvcmtpbmcgY29weSkKQEAgLTUw LDcgKzUwLDcgQEAgY2xhc3MgRHJhd2luZ0l0ZW07CiBjbGFzcyBSZWNvcmRlciA6IHB1YmxpYyBH cmFwaGljc0NvbnRleHRJbXBsIHsKICAgICBXVEZfTUFLRV9OT05DT1BZQUJMRShSZWNvcmRlcik7 CiBwdWJsaWM6Ci0gICAgUmVjb3JkZXIoR3JhcGhpY3NDb250ZXh0JiwgRGlzcGxheUxpc3QmLCBj b25zdCBGbG9hdFJlY3QmIGluaXRpYWxDbGlwLCBjb25zdCBBZmZpbmVUcmFuc2Zvcm0mKTsKKyAg ICBSZWNvcmRlcihHcmFwaGljc0NvbnRleHQmLCBEaXNwbGF5TGlzdCYsIGNvbnN0IEdyYXBoaWNz Q29udGV4dFN0YXRlJiwgY29uc3QgRmxvYXRSZWN0JiBpbml0aWFsQ2xpcCwgY29uc3QgQWZmaW5l VHJhbnNmb3JtJik7CiAgICAgdmlydHVhbCB+UmVjb3JkZXIoKTsKIAogICAgIHNpemVfdCBpdGVt Q291bnQoKSBjb25zdCB7IHJldHVybiBtX2Rpc3BsYXlMaXN0Lml0ZW1Db3VudCgpOyB9CkBAIC0x NDUsMTcgKzE0NSwxNyBAQCBwcml2YXRlOgogICAgICAgICBib29sIHdhc1VzZWRGb3JEcmF3aW5n IHsgZmFsc2UgfTsKICAgICAgICAgc2l6ZV90IHNhdmVJdGVtSW5kZXggeyAwIH07CiAgICAgICAg IAotICAgICAgICBDb250ZXh0U3RhdGUoY29uc3QgQWZmaW5lVHJhbnNmb3JtJiB0cmFuc2Zvcm0s IGNvbnN0IEZsb2F0UmVjdCYgY2xpcCkKKyAgICAgICAgQ29udGV4dFN0YXRlKGNvbnN0IEdyYXBo aWNzQ29udGV4dFN0YXRlJiBzdGF0ZSwgY29uc3QgQWZmaW5lVHJhbnNmb3JtJiB0cmFuc2Zvcm0s IGNvbnN0IEZsb2F0UmVjdCYgY2xpcCkKICAgICAgICAgICAgIDogY3RtKHRyYW5zZm9ybSkKICAg ICAgICAgICAgICwgY2xpcEJvdW5kcyhjbGlwKQorICAgICAgICAgICAgLCBsYXN0RHJhd2luZ1N0 YXRlKHN0YXRlKQogICAgICAgICB7CiAgICAgICAgIH0KICAgICAgICAgCiAgICAgICAgIENvbnRl eHRTdGF0ZSBjbG9uZUZvclNhdmUoc2l6ZV90IHNhdmVJbmRleCkgY29uc3QKICAgICAgICAgewot ICAgICAgICAgICAgQ29udGV4dFN0YXRlIHN0YXRlKGN0bSwgY2xpcEJvdW5kcyk7CisgICAgICAg ICAgICBDb250ZXh0U3RhdGUgc3RhdGUobGFzdERyYXdpbmdTdGF0ZSwgY3RtLCBjbGlwQm91bmRz KTsKICAgICAgICAgICAgIHN0YXRlLnN0YXRlQ2hhbmdlID0gc3RhdGVDaGFuZ2U7Ci0gICAgICAg ICAgICBzdGF0ZS5sYXN0RHJhd2luZ1N0YXRlID0gbGFzdERyYXdpbmdTdGF0ZTsKICAgICAgICAg ICAgIHN0YXRlLnNhdmVJdGVtSW5kZXggPSBzYXZlSW5kZXg7CiAgICAgICAgICAgICByZXR1cm4g c3RhdGU7CiAgICAgICAgIH0KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2Rpc3BsYXlsaXN0cy9EaXNwbGF5TGlzdFJlcGxheWVyLmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9kaXNwbGF5bGlzdHMvRGlzcGxheUxpc3RSZXBs YXllci5jcHAJKHJldmlzaW9uIDIzMDI3NCkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2Rpc3BsYXlsaXN0cy9EaXNwbGF5TGlzdFJlcGxheWVyLmNwcAkod29ya2luZyBjb3B5 KQpAQCAtNTUsNyArNTUsNyBAQCBzdGQ6OnVuaXF1ZV9wdHI8RGlzcGxheUxpc3Q+IFJlcGxheWVy OjpyCiAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBudW1JdGVtczsgKytpKSB7CiAgICAgICAg IGF1dG8mIGl0ZW0gPSBtX2Rpc3BsYXlMaXN0Lmxpc3QoKVtpXS5nZXQoKTsKIAotICAgICAgICBp ZiAoaXM8RHJhd2luZ0l0ZW0+KGl0ZW0pKSB7CisgICAgICAgIGlmICghaW5pdGlhbENsaXAuaXNa ZXJvKCkgJiYgaXM8RHJhd2luZ0l0ZW0+KGl0ZW0pKSB7CiAgICAgICAgICAgICBjb25zdCBEcmF3 aW5nSXRlbSYgZHJhd2luZ0l0ZW0gPSBkb3duY2FzdDxEcmF3aW5nSXRlbT4oaXRlbSk7CiAgICAg ICAgICAgICBpZiAoZHJhd2luZ0l0ZW0uZXh0ZW50S25vd24oKSAmJiAhZHJhd2luZ0l0ZW0uZXh0 ZW50KCkuaW50ZXJzZWN0cyhpbml0aWFsQ2xpcCkpIHsKICAgICAgICAgICAgICAgICBMT0dfV0lU SF9TVFJFQU0oRGlzcGxheUxpc3RzLCBzdHJlYW0gPDwgInNraXBwaW5nICIgPDwgaSA8PCAiICIg PDwgaXRlbSk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9kaXNwbGF5 bGlzdHMvRGlzcGxheUxpc3RSZXBsYXllci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2Rpc3BsYXlsaXN0cy9EaXNwbGF5TGlzdFJlcGxheWVyLmgJKHJl dmlzaW9uIDIzMDI3NCkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Rpc3Bs YXlsaXN0cy9EaXNwbGF5TGlzdFJlcGxheWVyLmgJKHdvcmtpbmcgY29weSkKQEAgLTQyLDcgKzQy LDcgQEAgcHVibGljOgogICAgIFJlcGxheWVyKEdyYXBoaWNzQ29udGV4dCYsIGNvbnN0IERpc3Bs YXlMaXN0Jik7CiAgICAgflJlcGxheWVyKCk7CiAKLSAgICBzdGQ6OnVuaXF1ZV9wdHI8RGlzcGxh eUxpc3Q+IHJlcGxheShjb25zdCBGbG9hdFJlY3QmIGluaXRpYWxDbGlwLCBib29sIHRyYWNrUmVw bGF5TGlzdCA9IGZhbHNlKTsKKyAgICBzdGQ6OnVuaXF1ZV9wdHI8RGlzcGxheUxpc3Q+IHJlcGxh eShjb25zdCBGbG9hdFJlY3QmIGluaXRpYWxDbGlwID0geyB9LCBib29sIHRyYWNrUmVwbGF5TGlz dCA9IGZhbHNlKTsKICAgICAKIHByaXZhdGU6CiAgICAgY29uc3QgRGlzcGxheUxpc3QmIG1fZGlz cGxheUxpc3Q7Cg== 337282 2018-04-05 11:43:21 -0700 2018-04-06 12:19:46 -0700 Patch bug-184336-20180405114320.patch text/plain 8335 sabouhallawa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIzMDMwOCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMxIEBACisyMDE4LTA0LTA1ICBTYWlkIEFi b3UtSGFsbGF3YSAgPHNhYm91aGFsbGF3YUBhcHBsZS5jb20+CisKKyAgICAgICAgV2hlbiByZWNv cmRpbmcgdGhlIGRyYXdpbmcsIHRoZSBEaXNwbGF5TGlzdCBzaG91bGQgYmUgaW5pdGlhbGl6ZWQg d2l0aCB0aGUgR3JhcGhpY3NDb250ZXh0U3RhdGUgb2YgdGhlIHVuZGVybHlpbmcgR3JhcGhpY3ND b250ZXh0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x ODQzMzYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBU aGUgc3RhdGUgb2YgdGhlIGRyYXdpbmcgY29udGV4dCBoYXMgdG8gYmUgdHJhbnNmZXJlZCB0byB0 aGUgcmVjb3JkaW5nIAorICAgICAgICBEaXNwbGF5TGlzdCBiZWZvcmUgcmVjb3JkaW5nLiBNYW55 IHJlY29yZGluZyBHcmFwaGljc0NvbnRleHQgZnVuY3Rpb25zIAorICAgICAgICB3aWxsIGJlaGF2 ZSB3cm9uZ2x5IGlmIGl0IGdldHMgdGhlIGRlZmF1bHQgc3RhdGUuCisKKyAgICAgICAgKiBodG1s L2NhbnZhcy9DYW52YXNSZW5kZXJpbmdDb250ZXh0MkRCYXNlLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkRpc3BsYXlMaXN0RHJhd2luZ0NvbnRleHQ6OkRpc3BsYXlMaXN0RHJhd2luZ0NvbnRleHQp OgorICAgICAgICAoV2ViQ29yZTo6Q2FudmFzUmVuZGVyaW5nQ29udGV4dDJEQmFzZTo6ZHJhd2lu Z0NvbnRleHQgY29uc3QpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2NhL0dyYXBoaWNz TGF5ZXJDQS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0xheWVyQ0E6OnJlY3Vyc2l2 ZUNvbW1pdENoYW5nZXMpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Rpc3BsYXlsaXN0 cy9EaXNwbGF5TGlzdFJlY29yZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRpc3BsYXlMaXN0 OjpSZWNvcmRlcjo6UmVjb3JkZXIpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Rpc3Bs YXlsaXN0cy9EaXNwbGF5TGlzdFJlY29yZGVyLmg6CisgICAgICAgIChXZWJDb3JlOjpEaXNwbGF5 TGlzdDo6UmVjb3JkZXI6OkNvbnRleHRTdGF0ZTo6Q29udGV4dFN0YXRlKToKKyAgICAgICAgKFdl YkNvcmU6OkRpc3BsYXlMaXN0OjpSZWNvcmRlcjo6Q29udGV4dFN0YXRlOjpjbG9uZUZvclNhdmUg Y29uc3QpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Rpc3BsYXlsaXN0cy9EaXNwbGF5 TGlzdFJlcGxheWVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRpc3BsYXlMaXN0OjpSZXBsYXll cjo6cmVwbGF5KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9kaXNwbGF5bGlzdHMvRGlz cGxheUxpc3RSZXBsYXllci5oOgorICAgICAgICAoV2ViQ29yZTo6RGlzcGxheUxpc3Q6OlJlcGxh eWVyOjpyZXBsYXkpOiBJZiB3ZSBkbyBub3QgaGF2ZSBhIGNsaXBwaW5nCisgICAgICAgIHJlY3Rh bmdsZSBhbmQgd2Ugd2FudCB0byByZWNvcmQgYWxsIHRoZSBkcmF3aW5nLCB3ZSBuZWVkIGEgZGVm YXVsdCB2YWx1ZQorICAgICAgICBmb3IgdGhlIGNsaXBwaW5nIHJlY3RhbmdsZSBhbmQgd2Ugd2Fu dCBubyBjbGlwcGluZyB0byBoYXBwZW4uCisKIDIwMTgtMDQtMDUgIENocmlzIER1bWV6ICA8Y2R1 bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByMjMwMDQy LgpJbmRleDogU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvQ2FudmFzUmVuZGVyaW5nQ29udGV4 dDJEQmFzZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvQ2Fu dmFzUmVuZGVyaW5nQ29udGV4dDJEQmFzZS5jcHAJKHJldmlzaW9uIDIzMDMwOCkKKysrIFNvdXJj ZS9XZWJDb3JlL2h0bWwvY2FudmFzL0NhbnZhc1JlbmRlcmluZ0NvbnRleHQyREJhc2UuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC04Nyw5ICs4Nyw5IEBAIHB1YmxpYzoKICAgICBHcmFwaGljc0NvbnRl eHQgY29udGV4dDsKICAgICBEaXNwbGF5TGlzdDo6RGlzcGxheUxpc3QgZGlzcGxheUxpc3Q7CiAg ICAgCi0gICAgRGlzcGxheUxpc3REcmF3aW5nQ29udGV4dChjb25zdCBGbG9hdFJlY3QmIGNsaXAp Ci0gICAgICAgIDogY29udGV4dChbJl0oR3JhcGhpY3NDb250ZXh0JiBjb250ZXh0KSB7Ci0gICAg ICAgICAgICByZXR1cm4gc3RkOjptYWtlX3VuaXF1ZTxEaXNwbGF5TGlzdDo6UmVjb3JkZXI+KGNv bnRleHQsIGRpc3BsYXlMaXN0LCBjbGlwLCBBZmZpbmVUcmFuc2Zvcm0oKSk7CisgICAgRGlzcGxh eUxpc3REcmF3aW5nQ29udGV4dChHcmFwaGljc0NvbnRleHQmIGNvbnRleHQsIGNvbnN0IEZsb2F0 UmVjdCYgY2xpcCkKKyAgICAgICAgOiBjb250ZXh0KFsmXShHcmFwaGljc0NvbnRleHQmIGRpc3Bs YXlMaXN0Q29udGV4dCkgeworICAgICAgICAgICAgcmV0dXJuIHN0ZDo6bWFrZV91bmlxdWU8RGlz cGxheUxpc3Q6OlJlY29yZGVyPihkaXNwbGF5TGlzdENvbnRleHQsIGRpc3BsYXlMaXN0LCBjb250 ZXh0LnN0YXRlKCksIGNsaXAsIEFmZmluZVRyYW5zZm9ybSgpKTsKICAgICAgICAgfSkKICAgICB7 CiAgICAgfQpAQCAtMjA4Niw3ICsyMDg2LDcgQEAgR3JhcGhpY3NDb250ZXh0KiBDYW52YXNSZW5k ZXJpbmdDb250ZXh0MgogICAgIGF1dG8mIGNhbnZhcyA9IGRvd25jYXN0PEhUTUxDYW52YXNFbGVt ZW50PihjYW52YXNCYXNlKCkpOwogICAgIGlmIChVTkxJS0VMWShtX3VzZXNEaXNwbGF5TGlzdERy YXdpbmcpKSB7CiAgICAgICAgIGlmICghbV9yZWNvcmRpbmdDb250ZXh0KQotICAgICAgICAgICAg bV9yZWNvcmRpbmdDb250ZXh0ID0gc3RkOjptYWtlX3VuaXF1ZTxEaXNwbGF5TGlzdERyYXdpbmdD b250ZXh0PihGbG9hdFJlY3QoRmxvYXRQb2ludDo6emVybygpLCBjYW52YXMuc2l6ZSgpKSk7Cisg ICAgICAgICAgICBtX3JlY29yZGluZ0NvbnRleHQgPSBzdGQ6Om1ha2VfdW5pcXVlPERpc3BsYXlM aXN0RHJhd2luZ0NvbnRleHQ+KCpjYW52YXMuZHJhd2luZ0NvbnRleHQoKSwgRmxvYXRSZWN0KEZs b2F0UG9pbnQ6Onplcm8oKSwgY2FudmFzLnNpemUoKSkpOwogICAgICAgICByZXR1cm4gJm1fcmVj b3JkaW5nQ29udGV4dC0+Y29udGV4dDsKICAgICB9CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2NhL0dyYXBoaWNzTGF5ZXJDQS5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2EvR3JhcGhpY3NMYXllckNBLmNwcAkocmV2 aXNpb24gMjMwMzA4KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2EvR3Jh cGhpY3NMYXllckNBLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTU4NSw3ICsxNTg1LDcgQEAgdm9p ZCBHcmFwaGljc0xheWVyQ0E6OnJlY3Vyc2l2ZUNvbW1pdENoYQogICAgICAgICBGbG9hdFJlY3Qg aW5pdGlhbENsaXAoYm91bmRzT3JpZ2luKCksIHNpemUoKSk7CiAKICAgICAgICAgR3JhcGhpY3ND b250ZXh0IGNvbnRleHQoWyZdKEdyYXBoaWNzQ29udGV4dCYgY29udGV4dCkgewotICAgICAgICAg ICAgcmV0dXJuIHN0ZDo6bWFrZV91bmlxdWU8RGlzcGxheUxpc3Q6OlJlY29yZGVyPihjb250ZXh0 LCAqbV9kaXNwbGF5TGlzdCwgaW5pdGlhbENsaXAsIEFmZmluZVRyYW5zZm9ybSgpKTsKKyAgICAg ICAgICAgIHJldHVybiBzdGQ6Om1ha2VfdW5pcXVlPERpc3BsYXlMaXN0OjpSZWNvcmRlcj4oY29u dGV4dCwgKm1fZGlzcGxheUxpc3QsIEdyYXBoaWNzQ29udGV4dFN0YXRlKCksIGluaXRpYWxDbGlw LCBBZmZpbmVUcmFuc2Zvcm0oKSk7CiAgICAgICAgIH0pOwogICAgICAgICBwYWludEdyYXBoaWNz TGF5ZXJDb250ZW50cyhjb250ZXh0LCBGbG9hdFJlY3QoRmxvYXRQb2ludCgpLCBzaXplKCkpKTsK ICAgICB9CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9kaXNwbGF5bGlz dHMvRGlzcGxheUxpc3RSZWNvcmRlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvZGlzcGxheWxpc3RzL0Rpc3BsYXlMaXN0UmVjb3JkZXIuY3BwCShy ZXZpc2lvbiAyMzAzMDgpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9kaXNw bGF5bGlzdHMvRGlzcGxheUxpc3RSZWNvcmRlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM2LDEy ICszNiwxMiBAQAogbmFtZXNwYWNlIFdlYkNvcmUgewogbmFtZXNwYWNlIERpc3BsYXlMaXN0IHsK IAotUmVjb3JkZXI6OlJlY29yZGVyKEdyYXBoaWNzQ29udGV4dCYgY29udGV4dCwgRGlzcGxheUxp c3QmIGRpc3BsYXlMaXN0LCBjb25zdCBGbG9hdFJlY3QmIGluaXRpYWxDbGlwLCBjb25zdCBBZmZp bmVUcmFuc2Zvcm0mIGJhc2VDVE0pCitSZWNvcmRlcjo6UmVjb3JkZXIoR3JhcGhpY3NDb250ZXh0 JiBjb250ZXh0LCBEaXNwbGF5TGlzdCYgZGlzcGxheUxpc3QsIGNvbnN0IEdyYXBoaWNzQ29udGV4 dFN0YXRlJiBzdGF0ZSwgY29uc3QgRmxvYXRSZWN0JiBpbml0aWFsQ2xpcCwgY29uc3QgQWZmaW5l VHJhbnNmb3JtJiBiYXNlQ1RNKQogICAgIDogR3JhcGhpY3NDb250ZXh0SW1wbChjb250ZXh0LCBp bml0aWFsQ2xpcCwgYmFzZUNUTSkKICAgICAsIG1fZGlzcGxheUxpc3QoZGlzcGxheUxpc3QpCiB7 CiAgICAgTE9HX1dJVEhfU1RSRUFNKERpc3BsYXlMaXN0cywgc3RyZWFtIDw8ICJcblJlY29yZGlu ZyB3aXRoIGNsaXAgIiA8PCBpbml0aWFsQ2xpcCk7Ci0gICAgbV9zdGF0ZVN0YWNrLmFwcGVuZChD b250ZXh0U3RhdGUoYmFzZUNUTSwgaW5pdGlhbENsaXApKTsKKyAgICBtX3N0YXRlU3RhY2suYXBw ZW5kKENvbnRleHRTdGF0ZShzdGF0ZSwgYmFzZUNUTSwgaW5pdGlhbENsaXApKTsKIH0KIAogUmVj b3JkZXI6On5SZWNvcmRlcigpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9kaXNwbGF5bGlzdHMvRGlzcGxheUxpc3RSZWNvcmRlci5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Rpc3BsYXlsaXN0cy9EaXNwbGF5TGlzdFJlY29y ZGVyLmgJKHJldmlzaW9uIDIzMDMwOCkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2Rpc3BsYXlsaXN0cy9EaXNwbGF5TGlzdFJlY29yZGVyLmgJKHdvcmtpbmcgY29weSkKQEAg LTUwLDcgKzUwLDcgQEAgY2xhc3MgRHJhd2luZ0l0ZW07CiBjbGFzcyBSZWNvcmRlciA6IHB1Ymxp YyBHcmFwaGljc0NvbnRleHRJbXBsIHsKICAgICBXVEZfTUFLRV9OT05DT1BZQUJMRShSZWNvcmRl cik7CiBwdWJsaWM6Ci0gICAgUmVjb3JkZXIoR3JhcGhpY3NDb250ZXh0JiwgRGlzcGxheUxpc3Qm LCBjb25zdCBGbG9hdFJlY3QmIGluaXRpYWxDbGlwLCBjb25zdCBBZmZpbmVUcmFuc2Zvcm0mKTsK KyAgICBSZWNvcmRlcihHcmFwaGljc0NvbnRleHQmLCBEaXNwbGF5TGlzdCYsIGNvbnN0IEdyYXBo aWNzQ29udGV4dFN0YXRlJiwgY29uc3QgRmxvYXRSZWN0JiBpbml0aWFsQ2xpcCwgY29uc3QgQWZm aW5lVHJhbnNmb3JtJik7CiAgICAgdmlydHVhbCB+UmVjb3JkZXIoKTsKIAogICAgIHNpemVfdCBp dGVtQ291bnQoKSBjb25zdCB7IHJldHVybiBtX2Rpc3BsYXlMaXN0Lml0ZW1Db3VudCgpOyB9CkBA IC0xNDUsMTcgKzE0NSwxNyBAQCBwcml2YXRlOgogICAgICAgICBib29sIHdhc1VzZWRGb3JEcmF3 aW5nIHsgZmFsc2UgfTsKICAgICAgICAgc2l6ZV90IHNhdmVJdGVtSW5kZXggeyAwIH07CiAgICAg ICAgIAotICAgICAgICBDb250ZXh0U3RhdGUoY29uc3QgQWZmaW5lVHJhbnNmb3JtJiB0cmFuc2Zv cm0sIGNvbnN0IEZsb2F0UmVjdCYgY2xpcCkKKyAgICAgICAgQ29udGV4dFN0YXRlKGNvbnN0IEdy YXBoaWNzQ29udGV4dFN0YXRlJiBzdGF0ZSwgY29uc3QgQWZmaW5lVHJhbnNmb3JtJiB0cmFuc2Zv cm0sIGNvbnN0IEZsb2F0UmVjdCYgY2xpcCkKICAgICAgICAgICAgIDogY3RtKHRyYW5zZm9ybSkK ICAgICAgICAgICAgICwgY2xpcEJvdW5kcyhjbGlwKQorICAgICAgICAgICAgLCBsYXN0RHJhd2lu Z1N0YXRlKHN0YXRlKQogICAgICAgICB7CiAgICAgICAgIH0KICAgICAgICAgCiAgICAgICAgIENv bnRleHRTdGF0ZSBjbG9uZUZvclNhdmUoc2l6ZV90IHNhdmVJbmRleCkgY29uc3QKICAgICAgICAg ewotICAgICAgICAgICAgQ29udGV4dFN0YXRlIHN0YXRlKGN0bSwgY2xpcEJvdW5kcyk7CisgICAg ICAgICAgICBDb250ZXh0U3RhdGUgc3RhdGUobGFzdERyYXdpbmdTdGF0ZSwgY3RtLCBjbGlwQm91 bmRzKTsKICAgICAgICAgICAgIHN0YXRlLnN0YXRlQ2hhbmdlID0gc3RhdGVDaGFuZ2U7Ci0gICAg ICAgICAgICBzdGF0ZS5sYXN0RHJhd2luZ1N0YXRlID0gbGFzdERyYXdpbmdTdGF0ZTsKICAgICAg ICAgICAgIHN0YXRlLnNhdmVJdGVtSW5kZXggPSBzYXZlSW5kZXg7CiAgICAgICAgICAgICByZXR1 cm4gc3RhdGU7CiAgICAgICAgIH0KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2Rpc3BsYXlsaXN0cy9EaXNwbGF5TGlzdFJlcGxheWVyLmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9kaXNwbGF5bGlzdHMvRGlzcGxheUxpc3RS ZXBsYXllci5jcHAJKHJldmlzaW9uIDIzMDMwOCkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2Rpc3BsYXlsaXN0cy9EaXNwbGF5TGlzdFJlcGxheWVyLmNwcAkod29ya2luZyBj b3B5KQpAQCAtNTUsNyArNTUsNyBAQCBzdGQ6OnVuaXF1ZV9wdHI8RGlzcGxheUxpc3Q+IFJlcGxh eWVyOjpyCiAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBudW1JdGVtczsgKytpKSB7CiAgICAg ICAgIGF1dG8mIGl0ZW0gPSBtX2Rpc3BsYXlMaXN0Lmxpc3QoKVtpXS5nZXQoKTsKIAotICAgICAg ICBpZiAoaXM8RHJhd2luZ0l0ZW0+KGl0ZW0pKSB7CisgICAgICAgIGlmICghaW5pdGlhbENsaXAu aXNaZXJvKCkgJiYgaXM8RHJhd2luZ0l0ZW0+KGl0ZW0pKSB7CiAgICAgICAgICAgICBjb25zdCBE cmF3aW5nSXRlbSYgZHJhd2luZ0l0ZW0gPSBkb3duY2FzdDxEcmF3aW5nSXRlbT4oaXRlbSk7CiAg ICAgICAgICAgICBpZiAoZHJhd2luZ0l0ZW0uZXh0ZW50S25vd24oKSAmJiAhZHJhd2luZ0l0ZW0u ZXh0ZW50KCkuaW50ZXJzZWN0cyhpbml0aWFsQ2xpcCkpIHsKICAgICAgICAgICAgICAgICBMT0df V0lUSF9TVFJFQU0oRGlzcGxheUxpc3RzLCBzdHJlYW0gPDwgInNraXBwaW5nICIgPDwgaSA8PCAi ICIgPDwgaXRlbSk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9kaXNw bGF5bGlzdHMvRGlzcGxheUxpc3RSZXBsYXllci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Rpc3BsYXlsaXN0cy9EaXNwbGF5TGlzdFJlcGxheWVyLmgJ KHJldmlzaW9uIDIzMDMwOCkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Rp c3BsYXlsaXN0cy9EaXNwbGF5TGlzdFJlcGxheWVyLmgJKHdvcmtpbmcgY29weSkKQEAgLTQyLDcg KzQyLDcgQEAgcHVibGljOgogICAgIFJlcGxheWVyKEdyYXBoaWNzQ29udGV4dCYsIGNvbnN0IERp c3BsYXlMaXN0Jik7CiAgICAgflJlcGxheWVyKCk7CiAKLSAgICBzdGQ6OnVuaXF1ZV9wdHI8RGlz cGxheUxpc3Q+IHJlcGxheShjb25zdCBGbG9hdFJlY3QmIGluaXRpYWxDbGlwLCBib29sIHRyYWNr UmVwbGF5TGlzdCA9IGZhbHNlKTsKKyAgICBzdGQ6OnVuaXF1ZV9wdHI8RGlzcGxheUxpc3Q+IHJl cGxheShjb25zdCBGbG9hdFJlY3QmIGluaXRpYWxDbGlwID0geyB9LCBib29sIHRyYWNrUmVwbGF5 TGlzdCA9IGZhbHNlKTsKICAgICAKIHByaXZhdGU6CiAgICAgY29uc3QgRGlzcGxheUxpc3QmIG1f ZGlzcGxheUxpc3Q7Cg==