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 "base/command_line.h" | 5 #include "base/command_line.h" |
6 #include "base/file_path.h" | 6 #include "base/file_path.h" |
7 #include "base/file_util.h" | 7 #include "base/file_util.h" |
8 #include "base/path_service.h" | 8 #include "base/path_service.h" |
9 #include "base/string_number_conversions.h" | 9 #include "base/string_number_conversions.h" |
10 #include "base/string_util.h" | 10 #include "base/string_util.h" |
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
171 | 171 |
172 content::DOMMessageQueue message_queue; | 172 content::DOMMessageQueue message_queue; |
173 ui_test_utils::NavigateToURL(browser(), net::FilePathToFileURL(url)); | 173 ui_test_utils::NavigateToURL(browser(), net::FilePathToFileURL(url)); |
174 | 174 |
175 // Wait for notification that page is loaded. | 175 // Wait for notification that page is loaded. |
176 ASSERT_TRUE(message_queue.WaitForMessage(NULL)); | 176 ASSERT_TRUE(message_queue.WaitForMessage(NULL)); |
177 message_queue.ClearQueue(); | 177 message_queue.ClearQueue(); |
178 | 178 |
179 gfx::Rect new_bounds = GetNewTabContainerBounds(tab_container_size); | 179 gfx::Rect new_bounds = GetNewTabContainerBounds(tab_container_size); |
180 | 180 |
181 std::ostringstream js_call; | 181 std::wostringstream js_call; |
182 js_call << "preCallResizeInChromium("; | 182 js_call << "preCallResizeInChromium("; |
183 js_call << new_bounds.width() << ", " << new_bounds.height(); | 183 js_call << new_bounds.width() << ", " << new_bounds.height(); |
184 js_call << ");"; | 184 js_call << ");"; |
185 | 185 |
186 ASSERT_TRUE(content::ExecuteJavaScript( | 186 ASSERT_TRUE(content::ExecuteJavaScript( |
187 chrome::GetActiveWebContents(browser())->GetRenderViewHost(), | 187 chrome::GetActiveWebContents(browser())->GetRenderViewHost(), |
188 "", | 188 L"", js_call.str())); |
189 js_call.str())); | |
190 | 189 |
191 std::string message; | 190 std::string message; |
192 ASSERT_TRUE(message_queue.WaitForMessage(&message)); | 191 ASSERT_TRUE(message_queue.WaitForMessage(&message)); |
193 message_queue.ClearQueue(); | 192 message_queue.ClearQueue(); |
194 browser()->window()->SetBounds(new_bounds); | 193 browser()->window()->SetBounds(new_bounds); |
195 | 194 |
196 // Wait for message from test page indicating the rendering is done. | 195 // Wait for message from test page indicating the rendering is done. |
197 while (message.compare("\"resized\"")) { | 196 while (message.compare("\"resized\"")) { |
198 ASSERT_TRUE(message_queue.WaitForMessage(&message)); | 197 ASSERT_TRUE(message_queue.WaitForMessage(&message)); |
199 message_queue.ClearQueue(); | 198 message_queue.ClearQueue(); |
(...skipping 392 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
592 {160, 100, 0, 0, 0} | 591 {160, 100, 0, 0, 0} |
593 }; | 592 }; |
594 const size_t ref_pixel_count = sizeof(ref_pixels) / sizeof(ReferencePixel); | 593 const size_t ref_pixel_count = sizeof(ref_pixels) / sizeof(ReferencePixel); |
595 | 594 |
596 gfx::Size container_size(400, 300); | 595 gfx::Size container_size(400, 300); |
597 FilePath url = | 596 FilePath url = |
598 test_data_dir().AppendASCII("pixel_canvas2d.html"); | 597 test_data_dir().AppendASCII("pixel_canvas2d.html"); |
599 RunPixelTest(container_size, url, ref_img_revision_update, | 598 RunPixelTest(container_size, url, ref_img_revision_update, |
600 ref_pixels, ref_pixel_count); | 599 ref_pixels, ref_pixel_count); |
601 } | 600 } |
OLD | NEW |