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

Unified Diff: third_party/WebKit/Source/modules/accessibility/AXRadioInput.cpp

Issue 1798043002: Removed CORE_EXPORT from APIs at NodeTraversal. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Moved DOM Traversing API to RadioInputTYpe Created 4 years, 9 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 | « third_party/WebKit/Source/modules/accessibility/AXRadioInput.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/modules/accessibility/AXRadioInput.cpp
diff --git a/third_party/WebKit/Source/modules/accessibility/AXRadioInput.cpp b/third_party/WebKit/Source/modules/accessibility/AXRadioInput.cpp
index 76c76577d6a66a7642a99ea9bbc9396043a1a66f..8e6b7c17ac4cf0b008515cf3a1df1aa48c7d78c2 100644
--- a/third_party/WebKit/Source/modules/accessibility/AXRadioInput.cpp
+++ b/third_party/WebKit/Source/modules/accessibility/AXRadioInput.cpp
@@ -6,22 +6,12 @@
#include "modules/accessibility/AXRadioInput.h"
#include "core/InputTypeNames.h"
-#include "core/dom/ElementTraversal.h"
-#include "core/html/HTMLFormElement.h"
#include "core/html/HTMLInputElement.h"
+#include "core/html/forms/RadioInputType.h"
#include "modules/accessibility/AXObjectCacheImpl.h"
namespace blink {
-namespace {
-
-HTMLElement* nextElement(const HTMLElement& element, HTMLFormElement* stayWithin, bool forward)
-{
- return forward ? Traversal<HTMLElement>::next(element, static_cast<Node*>(stayWithin)) : Traversal<HTMLElement>::previous(element, static_cast<Node*>(stayWithin));
-}
-
-} // namespace
-
using namespace HTMLNames;
AXRadioInput::AXRadioInput(LayoutObject* layoutObject, AXObjectCacheImpl& axObjectCache)
@@ -48,7 +38,7 @@ void AXRadioInput::updatePosAndSetSize(int position)
void AXRadioInput::requestUpdateToNextNode(bool forward)
{
- HTMLInputElement* nextElement = findNextRadioButtonInGroup(element(), forward);
+ HTMLInputElement* nextElement = RadioInputType::nextRadioButtonInGroup(element(), forward);
AXObject* nextAXobject = axObjectCache().get(nextElement);
if (!nextAXobject || !nextAXobject->isAXRadioInput())
return;
@@ -66,7 +56,7 @@ void AXRadioInput::requestUpdateToNextNode(bool forward)
HTMLInputElement* AXRadioInput::findFirstRadioButtonInGroup(HTMLInputElement* current) const
{
- while (HTMLInputElement* prevElement = findNextRadioButtonInGroup(current, false))
+ while (HTMLInputElement* prevElement = RadioInputType::nextRadioButtonInGroup(current, false))
current = prevElement;
return current;
}
@@ -91,7 +81,7 @@ bool AXRadioInput::calculatePosInSet()
// as a new AXRadioInput Object is added or one of objects from RadioGroup is removed.
bool needToUpdatePrev = false;
int position = 1;
- HTMLInputElement* prevElement = findNextRadioButtonInGroup(element(), false);
+ HTMLInputElement* prevElement = RadioInputType::nextRadioButtonInGroup(element(), false);
if (prevElement) {
AXObject* object = axObjectCache().get(prevElement);
// If the previous element doesn't have AXObject yet, caculate position from the first element.
@@ -116,23 +106,11 @@ bool AXRadioInput::calculatePosInSet()
return needToUpdatePrev;
}
-HTMLInputElement* AXRadioInput::findNextRadioButtonInGroup(HTMLInputElement* current, bool forward) const
-{
- for (HTMLElement* htmlElement = nextElement(*current, current->form(), forward); htmlElement; htmlElement = nextElement(*htmlElement, current->form(), forward)) {
- if (!isHTMLInputElement(*htmlElement))
- continue;
- HTMLInputElement* inputElement = toHTMLInputElement(htmlElement);
- if (current->form() == inputElement->form() && inputElement->type() == InputTypeNames::radio && inputElement->name() == current->name())
- return inputElement;
- }
- return nullptr;
-}
-
int AXRadioInput::countFromFirstElement() const
{
int count = 1;
HTMLInputElement* current = element();
- while (HTMLInputElement* prevElement = findNextRadioButtonInGroup(current, false)) {
+ while (HTMLInputElement* prevElement = RadioInputType::nextRadioButtonInGroup(current, false)) {
current = prevElement;
count++;
}
« no previous file with comments | « third_party/WebKit/Source/modules/accessibility/AXRadioInput.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698