OLD | NEW |
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/browser/renderer_host/render_widget_host_view_aura.h" | 5 #include "content/browser/renderer_host/render_widget_host_view_aura.h" |
6 | 6 |
7 #include <set> | 7 #include <set> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
(...skipping 1408 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1419 ? blink::kWebTextDirectionRightToLeft | 1419 ? blink::kWebTextDirectionRightToLeft |
1420 : blink::kWebTextDirectionLeftToRight); | 1420 : blink::kWebTextDirectionLeftToRight); |
1421 GetTextInputManager()->GetActiveWidget()->NotifyTextDirection(); | 1421 GetTextInputManager()->GetActiveWidget()->NotifyTextDirection(); |
1422 return true; | 1422 return true; |
1423 } | 1423 } |
1424 | 1424 |
1425 void RenderWidgetHostViewAura::ExtendSelectionAndDelete( | 1425 void RenderWidgetHostViewAura::ExtendSelectionAndDelete( |
1426 size_t before, size_t after) { | 1426 size_t before, size_t after) { |
1427 RenderFrameHostImpl* rfh = GetFocusedFrame(); | 1427 RenderFrameHostImpl* rfh = GetFocusedFrame(); |
1428 if (rfh) | 1428 if (rfh) |
1429 rfh->ExtendSelectionAndDelete(before, after); | 1429 rfh->GetFrameInputHandler()->ExtendSelectionAndDelete(before, after); |
1430 } | 1430 } |
1431 | 1431 |
1432 void RenderWidgetHostViewAura::EnsureCaretNotInRect( | 1432 void RenderWidgetHostViewAura::EnsureCaretNotInRect( |
1433 const gfx::Rect& rect_in_screen) { | 1433 const gfx::Rect& rect_in_screen) { |
1434 aura::Window* top_level_window = window_->GetToplevelWindow(); | 1434 aura::Window* top_level_window = window_->GetToplevelWindow(); |
1435 #if defined(OS_CHROMEOS) | 1435 #if defined(OS_CHROMEOS) |
1436 wm::EnsureWindowNotInRect(top_level_window, rect_in_screen); | 1436 wm::EnsureWindowNotInRect(top_level_window, rect_in_screen); |
1437 #endif | 1437 #endif |
1438 | 1438 |
1439 // Perform overscroll if the caret is still hidden by the keyboard. | 1439 // Perform overscroll if the caret is still hidden by the keyboard. |
(...skipping 963 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2403 } | 2403 } |
2404 | 2404 |
2405 void RenderWidgetHostViewAura::UpdateNeedsBeginFramesInternal() { | 2405 void RenderWidgetHostViewAura::UpdateNeedsBeginFramesInternal() { |
2406 if (!delegated_frame_host_) | 2406 if (!delegated_frame_host_) |
2407 return; | 2407 return; |
2408 delegated_frame_host_->SetNeedsBeginFrames(needs_begin_frames_ || | 2408 delegated_frame_host_->SetNeedsBeginFrames(needs_begin_frames_ || |
2409 needs_flush_input_); | 2409 needs_flush_input_); |
2410 } | 2410 } |
2411 | 2411 |
2412 } // namespace content | 2412 } // namespace content |
OLD | NEW |