diff options
6 files changed, 3 insertions, 103 deletions
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc index d2d8f74..91f6777 100644 --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc @@ -1061,7 +1061,6 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer( switches::kDomAutomationController, switches::kEnableAcceleratedFixedRootBackground, switches::kEnableAcceleratedOverflowScroll, - switches::kEnableAccessibilityLogging, switches::kEnableADTSStreamParser, switches::kEnableBeginFrameScheduling, switches::kEnableBleedingEdgeRenderingFastPaths, diff --git a/content/public/common/content_switches.cc b/content/public/common/content_switches.cc index 7166716..a847406 100644 --- a/content/public/common/content_switches.cc +++ b/content/public/common/content_switches.cc @@ -346,9 +346,6 @@ const char kEnableLayerSquashing[] = // Enable experimental container node culling. const char kEnableContainerCulling[] = "enable-container-culling"; -// Turns on extremely verbose logging of accessibility events. -const char kEnableAccessibilityLogging[] = "enable-accessibility-logging"; - // Use a BeginFrame signal from browser to renderer to schedule rendering. const char kEnableBeginFrameScheduling[] = "enable-begin-frame-scheduling"; diff --git a/content/public/common/content_switches.h b/content/public/common/content_switches.h index ff68a5a..820ce973 100644 --- a/content/public/common/content_switches.h +++ b/content/public/common/content_switches.h @@ -105,7 +105,6 @@ CONTENT_EXPORT extern const char kEnableAcceleratedFixedRootBackground[]; CONTENT_EXPORT extern const char kEnableAcceleratedOverflowScroll[]; CONTENT_EXPORT extern const char kEnableLayerSquashing[]; CONTENT_EXPORT extern const char kEnableContainerCulling[]; -extern const char kEnableAccessibilityLogging[]; CONTENT_EXPORT extern const char kEnableBeginFrameScheduling[]; CONTENT_EXPORT extern const char kEnableCompositingForFixedPosition[]; CONTENT_EXPORT extern const char kEnableCompositingForTransition[]; diff --git a/content/renderer/accessibility/renderer_accessibility.cc b/content/renderer/accessibility/renderer_accessibility.cc index 62015ea..1f2d696 100644 --- a/content/renderer/accessibility/renderer_accessibility.cc +++ b/content/renderer/accessibility/renderer_accessibility.cc @@ -5,7 +5,6 @@ #include "content/renderer/accessibility/renderer_accessibility.h" #include "base/command_line.h" -#include "content/public/common/content_switches.h" #include "content/renderer/render_view_impl.h" #include "third_party/WebKit/public/web/WebAXObject.h" #include "third_party/WebKit/public/web/WebDocument.h" @@ -22,11 +21,7 @@ namespace content { RendererAccessibility::RendererAccessibility( RenderViewImpl* render_view) : RenderViewObserver(render_view), - render_view_(render_view), - logging_(false) { - const CommandLine& command_line = *CommandLine::ForCurrentProcess(); - if (command_line.HasSwitch(switches::kEnableAccessibilityLogging)) - logging_ = true; + render_view_(render_view) { } RendererAccessibility::~RendererAccessibility() { @@ -42,83 +37,4 @@ WebDocument RendererAccessibility::GetMainDocument() { return WebDocument(); } -#ifndef NDEBUG -const std::string RendererAccessibility::AccessibilityEventToString( - ui::AXEvent event) { - switch (event) { - case ui::AX_EVENT_ACTIVEDESCENDANTCHANGED: - return "active descendant changed"; - case ui::AX_EVENT_ARIA_ATTRIBUTE_CHANGED: - return "aria attribute changed"; - case ui::AX_EVENT_ALERT: - return "alert"; - case ui::AX_EVENT_AUTOCORRECTION_OCCURED: - return "autocorrection occurred"; - case ui::AX_EVENT_BLUR: - return "blur"; - case ui::AX_EVENT_CHECKED_STATE_CHANGED: - return "check state changed"; - case ui::AX_EVENT_CHILDREN_CHANGED: - return "children changed"; - case ui::AX_EVENT_FOCUS: - return "focus changed"; - case ui::AX_EVENT_HIDE: - return "object hide"; - case ui::AX_EVENT_INVALID_STATUS_CHANGED: - return "invalid status changed"; - case ui::AX_EVENT_LAYOUT_COMPLETE: - return "layout complete"; - case ui::AX_EVENT_LIVE_REGION_CHANGED: - return "live region changed"; - case ui::AX_EVENT_LOAD_COMPLETE: - return "load complete"; - case ui::AX_EVENT_LOCATION_CHANGED: - return "location changed"; - case ui::AX_EVENT_MENU_END: - return "menu end"; - case ui::AX_EVENT_MENU_LIST_ITEM_SELECTED: - return "menu list item selected"; - case ui::AX_EVENT_MENU_LIST_VALUE_CHANGED: - return "menu list changed"; - case ui::AX_EVENT_MENU_POPUP_END: - return "menu popup end"; - case ui::AX_EVENT_MENU_POPUP_START: - return "menu popup start"; - case ui::AX_EVENT_MENU_START: - return "menu start"; - case ui::AX_EVENT_NONE: - return "none"; - case ui::AX_EVENT_ROW_COLLAPSED: - return "row collapsed"; - case ui::AX_EVENT_ROW_COUNT_CHANGED: - return "row count changed"; - case ui::AX_EVENT_ROW_EXPANDED: - return "row expanded"; - case ui::AX_EVENT_SCROLL_POSITION_CHANGED: - return "scroll position changed"; - case ui::AX_EVENT_SCROLLED_TO_ANCHOR: - return "scrolled to anchor"; - case ui::AX_EVENT_SELECTED_CHILDREN_CHANGED: - return "selected children changed"; - case ui::AX_EVENT_SELECTED_TEXT_CHANGED: - return "selected text changed"; - case ui::AX_EVENT_SELECTION_CHANGED: - return "selection changed"; - case ui::AX_EVENT_SHOW: - return "object show"; - case ui::AX_EVENT_TEXT_CHANGED: - return "text changed"; - case ui::AX_EVENT_TEXT_INSERTED: - return "text inserted"; - case ui::AX_EVENT_TEXT_REMOVED: - return "text removed"; - case ui::AX_EVENT_VALUE_CHANGED: - return "value changed"; - default: - NOTREACHED(); - } - return ""; -} -#endif - } // namespace content diff --git a/content/renderer/accessibility/renderer_accessibility.h b/content/renderer/accessibility/renderer_accessibility.h index 1f9fd36..9ddb6ed 100644 --- a/content/renderer/accessibility/renderer_accessibility.h +++ b/content/renderer/accessibility/renderer_accessibility.h @@ -76,16 +76,9 @@ class CONTENT_EXPORT RendererAccessibility : public RenderViewObserver { // no view or frame. blink::WebDocument GetMainDocument(); -#ifndef NDEBUG - const std::string AccessibilityEventToString(ui::AXEvent event); -#endif - // The RenderViewImpl that owns us. RenderViewImpl* render_view_; - // True if verbose logging of accessibility events is on. - bool logging_; - DISALLOW_COPY_AND_ASSIGN(RendererAccessibility); }; diff --git a/content/renderer/accessibility/renderer_accessibility_complete.cc b/content/renderer/accessibility/renderer_accessibility_complete.cc index 4a9de8f..7d555cc 100644 --- a/content/renderer/accessibility/renderer_accessibility_complete.cc +++ b/content/renderer/accessibility/renderer_accessibility_complete.cc @@ -201,13 +201,9 @@ void RendererAccessibilityComplete::SendPendingAccessibilityEvents() { serializer_.SerializeChanges(obj, &event_msg.update); event_msgs.push_back(event_msg); -#ifndef NDEBUG - VLOG(0) << "Accessibility update: \n" - << "routing id=" << routing_id() - << " event=" - << AccessibilityEventToString(event.event_type) + VLOG(0) << "Accessibility event: " << ui::ToString(event.event_type) + << " on node id " << event_msg.id << "\n" << event_msg.update.ToString(); -#endif } Send(new AccessibilityHostMsg_Events(routing_id(), event_msgs)); |