| 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 2096 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2107 // Submit another frame. The resources for the previous frame belong to the | 2107 // Submit another frame. The resources for the previous frame belong to the |
| 2108 // old RendererCompositorFrameSink and should not be returned. | 2108 // old RendererCompositorFrameSink and should not be returned. |
| 2109 view_->SubmitCompositorFrame(CreateLocalSurfaceId(), | 2109 view_->SubmitCompositorFrame(CreateLocalSurfaceId(), |
| 2110 MakeDelegatedFrame(1.f, view_size, view_rect)); | 2110 MakeDelegatedFrame(1.f, view_size, view_rect)); |
| 2111 EXPECT_EQ(0u, sink_->message_count()); | 2111 EXPECT_EQ(0u, sink_->message_count()); |
| 2112 | 2112 |
| 2113 // Report that the surface is drawn to trigger an ACK. | 2113 // Report that the surface is drawn to trigger an ACK. |
| 2114 view_->renderer_compositor_frame_sink_->Reset(); | 2114 view_->renderer_compositor_frame_sink_->Reset(); |
| 2115 cc::Surface* surface = manager->GetSurfaceForId(view_->surface_id()); | 2115 cc::Surface* surface = manager->GetSurfaceForId(view_->surface_id()); |
| 2116 EXPECT_TRUE(surface); | 2116 EXPECT_TRUE(surface); |
| 2117 surface->RunDrawCallbacks(); | 2117 surface->RunDrawCallback(); |
| 2118 view_->renderer_compositor_frame_sink_->Flush(); | 2118 view_->renderer_compositor_frame_sink_->Flush(); |
| 2119 EXPECT_TRUE(view_->renderer_compositor_frame_sink_->did_receive_ack()); | 2119 EXPECT_TRUE(view_->renderer_compositor_frame_sink_->did_receive_ack()); |
| 2120 | 2120 |
| 2121 manager->RemoveObserver(&manager_observer); | 2121 manager->RemoveObserver(&manager_observer); |
| 2122 } | 2122 } |
| 2123 | 2123 |
| 2124 // Resizing in fullscreen mode should send the up-to-date screen info. | 2124 // Resizing in fullscreen mode should send the up-to-date screen info. |
| 2125 // http://crbug.com/324350 | 2125 // http://crbug.com/324350 |
| 2126 TEST_F(RenderWidgetHostViewAuraTest, DISABLED_FullscreenResize) { | 2126 TEST_F(RenderWidgetHostViewAuraTest, DISABLED_FullscreenResize) { |
| 2127 aura::Window* root_window = aura_test_helper_->root_window(); | 2127 aura::Window* root_window = aura_test_helper_->root_window(); |
| (...skipping 3316 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5444 // There is no composition in the beginning. | 5444 // There is no composition in the beginning. |
| 5445 EXPECT_FALSE(has_composition_text()); | 5445 EXPECT_FALSE(has_composition_text()); |
| 5446 SetHasCompositionTextToTrue(); | 5446 SetHasCompositionTextToTrue(); |
| 5447 view->ImeCancelComposition(); | 5447 view->ImeCancelComposition(); |
| 5448 // The composition must have been canceled. | 5448 // The composition must have been canceled. |
| 5449 EXPECT_FALSE(has_composition_text()); | 5449 EXPECT_FALSE(has_composition_text()); |
| 5450 } | 5450 } |
| 5451 } | 5451 } |
| 5452 | 5452 |
| 5453 } // namespace content | 5453 } // namespace content |
| OLD | NEW |