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/public/test/layouttest_support.h" | 5 #include "content/public/test/layouttest_support.h" |
6 | 6 |
7 #include "base/callback.h" | 7 #include "base/callback.h" |
8 #include "base/lazy_instance.h" | 8 #include "base/lazy_instance.h" |
9 #include "content/browser/renderer_host/render_widget_host_impl.h" | 9 #include "content/browser/renderer_host/render_widget_host_impl.h" |
10 #include "content/common/gpu/image_transport_surface.h" | 10 #include "content/common/gpu/image_transport_surface.h" |
11 #include "content/public/common/page_state.h" | 11 #include "content/public/common/page_state.h" |
| 12 #include "content/renderer/compositor_bindings/web_layer_impl.h" |
12 #include "content/renderer/history_entry.h" | 13 #include "content/renderer/history_entry.h" |
13 #include "content/renderer/history_serialization.h" | 14 #include "content/renderer/history_serialization.h" |
14 #include "content/renderer/render_frame_impl.h" | 15 #include "content/renderer/render_frame_impl.h" |
15 #include "content/renderer/render_thread_impl.h" | 16 #include "content/renderer/render_thread_impl.h" |
16 #include "content/renderer/render_view_impl.h" | 17 #include "content/renderer/render_view_impl.h" |
17 #include "content/renderer/renderer_webkitplatformsupport_impl.h" | 18 #include "content/renderer/renderer_webkitplatformsupport_impl.h" |
18 #include "content/shell/renderer/test_runner/TestCommon.h" | 19 #include "content/shell/renderer/test_runner/TestCommon.h" |
19 #include "content/shell/renderer/test_runner/web_frame_test_proxy.h" | 20 #include "content/shell/renderer/test_runner/web_frame_test_proxy.h" |
20 #include "content/shell/renderer/test_runner/web_test_proxy.h" | 21 #include "content/shell/renderer/test_runner/web_test_proxy.h" |
21 #include "third_party/WebKit/public/platform/WebBatteryStatus.h" | 22 #include "third_party/WebKit/public/platform/WebBatteryStatus.h" |
(...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
298 PageStateToHistoryEntry(page_state[index])); | 299 PageStateToHistoryEntry(page_state[index])); |
299 result.append( | 300 result.append( |
300 DumpHistoryItem(entry->root_history_node(), | 301 DumpHistoryItem(entry->root_history_node(), |
301 8, | 302 8, |
302 index == current_index)); | 303 index == current_index)); |
303 } | 304 } |
304 result.append("===============================================\n"); | 305 result.append("===============================================\n"); |
305 return result; | 306 return result; |
306 } | 307 } |
307 | 308 |
| 309 WebLayer* InstantiateWebLayer(scoped_refptr<cc::TextureLayer> layer) { |
| 310 return new WebLayerImpl(layer); |
| 311 } |
| 312 |
308 } // namespace content | 313 } // namespace content |
OLD | NEW |