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/glue/webkitplatformsupport_impl.h" | 5 #include "webkit/child/webkitplatformsupport_impl.h" |
6 | 6 |
7 #include <math.h> | 7 #include <math.h> |
8 | 8 |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
11 #include "base/allocator/allocator_extension.h" | 11 #include "base/allocator/allocator_extension.h" |
12 #include "base/bind.h" | 12 #include "base/bind.h" |
13 #include "base/files/file_path.h" | 13 #include "base/files/file_path.h" |
14 #include "base/memory/scoped_ptr.h" | 14 #include "base/memory/scoped_ptr.h" |
15 #include "base/memory/singleton.h" | 15 #include "base/memory/singleton.h" |
16 #include "base/message_loop/message_loop.h" | 16 #include "base/message_loop/message_loop.h" |
17 #include "base/metrics/histogram.h" | 17 #include "base/metrics/histogram.h" |
18 #include "base/metrics/sparse_histogram.h" | 18 #include "base/metrics/sparse_histogram.h" |
19 #include "base/metrics/stats_counters.h" | 19 #include "base/metrics/stats_counters.h" |
20 #include "base/platform_file.h" | 20 #include "base/platform_file.h" |
21 #include "base/process_util.h" | 21 #include "base/process_util.h" |
22 #include "base/rand_util.h" | 22 #include "base/rand_util.h" |
23 #include "base/strings/string_number_conversions.h" | 23 #include "base/strings/string_number_conversions.h" |
24 #include "base/strings/string_util.h" | 24 #include "base/strings/string_util.h" |
25 #include "base/strings/utf_string_conversions.h" | 25 #include "base/strings/utf_string_conversions.h" |
26 #include "base/synchronization/lock.h" | 26 #include "base/synchronization/lock.h" |
27 #include "base/sys_info.h" | 27 #include "base/sys_info.h" |
28 #include "base/time/time.h" | 28 #include "base/time/time.h" |
| 29 #include "content/public/common/webplugininfo.h" |
29 #include "grit/webkit_chromium_resources.h" | 30 #include "grit/webkit_chromium_resources.h" |
30 #include "grit/webkit_resources.h" | 31 #include "grit/webkit_resources.h" |
31 #include "grit/webkit_strings.h" | 32 #include "grit/webkit_strings.h" |
32 #include "net/base/data_url.h" | 33 #include "net/base/data_url.h" |
33 #include "net/base/mime_util.h" | 34 #include "net/base/mime_util.h" |
34 #include "net/base/net_errors.h" | 35 #include "net/base/net_errors.h" |
35 #include "third_party/WebKit/public/platform/WebCookie.h" | 36 #include "third_party/WebKit/public/platform/WebCookie.h" |
36 #include "third_party/WebKit/public/platform/WebData.h" | 37 #include "third_party/WebKit/public/platform/WebData.h" |
37 #include "third_party/WebKit/public/platform/WebDiscardableMemory.h" | 38 #include "third_party/WebKit/public/platform/WebDiscardableMemory.h" |
38 #include "third_party/WebKit/public/platform/WebGestureCurve.h" | 39 #include "third_party/WebKit/public/platform/WebGestureCurve.h" |
| 40 #include "third_party/WebKit/public/platform/WebPluginListBuilder.h" |
39 #include "third_party/WebKit/public/platform/WebString.h" | 41 #include "third_party/WebKit/public/platform/WebString.h" |
40 #include "third_party/WebKit/public/platform/WebURL.h" | 42 #include "third_party/WebKit/public/platform/WebURL.h" |
41 #include "third_party/WebKit/public/platform/WebVector.h" | 43 #include "third_party/WebKit/public/platform/WebVector.h" |
42 #include "third_party/WebKit/public/web/WebFrameClient.h" | 44 #include "third_party/WebKit/public/web/WebFrameClient.h" |
43 #include "third_party/WebKit/public/web/WebInputEvent.h" | 45 #include "third_party/WebKit/public/web/WebInputEvent.h" |
44 #include "third_party/WebKit/public/web/WebScreenInfo.h" | 46 #include "third_party/WebKit/public/web/WebScreenInfo.h" |
45 #include "third_party/tcmalloc/chromium/src/gperftools/heap-profiler.h" | 47 #include "third_party/tcmalloc/chromium/src/gperftools/heap-profiler.h" |
46 #include "ui/base/layout.h" | 48 #include "ui/base/layout.h" |
| 49 #include "webkit/child/webkit_child_helpers.h" |
| 50 #include "webkit/child/websocketstreamhandle_impl.h" |
| 51 #include "webkit/child/weburlloader_impl.h" |
47 #include "webkit/common/user_agent/user_agent.h" | 52 #include "webkit/common/user_agent/user_agent.h" |
48 #include "webkit/glue/webkit_glue.h" | 53 #include "webkit/glue/webkit_glue.h" |
49 #include "webkit/glue/websocketstreamhandle_impl.h" | |
50 #include "webkit/glue/weburlloader_impl.h" | |
51 | 54 |
52 using WebKit::WebAudioBus; | 55 using WebKit::WebAudioBus; |
53 using WebKit::WebCookie; | 56 using WebKit::WebCookie; |
54 using WebKit::WebData; | 57 using WebKit::WebData; |
55 using WebKit::WebLocalizedString; | 58 using WebKit::WebLocalizedString; |
56 using WebKit::WebPluginListBuilder; | 59 using WebKit::WebPluginListBuilder; |
57 using WebKit::WebString; | 60 using WebKit::WebString; |
58 using WebKit::WebSocketStreamHandle; | 61 using WebKit::WebSocketStreamHandle; |
59 using WebKit::WebURL; | 62 using WebKit::WebURL; |
60 using WebKit::WebURLError; | 63 using WebKit::WebURLError; |
(...skipping 831 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
892 if (--shared_timer_suspended_ == 0 && | 895 if (--shared_timer_suspended_ == 0 && |
893 (!shared_timer_.IsRunning() || | 896 (!shared_timer_.IsRunning() || |
894 shared_timer_fire_time_was_set_while_suspended_)) { | 897 shared_timer_fire_time_was_set_while_suspended_)) { |
895 shared_timer_fire_time_was_set_while_suspended_ = false; | 898 shared_timer_fire_time_was_set_while_suspended_ = false; |
896 setSharedTimerFireInterval( | 899 setSharedTimerFireInterval( |
897 shared_timer_fire_time_ - monotonicallyIncreasingTime()); | 900 shared_timer_fire_time_ - monotonicallyIncreasingTime()); |
898 } | 901 } |
899 } | 902 } |
900 | 903 |
901 } // namespace webkit_glue | 904 } // namespace webkit_glue |
OLD | NEW |