Revert of Send Windows accessibility events based on tree updates.

content/browser/accessibility/browser_accessibility_win.h

 // Copyright (c) 2012 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 CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_WIN_H_
 #define CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_WIN_H_
 
 #include <atlbase.h>
 #include <atlcom.h>
 #include <oleacc.h>
@@ skipping 79 matching lines @@
   static std::map<int32, base::string16> state_string_map;
 
   CONTENT_EXPORT BrowserAccessibilityWin();
 
   CONTENT_EXPORT virtual ~BrowserAccessibilityWin();
 
   // The Windows-specific unique ID, used as the child ID for MSAA methods
   // like NotifyWinEvent, and as the unique ID for IAccessible2 and ISimpleDOM.
   LONG unique_id_win() const { return unique_id_win_; }
 
-  CONTENT_EXPORT void UpdateIAccessibleText();
-
   //
   // BrowserAccessibility methods.
   //
   CONTENT_EXPORT virtual void OnDataChanged() override;
   CONTENT_EXPORT virtual void OnUpdateFinished() override;
-  CONTENT_EXPORT virtual void OnSubtreeWillBeDeleted() override;
-  CONTENT_EXPORT virtual void OnSubtreeCreationFinished() override;
   CONTENT_EXPORT virtual void NativeAddReference() override;
   CONTENT_EXPORT virtual void NativeReleaseReference() override;
   CONTENT_EXPORT virtual bool IsNative() const override;
   CONTENT_EXPORT virtual void OnLocationChanged() override;
 
   //
   // IAccessible methods.
   //
 
   // Performs the default action on a given object.
@@ skipping 653 matching lines @@
   //
 
   // Called by BEGIN_COM_MAP() / END_COM_MAP().
   static CONTENT_EXPORT HRESULT WINAPI
   InternalQueryInterface(void* this_ptr,
                          const _ATL_INTMAP_ENTRY* entries,
                          REFIID iid,
                          void** object);
 
   // Accessors.
-  int32 ia_role() const { return win_attributes_->ia_role; }
-  int32 ia_state() const { return win_attributes_->ia_state; }
-  const base::string16& role_name() const { return win_attributes_->role_name; }
-  int32 ia2_role() const { return win_attributes_->ia2_role; }
-  int32 ia2_state() const { return win_attributes_->ia2_state; }
+  int32 ia_role() const { return ia_role_; }
+  int32 ia_state() const { return ia_state_; }
+  const base::string16& role_name() const { return role_name_; }
+  int32 ia2_role() const { return ia2_role_; }
+  int32 ia2_state() const { return ia2_state_; }
   const std::vector<base::string16>& ia2_attributes() const {
-    return win_attributes_->ia2_attributes;
+    return ia2_attributes_;
   }
-  base::string16 name() const { return win_attributes_->name; }
-  base::string16 description() const { return win_attributes_->description; }
-  base::string16 help() const { return win_attributes_->help; }
-  base::string16 value() const { return win_attributes_->value; }
 
  private:
   // Add one to the reference count and return the same object. Always
   // use this method when returning a BrowserAccessibilityWin object as
   // an output parameter to a COM interface, never use it otherwise.
   BrowserAccessibilityWin* NewReference();
 
   // Many MSAA methods take a var_id parameter indicating that the operation
   // should be performed on a particular child ID, rather than this object.
   // This method tries to figure out the target object from |var_id| and
@@ skipping 20 matching lines @@
   // If the bool attribute |attribute| is present, add its value as an
   // IAccessible2 attribute with the name |ia2_attr|.
   void BoolAttributeToIA2(ui::AXBoolAttribute attribute,
                           const char* ia2_attr);
 
   // If the int attribute |attribute| is present, add its value as an
   // IAccessible2 attribute with the name |ia2_attr|.
   void IntAttributeToIA2(ui::AXIntAttribute attribute,
                          const char* ia2_attr);
 
-  // Append the accessible name from this node and its children.
-  base::string16 GetNameRecursive() const;
-
   // Get the value text, which might come from the floating-point
   // value for some roles.
   base::string16 GetValueText();
 
   // Get the text of this node for the purposes of IAccessibleText - it may
   // be the name, it may be the value, etc. depending on the role.
   base::string16 TextForIAccessibleText();
 
-  void ComputeHypertextRemovedAndInserted(
-      int* start, int* old_len, int* new_len);
-
   // If offset is a member of IA2TextSpecialOffsets this function updates the
   // value of offset and returns, otherwise offset remains unchanged.
   void HandleSpecialTextOffset(const base::string16& text, LONG* offset);
 
   // Convert from a IA2TextBoundaryType to a ui::TextBoundaryType.
   ui::TextBoundaryType IA2TextBoundaryToTextBoundary(IA2TextBoundaryType type);
 
   // Search forwards (direction == 1) or backwards (direction == -1)
   // from the given offset until the given boundary is found, and
   // return the offset of that boundary.
   LONG FindBoundary(const base::string16& text,
                     IA2TextBoundaryType ia2_boundary,
                     LONG start_offset,
                     ui::TextBoundaryDirection direction);
 
   // Return a pointer to the object corresponding to the given id,
   // does not make a new reference.
   BrowserAccessibilityWin* GetFromID(int32 id);
 
   // Windows-specific unique ID (unique within the browser process),
   // used for get_accChild, NotifyWinEvent, and as the unique ID for
   // IAccessible2 and ISimpleDOM.
   LONG unique_id_win_;
 
-  struct WinAttributes {
-    WinAttributes();
+  // IAccessible role and state.
+  int32 ia_role_;
+  int32 ia_state_;
+  base::string16 role_name_;
 
-    // IAccessible role and state.
-    int32 ia_role;
-    int32 ia_state;
-    base::string16 role_name;
+  // IAccessible2 role and state.
+  int32 ia2_role_;
+  int32 ia2_state_;
 
-    // IAccessible name, description, help, value.
-    base::string16 name;
-    base::string16 description;
-    base::string16 help;
-    base::string16 value;
+  // IAccessible2 attributes.
+  std::vector<base::string16> ia2_attributes_;
 
-    // IAccessible2 role and state.
-    int32 ia2_role;
-    int32 ia2_state;
+  // True in Initialize when the object is first created, and false
+  // subsequent times.
+  bool first_time_;
 
-    // IAccessible2 attributes.
-    std::vector<base::string16> ia2_attributes;
-  };
+  // The previous text, before the last update to this object.
+  base::string16 previous_text_;
 
-  scoped_ptr<WinAttributes> win_attributes_;
+  // The old text to return in IAccessibleText::get_oldText - this is like
+  // previous_text_ except that it's NOT updated when the object
+  // is initialized again but the text doesn't change.
+  base::string16 old_text_;
 
-  // Only valid during the scope of a IA2_EVENT_TEXT_REMOVED or
-  // IA2_EVENT_TEXT_INSERTED event.
-  scoped_ptr<WinAttributes> old_win_attributes_;
+  // The previous state, used to see if there was a state change.
+  int32 old_ia_state_;
 
   // Relationships between this node and other nodes.
   std::vector<BrowserAccessibilityRelation*> relations_;
 
-  // IAccessibleText text of this node including
-  // embedded hyperlink characters.
-  base::string16 old_hypertext_;
+  // The text of this node including embedded hyperlink characters.
   base::string16 hypertext_;
 
   // Maps the |hypertext_| embedded character offset to an index in
   // |hyperlinks_|.
   std::map<int32, int32> hyperlink_offset_to_index_;
 
   // Collection of non-static text child indicies, each of which corresponds to
   // a hyperlink.
   std::vector<int32> hyperlinks_;
 
   // The previous scroll position, so we can tell if this object scrolled.
   int previous_scroll_x_;
   int previous_scroll_y_;
 
   // The next unique id to use.
   static LONG next_unique_id_win_;
 
   // Give BrowserAccessibility::Create access to our constructor.
   friend class BrowserAccessibility;
   friend class BrowserAccessibilityRelation;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserAccessibilityWin);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_WIN_H_