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 <stddef.h> | 7 #include <stddef.h> |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
10 #include <tuple> | 10 #include <tuple> |
(...skipping 1570 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1581 // Cursor is below the window. | 1581 // Cursor is below the window. |
1582 cursor_client.reset_calls_to_set_cursor(); | 1582 cursor_client.reset_calls_to_set_cursor(); |
1583 aura::Env::GetInstance()->set_last_mouse_location(gfx::Point(161, 161)); | 1583 aura::Env::GetInstance()->set_last_mouse_location(gfx::Point(161, 161)); |
1584 view_->UpdateCursorIfOverSelf(); | 1584 view_->UpdateCursorIfOverSelf(); |
1585 EXPECT_EQ(0, cursor_client.calls_to_set_cursor()); | 1585 EXPECT_EQ(0, cursor_client.calls_to_set_cursor()); |
1586 } | 1586 } |
1587 | 1587 |
1588 std::unique_ptr<cc::CompositorFrame> MakeDelegatedFrame(float scale_factor, | 1588 std::unique_ptr<cc::CompositorFrame> MakeDelegatedFrame(float scale_factor, |
1589 gfx::Size size, | 1589 gfx::Size size, |
1590 gfx::Rect damage) { | 1590 gfx::Rect damage) { |
1591 std::unique_ptr<cc::CompositorFrame> frame(new cc::CompositorFrame); | 1591 std::unique_ptr<cc::CompositorFrame> frame(cc::CompositorFrame::Create()); |
1592 frame->metadata.device_scale_factor = scale_factor; | 1592 frame->metadata.device_scale_factor = scale_factor; |
1593 frame->delegated_frame_data.reset(new cc::DelegatedFrameData); | 1593 frame->delegated_frame_data.reset(new cc::DelegatedFrameData); |
1594 | 1594 |
1595 std::unique_ptr<cc::RenderPass> pass = cc::RenderPass::Create(); | 1595 std::unique_ptr<cc::RenderPass> pass = cc::RenderPass::Create(); |
1596 pass->SetNew( | 1596 pass->SetNew( |
1597 cc::RenderPassId(1, 1), gfx::Rect(size), damage, gfx::Transform()); | 1597 cc::RenderPassId(1, 1), gfx::Rect(size), damage, gfx::Transform()); |
1598 frame->delegated_frame_data->render_pass_list.push_back(std::move(pass)); | 1598 frame->delegated_frame_data->render_pass_list.push_back(std::move(pass)); |
1599 return frame; | 1599 return frame; |
1600 } | 1600 } |
1601 | 1601 |
(...skipping 2606 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4208 base::Bind(&ui::TextInputClient::InsertText, | 4208 base::Bind(&ui::TextInputClient::InsertText, |
4209 base::Unretained(text_input_client()), base::string16()); | 4209 base::Unretained(text_input_client()), base::string16()); |
4210 for (auto index : active_view_sequence_) { | 4210 for (auto index : active_view_sequence_) { |
4211 ActivateViewForTextInputManager(views_[index], ui::TEXT_INPUT_TYPE_TEXT); | 4211 ActivateViewForTextInputManager(views_[index], ui::TEXT_INPUT_TYPE_TEXT); |
4212 EXPECT_TRUE(!!RunAndReturnIPCSent(ime_call, processes_[index], | 4212 EXPECT_TRUE(!!RunAndReturnIPCSent(ime_call, processes_[index], |
4213 InputMsg_ImeConfirmComposition::ID)); | 4213 InputMsg_ImeConfirmComposition::ID)); |
4214 } | 4214 } |
4215 } | 4215 } |
4216 | 4216 |
4217 } // namespace content | 4217 } // namespace content |
OLD | NEW |