Index: sdk/lib/html/scripts/htmlrenamer.py |
diff --git a/sdk/lib/html/scripts/htmlrenamer.py b/sdk/lib/html/scripts/htmlrenamer.py |
index 1244a6c3831dfba6d85fab1b0a9a355a9e759301..419f2812c7894dddabbcfa18417bb713dd6d57a6 100644 |
--- a/sdk/lib/html/scripts/htmlrenamer.py |
+++ b/sdk/lib/html/scripts/htmlrenamer.py |
@@ -112,6 +112,7 @@ _private_html_members = set([ |
# Members from the standard dom that exist in the dart:html library with |
# identical functionality but with cleaner names. |
_renamed_html_members = { |
+ 'Document.createCDATASection': 'createCDataSection', |
'Document.defaultView': 'window', |
'Element.webkitMatchesSelector' : 'matchesSelector', |
'Element.scrollIntoViewIfNeeded': 'scrollIntoView', |
@@ -201,6 +202,7 @@ _removed_html_members = set([ |
"Element.getAttributeNodeNS", |
"Element.setAttributeNS", |
"Event.srcElement", |
+ "EventSource.URL", |
"BodyElement.text", |
"AnchorElement.text", |
"OptionElement.text", |
@@ -326,10 +328,13 @@ class HtmlRenamer(object): |
name = self._FindMatch(interface, member, member_prefix, |
_renamed_html_members) |
+ |
target_name = _renamed_html_members[name] if name else member |
if self._FindMatch(interface, member, member_prefix, _private_html_members): |
if not target_name.startswith('$dom_'): # e.g. $dom_svgClassName |
target_name = '$dom_' + target_name |
+ |
+ target_name = self._CamelCaseName(target_name) |
return target_name |
def _FindMatch(self, interface, member, member_prefix, candidates): |
@@ -345,6 +350,7 @@ class HtmlRenamer(object): |
def GetLibraryName(self, interface): |
return self._GetLibraryName(interface.id) |
+ |
def _GetLibraryName(self, idl_type_name): |
""" |
Gets the name of the library this type should live in. |
@@ -365,6 +371,10 @@ class HtmlRenamer(object): |
# Strip off the SVG prefix. |
name = re.sub(r'^SVG', '', type_name) |
+ return self._CamelCaseName(name) |
+ |
+ def _CamelCaseName(self, name): |
+ |
def toLower(match): |
return match.group(1) + match.group(2).lower() + match.group(3) |