<!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>[158750] 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/158750">158750</a></dd>
<dt>Author</dt> <dd>dbates@webkit.org</dd>
<dt>Date</dt> <dd>2013-11-06 08:48:17 -0800 (Wed, 06 Nov 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>Add ENABLE(TEXT_SELECTION)
https://bugs.webkit.org/show_bug.cgi?id=123827

Reviewed by Ryosuke Niwa.

Source/WebCore:

Add compile-time guard, ENABLE(TEXT_SELECTION), to enable or
disable selection painting in WebCore (enabled by default).

On iOS we disable WebCore selection painting and have UIKit
paint the selection.

* rendering/InlineTextBox.cpp:
(WebCore::InlineTextBox::paintSelection): Only paint selection when
TEXT_SELECTION is enabled.
* rendering/LogicalSelectionOffsetCaches.h:
(WebCore::LogicalSelectionOffsetCaches::LogicalSelectionOffsetCaches):
For now, add a ENABLE(TEXT_SELECTION)-guard around an assertion. Added
a FIXME comment to investigate the callers and either move the assertion
to the appropriate callers or structure the code such that we can remove
the assertion.
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::paintSelection): Only paint selection when
TEXT_SELECTION is enabled.
* rendering/TextPaintStyle.cpp:
(WebCore::computeTextSelectionPaintStyle): Only compute the selection
paint style when TEXT_SELECTION is enabled. Otherwise, return a paint
style identical to the text paint style. Also, substitute nullptr for 0.

Source/WTF:

Enable selection painting by default on all ports except iOS.

* wtf/FeatureDefines.h:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfFeatureDefinesh">trunk/Source/WTF/wtf/FeatureDefines.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingInlineTextBoxcpp">trunk/Source/WebCore/rendering/InlineTextBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingLogicalSelectionOffsetCachesh">trunk/Source/WebCore/rendering/LogicalSelectionOffsetCaches.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockcpp">trunk/Source/WebCore/rendering/RenderBlock.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingTextPaintStylecpp">trunk/Source/WebCore/rendering/TextPaintStyle.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (158749 => 158750)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog        2013-11-06 16:45:28 UTC (rev 158749)
+++ trunk/Source/WTF/ChangeLog        2013-11-06 16:48:17 UTC (rev 158750)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2013-11-06  Daniel Bates  &lt;dabates@apple.com&gt;
+
+        Add ENABLE(TEXT_SELECTION)
+        https://bugs.webkit.org/show_bug.cgi?id=123827
+
+        Reviewed by Ryosuke Niwa.
+
+        Enable selection painting by default on all ports except iOS.
+
+        * wtf/FeatureDefines.h:
+
</ins><span class="cx"> 2013-11-04  Alexey Proskuryakov  &lt;ap@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Implement base64url encoding from RFC 4648
</span></span></pre></div>
<a id="trunkSourceWTFwtfFeatureDefinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/FeatureDefines.h (158749 => 158750)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/FeatureDefines.h        2013-11-06 16:45:28 UTC (rev 158749)
+++ trunk/Source/WTF/wtf/FeatureDefines.h        2013-11-06 16:48:17 UTC (rev 158750)
</span><span class="lines">@@ -128,6 +128,10 @@
</span><span class="cx"> #define ENABLE_TEXT_CARET 0
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><ins>+#if !defined(ENABLE_TEXT_SELECTION)
+#define ENABLE_TEXT_SELECTION 0
+#endif
+
</ins><span class="cx"> #if !defined(ENABLE_TOUCH_EVENTS)
</span><span class="cx"> #define ENABLE_TOUCH_EVENTS 1
</span><span class="cx"> #endif
</span><span class="lines">@@ -787,6 +791,10 @@
</span><span class="cx"> #define ENABLE_TEXT_CARET 1
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><ins>+#if !defined(ENABLE_TEXT_SELECTION)
+#define ENABLE_TEXT_SELECTION 1
+#endif
+
</ins><span class="cx"> #if !defined(ENABLE_THREADED_HTML_PARSER)
</span><span class="cx"> #define ENABLE_THREADED_HTML_PARSER 0
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (158749 => 158750)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2013-11-06 16:45:28 UTC (rev 158749)
+++ trunk/Source/WebCore/ChangeLog        2013-11-06 16:48:17 UTC (rev 158750)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2013-11-06  Daniel Bates  &lt;dabates@apple.com&gt;
+
+        Add ENABLE(TEXT_SELECTION)
+        https://bugs.webkit.org/show_bug.cgi?id=123827
+
+        Reviewed by Ryosuke Niwa.
+
+        Add compile-time guard, ENABLE(TEXT_SELECTION), to enable or
+        disable selection painting in WebCore (enabled by default).
+
+        On iOS we disable WebCore selection painting and have UIKit
+        paint the selection.
+
+        * rendering/InlineTextBox.cpp:
+        (WebCore::InlineTextBox::paintSelection): Only paint selection when
+        TEXT_SELECTION is enabled.
+        * rendering/LogicalSelectionOffsetCaches.h:
+        (WebCore::LogicalSelectionOffsetCaches::LogicalSelectionOffsetCaches):
+        For now, add a ENABLE(TEXT_SELECTION)-guard around an assertion. Added
+        a FIXME comment to investigate the callers and either move the assertion
+        to the appropriate callers or structure the code such that we can remove
+        the assertion.
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::paintSelection): Only paint selection when
+        TEXT_SELECTION is enabled.
+        * rendering/TextPaintStyle.cpp:
+        (WebCore::computeTextSelectionPaintStyle): Only compute the selection
+        paint style when TEXT_SELECTION is enabled. Otherwise, return a paint
+        style identical to the text paint style. Also, substitute nullptr for 0.
+
</ins><span class="cx"> 2013-11-06  Jer Noble  &lt;jer.noble@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Unrevewied Windows build fix after r158736; add InlineElementBox.cpp to the RenderingAllInOne.cpp file.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingInlineTextBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/InlineTextBox.cpp (158749 => 158750)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/InlineTextBox.cpp        2013-11-06 16:45:28 UTC (rev 158749)
+++ trunk/Source/WebCore/rendering/InlineTextBox.cpp        2013-11-06 16:48:17 UTC (rev 158750)
</span><span class="lines">@@ -646,6 +646,7 @@
</span><span class="cx"> 
</span><span class="cx"> void InlineTextBox::paintSelection(GraphicsContext* context, const FloatPoint&amp; boxOrigin, const RenderStyle&amp; style, const Font&amp; font, Color textColor)
</span><span class="cx"> {
</span><ins>+#if ENABLE(TEXT_SELECTION)
</ins><span class="cx">     if (context-&gt;paintingDisabled())
</span><span class="cx">         return;
</span><span class="cx"> 
</span><span class="lines">@@ -697,6 +698,13 @@
</span><span class="cx">     context-&gt;clip(clipRect);
</span><span class="cx"> 
</span><span class="cx">     context-&gt;drawHighlightForText(font, textRun, localOrigin, selHeight, c, style.colorSpace(), sPos, ePos);
</span><ins>+#else
+    UNUSED_PARAM(context);
+    UNUSED_PARAM(boxOrigin);
+    UNUSED_PARAM(style);
+    UNUSED_PARAM(font);
+    UNUSED_PARAM(textColor);
+#endif
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void InlineTextBox::paintCompositionBackground(GraphicsContext* context, const FloatPoint&amp; boxOrigin, const RenderStyle&amp; style, const Font&amp; font, int startPos, int endPos)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingLogicalSelectionOffsetCachesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/LogicalSelectionOffsetCaches.h (158749 => 158750)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/LogicalSelectionOffsetCaches.h        2013-11-06 16:45:28 UTC (rev 158749)
+++ trunk/Source/WebCore/rendering/LogicalSelectionOffsetCaches.h        2013-11-06 16:48:17 UTC (rev 158750)
</span><span class="lines">@@ -135,7 +135,11 @@
</span><span class="cx"> 
</span><span class="cx">     explicit LogicalSelectionOffsetCaches(RenderBlock&amp; rootBlock)
</span><span class="cx">     {
</span><ins>+#if ENABLE(TEXT_SELECTION)
+        // FIXME: We should either move this assertion to the caller (if applicable) or structure the code
+        // such that we can remove this assertion.
</ins><span class="cx">         ASSERT(rootBlock.isSelectionRoot());
</span><ins>+#endif
</ins><span class="cx">         auto parent = rootBlock.parent();
</span><span class="cx"> 
</span><span class="cx">         // LogicalSelectionOffsetCaches should not be used on an orphaned tree.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (158749 => 158750)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlock.cpp        2013-11-06 16:45:28 UTC (rev 158749)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp        2013-11-06 16:48:17 UTC (rev 158750)
</span><span class="lines">@@ -2615,6 +2615,7 @@
</span><span class="cx"> 
</span><span class="cx"> void RenderBlock::paintSelection(PaintInfo&amp; paintInfo, const LayoutPoint&amp; paintOffset)
</span><span class="cx"> {
</span><ins>+#if ENABLE(TEXT_SELECTION)
</ins><span class="cx">     if (shouldPaintSelectionGaps() &amp;&amp; paintInfo.phase == PaintPhaseForeground) {
</span><span class="cx">         LogicalSelectionOffsetCaches cache(*this);
</span><span class="cx">         LayoutUnit lastTop = 0;
</span><span class="lines">@@ -2637,6 +2638,10 @@
</span><span class="cx">             }
</span><span class="cx">         }
</span><span class="cx">     }
</span><ins>+#else
+    UNUSED_PARAM(paintInfo);
+    UNUSED_PARAM(paintOffset);
+#endif
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> static void clipOutPositionedObjects(const PaintInfo* paintInfo, const LayoutPoint&amp; offset, TrackedRendererListHashSet* positionedObjects)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingTextPaintStylecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/TextPaintStyle.cpp (158749 => 158750)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/TextPaintStyle.cpp        2013-11-06 16:45:28 UTC (rev 158749)
+++ trunk/Source/WebCore/rendering/TextPaintStyle.cpp        2013-11-06 16:48:17 UTC (rev 158750)
</span><span class="lines">@@ -110,11 +110,11 @@
</span><span class="cx"> {
</span><span class="cx">     paintSelectedTextOnly = (paintInfo.phase == PaintPhaseSelection);
</span><span class="cx">     paintSelectedTextSeparately = false;
</span><del>-    const ShadowData* textShadow = paintInfo.forceBlackText() ? 0 : lineStyle.textShadow();
</del><ins>+    selectionShadow = paintInfo.forceBlackText() ? nullptr : lineStyle.textShadow();
</ins><span class="cx"> 
</span><span class="cx">     TextPaintStyle selectionPaintStyle = textPaintStyle;
</span><span class="cx"> 
</span><del>-    selectionShadow = textShadow;
</del><ins>+#if ENABLE(TEXT_SELECTION)
</ins><span class="cx">     Color foreground = paintInfo.forceBlackText() ? Color::black : renderer.selectionForegroundColor();
</span><span class="cx">     if (foreground.isValid() &amp;&amp; foreground != selectionPaintStyle.fillColor) {
</span><span class="cx">         if (!paintSelectedTextOnly)
</span><span class="lines">@@ -151,6 +151,11 @@
</span><span class="cx">             selectionPaintStyle.strokeColor = stroke;
</span><span class="cx">         }
</span><span class="cx">     }
</span><ins>+#else
+    UNUSED_PARAM(renderer);
+    UNUSED_PARAM(lineStyle);
+    UNUSED_PARAM(paintInfo);
+#endif
</ins><span class="cx">     return selectionPaintStyle;
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>