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

Side by Side Diff: content/renderer/render_frame_impl.cc

Issue 2694413006: Scope and clean up uses of AccessibilityMode. (Closed)
Patch Set: build bustage Created 3 years, 10 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/render_frame_impl.h" 5 #include "content/renderer/render_frame_impl.h"
6 6
7 #include <map> 7 #include <map>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 1064 matching lines...) Expand 10 before | Expand all | Expand 10 after
1075 web_user_media_client_(NULL), 1075 web_user_media_client_(NULL),
1076 #if defined(OS_ANDROID) 1076 #if defined(OS_ANDROID)
1077 media_player_manager_(NULL), 1077 media_player_manager_(NULL),
1078 #endif 1078 #endif
1079 media_surface_manager_(nullptr), 1079 media_surface_manager_(nullptr),
1080 devtools_agent_(nullptr), 1080 devtools_agent_(nullptr),
1081 push_messaging_dispatcher_(NULL), 1081 push_messaging_dispatcher_(NULL),
1082 presentation_dispatcher_(NULL), 1082 presentation_dispatcher_(NULL),
1083 screen_orientation_dispatcher_(NULL), 1083 screen_orientation_dispatcher_(NULL),
1084 manifest_manager_(NULL), 1084 manifest_manager_(NULL),
1085 accessibility_mode_(AccessibilityModeOff), 1085 accessibility_mode_(AccessibilityMode::OFF),
1086 render_accessibility_(NULL), 1086 render_accessibility_(NULL),
1087 media_player_delegate_(NULL), 1087 media_player_delegate_(NULL),
1088 previews_state_(PREVIEWS_UNSPECIFIED), 1088 previews_state_(PREVIEWS_UNSPECIFIED),
1089 effective_connection_type_( 1089 effective_connection_type_(
1090 blink::WebEffectiveConnectionType::TypeUnknown), 1090 blink::WebEffectiveConnectionType::TypeUnknown),
1091 is_pasting_(false), 1091 is_pasting_(false),
1092 suppress_further_dialogs_(false), 1092 suppress_further_dialogs_(false),
1093 blame_context_(nullptr), 1093 blame_context_(nullptr),
1094 #if BUILDFLAG(ENABLE_PLUGINS) 1094 #if BUILDFLAG(ENABLE_PLUGINS)
1095 focused_pepper_plugin_(nullptr), 1095 focused_pepper_plugin_(nullptr),
(...skipping 1001 matching lines...) Expand 10 before | Expand all | Expand 10 after
2097 if (render_accessibility_) { 2097 if (render_accessibility_) {
2098 // Note: this isn't called automatically by the destructor because 2098 // Note: this isn't called automatically by the destructor because
2099 // there'd be no point in calling it in frame teardown, only if there's 2099 // there'd be no point in calling it in frame teardown, only if there's
2100 // an accessibility mode change but the frame is persisting. 2100 // an accessibility mode change but the frame is persisting.
2101 render_accessibility_->DisableAccessibility(); 2101 render_accessibility_->DisableAccessibility();
2102 2102
2103 delete render_accessibility_; 2103 delete render_accessibility_;
2104 render_accessibility_ = NULL; 2104 render_accessibility_ = NULL;
2105 } 2105 }
2106 2106
2107 if (accessibility_mode_ & ACCESSIBILITY_MODE_FLAG_WEB_CONTENTS) { 2107 if (accessibility_mode_ & AccessibilityMode::WEB_CONTENTS) {
2108 render_accessibility_ = new RenderAccessibilityImpl( 2108 render_accessibility_ = new RenderAccessibilityImpl(
2109 this, accessibility_mode_); 2109 this, accessibility_mode_);
2110 } 2110 }
2111 2111
2112 for (auto& observer : observers_) 2112 for (auto& observer : observers_)
2113 observer.AccessibilityModeChanged(); 2113 observer.AccessibilityModeChanged();
2114 } 2114 }
2115 2115
2116 void RenderFrameImpl::OnSnapshotAccessibilityTree(int callback_id) { 2116 void RenderFrameImpl::OnSnapshotAccessibilityTree(int callback_id) {
2117 AXContentTreeUpdate response; 2117 AXContentTreeUpdate response;
(...skipping 4732 matching lines...) Expand 10 before | Expand all | Expand 10 after
6850 // event target. Potentially a Pepper plugin will receive the event. 6850 // event target. Potentially a Pepper plugin will receive the event.
6851 // In order to tell whether a plugin gets the last mouse event and which it 6851 // In order to tell whether a plugin gets the last mouse event and which it
6852 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets 6852 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets
6853 // the event, it will notify us via DidReceiveMouseEvent() and set itself as 6853 // the event, it will notify us via DidReceiveMouseEvent() and set itself as
6854 // |pepper_last_mouse_event_target_|. 6854 // |pepper_last_mouse_event_target_|.
6855 pepper_last_mouse_event_target_ = nullptr; 6855 pepper_last_mouse_event_target_ = nullptr;
6856 #endif 6856 #endif
6857 } 6857 }
6858 6858
6859 } // namespace content 6859 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698