| 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 "cc/blink/web_layer_impl.h" |
| 9 #include "content/browser/renderer_host/render_widget_host_impl.h" | 10 #include "content/browser/renderer_host/render_widget_host_impl.h" |
| 10 #include "content/common/gpu/image_transport_surface.h" | 11 #include "content/common/gpu/image_transport_surface.h" |
| 11 #include "content/public/common/page_state.h" | 12 #include "content/public/common/page_state.h" |
| 12 #include "content/renderer/compositor_bindings/web_layer_impl.h" | |
| 13 #include "content/renderer/history_entry.h" | 13 #include "content/renderer/history_entry.h" |
| 14 #include "content/renderer/history_serialization.h" | 14 #include "content/renderer/history_serialization.h" |
| 15 #include "content/renderer/render_frame_impl.h" | 15 #include "content/renderer/render_frame_impl.h" |
| 16 #include "content/renderer/render_thread_impl.h" | 16 #include "content/renderer/render_thread_impl.h" |
| 17 #include "content/renderer/render_view_impl.h" | 17 #include "content/renderer/render_view_impl.h" |
| 18 #include "content/renderer/renderer_webkitplatformsupport_impl.h" | 18 #include "content/renderer/renderer_webkitplatformsupport_impl.h" |
| 19 #include "content/shell/renderer/test_runner/test_common.h" | 19 #include "content/shell/renderer/test_runner/test_common.h" |
| 20 #include "content/shell/renderer/test_runner/web_frame_test_proxy.h" | 20 #include "content/shell/renderer/test_runner/web_frame_test_proxy.h" |
| 21 #include "content/shell/renderer/test_runner/web_test_proxy.h" | 21 #include "content/shell/renderer/test_runner/web_test_proxy.h" |
| 22 #include "third_party/WebKit/public/platform/WebBatteryStatus.h" | 22 #include "third_party/WebKit/public/platform/WebBatteryStatus.h" |
| (...skipping 323 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 346 result.append( | 346 result.append( |
| 347 DumpHistoryItem(entry->root_history_node(), | 347 DumpHistoryItem(entry->root_history_node(), |
| 348 8, | 348 8, |
| 349 index == current_index)); | 349 index == current_index)); |
| 350 } | 350 } |
| 351 result.append("===============================================\n"); | 351 result.append("===============================================\n"); |
| 352 return result; | 352 return result; |
| 353 } | 353 } |
| 354 | 354 |
| 355 blink::WebLayer* InstantiateWebLayer(scoped_refptr<cc::TextureLayer> layer) { | 355 blink::WebLayer* InstantiateWebLayer(scoped_refptr<cc::TextureLayer> layer) { |
| 356 return new WebLayerImpl(layer); | 356 return new cc_blink::WebLayerImpl(layer); |
| 357 } | 357 } |
| 358 | 358 |
| 359 } // namespace content | 359 } // namespace content |
| OLD | NEW |