Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(58)

Side by Side Diff: content/test/layouttest_support.cc

Issue 317163002: Moving compositor_bindings from webkit to content (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Changing dependencies due to failing ios bots Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 273 matching lines...) Expand 10 before | Expand all | Expand 10 after
295 PageStateToHistoryEntry(page_state[index])); 296 PageStateToHistoryEntry(page_state[index]));
296 result.append( 297 result.append(
297 DumpHistoryItem(entry->root_history_node(), 298 DumpHistoryItem(entry->root_history_node(),
298 8, 299 8,
299 index == current_index)); 300 index == current_index));
300 } 301 }
301 result.append("===============================================\n"); 302 result.append("===============================================\n");
302 return result; 303 return result;
303 } 304 }
304 305
306 blink::WebLayer* InstantiateWebLayer(scoped_refptr<cc::TextureLayer> layer) {
307 return new WebLayerImpl(layer);
308 }
309
305 } // namespace content 310 } // namespace content
OLDNEW
« no previous file with comments | « content/shell/renderer/test_runner/TestPlugin.cpp ('k') | content/test/test_webkit_platform_support.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698