Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(174)

Side by Side Diff: webkit/glue/webkitplatformsupport_impl.cc

Issue 7993004: Revert 102266 - Revert 102217 - Enable the Overhang pattern resource on TOUCH_UI builds. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « webkit/glue/webkit_resources.grd ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/webkitplatformsupport_impl.h" 5 #include "webkit/glue/webkitplatformsupport_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
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) 397 #if defined(OS_MACOSX) || defined(TOUCH_UI)
398 { "overhangPattern", IDR_OVERHANG_PATTERN }, 398 { "overhangPattern", IDR_OVERHANG_PATTERN },
399 #endif 399 #endif
400 { "panIcon", IDR_PAN_SCROLL_ICON }, 400 { "panIcon", IDR_PAN_SCROLL_ICON },
401 { "searchCancel", IDR_SEARCH_CANCEL }, 401 { "searchCancel", IDR_SEARCH_CANCEL },
402 { "searchCancelPressed", IDR_SEARCH_CANCEL_PRESSED }, 402 { "searchCancelPressed", IDR_SEARCH_CANCEL_PRESSED },
403 { "searchMagnifier", IDR_SEARCH_MAGNIFIER }, 403 { "searchMagnifier", IDR_SEARCH_MAGNIFIER },
404 { "searchMagnifierResults", IDR_SEARCH_MAGNIFIER_RESULTS }, 404 { "searchMagnifierResults", IDR_SEARCH_MAGNIFIER_RESULTS },
405 { "textAreaResizeCorner", IDR_TEXTAREA_RESIZER }, 405 { "textAreaResizeCorner", IDR_TEXTAREA_RESIZER },
406 { "tickmarkDash", IDR_TICKMARK_DASH }, 406 { "tickmarkDash", IDR_TICKMARK_DASH },
407 { "inputSpeech", IDR_INPUT_SPEECH }, 407 { "inputSpeech", IDR_INPUT_SPEECH },
(...skipping 243 matching lines...) Expand 10 before | Expand all | Expand 10 after
651 651
652 void WebKitPlatformSupportImpl::ResumeSharedTimer() { 652 void WebKitPlatformSupportImpl::ResumeSharedTimer() {
653 // The shared timer may have fired or been adjusted while we were suspended. 653 // The shared timer may have fired or been adjusted while we were suspended.
654 if (--shared_timer_suspended_ == 0 && !shared_timer_.IsRunning()) { 654 if (--shared_timer_suspended_ == 0 && !shared_timer_.IsRunning()) {
655 setSharedTimerFireInterval( 655 setSharedTimerFireInterval(
656 monotonicallyIncreasingTime() - shared_timer_fire_time_); 656 monotonicallyIncreasingTime() - shared_timer_fire_time_);
657 } 657 }
658 } 658 }
659 659
660 } // namespace webkit_glue 660 } // namespace webkit_glue
OLDNEW
« no previous file with comments | « webkit/glue/webkit_resources.grd ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698