<!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>[178745] branches/safari-600.1.4.15-branch/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/178745">178745</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2015-01-20 12:53:52 -0800 (Tue, 20 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/173071">r173071</a>. rdar://problem/19419981</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001415branchSourceWebCoreChangeLog">branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6001415branchSourceWebCoreWebCoreexpin">branches/safari-600.1.4.15-branch/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#branchessafari6001415branchSourceWebCoreeditingiosEditorIOSmm">branches/safari-600.1.4.15-branch/Source/WebCore/editing/ios/EditorIOS.mm</a></li>
<li><a href="#branchessafari6001415branchSourceWebKit2ChangeLog">branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari6001415branchSourceWebKit2WebProcessWebPageWebPagecpp">branches/safari-600.1.4.15-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#branchessafari6001415branchSourceWebKit2WebProcessWebPageiosWebPageIOSmm">branches/safari-600.1.4.15-branch/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001415branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog (178744 => 178745)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-01-20 20:52:05 UTC (rev 178744)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-01-20 20:53:52 UTC (rev 178745)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2015-01-20 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r173071.
+
+ 2014-08-27 Enrica Casucci <enrica@apple.com>
+
+ textStylingAtPosition returns incorrect values after executing toggleBold, toggleItalic and toggleUnderline.
+ https://bugs.webkit.org/show_bug.cgi?id=136323
+ rdar://problem/18141964
+
+ Reviewed by Antti Koivisto.
+
+ For underline style we need to check typingStyle first and use that information to populate
+ the dictionary. If there is no typing style we can use the render style.
+
+ * WebCore.exp.in:
+ * editing/ios/EditorIOS.mm:
+ (WebCore::Editor::fontAttributesForSelectionStart):
+
+2015-01-20 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r172797.
</span><span class="cx">
</span><span class="cx"> 2014-08-20 Zalan Bujtas <zalan@apple.com>
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/WebCore.exp.in (178744 => 178745)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/WebCore.exp.in 2015-01-20 20:52:05 UTC (rev 178744)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/WebCore.exp.in 2015-01-20 20:53:52 UTC (rev 178745)
</span><span class="lines">@@ -1747,6 +1747,7 @@
</span><span class="cx"> __ZNK7WebCore15ResourceRequest12cfURLRequestENS_20HTTPBodyUpdatePolicyE
</span><span class="cx"> __ZNK7WebCore15ResourceRequest12nsURLRequestENS_20HTTPBodyUpdatePolicyE
</span><span class="cx"> __ZNK7WebCore15StyleProperties11mutableCopyEv
</span><ins>+__ZNK7WebCore15StyleProperties16getPropertyValueENS_13CSSPropertyIDE
</ins><span class="cx"> __ZNK7WebCore15VisiblePosition14characterAfterEv
</span><span class="cx"> __ZNK7WebCore15VisiblePosition14localCaretRectERPNS_12RenderObjectE
</span><span class="cx"> __ZNK7WebCore15VisiblePosition19absoluteCaretBoundsEv
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCoreeditingiosEditorIOSmm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/editing/ios/EditorIOS.mm (178744 => 178745)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/editing/ios/EditorIOS.mm 2015-01-20 20:52:05 UTC (rev 178744)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/editing/ios/EditorIOS.mm 2015-01-20 20:53:52 UTC (rev 178745)
</span><span class="lines">@@ -263,10 +263,16 @@
</span><span class="cx"> CTFontRef font = style->font().primaryFont()->getCTFont();
</span><span class="cx"> if (font)
</span><span class="cx"> [result setObject:(id)font forKey:NSFontAttributeName];
</span><del>-
- if (style->textDecorationsInEffect() & TextDecorationUnderline)
- [result setObject:[NSNumber numberWithInt:NSUnderlineStyleSingle] forKey:NSUnderlineStyleAttributeName];
-
</del><ins>+
+ RefPtr<EditingStyle> typingStyle = m_frame.selection().typingStyle();
+ if (typingStyle && typingStyle->style()) {
+ String value = typingStyle->style()->getPropertyValue(CSSPropertyWebkitTextDecorationsInEffect);
+ if (value.contains("underline"))
+ [result setObject:[NSNumber numberWithInt:NSUnderlineStyleSingle] forKey:NSUnderlineStyleAttributeName];
+ } else {
+ if (style->textDecorationsInEffect() & TextDecorationUnderline)
+ [result setObject:[NSNumber numberWithInt:NSUnderlineStyleSingle] forKey:NSUnderlineStyleAttributeName];
+ }
</ins><span class="cx"> if (nodeToRemove)
</span><span class="cx"> nodeToRemove->remove(ASSERT_NO_EXCEPTION);
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog (178744 => 178745)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog 2015-01-20 20:52:05 UTC (rev 178744)
+++ branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog 2015-01-20 20:53:52 UTC (rev 178745)
</span><span class="lines">@@ -1,5 +1,27 @@
</span><span class="cx"> 2015-01-20 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r173071.
+
+ 2014-08-27 Enrica Casucci <enrica@apple.com>
+
+ textStylingAtPosition returns incorrect values after executing toggleBold, toggleItalic and toggleUnderline.
+ https://bugs.webkit.org/show_bug.cgi?id=136323
+ rdar://problem/18141964
+
+ Reviewed by Antti Koivisto.
+
+ For underline style we need to check typingStyle first and use that information to populate
+ the dictionary. If there is no typing style we can use the render style.
+ We also need to update the editor state for the toggle commands to reflect the state in the UIProcess
+ even for commands that don't change the selection.
+
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::editorState):
+ * WebProcess/WebPage/ios/WebPageIOS.mm:
+ (WebKit::WebPage::executeEditCommandWithCallback):
+
+2015-01-20 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r172199.
</span><span class="cx">
</span><span class="cx"> 2014-08-06 Simon Fraser <simon.fraser@apple.com>
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (178744 => 178745)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-01-20 20:52:05 UTC (rev 178744)
+++ branches/safari-600.1.4.15-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-01-20 20:53:52 UTC (rev 178745)
</span><span class="lines">@@ -145,6 +145,7 @@
</span><span class="cx"> #include <WebCore/Settings.h>
</span><span class="cx"> #include <WebCore/ShadowRoot.h>
</span><span class="cx"> #include <WebCore/SharedBuffer.h>
</span><ins>+#include <WebCore/StyleProperties.h>
</ins><span class="cx"> #include <WebCore/SubframeLoader.h>
</span><span class="cx"> #include <WebCore/SubstituteData.h>
</span><span class="cx"> #include <WebCore/TextIterator.h>
</span><span class="lines">@@ -762,10 +763,17 @@
</span><span class="cx"> result.typingAttributes |= AttributeBold;
</span><span class="cx"> if (traits & kCTFontTraitItalic)
</span><span class="cx"> result.typingAttributes |= AttributeItalics;
</span><del>-
- if (style->textDecorationsInEffect() & TextDecorationUnderline)
- result.typingAttributes |= AttributeUnderline;
-
</del><ins>+
+ RefPtr<EditingStyle> typingStyle = frame.selection().typingStyle();
+ if (typingStyle && typingStyle->style()) {
+ String value = typingStyle->style()->getPropertyValue(CSSPropertyWebkitTextDecorationsInEffect);
+ if (value.contains("underline"))
+ result.typingAttributes |= AttributeUnderline;
+ } else {
+ if (style->textDecorationsInEffect() & TextDecorationUnderline)
+ result.typingAttributes |= AttributeUnderline;
+ }
+
</ins><span class="cx"> if (nodeToRemove)
</span><span class="cx"> nodeToRemove->remove(ASSERT_NO_EXCEPTION);
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebKit2WebProcessWebPageiosWebPageIOSmm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (178744 => 178745)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2015-01-20 20:52:05 UTC (rev 178744)
+++ branches/safari-600.1.4.15-branch/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2015-01-20 20:53:52 UTC (rev 178745)
</span><span class="lines">@@ -1703,6 +1703,8 @@
</span><span class="cx"> void WebPage::executeEditCommandWithCallback(const String& commandName, uint64_t callbackID)
</span><span class="cx"> {
</span><span class="cx"> executeEditCommand(commandName);
</span><ins>+ if (commandName == "toggleBold" || commandName == "toggleItalic" || commandName == "toggleUnderline")
+ send(Messages::WebPageProxy::EditorStateChanged(editorState()));
</ins><span class="cx"> send(Messages::WebPageProxy::VoidCallback(callbackID));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>