Revert 58491 - Implement ISimpleDOM COM interface in BrowserAccessibility. Al...

chrome/browser/browser_accessibility_win.h

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_BROWSER_ACCESSIBILITY_WIN_H_
 #define CHROME_BROWSER_BROWSER_ACCESSIBILITY_WIN_H_
 #pragma once
 
 #include <atlbase.h>
 #include <atlcom.h>
 #include <oleacc.h>
 
 #include <map>
 #include <vector>
 
 #include "chrome/browser/browser_accessibility_manager_win.h"
 #include "ia2_api_all.h"  // Generated
-#include "ISimpleDOMDocument.h"  // Generated
-#include "ISimpleDOMNode.h"  // Generated
-#include "ISimpleDOMText.h"  // Generated
 #include "webkit/glue/webaccessibility.h"
 
 using webkit_glue::WebAccessibility;
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // BrowserAccessibility
 //
 // Class implementing the MSAA IAccessible COM interface for the
 // Browser-Renderer communication of MSAA information, providing accessibility
 // to be used by screen readers and other assistive technology (AT).
 //
 ////////////////////////////////////////////////////////////////////////////////
 class ATL_NO_VTABLE BrowserAccessibility
   : public CComObjectRootEx<CComMultiThreadModel>,
     public IDispatchImpl<IAccessible2, &IID_IAccessible2,
                          &LIBID_IAccessible2Lib>,
     public IAccessibleImage,
     public IAccessibleText,
-    public IServiceProvider,
-    public ISimpleDOMDocument,
-    public ISimpleDOMNode,
-    public ISimpleDOMText {
+    public IServiceProvider {
  public:
   BEGIN_COM_MAP(BrowserAccessibility)
     COM_INTERFACE_ENTRY2(IDispatch, IAccessible2)
     COM_INTERFACE_ENTRY2(IAccessible, IAccessible2)
     COM_INTERFACE_ENTRY(IAccessible2)
     COM_INTERFACE_ENTRY(IAccessibleImage)
     COM_INTERFACE_ENTRY(IAccessibleText)
     COM_INTERFACE_ENTRY(IServiceProvider)
-    COM_INTERFACE_ENTRY(ISimpleDOMDocument)
-    COM_INTERFACE_ENTRY(ISimpleDOMNode)
-    COM_INTERFACE_ENTRY(ISimpleDOMText)
   END_COM_MAP()
 
   BrowserAccessibility();
 
   virtual ~BrowserAccessibility();
 
   // Initialize this object and mark it as active.
   void Initialize(BrowserAccessibilityManager* manager,
                   BrowserAccessibility* parent,
                   LONG child_id,
@@ skipping 275 matching lines @@
     return E_NOTIMPL;
   }
   STDMETHODIMP get_newText(IA2TextSegment* new_text) {
     return E_NOTIMPL;
   }
   STDMETHODIMP get_oldText(IA2TextSegment* old_text) {
     return E_NOTIMPL;
   }
 
   //
-  // ISimpleDOMDocument methods.
-  //
-
-  STDMETHODIMP get_URL(BSTR* url);
-
-  STDMETHODIMP get_title(BSTR* title);
-
-  STDMETHODIMP get_mimeType(BSTR* mime_type);
-
-  STDMETHODIMP get_docType(BSTR* doc_type);
-
-  STDMETHODIMP get_nameSpaceURIForID(
-      short name_space_id, BSTR *name_space_uri) {
-    return E_NOTIMPL;
-  }
-  STDMETHODIMP put_alternateViewMediaTypes(
-      BSTR *comma_separated_media_types) {
-    return E_NOTIMPL;
-  }
-
-  //
-  // ISimpleDOMNode methods.
-  //
-
-  STDMETHODIMP get_nodeInfo(
-      BSTR* node_name,
-      short* name_space_id,
-      BSTR* node_value,
-      unsigned int* num_children,
-      unsigned int* unique_id,
-      unsigned short* node_type);
-
-  STDMETHODIMP get_attributes(
-      unsigned short max_attribs,
-      BSTR* attrib_names,
-      short* name_space_id,
-      BSTR* attrib_values,
-      unsigned short* num_attribs);
-
-  STDMETHODIMP get_attributesForNames(
-      unsigned short num_attribs,
-      BSTR* attrib_names,
-      short* name_space_id,
-      BSTR* attrib_values);
-
-  STDMETHODIMP get_computedStyle(
-      unsigned short max_style_properties,
-      boolean use_alternate_view,
-      BSTR *style_properties,
-      BSTR *style_values,
-      unsigned short *num_style_properties);
-
-  STDMETHODIMP get_computedStyleForProperties(
-      unsigned short num_style_properties,
-      boolean use_alternate_view,
-      BSTR* style_properties,
-      BSTR* style_values);
-
-  STDMETHODIMP scrollTo(boolean placeTopLeft);
-
-  STDMETHODIMP get_parentNode(ISimpleDOMNode** node);
-
-  STDMETHODIMP get_firstChild(ISimpleDOMNode** node);
-
-  STDMETHODIMP get_lastChild(ISimpleDOMNode** node);
-
-  STDMETHODIMP get_previousSibling(ISimpleDOMNode** node);
-
-  STDMETHODIMP get_nextSibling(ISimpleDOMNode** node);
-
-  STDMETHODIMP get_childAt(
-      unsigned int child_index,
-      ISimpleDOMNode** node);
-
-  STDMETHODIMP get_innerHTML(BSTR* innerHTML) {
-    return E_NOTIMPL;
-  }
-
-  STDMETHODIMP get_localInterface(void** local_interface) {
-    return E_NOTIMPL;
-  }
-
-  STDMETHODIMP get_language(BSTR* language) {
-    return E_NOTIMPL;
-  }
-
-  //
-  // ISimpleDOMText methods.
-  //
-
-  STDMETHODIMP get_domText(BSTR* dom_text);
-
-  STDMETHODIMP get_clippedSubstringBounds(
-      unsigned int start_index,
-      unsigned int end_index,
-      int* x,
-      int* y,
-      int* width,
-      int* height) {
-    return E_NOTIMPL;
-  }
-
-  STDMETHODIMP get_unclippedSubstringBounds(
-      unsigned int start_index,
-      unsigned int end_index,
-      int* x,
-      int* y,
-      int* width,
-      int* height) {
-    return E_NOTIMPL;
-  }
-
-  STDMETHODIMP scrollToSubstring(
-      unsigned int start_index,
-      unsigned int end_index)  {
-    return E_NOTIMPL;
-  }
-
-  STDMETHODIMP get_fontFamily(BSTR *font_family)  {
-    return E_NOTIMPL;
-  }
-
-  //
   // IServiceProvider methods.
   //
 
   STDMETHODIMP QueryService(REFGUID guidService, REFIID riid, void** object);
 
   //
   // CComObjectRootEx methods.
   //
 
   HRESULT WINAPI InternalQueryInterface(void* this_ptr,
@@ skipping 14 matching lines @@
   void InitRoleAndState(LONG web_accessibility_role,
                         LONG web_accessibility_state);
 
   // Return true if this attribute is in the attributes map.
   bool HasAttribute(WebAccessibility::Attribute attribute);
 
   // Retrieve the string value of an attribute from the attribute map and
   // returns true if found.
   bool GetAttribute(WebAccessibility::Attribute attribute, string16* value);
 
-  // Retrieve the string value of an attribute from the attribute map and
-  // if found and nonempty, allocate a new BSTR (with SysAllocString)
-  // and return S_OK. If not found or empty, return S_FALSE.
-  HRESULT GetAttributeAsBstr(
-      WebAccessibility::Attribute attribute, BSTR* value_bstr);
-
-  // Escape a string like it would be escaped for a URL or HTML form.
-  string16 Escape(string16 str);
-
   // The manager of this tree of accessibility objects; needed for
   // global operations like focus tracking.
   BrowserAccessibilityManager* manager_;
   // The parent of this object, may be NULL if we're the root object.
   BrowserAccessibility* parent_;
   // The ID of this object; globally unique within the browser process.
   LONG child_id_;
   // The index of this within its parent object.
   LONG index_in_parent_;
   // The ID of this object in the renderer process.
   int32 renderer_id_;
 
   // The children of this object.
   std::vector<BrowserAccessibility*> children_;
 
   // Accessibility metadata from the renderer, used to respond to MSAA
   // events.
   string16 name_;
   string16 value_;
   std::map<int32, string16> attributes_;
-  std::vector<std::pair<string16, string16> > html_attributes_;
 
   LONG role_;
   LONG state_;
   string16 role_name_;
   LONG ia2_role_;
   LONG ia2_state_;
   WebKit::WebRect location_;
 
   // COM objects are reference-counted. When we're done with this object
   // and it's removed from our accessibility tree, a client may still be
   // holding onto a pointer to this object, so we mark it as inactive
   // so that calls to any of this object's methods immediately return
   // failure.
   bool instance_active_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserAccessibility);
 };
 
 #endif  // CHROME_BROWSER_BROWSER_ACCESSIBILITY_WIN_H_