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 "cc/blink/web_layer_impl.h" |
10 #include "content/browser/renderer_host/render_widget_host_impl.h" | 10 #include "content/browser/renderer_host/render_widget_host_impl.h" |
(...skipping 30 matching lines...) Expand all Loading... |
41 using blink::WebRect; | 41 using blink::WebRect; |
42 using blink::WebSize; | 42 using blink::WebSize; |
43 | 43 |
44 namespace content { | 44 namespace content { |
45 | 45 |
46 namespace { | 46 namespace { |
47 | 47 |
48 base::LazyInstance<base::Callback<void(RenderView*, WebTestProxyBase*)> >::Leaky | 48 base::LazyInstance<base::Callback<void(RenderView*, WebTestProxyBase*)> >::Leaky |
49 g_callback = LAZY_INSTANCE_INITIALIZER; | 49 g_callback = LAZY_INSTANCE_INITIALIZER; |
50 | 50 |
51 RenderViewImpl* CreateWebTestProxy(RenderViewImplParams* params) { | 51 RenderViewImpl* CreateWebTestProxy(const ViewMsg_New_Params& params) { |
52 typedef WebTestProxy<RenderViewImpl, RenderViewImplParams*> ProxyType; | 52 typedef WebTestProxy<RenderViewImpl, const ViewMsg_New_Params&> ProxyType; |
53 ProxyType* render_view_proxy = new ProxyType(params); | 53 ProxyType* render_view_proxy = new ProxyType(params); |
54 if (g_callback == 0) | 54 if (g_callback == 0) |
55 return render_view_proxy; | 55 return render_view_proxy; |
56 g_callback.Get().Run(render_view_proxy, render_view_proxy); | 56 g_callback.Get().Run(render_view_proxy, render_view_proxy); |
57 return render_view_proxy; | 57 return render_view_proxy; |
58 } | 58 } |
59 | 59 |
60 WebTestProxyBase* GetWebTestProxyBase(RenderViewImpl* render_view) { | 60 WebTestProxyBase* GetWebTestProxyBase(RenderViewImpl* render_view) { |
61 typedef WebTestProxy<RenderViewImpl, RenderViewImplParams*> ViewProxy; | 61 typedef WebTestProxy<RenderViewImpl, ViewMsg_New_Params*> ViewProxy; |
62 | 62 |
63 ViewProxy* render_view_proxy = static_cast<ViewProxy*>(render_view); | 63 ViewProxy* render_view_proxy = static_cast<ViewProxy*>(render_view); |
64 return static_cast<WebTestProxyBase*>(render_view_proxy); | 64 return static_cast<WebTestProxyBase*>(render_view_proxy); |
65 } | 65 } |
66 | 66 |
67 RenderFrameImpl* CreateWebFrameTestProxy( | 67 RenderFrameImpl* CreateWebFrameTestProxy( |
68 RenderViewImpl* render_view, | 68 RenderViewImpl* render_view, |
69 int32 routing_id) { | 69 int32 routing_id) { |
70 typedef WebFrameTestProxy<RenderFrameImpl, RenderViewImpl*, int32> FrameProxy; | 70 typedef WebFrameTestProxy<RenderFrameImpl, RenderViewImpl*, int32> FrameProxy; |
71 | 71 |
(...skipping 323 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
395 } | 395 } |
396 result.append("===============================================\n"); | 396 result.append("===============================================\n"); |
397 return result; | 397 return result; |
398 } | 398 } |
399 | 399 |
400 blink::WebLayer* InstantiateWebLayer(scoped_refptr<cc::TextureLayer> layer) { | 400 blink::WebLayer* InstantiateWebLayer(scoped_refptr<cc::TextureLayer> layer) { |
401 return new cc_blink::WebLayerImpl(layer); | 401 return new cc_blink::WebLayerImpl(layer); |
402 } | 402 } |
403 | 403 |
404 } // namespace content | 404 } // namespace content |
OLD | NEW |