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/webkit_support.h" | 5 #include "webkit/support/webkit_support.h" |
6 | 6 |
7 #include "base/at_exit.h" | 7 #include "base/at_exit.h" |
8 #include "base/base64.h" | 8 #include "base/base64.h" |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/bind_helpers.h" | 10 #include "base/bind_helpers.h" |
(...skipping 482 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
493 default: | 493 default: |
494 NOTREACHED(); | 494 NOTREACHED(); |
495 } | 495 } |
496 } | 496 } |
497 | 497 |
498 WebKit::WebGraphicsContext3D* CreateGraphicsContext3D( | 498 WebKit::WebGraphicsContext3D* CreateGraphicsContext3D( |
499 const WebKit::WebGraphicsContext3D::Attributes& attributes, | 499 const WebKit::WebGraphicsContext3D::Attributes& attributes, |
500 WebKit::WebView* web_view) { | 500 WebKit::WebView* web_view) { |
501 scoped_ptr<WebGraphicsContext3DInProcessCommandBufferImpl> context( | 501 scoped_ptr<WebGraphicsContext3DInProcessCommandBufferImpl> context( |
502 new WebGraphicsContext3DInProcessCommandBufferImpl()); | 502 new WebGraphicsContext3DInProcessCommandBufferImpl()); |
503 if (!context->Initialize(attributes, NULL)) | 503 if (!context->Initialize(attributes)) |
504 return NULL; | 504 return NULL; |
505 return context.release(); | 505 return context.release(); |
506 } | 506 } |
507 | 507 |
508 WebKit::WebLayerTreeView* CreateLayerTreeView( | 508 WebKit::WebLayerTreeView* CreateLayerTreeView( |
509 LayerTreeViewType type, | 509 LayerTreeViewType type, |
510 DRTLayerTreeViewClient* client, | 510 DRTLayerTreeViewClient* client, |
511 WebKit::WebThread* thread) { | 511 WebKit::WebThread* thread) { |
512 scoped_ptr<cc::Thread> compositor_thread; | 512 scoped_ptr<cc::Thread> compositor_thread; |
513 if (thread) | 513 if (thread) |
(...skipping 381 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
895 // Logging | 895 // Logging |
896 void EnableWebCoreLogChannels(const std::string& channels) { | 896 void EnableWebCoreLogChannels(const std::string& channels) { |
897 webkit_glue::EnableWebCoreLogChannels(channels); | 897 webkit_glue::EnableWebCoreLogChannels(channels); |
898 } | 898 } |
899 | 899 |
900 void SetGamepadData(const WebKit::WebGamepads& pads) { | 900 void SetGamepadData(const WebKit::WebGamepads& pads) { |
901 test_environment->webkit_platform_support()->setGamepadData(pads); | 901 test_environment->webkit_platform_support()->setGamepadData(pads); |
902 } | 902 } |
903 | 903 |
904 } // namespace webkit_support | 904 } // namespace webkit_support |
OLD | NEW |