Unmerging HTMLDocument from Document.

sdk/lib/html/scripts/htmlrenamer.py

Index: sdk/lib/html/scripts/htmlrenamer.py
diff --git a/sdk/lib/html/scripts/htmlrenamer.py b/sdk/lib/html/scripts/htmlrenamer.py
index 0380a48c43f28e455215c58902ebb136cd415084..d023d8a81eb9114497f38d598faae29c278b28ab 100644
--- a/sdk/lib/html/scripts/htmlrenamer.py
+++ b/sdk/lib/html/scripts/htmlrenamer.py
@@ -9,6 +9,7 @@ html_interface_renames = {
     'DOMURL': 'Url',
     'DOMWindow': 'LocalWindow',
     'History': 'LocalHistory',
+    'HTMLDocument' : 'HtmlDocument',
     'Location': 'LocalLocation',
     'WebKitAnimation': 'Animation',
     'WebKitAnimationEvent': 'AnimationEvent',
@@ -37,14 +38,34 @@ _private_html_members = set([
   'Document.createEvent',
   'Document.createTextNode',
   'Document.createTouchList',
-  'DocumentFragment.querySelector',
-  'DocumentFragment.querySelectorAll',
   'Document.getElementById',
   'Document.getElementsByClassName',
   'Document.getElementsByName',
   'Document.getElementsByTagName',
   'Document.querySelector',
   'Document.querySelectorAll',
+
+  # Moved to HTMLDocument.
+  'Document.body',
+  'Document.caretRangeFromPoint',
+  'Document.elementFromPoint',
+  'Document.head',
+  'Document.lastModified',
+  'Document.referrer',
+  'Document.styleSheets',
+  'Document.title',
+  'Document.webkitCancelFullScreen',
+  'Document.webkitExitFullscreen',
+  'Document.webkitExitPointerLock',
+  'Document.webkitFullscreenElement',
+  'Document.webkitFullscreenEnabled',
+  'Document.webkitHidden',
+  'Document.webkitIsFullScreen',
+  'Document.webkitPointerLockElement',
+  'Document.webkitVisibilityState',
+
+  'DocumentFragment.querySelector',
+  'DocumentFragment.querySelectorAll',
   'Element.childElementCount',
   'Element.children',
   'Element.className',
@@ -121,6 +142,7 @@ _removed_html_members = set([
 #    "DOMImplementation.*",
     "CanvasRenderingContext2D.setFillColor",
     "CanvasRenderingContext2D.setStrokeColor",
+    'Document.applets',
     "Document.get:forms",
 #    "Document.get:selectedStylesheetSet",
 #    "Document.set:selectedStylesheetSet",
@@ -133,6 +155,7 @@ _removed_html_members = set([
     "Document.get:width",
     "Element.getElementsByTagNameNS",
     "Document.get:compatMode",
+    'Document.images',
     "Document.importNode",
     "Document.evaluate",
     "Document.get:images",
@@ -160,6 +183,8 @@ _removed_html_members = set([
     "Document.xmlVersion",
     "Document.get:anchors",
     "Document.getElementsByTagNameNS",
+    'Document.webkitCurrentFullScreenElement',
+    'Document.webkitFullScreenKeyboardInputAllowed',
     "DocumentType.*",
     "Element.hasAttributeNS",
     "Element.getAttributeNS",
@@ -273,12 +298,12 @@ class HtmlRenamer(object):
     self._database = database
 
   def RenameInterface(self, interface):
-    if interface.id.startswith('HTML'):
+    if interface.id in html_interface_renames:
+      return html_interface_renames[interface.id]
+    elif interface.id.startswith('HTML'):
       if any(interface.id in ['Element', 'Document']
              for interface in self._database.Hierarchy(interface)):
         return interface.id[len('HTML'):]
-    elif interface.id in html_interface_renames:
-      return html_interface_renames[interface.id]
     return interface.id
 
   def RenameMember(self, interface_name, member_node, member, member_prefix=''):