Diff
Modified: trunk/LayoutTests/ChangeLog (174362 => 174363)
--- trunk/LayoutTests/ChangeLog 2014-10-06 20:42:21 UTC (rev 174362)
+++ trunk/LayoutTests/ChangeLog 2014-10-06 20:45:02 UTC (rev 174363)
@@ -1,3 +1,15 @@
+2014-10-06 Benjamin Poulain <[email protected]>
+
+ Unreviewed, rolling out r174336.
+
+ Mozilla's Dromaeo still relies on the deprecated function.
+
+ Reverted changeset:
+
+ "Add a deprecation warning for Element.webkitMatchesSelector"
+ https://bugs.webkit.org/show_bug.cgi?id=137417
+ http://trac.webkit.org/changeset/174336
+
2014-10-06 Roger Fong <[email protected]>
[Windows] Skip remaining failing media tests after adding audio devices to the bots Part 2.
Modified: trunk/LayoutTests/fast/dom/SelectorAPI/attrname-case-insensitive-expected.txt (174362 => 174363)
--- trunk/LayoutTests/fast/dom/SelectorAPI/attrname-case-insensitive-expected.txt 2014-10-06 20:42:21 UTC (rev 174362)
+++ trunk/LayoutTests/fast/dom/SelectorAPI/attrname-case-insensitive-expected.txt 2014-10-06 20:45:02 UTC (rev 174363)
@@ -1,13 +1,3 @@
-CONSOLE MESSAGE: Element.webkitMatchesSelector is deprecated. Use Element.matches instead.
-CONSOLE MESSAGE: Element.webkitMatchesSelector is deprecated. Use Element.matches instead.
-CONSOLE MESSAGE: Element.webkitMatchesSelector is deprecated. Use Element.matches instead.
-CONSOLE MESSAGE: Element.webkitMatchesSelector is deprecated. Use Element.matches instead.
-CONSOLE MESSAGE: Element.webkitMatchesSelector is deprecated. Use Element.matches instead.
-CONSOLE MESSAGE: Element.webkitMatchesSelector is deprecated. Use Element.matches instead.
-CONSOLE MESSAGE: Element.webkitMatchesSelector is deprecated. Use Element.matches instead.
-CONSOLE MESSAGE: Element.webkitMatchesSelector is deprecated. Use Element.matches instead.
-CONSOLE MESSAGE: Element.webkitMatchesSelector is deprecated. Use Element.matches instead.
-CONSOLE MESSAGE: Element.webkitMatchesSelector is deprecated. Use Element.matches instead.
PASS document.querySelector('div[baR]') is document.getElementById('bar')
PASS document.getElementById('bar').matches('div[baR]') is true
PASS document.getElementById('bar').webkitMatchesSelector('div[baR]') is true
Modified: trunk/LayoutTests/fast/dom/SelectorAPI/attrname-case-sensitive-expected.txt (174362 => 174363)
--- trunk/LayoutTests/fast/dom/SelectorAPI/attrname-case-sensitive-expected.txt 2014-10-06 20:42:21 UTC (rev 174362)
+++ trunk/LayoutTests/fast/dom/SelectorAPI/attrname-case-sensitive-expected.txt 2014-10-06 20:45:02 UTC (rev 174363)
@@ -1,7 +1,3 @@
-CONSOLE MESSAGE: Element.webkitMatchesSelector is deprecated. Use Element.matches instead.
-CONSOLE MESSAGE: Element.webkitMatchesSelector is deprecated. Use Element.matches instead.
-CONSOLE MESSAGE: Element.webkitMatchesSelector is deprecated. Use Element.matches instead.
-CONSOLE MESSAGE: Element.webkitMatchesSelector is deprecated. Use Element.matches instead.
PASS document.querySelector('div[baR]') is document.getElementById('bar')
PASS document.getElementById('bar').matches('div[baR]') is true
PASS document.getElementById('bar').webkitMatchesSelector('div[baR]') is true
Modified: trunk/LayoutTests/fast/dom/SelectorAPI/caseID-almost-strict-expected.txt (174362 => 174363)
--- trunk/LayoutTests/fast/dom/SelectorAPI/caseID-almost-strict-expected.txt 2014-10-06 20:42:21 UTC (rev 174362)
+++ trunk/LayoutTests/fast/dom/SelectorAPI/caseID-almost-strict-expected.txt 2014-10-06 20:45:02 UTC (rev 174363)
@@ -1,7 +1,3 @@
-CONSOLE MESSAGE: Element.webkitMatchesSelector is deprecated. Use Element.matches instead.
-CONSOLE MESSAGE: Element.webkitMatchesSelector is deprecated. Use Element.matches instead.
-CONSOLE MESSAGE: Element.webkitMatchesSelector is deprecated. Use Element.matches instead.
-CONSOLE MESSAGE: Element.webkitMatchesSelector is deprecated. Use Element.matches instead.
PASS document.querySelector('#lower1').textContent is 'lower 1'
PASS document.querySelector('#LOWER2') is null
PASS document.querySelector('#UPPER1').textContent is 'UPPER 1'
Modified: trunk/LayoutTests/fast/dom/SelectorAPI/caseID-expected.txt (174362 => 174363)
--- trunk/LayoutTests/fast/dom/SelectorAPI/caseID-expected.txt 2014-10-06 20:42:21 UTC (rev 174362)
+++ trunk/LayoutTests/fast/dom/SelectorAPI/caseID-expected.txt 2014-10-06 20:45:02 UTC (rev 174363)
@@ -1,7 +1,3 @@
-CONSOLE MESSAGE: Element.webkitMatchesSelector is deprecated. Use Element.matches instead.
-CONSOLE MESSAGE: Element.webkitMatchesSelector is deprecated. Use Element.matches instead.
-CONSOLE MESSAGE: Element.webkitMatchesSelector is deprecated. Use Element.matches instead.
-CONSOLE MESSAGE: Element.webkitMatchesSelector is deprecated. Use Element.matches instead.
PASS document.querySelector('#lower1').textContent is 'lower 1'
PASS document.querySelector('#LOWER2').textContent is 'lower 2'
PASS document.querySelector('#UPPER1').textContent is 'UPPER 1'
Modified: trunk/LayoutTests/fast/dom/SelectorAPI/caseID-strict-expected.txt (174362 => 174363)
--- trunk/LayoutTests/fast/dom/SelectorAPI/caseID-strict-expected.txt 2014-10-06 20:42:21 UTC (rev 174362)
+++ trunk/LayoutTests/fast/dom/SelectorAPI/caseID-strict-expected.txt 2014-10-06 20:45:02 UTC (rev 174363)
@@ -1,7 +1,3 @@
-CONSOLE MESSAGE: Element.webkitMatchesSelector is deprecated. Use Element.matches instead.
-CONSOLE MESSAGE: Element.webkitMatchesSelector is deprecated. Use Element.matches instead.
-CONSOLE MESSAGE: Element.webkitMatchesSelector is deprecated. Use Element.matches instead.
-CONSOLE MESSAGE: Element.webkitMatchesSelector is deprecated. Use Element.matches instead.
PASS document.querySelector('#lower1').textContent is 'lower 1'
PASS document.querySelector('#LOWER2') is null
PASS document.querySelector('#UPPER1').textContent is 'UPPER 1'
Modified: trunk/LayoutTests/fast/dom/SelectorAPI/caseTag-expected.txt (174362 => 174363)
--- trunk/LayoutTests/fast/dom/SelectorAPI/caseTag-expected.txt 2014-10-06 20:42:21 UTC (rev 174362)
+++ trunk/LayoutTests/fast/dom/SelectorAPI/caseTag-expected.txt 2014-10-06 20:45:02 UTC (rev 174363)
@@ -1,5 +1,3 @@
-CONSOLE MESSAGE: Element.webkitMatchesSelector is deprecated. Use Element.matches instead.
-CONSOLE MESSAGE: Element.webkitMatchesSelector is deprecated. Use Element.matches instead.
PASS document.querySelector('div SPAN').textContent is 'lower'
PASS document.querySelector('div p').textContent is 'UPPER'
PASS document.getElementById('lower1').matches('div SPAN') is true
Modified: trunk/LayoutTests/fast/dom/SelectorAPI/caseTagX-expected.txt (174362 => 174363)
--- trunk/LayoutTests/fast/dom/SelectorAPI/caseTagX-expected.txt 2014-10-06 20:42:21 UTC (rev 174362)
+++ trunk/LayoutTests/fast/dom/SelectorAPI/caseTagX-expected.txt 2014-10-06 20:45:02 UTC (rev 174363)
@@ -1,4 +1,3 @@
-CONSOLE MESSAGE: Element.webkitMatchesSelector is deprecated. Use Element.matches instead.
PASS document.querySelector('div SPAN') is null
PASS document.getElementById('lower1').matches('div SPAN') is false
PASS document.getElementById('lower1').webkitMatchesSelector('div SPAN') is false
Modified: trunk/LayoutTests/fast/dom/SelectorAPI/detached-element-expected.txt (174362 => 174363)
--- trunk/LayoutTests/fast/dom/SelectorAPI/detached-element-expected.txt 2014-10-06 20:42:21 UTC (rev 174362)
+++ trunk/LayoutTests/fast/dom/SelectorAPI/detached-element-expected.txt 2014-10-06 20:45:02 UTC (rev 174363)
@@ -1,5 +1,3 @@
-CONSOLE MESSAGE: Element.webkitMatchesSelector is deprecated. Use Element.matches instead.
-CONSOLE MESSAGE: Element.webkitMatchesSelector is deprecated. Use Element.matches instead.
This tests that querySelector, querySelectorAll and matchesSelector (webkitMatchesSelector) work with elements that are not in a document yet.
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
Modified: trunk/LayoutTests/fast/dom/SelectorAPI/matches-null-undefined-expected.txt (174362 => 174363)
--- trunk/LayoutTests/fast/dom/SelectorAPI/matches-null-undefined-expected.txt 2014-10-06 20:42:21 UTC (rev 174362)
+++ trunk/LayoutTests/fast/dom/SelectorAPI/matches-null-undefined-expected.txt 2014-10-06 20:45:02 UTC (rev 174363)
@@ -1,9 +1,3 @@
-CONSOLE MESSAGE: Element.webkitMatchesSelector is deprecated. Use Element.matches instead.
-CONSOLE MESSAGE: Element.webkitMatchesSelector is deprecated. Use Element.matches instead.
-CONSOLE MESSAGE: Element.webkitMatchesSelector is deprecated. Use Element.matches instead.
-CONSOLE MESSAGE: Element.webkitMatchesSelector is deprecated. Use Element.matches instead.
-CONSOLE MESSAGE: Element.webkitMatchesSelector is deprecated. Use Element.matches instead.
-CONSOLE MESSAGE: Element.webkitMatchesSelector is deprecated. Use Element.matches instead.
Test Element.matches() with no argument, null, and undefined.
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
Modified: trunk/LayoutTests/fast/dom/SelectorAPI/not-supported-namespace-in-selector-expected.txt (174362 => 174363)
--- trunk/LayoutTests/fast/dom/SelectorAPI/not-supported-namespace-in-selector-expected.txt 2014-10-06 20:42:21 UTC (rev 174362)
+++ trunk/LayoutTests/fast/dom/SelectorAPI/not-supported-namespace-in-selector-expected.txt 2014-10-06 20:45:02 UTC (rev 174363)
@@ -1,15 +1,3 @@
-CONSOLE MESSAGE: Element.webkitMatchesSelector is deprecated. Use Element.matches instead.
-CONSOLE MESSAGE: Element.webkitMatchesSelector is deprecated. Use Element.matches instead.
-CONSOLE MESSAGE: Element.webkitMatchesSelector is deprecated. Use Element.matches instead.
-CONSOLE MESSAGE: Element.webkitMatchesSelector is deprecated. Use Element.matches instead.
-CONSOLE MESSAGE: Element.webkitMatchesSelector is deprecated. Use Element.matches instead.
-CONSOLE MESSAGE: Element.webkitMatchesSelector is deprecated. Use Element.matches instead.
-CONSOLE MESSAGE: Element.webkitMatchesSelector is deprecated. Use Element.matches instead.
-CONSOLE MESSAGE: Element.webkitMatchesSelector is deprecated. Use Element.matches instead.
-CONSOLE MESSAGE: Element.webkitMatchesSelector is deprecated. Use Element.matches instead.
-CONSOLE MESSAGE: Element.webkitMatchesSelector is deprecated. Use Element.matches instead.
-CONSOLE MESSAGE: Element.webkitMatchesSelector is deprecated. Use Element.matches instead.
-CONSOLE MESSAGE: Element.webkitMatchesSelector is deprecated. Use Element.matches instead.
This tests that we throw a NAMESPACE_ERR when parsing a selector string for querySelector and querySelectorAll that contains a namespace.
PASS: document.querySelector('bbb|pre') throws: Error: NamespaceError: DOM Exception 14
Modified: trunk/LayoutTests/fast/dom/SelectorAPI/undefined-null-stringify-expected.txt (174362 => 174363)
--- trunk/LayoutTests/fast/dom/SelectorAPI/undefined-null-stringify-expected.txt 2014-10-06 20:42:21 UTC (rev 174362)
+++ trunk/LayoutTests/fast/dom/SelectorAPI/undefined-null-stringify-expected.txt 2014-10-06 20:45:02 UTC (rev 174363)
@@ -1,5 +1,3 @@
-CONSOLE MESSAGE: Element.webkitMatchesSelector is deprecated. Use Element.matches instead.
-CONSOLE MESSAGE: Element.webkitMatchesSelector is deprecated. Use Element.matches instead.
This tests that the querySelector, querySelectorAll and matchesSelector (webkitMatchesSelector) correctly stringify null and undefined to "null" and "undefined".
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
Modified: trunk/LayoutTests/jquery/resources/src/sizzle/sizzle.js (174362 => 174363)
--- trunk/LayoutTests/jquery/resources/src/sizzle/sizzle.js 2014-10-06 20:42:21 UTC (rev 174362)
+++ trunk/LayoutTests/jquery/resources/src/sizzle/sizzle.js 2014-10-06 20:45:02 UTC (rev 174363)
@@ -1200,7 +1200,7 @@
(function(){
var html = document.documentElement,
- matches = html.matches || html.mozMatchesSelector || html.webkitMatchesSelector || html.msMatchesSelector,
+ matches = html.matchesSelector || html.mozMatchesSelector || html.webkitMatchesSelector || html.msMatchesSelector,
pseudoWorks = false;
try {
Modified: trunk/Source/WebCore/ChangeLog (174362 => 174363)
--- trunk/Source/WebCore/ChangeLog 2014-10-06 20:42:21 UTC (rev 174362)
+++ trunk/Source/WebCore/ChangeLog 2014-10-06 20:45:02 UTC (rev 174363)
@@ -1,3 +1,15 @@
+2014-10-06 Benjamin Poulain <[email protected]>
+
+ Unreviewed, rolling out r174336.
+
+ Mozilla's Dromaeo still relies on the deprecated function.
+
+ Reverted changeset:
+
+ "Add a deprecation warning for Element.webkitMatchesSelector"
+ https://bugs.webkit.org/show_bug.cgi?id=137417
+ http://trac.webkit.org/changeset/174336
+
2014-10-06 Christophe Dumez <[email protected]>
Use is<>() / downcast<>() for CryptoKey subclasses
Modified: trunk/Source/WebCore/dom/Element.cpp (174362 => 174363)
--- trunk/Source/WebCore/dom/Element.cpp 2014-10-06 20:42:21 UTC (rev 174362)
+++ trunk/Source/WebCore/dom/Element.cpp 2014-10-06 20:45:02 UTC (rev 174363)
@@ -2329,12 +2329,6 @@
return nullptr;
}
-bool Element::webkitMatchesSelector(const String& selector, ExceptionCode& ec)
-{
- document().addConsoleMessage(MessageSource::Other, MessageLevel::Warning, ASCIILiteral("Element.webkitMatchesSelector is deprecated. Use Element.matches instead."));
- return matches(selector, ec);
-}
-
bool Element::shouldAppearIndeterminate() const
{
return false;
Modified: trunk/Source/WebCore/dom/Element.h (174362 => 174363)
--- trunk/Source/WebCore/dom/Element.h 2014-10-06 20:42:21 UTC (rev 174362)
+++ trunk/Source/WebCore/dom/Element.h 2014-10-06 20:45:02 UTC (rev 174363)
@@ -452,7 +452,6 @@
virtual bool matchesReadWritePseudoClass() const;
bool matches(const String& selectors, ExceptionCode&);
- bool webkitMatchesSelector(const String& selectors, ExceptionCode&);
Element* closest(const String& selectors, ExceptionCode&);
virtual bool shouldAppearIndeterminate() const;
Modified: trunk/Source/WebCore/dom/Element.idl (174362 => 174363)
--- trunk/Source/WebCore/dom/Element.idl 2014-10-06 20:42:21 UTC (rev 174362)
+++ trunk/Source/WebCore/dom/Element.idl 2014-10-06 20:45:02 UTC (rev 174363)
@@ -121,8 +121,8 @@
[RaisesException] NodeList querySelectorAll(DOMString selectors);
[RaisesException] boolean matches(DOMString selectors);
- [RaisesException] boolean webkitMatchesSelector(DOMString selectors);
[RaisesException] Element closest(DOMString selectors);
+ [ImplementedAs=matches, RaisesException] boolean webkitMatchesSelector(DOMString selectors);
// ElementTraversal API
readonly attribute Element firstElementChild;
