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

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

Issue 1245863003: Initialize CompositorDependencies in RenderWidget's constructor. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 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 "cc/blink/web_layer_impl.h" 9 #include "cc/blink/web_layer_impl.h"
10 #include "components/test_runner/test_common.h" 10 #include "components/test_runner/test_common.h"
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 using blink::WebSize; 45 using blink::WebSize;
46 46
47 namespace content { 47 namespace content {
48 48
49 namespace { 49 namespace {
50 50
51 base::LazyInstance< 51 base::LazyInstance<
52 base::Callback<void(RenderView*, test_runner::WebTestProxyBase*)>>::Leaky 52 base::Callback<void(RenderView*, test_runner::WebTestProxyBase*)>>::Leaky
53 g_callback = LAZY_INSTANCE_INITIALIZER; 53 g_callback = LAZY_INSTANCE_INITIALIZER;
54 54
55 RenderViewImpl* CreateWebTestProxy(const ViewMsg_New_Params& params) { 55 RenderViewImpl* CreateWebTestProxy(CompositorDependencies* compositor_deps,
56 typedef test_runner::WebTestProxy<RenderViewImpl, const ViewMsg_New_Params&> 56 const ViewMsg_New_Params& params) {
57 ProxyType; 57 typedef test_runner::WebTestProxy<RenderViewImpl, CompositorDependencies*,
58 ProxyType* render_view_proxy = new ProxyType(params); 58 const ViewMsg_New_Params&> ProxyType;
59 ProxyType* render_view_proxy = new ProxyType(compositor_deps, params);
59 if (g_callback == 0) 60 if (g_callback == 0)
60 return render_view_proxy; 61 return render_view_proxy;
61 g_callback.Get().Run(render_view_proxy, render_view_proxy); 62 g_callback.Get().Run(render_view_proxy, render_view_proxy);
62 return render_view_proxy; 63 return render_view_proxy;
63 } 64 }
64 65
65 test_runner::WebTestProxyBase* GetWebTestProxyBase( 66 test_runner::WebTestProxyBase* GetWebTestProxyBase(
66 RenderViewImpl* render_view) { 67 RenderViewImpl* render_view) {
67 typedef test_runner::WebTestProxy<RenderViewImpl, const ViewMsg_New_Params&> 68 typedef test_runner::WebTestProxy<RenderViewImpl, const ViewMsg_New_Params&>
68 ViewProxy; 69 ViewProxy;
(...skipping 365 matching lines...) Expand 10 before | Expand all | Expand 10 after
434 cc::TextureLayerClient* client) { 435 cc::TextureLayerClient* client) {
435 return cc::TextureLayer::CreateForMailbox( 436 return cc::TextureLayer::CreateForMailbox(
436 cc_blink::WebLayerImpl::LayerSettings(), client); 437 cc_blink::WebLayerImpl::LayerSettings(), client);
437 } 438 }
438 439
439 blink::WebLayer* InstantiateWebLayer(scoped_refptr<cc::TextureLayer> layer) { 440 blink::WebLayer* InstantiateWebLayer(scoped_refptr<cc::TextureLayer> layer) {
440 return new cc_blink::WebLayerImpl(layer); 441 return new cc_blink::WebLayerImpl(layer);
441 } 442 }
442 443
443 } // namespace content 444 } // namespace content
OLDNEW
« components/test_runner/web_test_proxy.h ('K') | « content/renderer/render_widget_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698