| OLD | NEW |
|---|
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/tools/test_shell/test_shell_webkit_init.h" | 5 #include "webkit/tools/test_shell/test_shell_webkit_init.h" |
| 6 | 6 |
| 7 #include "base/metrics/stats_counters.h" | 7 #include "base/metrics/stats_counters.h" |
| 8 #include "base/path_service.h" | 8 #include "base/path_service.h" |
| 9 #include "media/base/media.h" | 9 #include "media/base/media.h" |
| 10 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCache.h" | 10 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCache.h" |
| (...skipping 278 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 289 return WebKit::WebIDBKey::injectIDBKeyIntoSerializedValue( | 289 return WebKit::WebIDBKey::injectIDBKeyIntoSerializedValue( |
| 290 key, value, WebKit::WebIDBKeyPath::create(keyPath)); | 290 key, value, WebKit::WebIDBKeyPath::create(keyPath)); |
| 291 } | 291 } |
| 292 | 292 |
| 293 WebKit::WebSharedWorkerRepository* | 293 WebKit::WebSharedWorkerRepository* |
| 294 TestShellWebKitInit::sharedWorkerRepository() { | 294 TestShellWebKitInit::sharedWorkerRepository() { |
| 295 return NULL; | 295 return NULL; |
| 296 } | 296 } |
| 297 | 297 |
| 298 WebKit::WebGraphicsContext3D* TestShellWebKitInit::createGraphicsContext3D() { | 298 WebKit::WebGraphicsContext3D* TestShellWebKitInit::createGraphicsContext3D() { |
| 299 gfx::BindSkiaToInProcessGL(); | |
| 300 return new webkit::gpu::WebGraphicsContext3DInProcessImpl(); | 299 return new webkit::gpu::WebGraphicsContext3DInProcessImpl(); |
| 301 } | 300 } |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 7753035:
Allow each WGC3D subclass to determine the correct GrGLInterface for its GrContext. (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src/