| 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/glue/webkitclient_impl.h" | 5 #include "webkit/glue/webkitclient_impl.h" |
| 6 | 6 |
| 7 #if defined(OS_LINUX) | 7 #if defined(OS_LINUX) |
| 8 #include <malloc.h> | 8 #include <malloc.h> |
| 9 #endif | 9 #endif |
| 10 | 10 |
| (...skipping 23 matching lines...) Expand all Loading... |
| 34 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginListBuilder.
h" | 34 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginListBuilder.
h" |
| 35 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScreenInfo.h" | 35 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScreenInfo.h" |
| 36 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h" | 36 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h" |
| 37 #include "third_party/WebKit/Source/WebKit/chromium/public/WebVector.h" | 37 #include "third_party/WebKit/Source/WebKit/chromium/public/WebVector.h" |
| 38 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h" | 38 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h" |
| 39 #include "webkit/glue/media/audio_decoder.h" | 39 #include "webkit/glue/media/audio_decoder.h" |
| 40 #include "webkit/plugins/npapi/plugin_instance.h" | 40 #include "webkit/plugins/npapi/plugin_instance.h" |
| 41 #include "webkit/plugins/webplugininfo.h" | 41 #include "webkit/plugins/webplugininfo.h" |
| 42 #include "webkit/glue/webkit_glue.h" | 42 #include "webkit/glue/webkit_glue.h" |
| 43 #include "webkit/glue/websocketstreamhandle_impl.h" | 43 #include "webkit/glue/websocketstreamhandle_impl.h" |
| 44 #include "webkit/glue/webthread_impl.h" |
| 44 #include "webkit/glue/weburlloader_impl.h" | 45 #include "webkit/glue/weburlloader_impl.h" |
| 45 | 46 |
| 46 #if defined(OS_LINUX) | 47 #if defined(OS_LINUX) |
| 47 #include "v8/include/v8.h" | 48 #include "v8/include/v8.h" |
| 48 #endif | 49 #endif |
| 49 | 50 |
| 50 using WebKit::WebAudioBus; | 51 using WebKit::WebAudioBus; |
| 51 using WebKit::WebCookie; | 52 using WebKit::WebCookie; |
| 52 using WebKit::WebData; | 53 using WebKit::WebData; |
| 53 using WebKit::WebLocalizedString; | 54 using WebKit::WebLocalizedString; |
| (...skipping 484 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 538 } | 539 } |
| 539 | 540 |
| 540 void WebKitClientImpl::stopSharedTimer() { | 541 void WebKitClientImpl::stopSharedTimer() { |
| 541 shared_timer_.Stop(); | 542 shared_timer_.Stop(); |
| 542 } | 543 } |
| 543 | 544 |
| 544 void WebKitClientImpl::callOnMainThread(void (*func)(void*), void* context) { | 545 void WebKitClientImpl::callOnMainThread(void (*func)(void*), void* context) { |
| 545 main_loop_->PostTask(FROM_HERE, NewRunnableFunction(func, context)); | 546 main_loop_->PostTask(FROM_HERE, NewRunnableFunction(func, context)); |
| 546 } | 547 } |
| 547 | 548 |
| 549 WebKit::WebThread* WebKitClientImpl::createThread(const char* name) { |
| 550 return new WebThreadImpl(name); |
| 551 } |
| 552 |
| 548 base::PlatformFile WebKitClientImpl::databaseOpenFile( | 553 base::PlatformFile WebKitClientImpl::databaseOpenFile( |
| 549 const WebKit::WebString& vfs_file_name, int desired_flags) { | 554 const WebKit::WebString& vfs_file_name, int desired_flags) { |
| 550 return base::kInvalidPlatformFileValue; | 555 return base::kInvalidPlatformFileValue; |
| 551 } | 556 } |
| 552 | 557 |
| 553 int WebKitClientImpl::databaseDeleteFile( | 558 int WebKitClientImpl::databaseDeleteFile( |
| 554 const WebKit::WebString& vfs_file_name, bool sync_dir) { | 559 const WebKit::WebString& vfs_file_name, bool sync_dir) { |
| 555 return -1; | 560 return -1; |
| 556 } | 561 } |
| 557 | 562 |
| (...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 654 if (--shared_timer_suspended_ == 0 && !shared_timer_.IsRunning()) | 659 if (--shared_timer_suspended_ == 0 && !shared_timer_.IsRunning()) |
| 655 #ifdef WEBKIT_USE_MONOTONIC_CLOCK_FOR_TIMER_SCHEDULING | 660 #ifdef WEBKIT_USE_MONOTONIC_CLOCK_FOR_TIMER_SCHEDULING |
| 656 setSharedTimerFireInterval( | 661 setSharedTimerFireInterval( |
| 657 monotonicallyIncreasingTime() - shared_timer_fire_time_); | 662 monotonicallyIncreasingTime() - shared_timer_fire_time_); |
| 658 #else | 663 #else |
| 659 setSharedTimerFireTime(shared_timer_fire_time_); | 664 setSharedTimerFireTime(shared_timer_fire_time_); |
| 660 #endif | 665 #endif |
| 661 } | 666 } |
| 662 | 667 |
| 663 } // namespace webkit_glue | 668 } // namespace webkit_glue |
| OLD | NEW |