| 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 607 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 618 | 618 |
| 619 WebKit::WebString TestWebKitPlatformSupport::webKitRootDir() { | 619 WebKit::WebString TestWebKitPlatformSupport::webKitRootDir() { |
| 620 return webkit_support::GetWebKitRootDir(); | 620 return webkit_support::GetWebKitRootDir(); |
| 621 } | 621 } |
| 622 | 622 |
| 623 | 623 |
| 624 WebKit::WebLayerTreeView* | 624 WebKit::WebLayerTreeView* |
| 625 TestWebKitPlatformSupport::createLayerTreeViewForTesting() { | 625 TestWebKitPlatformSupport::createLayerTreeViewForTesting() { |
| 626 scoped_ptr<WebLayerTreeViewImplForTesting> view( | 626 scoped_ptr<WebLayerTreeViewImplForTesting> view( |
| 627 new WebLayerTreeViewImplForTesting( | 627 new WebLayerTreeViewImplForTesting( |
| 628 WebLayerTreeViewImplForTesting::FAKE_CONTEXT, | 628 WebLayerTreeViewImplForTesting::FAKE_CONTEXT, NULL)); |
| 629 static_cast<WebKit::WebLayerTreeViewClient*>(NULL))); | |
| 630 | 629 |
| 631 if (!view->initialize(scoped_ptr<cc::Thread>())) | 630 if (!view->initialize(scoped_ptr<cc::Thread>())) |
| 632 return NULL; | 631 return NULL; |
| 633 return view.release(); | 632 return view.release(); |
| 634 } | 633 } |
| 635 | 634 |
| 636 WebKit::WebLayerTreeView* | 635 WebKit::WebLayerTreeView* |
| 637 TestWebKitPlatformSupport::createLayerTreeViewForTesting( | 636 TestWebKitPlatformSupport::createLayerTreeViewForTesting( |
| 638 TestViewType type) { | 637 TestViewType type) { |
| 639 DCHECK_EQ(TestViewTypeUnitTest, type); | 638 DCHECK_EQ(TestViewTypeUnitTest, type); |
| 640 return createLayerTreeViewForTesting(); | 639 return createLayerTreeViewForTesting(); |
| 641 } | 640 } |
| 642 | 641 |
| OLD | NEW |