Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(431)

Unified Diff: Source/core/accessibility/AXRenderObject.cpp

Issue 625073002: Merge RenderWidget into single subclass, RenderPart (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Address comments Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « LayoutTests/plugins/destroy-reentry.html ('k') | Source/core/core.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/accessibility/AXRenderObject.cpp
diff --git a/Source/core/accessibility/AXRenderObject.cpp b/Source/core/accessibility/AXRenderObject.cpp
index 1f88247c3da8f881ef2a9dd149fb8e29bd4fd832..d0acf267f3c099962b39086f0bf072b327a57330 100644
--- a/Source/core/accessibility/AXRenderObject.cpp
+++ b/Source/core/accessibility/AXRenderObject.cpp
@@ -63,10 +63,10 @@
#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"
@@ -470,9 +470,9 @@ bool AXRenderObject::isAttachment() const
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
@@ -1588,7 +1588,7 @@ Widget* AXRenderObject::widgetForAttachmentView() const
{
if (!isAttachment())
return 0;
- return toRenderWidget(m_renderer)->widget();
+ return toRenderPart(m_renderer)->widget();
}
//
« no previous file with comments | « LayoutTests/plugins/destroy-reentry.html ('k') | Source/core/core.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698