Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(442)

Side by Side Diff: webkit/support/test_webkit_client.cc

Issue 6712050: Revert 78801 - Addition of GL-redirecting mechanism for the Skia/GPU back-end. During execution o... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « skia/skia.gyp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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_client.h" 5 #include "webkit/support/test_webkit_client.h"
6 6
7 #include "app/gfx/gl/gl_bindings_skia.h"
8 #include "base/file_util.h" 7 #include "base/file_util.h"
9 #include "base/path_service.h" 8 #include "base/path_service.h"
10 #include "base/scoped_temp_dir.h" 9 #include "base/scoped_temp_dir.h"
11 #include "base/metrics/stats_counters.h" 10 #include "base/metrics/stats_counters.h"
12 #include "base/string_util.h" 11 #include "base/string_util.h"
13 #include "base/utf_string_conversions.h" 12 #include "base/utf_string_conversions.h"
14 #include "net/base/cookie_monster.h" 13 #include "net/base/cookie_monster.h"
15 #include "net/http/http_cache.h" 14 #include "net/http/http_cache.h"
16 #include "net/test/test_server.h" 15 #include "net/test/test_server.h"
17 #include "media/base/media.h" 16 #include "media/base/media.h"
(...skipping 328 matching lines...) Expand 10 before | Expand all | Expand 10 after
346 WebKit::WebThemeEngine* TestWebKitClient::themeEngine() { 345 WebKit::WebThemeEngine* TestWebKitClient::themeEngine() {
347 return active_theme_engine_; 346 return active_theme_engine_;
348 } 347 }
349 #endif 348 #endif
350 349
351 WebKit::WebSharedWorkerRepository* TestWebKitClient::sharedWorkerRepository() { 350 WebKit::WebSharedWorkerRepository* TestWebKitClient::sharedWorkerRepository() {
352 return NULL; 351 return NULL;
353 } 352 }
354 353
355 WebKit::WebGraphicsContext3D* TestWebKitClient::createGraphicsContext3D() { 354 WebKit::WebGraphicsContext3D* TestWebKitClient::createGraphicsContext3D() {
356 gfx::BindSkiaToHostGL();
357 return new webkit::gpu::WebGraphicsContext3DInProcessImpl(); 355 return new webkit::gpu::WebGraphicsContext3DInProcessImpl();
358 } 356 }
OLDNEW
« no previous file with comments | « skia/skia.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698