<!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>[163717] trunk</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/163717">163717</a></dd>
<dt>Author</dt> <dd>mitz@apple.com</dd>
<dt>Date</dt> <dd>2014-02-08 11:58:21 -0800 (Sat, 08 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove client-drawn highlights (-webkit-highlight, WebHTMLHighlighter)
https://bugs.webkit.org/show_bug.cgi?id=128456
Reviewed by Anders Carlsson.
Source/WebCore:
Updated fast/css/getComputedStyle and svg/css results.
* css/CSSComputedStyleDeclaration.cpp:
(WebCore::ComputedStyleExtractor::propertyValue): Removed CSSPropertyWebKitHighlight case.
* css/CSSParser.cpp:
(WebCore::CSSParser::parseValue): Ditto.
* css/CSSPropertyNames.in: Removed -webkit-highlight.
* css/DeprecatedStyleBuilder.cpp:
(WebCore::DeprecatedStyleBuilder::DeprecatedStyleBuilder): Removed
CSSPropertyWebKitHighlight handler.
* css/StyleResolver.cpp:
(WebCore::StyleResolver::applyProperty): Removed CSSPropertyWebKitHighlight case.
* page/Chrome.cpp: Removed customHighlightRect and paintCustomHighlight.
* page/ChromeClient.h: Ditto.
* rendering/InlineTextBox.cpp:
(WebCore::InlineTextBox::paint): Removed painting custom highlight.
* rendering/InlineTextBox.h:
* rendering/RenderBlockLineLayout.cpp:
(WebCore::RenderBlockFlow::createLineBoxesFromBidiRuns): Removed adding overflow for custom
highlights.
* rendering/RenderBox.cpp: Removed paintCustomHighlight.
* rendering/RenderBox.h:
* rendering/RenderImage.cpp:
(WebCore::RenderImage::paintReplaced): Removed painting custom highlight.
* rendering/RenderListMarker.cpp:
(WebCore::RenderListMarker::paint): Ditto.
* rendering/RenderSnapshottedPlugIn.cpp:
(WebCore::RenderSnapshottedPlugIn::paintSnapshot): Ditto.
* rendering/RenderWidget.cpp:
(WebCore::RenderWidget::paint): Ditto.
* rendering/RootInlineBox.cpp:
(WebCore::RootInlineBox::paint): Ditto.
* rendering/RootInlineBox.h:
* rendering/style/RenderStyle.cpp:
(WebCore::RenderStyle::changeRequiresLayout): Removed highlight comparison.
* rendering/style/RenderStyle.h:
* rendering/style/StyleRareInheritedData.cpp:
(WebCore::StyleRareInheritedData::StyleRareInheritedData): Removed initializer.
(WebCore::StyleRareInheritedData::operator==): Removed highlight comparison.
* rendering/style/StyleRareInheritedData.h: Removed highlight member variable.
Source/WebInspectorUI:
* UserInterface/CSSKeywordCompletions.js: Removed -webkit-highlight.
Source/WebKit/mac:
* WebCoreSupport/WebChromeClient.h:
* WebCoreSupport/WebChromeClient.mm: Removed customHighlightRect and paintCustomHighlight.
* WebView/WebHTMLView.mm:
(-[WebHTMLViewPrivate dealloc]): Removed highlighters ivar.
(-[WebHTMLViewPrivate clear]): Ditto.
* WebView/WebHTMLViewInternal.h: Removed declaration.
* WebView/WebHTMLViewPrivate.h: Removed WebHTMLHighlighter protocol and method declarations.
Source/WebKit2:
* WebProcess/WebCoreSupport/WebChromeClient.cpp: Removed customHighlightRect and
paintCustomHighlight.
* WebProcess/WebCoreSupport/WebChromeClient.h:
LayoutTests:
* fast/css/getComputedStyle/computed-style-expected.txt:
* fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
* svg/css/getComputedStyle-basic-expected.txt:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastcssgetComputedStylecomputedstyleexpectedtxt">trunk/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssgetComputedStylecomputedstylewithoutrendererexpectedtxt">trunk/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt</a></li>
<li><a href="#trunkLayoutTestssvgcssgetComputedStylebasicexpectedtxt">trunk/LayoutTests/svg/css/getComputedStyle-basic-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSComputedStyleDeclarationcpp">trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSParsercpp">trunk/Source/WebCore/css/CSSParser.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSPropertyNamesin">trunk/Source/WebCore/css/CSSPropertyNames.in</a></li>
<li><a href="#trunkSourceWebCorecssDeprecatedStyleBuildercpp">trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp</a></li>
<li><a href="#trunkSourceWebCorecssStyleResolvercpp">trunk/Source/WebCore/css/StyleResolver.cpp</a></li>
<li><a href="#trunkSourceWebCorepageChromecpp">trunk/Source/WebCore/page/Chrome.cpp</a></li>
<li><a href="#trunkSourceWebCorepageChromeClienth">trunk/Source/WebCore/page/ChromeClient.h</a></li>
<li><a href="#trunkSourceWebCorerenderingInlineTextBoxcpp">trunk/Source/WebCore/rendering/InlineTextBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingInlineTextBoxh">trunk/Source/WebCore/rendering/InlineTextBox.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockLineLayoutcpp">trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBoxcpp">trunk/Source/WebCore/rendering/RenderBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBoxh">trunk/Source/WebCore/rendering/RenderBox.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderImagecpp">trunk/Source/WebCore/rendering/RenderImage.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderListMarkercpp">trunk/Source/WebCore/rendering/RenderListMarker.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderSnapshottedPlugIncpp">trunk/Source/WebCore/rendering/RenderSnapshottedPlugIn.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderWidgetcpp">trunk/Source/WebCore/rendering/RenderWidget.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRootInlineBoxcpp">trunk/Source/WebCore/rendering/RootInlineBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRootInlineBoxh">trunk/Source/WebCore/rendering/RootInlineBox.h</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleRenderStylecpp">trunk/Source/WebCore/rendering/style/RenderStyle.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleRenderStyleh">trunk/Source/WebCore/rendering/style/RenderStyle.h</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleStyleRareInheritedDatacpp">trunk/Source/WebCore/rendering/style/StyleRareInheritedData.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleStyleRareInheritedDatah">trunk/Source/WebCore/rendering/style/StyleRareInheritedData.h</a></li>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceCSSKeywordCompletionsjs">trunk/Source/WebInspectorUI/UserInterface/CSSKeywordCompletions.js</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebChromeClienth">trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebChromeClientmm">trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebHTMLViewmm">trunk/Source/WebKit/mac/WebView/WebHTMLView.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebHTMLViewInternalh">trunk/Source/WebKit/mac/WebView/WebHTMLViewInternal.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebHTMLViewPrivateh">trunk/Source/WebKit/mac/WebView/WebHTMLViewPrivate.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClienth">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (163716 => 163717)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-02-08 18:37:27 UTC (rev 163716)
+++ trunk/LayoutTests/ChangeLog 2014-02-08 19:58:21 UTC (rev 163717)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-02-08 Dan Bernstein <mitz@apple.com>
+
+ Remove client-drawn highlights (-webkit-highlight, WebHTMLHighlighter)
+ https://bugs.webkit.org/show_bug.cgi?id=128456
+
+ Reviewed by Anders Carlsson.
+
+ * fast/css/getComputedStyle/computed-style-expected.txt:
+ * fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
+ * svg/css/getComputedStyle-basic-expected.txt:
+
</ins><span class="cx"> 2014-02-08 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> Convert current MHTML tests into reftests
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgetComputedStylecomputedstyleexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt (163716 => 163717)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt 2014-02-08 18:37:27 UTC (rev 163716)
+++ trunk/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt 2014-02-08 19:58:21 UTC (rev 163717)
</span><span class="lines">@@ -152,7 +152,6 @@
</span><span class="cx"> -webkit-font-kerning: auto;
</span><span class="cx"> -webkit-font-smoothing: auto;
</span><span class="cx"> -webkit-font-variant-ligatures: normal;
</span><del>--webkit-highlight: none;
</del><span class="cx"> -webkit-hyphenate-character: auto;
</span><span class="cx"> -webkit-hyphenate-limit-after: auto;
</span><span class="cx"> -webkit-hyphenate-limit-before: auto;
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgetComputedStylecomputedstylewithoutrendererexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt (163716 => 163717)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt 2014-02-08 18:37:27 UTC (rev 163716)
+++ trunk/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt 2014-02-08 19:58:21 UTC (rev 163717)
</span><span class="lines">@@ -151,7 +151,6 @@
</span><span class="cx"> -webkit-font-kerning: auto
</span><span class="cx"> -webkit-font-smoothing: auto
</span><span class="cx"> -webkit-font-variant-ligatures: normal
</span><del>--webkit-highlight: none
</del><span class="cx"> -webkit-hyphenate-character: auto
</span><span class="cx"> -webkit-hyphenate-limit-after: auto
</span><span class="cx"> -webkit-hyphenate-limit-before: auto
</span></span></pre></div>
<a id="trunkLayoutTestssvgcssgetComputedStylebasicexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/svg/css/getComputedStyle-basic-expected.txt (163716 => 163717)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/css/getComputedStyle-basic-expected.txt 2014-02-08 18:37:27 UTC (rev 163716)
+++ trunk/LayoutTests/svg/css/getComputedStyle-basic-expected.txt 2014-02-08 19:58:21 UTC (rev 163717)
</span><span class="lines">@@ -302,8 +302,6 @@
</span><span class="cx"> rect: style.getPropertyCSSValue(-webkit-font-smoothing) : [object CSSPrimitiveValue]
</span><span class="cx"> rect: style.getPropertyValue(-webkit-font-variant-ligatures) : normal
</span><span class="cx"> rect: style.getPropertyCSSValue(-webkit-font-variant-ligatures) : [object CSSPrimitiveValue]
</span><del>-rect: style.getPropertyValue(-webkit-highlight) : none
-rect: style.getPropertyCSSValue(-webkit-highlight) : [object CSSPrimitiveValue]
</del><span class="cx"> rect: style.getPropertyValue(-webkit-hyphenate-character) : auto
</span><span class="cx"> rect: style.getPropertyCSSValue(-webkit-hyphenate-character) : [object CSSPrimitiveValue]
</span><span class="cx"> rect: style.getPropertyValue(-webkit-hyphenate-limit-after) : auto
</span><span class="lines">@@ -798,8 +796,6 @@
</span><span class="cx"> g: style.getPropertyCSSValue(-webkit-font-smoothing) : [object CSSPrimitiveValue]
</span><span class="cx"> g: style.getPropertyValue(-webkit-font-variant-ligatures) : normal
</span><span class="cx"> g: style.getPropertyCSSValue(-webkit-font-variant-ligatures) : [object CSSPrimitiveValue]
</span><del>-g: style.getPropertyValue(-webkit-highlight) : none
-g: style.getPropertyCSSValue(-webkit-highlight) : [object CSSPrimitiveValue]
</del><span class="cx"> g: style.getPropertyValue(-webkit-hyphenate-character) : auto
</span><span class="cx"> g: style.getPropertyCSSValue(-webkit-hyphenate-character) : [object CSSPrimitiveValue]
</span><span class="cx"> g: style.getPropertyValue(-webkit-hyphenate-limit-after) : auto
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (163716 => 163717)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-08 18:37:27 UTC (rev 163716)
+++ trunk/Source/WebCore/ChangeLog 2014-02-08 19:58:21 UTC (rev 163717)
</span><span class="lines">@@ -1,5 +1,53 @@
</span><span class="cx"> 2014-02-08 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><ins>+ Remove client-drawn highlights (-webkit-highlight, WebHTMLHighlighter)
+ https://bugs.webkit.org/show_bug.cgi?id=128456
+
+ Reviewed by Anders Carlsson.
+
+ Updated fast/css/getComputedStyle and svg/css results.
+
+ * css/CSSComputedStyleDeclaration.cpp:
+ (WebCore::ComputedStyleExtractor::propertyValue): Removed CSSPropertyWebKitHighlight case.
+ * css/CSSParser.cpp:
+ (WebCore::CSSParser::parseValue): Ditto.
+ * css/CSSPropertyNames.in: Removed -webkit-highlight.
+ * css/DeprecatedStyleBuilder.cpp:
+ (WebCore::DeprecatedStyleBuilder::DeprecatedStyleBuilder): Removed
+ CSSPropertyWebKitHighlight handler.
+ * css/StyleResolver.cpp:
+ (WebCore::StyleResolver::applyProperty): Removed CSSPropertyWebKitHighlight case.
+ * page/Chrome.cpp: Removed customHighlightRect and paintCustomHighlight.
+ * page/ChromeClient.h: Ditto.
+ * rendering/InlineTextBox.cpp:
+ (WebCore::InlineTextBox::paint): Removed painting custom highlight.
+ * rendering/InlineTextBox.h:
+ * rendering/RenderBlockLineLayout.cpp:
+ (WebCore::RenderBlockFlow::createLineBoxesFromBidiRuns): Removed adding overflow for custom
+ highlights.
+ * rendering/RenderBox.cpp: Removed paintCustomHighlight.
+ * rendering/RenderBox.h:
+ * rendering/RenderImage.cpp:
+ (WebCore::RenderImage::paintReplaced): Removed painting custom highlight.
+ * rendering/RenderListMarker.cpp:
+ (WebCore::RenderListMarker::paint): Ditto.
+ * rendering/RenderSnapshottedPlugIn.cpp:
+ (WebCore::RenderSnapshottedPlugIn::paintSnapshot): Ditto.
+ * rendering/RenderWidget.cpp:
+ (WebCore::RenderWidget::paint): Ditto.
+ * rendering/RootInlineBox.cpp:
+ (WebCore::RootInlineBox::paint): Ditto.
+ * rendering/RootInlineBox.h:
+ * rendering/style/RenderStyle.cpp:
+ (WebCore::RenderStyle::changeRequiresLayout): Removed highlight comparison.
+ * rendering/style/RenderStyle.h:
+ * rendering/style/StyleRareInheritedData.cpp:
+ (WebCore::StyleRareInheritedData::StyleRareInheritedData): Removed initializer.
+ (WebCore::StyleRareInheritedData::operator==): Removed highlight comparison.
+ * rendering/style/StyleRareInheritedData.h: Removed highlight member variable.
+
+2014-02-08 Dan Bernstein <mitz@apple.com>
+
</ins><span class="cx"> One more build fix fix.
</span><span class="cx">
</span><span class="cx"> * accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSComputedStyleDeclarationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (163716 => 163717)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2014-02-08 18:37:27 UTC (rev 163716)
+++ trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2014-02-08 19:58:21 UTC (rev 163717)
</span><span class="lines">@@ -290,7 +290,6 @@
</span><span class="cx"> CSSPropertyWebkitGridTemplateRows,
</span><span class="cx"> CSSPropertyWebkitGridRowEnd,
</span><span class="cx"> CSSPropertyWebkitGridRowStart,
</span><del>- CSSPropertyWebkitHighlight,
</del><span class="cx"> CSSPropertyWebkitHyphenateCharacter,
</span><span class="cx"> CSSPropertyWebkitHyphenateLimitAfter,
</span><span class="cx"> CSSPropertyWebkitHyphenateLimitBefore,
</span><span class="lines">@@ -2118,10 +2117,6 @@
</span><span class="cx"> return zoomAdjustedPixelValue(sizingBox(renderer).height(), style.get());
</span><span class="cx"> }
</span><span class="cx"> return zoomAdjustedPixelValueForLength(style->height(), style.get());
</span><del>- case CSSPropertyWebkitHighlight:
- if (style->highlight() == nullAtom)
- return cssValuePool().createIdentifierValue(CSSValueNone);
- return cssValuePool().createValue(style->highlight(), CSSPrimitiveValue::CSS_STRING);
</del><span class="cx"> case CSSPropertyWebkitHyphens:
</span><span class="cx"> return cssValuePool().createValue(style->hyphens());
</span><span class="cx"> case CSSPropertyWebkitHyphenateCharacter:
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParser.cpp (163716 => 163717)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParser.cpp 2014-02-08 18:37:27 UTC (rev 163716)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2014-02-08 19:58:21 UTC (rev 163717)
</span><span class="lines">@@ -2686,11 +2686,6 @@
</span><span class="cx"> validPrimitive = validUnit(value, FLength);
</span><span class="cx"> break;
</span><span class="cx">
</span><del>- case CSSPropertyWebkitHighlight:
- if (id == CSSValueNone || value->unit == CSSPrimitiveValue::CSS_STRING)
- validPrimitive = true;
- break;
-
</del><span class="cx"> case CSSPropertyWebkitHyphenateCharacter:
</span><span class="cx"> if (id == CSSValueAuto || value->unit == CSSPrimitiveValue::CSS_STRING)
</span><span class="cx"> validPrimitive = true;
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPropertyNamesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSPropertyNames.in (163716 => 163717)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSPropertyNames.in 2014-02-08 18:37:27 UTC (rev 163716)
+++ trunk/Source/WebCore/css/CSSPropertyNames.in 2014-02-08 19:58:21 UTC (rev 163717)
</span><span class="lines">@@ -312,7 +312,6 @@
</span><span class="cx"> -webkit-grid-row
</span><span class="cx"> -webkit-grid-template
</span><span class="cx"> -webkit-grid-auto-flow
</span><del>--webkit-highlight [Inherited]
</del><span class="cx"> -webkit-hyphenate-character [Inherited]
</span><span class="cx"> -webkit-hyphenate-limit-after [Inherited]
</span><span class="cx"> -webkit-hyphenate-limit-before [Inherited]
</span></span></pre></div>
<a id="trunkSourceWebCorecssDeprecatedStyleBuildercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp (163716 => 163717)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp 2014-02-08 18:37:27 UTC (rev 163716)
+++ trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp 2014-02-08 19:58:21 UTC (rev 163717)
</span><span class="lines">@@ -2521,7 +2521,6 @@
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitFontKerning, ApplyPropertyFont<FontDescription::Kerning, &FontDescription::kerning, &FontDescription::setKerning, FontDescription::AutoKerning>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitFontSmoothing, ApplyPropertyFont<FontSmoothingMode, &FontDescription::fontSmoothing, &FontDescription::setFontSmoothing, AutoSmoothing>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitFontVariantLigatures, ApplyPropertyFontVariantLigatures::createHandler());
</span><del>- setPropertyHandler(CSSPropertyWebkitHighlight, ApplyPropertyString<MapNoneToNull, &RenderStyle::highlight, &RenderStyle::setHighlight, &RenderStyle::initialHighlight>::createHandler());
</del><span class="cx"> setPropertyHandler(CSSPropertyWebkitHyphenateCharacter, ApplyPropertyString<MapAutoToNull, &RenderStyle::hyphenationString, &RenderStyle::setHyphenationString, &RenderStyle::initialHyphenationString>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitHyphenateLimitAfter, ApplyPropertyNumber<short, &RenderStyle::hyphenationLimitAfter, &RenderStyle::setHyphenationLimitAfter, &RenderStyle::initialHyphenationLimitAfter>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitHyphenateLimitBefore, ApplyPropertyNumber<short, &RenderStyle::hyphenationLimitBefore, &RenderStyle::setHyphenationLimitBefore, &RenderStyle::initialHyphenationLimitBefore>::createHandler());
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleResolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolver.cpp (163716 => 163717)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleResolver.cpp 2014-02-08 18:37:27 UTC (rev 163716)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2014-02-08 19:58:21 UTC (rev 163717)
</span><span class="lines">@@ -2929,7 +2929,6 @@
</span><span class="cx"> case CSSPropertyWebkitFontKerning:
</span><span class="cx"> case CSSPropertyWebkitFontSmoothing:
</span><span class="cx"> case CSSPropertyWebkitFontVariantLigatures:
</span><del>- case CSSPropertyWebkitHighlight:
</del><span class="cx"> case CSSPropertyWebkitHyphenateCharacter:
</span><span class="cx"> case CSSPropertyWebkitHyphenateLimitAfter:
</span><span class="cx"> case CSSPropertyWebkitHyphenateLimitBefore:
</span></span></pre></div>
<a id="trunkSourceWebCorepageChromecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Chrome.cpp (163716 => 163717)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Chrome.cpp 2014-02-08 18:37:27 UTC (rev 163716)
+++ trunk/Source/WebCore/page/Chrome.cpp 2014-02-08 19:58:21 UTC (rev 163717)
</span><span class="lines">@@ -559,15 +559,6 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-FloatRect ChromeClient::customHighlightRect(Node*, const AtomicString&, const FloatRect&)
-{
- return FloatRect();
-}
-
-void ChromeClient::paintCustomHighlight(Node*, const AtomicString&, const FloatRect&, const FloatRect&, bool, bool)
-{
-}
-
</del><span class="cx"> bool ChromeClient::shouldReplaceWithGeneratedFileForUpload(const String&, String&)
</span><span class="cx"> {
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebCorepageChromeClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ChromeClient.h (163716 => 163717)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ChromeClient.h 2014-02-08 18:37:27 UTC (rev 163716)
+++ trunk/Source/WebCore/page/ChromeClient.h 2014-02-08 19:58:21 UTC (rev 163717)
</span><span class="lines">@@ -219,9 +219,6 @@
</span><span class="cx">
</span><span class="cx"> virtual void populateVisitedLinks();
</span><span class="cx">
</span><del>- virtual FloatRect customHighlightRect(Node*, const AtomicString& type, const FloatRect& lineRect);
- virtual void paintCustomHighlight(Node*, const AtomicString& type, const FloatRect& boxRect, const FloatRect& lineRect, bool behindText, bool entireLine);
-
</del><span class="cx"> virtual bool shouldReplaceWithGeneratedFileForUpload(const String& path, String& generatedFilename);
</span><span class="cx"> virtual String generateReplacementFile(const String& path);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingInlineTextBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/InlineTextBox.cpp (163716 => 163717)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/InlineTextBox.cpp 2014-02-08 18:37:27 UTC (rev 163716)
+++ trunk/Source/WebCore/rendering/InlineTextBox.cpp 2014-02-08 19:58:21 UTC (rev 163717)
</span><span class="lines">@@ -585,12 +585,6 @@
</span><span class="cx"> // 1. Paint backgrounds behind text if needed. Examples of such backgrounds include selection
</span><span class="cx"> // and composition underlines.
</span><span class="cx"> if (paintInfo.phase != PaintPhaseSelection && paintInfo.phase != PaintPhaseTextClip && !isPrinting) {
</span><del>-#if PLATFORM(MAC)
- // Custom highlighters go behind everything else.
- if (lineStyle.highlight() != nullAtom && !context->paintingDisabled())
- paintCustomHighlight(adjustedPaintOffset, lineStyle.highlight());
-#endif
-
</del><span class="cx"> if (containsComposition && !useCustomUnderlines)
</span><span class="cx"> paintCompositionBackground(context, boxOrigin, lineStyle, font,
</span><span class="cx"> renderer().frame().editor().compositionStart(),
</span><span class="lines">@@ -814,23 +808,6 @@
</span><span class="cx"> context->drawHighlightForText(font, constructTextRun(style, font), localOrigin, selHeight, c, style.colorSpace(), sPos, ePos);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
-
-void InlineTextBox::paintCustomHighlight(const LayoutPoint& paintOffset, const AtomicString& type)
-{
- Page* page = renderer().frame().page();
- if (!page)
- return;
-
- const RootInlineBox& rootBox = root();
- FloatRect rootRect(paintOffset.x() + rootBox.x(), paintOffset.y() + selectionTop(), rootBox.logicalWidth(), selectionHeight());
- FloatRect textRect(paintOffset.x() + x(), rootRect.y(), logicalWidth(), rootRect.height());
-
- page->chrome().client().paintCustomHighlight(renderer().textNode(), type, textRect, rootRect, true, false);
-}
-
-#endif
-
</del><span class="cx"> static StrokeStyle textDecorationStyleToStrokeStyle(TextDecorationStyle decorationStyle)
</span><span class="cx"> {
</span><span class="cx"> StrokeStyle strokeStyle = SolidStroke;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingInlineTextBoxh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/InlineTextBox.h (163716 => 163717)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/InlineTextBox.h 2014-02-08 18:37:27 UTC (rev 163716)
+++ trunk/Source/WebCore/rendering/InlineTextBox.h 2014-02-08 19:58:21 UTC (rev 163717)
</span><span class="lines">@@ -165,9 +165,6 @@
</span><span class="cx"> void paintCompositionBackground(GraphicsContext*, const FloatPoint& boxOrigin, const RenderStyle&, const Font&, int startPos, int endPos);
</span><span class="cx"> void paintDocumentMarkers(GraphicsContext*, const FloatPoint& boxOrigin, const RenderStyle&, const Font&, bool background);
</span><span class="cx"> void paintCompositionUnderline(GraphicsContext*, const FloatPoint& boxOrigin, const CompositionUnderline&);
</span><del>-#if PLATFORM(MAC)
- void paintCustomHighlight(const LayoutPoint&, const AtomicString& type);
-#endif
</del><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> void paintDecoration(GraphicsContext&, const FloatPoint& boxOrigin, TextDecoration, TextDecorationStyle, const ShadowData*, TextPainter&);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockLineLayoutcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp (163716 => 163717)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp 2014-02-08 18:37:27 UTC (rev 163716)
+++ trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp 2014-02-08 19:58:21 UTC (rev 163717)
</span><span class="lines">@@ -1016,11 +1016,6 @@
</span><span class="cx"> // Compute our overflow now.
</span><span class="cx"> lineBox->computeOverflow(lineBox->lineTop(), lineBox->lineBottom(), textBoxDataMap);
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
- // Highlight acts as an overflow inflation.
- if (style().highlight() != nullAtom)
- lineBox->addHighlightOverflow();
-#endif
</del><span class="cx"> return lineBox;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (163716 => 163717)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBox.cpp 2014-02-08 18:37:27 UTC (rev 163716)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp 2014-02-08 19:58:21 UTC (rev 163717)
</span><span class="lines">@@ -1622,28 +1622,6 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
-
-void RenderBox::paintCustomHighlight(const LayoutPoint& paintOffset, const AtomicString& type, bool behindText)
-{
- Page* page = frame().page();
- if (!page)
- return;
-
- InlineBox* boxWrap = inlineBoxWrapper();
- RootInlineBox* r = boxWrap ? &boxWrap->root() : 0;
- if (r) {
- FloatRect rootRect(paintOffset.x() + r->x(), paintOffset.y() + r->selectionTop(), r->logicalWidth(), r->selectionHeight());
- FloatRect imageRect(paintOffset.x() + x(), rootRect.y(), width(), rootRect.height());
- page->chrome().client().paintCustomHighlight(element(), type, imageRect, rootRect, behindText, false);
- } else {
- FloatRect imageRect(paintOffset.x() + x(), paintOffset.y() + y(), width(), height());
- page->chrome().client().paintCustomHighlight(element(), type, imageRect, imageRect, behindText, false);
- }
-}
-
-#endif
-
</del><span class="cx"> bool RenderBox::pushContentsClip(PaintInfo& paintInfo, const LayoutPoint& accumulatedOffset)
</span><span class="cx"> {
</span><span class="cx"> if (paintInfo.phase == PaintPhaseBlockBackground || paintInfo.phase == PaintPhaseSelfOutline || paintInfo.phase == PaintPhaseMask)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBox.h (163716 => 163717)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBox.h 2014-02-08 18:37:27 UTC (rev 163716)
+++ trunk/Source/WebCore/rendering/RenderBox.h 2014-02-08 19:58:21 UTC (rev 163717)
</span><span class="lines">@@ -634,10 +634,6 @@
</span><span class="cx"> BackgroundBleedAvoidance determineBackgroundBleedAvoidance(GraphicsContext*) const;
</span><span class="cx"> bool backgroundHasOpaqueTopLayer() const;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
- void paintCustomHighlight(const LayoutPoint&, const AtomicString& type, bool behindText);
-#endif
-
</del><span class="cx"> void computePositionedLogicalWidth(LogicalExtentComputedValues&, RenderRegion* = 0) const;
</span><span class="cx">
</span><span class="cx"> LayoutUnit computeIntrinsicLogicalWidthUsing(Length logicalWidthLength, LayoutUnit availableLogicalWidth, LayoutUnit borderAndPadding) const;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderImagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderImage.cpp (163716 => 163717)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderImage.cpp 2014-02-08 18:37:27 UTC (rev 163716)
+++ trunk/Source/WebCore/rendering/RenderImage.cpp 2014-02-08 19:58:21 UTC (rev 163717)
</span><span class="lines">@@ -463,11 +463,6 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
- if (style().highlight() != nullAtom && !paintInfo.context->paintingDisabled())
- paintCustomHighlight(toPoint(paintOffset - location()), style().highlight(), true);
-#endif
-
</del><span class="cx"> LayoutRect contentRect = contentBoxRect();
</span><span class="cx"> contentRect.moveBy(paintOffset);
</span><span class="cx"> LayoutRect paintRect = replacedContentRect(intrinsicSize());
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderListMarkercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderListMarker.cpp (163716 => 163717)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderListMarker.cpp 2014-02-08 18:37:27 UTC (rev 163716)
+++ trunk/Source/WebCore/rendering/RenderListMarker.cpp 2014-02-08 19:58:21 UTC (rev 163717)
</span><span class="lines">@@ -1196,10 +1196,6 @@
</span><span class="cx"> GraphicsContext* context = paintInfo.context;
</span><span class="cx">
</span><span class="cx"> if (isImage()) {
</span><del>-#if PLATFORM(MAC)
- if (style().highlight() != nullAtom && !paintInfo.context->paintingDisabled())
- paintCustomHighlight(paintOffset, style().highlight(), true);
-#endif
</del><span class="cx"> context->drawImage(m_image->image(this, marker.size()).get(), style().colorSpace(), marker);
</span><span class="cx"> if (selectionState() != SelectionNone) {
</span><span class="cx"> LayoutRect selRect = localSelectionRect();
</span><span class="lines">@@ -1209,12 +1205,6 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
- // FIXME: paint gap between marker and list item proper
- if (style().highlight() != nullAtom && !paintInfo.context->paintingDisabled())
- paintCustomHighlight(paintOffset, style().highlight(), true);
-#endif
-
</del><span class="cx"> if (selectionState() != SelectionNone) {
</span><span class="cx"> LayoutRect selRect = localSelectionRect();
</span><span class="cx"> selRect.moveBy(boxOrigin);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderSnapshottedPlugIncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderSnapshottedPlugIn.cpp (163716 => 163717)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderSnapshottedPlugIn.cpp 2014-02-08 18:37:27 UTC (rev 163716)
+++ trunk/Source/WebCore/rendering/RenderSnapshottedPlugIn.cpp 2014-02-08 19:58:21 UTC (rev 163717)
</span><span class="lines">@@ -123,10 +123,6 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> GraphicsContext* context = paintInfo.context;
</span><del>-#if PLATFORM(MAC)
- if (style().highlight() != nullAtom && !context->paintingDisabled())
- paintCustomHighlight(toPoint(paintOffset - location()), style().highlight(), true);
-#endif
</del><span class="cx">
</span><span class="cx"> LayoutSize contentSize(cWidth, cHeight);
</span><span class="cx"> LayoutPoint contentLocation = location() + paintOffset;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderWidgetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderWidget.cpp (163716 => 163717)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderWidget.cpp 2014-02-08 18:37:27 UTC (rev 163716)
+++ trunk/Source/WebCore/rendering/RenderWidget.cpp 2014-02-08 19:58:21 UTC (rev 163717)
</span><span class="lines">@@ -268,11 +268,6 @@
</span><span class="cx"> if (paintInfo.phase != PaintPhaseForeground)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
- if (style().highlight() != nullAtom && !paintInfo.context->paintingDisabled())
- paintCustomHighlight(paintOffset, style().highlight(), true);
-#endif
-
</del><span class="cx"> if (style().hasBorderRadius()) {
</span><span class="cx"> LayoutRect borderRect = LayoutRect(adjustedPaintOffset, size());
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRootInlineBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RootInlineBox.cpp (163716 => 163717)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RootInlineBox.cpp 2014-02-08 18:37:27 UTC (rev 163716)
+++ trunk/Source/WebCore/rendering/RootInlineBox.cpp 2014-02-08 19:58:21 UTC (rev 163717)
</span><span class="lines">@@ -168,38 +168,6 @@
</span><span class="cx"> ellipsisBox()->paint(paintInfo, paintOffset, lineTop, lineBottom);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
-
-void RootInlineBox::addHighlightOverflow()
-{
- Page* page = renderer().frame().page();
- if (!page)
- return;
-
- // Highlight acts as a selection inflation.
- FloatRect rootRect(0, selectionTop(), logicalWidth(), selectionHeight());
- IntRect inflatedRect = enclosingIntRect(page->chrome().client().customHighlightRect(renderer().element(), renderer().style().highlight(), rootRect));
- setOverflowFromLogicalRects(inflatedRect, inflatedRect, lineTop(), lineBottom());
-}
-
-void RootInlineBox::paintCustomHighlight(PaintInfo& paintInfo, const LayoutPoint& paintOffset, const AtomicString& highlightType)
-{
- if (!paintInfo.shouldPaintWithinRoot(renderer()) || renderer().style().visibility() != VISIBLE || paintInfo.phase != PaintPhaseForeground)
- return;
-
- Page* page = renderer().frame().page();
- if (!page)
- return;
-
- // Get the inflated rect so that we can properly hit test.
- FloatRect rootRect(paintOffset.x() + x(), paintOffset.y() + selectionTop(), logicalWidth(), selectionHeight());
- FloatRect inflatedRect = page->chrome().client().customHighlightRect(renderer().element(), highlightType, rootRect);
- if (inflatedRect.intersects(paintInfo.rect))
- page->chrome().client().paintCustomHighlight(renderer().element(), highlightType, rootRect, rootRect, false, true);
-}
-
-#endif
-
</del><span class="cx"> void RootInlineBox::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset, LayoutUnit lineTop, LayoutUnit lineBottom)
</span><span class="cx"> {
</span><span class="cx"> // Check if we are in the correct region.
</span><span class="lines">@@ -208,11 +176,6 @@
</span><span class="cx">
</span><span class="cx"> InlineFlowBox::paint(paintInfo, paintOffset, lineTop, lineBottom);
</span><span class="cx"> paintEllipsisBox(paintInfo, paintOffset, lineTop, lineBottom);
</span><del>-#if PLATFORM(MAC)
- const RenderStyle& lineStyle = this->lineStyle();
- if (lineStyle.highlight() != nullAtom && !paintInfo.context->paintingDisabled())
- paintCustomHighlight(paintInfo, paintOffset, lineStyle.highlight());
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool RootInlineBox::nodeAtPoint(const HitTestRequest& request, HitTestResult& result, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, LayoutUnit lineTop, LayoutUnit lineBottom)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRootInlineBoxh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RootInlineBox.h (163716 => 163717)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RootInlineBox.h 2014-02-08 18:37:27 UTC (rev 163716)
+++ trunk/Source/WebCore/rendering/RootInlineBox.h 2014-02-08 19:58:21 UTC (rev 163717)
</span><span class="lines">@@ -118,11 +118,6 @@
</span><span class="cx"> virtual int baselinePosition(FontBaseline baselineType) const override final;
</span><span class="cx"> virtual LayoutUnit lineHeight() const override final;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
- void addHighlightOverflow();
- void paintCustomHighlight(PaintInfo&, const LayoutPoint&, const AtomicString& highlightType);
-#endif
-
</del><span class="cx"> virtual void paint(PaintInfo&, const LayoutPoint&, LayoutUnit lineTop, LayoutUnit lineBottom) override;
</span><span class="cx"> virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, LayoutUnit lineTop, LayoutUnit lineBottom) override final;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStylecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyle.cpp (163716 => 163717)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyle.cpp 2014-02-08 18:37:27 UTC (rev 163716)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.cpp 2014-02-08 19:58:21 UTC (rev 163717)
</span><span class="lines">@@ -481,8 +481,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (rareInheritedData.get() != other->rareInheritedData.get()) {
</span><del>- if (rareInheritedData->highlight != other->rareInheritedData->highlight
- || rareInheritedData->indent != other->rareInheritedData->indent
</del><ins>+ if (rareInheritedData->indent != other->rareInheritedData->indent
</ins><span class="cx"> #if ENABLE(CSS3_TEXT)
</span><span class="cx"> || rareInheritedData->m_textAlignLast != other->rareInheritedData->m_textAlignLast
</span><span class="cx"> || rareInheritedData->m_textIndentLine != other->rareInheritedData->m_textIndentLine
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStyleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyle.h (163716 => 163717)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyle.h 2014-02-08 18:37:27 UTC (rev 163716)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.h 2014-02-08 19:58:21 UTC (rev 163717)
</span><span class="lines">@@ -814,7 +814,6 @@
</span><span class="cx"> EOverflowWrap overflowWrap() const { return static_cast<EOverflowWrap>(rareInheritedData->overflowWrap); }
</span><span class="cx"> ENBSPMode nbspMode() const { return static_cast<ENBSPMode>(rareInheritedData->nbspMode); }
</span><span class="cx"> LineBreak lineBreak() const { return static_cast<LineBreak>(rareInheritedData->lineBreak); }
</span><del>- const AtomicString& highlight() const { return rareInheritedData->highlight; }
</del><span class="cx"> Hyphens hyphens() const { return static_cast<Hyphens>(rareInheritedData->hyphens); }
</span><span class="cx"> short hyphenationLimitBefore() const { return rareInheritedData->hyphenationLimitBefore; }
</span><span class="cx"> short hyphenationLimitAfter() const { return rareInheritedData->hyphenationLimitAfter; }
</span><span class="lines">@@ -1333,7 +1332,6 @@
</span><span class="cx"> void setOverflowWrap(EOverflowWrap b) { SET_VAR(rareInheritedData, overflowWrap, b); }
</span><span class="cx"> void setNBSPMode(ENBSPMode b) { SET_VAR(rareInheritedData, nbspMode, b); }
</span><span class="cx"> void setLineBreak(LineBreak b) { SET_VAR(rareInheritedData, lineBreak, b); }
</span><del>- void setHighlight(const AtomicString& h) { SET_VAR(rareInheritedData, highlight, h); }
</del><span class="cx"> void setHyphens(Hyphens h) { SET_VAR(rareInheritedData, hyphens, h); }
</span><span class="cx"> void setHyphenationLimitBefore(short limit) { SET_VAR(rareInheritedData, hyphenationLimitBefore, limit); }
</span><span class="cx"> void setHyphenationLimitAfter(short limit) { SET_VAR(rareInheritedData, hyphenationLimitAfter, limit); }
</span><span class="lines">@@ -1715,7 +1713,6 @@
</span><span class="cx"> static EOverflowWrap initialOverflowWrap() { return NormalOverflowWrap; }
</span><span class="cx"> static ENBSPMode initialNBSPMode() { return NBNORMAL; }
</span><span class="cx"> static LineBreak initialLineBreak() { return LineBreakAuto; }
</span><del>- static const AtomicString& initialHighlight() { return nullAtom; }
</del><span class="cx"> static ESpeak initialSpeak() { return SpeakNormal; }
</span><span class="cx"> static Hyphens initialHyphens() { return HyphensManual; }
</span><span class="cx"> static short initialHyphenationLimitBefore() { return -1; }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleStyleRareInheritedDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/StyleRareInheritedData.cpp (163716 => 163717)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/StyleRareInheritedData.cpp 2014-02-08 18:37:27 UTC (rev 163716)
+++ trunk/Source/WebCore/rendering/style/StyleRareInheritedData.cpp 2014-02-08 19:58:21 UTC (rev 163717)
</span><span class="lines">@@ -147,7 +147,6 @@
</span><span class="cx"> , visitedLinkTextFillColor(o.visitedLinkTextFillColor)
</span><span class="cx"> , visitedLinkTextEmphasisColor(o.visitedLinkTextEmphasisColor)
</span><span class="cx"> , textShadow(o.textShadow ? adoptPtr(new ShadowData(*o.textShadow)) : nullptr)
</span><del>- , highlight(o.highlight)
</del><span class="cx"> , cursorData(o.cursorData)
</span><span class="cx"> , indent(o.indent)
</span><span class="cx"> , m_effectiveZoom(o.m_effectiveZoom)
</span><span class="lines">@@ -261,7 +260,6 @@
</span><span class="cx"> && tapHighlightColor == o.tapHighlightColor
</span><span class="cx"> #endif
</span><span class="cx"> && shadowDataEquivalent(o)
</span><del>- && highlight == o.highlight
</del><span class="cx"> && cursorDataEquivalent(cursorData.get(), o.cursorData.get())
</span><span class="cx"> && indent == o.indent
</span><span class="cx"> && m_effectiveZoom == o.m_effectiveZoom
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleStyleRareInheritedDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/StyleRareInheritedData.h (163716 => 163717)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/StyleRareInheritedData.h 2014-02-08 18:37:27 UTC (rev 163716)
+++ trunk/Source/WebCore/rendering/style/StyleRareInheritedData.h 2014-02-08 19:58:21 UTC (rev 163717)
</span><span class="lines">@@ -70,7 +70,6 @@
</span><span class="cx"> Color visitedLinkTextEmphasisColor;
</span><span class="cx">
</span><span class="cx"> OwnPtr<ShadowData> textShadow; // Our text shadow information for shadowed text drawing.
</span><del>- AtomicString highlight; // Apple-specific extension for custom highlight rendering.
</del><span class="cx">
</span><span class="cx"> RefPtr<CursorList> cursorData;
</span><span class="cx"> Length indent;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (163716 => 163717)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2014-02-08 18:37:27 UTC (rev 163716)
+++ trunk/Source/WebInspectorUI/ChangeLog 2014-02-08 19:58:21 UTC (rev 163717)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2014-02-08 Dan Bernstein <mitz@apple.com>
+
+ Remove client-drawn highlights (-webkit-highlight, WebHTMLHighlighter)
+ https://bugs.webkit.org/show_bug.cgi?id=128456
+
+ Reviewed by Anders Carlsson.
+
+ * UserInterface/CSSKeywordCompletions.js: Removed -webkit-highlight.
+
</ins><span class="cx"> 2014-02-07 Brian Burg <bburg@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Clean up DataGrid and add table columns incrementally
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceCSSKeywordCompletionsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/CSSKeywordCompletions.js (163716 => 163717)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/CSSKeywordCompletions.js 2014-02-08 18:37:27 UTC (rev 163716)
+++ trunk/Source/WebInspectorUI/UserInterface/CSSKeywordCompletions.js 2014-02-08 19:58:21 UTC (rev 163717)
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx"> "text-shadow", "text-transform", "visibility", "voice-family", "volume", "white-space", "widows", "word-break",
</span><span class="cx"> "word-spacing", "word-wrap", "writing-mode", "-webkit-aspect-ratio", "-webkit-border-horizontal-spacing",
</span><span class="cx"> "-webkit-border-vertical-spacing", "-webkit-box-direction", "-webkit-color-correction", "-webkit-font-feature-settings",
</span><del>- "-webkit-font-kerning", "-webkit-font-smoothing", "-webkit-font-variant-ligatures", "-webkit-highlight",
</del><ins>+ "-webkit-font-kerning", "-webkit-font-smoothing", "-webkit-font-variant-ligatures",
</ins><span class="cx"> "-webkit-hyphenate-character", "-webkit-hyphenate-limit-after", "-webkit-hyphenate-limit-before",
</span><span class="cx"> "-webkit-hyphenate-limit-lines", "-webkit-hyphens", "-webkit-line-align", "-webkit-line-box-contain",
</span><span class="cx"> "-webkit-line-break", "-webkit-line-grid", "-webkit-line-snap", "-webkit-locale", "-webkit-nbsp-mode",
</span><span class="lines">@@ -850,9 +850,6 @@
</span><span class="cx"> "-webkit-column-width": [
</span><span class="cx"> "auto", "calc()", "-webkit-calc()"
</span><span class="cx"> ],
</span><del>- "-webkit-highlight": [
- "none"
- ],
</del><span class="cx"> "-webkit-hyphenate-character": [
</span><span class="cx"> "none"
</span><span class="cx"> ],
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (163716 => 163717)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-02-08 18:37:27 UTC (rev 163716)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-02-08 19:58:21 UTC (rev 163717)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2014-02-08 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><ins>+ Remove client-drawn highlights (-webkit-highlight, WebHTMLHighlighter)
+ https://bugs.webkit.org/show_bug.cgi?id=128456
+
+ Reviewed by Anders Carlsson.
+
+ * WebCoreSupport/WebChromeClient.h:
+ * WebCoreSupport/WebChromeClient.mm: Removed customHighlightRect and paintCustomHighlight.
+ * WebView/WebHTMLView.mm:
+ (-[WebHTMLViewPrivate dealloc]): Removed highlighters ivar.
+ (-[WebHTMLViewPrivate clear]): Ditto.
+ * WebView/WebHTMLViewInternal.h: Removed declaration.
+ * WebView/WebHTMLViewPrivate.h: Removed WebHTMLHighlighter protocol and method declarations.
+
+2014-02-08 Dan Bernstein <mitz@apple.com>
+
</ins><span class="cx"> iOS build fix after r163712.
</span><span class="cx">
</span><span class="cx"> * WebCoreSupport/WebEditorClient.h:
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebChromeClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h (163716 => 163717)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h 2014-02-08 18:37:27 UTC (rev 163716)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h 2014-02-08 19:58:21 UTC (rev 163717)
</span><span class="lines">@@ -134,9 +134,6 @@
</span><span class="cx"> virtual void setCursorHiddenUntilMouseMoves(bool) override;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- virtual WebCore::FloatRect customHighlightRect(WebCore::Node*, const WTF::AtomicString& type, const WebCore::FloatRect& lineRect) override;
- virtual void paintCustomHighlight(WebCore::Node*, const WTF::AtomicString& type, const WebCore::FloatRect& boxRect, const WebCore::FloatRect& lineRect, bool behindText, bool entireLine) override;
-
</del><span class="cx"> #if ENABLE(INPUT_TYPE_COLOR)
</span><span class="cx"> virtual PassOwnPtr<WebCore::ColorChooser> createColorChooser(WebCore::ColorChooserClient*, const WebCore::Color&) override;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebChromeClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm (163716 => 163717)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm 2014-02-08 18:37:27 UTC (rev 163716)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm 2014-02-08 19:58:21 UTC (rev 163717)
</span><span class="lines">@@ -739,39 +739,6 @@
</span><span class="cx">
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-FloatRect WebChromeClient::customHighlightRect(Node* node, const AtomicString& type, const FloatRect& lineRect)
-{
- BEGIN_BLOCK_OBJC_EXCEPTIONS;
-
- NSView *documentView = [[kit(node->document().frame()) frameView] documentView];
- if (![documentView isKindOfClass:[WebHTMLView class]])
- return NSZeroRect;
-
- WebHTMLView *webHTMLView = (WebHTMLView *)documentView;
- id<WebHTMLHighlighter> highlighter = [webHTMLView _highlighterForType:type];
- return [highlighter highlightRectForLine:lineRect representedNode:kit(node)];
-
- END_BLOCK_OBJC_EXCEPTIONS;
-
- return NSZeroRect;
-}
-
-void WebChromeClient::paintCustomHighlight(Node* node, const AtomicString& type, const FloatRect& boxRect, const FloatRect& lineRect,
- bool behindText, bool entireLine)
-{
- BEGIN_BLOCK_OBJC_EXCEPTIONS;
-
- NSView *documentView = [[kit(node->document().frame()) frameView] documentView];
- if (![documentView isKindOfClass:[WebHTMLView class]])
- return;
-
- WebHTMLView *webHTMLView = (WebHTMLView *)documentView;
- id<WebHTMLHighlighter> highlighter = [webHTMLView _highlighterForType:type];
- [highlighter paintHighlightForBox:boxRect onLine:lineRect behindText:behindText entireLine:entireLine representedNode:kit(node)];
-
- END_BLOCK_OBJC_EXCEPTIONS;
-}
-
</del><span class="cx"> #if ENABLE(INPUT_TYPE_COLOR)
</span><span class="cx"> PassOwnPtr<ColorChooser> WebChromeClient::createColorChooser(ColorChooserClient* client, const Color& initialColor)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebHTMLViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebHTMLView.mm (163716 => 163717)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2014-02-08 18:37:27 UTC (rev 163716)
+++ trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2014-02-08 19:58:21 UTC (rev 163717)
</span><span class="lines">@@ -594,9 +594,6 @@
</span><span class="cx">
</span><span class="cx"> NSArray *pageRects;
</span><span class="cx">
</span><del>- NSMutableDictionary *highlighters;
-
-
</del><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> WebTextCompletionController *completionController;
</span><span class="cx"> #endif
</span><span class="lines">@@ -692,7 +689,6 @@
</span><span class="cx"> [completionController release];
</span><span class="cx"> #endif
</span><span class="cx"> [dataSource release];
</span><del>- [highlighters release];
</del><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> [trackingAreaForNonKeyWindow release];
</span><span class="cx"> if (promisedDragTIFFDataSource)
</span><span class="lines">@@ -731,7 +727,6 @@
</span><span class="cx"> [completionController release];
</span><span class="cx"> #endif
</span><span class="cx"> [dataSource release];
</span><del>- [highlighters release];
</del><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> [trackingAreaForNonKeyWindow release];
</span><span class="cx"> if (promisedDragTIFFDataSource)
</span><span class="lines">@@ -746,7 +741,6 @@
</span><span class="cx"> completionController = nil;
</span><span class="cx"> #endif
</span><span class="cx"> dataSource = nil;
</span><del>- highlighters = nil;
</del><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> trackingAreaForNonKeyWindow = nil;
</span><span class="cx"> promisedDragTIFFDataSource = 0;
</span><span class="lines">@@ -2088,18 +2082,6 @@
</span><span class="cx"> coreFrame->editor().decreaseSelectionListLevel();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)_setHighlighter:(id<WebHTMLHighlighter>)highlighter ofType:(NSString*)type
-{
- if (!_private->highlighters)
- _private->highlighters = [[NSMutableDictionary alloc] init];
- [_private->highlighters setObject:highlighter forKey:type];
-}
-
-- (void)_removeHighlighterOfType:(NSString*)type
-{
- [_private->highlighters removeObjectForKey:type];
-}
-
</del><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> - (void)_writeSelectionToPasteboard:(NSPasteboard *)pasteboard
</span><span class="cx"> {
</span><span class="lines">@@ -5537,11 +5519,6 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-- (id<WebHTMLHighlighter>)_highlighterForType:(NSString*)type
-{
- return [_private->highlighters objectForKey:type];
-}
-
</del><span class="cx"> - (WebFrame *)_frame
</span><span class="cx"> {
</span><span class="cx"> return [_private->dataSource webFrame];
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebHTMLViewInternalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebHTMLViewInternal.h (163716 => 163717)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebHTMLViewInternal.h 2014-02-08 18:37:27 UTC (rev 163716)
+++ trunk/Source/WebKit/mac/WebView/WebHTMLViewInternal.h 2014-02-08 19:58:21 UTC (rev 163717)
</span><span class="lines">@@ -45,7 +45,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> - (BOOL)_canSmartCopyOrDelete;
</span><span class="cx">
</span><del>-- (id <WebHTMLHighlighter>)_highlighterForType:(NSString*)type;
</del><span class="cx"> - (WebFrame *)_frame;
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> - (void)_lookUpInDictionaryFromMenu:(id)sender;
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebHTMLViewPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebHTMLViewPrivate.h (163716 => 163717)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebHTMLViewPrivate.h 2014-02-08 18:37:27 UTC (rev 163716)
+++ trunk/Source/WebKit/mac/WebView/WebHTMLViewPrivate.h 2014-02-08 19:58:21 UTC (rev 163717)
</span><span class="lines">@@ -39,11 +39,6 @@
</span><span class="cx"> @class DOMRange;
</span><span class="cx"> @class WebPluginController;
</span><span class="cx">
</span><del>-@protocol WebHTMLHighlighter
-- (NSRect)highlightRectForLine:(NSRect)lineRect representedNode:(DOMNode *)node;
-- (void)paintHighlightForBox:(NSRect)boxRect onLine:(NSRect)lineRect behindText:(BOOL)text entireLine:(BOOL)line representedNode:(DOMNode *)node;
-@end
-
</del><span class="cx"> extern const float _WebHTMLViewPrintingMinimumShrinkFactor;
</span><span class="cx"> extern const float _WebHTMLViewPrintingMaximumShrinkFactor;
</span><span class="cx">
</span><span class="lines">@@ -118,8 +113,6 @@
</span><span class="cx"> - (DOMNode *)_increaseSelectionListLevelOrdered;
</span><span class="cx"> - (DOMNode *)_increaseSelectionListLevelUnordered;
</span><span class="cx"> - (void)_decreaseSelectionListLevel;
</span><del>-- (void)_setHighlighter:(id <WebHTMLHighlighter>)highlighter ofType:(NSString *)type;
-- (void)_removeHighlighterOfType:(NSString *)type;
</del><span class="cx"> - (DOMDocumentFragment *)_documentFragmentFromPasteboard:(NSPasteboard *)pasteboard forType:(NSString *)pboardType inContext:(DOMRange *)context subresources:(NSArray **)subresources;
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (163716 => 163717)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-02-08 18:37:27 UTC (rev 163716)
+++ trunk/Source/WebKit2/ChangeLog 2014-02-08 19:58:21 UTC (rev 163717)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-02-08 Dan Bernstein <mitz@apple.com>
+
+ Remove client-drawn highlights (-webkit-highlight, WebHTMLHighlighter)
+ https://bugs.webkit.org/show_bug.cgi?id=128456
+
+ Reviewed by Anders Carlsson.
+
+ * WebProcess/WebCoreSupport/WebChromeClient.cpp: Removed customHighlightRect and
+ paintCustomHighlight.
+ * WebProcess/WebCoreSupport/WebChromeClient.h:
+
</ins><span class="cx"> 2014-02-08 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Change TextIterator to use StringView, preparing to wean it from deprecatedCharacters
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp (163716 => 163717)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2014-02-08 18:37:27 UTC (rev 163716)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2014-02-08 19:58:21 UTC (rev 163717)
</span><span class="lines">@@ -663,18 +663,6 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-FloatRect WebChromeClient::customHighlightRect(Node*, const AtomicString& /*type*/, const FloatRect& /*lineRect*/)
-{
- notImplemented();
- return FloatRect();
-}
-
-void WebChromeClient::paintCustomHighlight(Node*, const AtomicString& /*type*/, const FloatRect& /*boxRect*/, const FloatRect& /*lineRect*/,
- bool /*behindText*/, bool /*entireLine*/)
-{
- notImplemented();
-}
-
</del><span class="cx"> bool WebChromeClient::shouldReplaceWithGeneratedFileForUpload(const String& path, String& generatedFilename)
</span><span class="cx"> {
</span><span class="cx"> generatedFilename = m_page->injectedBundleUIClient().shouldGenerateFileForUpload(m_page, path);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h (163716 => 163717)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h 2014-02-08 18:37:27 UTC (rev 163716)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h 2014-02-08 19:58:21 UTC (rev 163717)
</span><span class="lines">@@ -144,10 +144,6 @@
</span><span class="cx">
</span><span class="cx"> virtual void populateVisitedLinks() override;
</span><span class="cx">
</span><del>- virtual WebCore::FloatRect customHighlightRect(WebCore::Node*, const WTF::AtomicString& type, const WebCore::FloatRect& lineRect) override;
- virtual void paintCustomHighlight(WebCore::Node*, const AtomicString& type, const WebCore::FloatRect& boxRect, const WebCore::FloatRect& lineRect,
- bool behindText, bool entireLine) override;
-
</del><span class="cx"> virtual bool shouldReplaceWithGeneratedFileForUpload(const String& path, String& generatedFilename) override;
</span><span class="cx"> virtual String generateReplacementFile(const String& path) override;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>