154424 2016-02-18 16:01:19 -0800 Enhance EditorState to include TypingAttributes, alignment, and color 2016-02-19 14:15:39 -0800 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 bdakin webkit-unassigned bdakin enrica sam thorton oldest_to_newest 1166235 0 bdakin 2016-02-18 16:01:19 -0800 Enhance EditorState to include TypingAttributes, alignment, and color 1166237 1 271713 bdakin 2016-02-18 16:03:48 -0800 Created attachment 271713 Patch 1166246 2 271713 dino 2016-02-18 16:24:55 -0800 Comment on attachment 271713 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=271713&action=review > Source/WebKit2/Shared/EditorState.h:48 > +enum TextAlignment { enum class? 1166248 3 271713 sam 2016-02-18 16:34:17 -0800 Comment on attachment 271713 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=271713&action=review > Source/WebKit2/Shared/EditorState.h:95 > + WebCore::Color textColor { WebCore::Color::black }; Since not every platform has these implemented, should they remain enabled? Can we refactor at all to make these supported on all platforms? > Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm:160 > + if (RenderStyle* style = Editor::styleForSelectionStart(&frame, nodeToRemove)) { > + NSFont *font = style->fontCascade().primaryFont().getNSFont(); > + NSFontTraitMask traits = [[NSFontManager sharedFontManager] traitsOfFont:font]; > + > + if (traits & NSBoldFontMask) > + postLayoutData.typingAttributes |= AttributeBold; > + if (traits & NSItalicFontMask) > + postLayoutData.typingAttributes |= AttributeItalics; > + Can this be done by doing: if (style->fontCascade().weight() == FontWeightBold) postLayoutData.typingAttributes |= AttributeBold; if (style->fontCascade().italic() == FontItalicOn) postLayoutData.typingAttributes |= AttributeItalics; or just look at the style itself? > Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm:200 > + nodeToRemove->remove(ASSERT_NO_EXCEPTION); > + } Can any of this be shared across Mac and iOS? 1166541 4 bdakin 2016-02-19 14:15:39 -0800 Thanks Sam and Dean! http://trac.webkit.org/changeset/196834 271713 2016-02-18 16:03:48 -0800 2016-02-19 10:04:27 -0800 Patch for-review.txt text/plain 7141 bdakin SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE5Njc4MykKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDE2LTAyLTE4ICBCZXRoIERh a2luICA8YmRha2luQGFwcGxlLmNvbT4KKworICAgICAgICBFbmhhbmNlIEVkaXRvclN0YXRlIHRv IGluY2x1ZGUgVHlwaW5nQXR0cmlidXRlcywgYWxpZ25tZW50LCBhbmQgY29sb3IKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1NDQyNAorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFR5cGluZ0F0dHJpYnV0ZXMg aXMgYWxyZWFkeSBhdmFpbGFibGUgZm9yIGlPUyBhbmQgR1RLLCBzbyB0aGlzIHBhdGNoIGhvb2tz IAorICAgICAgICB0aGF0IHVwIG9uIE1hYyBhcyB3ZWxsLiBUaGlzIHBhdGNoIGFsc28gYWRkcyB0 ZXh0Q29sb3IgYW5kIHRleHRBbGlnbm1lbnQgdG8gCisgICAgICAgIEVkaXRvclN0YXRlLgorICAg ICAgICAqIFNoYXJlZC9FZGl0b3JTdGF0ZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OkVkaXRvclN0 YXRlOjpQb3N0TGF5b3V0RGF0YTo6ZW5jb2RlKToKKyAgICAgICAgKFdlYktpdDo6RWRpdG9yU3Rh dGU6OlBvc3RMYXlvdXREYXRhOjpkZWNvZGUpOgorICAgICAgICAqIFNoYXJlZC9FZGl0b3JTdGF0 ZS5oOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9tYWMvV2ViUGFnZU1hYy5tbToKKyAg ICAgICAgKFdlYktpdDo6V2ViUGFnZTo6cGxhdGZvcm1FZGl0b3JTdGF0ZSk6CisgICAgICAgIChX ZWJLaXQ6OldlYlBhZ2U6OmhhbmRsZUFjY2VwdGVkQ2FuZGlkYXRlKToKKwogMjAxNi0wMi0xOCAg QnJhZHkgRWlkc29uICA8YmVpZHNvbkBhcHBsZS5jb20+CiAKICAgICAgICAgTW9kZXJuIElEQjog SW1wbGVtZW50IHNlcnZlci0+Y2xpZW50IG9wZXJhdGlvbnMgaW4gV0syLgpJbmRleDogU291cmNl L1dlYktpdDIvU2hhcmVkL0VkaXRvclN0YXRlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9TaGFyZWQvRWRpdG9yU3RhdGUuY3BwCShyZXZpc2lvbiAxOTY2NDApCisrKyBTb3VyY2Uv V2ViS2l0Mi9TaGFyZWQvRWRpdG9yU3RhdGUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMDYsOCAr MTA2LDggQEAgYm9vbCBFZGl0b3JTdGF0ZTo6ZGVjb2RlKElQQzo6QXJndW1lbnREZQogI2lmIFBM QVRGT1JNKElPUykgfHwgUExBVEZPUk0oR1RLKSB8fCBQTEFURk9STShNQUMpCiB2b2lkIEVkaXRv clN0YXRlOjpQb3N0TGF5b3V0RGF0YTo6ZW5jb2RlKElQQzo6QXJndW1lbnRFbmNvZGVyJiBlbmNv ZGVyKSBjb25zdAogewotI2lmIFBMQVRGT1JNKElPUykgfHwgUExBVEZPUk0oR1RLKQogICAgIGVu Y29kZXIgPDwgdHlwaW5nQXR0cmlidXRlczsKKyNpZiBQTEFURk9STShJT1MpIHx8IFBMQVRGT1JN KEdUSykKICAgICBlbmNvZGVyIDw8IGNhcmV0UmVjdEF0U3RhcnQ7CiAjZW5kaWYKICNpZiBQTEFU Rk9STShJT1MpIHx8IFBMQVRGT1JNKE1BQykKQEAgLTEyNCw2ICsxMjQsOCBAQCB2b2lkIEVkaXRv clN0YXRlOjpQb3N0TGF5b3V0RGF0YTo6ZW5jb2RlCiAgICAgZW5jb2RlciA8PCBpc1JlcGxhY2VB bGxvd2VkOwogICAgIGVuY29kZXIgPDwgaGFzQ29udGVudDsKICNlbmRpZgorICAgIGVuY29kZXIg PDwgdGV4dEFsaWdubWVudDsKKyAgICBlbmNvZGVyIDw8IHRleHRDb2xvcjsKICNpZiBQTEFURk9S TShNQUMpCiAgICAgZW5jb2RlciA8PCBjYW5kaWRhdGVSZXF1ZXN0U3RhcnRQb3NpdGlvbjsKICAg ICBlbmNvZGVyIDw8IHBhcmFncmFwaENvbnRleHRGb3JDYW5kaWRhdGVSZXF1ZXN0OwpAQCAtMTMz LDkgKzEzNSw5IEBAIHZvaWQgRWRpdG9yU3RhdGU6OlBvc3RMYXlvdXREYXRhOjplbmNvZGUKIAog Ym9vbCBFZGl0b3JTdGF0ZTo6UG9zdExheW91dERhdGE6OmRlY29kZShJUEM6OkFyZ3VtZW50RGVj b2RlciYgZGVjb2RlciwgUG9zdExheW91dERhdGEmIHJlc3VsdCkKIHsKLSNpZiBQTEFURk9STShJ T1MpIHx8IFBMQVRGT1JNKEdUSykKICAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHJlc3VsdC50eXBp bmdBdHRyaWJ1dGVzKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOworI2lmIFBMQVRGT1JNKElPUykg fHwgUExBVEZPUk0oR1RLKQogICAgIGlmICghZGVjb2Rlci5kZWNvZGUocmVzdWx0LmNhcmV0UmVj dEF0U3RhcnQpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAjZW5kaWYKQEAgLTE2Myw2ICsxNjUs MTAgQEAgYm9vbCBFZGl0b3JTdGF0ZTo6UG9zdExheW91dERhdGE6OmRlY29kZQogICAgIGlmICgh ZGVjb2Rlci5kZWNvZGUocmVzdWx0Lmhhc0NvbnRlbnQpKQogICAgICAgICByZXR1cm4gZmFsc2U7 CiAjZW5kaWYKKyAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHJlc3VsdC50ZXh0QWxpZ25tZW50KSkK KyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIGlmICghZGVjb2Rlci5kZWNvZGUocmVzdWx0LnRl eHRDb2xvcikpCisgICAgICAgIHJldHVybiBmYWxzZTsKICNpZiBQTEFURk9STShNQUMpCiAgICAg aWYgKCFkZWNvZGVyLmRlY29kZShyZXN1bHQuY2FuZGlkYXRlUmVxdWVzdFN0YXJ0UG9zaXRpb24p KQogICAgICAgICByZXR1cm4gZmFsc2U7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvRWRp dG9yU3RhdGUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvRWRpdG9yU3Rh dGUuaAkocmV2aXNpb24gMTk2NjQwKQorKysgU291cmNlL1dlYktpdDIvU2hhcmVkL0VkaXRvclN0 YXRlLmgJKHdvcmtpbmcgY29weSkKQEAgLTI3LDYgKzI3LDcgQEAKICNkZWZpbmUgRWRpdG9yU3Rh dGVfaAogCiAjaW5jbHVkZSAiQXJndW1lbnRDb2RlcnMuaCIKKyNpbmNsdWRlIDxXZWJDb3JlL0Nv bG9yLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9JbnRSZWN0Lmg+CiAjaW5jbHVkZSA8d3RmL3RleHQv V1RGU3RyaW5nLmg+CiAKQEAgLTQ0LDYgKzQ1LDE0IEBAIGVudW0gVHlwaW5nQXR0cmlidXRlcyB7 CiAgICAgQXR0cmlidXRlU3RyaWtlVGhyb3VnaCA9IDgKIH07CiAKK2VudW0gVGV4dEFsaWdubWVu dCB7CisgICAgTm9BbGlnbm1lbnQgPSAwLAorICAgIExlZnRBbGlnbm1lbnQgPSAxLAorICAgIFJp Z2h0QWxpZ25tZW50ID0gMiwKKyAgICBDZW50ZXJBbGlnbm1lbnQgPSAzLAorICAgIEp1c3RpZmll ZEFsaWdubWVudCA9IDQsCit9OworCiBzdHJ1Y3QgRWRpdG9yU3RhdGUgewogICAgIGJvb2wgc2hv dWxkSWdub3JlQ29tcG9zaXRpb25TZWxlY3Rpb25DaGFuZ2UgeyBmYWxzZSB9OwogCkBAIC02NCw4 ICs3Myw4IEBAIHN0cnVjdCBFZGl0b3JTdGF0ZSB7CiAKICNpZiBQTEFURk9STShJT1MpIHx8IFBM QVRGT1JNKEdUSykgfHwgUExBVEZPUk0oTUFDKQogICAgIHN0cnVjdCBQb3N0TGF5b3V0RGF0YSB7 Ci0jaWYgUExBVEZPUk0oSU9TKSB8fCBQTEFURk9STShHVEspCiAgICAgICAgIHVpbnQzMl90IHR5 cGluZ0F0dHJpYnV0ZXMgeyBBdHRyaWJ1dGVOb25lIH07CisjaWYgUExBVEZPUk0oSU9TKSB8fCBQ TEFURk9STShHVEspCiAgICAgICAgIFdlYkNvcmU6OkludFJlY3QgY2FyZXRSZWN0QXRTdGFydDsK ICNlbmRpZgogI2lmIFBMQVRGT1JNKElPUykgfHwgUExBVEZPUk0oTUFDKQpAQCAtODIsNiArOTEs OCBAQCBzdHJ1Y3QgRWRpdG9yU3RhdGUgewogICAgICAgICBib29sIGlzUmVwbGFjZUFsbG93ZWQg eyBmYWxzZSB9OwogICAgICAgICBib29sIGhhc0NvbnRlbnQgeyBmYWxzZSB9OwogI2VuZGlmCisg ICAgICAgIHVpbnQzMl90IHRleHRBbGlnbm1lbnQgeyBOb0FsaWdubWVudCB9OworICAgICAgICBX ZWJDb3JlOjpDb2xvciB0ZXh0Q29sb3IgeyBXZWJDb3JlOjpDb2xvcjo6YmxhY2sgfTsKICNpZiBQ TEFURk9STShNQUMpCiAgICAgICAgIHVpbnQ2NF90IGNhbmRpZGF0ZVJlcXVlc3RTdGFydFBvc2l0 aW9uIHsgMCB9OwogICAgICAgICBTdHJpbmcgcGFyYWdyYXBoQ29udGV4dEZvckNhbmRpZGF0ZVJl cXVlc3Q7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1dlYlBh Z2VNYWMubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdl L21hYy9XZWJQYWdlTWFjLm1tCShyZXZpc2lvbiAxOTY2NDApCisrKyBTb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1dlYlBhZ2VNYWMubW0JKHdvcmtpbmcgY29weSkKQEAgLTE0 Niw2ICsxNDYsNTkgQEAgdm9pZCBXZWJQYWdlOjpwbGF0Zm9ybUVkaXRvclN0YXRlKEZyYW1lJgog ICAgIHNlbGVjdGVkUmFuZ2UtPmFic29sdXRlVGV4dFF1YWRzKHF1YWRzKTsKICAgICBpZiAoIXF1 YWRzLmlzRW1wdHkoKSkKICAgICAgICAgcG9zdExheW91dERhdGEuc2VsZWN0aW9uQ2xpcFJlY3Qg PSBmcmFtZS52aWV3KCktPmNvbnRlbnRzVG9XaW5kb3cocXVhZHNbMF0uZW5jbG9zaW5nQm91bmRp bmdCb3goKSk7CisKKyAgICBpZiAoIXNlbGVjdGlvbi5pc05vbmUoKSkgeworICAgICAgICBOb2Rl KiBub2RlVG9SZW1vdmU7CisgICAgICAgIGlmIChSZW5kZXJTdHlsZSogc3R5bGUgPSBFZGl0b3I6 OnN0eWxlRm9yU2VsZWN0aW9uU3RhcnQoJmZyYW1lLCBub2RlVG9SZW1vdmUpKSB7CisgICAgICAg ICAgICBOU0ZvbnQgKmZvbnQgPSBzdHlsZS0+Zm9udENhc2NhZGUoKS5wcmltYXJ5Rm9udCgpLmdl dE5TRm9udCgpOworICAgICAgICAgICAgTlNGb250VHJhaXRNYXNrIHRyYWl0cyA9IFtbTlNGb250 TWFuYWdlciBzaGFyZWRGb250TWFuYWdlcl0gdHJhaXRzT2ZGb250OmZvbnRdOworCisgICAgICAg ICAgICBpZiAodHJhaXRzICYgTlNCb2xkRm9udE1hc2spCisgICAgICAgICAgICAgICAgcG9zdExh eW91dERhdGEudHlwaW5nQXR0cmlidXRlcyB8PSBBdHRyaWJ1dGVCb2xkOworICAgICAgICAgICAg aWYgKHRyYWl0cyAmIE5TSXRhbGljRm9udE1hc2spCisgICAgICAgICAgICAgICAgcG9zdExheW91 dERhdGEudHlwaW5nQXR0cmlidXRlcyB8PSBBdHRyaWJ1dGVJdGFsaWNzOworICAgICAgICAgICAg CisgICAgICAgICAgICBSZWZQdHI8RWRpdGluZ1N0eWxlPiB0eXBpbmdTdHlsZSA9IGZyYW1lLnNl bGVjdGlvbigpLnR5cGluZ1N0eWxlKCk7CisgICAgICAgICAgICBpZiAodHlwaW5nU3R5bGUgJiYg dHlwaW5nU3R5bGUtPnN0eWxlKCkpIHsKKyAgICAgICAgICAgICAgICBTdHJpbmcgdmFsdWUgPSB0 eXBpbmdTdHlsZS0+c3R5bGUoKS0+Z2V0UHJvcGVydHlWYWx1ZShDU1NQcm9wZXJ0eVdlYmtpdFRl eHREZWNvcmF0aW9uc0luRWZmZWN0KTsKKyAgICAgICAgICAgICAgICBpZiAodmFsdWUuY29udGFp bnMoInVuZGVybGluZSIpKQorICAgICAgICAgICAgICAgICAgICBwb3N0TGF5b3V0RGF0YS50eXBp bmdBdHRyaWJ1dGVzIHw9IEF0dHJpYnV0ZVVuZGVybGluZTsKKyAgICAgICAgICAgIH0gZWxzZSB7 CisgICAgICAgICAgICAgICAgaWYgKHN0eWxlLT50ZXh0RGVjb3JhdGlvbnNJbkVmZmVjdCgpICYg VGV4dERlY29yYXRpb25VbmRlcmxpbmUpCisgICAgICAgICAgICAgICAgICAgIHBvc3RMYXlvdXRE YXRhLnR5cGluZ0F0dHJpYnV0ZXMgfD0gQXR0cmlidXRlVW5kZXJsaW5lOworICAgICAgICAgICAg fQorCisgICAgICAgICAgICBpZiAoc3R5bGUtPnZpc2l0ZWREZXBlbmRlbnRDb2xvcihDU1NQcm9w ZXJ0eUNvbG9yKS5pc1ZhbGlkKCkpCisgICAgICAgICAgICAgICAgcG9zdExheW91dERhdGEudGV4 dENvbG9yID0gc3R5bGUtPnZpc2l0ZWREZXBlbmRlbnRDb2xvcihDU1NQcm9wZXJ0eUNvbG9yKTsK KworICAgICAgICAgICAgc3dpdGNoIChzdHlsZS0+dGV4dEFsaWduKCkpIHsKKyAgICAgICAgICAg IGNhc2UgUklHSFQ6CisgICAgICAgICAgICBjYXNlIFdFQktJVF9SSUdIVDoKKyAgICAgICAgICAg ICAgICBwb3N0TGF5b3V0RGF0YS50ZXh0QWxpZ25tZW50ID0gUmlnaHRBbGlnbm1lbnQ7CisgICAg ICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICBjYXNlIExFRlQ6CisgICAgICAgICAgICBj YXNlIFdFQktJVF9MRUZUOgorICAgICAgICAgICAgICAgIHBvc3RMYXlvdXREYXRhLnRleHRBbGln bm1lbnQgPSBMZWZ0QWxpZ25tZW50OworICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAg ICAgY2FzZSBDRU5URVI6CisgICAgICAgICAgICBjYXNlIFdFQktJVF9DRU5URVI6CisgICAgICAg ICAgICAgICAgcG9zdExheW91dERhdGEudGV4dEFsaWdubWVudCA9IENlbnRlckFsaWdubWVudDsK KyAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgIGNhc2UgSlVTVElGWToKKyAgICAg ICAgICAgICAgICBwb3N0TGF5b3V0RGF0YS50ZXh0QWxpZ25tZW50ID0gSnVzdGlmaWVkQWxpZ25t ZW50OworICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgY2FzZSBUQVNUQVJUOgor ICAgICAgICAgICAgICAgIHBvc3RMYXlvdXREYXRhLnRleHRBbGlnbm1lbnQgPSBzdHlsZS0+aXNM ZWZ0VG9SaWdodERpcmVjdGlvbigpID8gTGVmdEFsaWdubWVudCA6IFJpZ2h0QWxpZ25tZW50Owor ICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgY2FzZSBUQUVORDoKKyAgICAgICAg ICAgICAgICBwb3N0TGF5b3V0RGF0YS50ZXh0QWxpZ25tZW50ID0gc3R5bGUtPmlzTGVmdFRvUmln aHREaXJlY3Rpb24oKSA/IFJpZ2h0QWxpZ25tZW50IDogTGVmdEFsaWdubWVudDsKKyAgICAgICAg ICAgICAgICBicmVhazsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIAorICAgICAgICAgICAg aWYgKG5vZGVUb1JlbW92ZSkKKyAgICAgICAgICAgICAgICBub2RlVG9SZW1vdmUtPnJlbW92ZShB U1NFUlRfTk9fRVhDRVBUSU9OKTsKKyAgICAgICAgfQorICAgIH0KIH0KIAogdm9pZCBXZWJQYWdl OjpoYW5kbGVBY2NlcHRlZENhbmRpZGF0ZShXZWJDb3JlOjpUZXh0Q2hlY2tpbmdSZXN1bHQgYWNj ZXB0ZWRDYW5kaWRhdGUpCg==