221064 2021-01-27 15:17:55 -0800 Remove some uses of FontSelector from within CSSFontFace 2021-01-28 19:50:15 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 208351 1 mmaxfield mmaxfield darin esprehn+autocc ews-watchlist glenn gyuyoung.kim macpherson menard webkit-bug-importer oldest_to_newest 1723173 0 mmaxfield 2021-01-27 15:17:55 -0800 Remove some uses of FontSelector from within CSSFontFace 1723174 1 418588 mmaxfield 2021-01-27 15:19:09 -0800 Created attachment 418588 Patch 1723182 2 418588 darin 2021-01-27 15:40:24 -0800 Comment on attachment 418588 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=418588&action=review > Source/WebCore/css/CSSFontFace.cpp:98 > + , m_shouldIgnoreFontLoadCompletions(m_fontSelector && m_fontSelector->document() ? m_fontSelector->document()->settings().shouldIgnoreFontLoadCompletions() : false) I suggest using && here more instead of using ?: with false. I suggest using fontSelector here instead of m_fontSelector since you plan to remove the latter. > Source/WebCore/css/CSSFontFace.cpp:100 > + , m_allowUserInstalledFonts(m_fontSelector && m_fontSelector->document() && !m_fontSelector->document()->settings().shouldAllowUserInstalledFonts() ? AllowUserInstalledFonts::No : AllowUserInstalledFonts::Yes) I suggest using fontSelector here instead of m_fontSelector since you plan to remove the latter. I think we should try to find a way to get to settings that works even when the font selector is nullptr. I think we should also restructure things so the Settings& is an argument to the constructor. We can have one constructor call another, and the one that takes Settings& can be private. > Source/WebCore/css/CSSFontFace.h:156 > + bool shouldIgnoreFontLoadCompletions() const { return m_shouldIgnoreFontLoadCompletions; }; Unneeded semicolon here after the closing brace. 1723193 3 418595 mmaxfield 2021-01-27 16:01:21 -0800 Created attachment 418595 Patch for committing 1723246 4 ews-feeder 2021-01-27 18:26:23 -0800 ChangeLog entry in Source/WebCore/ChangeLog contains OOPS!. 1723605 5 mmaxfield 2021-01-28 19:49:11 -0800 Committed r272045: <https://trac.webkit.org/changeset/272045> 1723606 6 webkit-bug-importer 2021-01-28 19:50:15 -0800 <rdar://problem/73736861> 418588 2021-01-27 15:19:09 -0800 2021-01-27 15:40:24 -0800 Patch bug-221064-20210127151909.patch text/plain 5292 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxODE1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjc2ZTRmMzRmYmQ0ZjEx Y2U4ZjJjZWYxZWNkZjhmZmYxYTZjMTUwMC4uZWIxNmY3YjA4YzMxMDQ4ODljMDA0YzVlMzk4ZjQz ODRjNzgzNzJlMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIxLTAxLTI3ICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgUmVtb3ZlIHNv bWUgdXNlcyBvZiBGb250U2VsZWN0b3IgZnJvbSB3aXRoaW4gQ1NTRm9udEZhY2UKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMTA2NAorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgaXMgb25lIG9mIHRo ZSBzdGVwcyB0b3dhcmQgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIw ODM1MSAiQ1NTRm9udEZhY2Ugc2hvdWxkCisgICAgICAgIG5vdCBuZWVkIGl0cyBtX2ZvbnRTZWxl Y3RvciBkYXRhIG1lbWJlci4iCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIGJlY2F1c2UgdGhlcmUg aXMgbm8gYmVoYXZpb3IgY2hhbmdlLgorCisgICAgICAgICogY3NzL0NTU0ZvbnRGYWNlLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkNTU0ZvbnRGYWNlOjpDU1NGb250RmFjZSk6CisgICAgICAgIChX ZWJDb3JlOjpDU1NGb250RmFjZTo6Zm9udExvYWRUaW1pbmcgY29uc3QpOgorICAgICAgICAoV2Vi Q29yZTo6Q1NTRm9udEZhY2U6OmFsbG93VXNlckluc3RhbGxlZEZvbnRzIGNvbnN0KTogRGVsZXRl ZC4KKyAgICAgICAgKFdlYkNvcmU6OmZvbnRMb2FkVGltaW5nT3ZlcnJpZGUpOiBEZWxldGVkLgor ICAgICAgICAoV2ViQ29yZTo6Q1NTRm9udEZhY2U6OnNob3VsZElnbm9yZUZvbnRMb2FkQ29tcGxl dGlvbnMgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAqIGNzcy9DU1NGb250RmFjZS5oOgorCiAy MDIxLTAxLTIyICBOaWtvbGFzIFppbW1lcm1hbm4gIDxuemltbWVybWFubkBpZ2FsaWEuY29tPgog CiAgICAgICAgIEZpbmlzaCBpbnRyb2R1Y3Rpb24gb2YgUmVuZGVyTGF5ZXJTY3JvbGxhYmxlQXJl YTogcmVtb3ZlIHJlbWFpbmluZyBnbHVlIGNvZGUgZnJvbSBSZW5kZXJMYXllcgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU0ZvbnRGYWNlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nz cy9DU1NGb250RmFjZS5jcHAKaW5kZXggNThhNzhmNmIwODgxODE5OGE0YjJkZjdmOTkzMGQzYWFl MTUwNGU4Ny4uYjQxN2FkNWViYmQyYzEwYTk0NTE2OTZiYTMzZGEwNmNhNWM4M2M2ZiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU0ZvbnRGYWNlLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9jc3MvQ1NTRm9udEZhY2UuY3BwCkBAIC05NSw2ICs5NSw5IEBAIENTU0ZvbnRGYWNlOjpD U1NGb250RmFjZShDU1NGb250U2VsZWN0b3IqIGZvbnRTZWxlY3RvciwgU3R5bGVSdWxlRm9udEZh Y2UqIGNzc0NvCiAgICAgLCBtX3dyYXBwZXIobWFrZVdlYWtQdHIod3JhcHBlcikpCiAgICAgLCBt X2lzTG9jYWxGYWxsYmFjayhpc0xvY2FsRmFsbGJhY2spCiAgICAgLCBtX21heUJlUHVyZ2VkKCF3 cmFwcGVyKQorICAgICwgbV9zaG91bGRJZ25vcmVGb250TG9hZENvbXBsZXRpb25zKG1fZm9udFNl bGVjdG9yICYmIG1fZm9udFNlbGVjdG9yLT5kb2N1bWVudCgpID8gbV9mb250U2VsZWN0b3ItPmRv Y3VtZW50KCktPnNldHRpbmdzKCkuc2hvdWxkSWdub3JlRm9udExvYWRDb21wbGV0aW9ucygpIDog ZmFsc2UpCisgICAgLCBtX2ZvbnRMb2FkVGltaW5nT3ZlcnJpZGUoZm9udFNlbGVjdG9yICYmIGZv bnRTZWxlY3Rvci0+ZG9jdW1lbnQoKSA/IGZvbnRTZWxlY3Rvci0+ZG9jdW1lbnQoKS0+c2V0dGlu Z3MoKS5mb250TG9hZFRpbWluZ092ZXJyaWRlKCkgOiBGb250TG9hZFRpbWluZ092ZXJyaWRlOjpO b25lKQorICAgICwgbV9hbGxvd1VzZXJJbnN0YWxsZWRGb250cyhtX2ZvbnRTZWxlY3RvciAmJiBt X2ZvbnRTZWxlY3Rvci0+ZG9jdW1lbnQoKSAmJiAhbV9mb250U2VsZWN0b3ItPmRvY3VtZW50KCkt PnNldHRpbmdzKCkuc2hvdWxkQWxsb3dVc2VySW5zdGFsbGVkRm9udHMoKSA/IEFsbG93VXNlcklu c3RhbGxlZEZvbnRzOjpObyA6IEFsbG93VXNlckluc3RhbGxlZEZvbnRzOjpZZXMpCiAgICAgLCBt X3RpbWVvdXRUaW1lcigqdGhpcywgJkNTU0ZvbnRGYWNlOjp0aW1lb3V0RmlyZWQpCiB7CiB9CkBA IC00NTIsMjQgKzQ1NSw5IEBAIERvY3VtZW50KiBDU1NGb250RmFjZTo6ZG9jdW1lbnQoKSBjb25z dAogICAgIHJldHVybiBtX2ZvbnRTZWxlY3RvciA/IG1fZm9udFNlbGVjdG9yLT5kb2N1bWVudCgp IDogbnVsbHB0cjsKIH0KIAotQWxsb3dVc2VySW5zdGFsbGVkRm9udHMgQ1NTRm9udEZhY2U6OmFs bG93VXNlckluc3RhbGxlZEZvbnRzKCkgY29uc3QKLXsKLSAgICBpZiAobV9mb250U2VsZWN0b3Ig JiYgbV9mb250U2VsZWN0b3ItPmRvY3VtZW50KCkpCi0gICAgICAgIHJldHVybiBtX2ZvbnRTZWxl Y3Rvci0+ZG9jdW1lbnQoKS0+c2V0dGluZ3MoKS5zaG91bGRBbGxvd1VzZXJJbnN0YWxsZWRGb250 cygpID8gQWxsb3dVc2VySW5zdGFsbGVkRm9udHM6OlllcyA6IEFsbG93VXNlckluc3RhbGxlZEZv bnRzOjpObzsKLSAgICByZXR1cm4gQWxsb3dVc2VySW5zdGFsbGVkRm9udHM6OlllczsKLX0KLQot c3RhdGljIEZvbnRMb2FkVGltaW5nT3ZlcnJpZGUgZm9udExvYWRUaW1pbmdPdmVycmlkZShDU1NG b250U2VsZWN0b3IqIGZvbnRTZWxlY3RvcikKLXsKLSAgICBhdXRvIG92ZXJyaWRlVmFsdWUgPSBG b250TG9hZFRpbWluZ092ZXJyaWRlOjpOb25lOwotICAgIGlmIChmb250U2VsZWN0b3IgJiYgZm9u dFNlbGVjdG9yLT5kb2N1bWVudCgpKQotICAgICAgICBvdmVycmlkZVZhbHVlID0gZm9udFNlbGVj dG9yLT5kb2N1bWVudCgpLT5zZXR0aW5ncygpLmZvbnRMb2FkVGltaW5nT3ZlcnJpZGUoKTsKLSAg ICByZXR1cm4gb3ZlcnJpZGVWYWx1ZTsKLX0KLQogYXV0byBDU1NGb250RmFjZTo6Zm9udExvYWRU aW1pbmcoKSBjb25zdCAtPiBGb250TG9hZFRpbWluZwogewotICAgIHN3aXRjaCAoZm9udExvYWRU aW1pbmdPdmVycmlkZShtX2ZvbnRTZWxlY3Rvci5nZXQoKSkpIHsKKyAgICBzd2l0Y2ggKG1fZm9u dExvYWRUaW1pbmdPdmVycmlkZSkgewogICAgIGNhc2UgRm9udExvYWRUaW1pbmdPdmVycmlkZTo6 Tm9uZToKICAgICAgICAgc3dpdGNoIChtX2xvYWRpbmdCZWhhdmlvcikgewogICAgICAgICBjYXNl IEZvbnRMb2FkaW5nQmVoYXZpb3I6OkF1dG86CkBAIC01NTksMTMgKzU0Nyw2IEBAIHZvaWQgQ1NT Rm9udEZhY2U6OmZvbnRMb2FkZWQoQ1NTRm9udEZhY2VTb3VyY2UmKQogICAgIGZvbnRMb2FkRXZl bnRPY2N1cnJlZCgpOwogfQogCi1ib29sIENTU0ZvbnRGYWNlOjpzaG91bGRJZ25vcmVGb250TG9h ZENvbXBsZXRpb25zKCkgY29uc3QKLXsKLSAgICBpZiAobV9mb250U2VsZWN0b3IgJiYgbV9mb250 U2VsZWN0b3ItPmRvY3VtZW50KCkpCi0gICAgICAgIHJldHVybiBtX2ZvbnRTZWxlY3Rvci0+ZG9j dW1lbnQoKS0+c2V0dGluZ3MoKS5zaG91bGRJZ25vcmVGb250TG9hZENvbXBsZXRpb25zKCk7Ci0g ICAgcmV0dXJuIGZhbHNlOwotfQotCiB2b2lkIENTU0ZvbnRGYWNlOjpvcHBvcnR1bmlzdGljYWxs eVN0YXJ0Rm9udERhdGFVUkxMb2FkaW5nKENTU0ZvbnRTZWxlY3RvciYgZm9udFNlbGVjdG9yKQog ewogICAgIC8vIFdlIGRvbid0IHdhbnQgdG8gZ28gY3JhenkgaGVyZSBhbmQgYmxvdyB0aGUgY2Fj aGUuIFVzdWFsbHkgdGhlc2UgZGF0YSBVUkxzIGFyZSB0aGUgZmlyc3QgaXRlbSBpbiB0aGUgc3Jj OiBsaXN0LCBzbyBsZXQncyBqdXN0IGNoZWNrIHRoYXQgb25lLgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvY3NzL0NTU0ZvbnRGYWNlLmggYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTRm9udEZh Y2UuaAppbmRleCBmOTJlOWIyYzYyY2ViMWIwYjNlNWVmNmQwMzhmNjdmNDc3MGMxNzExLi43MDg0 N2Y2M2U3Y2IxYmEzOGFkMzY4NGI1YzJjZDM3YWE3ZTExMzI4IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9jc3MvQ1NTRm9udEZhY2UuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTRm9u dEZhY2UuaApAQCAtMjUsNiArMjUsNyBAQAogCiAjcHJhZ21hIG9uY2UKIAorI2luY2x1ZGUgIkZv bnRMb2FkVGltaW5nT3ZlcnJpZGUuaCIKICNpbmNsdWRlICJGb250U2VsZWN0aW9uVmFsdWVJbmxp bmVzLmgiCiAjaW5jbHVkZSAiRm9udFRhZ2dlZFNldHRpbmdzLmgiCiAjaW5jbHVkZSAiU3R5bGVS dWxlLmgiCkBAIC0xNTIsMTEgKzE1MywxMSBAQCBwdWJsaWM6CiAgICAgICAgIFNlY29uZHMgc3dh cFBlcmlvZDsKICAgICB9OwogICAgIEZvbnRMb2FkVGltaW5nIGZvbnRMb2FkVGltaW5nKCkgY29u c3Q7Ci0gICAgYm9vbCBzaG91bGRJZ25vcmVGb250TG9hZENvbXBsZXRpb25zKCkgY29uc3Q7Cisg ICAgYm9vbCBzaG91bGRJZ25vcmVGb250TG9hZENvbXBsZXRpb25zKCkgY29uc3QgeyByZXR1cm4g bV9zaG91bGRJZ25vcmVGb250TG9hZENvbXBsZXRpb25zOyB9OwogCiAgICAgYm9vbCBwdXJnZWFi bGUoKSBjb25zdDsKIAotICAgIEFsbG93VXNlckluc3RhbGxlZEZvbnRzIGFsbG93VXNlckluc3Rh bGxlZEZvbnRzKCkgY29uc3Q7CisgICAgQWxsb3dVc2VySW5zdGFsbGVkRm9udHMgYWxsb3dVc2Vy SW5zdGFsbGVkRm9udHMoKSBjb25zdCB7IHJldHVybiBtX2FsbG93VXNlckluc3RhbGxlZEZvbnRz OyB9CiAKICAgICB2b2lkIHVwZGF0ZVN0eWxlSWZOZWVkZWQoKTsKIApAQCAtMTk0LDYgKzE5NSw5 IEBAIHByaXZhdGU6CiAgICAgYm9vbCBtX2lzTG9jYWxGYWxsYmFjayB7IGZhbHNlIH07CiAgICAg Ym9vbCBtX3NvdXJjZXNQb3B1bGF0ZWQgeyBmYWxzZSB9OwogICAgIGJvb2wgbV9tYXlCZVB1cmdl ZCB7IHRydWUgfTsKKyAgICBib29sIG1fc2hvdWxkSWdub3JlRm9udExvYWRDb21wbGV0aW9ucyB7 IGZhbHNlIH07CisgICAgRm9udExvYWRUaW1pbmdPdmVycmlkZSBtX2ZvbnRMb2FkVGltaW5nT3Zl cnJpZGUgeyBGb250TG9hZFRpbWluZ092ZXJyaWRlOjpOb25lIH07CisgICAgQWxsb3dVc2VySW5z dGFsbGVkRm9udHMgbV9hbGxvd1VzZXJJbnN0YWxsZWRGb250cyB7IEFsbG93VXNlckluc3RhbGxl ZEZvbnRzOjpZZXMgfTsKIAogICAgIFRpbWVyIG1fdGltZW91dFRpbWVyOwogfTsK 418595 2021-01-27 16:01:21 -0800 2021-01-27 18:26:24 -0800 Patch for committing bug-221064-20210127160120.patch text/plain 6092 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxODE1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjc2ZTRmMzRmYmQ0ZjEx Y2U4ZjJjZWYxZWNkZjhmZmYxYTZjMTUwMC4uZWIxNmY3YjA4YzMxMDQ4ODljMDA0YzVlMzk4ZjQz ODRjNzgzNzJlMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIxLTAxLTI3ICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgUmVtb3ZlIHNv bWUgdXNlcyBvZiBGb250U2VsZWN0b3IgZnJvbSB3aXRoaW4gQ1NTRm9udEZhY2UKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMTA2NAorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgaXMgb25lIG9mIHRo ZSBzdGVwcyB0b3dhcmQgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIw ODM1MSAiQ1NTRm9udEZhY2Ugc2hvdWxkCisgICAgICAgIG5vdCBuZWVkIGl0cyBtX2ZvbnRTZWxl Y3RvciBkYXRhIG1lbWJlci4iCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIGJlY2F1c2UgdGhlcmUg aXMgbm8gYmVoYXZpb3IgY2hhbmdlLgorCisgICAgICAgICogY3NzL0NTU0ZvbnRGYWNlLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkNTU0ZvbnRGYWNlOjpDU1NGb250RmFjZSk6CisgICAgICAgIChX ZWJDb3JlOjpDU1NGb250RmFjZTo6Zm9udExvYWRUaW1pbmcgY29uc3QpOgorICAgICAgICAoV2Vi Q29yZTo6Q1NTRm9udEZhY2U6OmFsbG93VXNlckluc3RhbGxlZEZvbnRzIGNvbnN0KTogRGVsZXRl ZC4KKyAgICAgICAgKFdlYkNvcmU6OmZvbnRMb2FkVGltaW5nT3ZlcnJpZGUpOiBEZWxldGVkLgor ICAgICAgICAoV2ViQ29yZTo6Q1NTRm9udEZhY2U6OnNob3VsZElnbm9yZUZvbnRMb2FkQ29tcGxl dGlvbnMgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAqIGNzcy9DU1NGb250RmFjZS5oOgorCiAy MDIxLTAxLTIyICBOaWtvbGFzIFppbW1lcm1hbm4gIDxuemltbWVybWFubkBpZ2FsaWEuY29tPgog CiAgICAgICAgIEZpbmlzaCBpbnRyb2R1Y3Rpb24gb2YgUmVuZGVyTGF5ZXJTY3JvbGxhYmxlQXJl YTogcmVtb3ZlIHJlbWFpbmluZyBnbHVlIGNvZGUgZnJvbSBSZW5kZXJMYXllcgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU0ZvbnRGYWNlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nz cy9DU1NGb250RmFjZS5jcHAKaW5kZXggNThhNzhmNmIwODgxODE5OGE0YjJkZjdmOTkzMGQzYWFl MTUwNGU4Ny4uODVlYmU1NmFlMmY5NTNhOTBjNmE5ZDNjZTcxNTk1NjUzYjRjNDhmZiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU0ZvbnRGYWNlLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9jc3MvQ1NTRm9udEZhY2UuY3BwCkBAIC05MCwxMSArOTAsMTkgQEAgdm9pZCBDU1NGb250 RmFjZTo6YXBwZW5kU291cmNlcyhDU1NGb250RmFjZSYgZm9udEZhY2UsIENTU1ZhbHVlTGlzdCYg c3JjTGlzdCwgRG8KIH0KIAogQ1NTRm9udEZhY2U6OkNTU0ZvbnRGYWNlKENTU0ZvbnRTZWxlY3Rv ciogZm9udFNlbGVjdG9yLCBTdHlsZVJ1bGVGb250RmFjZSogY3NzQ29ubmVjdGlvbiwgRm9udEZh Y2UqIHdyYXBwZXIsIGJvb2wgaXNMb2NhbEZhbGxiYWNrKQotICAgIDogbV9mb250U2VsZWN0b3Io bWFrZVdlYWtQdHIoZm9udFNlbGVjdG9yKSkKLSAgICAsIG1fY3NzQ29ubmVjdGlvbihjc3NDb25u ZWN0aW9uKQorICAgIDogQ1NTRm9udEZhY2UoZm9udFNlbGVjdG9yICYmIGZvbnRTZWxlY3Rvci0+ ZG9jdW1lbnQoKSA/ICZmb250U2VsZWN0b3ItPmRvY3VtZW50KCktPnNldHRpbmdzKCkgOiBudWxs cHRyLCBjc3NDb25uZWN0aW9uLCB3cmFwcGVyLCBpc0xvY2FsRmFsbGJhY2spCit7CisgICAgbV9m b250U2VsZWN0b3IgPSBtYWtlV2Vha1B0cihmb250U2VsZWN0b3IpOyAvLyBGSVhNRTogSWRlYWxs eSB0aGlzIGRhdGEgbWVtYmVyIHdvdWxkIGdvIGF3YXkgKGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yMDgzNTEpLgorfQorCitDU1NGb250RmFjZTo6Q1NTRm9udEZhY2Uo Y29uc3QgU2V0dGluZ3MqIHNldHRpbmdzLCBTdHlsZVJ1bGVGb250RmFjZSogY3NzQ29ubmVjdGlv biwgRm9udEZhY2UqIHdyYXBwZXIsIGJvb2wgaXNMb2NhbEZhbGxiYWNrKQorICAgIDogbV9jc3ND b25uZWN0aW9uKGNzc0Nvbm5lY3Rpb24pCiAgICAgLCBtX3dyYXBwZXIobWFrZVdlYWtQdHIod3Jh cHBlcikpCiAgICAgLCBtX2lzTG9jYWxGYWxsYmFjayhpc0xvY2FsRmFsbGJhY2spCiAgICAgLCBt X21heUJlUHVyZ2VkKCF3cmFwcGVyKQorICAgICwgbV9zaG91bGRJZ25vcmVGb250TG9hZENvbXBs ZXRpb25zKHNldHRpbmdzICYmIHNldHRpbmdzLT5zaG91bGRJZ25vcmVGb250TG9hZENvbXBsZXRp b25zKCkpCisgICAgLCBtX2ZvbnRMb2FkVGltaW5nT3ZlcnJpZGUoc2V0dGluZ3MgPyBzZXR0aW5n cy0+Zm9udExvYWRUaW1pbmdPdmVycmlkZSgpIDogRm9udExvYWRUaW1pbmdPdmVycmlkZTo6Tm9u ZSkKKyAgICAsIG1fYWxsb3dVc2VySW5zdGFsbGVkRm9udHMoc2V0dGluZ3MgJiYgIXNldHRpbmdz LT5zaG91bGRBbGxvd1VzZXJJbnN0YWxsZWRGb250cygpID8gQWxsb3dVc2VySW5zdGFsbGVkRm9u dHM6Ok5vIDogQWxsb3dVc2VySW5zdGFsbGVkRm9udHM6OlllcykKICAgICAsIG1fdGltZW91dFRp bWVyKCp0aGlzLCAmQ1NTRm9udEZhY2U6OnRpbWVvdXRGaXJlZCkKIHsKIH0KQEAgLTQ1MiwyNCAr NDYwLDkgQEAgRG9jdW1lbnQqIENTU0ZvbnRGYWNlOjpkb2N1bWVudCgpIGNvbnN0CiAgICAgcmV0 dXJuIG1fZm9udFNlbGVjdG9yID8gbV9mb250U2VsZWN0b3ItPmRvY3VtZW50KCkgOiBudWxscHRy OwogfQogCi1BbGxvd1VzZXJJbnN0YWxsZWRGb250cyBDU1NGb250RmFjZTo6YWxsb3dVc2VySW5z dGFsbGVkRm9udHMoKSBjb25zdAotewotICAgIGlmIChtX2ZvbnRTZWxlY3RvciAmJiBtX2ZvbnRT ZWxlY3Rvci0+ZG9jdW1lbnQoKSkKLSAgICAgICAgcmV0dXJuIG1fZm9udFNlbGVjdG9yLT5kb2N1 bWVudCgpLT5zZXR0aW5ncygpLnNob3VsZEFsbG93VXNlckluc3RhbGxlZEZvbnRzKCkgPyBBbGxv d1VzZXJJbnN0YWxsZWRGb250czo6WWVzIDogQWxsb3dVc2VySW5zdGFsbGVkRm9udHM6Ok5vOwot ICAgIHJldHVybiBBbGxvd1VzZXJJbnN0YWxsZWRGb250czo6WWVzOwotfQotCi1zdGF0aWMgRm9u dExvYWRUaW1pbmdPdmVycmlkZSBmb250TG9hZFRpbWluZ092ZXJyaWRlKENTU0ZvbnRTZWxlY3Rv ciogZm9udFNlbGVjdG9yKQotewotICAgIGF1dG8gb3ZlcnJpZGVWYWx1ZSA9IEZvbnRMb2FkVGlt aW5nT3ZlcnJpZGU6Ok5vbmU7Ci0gICAgaWYgKGZvbnRTZWxlY3RvciAmJiBmb250U2VsZWN0b3It PmRvY3VtZW50KCkpCi0gICAgICAgIG92ZXJyaWRlVmFsdWUgPSBmb250U2VsZWN0b3ItPmRvY3Vt ZW50KCktPnNldHRpbmdzKCkuZm9udExvYWRUaW1pbmdPdmVycmlkZSgpOwotICAgIHJldHVybiBv dmVycmlkZVZhbHVlOwotfQotCiBhdXRvIENTU0ZvbnRGYWNlOjpmb250TG9hZFRpbWluZygpIGNv bnN0IC0+IEZvbnRMb2FkVGltaW5nCiB7Ci0gICAgc3dpdGNoIChmb250TG9hZFRpbWluZ092ZXJy aWRlKG1fZm9udFNlbGVjdG9yLmdldCgpKSkgeworICAgIHN3aXRjaCAobV9mb250TG9hZFRpbWlu Z092ZXJyaWRlKSB7CiAgICAgY2FzZSBGb250TG9hZFRpbWluZ092ZXJyaWRlOjpOb25lOgogICAg ICAgICBzd2l0Y2ggKG1fbG9hZGluZ0JlaGF2aW9yKSB7CiAgICAgICAgIGNhc2UgRm9udExvYWRp bmdCZWhhdmlvcjo6QXV0bzoKQEAgLTU1OSwxMyArNTUyLDYgQEAgdm9pZCBDU1NGb250RmFjZTo6 Zm9udExvYWRlZChDU1NGb250RmFjZVNvdXJjZSYpCiAgICAgZm9udExvYWRFdmVudE9jY3VycmVk KCk7CiB9CiAKLWJvb2wgQ1NTRm9udEZhY2U6OnNob3VsZElnbm9yZUZvbnRMb2FkQ29tcGxldGlv bnMoKSBjb25zdAotewotICAgIGlmIChtX2ZvbnRTZWxlY3RvciAmJiBtX2ZvbnRTZWxlY3Rvci0+ ZG9jdW1lbnQoKSkKLSAgICAgICAgcmV0dXJuIG1fZm9udFNlbGVjdG9yLT5kb2N1bWVudCgpLT5z ZXR0aW5ncygpLnNob3VsZElnbm9yZUZvbnRMb2FkQ29tcGxldGlvbnMoKTsKLSAgICByZXR1cm4g ZmFsc2U7Ci19Ci0KIHZvaWQgQ1NTRm9udEZhY2U6Om9wcG9ydHVuaXN0aWNhbGx5U3RhcnRGb250 RGF0YVVSTExvYWRpbmcoQ1NTRm9udFNlbGVjdG9yJiBmb250U2VsZWN0b3IpCiB7CiAgICAgLy8g V2UgZG9uJ3Qgd2FudCB0byBnbyBjcmF6eSBoZXJlIGFuZCBibG93IHRoZSBjYWNoZS4gVXN1YWxs eSB0aGVzZSBkYXRhIFVSTHMgYXJlIHRoZSBmaXJzdCBpdGVtIGluIHRoZSBzcmM6IGxpc3QsIHNv IGxldCdzIGp1c3QgY2hlY2sgdGhhdCBvbmUuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9j c3MvQ1NTRm9udEZhY2UuaCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NGb250RmFjZS5oCmluZGV4 IGY5MmU5YjJjNjJjZWIxYjBiM2U1ZWY2ZDAzOGY2N2Y0NzcwYzE3MTEuLjA1ZDI5NWM0NmZhMzFm N2FjYTgzMGMxMTljYmI3ZDM3YTFhY2NmMDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nz cy9DU1NGb250RmFjZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NGb250RmFjZS5oCkBA IC0yNSw2ICsyNSw3IEBACiAKICNwcmFnbWEgb25jZQogCisjaW5jbHVkZSAiRm9udExvYWRUaW1p bmdPdmVycmlkZS5oIgogI2luY2x1ZGUgIkZvbnRTZWxlY3Rpb25WYWx1ZUlubGluZXMuaCIKICNp bmNsdWRlICJGb250VGFnZ2VkU2V0dGluZ3MuaCIKICNpbmNsdWRlICJTdHlsZVJ1bGUuaCIKQEAg LTE1MiwxMSArMTUzLDExIEBAIHB1YmxpYzoKICAgICAgICAgU2Vjb25kcyBzd2FwUGVyaW9kOwog ICAgIH07CiAgICAgRm9udExvYWRUaW1pbmcgZm9udExvYWRUaW1pbmcoKSBjb25zdDsKLSAgICBi b29sIHNob3VsZElnbm9yZUZvbnRMb2FkQ29tcGxldGlvbnMoKSBjb25zdDsKKyAgICBib29sIHNo b3VsZElnbm9yZUZvbnRMb2FkQ29tcGxldGlvbnMoKSBjb25zdCB7IHJldHVybiBtX3Nob3VsZEln bm9yZUZvbnRMb2FkQ29tcGxldGlvbnM7IH0KIAogICAgIGJvb2wgcHVyZ2VhYmxlKCkgY29uc3Q7 CiAKLSAgICBBbGxvd1VzZXJJbnN0YWxsZWRGb250cyBhbGxvd1VzZXJJbnN0YWxsZWRGb250cygp IGNvbnN0OworICAgIEFsbG93VXNlckluc3RhbGxlZEZvbnRzIGFsbG93VXNlckluc3RhbGxlZEZv bnRzKCkgY29uc3QgeyByZXR1cm4gbV9hbGxvd1VzZXJJbnN0YWxsZWRGb250czsgfQogCiAgICAg dm9pZCB1cGRhdGVTdHlsZUlmTmVlZGVkKCk7CiAKQEAgLTE2Nyw2ICsxNjgsNyBAQCBwdWJsaWM6 CiAKIHByaXZhdGU6CiAgICAgQ1NTRm9udEZhY2UoQ1NTRm9udFNlbGVjdG9yKiwgU3R5bGVSdWxl Rm9udEZhY2UqLCBGb250RmFjZSosIGJvb2wgaXNMb2NhbEZhbGxiYWNrKTsKKyAgICBDU1NGb250 RmFjZShjb25zdCBTZXR0aW5ncyosIFN0eWxlUnVsZUZvbnRGYWNlKiwgRm9udEZhY2UqLCBib29s IGlzTG9jYWxGYWxsYmFjayk7CiAKICAgICBzaXplX3QgcHVtcChFeHRlcm5hbFJlc291cmNlRG93 bmxvYWRQb2xpY3kpOwogICAgIHZvaWQgc2V0U3RhdHVzKFN0YXR1cyk7CkBAIC0xOTQsNiArMTk2 LDkgQEAgcHJpdmF0ZToKICAgICBib29sIG1faXNMb2NhbEZhbGxiYWNrIHsgZmFsc2UgfTsKICAg ICBib29sIG1fc291cmNlc1BvcHVsYXRlZCB7IGZhbHNlIH07CiAgICAgYm9vbCBtX21heUJlUHVy Z2VkIHsgdHJ1ZSB9OworICAgIGJvb2wgbV9zaG91bGRJZ25vcmVGb250TG9hZENvbXBsZXRpb25z IHsgZmFsc2UgfTsKKyAgICBGb250TG9hZFRpbWluZ092ZXJyaWRlIG1fZm9udExvYWRUaW1pbmdP dmVycmlkZSB7IEZvbnRMb2FkVGltaW5nT3ZlcnJpZGU6Ok5vbmUgfTsKKyAgICBBbGxvd1VzZXJJ bnN0YWxsZWRGb250cyBtX2FsbG93VXNlckluc3RhbGxlZEZvbnRzIHsgQWxsb3dVc2VySW5zdGFs bGVkRm9udHM6OlllcyB9OwogCiAgICAgVGltZXIgbV90aW1lb3V0VGltZXI7CiB9Owo=