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/file_util.h" | 7 #include "base/file_util.h" |
8 #include "base/metrics/stats_counters.h" | 8 #include "base/metrics/stats_counters.h" |
9 #include "base/path_service.h" | 9 #include "base/path_service.h" |
10 #include "base/scoped_temp_dir.h" | 10 #include "base/scoped_temp_dir.h" |
(...skipping 361 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
372 TestWebKitPlatformSupport::sharedWorkerRepository() { | 372 TestWebKitPlatformSupport::sharedWorkerRepository() { |
373 return NULL; | 373 return NULL; |
374 } | 374 } |
375 | 375 |
376 WebKit::WebGraphicsContext3D* | 376 WebKit::WebGraphicsContext3D* |
377 TestWebKitPlatformSupport::createOffscreenGraphicsContext3D( | 377 TestWebKitPlatformSupport::createOffscreenGraphicsContext3D( |
378 const WebKit::WebGraphicsContext3D::Attributes& attributes) { | 378 const WebKit::WebGraphicsContext3D::Attributes& attributes) { |
379 switch (webkit_support::GetGraphicsContext3DImplementation()) { | 379 switch (webkit_support::GetGraphicsContext3DImplementation()) { |
380 case webkit_support::IN_PROCESS: | 380 case webkit_support::IN_PROCESS: |
381 return webkit::gpu::WebGraphicsContext3DInProcessImpl::CreateForWebView( | 381 return webkit::gpu::WebGraphicsContext3DInProcessImpl::CreateForWebView( |
382 attributes, NULL, false); | 382 attributes, false); |
383 case webkit_support::IN_PROCESS_COMMAND_BUFFER: { | 383 case webkit_support::IN_PROCESS_COMMAND_BUFFER: { |
384 scoped_ptr<WebKit::WebGraphicsContext3D> context( | 384 scoped_ptr<webkit::gpu::WebGraphicsContext3DInProcessCommandBufferImpl> |
385 new webkit::gpu::WebGraphicsContext3DInProcessCommandBufferImpl()); | 385 context(new |
386 if (!context->initialize(attributes, NULL, false)) | 386 webkit::gpu::WebGraphicsContext3DInProcessCommandBufferImpl()); |
| 387 if (!context->Initialize(attributes, NULL)) |
387 return NULL; | 388 return NULL; |
388 return context.release(); | 389 return context.release(); |
389 } | 390 } |
390 } | 391 } |
391 NOTREACHED(); | 392 NOTREACHED(); |
392 return NULL; | 393 return NULL; |
393 } | 394 } |
394 | 395 |
395 double TestWebKitPlatformSupport::audioHardwareSampleRate() { | 396 double TestWebKitPlatformSupport::audioHardwareSampleRate() { |
396 return 44100.0; | 397 return 44100.0; |
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
442 const webkit_glue::ResourceLoaderBridge::RequestInfo& request_info) { | 443 const webkit_glue::ResourceLoaderBridge::RequestInfo& request_info) { |
443 return SimpleResourceLoaderBridge::Create(request_info); | 444 return SimpleResourceLoaderBridge::Create(request_info); |
444 } | 445 } |
445 | 446 |
446 webkit_glue::WebSocketStreamHandleBridge* | 447 webkit_glue::WebSocketStreamHandleBridge* |
447 TestWebKitPlatformSupport::CreateWebSocketBridge( | 448 TestWebKitPlatformSupport::CreateWebSocketBridge( |
448 WebKit::WebSocketStreamHandle* handle, | 449 WebKit::WebSocketStreamHandle* handle, |
449 webkit_glue::WebSocketStreamHandleDelegate* delegate) { | 450 webkit_glue::WebSocketStreamHandleDelegate* delegate) { |
450 return SimpleSocketStreamBridge::Create(handle, delegate); | 451 return SimpleSocketStreamBridge::Create(handle, delegate); |
451 } | 452 } |
OLD | NEW |