Version 1.6.0-dev.0.1
svn merge -c 37780 https://dart.googlecode.com/svn/branches/bleeding_edge trunk
svn merge -c 37785 https://dart.googlecode.com/svn/branches/bleeding_edge trunk
svn merge -c 37822 https://dart.googlecode.com/svn/branches/bleeding_edge trunk
R=kasperl@google.com
Review URL: https://codereview.chromium.org//363593005
git-svn-id: http://dart.googlecode.com/svn/trunk@37846 260f80e4-7a28-3924-810f-c04153c831b5
diff --git a/sdk/lib/html/dart2js/html_dart2js.dart b/sdk/lib/html/dart2js/html_dart2js.dart
index 3a1e464..2e8e500 100644
--- a/sdk/lib/html/dart2js/html_dart2js.dart
+++ b/sdk/lib/html/dart2js/html_dart2js.dart
@@ -23344,7 +23344,8 @@
Selection getSelection() native;
static bool get supported =>
- JS('bool', '!!(Element.prototype.webkitCreateShadowRoot)');
+ JS('bool', '!!(Element.prototype.createShadowRoot||'
+ 'Element.prototype.webkitCreateShadowRoot)');
static bool _shadowRootDeprecationReported = false;
static void _shadowRootDeprecationReport() {
diff --git a/tests/html/html.status b/tests/html/html.status
index bbb4ec6..1e4e9ec 100644
--- a/tests/html/html.status
+++ b/tests/html/html.status
@@ -108,11 +108,6 @@
websql_test: Fail, Pass # Issue 4941: stderr contains a backtrace.
native_gc_test: Pass, Slow
-[ $compiler == dart2js && $runtime == drt ]
-shadow_dom_test/ShadowDOM_tests: Fail # Issue 19426
-shadow_dom_test/supported: Fail # Issue 19426
-shadowroot_test: Fail # Issue 19426
-
[ $compiler == dart2js && $runtime == drt && $system == macos]
audiobuffersourcenode_test: Pass, Fail
diff --git a/tools/VERSION b/tools/VERSION
index 1873f13..27ae2ad 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -28,4 +28,4 @@
MINOR 6
PATCH 0
PRERELEASE 0
-PRERELEASE_PATCH 0
+PRERELEASE_PATCH 1
diff --git a/tools/dom/templates/html/impl/impl_ShadowRoot.darttemplate b/tools/dom/templates/html/impl/impl_ShadowRoot.darttemplate
index 559ba25..883faea 100644
--- a/tools/dom/templates/html/impl/impl_ShadowRoot.darttemplate
+++ b/tools/dom/templates/html/impl/impl_ShadowRoot.darttemplate
@@ -10,7 +10,8 @@
$!MEMBERS
$if DART2JS
static bool get supported =>
- JS('bool', '!!(Element.prototype.webkitCreateShadowRoot)');
+ JS('bool', '!!(Element.prototype.createShadowRoot||'
+ 'Element.prototype.webkitCreateShadowRoot)');
$else
static final bool supported = true;
$endif
