| 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 376 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 387 { "mediaplayerSoundNoneHover", IDR_MEDIAPLAYER_SOUND_NONE_BUTTON_HOVER }, | 387 { "mediaplayerSoundNoneHover", IDR_MEDIAPLAYER_SOUND_NONE_BUTTON_HOVER }, |
| 388 { "mediaplayerSoundNoneDown", IDR_MEDIAPLAYER_SOUND_NONE_BUTTON_DOWN }, | 388 { "mediaplayerSoundNoneDown", IDR_MEDIAPLAYER_SOUND_NONE_BUTTON_DOWN }, |
| 389 { "mediaplayerSliderThumb", IDR_MEDIAPLAYER_SLIDER_THUMB }, | 389 { "mediaplayerSliderThumb", IDR_MEDIAPLAYER_SLIDER_THUMB }, |
| 390 { "mediaplayerSliderThumbHover", IDR_MEDIAPLAYER_SLIDER_THUMB_HOVER }, | 390 { "mediaplayerSliderThumbHover", IDR_MEDIAPLAYER_SLIDER_THUMB_HOVER }, |
| 391 { "mediaplayerSliderThumbDown", IDR_MEDIAPLAYER_SLIDER_THUMB_DOWN }, | 391 { "mediaplayerSliderThumbDown", IDR_MEDIAPLAYER_SLIDER_THUMB_DOWN }, |
| 392 { "mediaplayerVolumeSliderThumb", IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB }, | 392 { "mediaplayerVolumeSliderThumb", IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB }, |
| 393 { "mediaplayerVolumeSliderThumbHover", | 393 { "mediaplayerVolumeSliderThumbHover", |
| 394 IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_HOVER }, | 394 IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_HOVER }, |
| 395 { "mediaplayerVolumeSliderThumbDown", | 395 { "mediaplayerVolumeSliderThumbDown", |
| 396 IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_DOWN }, | 396 IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_DOWN }, |
| 397 #if defined(OS_MACOSX) |
| 398 { "overhangPattern", IDR_OVERHANG_PATTERN }, |
| 399 #endif |
| 397 { "panIcon", IDR_PAN_SCROLL_ICON }, | 400 { "panIcon", IDR_PAN_SCROLL_ICON }, |
| 398 { "searchCancel", IDR_SEARCH_CANCEL }, | 401 { "searchCancel", IDR_SEARCH_CANCEL }, |
| 399 { "searchCancelPressed", IDR_SEARCH_CANCEL_PRESSED }, | 402 { "searchCancelPressed", IDR_SEARCH_CANCEL_PRESSED }, |
| 400 { "searchMagnifier", IDR_SEARCH_MAGNIFIER }, | 403 { "searchMagnifier", IDR_SEARCH_MAGNIFIER }, |
| 401 { "searchMagnifierResults", IDR_SEARCH_MAGNIFIER_RESULTS }, | 404 { "searchMagnifierResults", IDR_SEARCH_MAGNIFIER_RESULTS }, |
| 402 { "textAreaResizeCorner", IDR_TEXTAREA_RESIZER }, | 405 { "textAreaResizeCorner", IDR_TEXTAREA_RESIZER }, |
| 403 { "tickmarkDash", IDR_TICKMARK_DASH }, | 406 { "tickmarkDash", IDR_TICKMARK_DASH }, |
| 404 { "inputSpeech", IDR_INPUT_SPEECH }, | 407 { "inputSpeech", IDR_INPUT_SPEECH }, |
| 405 { "inputSpeechRecording", IDR_INPUT_SPEECH_RECORDING }, | 408 { "inputSpeechRecording", IDR_INPUT_SPEECH_RECORDING }, |
| 406 { "inputSpeechWaiting", IDR_INPUT_SPEECH_WAITING }, | 409 { "inputSpeechWaiting", IDR_INPUT_SPEECH_WAITING }, |
| (...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 649 if (--shared_timer_suspended_ == 0 && !shared_timer_.IsRunning()) | 652 if (--shared_timer_suspended_ == 0 && !shared_timer_.IsRunning()) |
| 650 #ifdef WEBKIT_USE_MONOTONIC_CLOCK_FOR_TIMER_SCHEDULING | 653 #ifdef WEBKIT_USE_MONOTONIC_CLOCK_FOR_TIMER_SCHEDULING |
| 651 setSharedTimerFireInterval( | 654 setSharedTimerFireInterval( |
| 652 monotonicallyIncreasingTime() - shared_timer_fire_time_); | 655 monotonicallyIncreasingTime() - shared_timer_fire_time_); |
| 653 #else | 656 #else |
| 654 setSharedTimerFireTime(shared_timer_fire_time_); | 657 setSharedTimerFireTime(shared_timer_fire_time_); |
| 655 #endif | 658 #endif |
| 656 } | 659 } |
| 657 | 660 |
| 658 } // namespace webkit_glue | 661 } // namespace webkit_glue |
| OLD | NEW |