| 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 236 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 247 { "mediaPause", IDR_MEDIA_PAUSE_BUTTON }, | 247 { "mediaPause", IDR_MEDIA_PAUSE_BUTTON }, |
| 248 { "mediaSoundFull", IDR_MEDIA_SOUND_FULL_BUTTON }, | 248 { "mediaSoundFull", IDR_MEDIA_SOUND_FULL_BUTTON }, |
| 249 { "mediaSoundNone", IDR_MEDIA_SOUND_NONE_BUTTON }, | 249 { "mediaSoundNone", IDR_MEDIA_SOUND_NONE_BUTTON }, |
| 250 { "mediaSoundDisabled", IDR_MEDIA_SOUND_DISABLED }, | 250 { "mediaSoundDisabled", IDR_MEDIA_SOUND_DISABLED }, |
| 251 { "mediaSliderThumb", IDR_MEDIA_SLIDER_THUMB }, | 251 { "mediaSliderThumb", IDR_MEDIA_SLIDER_THUMB }, |
| 252 { "mediaVolumeSliderThumb", IDR_MEDIA_VOLUME_SLIDER_THUMB }, | 252 { "mediaVolumeSliderThumb", IDR_MEDIA_VOLUME_SLIDER_THUMB }, |
| 253 #if defined(OS_POSIX) && !defined(OS_MACOSX) | 253 #if defined(OS_POSIX) && !defined(OS_MACOSX) |
| 254 // TODO(port): rename these to "skia" instead of "Linux". | 254 // TODO(port): rename these to "skia" instead of "Linux". |
| 255 { "linuxCheckboxOff", IDR_LINUX_CHECKBOX_OFF }, | 255 { "linuxCheckboxOff", IDR_LINUX_CHECKBOX_OFF }, |
| 256 { "linuxCheckboxOn", IDR_LINUX_CHECKBOX_ON }, | 256 { "linuxCheckboxOn", IDR_LINUX_CHECKBOX_ON }, |
| 257 { "linuxCheckboxIndeterminate", IDR_LINUX_CHECKBOX_INDETERMINATE }, |
| 257 { "linuxCheckboxDisabledOff", IDR_LINUX_CHECKBOX_DISABLED_OFF }, | 258 { "linuxCheckboxDisabledOff", IDR_LINUX_CHECKBOX_DISABLED_OFF }, |
| 258 { "linuxCheckboxDisabledOn", IDR_LINUX_CHECKBOX_DISABLED_ON }, | 259 { "linuxCheckboxDisabledOn", IDR_LINUX_CHECKBOX_DISABLED_ON }, |
| 260 { "linuxCheckboxDisabledIndeterminate", |
| 261 IDR_LINUX_CHECKBOX_DISABLED_INDETERMINATE }, |
| 259 { "linuxRadioOff", IDR_LINUX_RADIO_OFF }, | 262 { "linuxRadioOff", IDR_LINUX_RADIO_OFF }, |
| 260 { "linuxRadioOn", IDR_LINUX_RADIO_ON }, | 263 { "linuxRadioOn", IDR_LINUX_RADIO_ON }, |
| 261 { "linuxRadioDisabledOff", IDR_LINUX_RADIO_DISABLED_OFF }, | 264 { "linuxRadioDisabledOff", IDR_LINUX_RADIO_DISABLED_OFF }, |
| 262 { "linuxRadioDisabledOn", IDR_LINUX_RADIO_DISABLED_ON }, | 265 { "linuxRadioDisabledOn", IDR_LINUX_RADIO_DISABLED_ON }, |
| 263 { "linuxProgressBar", IDR_PROGRESS_BAR }, | 266 { "linuxProgressBar", IDR_PROGRESS_BAR }, |
| 264 { "linuxProgressValue", IDR_PROGRESS_VALUE }, | 267 { "linuxProgressValue", IDR_PROGRESS_VALUE }, |
| 265 { "linuxProgressBorderLeft", IDR_PROGRESS_BORDER_LEFT }, | 268 { "linuxProgressBorderLeft", IDR_PROGRESS_BORDER_LEFT }, |
| 266 { "linuxProgressBorderRight", IDR_PROGRESS_BORDER_RIGHT }, | 269 { "linuxProgressBorderRight", IDR_PROGRESS_BORDER_RIGHT }, |
| 267 #endif | 270 #endif |
| 268 }; | 271 }; |
| (...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 425 ++shared_timer_suspended_; | 428 ++shared_timer_suspended_; |
| 426 } | 429 } |
| 427 | 430 |
| 428 void WebKitClientImpl::ResumeSharedTimer() { | 431 void WebKitClientImpl::ResumeSharedTimer() { |
| 429 // The shared timer may have fired or been adjusted while we were suspended. | 432 // The shared timer may have fired or been adjusted while we were suspended. |
| 430 if (--shared_timer_suspended_ == 0 && !shared_timer_.IsRunning()) | 433 if (--shared_timer_suspended_ == 0 && !shared_timer_.IsRunning()) |
| 431 setSharedTimerFireTime(shared_timer_fire_time_); | 434 setSharedTimerFireTime(shared_timer_fire_time_); |
| 432 } | 435 } |
| 433 | 436 |
| 434 } // namespace webkit_glue | 437 } // namespace webkit_glue |
| OLD | NEW |