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

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

Issue 2694413006: Scope and clean up uses of AccessibilityMode. (Closed)
Patch Set: enum -> class 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_view_impl.h" 5 #include "content/renderer/render_view_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 #include <memory> 9 #include <memory>
10 10
(...skipping 2484 matching lines...) Expand 10 before | Expand all | Expand 10 after
2495 #if defined(OS_ANDROID) 2495 #if defined(OS_ANDROID)
2496 bool RenderViewImpl::didTapMultipleTargets( 2496 bool RenderViewImpl::didTapMultipleTargets(
2497 const WebSize& inner_viewport_offset, 2497 const WebSize& inner_viewport_offset,
2498 const WebRect& touch_rect, 2498 const WebRect& touch_rect,
2499 const WebVector<WebRect>& target_rects) { 2499 const WebVector<WebRect>& target_rects) {
2500 // Never show a disambiguation popup when accessibility is enabled, 2500 // Never show a disambiguation popup when accessibility is enabled,
2501 // as this interferes with "touch exploration". 2501 // as this interferes with "touch exploration".
2502 AccessibilityMode accessibility_mode = 2502 AccessibilityMode accessibility_mode =
2503 GetMainRenderFrame()->accessibility_mode(); 2503 GetMainRenderFrame()->accessibility_mode();
2504 bool matches_accessibility_mode_complete = 2504 bool matches_accessibility_mode_complete =
2505 (accessibility_mode & ACCESSIBILITY_MODE_COMPLETE) == 2505 (accessibility_mode == AccessibilityMode::COMPLETE);
2506 ACCESSIBILITY_MODE_COMPLETE;
2507 if (matches_accessibility_mode_complete) 2506 if (matches_accessibility_mode_complete)
2508 return false; 2507 return false;
2509 2508
2510 // The touch_rect, target_rects and zoom_rect are in the outer viewport 2509 // The touch_rect, target_rects and zoom_rect are in the outer viewport
2511 // reference frame. 2510 // reference frame.
2512 gfx::Rect zoom_rect; 2511 gfx::Rect zoom_rect;
2513 float new_total_scale = 2512 float new_total_scale =
2514 DisambiguationPopupHelper::ComputeZoomAreaAndScaleFactor( 2513 DisambiguationPopupHelper::ComputeZoomAreaAndScaleFactor(
2515 touch_rect, target_rects, GetSize(), 2514 touch_rect, target_rects, GetSize(),
2516 gfx::Rect(webview()->mainFrame()->visibleContentRect()).size(), 2515 gfx::Rect(webview()->mainFrame()->visibleContentRect()).size(),
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after
2718 INPUT_EVENT_ACK_STATE_NOT_CONSUMED); 2717 INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
2719 } 2718 }
2720 2719
2721 std::unique_ptr<InputEventAck> ack( 2720 std::unique_ptr<InputEventAck> ack(
2722 new InputEventAck(InputEventAckSource::MAIN_THREAD, input_event->type(), 2721 new InputEventAck(InputEventAckSource::MAIN_THREAD, input_event->type(),
2723 INPUT_EVENT_ACK_STATE_NOT_CONSUMED)); 2722 INPUT_EVENT_ACK_STATE_NOT_CONSUMED));
2724 OnInputEventAck(std::move(ack)); 2723 OnInputEventAck(std::move(ack));
2725 } 2724 }
2726 2725
2727 } // namespace content 2726 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698