OLD | NEW |
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 | 9 |
10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
(...skipping 1342 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1353 return; | 1353 return; |
1354 ImeEventGuard guard(GetRenderWidget()); | 1354 ImeEventGuard guard(GetRenderWidget()); |
1355 frame_->extendSelectionAndDelete(before, after); | 1355 frame_->extendSelectionAndDelete(before, after); |
1356 } | 1356 } |
1357 | 1357 |
1358 void RenderFrameImpl::OnSetAccessibilityMode(AccessibilityMode new_mode) { | 1358 void RenderFrameImpl::OnSetAccessibilityMode(AccessibilityMode new_mode) { |
1359 if (accessibility_mode_ == new_mode) | 1359 if (accessibility_mode_ == new_mode) |
1360 return; | 1360 return; |
1361 accessibility_mode_ = new_mode; | 1361 accessibility_mode_ = new_mode; |
1362 if (renderer_accessibility_) { | 1362 if (renderer_accessibility_) { |
| 1363 // Note: this isn't called automatically by the destructor because |
| 1364 // there'd be no point in calling it in frame teardown, only if there's |
| 1365 // an accessibility mode change but the frame is persisting. |
| 1366 renderer_accessibility_->DisableAccessibility(); |
| 1367 |
1363 delete renderer_accessibility_; | 1368 delete renderer_accessibility_; |
1364 renderer_accessibility_ = NULL; | 1369 renderer_accessibility_ = NULL; |
1365 } | 1370 } |
1366 if (accessibility_mode_ == AccessibilityModeOff) | 1371 if (accessibility_mode_ == AccessibilityModeOff) |
1367 return; | 1372 return; |
1368 | 1373 |
1369 if (accessibility_mode_ & AccessibilityModeFlagFullTree) | 1374 if (accessibility_mode_ & AccessibilityModeFlagFullTree) |
1370 renderer_accessibility_ = new RendererAccessibilityComplete(this); | 1375 renderer_accessibility_ = new RendererAccessibilityComplete(this); |
1371 } | 1376 } |
1372 | 1377 |
(...skipping 2734 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4107 | 4112 |
4108 #if defined(ENABLE_BROWSER_CDMS) | 4113 #if defined(ENABLE_BROWSER_CDMS) |
4109 RendererCdmManager* RenderFrameImpl::GetCdmManager() { | 4114 RendererCdmManager* RenderFrameImpl::GetCdmManager() { |
4110 if (!cdm_manager_) | 4115 if (!cdm_manager_) |
4111 cdm_manager_ = new RendererCdmManager(this); | 4116 cdm_manager_ = new RendererCdmManager(this); |
4112 return cdm_manager_; | 4117 return cdm_manager_; |
4113 } | 4118 } |
4114 #endif // defined(ENABLE_BROWSER_CDMS) | 4119 #endif // defined(ENABLE_BROWSER_CDMS) |
4115 | 4120 |
4116 } // namespace content | 4121 } // namespace content |
OLD | NEW |