| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "content/child/blink_platform_impl.h" | 5 #include "content/child/blink_platform_impl.h" |
| 6 | 6 |
| 7 #include <math.h> | 7 #include <math.h> |
| 8 | 8 |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 716 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 727 { "mediaplayerClosedCaptionDisabled", | 727 { "mediaplayerClosedCaptionDisabled", |
| 728 IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_DISABLED, ui::SCALE_FACTOR_100P }, | 728 IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_DISABLED, ui::SCALE_FACTOR_100P }, |
| 729 { "mediaplayerFullscreen", | 729 { "mediaplayerFullscreen", |
| 730 IDR_MEDIAPLAYER_FULLSCREEN_BUTTON, ui::SCALE_FACTOR_100P }, | 730 IDR_MEDIAPLAYER_FULLSCREEN_BUTTON, ui::SCALE_FACTOR_100P }, |
| 731 { "mediaplayerFullscreenHover", | 731 { "mediaplayerFullscreenHover", |
| 732 IDR_MEDIAPLAYER_FULLSCREEN_BUTTON_HOVER, ui::SCALE_FACTOR_100P }, | 732 IDR_MEDIAPLAYER_FULLSCREEN_BUTTON_HOVER, ui::SCALE_FACTOR_100P }, |
| 733 { "mediaplayerFullscreenDown", | 733 { "mediaplayerFullscreenDown", |
| 734 IDR_MEDIAPLAYER_FULLSCREEN_BUTTON_DOWN, ui::SCALE_FACTOR_100P }, | 734 IDR_MEDIAPLAYER_FULLSCREEN_BUTTON_DOWN, ui::SCALE_FACTOR_100P }, |
| 735 { "mediaplayerFullscreenDisabled", | 735 { "mediaplayerFullscreenDisabled", |
| 736 IDR_MEDIAPLAYER_FULLSCREEN_BUTTON_DISABLED, ui::SCALE_FACTOR_100P }, | 736 IDR_MEDIAPLAYER_FULLSCREEN_BUTTON_DISABLED, ui::SCALE_FACTOR_100P }, |
| 737 #if defined(OS_ANDROID) | |
| 738 { "mediaplayerOverlayPlay", | 737 { "mediaplayerOverlayPlay", |
| 739 IDR_MEDIAPLAYER_OVERLAY_PLAY_BUTTON, ui::SCALE_FACTOR_100P }, | 738 IDR_MEDIAPLAYER_OVERLAY_PLAY_BUTTON, ui::SCALE_FACTOR_100P }, |
| 740 #endif | |
| 741 #if defined(OS_MACOSX) | 739 #if defined(OS_MACOSX) |
| 742 { "overhangPattern", IDR_OVERHANG_PATTERN, ui::SCALE_FACTOR_100P }, | 740 { "overhangPattern", IDR_OVERHANG_PATTERN, ui::SCALE_FACTOR_100P }, |
| 743 { "overhangShadow", IDR_OVERHANG_SHADOW, ui::SCALE_FACTOR_100P }, | 741 { "overhangShadow", IDR_OVERHANG_SHADOW, ui::SCALE_FACTOR_100P }, |
| 744 #endif | 742 #endif |
| 745 { "panIcon", IDR_PAN_SCROLL_ICON, ui::SCALE_FACTOR_100P }, | 743 { "panIcon", IDR_PAN_SCROLL_ICON, ui::SCALE_FACTOR_100P }, |
| 746 { "searchCancel", IDR_SEARCH_CANCEL, ui::SCALE_FACTOR_100P }, | 744 { "searchCancel", IDR_SEARCH_CANCEL, ui::SCALE_FACTOR_100P }, |
| 747 { "searchCancelPressed", IDR_SEARCH_CANCEL_PRESSED, ui::SCALE_FACTOR_100P }, | 745 { "searchCancelPressed", IDR_SEARCH_CANCEL_PRESSED, ui::SCALE_FACTOR_100P }, |
| 748 { "searchMagnifier", IDR_SEARCH_MAGNIFIER, ui::SCALE_FACTOR_100P }, | 746 { "searchMagnifier", IDR_SEARCH_MAGNIFIER, ui::SCALE_FACTOR_100P }, |
| 749 { "searchMagnifierResults", | 747 { "searchMagnifierResults", |
| 750 IDR_SEARCH_MAGNIFIER_RESULTS, ui::SCALE_FACTOR_100P }, | 748 IDR_SEARCH_MAGNIFIER_RESULTS, ui::SCALE_FACTOR_100P }, |
| (...skipping 348 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1099 } | 1097 } |
| 1100 | 1098 |
| 1101 // static | 1099 // static |
| 1102 void BlinkPlatformImpl::DestroyCurrentThread(void* thread) { | 1100 void BlinkPlatformImpl::DestroyCurrentThread(void* thread) { |
| 1103 WebThreadImplForMessageLoop* impl = | 1101 WebThreadImplForMessageLoop* impl = |
| 1104 static_cast<WebThreadImplForMessageLoop*>(thread); | 1102 static_cast<WebThreadImplForMessageLoop*>(thread); |
| 1105 delete impl; | 1103 delete impl; |
| 1106 } | 1104 } |
| 1107 | 1105 |
| 1108 } // namespace content | 1106 } // namespace content |
| OLD | NEW |