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

Side by Side Diff: content/child/blink_platform_impl.cc

Issue 1033733004: Part 3 of 4: Modify blink users so they use the image resources in blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix 100/200 percent packs. Created 5 years, 9 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
OLDNEW
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 720 matching lines...) Expand 10 before | Expand all | Expand 10 after
731 return WebData(); 731 return WebData();
732 } 732 }
733 733
734 struct DataResource { 734 struct DataResource {
735 const char* name; 735 const char* name;
736 int id; 736 int id;
737 ui::ScaleFactor scale_factor; 737 ui::ScaleFactor scale_factor;
738 }; 738 };
739 739
740 const DataResource kDataResources[] = { 740 const DataResource kDataResources[] = {
741 { "missingImage", IDR2_BROKENIMAGE, ui::SCALE_FACTOR_100P }, 741 { "missingImage", IDR_BROKENIMAGE, ui::SCALE_FACTOR_100P },
742 { "missingImage@2x", IDR2_BROKENIMAGE, ui::SCALE_FACTOR_200P }, 742 { "missingImage@2x", IDR_BROKENIMAGE, ui::SCALE_FACTOR_200P },
743 { "mediaplayerPause", IDR2_MEDIAPLAYER_PAUSE_BUTTON, ui::SCALE_FACTOR_100P }, 743 { "mediaplayerPause", IDR_MEDIAPLAYER_PAUSE_BUTTON, ui::SCALE_FACTOR_100P },
744 { "mediaplayerPauseHover", 744 { "mediaplayerPauseHover",
745 IDR2_MEDIAPLAYER_PAUSE_BUTTON_HOVER, ui::SCALE_FACTOR_100P }, 745 IDR_MEDIAPLAYER_PAUSE_BUTTON_HOVER, ui::SCALE_FACTOR_100P },
746 { "mediaplayerPauseDown", 746 { "mediaplayerPauseDown",
747 IDR2_MEDIAPLAYER_PAUSE_BUTTON_DOWN, ui::SCALE_FACTOR_100P }, 747 IDR_MEDIAPLAYER_PAUSE_BUTTON_DOWN, ui::SCALE_FACTOR_100P },
748 { "mediaplayerPlay", IDR2_MEDIAPLAYER_PLAY_BUTTON, ui::SCALE_FACTOR_100P }, 748 { "mediaplayerPlay", IDR_MEDIAPLAYER_PLAY_BUTTON, ui::SCALE_FACTOR_100P },
749 { "mediaplayerPlayHover", 749 { "mediaplayerPlayHover",
750 IDR2_MEDIAPLAYER_PLAY_BUTTON_HOVER, ui::SCALE_FACTOR_100P }, 750 IDR_MEDIAPLAYER_PLAY_BUTTON_HOVER, ui::SCALE_FACTOR_100P },
751 { "mediaplayerPlayDown", 751 { "mediaplayerPlayDown",
752 IDR2_MEDIAPLAYER_PLAY_BUTTON_DOWN, ui::SCALE_FACTOR_100P }, 752 IDR_MEDIAPLAYER_PLAY_BUTTON_DOWN, ui::SCALE_FACTOR_100P },
753 { "mediaplayerPlayDisabled", 753 { "mediaplayerPlayDisabled",
754 IDR2_MEDIAPLAYER_PLAY_BUTTON_DISABLED, ui::SCALE_FACTOR_100P }, 754 IDR_MEDIAPLAYER_PLAY_BUTTON_DISABLED, ui::SCALE_FACTOR_100P },
755 { "mediaplayerSoundLevel3", 755 { "mediaplayerSoundLevel3",
756 IDR2_MEDIAPLAYER_SOUND_LEVEL3_BUTTON, ui::SCALE_FACTOR_100P }, 756 IDR_MEDIAPLAYER_SOUND_LEVEL3_BUTTON, ui::SCALE_FACTOR_100P },
757 { "mediaplayerSoundLevel3Hover", 757 { "mediaplayerSoundLevel3Hover",
758 IDR2_MEDIAPLAYER_SOUND_LEVEL3_BUTTON_HOVER, ui::SCALE_FACTOR_100P }, 758 IDR_MEDIAPLAYER_SOUND_LEVEL3_BUTTON_HOVER, ui::SCALE_FACTOR_100P },
759 { "mediaplayerSoundLevel3Down", 759 { "mediaplayerSoundLevel3Down",
760 IDR2_MEDIAPLAYER_SOUND_LEVEL3_BUTTON_DOWN, ui::SCALE_FACTOR_100P }, 760 IDR_MEDIAPLAYER_SOUND_LEVEL3_BUTTON_DOWN, ui::SCALE_FACTOR_100P },
761 { "mediaplayerSoundLevel2", 761 { "mediaplayerSoundLevel2",
762 IDR2_MEDIAPLAYER_SOUND_LEVEL2_BUTTON, ui::SCALE_FACTOR_100P }, 762 IDR_MEDIAPLAYER_SOUND_LEVEL2_BUTTON, ui::SCALE_FACTOR_100P },
763 { "mediaplayerSoundLevel2Hover", 763 { "mediaplayerSoundLevel2Hover",
764 IDR2_MEDIAPLAYER_SOUND_LEVEL2_BUTTON_HOVER, ui::SCALE_FACTOR_100P }, 764 IDR_MEDIAPLAYER_SOUND_LEVEL2_BUTTON_HOVER, ui::SCALE_FACTOR_100P },
765 { "mediaplayerSoundLevel2Down", 765 { "mediaplayerSoundLevel2Down",
766 IDR2_MEDIAPLAYER_SOUND_LEVEL2_BUTTON_DOWN, ui::SCALE_FACTOR_100P }, 766 IDR_MEDIAPLAYER_SOUND_LEVEL2_BUTTON_DOWN, ui::SCALE_FACTOR_100P },
767 { "mediaplayerSoundLevel1", 767 { "mediaplayerSoundLevel1",
768 IDR2_MEDIAPLAYER_SOUND_LEVEL1_BUTTON, ui::SCALE_FACTOR_100P }, 768 IDR_MEDIAPLAYER_SOUND_LEVEL1_BUTTON, ui::SCALE_FACTOR_100P },
769 { "mediaplayerSoundLevel1Hover", 769 { "mediaplayerSoundLevel1Hover",
770 IDR2_MEDIAPLAYER_SOUND_LEVEL1_BUTTON_HOVER, ui::SCALE_FACTOR_100P }, 770 IDR_MEDIAPLAYER_SOUND_LEVEL1_BUTTON_HOVER, ui::SCALE_FACTOR_100P },
771 { "mediaplayerSoundLevel1Down", 771 { "mediaplayerSoundLevel1Down",
772 IDR2_MEDIAPLAYER_SOUND_LEVEL1_BUTTON_DOWN, ui::SCALE_FACTOR_100P }, 772 IDR_MEDIAPLAYER_SOUND_LEVEL1_BUTTON_DOWN, ui::SCALE_FACTOR_100P },
773 { "mediaplayerSoundLevel0", 773 { "mediaplayerSoundLevel0",
774 IDR2_MEDIAPLAYER_SOUND_LEVEL0_BUTTON, ui::SCALE_FACTOR_100P }, 774 IDR_MEDIAPLAYER_SOUND_LEVEL0_BUTTON, ui::SCALE_FACTOR_100P },
775 { "mediaplayerSoundLevel0Hover", 775 { "mediaplayerSoundLevel0Hover",
776 IDR2_MEDIAPLAYER_SOUND_LEVEL0_BUTTON_HOVER, ui::SCALE_FACTOR_100P }, 776 IDR_MEDIAPLAYER_SOUND_LEVEL0_BUTTON_HOVER, ui::SCALE_FACTOR_100P },
777 { "mediaplayerSoundLevel0Down", 777 { "mediaplayerSoundLevel0Down",
778 IDR2_MEDIAPLAYER_SOUND_LEVEL0_BUTTON_DOWN, ui::SCALE_FACTOR_100P }, 778 IDR_MEDIAPLAYER_SOUND_LEVEL0_BUTTON_DOWN, ui::SCALE_FACTOR_100P },
779 { "mediaplayerSoundDisabled", 779 { "mediaplayerSoundDisabled",
780 IDR2_MEDIAPLAYER_SOUND_DISABLED, ui::SCALE_FACTOR_100P }, 780 IDR_MEDIAPLAYER_SOUND_DISABLED, ui::SCALE_FACTOR_100P },
781 { "mediaplayerSliderThumb", 781 { "mediaplayerSliderThumb",
782 IDR2_MEDIAPLAYER_SLIDER_THUMB, ui::SCALE_FACTOR_100P }, 782 IDR_MEDIAPLAYER_SLIDER_THUMB, ui::SCALE_FACTOR_100P },
783 { "mediaplayerSliderThumbHover", 783 { "mediaplayerSliderThumbHover",
784 IDR2_MEDIAPLAYER_SLIDER_THUMB_HOVER, ui::SCALE_FACTOR_100P }, 784 IDR_MEDIAPLAYER_SLIDER_THUMB_HOVER, ui::SCALE_FACTOR_100P },
785 { "mediaplayerSliderThumbDown", 785 { "mediaplayerSliderThumbDown",
786 IDR2_MEDIAPLAYER_SLIDER_THUMB_DOWN, ui::SCALE_FACTOR_100P }, 786 IDR_MEDIAPLAYER_SLIDER_THUMB_DOWN, ui::SCALE_FACTOR_100P },
787 { "mediaplayerVolumeSliderThumb", 787 { "mediaplayerVolumeSliderThumb",
788 IDR2_MEDIAPLAYER_VOLUME_SLIDER_THUMB, ui::SCALE_FACTOR_100P }, 788 IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB, ui::SCALE_FACTOR_100P },
789 { "mediaplayerVolumeSliderThumbHover", 789 { "mediaplayerVolumeSliderThumbHover",
790 IDR2_MEDIAPLAYER_VOLUME_SLIDER_THUMB_HOVER, ui::SCALE_FACTOR_100P }, 790 IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_HOVER, ui::SCALE_FACTOR_100P },
791 { "mediaplayerVolumeSliderThumbDown", 791 { "mediaplayerVolumeSliderThumbDown",
792 IDR2_MEDIAPLAYER_VOLUME_SLIDER_THUMB_DOWN, ui::SCALE_FACTOR_100P }, 792 IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_DOWN, ui::SCALE_FACTOR_100P },
793 { "mediaplayerVolumeSliderThumbDisabled", 793 { "mediaplayerVolumeSliderThumbDisabled",
794 IDR2_MEDIAPLAYER_VOLUME_SLIDER_THUMB_DISABLED, ui::SCALE_FACTOR_100P }, 794 IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_DISABLED, ui::SCALE_FACTOR_100P },
795 { "mediaplayerClosedCaption", 795 { "mediaplayerClosedCaption",
796 IDR2_MEDIAPLAYER_CLOSEDCAPTION_BUTTON, ui::SCALE_FACTOR_100P }, 796 IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON, ui::SCALE_FACTOR_100P },
797 { "mediaplayerClosedCaptionHover", 797 { "mediaplayerClosedCaptionHover",
798 IDR2_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_HOVER, ui::SCALE_FACTOR_100P }, 798 IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_HOVER, ui::SCALE_FACTOR_100P },
799 { "mediaplayerClosedCaptionDown", 799 { "mediaplayerClosedCaptionDown",
800 IDR2_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_DOWN, ui::SCALE_FACTOR_100P }, 800 IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_DOWN, ui::SCALE_FACTOR_100P },
801 { "mediaplayerClosedCaptionDisabled", 801 { "mediaplayerClosedCaptionDisabled",
802 IDR2_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_DISABLED, ui::SCALE_FACTOR_100P }, 802 IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_DISABLED, ui::SCALE_FACTOR_100P },
803 { "mediaplayerFullscreen", 803 { "mediaplayerFullscreen",
804 IDR2_MEDIAPLAYER_FULLSCREEN_BUTTON, ui::SCALE_FACTOR_100P }, 804 IDR_MEDIAPLAYER_FULLSCREEN_BUTTON, ui::SCALE_FACTOR_100P },
805 { "mediaplayerFullscreenHover", 805 { "mediaplayerFullscreenHover",
806 IDR2_MEDIAPLAYER_FULLSCREEN_BUTTON_HOVER, ui::SCALE_FACTOR_100P }, 806 IDR_MEDIAPLAYER_FULLSCREEN_BUTTON_HOVER, ui::SCALE_FACTOR_100P },
807 { "mediaplayerFullscreenDown", 807 { "mediaplayerFullscreenDown",
808 IDR2_MEDIAPLAYER_FULLSCREEN_BUTTON_DOWN, ui::SCALE_FACTOR_100P }, 808 IDR_MEDIAPLAYER_FULLSCREEN_BUTTON_DOWN, ui::SCALE_FACTOR_100P },
809 { "mediaplayerCastOff", 809 { "mediaplayerCastOff",
810 IDR2_MEDIAPLAYER_CAST_BUTTON_OFF, ui::SCALE_FACTOR_100P }, 810 IDR_MEDIAPLAYER_CAST_BUTTON_OFF, ui::SCALE_FACTOR_100P },
811 { "mediaplayerCastOn", 811 { "mediaplayerCastOn",
812 IDR2_MEDIAPLAYER_CAST_BUTTON_ON, ui::SCALE_FACTOR_100P }, 812 IDR_MEDIAPLAYER_CAST_BUTTON_ON, ui::SCALE_FACTOR_100P },
813 { "mediaplayerFullscreenDisabled", 813 { "mediaplayerFullscreenDisabled",
814 IDR2_MEDIAPLAYER_FULLSCREEN_BUTTON_DISABLED, ui::SCALE_FACTOR_100P }, 814 IDR_MEDIAPLAYER_FULLSCREEN_BUTTON_DISABLED, ui::SCALE_FACTOR_100P },
815 { "mediaplayerOverlayCastOff", 815 { "mediaplayerOverlayCastOff",
816 IDR2_MEDIAPLAYER_OVERLAY_CAST_BUTTON_OFF, ui::SCALE_FACTOR_100P }, 816 IDR_MEDIAPLAYER_OVERLAY_CAST_BUTTON_OFF, ui::SCALE_FACTOR_100P },
817 { "mediaplayerOverlayPlay", 817 { "mediaplayerOverlayPlay",
818 IDR2_MEDIAPLAYER_OVERLAY_PLAY_BUTTON, ui::SCALE_FACTOR_100P }, 818 IDR_MEDIAPLAYER_OVERLAY_PLAY_BUTTON, ui::SCALE_FACTOR_100P },
819 { "panIcon", IDR2_PAN_SCROLL_ICON, ui::SCALE_FACTOR_100P }, 819 { "panIcon", IDR_PAN_SCROLL_ICON, ui::SCALE_FACTOR_100P },
820 { "searchCancel", IDR2_SEARCH_CANCEL, ui::SCALE_FACTOR_100P }, 820 { "searchCancel", IDR_SEARCH_CANCEL, ui::SCALE_FACTOR_100P },
821 { "searchCancelPressed", IDR2_SEARCH_CANCEL_PRESSED, ui::SCALE_FACTOR_100P }, 821 { "searchCancelPressed", IDR_SEARCH_CANCEL_PRESSED, ui::SCALE_FACTOR_100P },
822 { "searchMagnifier", IDR2_SEARCH_MAGNIFIER, ui::SCALE_FACTOR_100P }, 822 { "searchMagnifier", IDR_SEARCH_MAGNIFIER, ui::SCALE_FACTOR_100P },
823 { "searchMagnifierResults", 823 { "searchMagnifierResults",
824 IDR2_SEARCH_MAGNIFIER_RESULTS, ui::SCALE_FACTOR_100P }, 824 IDR_SEARCH_MAGNIFIER_RESULTS, ui::SCALE_FACTOR_100P },
825 { "textAreaResizeCorner", IDR2_TEXTAREA_RESIZER, ui::SCALE_FACTOR_100P }, 825 { "textAreaResizeCorner", IDR_TEXTAREA_RESIZER, ui::SCALE_FACTOR_100P },
826 { "textAreaResizeCorner@2x", IDR2_TEXTAREA_RESIZER, ui::SCALE_FACTOR_200P }, 826 { "textAreaResizeCorner@2x", IDR_TEXTAREA_RESIZER, ui::SCALE_FACTOR_200P },
827 { "generatePassword", IDR2_PASSWORD_GENERATION_ICON, ui::SCALE_FACTOR_100P }, 827 { "generatePassword", IDR_PASSWORD_GENERATION_ICON, ui::SCALE_FACTOR_100P },
828 { "generatePasswordHover", 828 { "generatePasswordHover",
829 IDR2_PASSWORD_GENERATION_ICON_HOVER, ui::SCALE_FACTOR_100P }, 829 IDR_PASSWORD_GENERATION_ICON_HOVER, ui::SCALE_FACTOR_100P },
830 { "html.css", IDR_UASTYLE_HTML_CSS, ui::SCALE_FACTOR_NONE }, 830 { "html.css", IDR_UASTYLE_HTML_CSS, ui::SCALE_FACTOR_NONE },
831 { "quirks.css", IDR_UASTYLE_QUIRKS_CSS, ui::SCALE_FACTOR_NONE }, 831 { "quirks.css", IDR_UASTYLE_QUIRKS_CSS, ui::SCALE_FACTOR_NONE },
832 { "view-source.css", IDR_UASTYLE_VIEW_SOURCE_CSS, ui::SCALE_FACTOR_NONE }, 832 { "view-source.css", IDR_UASTYLE_VIEW_SOURCE_CSS, ui::SCALE_FACTOR_NONE },
833 { "themeChromium.css", IDR_UASTYLE_THEME_CHROMIUM_CSS, 833 { "themeChromium.css", IDR_UASTYLE_THEME_CHROMIUM_CSS,
834 ui::SCALE_FACTOR_NONE }, 834 ui::SCALE_FACTOR_NONE },
835 #if defined(OS_ANDROID) 835 #if defined(OS_ANDROID)
836 { "themeChromiumAndroid.css", IDR_UASTYLE_THEME_CHROMIUM_ANDROID_CSS, 836 { "themeChromiumAndroid.css", IDR_UASTYLE_THEME_CHROMIUM_ANDROID_CSS,
837 ui::SCALE_FACTOR_NONE }, 837 ui::SCALE_FACTOR_NONE },
838 { "mediaControlsAndroid.css", IDR_UASTYLE_MEDIA_CONTROLS_ANDROID_CSS, 838 { "mediaControlsAndroid.css", IDR_UASTYLE_MEDIA_CONTROLS_ANDROID_CSS,
839 ui::SCALE_FACTOR_NONE }, 839 ui::SCALE_FACTOR_NONE },
(...skipping 415 matching lines...) Expand 10 before | Expand all | Expand 10 after
1255 return WebString::fromUTF8(ui::KeycodeConverter::DomCodeToCodeString( 1255 return WebString::fromUTF8(ui::KeycodeConverter::DomCodeToCodeString(
1256 static_cast<ui::DomCode>(dom_code))); 1256 static_cast<ui::DomCode>(dom_code)));
1257 } 1257 }
1258 1258
1259 int BlinkPlatformImpl::domEnumFromCodeString(const WebString& code) { 1259 int BlinkPlatformImpl::domEnumFromCodeString(const WebString& code) {
1260 return static_cast<int>(ui::KeycodeConverter::CodeStringToDomCode( 1260 return static_cast<int>(ui::KeycodeConverter::CodeStringToDomCode(
1261 code.utf8().data())); 1261 code.utf8().data()));
1262 } 1262 }
1263 1263
1264 } // namespace content 1264 } // namespace content
OLDNEW
« no previous file with comments | « content/app/resources/default_200_percent/textarea_resize_corner.png ('k') | content/content_shell.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698