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 186 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
197 : main_loop_(MessageLoop::current()), | 197 : main_loop_(MessageLoop::current()), |
198 shared_timer_func_(NULL), | 198 shared_timer_func_(NULL), |
199 shared_timer_fire_time_(0.0), | 199 shared_timer_fire_time_(0.0), |
200 shared_timer_suspended_(0) { | 200 shared_timer_suspended_(0) { |
201 } | 201 } |
202 | 202 |
203 WebKitClientImpl::~WebKitClientImpl() { | 203 WebKitClientImpl::~WebKitClientImpl() { |
204 } | 204 } |
205 | 205 |
206 WebThemeEngine* WebKitClientImpl::themeEngine() { | 206 WebThemeEngine* WebKitClientImpl::themeEngine() { |
207 #if defined(OS_WIN) || defined(OS_LINUX) | 207 #if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) |
208 return &theme_engine_; | 208 return &theme_engine_; |
209 #else | 209 #else |
210 return NULL; | 210 return NULL; |
211 #endif | 211 #endif |
212 } | 212 } |
213 | 213 |
214 WebURLLoader* WebKitClientImpl::createURLLoader() { | 214 WebURLLoader* WebKitClientImpl::createURLLoader() { |
215 return new WebURLLoaderImpl(); | 215 return new WebURLLoaderImpl(); |
216 } | 216 } |
217 | 217 |
(...skipping 321 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
539 ++shared_timer_suspended_; | 539 ++shared_timer_suspended_; |
540 } | 540 } |
541 | 541 |
542 void WebKitClientImpl::ResumeSharedTimer() { | 542 void WebKitClientImpl::ResumeSharedTimer() { |
543 // The shared timer may have fired or been adjusted while we were suspended. | 543 // The shared timer may have fired or been adjusted while we were suspended. |
544 if (--shared_timer_suspended_ == 0 && !shared_timer_.IsRunning()) | 544 if (--shared_timer_suspended_ == 0 && !shared_timer_.IsRunning()) |
545 setSharedTimerFireTime(shared_timer_fire_time_); | 545 setSharedTimerFireTime(shared_timer_fire_time_); |
546 } | 546 } |
547 | 547 |
548 } // namespace webkit_glue | 548 } // namespace webkit_glue |
OLD | NEW |