content/browser/renderer_host/render_widget_host_view_mac.mm - Issue 10379029: Revert 135593 - Add initial GTK web accessibility framework (new with valgrind fix).

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/renderer_host/render_widget_host_view_mac.mm

Issue 10379029: Revert 135593 - Add initial GTK web accessibility framework (new with valgrind fix). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 years, 7 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 | « content/browser/renderer_host/render_widget_host_view_gtk.cc ('k') | content/browser/renderer_host/render_widget_host_view_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/render_widget_host_view_mac.mm

===================================================================

--- content/browser/renderer_host/render_widget_host_view_mac.mm (revision 135594)

+++ content/browser/renderer_host/render_widget_host_view_mac.mm (working copy)

@@ -20,7 +20,6 @@

#include "base/sys_string_conversions.h"

#include "base/utf_string_conversions.h"

#import "content/browser/accessibility/browser_accessibility_cocoa.h"

-#import "content/browser/accessibility/browser_accessibility_mac.h"

#include "content/browser/accessibility/browser_accessibility_manager.h"

#include "content/browser/plugin_process_host.h"

#import "content/browser/renderer_host/accelerated_plugin_view_mac.h"

@@ -2107,7 +2106,7 @@

[attribute isEqualToString:NSAccessibilityContentsAttribute]) &&

manager) {

return [NSArray arrayWithObjects:manager->

- GetRoot()->ToBrowserAccessibilityMac()->native_view(), nil];

+ GetRoot()->toBrowserAccessibilityCocoa(), nil];

} else if ([attribute isEqualToString:NSAccessibilityRoleAttribute]) {

return NSAccessibilityScrollAreaRole;

}

@@ -2130,7 +2129,7 @@

localPoint.y = NSHeight([self bounds]) - localPoint.y;

BrowserAccessibilityCocoa* root = renderWidgetHostView_->

GetBrowserAccessibilityManager()->

- GetRoot()->ToBrowserAccessibilityMac()->native_view();

+ GetRoot()->toBrowserAccessibilityCocoa();

id obj = [root accessibilityHitTest:localPoint];

return obj;

}

@@ -2144,7 +2143,7 @@

renderWidgetHostView_->GetBrowserAccessibilityManager();

// Only child is root.

if (manager &&

- manager->GetRoot()->ToBrowserAccessibilityMac()->native_view() == child) {

+ manager->GetRoot()->toBrowserAccessibilityCocoa() == child) {

return 0;

} else {

return NSNotFound;

@@ -2159,7 +2158,7 @@

DCHECK(focused_item);

if (focused_item) {

BrowserAccessibilityCocoa* focused_item_cocoa =

- focused_item->ToBrowserAccessibilityMac()->native_view();

+ focused_item->toBrowserAccessibilityCocoa();

DCHECK(focused_item_cocoa);

if (focused_item_cocoa)

return focused_item_cocoa;