Merge RenderWidget into single subclass, RenderPart

Source/core/accessibility/AXRenderObject.cpp

 /*
 * Copyright (C) 2008 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 45 matching lines @@
 #include "core/page/Page.h"
 #include "core/rendering/HitTestResult.h"
 #include "core/rendering/RenderFieldset.h"
 #include "core/rendering/RenderFileUploadControl.h"
 #include "core/rendering/RenderHTMLCanvas.h"
 #include "core/rendering/RenderImage.h"
 #include "core/rendering/RenderInline.h"
 #include "core/rendering/RenderLayer.h"
 #include "core/rendering/RenderListMarker.h"
 #include "core/rendering/RenderMenuList.h"
+#include "core/rendering/RenderPart.h"
 #include "core/rendering/RenderTextControlSingleLine.h"
 #include "core/rendering/RenderTextFragment.h"
 #include "core/rendering/RenderView.h"
-#include "core/rendering/RenderWidget.h"
 #include "core/svg/SVGDocumentExtensions.h"
 #include "core/svg/SVGSVGElement.h"
 #include "core/svg/graphics/SVGImage.h"
 #include "platform/text/PlatformLocale.h"
 #include "wtf/StdLibExtras.h"
 
 using blink::WebLocalizedString;
 
 namespace blink {
 
@@ skipping 383 matching lines @@
 //
 // Check object role or purpose.
 //
 
 bool AXRenderObject::isAttachment() const
 {
     RenderBoxModelObject* renderer = renderBoxModelObject();
     if (!renderer)
         return false;
     // Widgets are the replaced elements that we represent to AX as attachments
-    bool isWidget = renderer->isWidget();
-    ASSERT(!isWidget || (renderer->isReplaced() && !isImage()));
-    return isWidget;
+    bool isRenderPart = renderer->isRenderPart();
+    ASSERT(!isRenderPart || (renderer->isReplaced() && !isImage()));
+    return isRenderPart;
 }
 
 bool AXRenderObject::isFileUploadButton() const
 {
     return m_renderer && isHTMLInputElement(m_renderer->node()) && toHTMLInputElement(*m_renderer->node()).type() == InputTypeNames::file;
 }
 
 static bool isLinkable(const AXObject& object)
 {
     if (!object.renderer())
@@ skipping 1095 matching lines @@
             return toElement(node);
     }
 
     return 0;
 }
 
 Widget* AXRenderObject::widgetForAttachmentView() const
 {
     if (!isAttachment())
         return 0;
-    return toRenderWidget(m_renderer)->widget();
+    return toRenderPart(m_renderer)->widget();
 }
 
 //
 // Selected text.
 //
 
 AXObject::PlainTextRange AXRenderObject::selectedTextRange() const
 {
     if (!isTextControl())
         return PlainTextRange();
@@ skipping 772 matching lines @@
         if (label && label->renderer()) {
             LayoutRect labelRect = axObjectCache()->getOrCreate(label)->elementRect();
             result.unite(labelRect);
         }
     }
 
     return result;
 }
 
 } // namespace blink