renderer/RenderMenuList.* -> layout/LayoutMenuList.*

Source/modules/accessibility/AXMenuList.cpp

 /*
  * Copyright (C) 2010 Apple 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
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "modules/accessibility/AXMenuList.h"
 
-#include "core/rendering/RenderMenuList.h"
+#include "core/layout/LayoutMenuList.h"
 #include "modules/accessibility/AXMenuListPopup.h"
 #include "modules/accessibility/AXObjectCacheImpl.h"
 
 namespace blink {
 
-AXMenuList::AXMenuList(RenderMenuList* renderer, AXObjectCacheImpl* axObjectCache)
-    : AXLayoutObject(renderer, axObjectCache)
+AXMenuList::AXMenuList(LayoutMenuList* layoutObject, AXObjectCacheImpl* axObjectCache)
+    : AXLayoutObject(layoutObject, axObjectCache)
 {
 }
 
-PassRefPtr<AXMenuList> AXMenuList::create(RenderMenuList* renderer, AXObjectCacheImpl* axObjectCache)
+PassRefPtr<AXMenuList> AXMenuList::create(LayoutMenuList* layoutObject, AXObjectCacheImpl* axObjectCache)
 {
-    return adoptRef(new AXMenuList(renderer, axObjectCache));
+    return adoptRef(new AXMenuList(layoutObject, axObjectCache));
 }
 
 bool AXMenuList::press() const
 {
-    RenderMenuList* menuList = toRenderMenuList(m_renderer);
+    LayoutMenuList* menuList = toLayoutMenuList(m_renderer);
     if (menuList->popupIsVisible())
         menuList->hidePopup();
     else
         menuList->showPopup();
     return true;
 }
 
 void AXMenuList::addChildren()
 {
     m_haveChildren = true;
@@ skipping 19 matching lines @@
 {
     if (m_children.isEmpty())
         return;
 
     ASSERT(m_children.size() == 1);
     m_children[0]->childrenChanged();
 }
 
 bool AXMenuList::isCollapsed() const
 {
-    return !toRenderMenuList(m_renderer)->popupIsVisible();
+    return !toLayoutMenuList(m_renderer)->popupIsVisible();
 }
 
 AccessibilityExpanded AXMenuList::isExpanded() const
 {
     if (isCollapsed())
         return ExpandedCollapsed;
 
     return ExpandedExpanded;
 }
 
@@ skipping 18 matching lines @@
         if (childObjects[0]->isMenuListPopup()) {
             if (AXMenuListPopup* popup = toAXMenuListPopup(childObjects[0].get()))
                 popup->didUpdateActiveOption(optionIndex);
         }
     }
 
     cache->postNotification(this, document.get(), AXObjectCacheImpl::AXMenuListValueChanged, true);
 }
 
 } // namespace blink