Skip to content

Commit

Permalink
Rename WebKit namespace to blink (part 3)
Browse files Browse the repository at this point in the history
This CL updates all references to the WebKit namespace in content.

TBR=darin@chromium.org
BUG=295096

Review URL: https://codereview.chromium.org/63253002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@233513 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
abarth@chromium.org committed Nov 7, 2013
1 parent 8d7dd7a commit 180ef24
Show file tree
Hide file tree
Showing 784 changed files with 7,562 additions and 7,562 deletions.
18 changes: 9 additions & 9 deletions content/browser/accessibility/accessibility_win_browsertest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ void AccessibilityWinBrowserTest::LoadInitialAccessibilityTreeFromHtml(
const std::string& html) {
AccessibilityNotificationWaiter waiter(
shell(), AccessibilityModeComplete,
WebKit::WebAXEventLoadComplete);
blink::WebAXEventLoadComplete);
GURL html_data_url("data:text/html," + html);
NavigateToURL(shell(), html_data_url);
waiter.WaitForNotification();
Expand Down Expand Up @@ -504,7 +504,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityWinBrowserTest,
scoped_ptr<AccessibilityNotificationWaiter> waiter(
new AccessibilityNotificationWaiter(
shell(), AccessibilityModeComplete,
WebKit::WebAXEventFocus));
blink::WebAXEventFocus));
ExecuteScript(L"document.body.children[0].focus()");
waiter->WaitForNotification();

Expand All @@ -516,7 +516,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityWinBrowserTest,
// Set the active descendant of the radio group
waiter.reset(new AccessibilityNotificationWaiter(
shell(), AccessibilityModeComplete,
WebKit::WebAXEventFocus));
blink::WebAXEventFocus));
ExecuteScript(
L"document.body.children[0].setAttribute('aria-activedescendant', 'li')");
waiter->WaitForNotification();
Expand Down Expand Up @@ -549,7 +549,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityWinBrowserTest,
scoped_ptr<AccessibilityNotificationWaiter> waiter(
new AccessibilityNotificationWaiter(
shell(), AccessibilityModeComplete,
WebKit::WebAXEventCheckedStateChanged));
blink::WebAXEventCheckedStateChanged));
ExecuteScript(L"document.body.children[0].checked=true");
waiter->WaitForNotification();

Expand Down Expand Up @@ -577,7 +577,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityWinBrowserTest,
new AccessibilityNotificationWaiter(
shell(),
AccessibilityModeComplete,
WebKit::WebAXEventChildrenChanged));
blink::WebAXEventChildrenChanged));
ExecuteScript(L"document.body.innerHTML='<b>new text</b>'");
waiter->WaitForNotification();

Expand All @@ -602,7 +602,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityWinBrowserTest,
scoped_ptr<AccessibilityNotificationWaiter> waiter(
new AccessibilityNotificationWaiter(
shell(), AccessibilityModeComplete,
WebKit::WebAXEventChildrenChanged));
blink::WebAXEventChildrenChanged));
ExecuteScript(L"document.body.children[0].style.visibility='visible'");
waiter->WaitForNotification();

Expand Down Expand Up @@ -635,7 +635,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityWinBrowserTest,
scoped_ptr<AccessibilityNotificationWaiter> waiter(
new AccessibilityNotificationWaiter(
shell(), AccessibilityModeComplete,
WebKit::WebAXEventFocus));
blink::WebAXEventFocus));
ExecuteScript(L"document.body.children[0].focus()");
waiter->WaitForNotification();

Expand All @@ -649,7 +649,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityWinBrowserTest,
waiter.reset(
new AccessibilityNotificationWaiter(
shell(), AccessibilityModeComplete,
WebKit::WebAXEventBlur));
blink::WebAXEventBlur));
base::win::ScopedComPtr<IAccessible> document_accessible(
GetRendererAccessible());
ASSERT_NE(document_accessible.get(), reinterpret_cast<IAccessible*>(NULL));
Expand Down Expand Up @@ -685,7 +685,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityWinBrowserTest,
scoped_ptr<AccessibilityNotificationWaiter> waiter(
new AccessibilityNotificationWaiter(
shell(), AccessibilityModeComplete,
WebKit::WebAXEventValueChanged));
blink::WebAXEventValueChanged));
ExecuteScript(L"document.body.children[0].value='new value'");
waiter->WaitForNotification();

Expand Down
40 changes: 20 additions & 20 deletions content/browser/accessibility/browser_accessibility.cc
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ BrowserAccessibility::~BrowserAccessibility() {
}

bool BrowserAccessibility::PlatformIsLeaf() const {
return role_ == WebKit::WebAXRoleStaticText || child_count() == 0;
return role_ == blink::WebAXRoleStaticText || child_count() == 0;
}

uint32 BrowserAccessibility::PlatformChildCount() const {
Expand Down Expand Up @@ -151,8 +151,8 @@ gfx::Rect BrowserAccessibility::GetLocalBoundsRect() const {
// nested web area.
BrowserAccessibility* parent = parent_;
bool need_to_offset_web_area =
(role_ == WebKit::WebAXRoleWebArea ||
role_ == WebKit::WebAXRoleRootWebArea);
(role_ == blink::WebAXRoleWebArea ||
role_ == blink::WebAXRoleRootWebArea);
while (parent) {
if (need_to_offset_web_area &&
parent->location().width() > 0 &&
Expand All @@ -163,13 +163,13 @@ gfx::Rect BrowserAccessibility::GetLocalBoundsRect() const {

// On some platforms, we don't want to take the root scroll offsets
// into account.
if (parent->role() == WebKit::WebAXRoleRootWebArea &&
if (parent->role() == blink::WebAXRoleRootWebArea &&
!manager()->UseRootScrollOffsetsWhenComputingBounds()) {
break;
}

if (parent->role() == WebKit::WebAXRoleWebArea ||
parent->role() == WebKit::WebAXRoleRootWebArea) {
if (parent->role() == blink::WebAXRoleWebArea ||
parent->role() == blink::WebAXRoleRootWebArea) {
int sx = 0;
int sy = 0;
if (parent->GetIntAttribute(AccessibilityNodeData::ATTR_SCROLL_X, &sx) &&
Expand All @@ -196,15 +196,15 @@ gfx::Rect BrowserAccessibility::GetGlobalBoundsRect() const {

gfx::Rect BrowserAccessibility::GetLocalBoundsForRange(int start, int len)
const {
DCHECK_EQ(role_, WebKit::WebAXRoleStaticText);
DCHECK_EQ(role_, blink::WebAXRoleStaticText);
int end = start + len;
int child_start = 0;
int child_end = 0;

gfx::Rect bounds;
for (size_t i = 0; i < children_.size() && child_end < start + len; ++i) {
BrowserAccessibility* child = children_[i];
DCHECK_EQ(child->role(), WebKit::WebAXRoleInlineTextBox);
DCHECK_EQ(child->role(), blink::WebAXRoleInlineTextBox);
std::string child_text;
child->GetStringAttribute(AccessibilityNodeData::ATTR_VALUE, &child_text);
int child_len = static_cast<int>(child_text.size());
Expand Down Expand Up @@ -232,28 +232,28 @@ gfx::Rect BrowserAccessibility::GetLocalBoundsForRange(int start, int len)

gfx::Rect child_overlap_rect;
switch (text_direction) {
case WebKit::WebAXTextDirectionLR: {
case blink::WebAXTextDirectionLR: {
int left = child_rect.x() + start_pixel_offset;
int right = child_rect.x() + end_pixel_offset;
child_overlap_rect = gfx::Rect(left, child_rect.y(),
right - left, child_rect.height());
break;
}
case WebKit::WebAXTextDirectionRL: {
case blink::WebAXTextDirectionRL: {
int right = child_rect.right() - start_pixel_offset;
int left = child_rect.right() - end_pixel_offset;
child_overlap_rect = gfx::Rect(left, child_rect.y(),
right - left, child_rect.height());
break;
}
case WebKit::WebAXTextDirectionTB: {
case blink::WebAXTextDirectionTB: {
int top = child_rect.y() + start_pixel_offset;
int bottom = child_rect.y() + end_pixel_offset;
child_overlap_rect = gfx::Rect(child_rect.x(), top,
child_rect.width(), bottom - top);
break;
}
case WebKit::WebAXTextDirectionBT: {
case blink::WebAXTextDirectionBT: {
int bottom = child_rect.bottom() - start_pixel_offset;
int top = child_rect.bottom() - end_pixel_offset;
child_overlap_rect = gfx::Rect(child_rect.x(), top,
Expand Down Expand Up @@ -310,7 +310,7 @@ void BrowserAccessibility::Destroy() {
PostInitialize();

manager_->NotifyAccessibilityEvent(
WebKit::WebAXEventHide, this);
blink::WebAXEventHide, this);

instance_active_ = false;
manager_->RemoveNode(this);
Expand Down Expand Up @@ -555,24 +555,24 @@ bool BrowserAccessibility::GetAriaTristate(
return false; // Not set
}

bool BrowserAccessibility::HasState(WebKit::WebAXState state_enum) const {
bool BrowserAccessibility::HasState(blink::WebAXState state_enum) const {
return (state_ >> state_enum) & 1;
}

bool BrowserAccessibility::IsEditableText() const {
// These roles don't have readonly set, but they're not editable text.
if (role_ == WebKit::WebAXRoleScrollArea ||
role_ == WebKit::WebAXRoleColumn ||
role_ == WebKit::WebAXRoleTableHeaderContainer) {
if (role_ == blink::WebAXRoleScrollArea ||
role_ == blink::WebAXRoleColumn ||
role_ == blink::WebAXRoleTableHeaderContainer) {
return false;
}

// Note: WebAXStateReadonly being false means it's either a text control,
// or contenteditable. We also check for editable text roles to cover
// another element that has role=textbox set on it.
return (!HasState(WebKit::WebAXStateReadonly) ||
role_ == WebKit::WebAXRoleTextField ||
role_ == WebKit::WebAXRoleTextArea);
return (!HasState(blink::WebAXStateReadonly) ||
role_ == blink::WebAXRoleTextField ||
role_ == blink::WebAXRoleTextArea);
}

std::string BrowserAccessibility::GetTextRecursive() const {
Expand Down
2 changes: 1 addition & 1 deletion content/browser/accessibility/browser_accessibility.h
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ class CONTENT_EXPORT BrowserAccessibility {
bool* is_mixed) const;

// Returns true if the bit corresponding to the given state enum is 1.
bool HasState(WebKit::WebAXState state_enum) const;
bool HasState(blink::WebAXState state_enum) const;

// Returns true if this node is an editable text field of any kind.
bool IsEditableText() const;
Expand Down
Loading

0 comments on commit 180ef24

Please sign in to comment.