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 1410 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1421 ? blink::kWebTextDirectionRightToLeft | 1421 ? blink::kWebTextDirectionRightToLeft |
1422 : blink::kWebTextDirectionLeftToRight); | 1422 : blink::kWebTextDirectionLeftToRight); |
1423 GetTextInputManager()->GetActiveWidget()->NotifyTextDirection(); | 1423 GetTextInputManager()->GetActiveWidget()->NotifyTextDirection(); |
1424 return true; | 1424 return true; |
1425 } | 1425 } |
1426 | 1426 |
1427 void RenderWidgetHostViewAura::ExtendSelectionAndDelete( | 1427 void RenderWidgetHostViewAura::ExtendSelectionAndDelete( |
1428 size_t before, size_t after) { | 1428 size_t before, size_t after) { |
1429 RenderFrameHostImpl* rfh = GetFocusedFrame(); | 1429 RenderFrameHostImpl* rfh = GetFocusedFrame(); |
1430 if (rfh) | 1430 if (rfh) |
1431 rfh->ExtendSelectionAndDelete(before, after); | 1431 rfh->GetFrameInputHandler()->ExtendSelectionAndDelete(before, after); |
1432 } | 1432 } |
1433 | 1433 |
1434 void RenderWidgetHostViewAura::EnsureCaretNotInRect( | 1434 void RenderWidgetHostViewAura::EnsureCaretNotInRect( |
1435 const gfx::Rect& rect_in_screen) { | 1435 const gfx::Rect& rect_in_screen) { |
1436 aura::Window* top_level_window = window_->GetToplevelWindow(); | 1436 aura::Window* top_level_window = window_->GetToplevelWindow(); |
1437 #if defined(OS_CHROMEOS) | 1437 #if defined(OS_CHROMEOS) |
1438 wm::EnsureWindowNotInRect(top_level_window, rect_in_screen); | 1438 wm::EnsureWindowNotInRect(top_level_window, rect_in_screen); |
1439 #endif | 1439 #endif |
1440 | 1440 |
1441 // Perform overscroll if the caret is still hidden by the keyboard. | 1441 // Perform overscroll if the caret is still hidden by the keyboard. |
(...skipping 965 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2407 } | 2407 } |
2408 | 2408 |
2409 void RenderWidgetHostViewAura::UpdateNeedsBeginFramesInternal() { | 2409 void RenderWidgetHostViewAura::UpdateNeedsBeginFramesInternal() { |
2410 if (!delegated_frame_host_) | 2410 if (!delegated_frame_host_) |
2411 return; | 2411 return; |
2412 delegated_frame_host_->SetNeedsBeginFrames(needs_begin_frames_ || | 2412 delegated_frame_host_->SetNeedsBeginFrames(needs_begin_frames_ || |
2413 needs_flush_input_); | 2413 needs_flush_input_); |
2414 } | 2414 } |
2415 | 2415 |
2416 } // namespace content | 2416 } // namespace content |
OLD | NEW |