<!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>[183871] trunk/Source</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/183871">183871</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2015-05-06 09:42:33 -0700 (Wed, 06 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Toggling underline on font panel removes strike through
https://bugs.webkit.org/show_bug.cgi?id=144670
<rdar://problem/3790443>
Reviewed by Darin Adler.
Source/WebCore:
* editing/EditingStyle.cpp:
(WebCore::EditingStyle::EditingStyle): Added a variant that takes CSSStyleDeclaration.
* editing/EditingStyle.h:
(WebCore::EditingStyle::create): Ditto.
* editing/Editor.cpp:
(WebCore::Editor::applyStyleToSelection): Takes Ref<EditingStyle>&& instead of RefPtr<EditingStyle>&&.
* editing/Editor.h:
* editing/EditorCommand.cpp:
(WebCore::applyCommandToFrame): Ditto.
(WebCore::executeStrikethrough):
(WebCore::executeUnderline):
Source/WebKit/mac:
Use setStrikeThroughChange and setUnderlineChange added in <a href="http://trac.webkit.org/projects/webkit/changeset/183770">r183770</a> to toggle underline and strike through.
* WebView/WebHTMLView.mm:
(-[WebHTMLView _applyEditingStyleToSelection:withUndoAction:]):
(-[WebHTMLView _styleForAttributeChange:]):
(-[WebHTMLView changeAttributes:]):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreeditingEditingStylecpp">trunk/Source/WebCore/editing/EditingStyle.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingEditingStyleh">trunk/Source/WebCore/editing/EditingStyle.h</a></li>
<li><a href="#trunkSourceWebCoreeditingEditorcpp">trunk/Source/WebCore/editing/Editor.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingEditorh">trunk/Source/WebCore/editing/Editor.h</a></li>
<li><a href="#trunkSourceWebCoreeditingEditorCommandcpp">trunk/Source/WebCore/editing/EditorCommand.cpp</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebHTMLViewmm">trunk/Source/WebKit/mac/WebView/WebHTMLView.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (183870 => 183871)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-05-06 16:36:25 UTC (rev 183870)
+++ trunk/Source/WebCore/ChangeLog 2015-05-06 16:42:33 UTC (rev 183871)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-05-06 Ryosuke Niwa <rniwa@webkit.org>
+
+ Toggling underline on font panel removes strike through
+ https://bugs.webkit.org/show_bug.cgi?id=144670
+ <rdar://problem/3790443>
+
+ Reviewed by Darin Adler.
+
+ * editing/EditingStyle.cpp:
+ (WebCore::EditingStyle::EditingStyle): Added a variant that takes CSSStyleDeclaration.
+ * editing/EditingStyle.h:
+ (WebCore::EditingStyle::create): Ditto.
+ * editing/Editor.cpp:
+ (WebCore::Editor::applyStyleToSelection): Takes Ref<EditingStyle>&& instead of RefPtr<EditingStyle>&&.
+ * editing/Editor.h:
+ * editing/EditorCommand.cpp:
+ (WebCore::applyCommandToFrame): Ditto.
+ (WebCore::executeStrikethrough):
+ (WebCore::executeUnderline):
+
</ins><span class="cx"> 2015-05-06 Jessie Berlin <jberlin@webkit.org>
</span><span class="cx">
</span><span class="cx"> More build fixing.
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingEditingStylecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/EditingStyle.cpp (183870 => 183871)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/EditingStyle.cpp 2015-05-06 16:36:25 UTC (rev 183870)
+++ trunk/Source/WebCore/editing/EditingStyle.cpp 2015-05-06 16:42:33 UTC (rev 183871)
</span><span class="lines">@@ -348,6 +348,14 @@
</span><span class="cx"> init(position.deprecatedNode(), propertiesToInclude);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+EditingStyle::EditingStyle(const CSSStyleDeclaration* style)
+ : EditingStyle()
+{
+ if (style)
+ m_mutableStyle = style->copyProperties();
+ extractFontSizeDelta();
+}
+
</ins><span class="cx"> EditingStyle::EditingStyle(const StyleProperties* style)
</span><span class="cx"> : EditingStyle()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingEditingStyleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/EditingStyle.h (183870 => 183871)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/EditingStyle.h 2015-05-06 16:36:25 UTC (rev 183870)
+++ trunk/Source/WebCore/editing/EditingStyle.h 2015-05-06 16:42:33 UTC (rev 183871)
</span><span class="lines">@@ -94,6 +94,11 @@
</span><span class="cx"> return adoptRef(*new EditingStyle(style));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ static Ref<EditingStyle> create(const CSSStyleDeclaration* style)
+ {
+ return adoptRef(*new EditingStyle(style));
+ }
+
</ins><span class="cx"> static Ref<EditingStyle> create(CSSPropertyID propertyID, const String& value)
</span><span class="cx"> {
</span><span class="cx"> return adoptRef(*new EditingStyle(propertyID, value));
</span><span class="lines">@@ -167,6 +172,7 @@
</span><span class="cx"> EditingStyle();
</span><span class="cx"> EditingStyle(Node*, PropertiesToInclude);
</span><span class="cx"> EditingStyle(const Position&, PropertiesToInclude);
</span><ins>+ WEBCORE_EXPORT explicit EditingStyle(const CSSStyleDeclaration*);
</ins><span class="cx"> explicit EditingStyle(const StyleProperties*);
</span><span class="cx"> EditingStyle(CSSPropertyID, const String& value);
</span><span class="cx"> EditingStyle(CSSPropertyID, CSSValueID);
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingEditorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/Editor.cpp (183870 => 183871)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/Editor.cpp 2015-05-06 16:36:25 UTC (rev 183870)
+++ trunk/Source/WebCore/editing/Editor.cpp 2015-05-06 16:42:33 UTC (rev 183871)
</span><span class="lines">@@ -941,9 +941,9 @@
</span><span class="cx"> applyStyle(style, editingAction);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Editor::applyStyleToSelection(RefPtr<EditingStyle>&& style, EditAction editingAction)
</del><ins>+void Editor::applyStyleToSelection(Ref<EditingStyle>&& style, EditAction editingAction)
</ins><span class="cx"> {
</span><del>- if (!style || style->isEmpty() || !canEditRichly())
</del><ins>+ if (style->isEmpty() || !canEditRichly())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // FIXME: This is wrong for text decorations since m_mutableStyle is empty.
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingEditorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/Editor.h (183870 => 183871)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/Editor.h 2015-05-06 16:36:25 UTC (rev 183870)
+++ trunk/Source/WebCore/editing/Editor.h 2015-05-06 16:42:33 UTC (rev 183871)
</span><span class="lines">@@ -186,7 +186,7 @@
</span><span class="cx"> void applyStyle(RefPtr<EditingStyle>&&, EditAction);
</span><span class="cx"> void applyParagraphStyle(StyleProperties*, EditAction = EditActionUnspecified);
</span><span class="cx"> WEBCORE_EXPORT void applyStyleToSelection(StyleProperties*, EditAction);
</span><del>- void applyStyleToSelection(RefPtr<EditingStyle>&&, EditAction);
</del><ins>+ WEBCORE_EXPORT void applyStyleToSelection(Ref<EditingStyle>&&, EditAction);
</ins><span class="cx"> void applyParagraphStyleToSelection(StyleProperties*, EditAction);
</span><span class="cx">
</span><span class="cx"> void appliedEditing(PassRefPtr<CompositeEditCommand>);
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingEditorCommandcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/EditorCommand.cpp (183870 => 183871)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/EditorCommand.cpp 2015-05-06 16:36:25 UTC (rev 183870)
+++ trunk/Source/WebCore/editing/EditorCommand.cpp 2015-05-06 16:42:33 UTC (rev 183871)
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx"> return node->document().frame();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static bool applyCommandToFrame(Frame& frame, EditorCommandSource source, EditAction action, RefPtr<EditingStyle>&& style)
</del><ins>+static bool applyCommandToFrame(Frame& frame, EditorCommandSource source, EditAction action, Ref<EditingStyle>&& style)
</ins><span class="cx"> {
</span><span class="cx"> // FIXME: We don't call shouldApplyStyle when the source is DOM; is there a good reason for that?
</span><span class="cx"> switch (source) {
</span><span class="lines">@@ -1034,7 +1034,7 @@
</span><span class="cx">
</span><span class="cx"> static bool executeStrikethrough(Frame& frame, Event*, EditorCommandSource source, const String&)
</span><span class="cx"> {
</span><del>- RefPtr<EditingStyle> style = EditingStyle::create();
</del><ins>+ Ref<EditingStyle> style = EditingStyle::create();
</ins><span class="cx"> style->setStrikeThroughChange(textDecorationChangeForToggling(frame.editor(), CSSPropertyWebkitTextDecorationsInEffect, "line-through"));
</span><span class="cx"> // FIXME: Needs a new EditAction!
</span><span class="cx"> return applyCommandToFrame(frame, source, EditActionUnderline, WTF::move(style));
</span><span class="lines">@@ -1101,7 +1101,7 @@
</span><span class="cx">
</span><span class="cx"> static bool executeUnderline(Frame& frame, Event*, EditorCommandSource source, const String&)
</span><span class="cx"> {
</span><del>- RefPtr<EditingStyle> style = EditingStyle::create();
</del><ins>+ Ref<EditingStyle> style = EditingStyle::create();
</ins><span class="cx"> TextDecorationChange change = textDecorationChangeForToggling(frame.editor(), CSSPropertyWebkitTextDecorationsInEffect, "underline");
</span><span class="cx"> style->setUnderlineChange(change);
</span><span class="cx"> return applyCommandToFrame(frame, source, EditActionUnderline, WTF::move(style));
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (183870 => 183871)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2015-05-06 16:36:25 UTC (rev 183870)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-05-06 16:42:33 UTC (rev 183871)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-05-06 Ryosuke Niwa <rniwa@webkit.org>
+
+ Toggling underline on font panel removes strike through
+ https://bugs.webkit.org/show_bug.cgi?id=144670
+ <rdar://problem/3790443>
+
+ Reviewed by Darin Adler.
+
+ Use setStrikeThroughChange and setUnderlineChange added in r183770 to toggle underline and strike through.
+
+ * WebView/WebHTMLView.mm:
+ (-[WebHTMLView _applyEditingStyleToSelection:withUndoAction:]):
+ (-[WebHTMLView _styleForAttributeChange:]):
+ (-[WebHTMLView changeAttributes:]):
+
</ins><span class="cx"> 2015-05-04 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> Toggling underline or strike through affects each other
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebHTMLViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebHTMLView.mm (183870 => 183871)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2015-05-06 16:36:25 UTC (rev 183870)
+++ trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2015-05-06 16:42:33 UTC (rev 183871)
</span><span class="lines">@@ -4795,6 +4795,12 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)_applyEditingStyleToSelection:(Ref<EditingStyle>&&)editingStyle withUndoAction:(EditAction)undoAction
+{
+ if (Frame* coreFrame = core([self _frame]))
+ coreFrame->editor().applyStyleToSelection(WTF::move(editingStyle), undoAction);
+}
+
</ins><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> - (BOOL)_handleStyleKeyEquivalent:(NSEvent *)event
</span><span class="cx"> {
</span><span class="lines">@@ -4985,7 +4991,7 @@
</span><span class="cx"> [self _applyStyleToSelection:[self _styleFromFontManagerOperation] withUndoAction:EditActionSetFont];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (DOMCSSStyleDeclaration *)_styleForAttributeChange:(id)sender
</del><ins>+- (Ref<EditingStyle>)_styleForAttributeChange:(id)sender
</ins><span class="cx"> {
</span><span class="cx"> DOMCSSStyleDeclaration *style = [self _emptyStyle];
</span><span class="cx">
</span><span class="lines">@@ -5032,20 +5038,9 @@
</span><span class="cx"> else if ([b objectForKey:NSShadowAttributeName] == nil)
</span><span class="cx"> [style setTextShadow:@"none"];
</span><span class="cx">
</span><del>- int sa = [[a objectForKey:NSStrikethroughStyleAttributeName] intValue];
- int sb = [[b objectForKey:NSStrikethroughStyleAttributeName] intValue];
</del><ins>+ int sa = [[a objectForKey:NSSuperscriptAttributeName] intValue];
+ int sb = [[b objectForKey:NSSuperscriptAttributeName] intValue];
</ins><span class="cx"> if (sa == sb) {
</span><del>- if (sa == NSUnderlineStyleNone)
- [style setProperty:@"-webkit-text-decorations-in-effect" value:@"none" priority:@""];
- // we really mean "no line-through" rather than "none"
- else
- [style setProperty:@"-webkit-text-decorations-in-effect" value:@"line-through" priority:@""];
- // we really mean "add line-through" rather than "line-through"
- }
-
- sa = [[a objectForKey:NSSuperscriptAttributeName] intValue];
- sb = [[b objectForKey:NSSuperscriptAttributeName] intValue];
- if (sa == sb) {
</del><span class="cx"> if (sa > 0)
</span><span class="cx"> [style setVerticalAlign:@"super"];
</span><span class="cx"> else if (sa < 0)
</span><span class="lines">@@ -5053,26 +5048,31 @@
</span><span class="cx"> else
</span><span class="cx"> [style setVerticalAlign:@"baseline"];
</span><span class="cx"> }
</span><ins>+
+ auto editingStyle = EditingStyle::create(core(style));
</ins><span class="cx">
</span><ins>+ int strikeThroughA = [[a objectForKey:NSStrikethroughStyleAttributeName] intValue];
+ int strikeThroughB = [[b objectForKey:NSStrikethroughStyleAttributeName] intValue];
+ if (strikeThroughA == strikeThroughB) {
+ bool shouldRemoveStrikeThrough = strikeThroughA == NSUnderlineStyleNone;
+ editingStyle->setStrikeThroughChange(shouldRemoveStrikeThrough ? TextDecorationChange::Remove : TextDecorationChange::Add);
+ }
+
</ins><span class="cx"> int ua = [[a objectForKey:NSUnderlineStyleAttributeName] intValue];
</span><span class="cx"> int ub = [[b objectForKey:NSUnderlineStyleAttributeName] intValue];
</span><span class="cx"> if (ua == ub) {
</span><del>- if (ua == NSUnderlineStyleNone)
- [style setProperty:@"-webkit-text-decorations-in-effect" value:@"none" priority:@""];
- // we really mean "no underline" rather than "none"
- else
- [style setProperty:@"-webkit-text-decorations-in-effect" value:@"underline" priority:@""];
- // we really mean "add underline" rather than "underline"
</del><ins>+ bool shouldRemoveUnderline = ua == NSUnderlineStyleNone;
+ editingStyle->setUnderlineChange(shouldRemoveUnderline ? TextDecorationChange::Remove : TextDecorationChange::Add);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- return style;
</del><ins>+ return editingStyle;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)changeAttributes:(id)sender
</span><span class="cx"> {
</span><span class="cx"> COMMAND_PROLOGUE
</span><span class="cx">
</span><del>- [self _applyStyleToSelection:[self _styleForAttributeChange:sender] withUndoAction:EditActionChangeAttributes];
</del><ins>+ [self _applyEditingStyleToSelection:[self _styleForAttributeChange:sender] withUndoAction:EditActionChangeAttributes];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (DOMCSSStyleDeclaration *)_styleFromColorPanelWithSelector:(SEL)selector
</span></span></pre>
</div>
</div>
</body>
</html>