<!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>[175009] branches/safari-600.2-branch</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/175009">175009</a></dd>
<dt>Author</dt> <dd>dburkart@apple.com</dd>
<dt>Date</dt> <dd>2014-10-21 18:40:47 -0700 (Tue, 21 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/173246">r173246</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6002branchLayoutTestsChangeLog">branches/safari-600.2-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari6002branchSourceWebCoreChangeLog">branches/safari-600.2-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6002branchSourceWebCoreeditingFrameSelectioncpp">branches/safari-600.2-branch/Source/WebCore/editing/FrameSelection.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari6002branchLayoutTestseditingcaretcolorspaninsideeditableexpectedhtml">branches/safari-600.2-branch/LayoutTests/editing/caret/color-span-inside-editable-expected.html</a></li>
<li><a href="#branchessafari6002branchLayoutTestseditingcaretcolorspaninsideeditablehtml">branches/safari-600.2-branch/LayoutTests/editing/caret/color-span-inside-editable.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6002branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.2-branch/LayoutTests/ChangeLog (175008 => 175009)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.2-branch/LayoutTests/ChangeLog 2014-10-22 01:35:50 UTC (rev 175008)
+++ branches/safari-600.2-branch/LayoutTests/ChangeLog 2014-10-22 01:40:47 UTC (rev 175009)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-10-21 Dana Burkart <dburkart@apple.com>
+
+ Merge r173246
+
+ 2014-09-03 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Text caret changes to color of text in Mail and Notes
+ https://bugs.webkit.org/show_bug.cgi?id=135904
+
+ Reviewed by Simon Fraser.
+
+ Make sure the caret is the correct color.
+
+ * editing/caret/color-span-inside-editable-expected.html: Added.
+ * editing/caret/color-span-inside-editable.html: Added.
+
</ins><span class="cx"> 2014-10-20 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><span class="cx"> Mark remainder of failing tests as green so we can branch.
</span></span></pre></div>
<a id="branchessafari6002branchLayoutTestseditingcaretcolorspaninsideeditableexpectedhtmlfromrev173246trunkLayoutTestseditingcaretcolorspaninsideeditableexpectedhtml"></a>
<div class="copfile"><h4>Copied: branches/safari-600.2-branch/LayoutTests/editing/caret/color-span-inside-editable-expected.html (from rev 173246, trunk/LayoutTests/editing/caret/color-span-inside-editable-expected.html) (0 => 175009)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.2-branch/LayoutTests/editing/caret/color-span-inside-editable-expected.html (rev 0)
+++ branches/safari-600.2-branch/LayoutTests/editing/caret/color-span-inside-editable-expected.html 2014-10-22 01:40:47 UTC (rev 175009)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+This test makes sure that carets in content editable divs remain black even if there is a span inside them with a foreground color specified.
+<div style="width: 505px; height: 505px; overflow: hidden;">
+<div style="width: 50px; height: 500px; background-color: black"></div>
+</div>
</ins></span></pre></div>
<a id="branchessafari6002branchLayoutTestseditingcaretcolorspaninsideeditablehtmlfromrev173246trunkLayoutTestseditingcaretcolorspaninsideeditablehtml"></a>
<div class="copfile"><h4>Copied: branches/safari-600.2-branch/LayoutTests/editing/caret/color-span-inside-editable.html (from rev 173246, trunk/LayoutTests/editing/caret/color-span-inside-editable.html) (0 => 175009)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.2-branch/LayoutTests/editing/caret/color-span-inside-editable.html (rev 0)
+++ branches/safari-600.2-branch/LayoutTests/editing/caret/color-span-inside-editable.html 2014-10-22 01:40:47 UTC (rev 175009)
</span><span class="lines">@@ -0,0 +1,8 @@
</span><ins>+This test makes sure that carets in content editable divs remain black even if there is a span inside them with a foreground color specified.
+<div style="width: 505px; height: 505px; overflow: hidden;">
+<div id="edit" contenteditable="true" style="-webkit-transform-origin: left top; -webkit-transform: scale(50, 50); outline: none; font-family: Ahem; font-size: 10px;"><span id="spn" style="color: red;">&nbsp;&nbsp;</span></div>
+</div>
+<script>
+var edit = document.getElementById("edit");
+edit.focus();
+</script>
</ins></span></pre></div>
<a id="branchessafari6002branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.2-branch/Source/WebCore/ChangeLog (175008 => 175009)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.2-branch/Source/WebCore/ChangeLog 2014-10-22 01:35:50 UTC (rev 175008)
+++ branches/safari-600.2-branch/Source/WebCore/ChangeLog 2014-10-22 01:40:47 UTC (rev 175009)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-10-21 Dana Burkart <dburkart@apple.com>
+
+ Merge r173246
+
+ 2014-09-03 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Text caret changes to color of text in Mail and Notes
+ https://bugs.webkit.org/show_bug.cgi?id=135904
+
+ Reviewed by Simon Fraser.
+
+ Consult with the background color of spans inside editable divs to determine what color
+ the caret should be.
+
+ Test: editing/caret/color-span-inside-editable.html
+
+ * editing/FrameSelection.cpp:
+ (WebCore::CaretBase::paintCaret):
+
</ins><span class="cx"> 2014-09-23 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><span class="cx"> Rollout trunk r173848 | (r173897 on branch)
</span></span></pre></div>
<a id="branchessafari6002branchSourceWebCoreeditingFrameSelectioncpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.2-branch/Source/WebCore/editing/FrameSelection.cpp (175008 => 175009)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.2-branch/Source/WebCore/editing/FrameSelection.cpp 2014-10-22 01:35:50 UTC (rev 175008)
+++ branches/safari-600.2-branch/Source/WebCore/editing/FrameSelection.cpp 2014-10-22 01:40:47 UTC (rev 175009)
</span><span class="lines">@@ -1509,10 +1509,23 @@
</span><span class="cx"> Color caretColor = Color::black;
</span><span class="cx"> ColorSpace colorSpace = ColorSpaceDeviceRGB;
</span><span class="cx"> Element* element = node->isElementNode() ? toElement(node) : node->parentElement();
</span><ins>+ Element* rootEditableElement = node->rootEditableElement();
</ins><span class="cx">
</span><span class="cx"> if (element && element->renderer()) {
</span><del>- caretColor = element->renderer()->style().visitedDependentColor(CSSPropertyColor);
- colorSpace = element->renderer()->style().colorSpace();
</del><ins>+ bool setToRootEditableElement = false;
+ if (rootEditableElement && rootEditableElement->renderer()) {
+ const auto& rootEditableStyle = rootEditableElement->renderer()->style();
+ const auto& elementStyle = element->renderer()->style();
+ if (rootEditableStyle.visitedDependentColor(CSSPropertyBackgroundColor) == elementStyle.visitedDependentColor(CSSPropertyBackgroundColor)) {
+ caretColor = rootEditableElement->renderer()->style().visitedDependentColor(CSSPropertyColor);
+ colorSpace = rootEditableElement->renderer()->style().colorSpace();
+ setToRootEditableElement = true;
+ }
+ }
+ if (!setToRootEditableElement) {
+ caretColor = element->renderer()->style().visitedDependentColor(CSSPropertyColor);
+ colorSpace = element->renderer()->style().colorSpace();
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> context->fillRect(caret, caretColor, colorSpace);
</span></span></pre>
</div>
</div>
</body>
</html>