186036 2018-05-28 09:30:48 -0700 [LFC] Add formatting context testing codepath in FrameViewLayoutContext 2018-05-28 11:57:19 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham commit-queue koivisto sam simon.fraser webkit-bug-importer zalan oldest_to_newest 1427945 0 zalan 2018-05-28 09:30:48 -0700 This is to verify the formatting context layout correctness. 1427946 1 341455 zalan 2018-05-28 09:34:34 -0700 Created attachment 341455 Patch 1427949 2 341455 koivisto 2018-05-28 10:03:13 -0700 Comment on attachment 341455 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=341455&action=review > Source/WebCore/page/FrameViewLayoutContext.cpp:39 > #include "InspectorInstrumentation.h" > +#if ENABLE(LAYOUT_FORMATTING_CONTEXT) > +#include "LayoutContainer.h" > +#include "LayoutContext.h" > +#include "LayoutTreeBuilder.h" > +#endif > #include "LayoutDisallowedScope.h" I think #if includes usually go to a separate section rather than being in the middle of the normal ones. 1427954 3 341458 zalan 2018-05-28 10:18:45 -0700 Created attachment 341458 Patch 1427958 4 341458 commit-queue 2018-05-28 11:56:39 -0700 Comment on attachment 341458 Patch Clearing flags on attachment: 341458 Committed r232249: <https://trac.webkit.org/changeset/232249> 1427959 5 commit-queue 2018-05-28 11:56:41 -0700 All reviewed patches have been landed. Closing bug. 1427960 6 webkit-bug-importer 2018-05-28 11:57:19 -0700 <rdar://problem/40601127> 341455 2018-05-28 09:34:34 -0700 2018-05-28 10:18:44 -0700 Patch bug-186036-20180528093433.patch text/plain 5959 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjMyMjI2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmIwODhiOWQ4MzRlM2Uw NTY1OTczZWNjMTE0MTA3MWQ4OWUwNTJkMy4uM2I5MzhlOWJjODUzZmQxY2IyNDQ1NzEyY2I2MzI5 YjI3N2U4ODQ4MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE4LTA1LTI4ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ10gQWRkIGZvcm1hdHRp bmcgY29udGV4dCB0ZXN0aW5nIGNvZGVwYXRoIGluIEZyYW1lVmlld0xheW91dENvbnRleHQKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4NjAzNgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgaXMgdG8g dmVyaWZ5IHRoZSBmb3JtYXR0aW5nIGNvbnRleHQgbGF5b3V0IGNvcnJlY3RuZXNzLgorCisgICAg ICAgICogbGF5b3V0L0xheW91dENvbnRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0 OjpMYXlvdXRDb250ZXh0OjpMYXlvdXRDb250ZXh0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91 dDo6TGF5b3V0Q29udGV4dDo6aW5pdGlhbGl6ZVJvb3QpOgorICAgICAgICAqIGxheW91dC9MYXlv dXRDb250ZXh0Lmg6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxheW91dENvbnRleHQ6OmRp c3BsYXlCb3hGb3JMYXlvdXRCb3ggY29uc3QpOgorICAgICAgICAqIHBhZ2UvRnJhbWVWaWV3TGF5 b3V0Q29udGV4dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpsYXlvdXRVc2luZ0Zvcm1hdHRpbmdD b250ZXh0KToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVmlld0xheW91dENvbnRleHQ6OmxheW91 dCk6CisKIDIwMTgtMDUtMjYgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAg ICAgICBbTEZDXSBJbXBsZW1lbnQgbWFyZ2luIGNvbXB1dGF0aW9uCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvTGF5b3V0Q29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvTGF5b3V0Q29udGV4dC5jcHAKaW5kZXggYmMwZGU4NjMxZDdjMjBkYTA4NjE0NDJiMzlhYTYx OGFmZGNhNzNmZi4uMjAyYjhlNGNmYWNjZDgyNGFjMTE0ZjI3YjZlMTBjNmE2NWFkMmFjZSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L0xheW91dENvbnRleHQuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9MYXlvdXRDb250ZXh0LmNwcApAQCAtNDUsMTEgKzQ1LDM3IEBA IG5hbWVzcGFjZSBMYXlvdXQgewogCiBXVEZfTUFLRV9JU09fQUxMT0NBVEVEX0lNUEwoTGF5b3V0 Q29udGV4dCk7CiAKLUxheW91dENvbnRleHQ6OkxheW91dENvbnRleHQoY29uc3QgQm94JiByb290 KQotICAgIDogbV9yb290KG1ha2VXZWFrUHRyKGNvbnN0X2Nhc3Q8Qm94Jj4ocm9vdCkpKQorTGF5 b3V0Q29udGV4dDo6TGF5b3V0Q29udGV4dCgpCiB7CiB9CiAKK3ZvaWQgTGF5b3V0Q29udGV4dDo6 aW5pdGlhbGl6ZVJvb3QoY29uc3QgQ29udGFpbmVyJiByb290LCBjb25zdCBMYXlvdXRTaXplJiBj b250YWluZXJTaXplKQoreworICAgIG1fcm9vdCA9IG1ha2VXZWFrUHRyKGNvbnN0X2Nhc3Q8Q29u dGFpbmVyJj4ocm9vdCkpOworICAgIGF1dG8mIGRpc3BsYXlCb3ggPSBjcmVhdGVEaXNwbGF5Qm94 KHJvb3QpOworICAgIC8vIFJvb3QgaXMgYWx3YXlzIGF0IDAgMCB3aXRoIG5vIG1hcmdpbiAKKyAg ICBkaXNwbGF5Qm94LnNldFRvcExlZnQoeyB9KTsKKyAgICBkaXNwbGF5Qm94LnNldFdpZHRoKGNv bnRhaW5lclNpemUud2lkdGgoKSk7CisgICAgZGlzcGxheUJveC5zZXRIZWlnaHQoY29udGFpbmVy U2l6ZS5oZWlnaHQoKSk7CisgICAgZGlzcGxheUJveC5zZXRNYXJnaW4oeyB9KTsKKworICAgIGF1 dG8mIHN0eWxlID0gcm9vdC5zdHlsZSgpOworICAgIC8vIEZJWE1FOiBtX3Jvb3QgY291bGQgdmVy eSB3ZWxsIGJlIGEgZm9ybWF0dGluZyBjb250ZXh0IHJvb3Qgd2l0aCBhbmNlc3RvcnMgYW5kIHJl c29sdmFibGUgYm9yZGVyIGFuZCBwYWRkaW5nIChhcyBvcHBvc2VkIHRvIHRoZSB0b3Btb3N0IHJv b3QpICAKKyAgICBkaXNwbGF5Qm94LnNldEJvcmRlcih7CisgICAgICAgIHN0eWxlLmJvcmRlclRv cCgpLndpZHRoKCksCisgICAgICAgIHN0eWxlLmJvcmRlckxlZnQoKS53aWR0aCgpLAorICAgICAg ICBzdHlsZS5ib3JkZXJCb3R0b20oKS53aWR0aCgpLAorICAgICAgICBzdHlsZS5ib3JkZXJSaWdo dCgpLndpZHRoKCkKKworICAgIH0pOworICAgIGRpc3BsYXlCb3guc2V0UGFkZGluZyh7CisgICAg ICAgIHZhbHVlRm9yTGVuZ3RoKHN0eWxlLnBhZGRpbmdUb3AoKSwgY29udGFpbmVyU2l6ZS53aWR0 aCgpKSwKKyAgICAgICAgdmFsdWVGb3JMZW5ndGgoc3R5bGUucGFkZGluZ0xlZnQoKSwgY29udGFp bmVyU2l6ZS53aWR0aCgpKSwKKyAgICAgICAgdmFsdWVGb3JMZW5ndGgoc3R5bGUucGFkZGluZ0Jv dHRvbSgpLCBjb250YWluZXJTaXplLndpZHRoKCkpLAorICAgICAgICB2YWx1ZUZvckxlbmd0aChz dHlsZS5wYWRkaW5nUmlnaHQoKSwgY29udGFpbmVyU2l6ZS53aWR0aCgpKQorICAgIH0pOworfQor CiB2b2lkIExheW91dENvbnRleHQ6OnVwZGF0ZUxheW91dCgpCiB7CiAgICAgQVNTRVJUKCFtX2Zv cm1hdHRpbmdDb250ZXh0Um9vdExpc3RGb3JMYXlvdXQuaXNFbXB0eSgpKTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2xheW91dC9MYXlvdXRDb250ZXh0LmggYi9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvTGF5b3V0Q29udGV4dC5oCmluZGV4IDAxZDkyZGEzZWE0MTNmMjU5ZjNlODBlNDJmNDE4 MjZkYWRiMzRmYzguLjc0MDUwNjA0MjIzZDI4YmQxOTRiODJkYTk1NWFjNjM2ZjViMmYyYjcgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9MYXlvdXRDb250ZXh0LmgKKysrIGIvU291 cmNlL1dlYkNvcmUvbGF5b3V0L0xheW91dENvbnRleHQuaApAQCAtNTQsMTMgKzU0LDEwIEBAIGNs YXNzIENvbnRhaW5lcjsKIGNsYXNzIExheW91dENvbnRleHQgewogICAgIFdURl9NQUtFX0lTT19B TExPQ0FURUQoTGF5b3V0Q29udGV4dCk7CiBwdWJsaWM6Ci0gICAgTGF5b3V0Q29udGV4dChjb25z dCBCb3gmIHJvb3QpOworICAgIExheW91dENvbnRleHQoKTsKIAorICAgIHZvaWQgaW5pdGlhbGl6 ZVJvb3QoY29uc3QgQ29udGFpbmVyJiwgY29uc3QgTGF5b3V0U2l6ZSYpOwogICAgIHZvaWQgdXBk YXRlTGF5b3V0KCk7Ci0KLSAgICBEaXNwbGF5OjpCb3gmIGNyZWF0ZURpc3BsYXlCb3goY29uc3Qg Qm94Jik7Ci0gICAgRGlzcGxheTo6Qm94KiBkaXNwbGF5Qm94Rm9yTGF5b3V0Qm94KGNvbnN0IEJv eCYgbGF5b3V0Qm94KSBjb25zdCB7IHJldHVybiBtX2xheW91dFRvRGlzcGxheUJveC5nZXQoJmxh eW91dEJveCk7IH0KLQogICAgIHZvaWQgc3R5bGVDaGFuZ2VkKGNvbnN0IEJveCYsIFN0eWxlRGlm Zik7CiAKICAgICBlbnVtIGNsYXNzIFVwZGF0ZVR5cGUgewpAQCAtNzYsOCArNzMsMTEgQEAgcHVi bGljOgogICAgIEZvcm1hdHRpbmdTdGF0ZSYgZXN0YWJsaXNoZWRGb3JtYXR0aW5nU3RhdGUoY29u c3QgQm94JiBmb3JtYXR0aW5nQ29udGV4dFJvb3QsIGNvbnN0IEZvcm1hdHRpbmdDb250ZXh0Jik7 CiAgICAgc3RkOjp1bmlxdWVfcHRyPEZvcm1hdHRpbmdDb250ZXh0PiBmb3JtYXR0aW5nQ29udGV4 dChjb25zdCBCb3gmIGZvcm1hdHRpbmdDb250ZXh0Um9vdCk7CiAKKyAgICBEaXNwbGF5OjpCb3gm IGNyZWF0ZURpc3BsYXlCb3goY29uc3QgQm94Jik7CisgICAgRGlzcGxheTo6Qm94KiBkaXNwbGF5 Qm94Rm9yTGF5b3V0Qm94KGNvbnN0IEJveCYgbGF5b3V0Qm94KSBjb25zdCB7IHJldHVybiBtX2xh eW91dFRvRGlzcGxheUJveC5nZXQoJmxheW91dEJveCk7IH0KKwogcHJpdmF0ZToKLSAgICBXZWFr UHRyPEJveD4gbV9yb290OworICAgIFdlYWtQdHI8Q29udGFpbmVyPiBtX3Jvb3Q7CiAgICAgSGFz aFNldDxjb25zdCBDb250YWluZXIqPiBtX2Zvcm1hdHRpbmdDb250ZXh0Um9vdExpc3RGb3JMYXlv dXQ7CiAgICAgSGFzaE1hcDxjb25zdCBCb3gqLCBzdGQ6OnVuaXF1ZV9wdHI8Rm9ybWF0dGluZ1N0 YXRlPj4gbV9mb3JtYXR0aW5nU3RhdGVzOwogICAgIEhhc2hNYXA8Y29uc3QgQm94Kiwgc3RkOjp1 bmlxdWVfcHRyPERpc3BsYXk6OkJveD4+IG1fbGF5b3V0VG9EaXNwbGF5Qm94OwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXdMYXlvdXRDb250ZXh0LmNwcCBiL1NvdXJj ZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3TGF5b3V0Q29udGV4dC5jcHAKaW5kZXggYTFkNWQxMjI0 ZjBiZTIyNzI3YTNlMDk2ZDI2OWViZTg5OGY2MDRlNy4uOGU2NTAxNmJjNTllNGYyODM0ZGI3Zjk5 MTc1M2I1NTQ5MWE4NjU1MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZp ZXdMYXlvdXRDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlld0xh eW91dENvbnRleHQuY3BwCkBAIC0zMSw2ICszMSwxMSBAQAogI2luY2x1ZGUgIkRvY3VtZW50Lmgi CiAjaW5jbHVkZSAiRnJhbWVWaWV3LmgiCiAjaW5jbHVkZSAiSW5zcGVjdG9ySW5zdHJ1bWVudGF0 aW9uLmgiCisjaWYgRU5BQkxFKExBWU9VVF9GT1JNQVRUSU5HX0NPTlRFWFQpCisjaW5jbHVkZSAi TGF5b3V0Q29udGFpbmVyLmgiCisjaW5jbHVkZSAiTGF5b3V0Q29udGV4dC5oIgorI2luY2x1ZGUg IkxheW91dFRyZWVCdWlsZGVyLmgiCisjZW5kaWYKICNpbmNsdWRlICJMYXlvdXREaXNhbGxvd2Vk U2NvcGUuaCIKICNpbmNsdWRlICJMYXlvdXRTdGF0ZS5oIgogI2luY2x1ZGUgIkxvZ2dpbmcuaCIK QEAgLTQ1LDYgKzUwLDE3IEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAorI2lmIEVOQUJMRShM QVlPVVRfRk9STUFUVElOR19DT05URVhUKQorc3RhdGljIHZvaWQgbGF5b3V0VXNpbmdGb3JtYXR0 aW5nQ29udGV4dChjb25zdCBSZW5kZXJWaWV3JiByZW5kZXJWaWV3KQoreworICAgIGF1dG8gaW5p dGlhbENvbnRhaW5pbmdCbG9jayA9IExheW91dDo6VHJlZUJ1aWxkZXI6OmNyZWF0ZUxheW91dFRy ZWUocmVuZGVyVmlldyk7CisgICAgYXV0byBsYXlvdXRDb250ZXh0ID0gc3RkOjptYWtlX3VuaXF1 ZTxMYXlvdXQ6OkxheW91dENvbnRleHQ+KCk7CisgICAgbGF5b3V0Q29udGV4dC0+aW5pdGlhbGl6 ZVJvb3QoKmluaXRpYWxDb250YWluaW5nQmxvY2ssIHJlbmRlclZpZXcuc2l6ZSgpKTsKKyAgICBs YXlvdXRDb250ZXh0LT51cGRhdGVMYXlvdXQoKTsKKyAgICBsYXlvdXRDb250ZXh0LT52ZXJpZnlB bmRPdXRwdXRNaXNtYXRjaGluZ0xheW91dFRyZWUocmVuZGVyVmlldyk7Cit9IAorI2VuZGlmCisK IHN0YXRpYyBib29sIGlzT2JqZWN0QW5jZXN0b3JDb250YWluZXJPZihSZW5kZXJFbGVtZW50JiBh bmNlc3RvciwgUmVuZGVyRWxlbWVudCYgZGVzY2VuZGFudCkKIHsKICAgICBmb3IgKGF1dG8qIHJl bmRlcmVyID0gJmRlc2NlbmRhbnQ7IHJlbmRlcmVyOyByZW5kZXJlciA9IHJlbmRlcmVyLT5jb250 YWluZXIoKSkgewpAQCAtMTg5LDYgKzIwNSw5IEBAIHZvaWQgRnJhbWVWaWV3TGF5b3V0Q29udGV4 dDo6bGF5b3V0KCkKICAgICAgICAgUmVuZGVyVHJlZU5lZWRzTGF5b3V0Q2hlY2tlciBjaGVja2Vy KCpsYXlvdXRSb290KTsKICNlbmRpZgogICAgICAgICBsYXlvdXRSb290LT5sYXlvdXQoKTsKKyNp ZiBFTkFCTEUoTEFZT1VUX0ZPUk1BVFRJTkdfQ09OVEVYVCkKKyAgICBsYXlvdXRVc2luZ0Zvcm1h dHRpbmdDb250ZXh0KCpyZW5kZXJWaWV3KCkpOworI2VuZGlmCiAgICAgICAgICsrbV9sYXlvdXRD b3VudDsKICNpZiBFTkFCTEUoVEVYVF9BVVRPU0laSU5HKQogICAgICAgICBhcHBseVRleHRTaXpp bmdJZk5lZWRlZCgqbGF5b3V0Um9vdC5nZXQoKSk7Cg== 341458 2018-05-28 10:18:45 -0700 2018-05-28 11:56:39 -0700 Patch bug-186036-20180528101844.patch text/plain 5923 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjMyMjQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2YwNmFiMGYwMThhMzFl YWYyN2MxYzk4MzM3MDI2NzA5ZWQ1ODgxMC4uNmQ3ZGQzYzBiZmE5YjgyOGRmMGFhYzY0OGIwYjky NThhNDM1NGJjOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE4LTA1LTI4ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ10gQWRkIGZvcm1hdHRp bmcgY29udGV4dCB0ZXN0aW5nIGNvZGVwYXRoIGluIEZyYW1lVmlld0xheW91dENvbnRleHQKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4NjAzNgorCisg ICAgICAgIFJldmlld2VkIGJ5IEFudHRpIEtvaXZpc3RvLgorCisgICAgICAgIFRoaXMgaXMgdG8g dmVyaWZ5IHRoZSBmb3JtYXR0aW5nIGNvbnRleHQgbGF5b3V0IGNvcnJlY3RuZXNzLgorCisgICAg ICAgICogbGF5b3V0L0xheW91dENvbnRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0 OjpMYXlvdXRDb250ZXh0OjpMYXlvdXRDb250ZXh0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91 dDo6TGF5b3V0Q29udGV4dDo6aW5pdGlhbGl6ZVJvb3QpOgorICAgICAgICAqIGxheW91dC9MYXlv dXRDb250ZXh0Lmg6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxheW91dENvbnRleHQ6OmRp c3BsYXlCb3hGb3JMYXlvdXRCb3ggY29uc3QpOgorICAgICAgICAqIHBhZ2UvRnJhbWVWaWV3TGF5 b3V0Q29udGV4dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpsYXlvdXRVc2luZ0Zvcm1hdHRpbmdD b250ZXh0KToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVmlld0xheW91dENvbnRleHQ6OmxheW91 dCk6CisKIDIwMTgtMDUtMjggIFNhbSBXZWluaWcgIDxzYW1Ad2Via2l0Lm9yZz4KIAogICAgICAg ICBNb2Rlcm5pemUgU1ZHUmVuZGVyU3R5bGVEZWZzLmgKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2xheW91dC9MYXlvdXRDb250ZXh0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9MYXlv dXRDb250ZXh0LmNwcAppbmRleCBiYzBkZTg2MzFkN2MyMGRhMDg2MTQ0MmIzOWFhNjE4YWZkY2E3 M2ZmLi4yMDJiOGU0Y2ZhY2NkODI0YWMxMTRmMjdiNmUxMGM2YTY1YWQyYWNlIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvTGF5b3V0Q29udGV4dC5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvbGF5b3V0L0xheW91dENvbnRleHQuY3BwCkBAIC00NSwxMSArNDUsMzcgQEAgbmFtZXNw YWNlIExheW91dCB7CiAKIFdURl9NQUtFX0lTT19BTExPQ0FURURfSU1QTChMYXlvdXRDb250ZXh0 KTsKIAotTGF5b3V0Q29udGV4dDo6TGF5b3V0Q29udGV4dChjb25zdCBCb3gmIHJvb3QpCi0gICAg OiBtX3Jvb3QobWFrZVdlYWtQdHIoY29uc3RfY2FzdDxCb3gmPihyb290KSkpCitMYXlvdXRDb250 ZXh0OjpMYXlvdXRDb250ZXh0KCkKIHsKIH0KIAordm9pZCBMYXlvdXRDb250ZXh0Ojppbml0aWFs aXplUm9vdChjb25zdCBDb250YWluZXImIHJvb3QsIGNvbnN0IExheW91dFNpemUmIGNvbnRhaW5l clNpemUpCit7CisgICAgbV9yb290ID0gbWFrZVdlYWtQdHIoY29uc3RfY2FzdDxDb250YWluZXIm Pihyb290KSk7CisgICAgYXV0byYgZGlzcGxheUJveCA9IGNyZWF0ZURpc3BsYXlCb3gocm9vdCk7 CisgICAgLy8gUm9vdCBpcyBhbHdheXMgYXQgMCAwIHdpdGggbm8gbWFyZ2luIAorICAgIGRpc3Bs YXlCb3guc2V0VG9wTGVmdCh7IH0pOworICAgIGRpc3BsYXlCb3guc2V0V2lkdGgoY29udGFpbmVy U2l6ZS53aWR0aCgpKTsKKyAgICBkaXNwbGF5Qm94LnNldEhlaWdodChjb250YWluZXJTaXplLmhl aWdodCgpKTsKKyAgICBkaXNwbGF5Qm94LnNldE1hcmdpbih7IH0pOworCisgICAgYXV0byYgc3R5 bGUgPSByb290LnN0eWxlKCk7CisgICAgLy8gRklYTUU6IG1fcm9vdCBjb3VsZCB2ZXJ5IHdlbGwg YmUgYSBmb3JtYXR0aW5nIGNvbnRleHQgcm9vdCB3aXRoIGFuY2VzdG9ycyBhbmQgcmVzb2x2YWJs ZSBib3JkZXIgYW5kIHBhZGRpbmcgKGFzIG9wcG9zZWQgdG8gdGhlIHRvcG1vc3Qgcm9vdCkgIAor ICAgIGRpc3BsYXlCb3guc2V0Qm9yZGVyKHsKKyAgICAgICAgc3R5bGUuYm9yZGVyVG9wKCkud2lk dGgoKSwKKyAgICAgICAgc3R5bGUuYm9yZGVyTGVmdCgpLndpZHRoKCksCisgICAgICAgIHN0eWxl LmJvcmRlckJvdHRvbSgpLndpZHRoKCksCisgICAgICAgIHN0eWxlLmJvcmRlclJpZ2h0KCkud2lk dGgoKQorCisgICAgfSk7CisgICAgZGlzcGxheUJveC5zZXRQYWRkaW5nKHsKKyAgICAgICAgdmFs dWVGb3JMZW5ndGgoc3R5bGUucGFkZGluZ1RvcCgpLCBjb250YWluZXJTaXplLndpZHRoKCkpLAor ICAgICAgICB2YWx1ZUZvckxlbmd0aChzdHlsZS5wYWRkaW5nTGVmdCgpLCBjb250YWluZXJTaXpl LndpZHRoKCkpLAorICAgICAgICB2YWx1ZUZvckxlbmd0aChzdHlsZS5wYWRkaW5nQm90dG9tKCks IGNvbnRhaW5lclNpemUud2lkdGgoKSksCisgICAgICAgIHZhbHVlRm9yTGVuZ3RoKHN0eWxlLnBh ZGRpbmdSaWdodCgpLCBjb250YWluZXJTaXplLndpZHRoKCkpCisgICAgfSk7Cit9CisKIHZvaWQg TGF5b3V0Q29udGV4dDo6dXBkYXRlTGF5b3V0KCkKIHsKICAgICBBU1NFUlQoIW1fZm9ybWF0dGlu Z0NvbnRleHRSb290TGlzdEZvckxheW91dC5pc0VtcHR5KCkpOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvbGF5b3V0L0xheW91dENvbnRleHQuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9M YXlvdXRDb250ZXh0LmgKaW5kZXggMDFkOTJkYTNlYTQxM2YyNTlmM2U4MGU0MmY0MTgyNmRhZGIz NGZjOC4uNzQwNTA2MDQyMjNkMjhiZDE5NGI4MmRhOTU1YWM2MzZmNWIyZjJiNyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L0xheW91dENvbnRleHQuaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvTGF5b3V0Q29udGV4dC5oCkBAIC01NCwxMyArNTQsMTAgQEAgY2xhc3MgQ29u dGFpbmVyOwogY2xhc3MgTGF5b3V0Q29udGV4dCB7CiAgICAgV1RGX01BS0VfSVNPX0FMTE9DQVRF RChMYXlvdXRDb250ZXh0KTsKIHB1YmxpYzoKLSAgICBMYXlvdXRDb250ZXh0KGNvbnN0IEJveCYg cm9vdCk7CisgICAgTGF5b3V0Q29udGV4dCgpOwogCisgICAgdm9pZCBpbml0aWFsaXplUm9vdChj b25zdCBDb250YWluZXImLCBjb25zdCBMYXlvdXRTaXplJik7CiAgICAgdm9pZCB1cGRhdGVMYXlv dXQoKTsKLQotICAgIERpc3BsYXk6OkJveCYgY3JlYXRlRGlzcGxheUJveChjb25zdCBCb3gmKTsK LSAgICBEaXNwbGF5OjpCb3gqIGRpc3BsYXlCb3hGb3JMYXlvdXRCb3goY29uc3QgQm94JiBsYXlv dXRCb3gpIGNvbnN0IHsgcmV0dXJuIG1fbGF5b3V0VG9EaXNwbGF5Qm94LmdldCgmbGF5b3V0Qm94 KTsgfQotCiAgICAgdm9pZCBzdHlsZUNoYW5nZWQoY29uc3QgQm94JiwgU3R5bGVEaWZmKTsKIAog ICAgIGVudW0gY2xhc3MgVXBkYXRlVHlwZSB7CkBAIC03Niw4ICs3MywxMSBAQCBwdWJsaWM6CiAg ICAgRm9ybWF0dGluZ1N0YXRlJiBlc3RhYmxpc2hlZEZvcm1hdHRpbmdTdGF0ZShjb25zdCBCb3gm IGZvcm1hdHRpbmdDb250ZXh0Um9vdCwgY29uc3QgRm9ybWF0dGluZ0NvbnRleHQmKTsKICAgICBz dGQ6OnVuaXF1ZV9wdHI8Rm9ybWF0dGluZ0NvbnRleHQ+IGZvcm1hdHRpbmdDb250ZXh0KGNvbnN0 IEJveCYgZm9ybWF0dGluZ0NvbnRleHRSb290KTsKIAorICAgIERpc3BsYXk6OkJveCYgY3JlYXRl RGlzcGxheUJveChjb25zdCBCb3gmKTsKKyAgICBEaXNwbGF5OjpCb3gqIGRpc3BsYXlCb3hGb3JM YXlvdXRCb3goY29uc3QgQm94JiBsYXlvdXRCb3gpIGNvbnN0IHsgcmV0dXJuIG1fbGF5b3V0VG9E aXNwbGF5Qm94LmdldCgmbGF5b3V0Qm94KTsgfQorCiBwcml2YXRlOgotICAgIFdlYWtQdHI8Qm94 PiBtX3Jvb3Q7CisgICAgV2Vha1B0cjxDb250YWluZXI+IG1fcm9vdDsKICAgICBIYXNoU2V0PGNv bnN0IENvbnRhaW5lcio+IG1fZm9ybWF0dGluZ0NvbnRleHRSb290TGlzdEZvckxheW91dDsKICAg ICBIYXNoTWFwPGNvbnN0IEJveCosIHN0ZDo6dW5pcXVlX3B0cjxGb3JtYXR0aW5nU3RhdGU+PiBt X2Zvcm1hdHRpbmdTdGF0ZXM7CiAgICAgSGFzaE1hcDxjb25zdCBCb3gqLCBzdGQ6OnVuaXF1ZV9w dHI8RGlzcGxheTo6Qm94Pj4gbV9sYXlvdXRUb0Rpc3BsYXlCb3g7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlld0xheW91dENvbnRleHQuY3BwIGIvU291cmNlL1dlYkNv cmUvcGFnZS9GcmFtZVZpZXdMYXlvdXRDb250ZXh0LmNwcAppbmRleCBhMWQ1ZDEyMjRmMGJlMjI3 MjdhM2UwOTZkMjY5ZWJlODk4ZjYwNGU3Li42YjMzMWFjZjBhZjBkZGY4MzM5YTVmM2NjZTJiMDc5 ZWRiY2IzNTYwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlld0xheW91 dENvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3TGF5b3V0Q29u dGV4dC5jcHAKQEAgLTM5LDEyICszOSwyOSBAQAogI2luY2x1ZGUgIlNjcmlwdERpc2FsbG93ZWRT Y29wZS5oIgogI2luY2x1ZGUgIlNldHRpbmdzLmgiCiAKKyNpZiBFTkFCTEUoTEFZT1VUX0ZPUk1B VFRJTkdfQ09OVEVYVCkKKyNpbmNsdWRlICJMYXlvdXRDb250YWluZXIuaCIKKyNpbmNsdWRlICJM YXlvdXRDb250ZXh0LmgiCisjaW5jbHVkZSAiTGF5b3V0VHJlZUJ1aWxkZXIuaCIKKyNlbmRpZgor CiAjaW5jbHVkZSA8d3RmL1NldEZvclNjb3BlLmg+CiAjaW5jbHVkZSA8d3RmL1N5c3RlbVRyYWNp bmcuaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9UZXh0U3RyZWFtLmg+CiAKIG5hbWVzcGFjZSBXZWJD b3JlIHsKIAorI2lmIEVOQUJMRShMQVlPVVRfRk9STUFUVElOR19DT05URVhUKQorc3RhdGljIHZv aWQgbGF5b3V0VXNpbmdGb3JtYXR0aW5nQ29udGV4dChjb25zdCBSZW5kZXJWaWV3JiByZW5kZXJW aWV3KQoreworICAgIGF1dG8gaW5pdGlhbENvbnRhaW5pbmdCbG9jayA9IExheW91dDo6VHJlZUJ1 aWxkZXI6OmNyZWF0ZUxheW91dFRyZWUocmVuZGVyVmlldyk7CisgICAgYXV0byBsYXlvdXRDb250 ZXh0ID0gc3RkOjptYWtlX3VuaXF1ZTxMYXlvdXQ6OkxheW91dENvbnRleHQ+KCk7CisgICAgbGF5 b3V0Q29udGV4dC0+aW5pdGlhbGl6ZVJvb3QoKmluaXRpYWxDb250YWluaW5nQmxvY2ssIHJlbmRl clZpZXcuc2l6ZSgpKTsKKyAgICBsYXlvdXRDb250ZXh0LT51cGRhdGVMYXlvdXQoKTsKKyAgICBs YXlvdXRDb250ZXh0LT52ZXJpZnlBbmRPdXRwdXRNaXNtYXRjaGluZ0xheW91dFRyZWUocmVuZGVy Vmlldyk7Cit9IAorI2VuZGlmCisKIHN0YXRpYyBib29sIGlzT2JqZWN0QW5jZXN0b3JDb250YWlu ZXJPZihSZW5kZXJFbGVtZW50JiBhbmNlc3RvciwgUmVuZGVyRWxlbWVudCYgZGVzY2VuZGFudCkK IHsKICAgICBmb3IgKGF1dG8qIHJlbmRlcmVyID0gJmRlc2NlbmRhbnQ7IHJlbmRlcmVyOyByZW5k ZXJlciA9IHJlbmRlcmVyLT5jb250YWluZXIoKSkgewpAQCAtMTg5LDYgKzIwNiw5IEBAIHZvaWQg RnJhbWVWaWV3TGF5b3V0Q29udGV4dDo6bGF5b3V0KCkKICAgICAgICAgUmVuZGVyVHJlZU5lZWRz TGF5b3V0Q2hlY2tlciBjaGVja2VyKCpsYXlvdXRSb290KTsKICNlbmRpZgogICAgICAgICBsYXlv dXRSb290LT5sYXlvdXQoKTsKKyNpZiBFTkFCTEUoTEFZT1VUX0ZPUk1BVFRJTkdfQ09OVEVYVCkK KyAgICBsYXlvdXRVc2luZ0Zvcm1hdHRpbmdDb250ZXh0KCpyZW5kZXJWaWV3KCkpOworI2VuZGlm CiAgICAgICAgICsrbV9sYXlvdXRDb3VudDsKICNpZiBFTkFCTEUoVEVYVF9BVVRPU0laSU5HKQog ICAgICAgICBhcHBseVRleHRTaXppbmdJZk5lZWRlZCgqbGF5b3V0Um9vdC5nZXQoKSk7Cg==