| Index: Source/web/WebAXObject.cpp
|
| diff --git a/Source/web/WebAXObject.cpp b/Source/web/WebAXObject.cpp
|
| index a347122bc95401b112566303c3aa5514106661aa..cf1fbebf9ddc50233f96b797d12841fe70dbde23 100644
|
| --- a/Source/web/WebAXObject.cpp
|
| +++ b/Source/web/WebAXObject.cpp
|
| @@ -54,8 +54,6 @@
|
| #include "public/web/WebNode.h"
|
| #include "wtf/text/StringBuilder.h"
|
|
|
| -using namespace blink;
|
| -
|
| namespace blink {
|
|
|
| void WebAXObject::reset()
|
| @@ -63,7 +61,7 @@ void WebAXObject::reset()
|
| m_private.reset();
|
| }
|
|
|
| -void WebAXObject::assign(const blink::WebAXObject& other)
|
| +void WebAXObject::assign(const WebAXObject& other)
|
| {
|
| m_private = other.m_private;
|
| }
|
| @@ -712,7 +710,7 @@ bool WebAXObject::press() const
|
| WebAXRole WebAXObject::role() const
|
| {
|
| if (isDetached())
|
| - return blink::WebAXRoleUnknown;
|
| + return WebAXRoleUnknown;
|
|
|
| return static_cast<WebAXRole>(m_private->roleValue());
|
| }
|
| @@ -961,8 +959,8 @@ WebAXObject WebAXObject::cellForColumnAndRow(unsigned column, unsigned row) cons
|
| if (!m_private->isAXTable())
|
| return WebAXObject();
|
|
|
| - blink::AXTableCell* cell = toAXTable(m_private.get())->cellForColumnAndRow(column, row);
|
| - return WebAXObject(static_cast<blink::AXObject*>(cell));
|
| + AXTableCell* cell = toAXTable(m_private.get())->cellForColumnAndRow(column, row);
|
| + return WebAXObject(static_cast<AXObject*>(cell));
|
| }
|
|
|
| WebAXObject WebAXObject::headerContainerObject() const
|
| @@ -1014,7 +1012,7 @@ unsigned WebAXObject::rowIndex() const
|
| if (!m_private->isTableRow())
|
| return 0;
|
|
|
| - return blink::toAXTableRow(m_private.get())->rowIndex();
|
| + return toAXTableRow(m_private.get())->rowIndex();
|
| }
|
|
|
| WebAXObject WebAXObject::rowHeader() const
|
| @@ -1025,7 +1023,7 @@ WebAXObject WebAXObject::rowHeader() const
|
| if (!m_private->isTableRow())
|
| return WebAXObject();
|
|
|
| - return WebAXObject(blink::toAXTableRow(m_private.get())->headerObject());
|
| + return WebAXObject(toAXTableRow(m_private.get())->headerObject());
|
| }
|
|
|
| unsigned WebAXObject::columnIndex() const
|
| @@ -1036,7 +1034,7 @@ unsigned WebAXObject::columnIndex() const
|
| if (m_private->roleValue() != ColumnRole)
|
| return 0;
|
|
|
| - return blink::toAXTableColumn(m_private.get())->columnIndex();
|
| + return toAXTableColumn(m_private.get())->columnIndex();
|
| }
|
|
|
| WebAXObject WebAXObject::columnHeader() const
|
| @@ -1047,7 +1045,7 @@ WebAXObject WebAXObject::columnHeader() const
|
| if (m_private->roleValue() != ColumnRole)
|
| return WebAXObject();
|
|
|
| - return WebAXObject(blink::toAXTableColumn(m_private.get())->headerObject());
|
| + return WebAXObject(toAXTableColumn(m_private.get())->headerObject());
|
| }
|
|
|
| unsigned WebAXObject::cellColumnIndex() const
|
| @@ -1059,7 +1057,7 @@ unsigned WebAXObject::cellColumnIndex() const
|
| return 0;
|
|
|
| pair<unsigned, unsigned> columnRange;
|
| - blink::toAXTableCell(m_private.get())->columnIndexRange(columnRange);
|
| + toAXTableCell(m_private.get())->columnIndexRange(columnRange);
|
| return columnRange.first;
|
| }
|
|
|
| @@ -1072,7 +1070,7 @@ unsigned WebAXObject::cellColumnSpan() const
|
| return 0;
|
|
|
| pair<unsigned, unsigned> columnRange;
|
| - blink::toAXTableCell(m_private.get())->columnIndexRange(columnRange);
|
| + toAXTableCell(m_private.get())->columnIndexRange(columnRange);
|
| return columnRange.second;
|
| }
|
|
|
| @@ -1085,7 +1083,7 @@ unsigned WebAXObject::cellRowIndex() const
|
| return 0;
|
|
|
| pair<unsigned, unsigned> rowRange;
|
| - blink::toAXTableCell(m_private.get())->rowIndexRange(rowRange);
|
| + toAXTableCell(m_private.get())->rowIndexRange(rowRange);
|
| return rowRange.first;
|
| }
|
|
|
| @@ -1098,7 +1096,7 @@ unsigned WebAXObject::cellRowSpan() const
|
| return 0;
|
|
|
| pair<unsigned, unsigned> rowRange;
|
| - blink::toAXTableCell(m_private.get())->rowIndexRange(rowRange);
|
| + toAXTableCell(m_private.get())->rowIndexRange(rowRange);
|
| return rowRange.second;
|
| }
|
|
|
| @@ -1161,18 +1159,18 @@ void WebAXObject::scrollToGlobalPoint(const WebPoint& point) const
|
| m_private->scrollToGlobalPoint(point);
|
| }
|
|
|
| -WebAXObject::WebAXObject(const WTF::PassRefPtr<blink::AXObject>& object)
|
| +WebAXObject::WebAXObject(const WTF::PassRefPtr<AXObject>& object)
|
| : m_private(object)
|
| {
|
| }
|
|
|
| -WebAXObject& WebAXObject::operator=(const WTF::PassRefPtr<blink::AXObject>& object)
|
| +WebAXObject& WebAXObject::operator=(const WTF::PassRefPtr<AXObject>& object)
|
| {
|
| m_private = object;
|
| return *this;
|
| }
|
|
|
| -WebAXObject::operator WTF::PassRefPtr<blink::AXObject>() const
|
| +WebAXObject::operator WTF::PassRefPtr<AXObject>() const
|
| {
|
| return m_private.get();
|
| }
|
|
|