<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[196834] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/196834">196834</a></dd>
<dt>Author</dt> <dd>bdakin@apple.com</dd>
<dt>Date</dt> <dd>2016-02-19 14:15:09 -0800 (Fri, 19 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Enhance EditorState to include TypingAttributes, alignment, and color
https://bugs.webkit.org/show_bug.cgi?id=154424
Reviewed by Dean Jackson and Sam Weinig.
TypingAttributes is already available for iOS and GTK. This patch hooks
that up on Mac as well, and it moves the calculation of that to the shared
file since there is no reason for this to be written in an iOS-only way. This
patch also adds textColor and textAlignment to EditorState, and since those
are not technically platform-specific either, they are also calculated in the
shared editorState() function.
* Shared/EditorState.cpp:
(WebKit::EditorState::PostLayoutData::encode):
(WebKit::EditorState::PostLayoutData::decode):
* Shared/EditorState.h:
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::editorState):
* WebProcess/WebPage/ios/WebPageIOS.mm:
(WebKit::WebPage::platformEditorState):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedEditorStatecpp">trunk/Source/WebKit2/Shared/EditorState.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedEditorStateh">trunk/Source/WebKit2/Shared/EditorState.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageiosWebPageIOSmm">trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (196833 => 196834)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-02-19 21:49:34 UTC (rev 196833)
+++ trunk/Source/WebKit2/ChangeLog 2016-02-19 22:15:09 UTC (rev 196834)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2016-02-19 Beth Dakin <bdakin@apple.com>
+
+ Enhance EditorState to include TypingAttributes, alignment, and color
+ https://bugs.webkit.org/show_bug.cgi?id=154424
+
+ Reviewed by Dean Jackson and Sam Weinig.
+
+ TypingAttributes is already available for iOS and GTK. This patch hooks
+ that up on Mac as well, and it moves the calculation of that to the shared
+ file since there is no reason for this to be written in an iOS-only way. This
+ patch also adds textColor and textAlignment to EditorState, and since those
+ are not technically platform-specific either, they are also calculated in the
+ shared editorState() function.
+
+ * Shared/EditorState.cpp:
+ (WebKit::EditorState::PostLayoutData::encode):
+ (WebKit::EditorState::PostLayoutData::decode):
+ * Shared/EditorState.h:
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::editorState):
+ * WebProcess/WebPage/ios/WebPageIOS.mm:
+ (WebKit::WebPage::platformEditorState):
+
</ins><span class="cx"> 2016-02-19 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Purge as much as we can from WKDeprecatedFunctions.cpp
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedEditorStatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/EditorState.cpp (196833 => 196834)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/EditorState.cpp 2016-02-19 21:49:34 UTC (rev 196833)
+++ trunk/Source/WebKit2/Shared/EditorState.cpp 2016-02-19 22:15:09 UTC (rev 196834)
</span><span class="lines">@@ -106,13 +106,15 @@
</span><span class="cx"> #if PLATFORM(IOS) || PLATFORM(GTK) || PLATFORM(MAC)
</span><span class="cx"> void EditorState::PostLayoutData::encode(IPC::ArgumentEncoder& encoder) const
</span><span class="cx"> {
</span><ins>+ encoder << typingAttributes;
</ins><span class="cx"> #if PLATFORM(IOS) || PLATFORM(GTK)
</span><del>- encoder << typingAttributes;
</del><span class="cx"> encoder << caretRectAtStart;
</span><span class="cx"> #endif
</span><span class="cx"> #if PLATFORM(IOS) || PLATFORM(MAC)
</span><span class="cx"> encoder << selectionClipRect;
</span><span class="cx"> encoder << selectedTextLength;
</span><ins>+ encoder << textAlignment;
+ encoder << textColor;
</ins><span class="cx"> #endif
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> encoder << caretRectAtEnd;
</span><span class="lines">@@ -133,9 +135,9 @@
</span><span class="cx">
</span><span class="cx"> bool EditorState::PostLayoutData::decode(IPC::ArgumentDecoder& decoder, PostLayoutData& result)
</span><span class="cx"> {
</span><del>-#if PLATFORM(IOS) || PLATFORM(GTK)
</del><span class="cx"> if (!decoder.decode(result.typingAttributes))
</span><span class="cx"> return false;
</span><ins>+#if PLATFORM(IOS) || PLATFORM(GTK)
</ins><span class="cx"> if (!decoder.decode(result.caretRectAtStart))
</span><span class="cx"> return false;
</span><span class="cx"> #endif
</span><span class="lines">@@ -144,6 +146,10 @@
</span><span class="cx"> return false;
</span><span class="cx"> if (!decoder.decode(result.selectedTextLength))
</span><span class="cx"> return false;
</span><ins>+ if (!decoder.decode(result.textAlignment))
+ return false;
+ if (!decoder.decode(result.textColor))
+ return false;
</ins><span class="cx"> #endif
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> if (!decoder.decode(result.caretRectAtEnd))
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedEditorStateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/EditorState.h (196833 => 196834)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/EditorState.h 2016-02-19 21:49:34 UTC (rev 196833)
+++ trunk/Source/WebKit2/Shared/EditorState.h 2016-02-19 22:15:09 UTC (rev 196834)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> #define EditorState_h
</span><span class="cx">
</span><span class="cx"> #include "ArgumentCoders.h"
</span><ins>+#include <WebCore/Color.h>
</ins><span class="cx"> #include <WebCore/IntRect.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="lines">@@ -44,6 +45,14 @@
</span><span class="cx"> AttributeStrikeThrough = 8
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+enum TextAlignment {
+ NoAlignment = 0,
+ LeftAlignment = 1,
+ RightAlignment = 2,
+ CenterAlignment = 3,
+ JustifiedAlignment = 4,
+};
+
</ins><span class="cx"> struct EditorState {
</span><span class="cx"> bool shouldIgnoreCompositionSelectionChange { false };
</span><span class="cx">
</span><span class="lines">@@ -64,13 +73,15 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS) || PLATFORM(GTK) || PLATFORM(MAC)
</span><span class="cx"> struct PostLayoutData {
</span><ins>+ uint32_t typingAttributes { AttributeNone };
</ins><span class="cx"> #if PLATFORM(IOS) || PLATFORM(GTK)
</span><del>- uint32_t typingAttributes { AttributeNone };
</del><span class="cx"> WebCore::IntRect caretRectAtStart;
</span><span class="cx"> #endif
</span><span class="cx"> #if PLATFORM(IOS) || PLATFORM(MAC)
</span><span class="cx"> WebCore::IntRect selectionClipRect;
</span><span class="cx"> uint64_t selectedTextLength { 0 };
</span><ins>+ uint32_t textAlignment { NoAlignment };
+ WebCore::Color textColor { WebCore::Color::black };
</ins><span class="cx"> #endif
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> WebCore::IntRect caretRectAtEnd;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (196833 => 196834)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-02-19 21:49:34 UTC (rev 196833)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-02-19 22:15:09 UTC (rev 196834)
</span><span class="lines">@@ -802,7 +802,62 @@
</span><span class="cx"> result.isInPasswordField = selection.isInPasswordField();
</span><span class="cx"> result.hasComposition = frame.editor().hasComposition();
</span><span class="cx"> result.shouldIgnoreCompositionSelectionChange = frame.editor().ignoreCompositionSelectionChange();
</span><del>-
</del><ins>+
+#if PLATFORM(COCOA)
+ if (shouldIncludePostLayoutData == IncludePostLayoutDataHint::Yes && result.isContentEditable) {
+ auto& postLayoutData = result.postLayoutData();
+ if (!selection.isNone()) {
+ Node* nodeToRemove;
+ if (RenderStyle* style = Editor::styleForSelectionStart(&frame, nodeToRemove)) {
+ if (style->fontCascade().weight() >= FontWeightBold)
+ postLayoutData.typingAttributes |= AttributeBold;
+ if (style->fontCascade().italic() == FontItalicOn)
+ postLayoutData.typingAttributes |= AttributeItalics;
+
+ RefPtr<EditingStyle> typingStyle = frame.selection().typingStyle();
+ if (typingStyle && typingStyle->style()) {
+ String value = typingStyle->style()->getPropertyValue(CSSPropertyWebkitTextDecorationsInEffect);
+ if (value.contains("underline"))
+ postLayoutData.typingAttributes |= AttributeUnderline;
+ } else {
+ if (style->textDecorationsInEffect() & TextDecorationUnderline)
+ postLayoutData.typingAttributes |= AttributeUnderline;
+ }
+
+ if (style->visitedDependentColor(CSSPropertyColor).isValid())
+ postLayoutData.textColor = style->visitedDependentColor(CSSPropertyColor);
+
+ switch (style->textAlign()) {
+ case RIGHT:
+ case WEBKIT_RIGHT:
+ postLayoutData.textAlignment = RightAlignment;
+ break;
+ case LEFT:
+ case WEBKIT_LEFT:
+ postLayoutData.textAlignment = LeftAlignment;
+ break;
+ case CENTER:
+ case WEBKIT_CENTER:
+ postLayoutData.textAlignment = CenterAlignment;
+ break;
+ case JUSTIFY:
+ postLayoutData.textAlignment = JustifiedAlignment;
+ break;
+ case TASTART:
+ postLayoutData.textAlignment = style->isLeftToRightDirection() ? LeftAlignment : RightAlignment;
+ break;
+ case TAEND:
+ postLayoutData.textAlignment = style->isLeftToRightDirection() ? RightAlignment : LeftAlignment;
+ break;
+ }
+
+ if (nodeToRemove)
+ nodeToRemove->remove(ASSERT_NO_EXCEPTION);
+ }
+ }
+ }
+#endif
+
</ins><span class="cx"> platformEditorState(frame, result, shouldIncludePostLayoutData);
</span><span class="cx">
</span><span class="cx"> return result;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageiosWebPageIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (196833 => 196834)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2016-02-19 21:49:34 UTC (rev 196833)
+++ trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2016-02-19 22:15:09 UTC (rev 196834)
</span><span class="lines">@@ -190,30 +190,6 @@
</span><span class="cx"> if (!selection.isNone()) {
</span><span class="cx"> if (m_assistedNode && m_assistedNode->renderer())
</span><span class="cx"> postLayoutData.selectionClipRect = view->contentsToRootView(m_assistedNode->renderer()->absoluteBoundingBoxRect());
</span><del>-
- Node* nodeToRemove;
- if (RenderStyle* style = Editor::styleForSelectionStart(&frame, nodeToRemove)) {
- CTFontRef font = style->fontCascade().primaryFont().getCTFont();
- CTFontSymbolicTraits traits = font ? CTFontGetSymbolicTraits(font) : 0;
-
- if (traits & kCTFontTraitBold)
- postLayoutData.typingAttributes |= AttributeBold;
- if (traits & kCTFontTraitItalic)
- postLayoutData.typingAttributes |= AttributeItalics;
-
- RefPtr<EditingStyle> typingStyle = frame.selection().typingStyle();
- if (typingStyle && typingStyle->style()) {
- String value = typingStyle->style()->getPropertyValue(CSSPropertyWebkitTextDecorationsInEffect);
- if (value.contains("underline"))
- postLayoutData.typingAttributes |= AttributeUnderline;
- } else {
- if (style->textDecorationsInEffect() & TextDecorationUnderline)
- postLayoutData.typingAttributes |= AttributeUnderline;
- }
-
- if (nodeToRemove)
- nodeToRemove->remove(ASSERT_NO_EXCEPTION);
- }
</del><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>