Version 0.5.14.2 .
svn merge -c 23646 https://dart.googlecode.com/svn/branches/bleeding_edge trunk
git-svn-id: http://dart.googlecode.com/svn/trunk@23647 260f80e4-7a28-3924-810f-c04153c831b5
diff --git a/sdk/lib/html/dart2js/html_dart2js.dart b/sdk/lib/html/dart2js/html_dart2js.dart
index ea38b93d..e9de909 100644
--- a/sdk/lib/html/dart2js/html_dart2js.dart
+++ b/sdk/lib/html/dart2js/html_dart2js.dart
@@ -9163,28 +9163,6 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-
-@DocsEditable
-@DomName('Entity')
-@Experimental // untriaged
-class Entity extends Node native "Entity" {
-
- @DomName('Entity.notationName')
- @DocsEditable
- final String notationName;
-
- @DomName('Entity.publicId')
- @DocsEditable
- final String publicId;
-
- @DomName('Entity.systemId')
- @DocsEditable
- final String systemId;
-}
-// Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
// WARNING: Do not edit - generated code.
@@ -24222,6 +24200,28 @@
@DocsEditable
+@DomName('Entity')
+@Experimental // untriaged
+class _Entity extends Node native "Entity" {
+
+ @DomName('Entity.notationName')
+ @DocsEditable
+ final String notationName;
+
+ @DomName('Entity.publicId')
+ @DocsEditable
+ final String publicId;
+
+ @DomName('Entity.systemId')
+ @DocsEditable
+ final String systemId;
+}
+// Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+
+@DocsEditable
@DomName('EntryArray')
// http://www.w3.org/TR/file-system-api/#the-entry-interface
@Experimental
diff --git a/sdk/lib/html/dartium/html_dartium.dart b/sdk/lib/html/dartium/html_dartium.dart
index f5a4b1a..1942b09 100644
--- a/sdk/lib/html/dartium/html_dartium.dart
+++ b/sdk/lib/html/dartium/html_dartium.dart
@@ -9496,32 +9496,6 @@
// WARNING: Do not edit - generated code.
-@DocsEditable
-@DomName('Entity')
-@Experimental // untriaged
-class Entity extends Node {
- Entity.internal() : super.internal();
-
- @DomName('Entity.notationName')
- @DocsEditable
- String get notationName native "Entity_notationName_Getter";
-
- @DomName('Entity.publicId')
- @DocsEditable
- String get publicId native "Entity_publicId_Getter";
-
- @DomName('Entity.systemId')
- @DocsEditable
- String get systemId native "Entity_systemId_Getter";
-
-}
-// Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// WARNING: Do not edit - generated code.
-
-
@DomName('EntriesCallback')
// http://www.w3.org/TR/file-system-api/#the-entriescallback-interface
@Experimental
@@ -25975,6 +25949,32 @@
@DocsEditable
+@DomName('Entity')
+@Experimental // untriaged
+class _Entity extends Node {
+ _Entity.internal() : super.internal();
+
+ @DomName('Entity.notationName')
+ @DocsEditable
+ String get notationName native "Entity_notationName_Getter";
+
+ @DomName('Entity.publicId')
+ @DocsEditable
+ String get publicId native "Entity_publicId_Getter";
+
+ @DomName('Entity.systemId')
+ @DocsEditable
+ String get systemId native "Entity_systemId_Getter";
+
+}
+// Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+// WARNING: Do not edit - generated code.
+
+
+@DocsEditable
@DomName('EntryArray')
// http://www.w3.org/TR/file-system-api/#the-entry-interface
@Experimental
diff --git a/tools/VERSION b/tools/VERSION
index a12d088..b30784a 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -1,4 +1,4 @@
MAJOR 0
MINOR 5
BUILD 14
-PATCH 1
+PATCH 2
diff --git a/tools/dom/scripts/htmlrenamer.py b/tools/dom/scripts/htmlrenamer.py
index 29514e9..cd1d45c 100644
--- a/tools/dom/scripts/htmlrenamer.py
+++ b/tools/dom/scripts/htmlrenamer.py
@@ -31,6 +31,7 @@
'DOMApplicationCache': 'ApplicationCache',
'DOMFileSystem': 'FileSystem',
'DOMPoint': '_DomPoint',
+ 'Entity': '_Entity', # Not sure if we want to expose this yet, may conflict with other libs.
'EntryCallback': '_EntryCallback',
'EntriesCallback': '_EntriesCallback',
'ErrorCallback': '_ErrorCallback',
