Move rendering/RenderObject to layout/LayoutObject.

Source/modules/accessibility/AXMediaControls.cpp

 /*
  * Copyright (C) 2009 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
@@ skipping 25 matching lines @@
 namespace blink {
 
 using blink::WebLocalizedString;
 using namespace HTMLNames;
 
 static inline String queryString(WebLocalizedString::Name name)
 {
     return Locale::defaultLocale().queryString(name);
 }
 
-AccessibilityMediaControl::AccessibilityMediaControl(RenderObject* renderer, AXObjectCacheImpl* axObjectCache)
+AccessibilityMediaControl::AccessibilityMediaControl(LayoutObject* renderer, AXObjectCacheImpl* axObjectCache)
     : AXRenderObject(renderer, axObjectCache)
 {
 }
 
-PassRefPtr<AXObject> AccessibilityMediaControl::create(RenderObject* renderer, AXObjectCacheImpl* axObjectCache)
+PassRefPtr<AXObject> AccessibilityMediaControl::create(LayoutObject* renderer, AXObjectCacheImpl* axObjectCache)
 {
     ASSERT(renderer->node());
 
     switch (mediaControlElementType(renderer->node())) {
     case MediaSlider:
         return AccessibilityMediaTimeline::create(renderer, axObjectCache);
 
     case MediaCurrentTimeDisplay:
     case MediaTimeRemainingDisplay:
         return AccessibilityMediaTimeDisplay::create(renderer, axObjectCache);
@@ skipping 124 matching lines @@
     }
 
     return UnknownRole;
 }
 
 
 
 //
 // AXMediaControlsContainer
 
-AXMediaControlsContainer::AXMediaControlsContainer(RenderObject* renderer, AXObjectCacheImpl* axObjectCache)
+AXMediaControlsContainer::AXMediaControlsContainer(LayoutObject* renderer, AXObjectCacheImpl* axObjectCache)
     : AccessibilityMediaControl(renderer, axObjectCache)
 {
 }
 
-PassRefPtr<AXObject> AXMediaControlsContainer::create(RenderObject* renderer, AXObjectCacheImpl* axObjectCache)
+PassRefPtr<AXObject> AXMediaControlsContainer::create(LayoutObject* renderer, AXObjectCacheImpl* axObjectCache)
 {
     return adoptRef(new AXMediaControlsContainer(renderer, axObjectCache));
 }
 
 String AXMediaControlsContainer::accessibilityDescription() const
 {
     return queryString(isControllingVideoElement() ? WebLocalizedString::AXMediaVideoElement : WebLocalizedString::AXMediaAudioElement);
 }
 
 String AXMediaControlsContainer::helpText() const
 {
     return queryString(isControllingVideoElement() ? WebLocalizedString::AXMediaVideoElementHelp : WebLocalizedString::AXMediaAudioElementHelp);
 }
 
 bool AXMediaControlsContainer::computeAccessibilityIsIgnored() const
 {
     return accessibilityIsIgnoredByDefault();
 }
 
 //
 // AccessibilityMediaTimeline
 
 static String localizedMediaTimeDescription(float /*time*/)
 {
     // FIXME: To be fixed. See
     // http://trac.webkit.org/browser/trunk/Source/WebCore/platform/LocalizedStrings.cpp#L928
     return String();
 }
 
-AccessibilityMediaTimeline::AccessibilityMediaTimeline(RenderObject* renderer, AXObjectCacheImpl* axObjectCache)
+AccessibilityMediaTimeline::AccessibilityMediaTimeline(LayoutObject* renderer, AXObjectCacheImpl* axObjectCache)
     : AXSlider(renderer, axObjectCache)
 {
 }
 
-PassRefPtr<AXObject> AccessibilityMediaTimeline::create(RenderObject* renderer, AXObjectCacheImpl* axObjectCache)
+PassRefPtr<AXObject> AccessibilityMediaTimeline::create(LayoutObject* renderer, AXObjectCacheImpl* axObjectCache)
 {
     return adoptRef(new AccessibilityMediaTimeline(renderer, axObjectCache));
 }
 
 String AccessibilityMediaTimeline::valueDescription() const
 {
     Node* node = m_renderer->node();
     if (!isHTMLInputElement(node))
         return String();
 
     return localizedMediaTimeDescription(toHTMLInputElement(node)->value().toFloat());
 }
 
 String AccessibilityMediaTimeline::helpText() const
 {
     return queryString(isControllingVideoElement() ? WebLocalizedString::AXMediaVideoSliderHelp : WebLocalizedString::AXMediaAudioSliderHelp);
 }
 
 
 //
 // AccessibilityMediaTimeDisplay
 
-AccessibilityMediaTimeDisplay::AccessibilityMediaTimeDisplay(RenderObject* renderer, AXObjectCacheImpl* axObjectCache)
+AccessibilityMediaTimeDisplay::AccessibilityMediaTimeDisplay(LayoutObject* renderer, AXObjectCacheImpl* axObjectCache)
     : AccessibilityMediaControl(renderer, axObjectCache)
 {
 }
 
-PassRefPtr<AXObject> AccessibilityMediaTimeDisplay::create(RenderObject* renderer, AXObjectCacheImpl* axObjectCache)
+PassRefPtr<AXObject> AccessibilityMediaTimeDisplay::create(LayoutObject* renderer, AXObjectCacheImpl* axObjectCache)
 {
     return adoptRef(new AccessibilityMediaTimeDisplay(renderer, axObjectCache));
 }
 
 bool AccessibilityMediaTimeDisplay::computeAccessibilityIsIgnored() const
 {
     if (!m_renderer || !m_renderer->style() || m_renderer->style()->visibility() != VISIBLE)
         return true;
 
     if (!m_renderer->style()->width().value())
@@ skipping 13 matching lines @@
 {
     if (!m_renderer || !m_renderer->node())
         return String();
 
     MediaControlTimeDisplayElement* element = static_cast<MediaControlTimeDisplayElement*>(m_renderer->node());
     float time = element->currentValue();
     return localizedMediaTimeDescription(fabsf(time));
 }
 
 } // namespace blink