| OLD | NEW | 
|---|
| 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/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 26 matching lines...) Expand all  Loading... | 
| 37 #include "webkit/glue/plugins/plugin_instance.h" | 37 #include "webkit/glue/plugins/plugin_instance.h" | 
| 38 #include "webkit/glue/plugins/webplugininfo.h" | 38 #include "webkit/glue/plugins/webplugininfo.h" | 
| 39 #include "webkit/glue/webkit_glue.h" | 39 #include "webkit/glue/webkit_glue.h" | 
| 40 #include "webkit/glue/websocketstreamhandle_impl.h" | 40 #include "webkit/glue/websocketstreamhandle_impl.h" | 
| 41 #include "webkit/glue/weburlloader_impl.h" | 41 #include "webkit/glue/weburlloader_impl.h" | 
| 42 | 42 | 
| 43 #if defined(OS_LINUX) | 43 #if defined(OS_LINUX) | 
| 44 #include "v8/include/v8.h" | 44 #include "v8/include/v8.h" | 
| 45 #endif | 45 #endif | 
| 46 | 46 | 
| 47 using WebKit::WebApplicationCacheHost; |  | 
| 48 using WebKit::WebApplicationCacheHostClient; |  | 
| 49 using WebKit::WebCookie; | 47 using WebKit::WebCookie; | 
| 50 using WebKit::WebData; | 48 using WebKit::WebData; | 
| 51 using WebKit::WebLocalizedString; | 49 using WebKit::WebLocalizedString; | 
| 52 using WebKit::WebPluginListBuilder; | 50 using WebKit::WebPluginListBuilder; | 
| 53 using WebKit::WebString; | 51 using WebKit::WebString; | 
| 54 using WebKit::WebSocketStreamHandle; | 52 using WebKit::WebSocketStreamHandle; | 
| 55 using WebKit::WebThemeEngine; | 53 using WebKit::WebThemeEngine; | 
| 56 using WebKit::WebURL; | 54 using WebKit::WebURL; | 
| 57 using WebKit::WebURLLoader; | 55 using WebKit::WebURLLoader; | 
| 58 using WebKit::WebVector; | 56 using WebKit::WebVector; | 
| (...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 163   return -1; | 161   return -1; | 
| 164 } | 162 } | 
| 165 | 163 | 
| 166 WebKitClientImpl::WebKitClientImpl() | 164 WebKitClientImpl::WebKitClientImpl() | 
| 167     : main_loop_(MessageLoop::current()), | 165     : main_loop_(MessageLoop::current()), | 
| 168       shared_timer_func_(NULL), | 166       shared_timer_func_(NULL), | 
| 169       shared_timer_fire_time_(0.0), | 167       shared_timer_fire_time_(0.0), | 
| 170       shared_timer_suspended_(0) { | 168       shared_timer_suspended_(0) { | 
| 171 } | 169 } | 
| 172 | 170 | 
| 173 WebApplicationCacheHost* WebKitClientImpl::createApplicationCacheHost( |  | 
| 174     WebApplicationCacheHostClient*) { |  | 
| 175   return NULL; |  | 
| 176 } |  | 
| 177 |  | 
| 178 WebThemeEngine* WebKitClientImpl::themeEngine() { | 171 WebThemeEngine* WebKitClientImpl::themeEngine() { | 
| 179 #if defined(OS_WIN) | 172 #if defined(OS_WIN) | 
| 180   return &theme_engine_; | 173   return &theme_engine_; | 
| 181 #else | 174 #else | 
| 182   return NULL; | 175   return NULL; | 
| 183 #endif | 176 #endif | 
| 184 } | 177 } | 
| 185 | 178 | 
| 186 WebURLLoader* WebKitClientImpl::createURLLoader() { | 179 WebURLLoader* WebKitClientImpl::createURLLoader() { | 
| 187   return new WebURLLoaderImpl(); | 180   return new WebURLLoaderImpl(); | 
| (...skipping 312 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 500   ++shared_timer_suspended_; | 493   ++shared_timer_suspended_; | 
| 501 } | 494 } | 
| 502 | 495 | 
| 503 void WebKitClientImpl::ResumeSharedTimer() { | 496 void WebKitClientImpl::ResumeSharedTimer() { | 
| 504   // The shared timer may have fired or been adjusted while we were suspended. | 497   // The shared timer may have fired or been adjusted while we were suspended. | 
| 505   if (--shared_timer_suspended_ == 0 && !shared_timer_.IsRunning()) | 498   if (--shared_timer_suspended_ == 0 && !shared_timer_.IsRunning()) | 
| 506     setSharedTimerFireTime(shared_timer_fire_time_); | 499     setSharedTimerFireTime(shared_timer_fire_time_); | 
| 507 } | 500 } | 
| 508 | 501 | 
| 509 }  // namespace webkit_glue | 502 }  // namespace webkit_glue | 
| OLD | NEW | 
|---|