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 "webkit/support/test_webkit_platform_support.h" | 5 #include "webkit/support/test_webkit_platform_support.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/file_util.h" | 8 #include "base/file_util.h" |
9 #include "base/files/scoped_temp_dir.h" | 9 #include "base/files/scoped_temp_dir.h" |
10 #include "base/memory/scoped_handle.h" | 10 #include "base/memory/scoped_handle.h" |
(...skipping 587 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
598 | 598 |
599 WebKit::WebString TestWebKitPlatformSupport::webKitRootDir() { | 599 WebKit::WebString TestWebKitPlatformSupport::webKitRootDir() { |
600 return webkit_support::GetWebKitRootDir(); | 600 return webkit_support::GetWebKitRootDir(); |
601 } | 601 } |
602 | 602 |
603 | 603 |
604 WebKit::WebLayerTreeView* | 604 WebKit::WebLayerTreeView* |
605 TestWebKitPlatformSupport::createLayerTreeViewForTesting() { | 605 TestWebKitPlatformSupport::createLayerTreeViewForTesting() { |
606 scoped_ptr<WebLayerTreeViewImplForTesting> view( | 606 scoped_ptr<WebLayerTreeViewImplForTesting> view( |
607 new WebLayerTreeViewImplForTesting( | 607 new WebLayerTreeViewImplForTesting( |
608 WebLayerTreeViewImplForTesting::FAKE_CONTEXT, NULL)); | 608 WebLayerTreeViewImplForTesting::FAKE_CONTEXT, |
| 609 static_cast<WebKit::WebLayerTreeViewClient*>(NULL))); |
609 | 610 |
610 if (!view->initialize(scoped_ptr<cc::Thread>())) | 611 if (!view->initialize(scoped_ptr<cc::Thread>())) |
611 return NULL; | 612 return NULL; |
612 return view.release(); | 613 return view.release(); |
613 } | 614 } |
614 | 615 |
615 WebKit::WebLayerTreeView* | 616 WebKit::WebLayerTreeView* |
616 TestWebKitPlatformSupport::createLayerTreeViewForTesting( | 617 TestWebKitPlatformSupport::createLayerTreeViewForTesting( |
617 TestViewType type) { | 618 TestViewType type) { |
618 DCHECK_EQ(TestViewTypeUnitTest, type); | 619 DCHECK_EQ(TestViewTypeUnitTest, type); |
619 return createLayerTreeViewForTesting(); | 620 return createLayerTreeViewForTesting(); |
620 } | 621 } |
621 | 622 |
OLD | NEW |