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

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

Issue 922423002: Move rendering/RenderTextControl* to layout/LayoutTextControl* (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 10 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 | « Source/core/rendering/RenderTextControlSingleLine.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/modules/accessibility/AXRenderObject.cpp
diff --git a/Source/modules/accessibility/AXRenderObject.cpp b/Source/modules/accessibility/AXRenderObject.cpp
index 24997c7d79284b43e6a347211c176a73cdf7afe8..5505567b1c16f7d777662ba23f456de468e8c308 100644
--- a/Source/modules/accessibility/AXRenderObject.cpp
+++ b/Source/modules/accessibility/AXRenderObject.cpp
@@ -50,6 +50,7 @@
#include "core/layout/HitTestResult.h"
#include "core/layout/Layer.h"
#include "core/layout/LayoutImage.h"
+#include "core/layout/LayoutTextControlSingleLine.h"
#include "core/loader/ProgressTracker.h"
#include "core/page/Page.h"
#include "core/rendering/RenderFieldset.h"
@@ -59,7 +60,6 @@
#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/svg/SVGDocumentExtensions.h"
@@ -1665,7 +1665,7 @@ AXObject::PlainTextRange AXRenderObject::selectedTextRange() const
AccessibilityRole ariaRole = ariaRoleAttribute();
if (isNativeTextControl() && ariaRole == UnknownRole && m_renderer->isTextControl()) {
- HTMLTextFormControlElement* textControl = toRenderTextControl(m_renderer)->textFormControlElement();
+ HTMLTextFormControlElement* textControl = toLayoutTextControl(m_renderer)->textFormControlElement();
return PlainTextRange(textControl->selectionStart(), textControl->selectionEnd() - textControl->selectionStart());
}
@@ -1687,7 +1687,7 @@ VisibleSelection AXRenderObject::selection() const
void AXRenderObject::setSelectedTextRange(const PlainTextRange& range)
{
if (isNativeTextControl() && m_renderer->isTextControl()) {
- HTMLTextFormControlElement* textControl = toRenderTextControl(m_renderer)->textFormControlElement();
+ HTMLTextFormControlElement* textControl = toLayoutTextControl(m_renderer)->textFormControlElement();
textControl->setSelectionRange(range.start, range.start + range.length, SelectionHasNoDirection, NotDispatchSelectEvent);
return;
}
@@ -1824,7 +1824,7 @@ VisiblePosition AXRenderObject::visiblePositionForIndex(int index) const
return VisiblePosition();
if (isNativeTextControl() && m_renderer->isTextControl())
- return toRenderTextControl(m_renderer)->textFormControlElement()->visiblePositionForIndex(index);
+ return toLayoutTextControl(m_renderer)->textFormControlElement()->visiblePositionForIndex(index);
if (!allowsTextRanges() && !m_renderer->isText())
return VisiblePosition();
@@ -1849,7 +1849,7 @@ VisiblePosition AXRenderObject::visiblePositionForIndex(int index) const
int AXRenderObject::indexForVisiblePosition(const VisiblePosition& pos) const
{
if (isNativeTextControl() && m_renderer->isTextControl()) {
- HTMLTextFormControlElement* textControl = toRenderTextControl(m_renderer)->textFormControlElement();
+ HTMLTextFormControlElement* textControl = toLayoutTextControl(m_renderer)->textFormControlElement();
return textControl->indexForVisiblePosition(pos);
}
« no previous file with comments | « Source/core/rendering/RenderTextControlSingleLine.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698