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 335 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
346 | 346 |
347 virtual void getDatabaseNames(WebKit::WebIDBCallbacks* callbacks, | 347 virtual void getDatabaseNames(WebKit::WebIDBCallbacks* callbacks, |
348 const WebKit::WebSecurityOrigin& origin, | 348 const WebKit::WebSecurityOrigin& origin, |
349 WebKit::WebFrame* frame, | 349 WebKit::WebFrame* frame, |
350 const WebString& dataDir) { | 350 const WebString& dataDir) { |
351 factory_->getDatabaseNames(callbacks, origin, frame, | 351 factory_->getDatabaseNames(callbacks, origin, frame, |
352 dataDir.isEmpty() ? data_dir_ : dataDir); | 352 dataDir.isEmpty() ? data_dir_ : dataDir); |
353 } | 353 } |
354 | 354 |
355 virtual void open(const WebString& name, | 355 virtual void open(const WebString& name, |
| 356 long long version, |
356 WebKit::WebIDBCallbacks* callbacks, | 357 WebKit::WebIDBCallbacks* callbacks, |
357 const WebKit::WebSecurityOrigin& origin, | 358 const WebKit::WebSecurityOrigin& origin, |
358 WebKit::WebFrame* frame, | 359 WebKit::WebFrame* frame, |
359 const WebString& dataDir) { | 360 const WebString& dataDir) { |
360 factory_->open(name, callbacks, origin, frame, | 361 factory_->open(name, version, callbacks, origin, frame, |
361 dataDir.isEmpty() ? data_dir_ : dataDir); | 362 dataDir.isEmpty() ? data_dir_ : dataDir); |
362 } | 363 } |
363 | 364 |
364 virtual void deleteDatabase(const WebString& name, | 365 virtual void deleteDatabase(const WebString& name, |
365 WebKit::WebIDBCallbacks* callbacks, | 366 WebKit::WebIDBCallbacks* callbacks, |
366 const WebKit::WebSecurityOrigin& origin, | 367 const WebKit::WebSecurityOrigin& origin, |
367 WebKit::WebFrame* frame, | 368 WebKit::WebFrame* frame, |
368 const WebString& dataDir) { | 369 const WebString& dataDir) { |
369 factory_->deleteDatabase(name, callbacks, origin, frame, | 370 factory_->deleteDatabase(name, callbacks, origin, frame, |
370 dataDir.isEmpty() ? data_dir_ : dataDir); | 371 dataDir.isEmpty() ? data_dir_ : dataDir); |
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
502 | 503 |
503 WebKit::WebMediaStreamCenter* | 504 WebKit::WebMediaStreamCenter* |
504 TestWebKitPlatformSupport::createMediaStreamCenter( | 505 TestWebKitPlatformSupport::createMediaStreamCenter( |
505 WebKit::WebMediaStreamCenterClient* client) { | 506 WebKit::WebMediaStreamCenterClient* client) { |
506 if (shadow_platform_delegate_) | 507 if (shadow_platform_delegate_) |
507 return shadow_platform_delegate_->createMediaStreamCenter(client); | 508 return shadow_platform_delegate_->createMediaStreamCenter(client); |
508 else | 509 else |
509 return webkit_glue::WebKitPlatformSupportImpl::createMediaStreamCenter( | 510 return webkit_glue::WebKitPlatformSupportImpl::createMediaStreamCenter( |
510 client); | 511 client); |
511 } | 512 } |
OLD | NEW |