Move rendering/RenderObject to layout/LayoutObject.

Source/modules/accessibility/AXObjectCacheImpl.h

 /*
  * Copyright (C) 2014, Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 45 matching lines @@
 class AXObjectCacheImpl : public AXObjectCache {
     WTF_MAKE_NONCOPYABLE(AXObjectCacheImpl); WTF_MAKE_FAST_ALLOCATED;
 public:
     explicit AXObjectCacheImpl(Document&);
     ~AXObjectCacheImpl();
 
     AXObject* focusedUIElementForPage(const Page*);
 
     virtual void selectionChanged(Node*) override;
     virtual void childrenChanged(Node*) override;
-    virtual void childrenChanged(RenderObject*) override;
+    virtual void childrenChanged(LayoutObject*) override;
     virtual void checkedStateChanged(Node*) override;
     virtual void selectedChildrenChanged(Node*) override;
 
-    virtual void remove(RenderObject*) override;
+    virtual void remove(LayoutObject*) override;
     virtual void remove(Node*) override;
     virtual void remove(Widget*) override;
 
     virtual const Element* rootAXEditableElement(const Node*) override;
 
     // Called by a node when text or a text equivalent (e.g. alt) attribute is changed.
-    virtual void textChanged(RenderObject*) override;
+    virtual void textChanged(LayoutObject*) override;
     // Called when a node has just been attached, so we can make sure we have the right subclass of AXObject.
     virtual void updateCacheAfterNodeIsAttached(Node*) override;
 
     virtual void handleAttributeChanged(const QualifiedName& attrName, Element*) override;
     virtual void handleFocusedUIElementChanged(Node* oldFocusedNode, Node* newFocusedNode) override;
     virtual void handleInitialFocus() override;
     virtual void handleTextFormControlChanged(Node*) override;
     virtual void handleEditableTextContentChanged(Node*) override;
     virtual void handleValueChanged(Node*) override;
     virtual void handleUpdateActiveMenuOption(RenderMenuList*, int optionIndex) override;
     virtual void handleLoadComplete(Document*) override;
     virtual void handleLayoutComplete(Document*) override;
 
     virtual void setCanvasObjectBounds(Element*, const LayoutRect&) override;
 
     virtual void clearWeakMembers(Visitor*) override;
 
-    virtual void inlineTextBoxesUpdated(RenderObject* renderer) override;
+    virtual void inlineTextBoxesUpdated(LayoutObject* renderer) override;
 
     // Called when the scroll offset changes.
     virtual void handleScrollPositionChanged(FrameView*) override;
-    virtual void handleScrollPositionChanged(RenderObject*) override;
+    virtual void handleScrollPositionChanged(LayoutObject*) override;
 
     // Called when scroll bars are added / removed (as the view resizes).
     void handleScrollbarUpdate(FrameView*) override;
-    void handleLayoutComplete(RenderObject*) override;
+    void handleLayoutComplete(LayoutObject*) override;
     void handleScrolledToAnchor(const Node* anchorNode) override;
 
     virtual const AtomicString& computedRoleForNode(Node*) override;
     virtual String computedNameForNode(Node*) override;
 
     // Returns the root object for the entire document.
     AXObject* rootObject();
 
     AXObject* objectFromAXID(AXID id) const { return m_objects.get(id); }
     AXObject* root();
 
     // used for objects without backing elements
     AXObject* getOrCreate(AccessibilityRole);
-    AXObject* getOrCreate(RenderObject*);
+    AXObject* getOrCreate(LayoutObject*);
     AXObject* getOrCreate(Widget*);
     AXObject* getOrCreate(Node*);
     AXObject* getOrCreate(AbstractInlineTextBox*);
 
     // will only return the AXObject if it already exists
     AXObject* get(Node*);
-    AXObject* get(RenderObject*);
+    AXObject* get(LayoutObject*);
     AXObject* get(Widget*);
     AXObject* get(AbstractInlineTextBox*);
 
     AXObject* firstAccessibleObjectFromNode(const Node*);
 
     void remove(AXID);
     void remove(AbstractInlineTextBox*);
 
     void childrenChanged(AXObject*);
-    void selectedChildrenChanged(RenderObject*);
+    void selectedChildrenChanged(LayoutObject*);
 
     void handleActiveDescendantChanged(Node*);
     void handleAriaRoleChanged(Node*);
     void handleAriaExpandedChange(Node*);
 
-    void recomputeIsIgnored(RenderObject* renderer);
+    void recomputeIsIgnored(LayoutObject* renderer);
 
     bool accessibilityEnabled();
     bool inlineTextBoxAccessibilityEnabled();
 
     void removeAXID(AXObject*);
     bool isIDinUse(AXID id) const { return m_idsInUse.contains(id); }
 
     AXID platformGenerateAXID() const;
 
     // Counts the number of times the document has been modified. Some attribute values are cached
     // as long as the modification count hasn't changed.
     int modificationCount() const { return m_modificationCount; }
 
-    void postNotification(RenderObject*, AXNotification, bool postToElement);
+    void postNotification(LayoutObject*, AXNotification, bool postToElement);
     void postNotification(Node*, AXNotification, bool postToElement);
     void postNotification(AXObject*, Document*, AXNotification, bool postToElement);
 
 protected:
     void postPlatformNotification(AXObject*, AXNotification);
     void textChanged(AXObject*);
     void labelChanged(Element*);
 
     // This is a weak reference cache for knowing if Nodes used by TextMarkers are valid.
     void setNodeInUse(Node* n) { m_textMarkerNodes.add(n); }
     void removeNodeForUse(Node* n) { m_textMarkerNodes.remove(n); }
     bool isNodeInUse(Node* n) { return m_textMarkerNodes.contains(n); }
 
-    PassRefPtr<AXObject> createFromRenderer(RenderObject*);
+    PassRefPtr<AXObject> createFromRenderer(LayoutObject*);
     PassRefPtr<AXObject> createFromNode(Node*);
     PassRefPtr<AXObject> createFromInlineTextBox(AbstractInlineTextBox*);
 
 private:
     Document& m_document;
     HashMap<AXID, RefPtr<AXObject>> m_objects;
-    HashMap<RenderObject*, AXID> m_renderObjectMapping;
+    HashMap<LayoutObject*, AXID> m_layoutObjectMapping;
     HashMap<Widget*, AXID> m_widgetObjectMapping;
     HashMap<Node*, AXID> m_nodeObjectMapping;
     HashMap<AbstractInlineTextBox*, AXID> m_inlineTextBoxObjectMapping;
     HashSet<Node*> m_textMarkerNodes;
     int m_modificationCount;
 
     HashSet<AXID> m_idsInUse;
 
     Timer<AXObjectCacheImpl> m_notificationPostTimer;
     Vector<pair<RefPtr<AXObject>, AXNotification>> m_notificationsToPost;
@@ skipping 12 matching lines @@
 // This is the only subclass of AXObjectCache.
 DEFINE_TYPE_CASTS(AXObjectCacheImpl, AXObjectCache, cache, true, true);
 
 bool nodeHasRole(Node*, const String& role);
 // This will let you know if aria-hidden was explicitly set to false.
 bool isNodeAriaVisible(Node*);
 
 }
 
 #endif