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 1413 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1424 ? blink::kWebTextDirectionRightToLeft | 1424 ? blink::kWebTextDirectionRightToLeft |
1425 : blink::kWebTextDirectionLeftToRight); | 1425 : blink::kWebTextDirectionLeftToRight); |
1426 GetTextInputManager()->GetActiveWidget()->NotifyTextDirection(); | 1426 GetTextInputManager()->GetActiveWidget()->NotifyTextDirection(); |
1427 return true; | 1427 return true; |
1428 } | 1428 } |
1429 | 1429 |
1430 void RenderWidgetHostViewAura::ExtendSelectionAndDelete( | 1430 void RenderWidgetHostViewAura::ExtendSelectionAndDelete( |
1431 size_t before, size_t after) { | 1431 size_t before, size_t after) { |
1432 RenderFrameHostImpl* rfh = GetFocusedFrame(); | 1432 RenderFrameHostImpl* rfh = GetFocusedFrame(); |
1433 if (rfh) | 1433 if (rfh) |
1434 rfh->ExtendSelectionAndDelete(before, after); | 1434 rfh->GetFrameInputHandler()->ExtendSelectionAndDelete(before, after); |
1435 } | 1435 } |
1436 | 1436 |
1437 void RenderWidgetHostViewAura::EnsureCaretNotInRect( | 1437 void RenderWidgetHostViewAura::EnsureCaretNotInRect( |
1438 const gfx::Rect& rect_in_screen) { | 1438 const gfx::Rect& rect_in_screen) { |
1439 aura::Window* top_level_window = window_->GetToplevelWindow(); | 1439 aura::Window* top_level_window = window_->GetToplevelWindow(); |
1440 #if defined(OS_CHROMEOS) | 1440 #if defined(OS_CHROMEOS) |
1441 wm::EnsureWindowNotInRect(top_level_window, rect_in_screen); | 1441 wm::EnsureWindowNotInRect(top_level_window, rect_in_screen); |
1442 #endif | 1442 #endif |
1443 | 1443 |
1444 // Perform overscroll if the caret is still hidden by the keyboard. | 1444 // Perform overscroll if the caret is still hidden by the keyboard. |
(...skipping 974 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2419 } | 2419 } |
2420 | 2420 |
2421 void RenderWidgetHostViewAura::UpdateNeedsBeginFramesInternal() { | 2421 void RenderWidgetHostViewAura::UpdateNeedsBeginFramesInternal() { |
2422 if (!delegated_frame_host_) | 2422 if (!delegated_frame_host_) |
2423 return; | 2423 return; |
2424 delegated_frame_host_->SetNeedsBeginFrames(needs_begin_frames_ || | 2424 delegated_frame_host_->SetNeedsBeginFrames(needs_begin_frames_ || |
2425 needs_flush_input_); | 2425 needs_flush_input_); |
2426 } | 2426 } |
2427 | 2427 |
2428 } // namespace content | 2428 } // namespace content |
OLD | NEW |