<!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>[185459] trunk/Source/WebCore</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/185459">185459</a></dd>
<dt>Author</dt> <dd>dbates@webkit.org</dd>
<dt>Date</dt> <dd>2015-06-11 10:20:53 -0700 (Thu, 11 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Simplify event handling logic for search cancel button
https://bugs.webkit.org/show_bug.cgi?id=145780
Reviewed by Darin Adler.
Following the patch for <https://bugs.webkit.org/show_bug.cgi?id=145774> we can take advantage
of the DOM click event to simplify the event handling logic for the search cancel button.
It is sufficient to listen for mousedown and click events instead of listening for mousedown
and mouseup events, capturing all events during drag, and using the hover state of the button
on mouse release together with a instance variable set on mouse press to determine whether
the cancel button was clicked.
As a side effect of removing the requirement that the search cancel button be hovered (a
workaround to ensure that the mouse was pressed and released on the button in absence of
listening for an explicit DOM click event) we can remove the accessibility-specific class,
AccessibilitySearchFieldCancelButton, that was primarily used to fake the hover state of
the button so that the accessibility machinery could simulate a click on it. Instead we
can add use the default accessibility machinery for clicking on an element.
No new tests since no functionality was changed.
* CMakeLists.txt: Remove reference to file AccessibilitySearchFieldButtons.cpp.
* WebCore.vcxproj/WebCore.vcxproj: Remove reference to files AccessibilitySearchFieldButtons.{cpp, h}.
* WebCore.vcxproj/WebCore.vcxproj.filters: Ditto.
* WebCore.xcodeproj/project.pbxproj: Ditto.
* accessibility/AXObjectCache.cpp:
(WebCore::createFromRenderer): Remove special-purpose logic that instantiated
AccessibilitySearchFieldCancelButton for the search cancel button. Instead we can make
use of the existing accessibility machinery to handle this button.
* accessibility/AccessibilityAllInOne.cpp: Remove #include of AccessibilitySearchFieldButtons.cpp
since the file is no longer needed.
* accessibility/AccessibilitySearchFieldButtons.cpp: Removed.
* accessibility/AccessibilitySearchFieldButtons.h: Removed.
* dom/Element.h:
(WebCore::Element::isSearchFieldCancelButtonElement): Deleted.
* html/shadow/TextControlInnerElements.cpp:
(WebCore::SearchFieldCancelButtonElement::SearchFieldCancelButtonElement): Set the ARIA role
and label attributes so that the accessibility system identifies the search cancel button as
a button and shows a description for the button, respectively.
(WebCore::SearchFieldCancelButtonElement::defaultEventHandler): Simplify the event handling logic
such that we clear the field when we receive a DOM click event (i.e. the mouse was pressed
and released on the button). Remove unused variable, oldValue. Substitute emptyString() for the
empty string literal in the call to HTMLInputElement::setValueForUser() to avoid an implicit
conversion to String. Also remove out-of-date comment that repeated what the code does.
(WebCore::SearchFieldCancelButtonElement::willDetachRenderers): Deleted. We no longer need to use
custom style resolve callbacks to reset the state of the EventHandler since we no longer need to
have the EventHandler dispatch all mouse events to us on mouse press.
* html/shadow/TextControlInnerElements.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCorevcxproj">trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCorevcxprojfilters">trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAXObjectCachecpp">trunk/Source/WebCore/accessibility/AXObjectCache.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityAllInOnecpp">trunk/Source/WebCore/accessibility/AccessibilityAllInOne.cpp</a></li>
<li><a href="#trunkSourceWebCoredomElementh">trunk/Source/WebCore/dom/Element.h</a></li>
<li><a href="#trunkSourceWebCorehtmlshadowTextControlInnerElementscpp">trunk/Source/WebCore/html/shadow/TextControlInnerElements.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlshadowTextControlInnerElementsh">trunk/Source/WebCore/html/shadow/TextControlInnerElements.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilitySearchFieldButtonscpp">trunk/Source/WebCore/accessibility/AccessibilitySearchFieldButtons.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilitySearchFieldButtonsh">trunk/Source/WebCore/accessibility/AccessibilitySearchFieldButtons.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (185458 => 185459)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2015-06-11 17:03:02 UTC (rev 185458)
+++ trunk/Source/WebCore/CMakeLists.txt 2015-06-11 17:20:53 UTC (rev 185459)
</span><span class="lines">@@ -1054,7 +1054,6 @@
</span><span class="cx"> accessibility/AccessibilitySVGRoot.cpp
</span><span class="cx"> accessibility/AccessibilityScrollView.cpp
</span><span class="cx"> accessibility/AccessibilityScrollbar.cpp
</span><del>- accessibility/AccessibilitySearchFieldButtons.cpp
</del><span class="cx"> accessibility/AccessibilitySlider.cpp
</span><span class="cx"> accessibility/AccessibilitySpinButton.cpp
</span><span class="cx"> accessibility/AccessibilityTable.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (185458 => 185459)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-06-11 17:03:02 UTC (rev 185458)
+++ trunk/Source/WebCore/ChangeLog 2015-06-11 17:20:53 UTC (rev 185459)
</span><span class="lines">@@ -1,3 +1,54 @@
</span><ins>+2015-06-11 Daniel Bates <dabates@apple.com>
+
+ Simplify event handling logic for search cancel button
+ https://bugs.webkit.org/show_bug.cgi?id=145780
+
+ Reviewed by Darin Adler.
+
+ Following the patch for <https://bugs.webkit.org/show_bug.cgi?id=145774> we can take advantage
+ of the DOM click event to simplify the event handling logic for the search cancel button.
+ It is sufficient to listen for mousedown and click events instead of listening for mousedown
+ and mouseup events, capturing all events during drag, and using the hover state of the button
+ on mouse release together with a instance variable set on mouse press to determine whether
+ the cancel button was clicked.
+
+ As a side effect of removing the requirement that the search cancel button be hovered (a
+ workaround to ensure that the mouse was pressed and released on the button in absence of
+ listening for an explicit DOM click event) we can remove the accessibility-specific class,
+ AccessibilitySearchFieldCancelButton, that was primarily used to fake the hover state of
+ the button so that the accessibility machinery could simulate a click on it. Instead we
+ can add use the default accessibility machinery for clicking on an element.
+
+ No new tests since no functionality was changed.
+
+ * CMakeLists.txt: Remove reference to file AccessibilitySearchFieldButtons.cpp.
+ * WebCore.vcxproj/WebCore.vcxproj: Remove reference to files AccessibilitySearchFieldButtons.{cpp, h}.
+ * WebCore.vcxproj/WebCore.vcxproj.filters: Ditto.
+ * WebCore.xcodeproj/project.pbxproj: Ditto.
+ * accessibility/AXObjectCache.cpp:
+ (WebCore::createFromRenderer): Remove special-purpose logic that instantiated
+ AccessibilitySearchFieldCancelButton for the search cancel button. Instead we can make
+ use of the existing accessibility machinery to handle this button.
+ * accessibility/AccessibilityAllInOne.cpp: Remove #include of AccessibilitySearchFieldButtons.cpp
+ since the file is no longer needed.
+ * accessibility/AccessibilitySearchFieldButtons.cpp: Removed.
+ * accessibility/AccessibilitySearchFieldButtons.h: Removed.
+ * dom/Element.h:
+ (WebCore::Element::isSearchFieldCancelButtonElement): Deleted.
+ * html/shadow/TextControlInnerElements.cpp:
+ (WebCore::SearchFieldCancelButtonElement::SearchFieldCancelButtonElement): Set the ARIA role
+ and label attributes so that the accessibility system identifies the search cancel button as
+ a button and shows a description for the button, respectively.
+ (WebCore::SearchFieldCancelButtonElement::defaultEventHandler): Simplify the event handling logic
+ such that we clear the field when we receive a DOM click event (i.e. the mouse was pressed
+ and released on the button). Remove unused variable, oldValue. Substitute emptyString() for the
+ empty string literal in the call to HTMLInputElement::setValueForUser() to avoid an implicit
+ conversion to String. Also remove out-of-date comment that repeated what the code does.
+ (WebCore::SearchFieldCancelButtonElement::willDetachRenderers): Deleted. We no longer need to use
+ custom style resolve callbacks to reset the state of the EventHandler since we no longer need to
+ have the EventHandler dispatch all mouse events to us on mouse press.
+ * html/shadow/TextControlInnerElements.h:
+
</ins><span class="cx"> 2015-06-11 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r185453.
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (185458 => 185459)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2015-06-11 17:03:02 UTC (rev 185458)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2015-06-11 17:20:53 UTC (rev 185459)
</span><span class="lines">@@ -7016,20 +7016,6 @@
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\accessibility\AccessibilitySearchFieldButtons.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
- </ClCompile>
</del><span class="cx"> <ClCompile Include="..\accessibility\AccessibilitySlider.cpp">
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</span><span class="lines">@@ -19537,7 +19523,6 @@
</span><span class="cx"> <ClInclude Include="..\accessibility\AccessibilityRenderObject.h" />
</span><span class="cx"> <ClInclude Include="..\accessibility\AccessibilityScrollbar.h" />
</span><span class="cx"> <ClInclude Include="..\accessibility\AccessibilityScrollView.h" />
</span><del>- <ClInclude Include="..\accessibility\AccessibilitySearchFieldButtons.h" />
</del><span class="cx"> <ClInclude Include="..\accessibility\AccessibilitySlider.h" />
</span><span class="cx"> <ClInclude Include="..\accessibility\AccessibilitySpinButton.h" />
</span><span class="cx"> <ClInclude Include="..\accessibility\AccessibilitySVGRoot.h" />
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters (185458 => 185459)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2015-06-11 17:03:02 UTC (rev 185458)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2015-06-11 17:20:53 UTC (rev 185459)
</span><span class="lines">@@ -6610,9 +6610,6 @@
</span><span class="cx"> <ClCompile Include="..\rendering\ImageQualityController.cpp">
</span><span class="cx"> <Filter>rendering</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\accessibility\AccessibilitySearchFieldButtons.cpp">
- <Filter>accessibility</Filter>
- </ClCompile>
</del><span class="cx"> <ClCompile Include="..\dom\ElementData.cpp">
</span><span class="cx"> <Filter>dom</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="lines">@@ -13997,9 +13994,6 @@
</span><span class="cx"> <ClInclude Include="..\rendering\ImageQualityController.h">
</span><span class="cx"> <Filter>rendering</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\accessibility\AccessibilitySearchFieldButtons.h">
- <Filter>accessibility</Filter>
- </ClInclude>
</del><span class="cx"> <ClInclude Include="..\dom\ElementAncestorIterator.h">
</span><span class="cx"> <Filter>dom</Filter>
</span><span class="cx"> </ClInclude>
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (185458 => 185459)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-06-11 17:03:02 UTC (rev 185458)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-06-11 17:20:53 UTC (rev 185459)
</span><span class="lines">@@ -1402,7 +1402,6 @@
</span><span class="cx"> 37F57AC41A50729300876F98 /* AccessibilityRenderObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2981CAA6131822EC00D12F2A /* AccessibilityRenderObject.cpp */; };
</span><span class="cx"> 37F57AC51A50729700876F98 /* AccessibilityScrollbar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2981CAA7131822EC00D12F2A /* AccessibilityScrollbar.cpp */; };
</span><span class="cx"> 37F57AC61A50729B00876F98 /* AccessibilityScrollView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2981CAA8131822EC00D12F2A /* AccessibilityScrollView.cpp */; };
</span><del>- 37F57AC71A5072A100876F98 /* AccessibilitySearchFieldButtons.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 415B3A6917CBE172000FCCE8 /* AccessibilitySearchFieldButtons.cpp */; };
</del><span class="cx"> 37F57AC81A5072BC00876F98 /* AccessibilitySlider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2981CAA9131822EC00D12F2A /* AccessibilitySlider.cpp */; };
</span><span class="cx"> 37F57AC91A5072CC00876F98 /* AccessibilitySVGRoot.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AAC08CF015F941FC00F1E188 /* AccessibilitySVGRoot.cpp */; };
</span><span class="cx"> 37F57ACA1A5072CF00876F98 /* AccessibilityTable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2981CAAA131822EC00D12F2A /* AccessibilityTable.cpp */; };
</span><span class="lines">@@ -1453,7 +1452,6 @@
</span><span class="cx"> 4150F9F212B6E0E70008C860 /* SliderThumbElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4150F9F012B6E0E70008C860 /* SliderThumbElement.cpp */; };
</span><span class="cx"> 4157AF8012F1FB0400A8C6F5 /* MediaControlsApple.h in Headers */ = {isa = PBXBuildFile; fileRef = 4157AF7E12F1FB0400A8C6F5 /* MediaControlsApple.h */; };
</span><span class="cx"> 4157AF8112F1FB0400A8C6F5 /* MediaControlsApple.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4157AF7F12F1FB0400A8C6F5 /* MediaControlsApple.cpp */; };
</span><del>- 415B3A6E17CBE267000FCCE8 /* AccessibilitySearchFieldButtons.h in Headers */ = {isa = PBXBuildFile; fileRef = 415B3A6A17CBE172000FCCE8 /* AccessibilitySearchFieldButtons.h */; };
</del><span class="cx"> 4162A450101145AE00DFF3ED /* DedicatedWorkerGlobalScope.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4162A44D101145AE00DFF3ED /* DedicatedWorkerGlobalScope.cpp */; };
</span><span class="cx"> 4162A451101145AE00DFF3ED /* DedicatedWorkerGlobalScope.h in Headers */ = {isa = PBXBuildFile; fileRef = 4162A44E101145AE00DFF3ED /* DedicatedWorkerGlobalScope.h */; };
</span><span class="cx"> 4162A454101145E300DFF3ED /* JSDedicatedWorkerGlobalScopeCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4162A453101145E300DFF3ED /* JSDedicatedWorkerGlobalScopeCustom.cpp */; };
</span><span class="lines">@@ -8605,8 +8603,6 @@
</span><span class="cx"> 4150F9F012B6E0E70008C860 /* SliderThumbElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SliderThumbElement.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 4157AF7E12F1FB0400A8C6F5 /* MediaControlsApple.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaControlsApple.h; sourceTree = "<group>"; };
</span><span class="cx"> 4157AF7F12F1FB0400A8C6F5 /* MediaControlsApple.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MediaControlsApple.cpp; sourceTree = "<group>"; };
</span><del>- 415B3A6917CBE172000FCCE8 /* AccessibilitySearchFieldButtons.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AccessibilitySearchFieldButtons.cpp; sourceTree = "<group>"; };
- 415B3A6A17CBE172000FCCE8 /* AccessibilitySearchFieldButtons.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AccessibilitySearchFieldButtons.h; sourceTree = "<group>"; };
</del><span class="cx"> 4162A44D101145AE00DFF3ED /* DedicatedWorkerGlobalScope.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DedicatedWorkerGlobalScope.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 4162A44E101145AE00DFF3ED /* DedicatedWorkerGlobalScope.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DedicatedWorkerGlobalScope.h; sourceTree = "<group>"; };
</span><span class="cx"> 4162A44F101145AE00DFF3ED /* DedicatedWorkerGlobalScope.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = DedicatedWorkerGlobalScope.idl; sourceTree = "<group>"; };
</span><span class="lines">@@ -15723,8 +15719,6 @@
</span><span class="cx"> 93C4F6E91108F9A50099D0DB /* AccessibilityScrollbar.h */,
</span><span class="cx"> 2981CAA8131822EC00D12F2A /* AccessibilityScrollView.cpp */,
</span><span class="cx"> 29489FC512C00F0300D83F0F /* AccessibilityScrollView.h */,
</span><del>- 415B3A6917CBE172000FCCE8 /* AccessibilitySearchFieldButtons.cpp */,
- 415B3A6A17CBE172000FCCE8 /* AccessibilitySearchFieldButtons.h */,
</del><span class="cx"> 2981CAA9131822EC00D12F2A /* AccessibilitySlider.cpp */,
</span><span class="cx"> 0709FC4D1025DEE30059CDBA /* AccessibilitySlider.h */,
</span><span class="cx"> 29D7BCF51444AF580070619C /* AccessibilitySpinButton.cpp */,
</span><span class="lines">@@ -23790,7 +23784,6 @@
</span><span class="cx"> 29A812390FBB9C1D00510293 /* AccessibilityRenderObject.h in Headers */,
</span><span class="cx"> 93C4F6EB1108F9A50099D0DB /* AccessibilityScrollbar.h in Headers */,
</span><span class="cx"> 29489FC712C00F0300D83F0F /* AccessibilityScrollView.h in Headers */,
</span><del>- 415B3A6E17CBE267000FCCE8 /* AccessibilitySearchFieldButtons.h in Headers */,
</del><span class="cx"> 0709FC4E1025DEE30059CDBA /* AccessibilitySlider.h in Headers */,
</span><span class="cx"> 29D7BCFA1444AF7D0070619C /* AccessibilitySpinButton.h in Headers */,
</span><span class="cx"> AAC08CF315F941FD00F1E188 /* AccessibilitySVGRoot.h in Headers */,
</span><span class="lines">@@ -27599,7 +27592,6 @@
</span><span class="cx"> 37F57AC41A50729300876F98 /* AccessibilityRenderObject.cpp in Sources */,
</span><span class="cx"> 37F57AC51A50729700876F98 /* AccessibilityScrollbar.cpp in Sources */,
</span><span class="cx"> 37F57AC61A50729B00876F98 /* AccessibilityScrollView.cpp in Sources */,
</span><del>- 37F57AC71A5072A100876F98 /* AccessibilitySearchFieldButtons.cpp in Sources */,
</del><span class="cx"> 37F57AC81A5072BC00876F98 /* AccessibilitySlider.cpp in Sources */,
</span><span class="cx"> 29D7BCF61444AF580070619C /* AccessibilitySpinButton.cpp in Sources */,
</span><span class="cx"> 37F57AC91A5072CC00876F98 /* AccessibilitySVGRoot.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAXObjectCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AXObjectCache.cpp (185458 => 185459)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AXObjectCache.cpp 2015-06-11 17:03:02 UTC (rev 185458)
+++ trunk/Source/WebCore/accessibility/AXObjectCache.cpp 2015-06-11 17:20:53 UTC (rev 185459)
</span><span class="lines">@@ -48,7 +48,6 @@
</span><span class="cx"> #include "AccessibilitySVGRoot.h"
</span><span class="cx"> #include "AccessibilityScrollView.h"
</span><span class="cx"> #include "AccessibilityScrollbar.h"
</span><del>-#include "AccessibilitySearchFieldButtons.h"
</del><span class="cx"> #include "AccessibilitySlider.h"
</span><span class="cx"> #include "AccessibilitySpinButton.h"
</span><span class="cx"> #include "AccessibilityTable.h"
</span><span class="lines">@@ -298,10 +297,6 @@
</span><span class="cx"> if (is<RenderSVGRoot>(*renderer))
</span><span class="cx"> return AccessibilitySVGRoot::create(renderer);
</span><span class="cx">
</span><del>- // Search field buttons
- if (is<Element>(node) && downcast<Element>(*node).isSearchFieldCancelButtonElement())
- return AccessibilitySearchFieldCancelButton::create(renderer);
-
</del><span class="cx"> if (is<RenderBoxModelObject>(*renderer)) {
</span><span class="cx"> RenderBoxModelObject& cssBox = downcast<RenderBoxModelObject>(*renderer);
</span><span class="cx"> if (is<RenderListBox>(cssBox))
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityAllInOnecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityAllInOne.cpp (185458 => 185459)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityAllInOne.cpp 2015-06-11 17:03:02 UTC (rev 185458)
+++ trunk/Source/WebCore/accessibility/AccessibilityAllInOne.cpp 2015-06-11 17:20:53 UTC (rev 185459)
</span><span class="lines">@@ -41,7 +41,6 @@
</span><span class="cx"> #include "AccessibilitySVGRoot.cpp"
</span><span class="cx"> #include "AccessibilityScrollView.cpp"
</span><span class="cx"> #include "AccessibilityScrollbar.cpp"
</span><del>-#include "AccessibilitySearchFieldButtons.cpp"
</del><span class="cx"> #include "AccessibilitySlider.cpp"
</span><span class="cx"> #include "AccessibilityTable.cpp"
</span><span class="cx"> #include "AccessibilityTableCell.cpp"
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilitySearchFieldButtonscpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/accessibility/AccessibilitySearchFieldButtons.cpp (185458 => 185459)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilitySearchFieldButtons.cpp 2015-06-11 17:03:02 UTC (rev 185458)
+++ trunk/Source/WebCore/accessibility/AccessibilitySearchFieldButtons.cpp 2015-06-11 17:20:53 UTC (rev 185459)
</span><span class="lines">@@ -1,76 +0,0 @@
</span><del>-/*
- * Copyright (C) 2013 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "AccessibilitySearchFieldButtons.h"
-
-#include "LocalizedStrings.h"
-#include "RenderObject.h"
-
-namespace WebCore {
-
-Ref<AccessibilitySearchFieldCancelButton> AccessibilitySearchFieldCancelButton::create(RenderObject* renderer)
-{
- return adoptRef(*new AccessibilitySearchFieldCancelButton(renderer));
-}
-
-AccessibilitySearchFieldCancelButton::AccessibilitySearchFieldCancelButton(RenderObject* renderer)
- : AccessibilityRenderObject(renderer)
-{
-}
-
-String AccessibilitySearchFieldCancelButton::accessibilityDescription() const
-{
-#if PLATFORM(IOS)
- return String();
-#else
- return AXSearchFieldCancelButtonText();
-#endif
-}
-
-void AccessibilitySearchFieldCancelButton::accessibilityText(Vector<AccessibilityText>& textOrder)
-{
- textOrder.append(AccessibilityText(accessibilityDescription(), AlternativeText));
-}
-
-bool AccessibilitySearchFieldCancelButton::press()
-{
- Node* node = this->node();
- if (!is<Element>(node))
- return false;
-
- Element& element = downcast<Element>(*node);
- // The default event handler on SearchFieldCancelButtonElement requires hover.
- element.setHovered(true);
- element.accessKeyAction(true);
- return true;
-}
-
-bool AccessibilitySearchFieldCancelButton::computeAccessibilityIsIgnored() const
-{
- return accessibilityIsIgnoredByDefault();
-}
-
-} // namespace WebCore
</del></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilitySearchFieldButtonsh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/accessibility/AccessibilitySearchFieldButtons.h (185458 => 185459)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilitySearchFieldButtons.h 2015-06-11 17:03:02 UTC (rev 185458)
+++ trunk/Source/WebCore/accessibility/AccessibilitySearchFieldButtons.h 2015-06-11 17:20:53 UTC (rev 185459)
</span><span class="lines">@@ -1,50 +0,0 @@
</span><del>-/*
- * Copyright (C) 2013 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef AccessibilitySearchFieldButtons_h
-#define AccessibilitySearchFieldButtons_h
-
-#include "AccessibilityRenderObject.h"
-
-namespace WebCore {
-
-class AccessibilitySearchFieldCancelButton final : public AccessibilityRenderObject {
-public:
- static Ref<AccessibilitySearchFieldCancelButton> create(RenderObject*);
-
- virtual String accessibilityDescription() const override;
- virtual void accessibilityText(Vector<AccessibilityText>&) override;
- virtual bool press() override;
- virtual AccessibilityRole roleValue() const override { return ButtonRole; }
-
-private:
- explicit AccessibilitySearchFieldCancelButton(RenderObject*);
-
- virtual bool computeAccessibilityIsIgnored() const override;
-};
-
-} // namespace WebCore
-
-#endif // AccessibilitySearchFieldButtons_h
</del></span></pre></div>
<a id="trunkSourceWebCoredomElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.h (185458 => 185459)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.h 2015-06-11 17:03:02 UTC (rev 185458)
+++ trunk/Source/WebCore/dom/Element.h 2015-06-11 17:20:53 UTC (rev 185459)
</span><span class="lines">@@ -394,7 +394,6 @@
</span><span class="cx"> virtual bool isInRange() const { return false; }
</span><span class="cx"> virtual bool isOutOfRange() const { return false; }
</span><span class="cx"> virtual bool isFrameElementBase() const { return false; }
</span><del>- virtual bool isSearchFieldCancelButtonElement() const { return false; }
</del><span class="cx">
</span><span class="cx"> virtual bool canContainRangeEndPoint() const override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlshadowTextControlInnerElementscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/shadow/TextControlInnerElements.cpp (185458 => 185459)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/shadow/TextControlInnerElements.cpp 2015-06-11 17:03:02 UTC (rev 185458)
+++ trunk/Source/WebCore/html/shadow/TextControlInnerElements.cpp 2015-06-11 17:20:53 UTC (rev 185459)
</span><span class="lines">@@ -28,12 +28,13 @@
</span><span class="cx"> #include "TextControlInnerElements.h"
</span><span class="cx">
</span><span class="cx"> #include "Document.h"
</span><del>-#include "EventHandler.h"
</del><span class="cx"> #include "EventNames.h"
</span><span class="cx"> #include "Frame.h"
</span><span class="cx"> #include "HTMLInputElement.h"
</span><span class="cx"> #include "HTMLNames.h"
</span><ins>+#include "LocalizedStrings.h"
</ins><span class="cx"> #include "MouseEvent.h"
</span><ins>+#include "PlatformMouseEvent.h"
</ins><span class="cx"> #include "RenderSearchField.h"
</span><span class="cx"> #include "RenderTextControl.h"
</span><span class="cx"> #include "RenderView.h"
</span><span class="lines">@@ -170,10 +171,12 @@
</span><span class="cx">
</span><span class="cx"> inline SearchFieldCancelButtonElement::SearchFieldCancelButtonElement(Document& document)
</span><span class="cx"> : HTMLDivElement(divTag, document)
</span><del>- , m_capturing(false)
</del><span class="cx"> {
</span><span class="cx"> setPseudo(AtomicString("-webkit-search-cancel-button", AtomicString::ConstructFromLiteral));
</span><del>- setHasCustomStyleResolveCallbacks();
</del><ins>+#if !PLATFORM(IOS)
+ setAttribute(aria_labelAttr, AXSearchFieldCancelButtonText());
+#endif
+ setAttribute(roleAttr, AtomicString("button", AtomicString::ConstructFromLiteral));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Ref<SearchFieldCancelButtonElement> SearchFieldCancelButtonElement::create(Document& document)
</span><span class="lines">@@ -181,17 +184,8 @@
</span><span class="cx"> return adoptRef(*new SearchFieldCancelButtonElement(document));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void SearchFieldCancelButtonElement::willDetachRenderers()
-{
- if (m_capturing) {
- if (Frame* frame = document().frame())
- frame->eventHandler().setCapturingMouseEventsElement(nullptr);
- }
-}
-
</del><span class="cx"> void SearchFieldCancelButtonElement::defaultEventHandler(Event* event)
</span><span class="cx"> {
</span><del>- // If the element is visible, on mouseup, clear the value, and set selection
</del><span class="cx"> RefPtr<HTMLInputElement> input(downcast<HTMLInputElement>(shadowHost()));
</span><span class="cx"> if (!input || input->isDisabledOrReadOnly()) {
</span><span class="cx"> if (!event->defaultHandled())
</span><span class="lines">@@ -200,29 +194,15 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (event->type() == eventNames().mousedownEvent && is<MouseEvent>(*event) && downcast<MouseEvent>(*event).button() == LeftButton) {
</span><del>- if (renderer() && renderer()->visibleToHitTesting()) {
- if (Frame* frame = document().frame()) {
- frame->eventHandler().setCapturingMouseEventsElement(this);
- m_capturing = true;
- }
- }
</del><span class="cx"> input->focus();
</span><span class="cx"> input->select();
</span><span class="cx"> event->setDefaultHandled();
</span><span class="cx"> }
</span><del>- if (event->type() == eventNames().mouseupEvent && is<MouseEvent>(*event) && downcast<MouseEvent>(*event).button() == LeftButton) {
- if (m_capturing) {
- if (Frame* frame = document().frame()) {
- frame->eventHandler().setCapturingMouseEventsElement(nullptr);
- m_capturing = false;
- }
- if (hovered()) {
- String oldValue = input->value();
- input->setValueForUser("");
- input->onSearch();
- event->setDefaultHandled();
- }
- }
</del><ins>+
+ if (event->type() == eventNames().clickEvent) {
+ input->setValueForUser(emptyString());
+ input->onSearch();
+ event->setDefaultHandled();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!event->defaultHandled())
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlshadowTextControlInnerElementsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/shadow/TextControlInnerElements.h (185458 => 185459)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/shadow/TextControlInnerElements.h 2015-06-11 17:03:02 UTC (rev 185458)
+++ trunk/Source/WebCore/html/shadow/TextControlInnerElements.h 2015-06-11 17:20:53 UTC (rev 185459)
</span><span class="lines">@@ -89,17 +89,13 @@
</span><span class="cx"> static Ref<SearchFieldCancelButtonElement> create(Document&);
</span><span class="cx">
</span><span class="cx"> virtual void defaultEventHandler(Event*) override;
</span><del>- virtual bool isSearchFieldCancelButtonElement() const override { return true; }
</del><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> virtual bool willRespondToMouseClickEvents() override;
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> SearchFieldCancelButtonElement(Document&);
</span><del>- virtual void willDetachRenderers() override;
</del><span class="cx"> virtual bool isMouseFocusable() const override { return false; }
</span><del>-
- bool m_capturing;
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre>
</div>
</div>
</body>
</html>