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 344 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
355 } resources[] = { | 355 } resources[] = { |
356 { "missingImage", IDR_BROKENIMAGE }, | 356 { "missingImage", IDR_BROKENIMAGE }, |
357 { "mediaPause", IDR_MEDIA_PAUSE_BUTTON }, | 357 { "mediaPause", IDR_MEDIA_PAUSE_BUTTON }, |
358 { "mediaPlay", IDR_MEDIA_PLAY_BUTTON }, | 358 { "mediaPlay", IDR_MEDIA_PLAY_BUTTON }, |
359 { "mediaPlayDisabled", IDR_MEDIA_PLAY_BUTTON_DISABLED }, | 359 { "mediaPlayDisabled", IDR_MEDIA_PLAY_BUTTON_DISABLED }, |
360 { "mediaSoundDisabled", IDR_MEDIA_SOUND_DISABLED }, | 360 { "mediaSoundDisabled", IDR_MEDIA_SOUND_DISABLED }, |
361 { "mediaSoundFull", IDR_MEDIA_SOUND_FULL_BUTTON }, | 361 { "mediaSoundFull", IDR_MEDIA_SOUND_FULL_BUTTON }, |
362 { "mediaSoundNone", IDR_MEDIA_SOUND_NONE_BUTTON }, | 362 { "mediaSoundNone", IDR_MEDIA_SOUND_NONE_BUTTON }, |
363 { "mediaSliderThumb", IDR_MEDIA_SLIDER_THUMB }, | 363 { "mediaSliderThumb", IDR_MEDIA_SLIDER_THUMB }, |
364 { "mediaVolumeSliderThumb", IDR_MEDIA_VOLUME_SLIDER_THUMB }, | 364 { "mediaVolumeSliderThumb", IDR_MEDIA_VOLUME_SLIDER_THUMB }, |
| 365 { "mediaplayerPause", IDR_MEDIAPLAYER_PAUSE_BUTTON }, |
| 366 { "mediaplayerPauseHover", IDR_MEDIAPLAYER_PAUSE_BUTTON_HOVER }, |
| 367 { "mediaplayerPauseDown", IDR_MEDIAPLAYER_PAUSE_BUTTON_DOWN }, |
| 368 { "mediaplayerPlay", IDR_MEDIAPLAYER_PLAY_BUTTON }, |
| 369 { "mediaplayerPlayHover", IDR_MEDIAPLAYER_PLAY_BUTTON_HOVER }, |
| 370 { "mediaplayerPlayDown", IDR_MEDIAPLAYER_PLAY_BUTTON_DOWN }, |
| 371 { "mediaplayerPlayDisabled", IDR_MEDIAPLAYER_PLAY_BUTTON_DISABLED }, |
| 372 { "mediaplayerSoundDisabled", IDR_MEDIAPLAYER_SOUND_DISABLED }, |
| 373 { "mediaplayerSoundFull", IDR_MEDIAPLAYER_SOUND_FULL_BUTTON }, |
| 374 { "mediaplayerSoundFullHover", IDR_MEDIAPLAYER_SOUND_FULL_BUTTON_HOVER }, |
| 375 { "mediaplayerSoundFullDown", IDR_MEDIAPLAYER_SOUND_FULL_BUTTON_DOWN }, |
| 376 { "mediaplayerSoundLevel2", IDR_MEDIAPLAYER_SOUND_LEVEL2_BUTTON }, |
| 377 { "mediaplayerSoundLevel2Hover", |
| 378 IDR_MEDIAPLAYER_SOUND_LEVEL2_BUTTON_HOVER }, |
| 379 { "mediaplayerSoundLevel2Down", IDR_MEDIAPLAYER_SOUND_LEVEL2_BUTTON_DOWN }, |
| 380 { "mediaplayerSoundLevel1", IDR_MEDIAPLAYER_SOUND_LEVEL1_BUTTON }, |
| 381 { "mediaplayerSoundLevel1Hover", |
| 382 IDR_MEDIAPLAYER_SOUND_LEVEL1_BUTTON_HOVER }, |
| 383 { "mediaplayerSoundLevel1Down", IDR_MEDIAPLAYER_SOUND_LEVEL1_BUTTON_DOWN }, |
| 384 { "mediaplayerSoundNone", IDR_MEDIAPLAYER_SOUND_NONE_BUTTON }, |
| 385 { "mediaplayerSoundNoneHover", IDR_MEDIAPLAYER_SOUND_NONE_BUTTON_HOVER }, |
| 386 { "mediaplayerSoundNoneDown", IDR_MEDIAPLAYER_SOUND_NONE_BUTTON_DOWN }, |
| 387 { "mediaplayerSliderThumb", IDR_MEDIAPLAYER_SLIDER_THUMB }, |
| 388 { "mediaplayerSliderThumbHover", IDR_MEDIAPLAYER_SLIDER_THUMB_HOVER }, |
| 389 { "mediaplayerSliderThumbDown", IDR_MEDIAPLAYER_SLIDER_THUMB_DOWN }, |
| 390 { "mediaplayerVolumeSliderThumb", IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB }, |
| 391 { "mediaplayerVolumeSliderThumbHover", |
| 392 IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_HOVER }, |
| 393 { "mediaplayerVolumeSliderThumbDown", |
| 394 IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_DOWN }, |
365 { "panIcon", IDR_PAN_SCROLL_ICON }, | 395 { "panIcon", IDR_PAN_SCROLL_ICON }, |
366 { "searchCancel", IDR_SEARCH_CANCEL }, | 396 { "searchCancel", IDR_SEARCH_CANCEL }, |
367 { "searchCancelPressed", IDR_SEARCH_CANCEL_PRESSED }, | 397 { "searchCancelPressed", IDR_SEARCH_CANCEL_PRESSED }, |
368 { "searchMagnifier", IDR_SEARCH_MAGNIFIER }, | 398 { "searchMagnifier", IDR_SEARCH_MAGNIFIER }, |
369 { "searchMagnifierResults", IDR_SEARCH_MAGNIFIER_RESULTS }, | 399 { "searchMagnifierResults", IDR_SEARCH_MAGNIFIER_RESULTS }, |
370 { "textAreaResizeCorner", IDR_TEXTAREA_RESIZER }, | 400 { "textAreaResizeCorner", IDR_TEXTAREA_RESIZER }, |
371 { "tickmarkDash", IDR_TICKMARK_DASH }, | 401 { "tickmarkDash", IDR_TICKMARK_DASH }, |
372 { "inputSpeech", IDR_INPUT_SPEECH }, | 402 { "inputSpeech", IDR_INPUT_SPEECH }, |
373 { "inputSpeechRecording", IDR_INPUT_SPEECH_RECORDING }, | 403 { "inputSpeechRecording", IDR_INPUT_SPEECH_RECORDING }, |
374 { "inputSpeechWaiting", IDR_INPUT_SPEECH_WAITING }, | 404 { "inputSpeechWaiting", IDR_INPUT_SPEECH_WAITING }, |
(...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
599 ++shared_timer_suspended_; | 629 ++shared_timer_suspended_; |
600 } | 630 } |
601 | 631 |
602 void WebKitClientImpl::ResumeSharedTimer() { | 632 void WebKitClientImpl::ResumeSharedTimer() { |
603 // The shared timer may have fired or been adjusted while we were suspended. | 633 // The shared timer may have fired or been adjusted while we were suspended. |
604 if (--shared_timer_suspended_ == 0 && !shared_timer_.IsRunning()) | 634 if (--shared_timer_suspended_ == 0 && !shared_timer_.IsRunning()) |
605 setSharedTimerFireTime(shared_timer_fire_time_); | 635 setSharedTimerFireTime(shared_timer_fire_time_); |
606 } | 636 } |
607 | 637 |
608 } // namespace webkit_glue | 638 } // namespace webkit_glue |
OLD | NEW |