| 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 <memory> | 9 #include <memory> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 498 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 509 | 509 |
| 510 struct DataResource { | 510 struct DataResource { |
| 511 const char* name; | 511 const char* name; |
| 512 int id; | 512 int id; |
| 513 ui::ScaleFactor scale_factor; | 513 ui::ScaleFactor scale_factor; |
| 514 }; | 514 }; |
| 515 | 515 |
| 516 const DataResource kDataResources[] = { | 516 const DataResource kDataResources[] = { |
| 517 {"missingImage", IDR_BROKENIMAGE, ui::SCALE_FACTOR_100P}, | 517 {"missingImage", IDR_BROKENIMAGE, ui::SCALE_FACTOR_100P}, |
| 518 {"missingImage@2x", IDR_BROKENIMAGE, ui::SCALE_FACTOR_200P}, | 518 {"missingImage@2x", IDR_BROKENIMAGE, ui::SCALE_FACTOR_200P}, |
| 519 {"mediaplayerPause", IDR_MEDIAPLAYER_PAUSE_BUTTON, ui::SCALE_FACTOR_100P}, | |
| 520 {"mediaplayerPauseNew", | 519 {"mediaplayerPauseNew", |
| 521 IDR_MEDIAPLAYER_PAUSE_BUTTON_NEW, | 520 IDR_MEDIAPLAYER_PAUSE_BUTTON_NEW, |
| 522 ui::SCALE_FACTOR_100P}, | 521 ui::SCALE_FACTOR_100P}, |
| 523 {"mediaplayerPlay", IDR_MEDIAPLAYER_PLAY_BUTTON, ui::SCALE_FACTOR_100P}, | |
| 524 {"mediaplayerPlayNew", | 522 {"mediaplayerPlayNew", |
| 525 IDR_MEDIAPLAYER_PLAY_BUTTON_NEW, | 523 IDR_MEDIAPLAYER_PLAY_BUTTON_NEW, |
| 526 ui::SCALE_FACTOR_100P}, | 524 ui::SCALE_FACTOR_100P}, |
| 527 {"mediaplayerPlayDisabled", | |
| 528 IDR_MEDIAPLAYER_PLAY_BUTTON_DISABLED, | |
| 529 ui::SCALE_FACTOR_100P}, | |
| 530 {"mediaplayerSoundLevel3", | |
| 531 IDR_MEDIAPLAYER_SOUND_LEVEL3_BUTTON, | |
| 532 ui::SCALE_FACTOR_100P}, | |
| 533 {"mediaplayerSoundLevel3New", | 525 {"mediaplayerSoundLevel3New", |
| 534 IDR_MEDIAPLAYER_SOUND_LEVEL3_BUTTON_NEW, | 526 IDR_MEDIAPLAYER_SOUND_LEVEL3_BUTTON_NEW, |
| 535 ui::SCALE_FACTOR_100P}, | 527 ui::SCALE_FACTOR_100P}, |
| 536 {"mediaplayerSoundLevel2", | |
| 537 IDR_MEDIAPLAYER_SOUND_LEVEL2_BUTTON, | |
| 538 ui::SCALE_FACTOR_100P}, | |
| 539 {"mediaplayerSoundLevel1", | |
| 540 IDR_MEDIAPLAYER_SOUND_LEVEL1_BUTTON, | |
| 541 ui::SCALE_FACTOR_100P}, | |
| 542 {"mediaplayerSoundLevel0", | |
| 543 IDR_MEDIAPLAYER_SOUND_LEVEL0_BUTTON, | |
| 544 ui::SCALE_FACTOR_100P}, | |
| 545 {"mediaplayerSoundLevel0New", | 528 {"mediaplayerSoundLevel0New", |
| 546 IDR_MEDIAPLAYER_SOUND_LEVEL0_BUTTON_NEW, | 529 IDR_MEDIAPLAYER_SOUND_LEVEL0_BUTTON_NEW, |
| 547 ui::SCALE_FACTOR_100P}, | 530 ui::SCALE_FACTOR_100P}, |
| 548 {"mediaplayerSoundDisabled", | |
| 549 IDR_MEDIAPLAYER_SOUND_DISABLED, | |
| 550 ui::SCALE_FACTOR_100P}, | |
| 551 {"mediaplayerSliderThumb", | |
| 552 IDR_MEDIAPLAYER_SLIDER_THUMB, | |
| 553 ui::SCALE_FACTOR_100P}, | |
| 554 {"mediaplayerSliderThumbNew", | 531 {"mediaplayerSliderThumbNew", |
| 555 IDR_MEDIAPLAYER_SLIDER_THUMB_NEW, | 532 IDR_MEDIAPLAYER_SLIDER_THUMB_NEW, |
| 556 ui::SCALE_FACTOR_100P}, | 533 ui::SCALE_FACTOR_100P}, |
| 557 {"mediaplayerVolumeSliderThumb", | |
| 558 IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB, | |
| 559 ui::SCALE_FACTOR_100P}, | |
| 560 {"mediaplayerVolumeSliderThumbNew", | 534 {"mediaplayerVolumeSliderThumbNew", |
| 561 IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_NEW, | 535 IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_NEW, |
| 562 ui::SCALE_FACTOR_100P}, | 536 ui::SCALE_FACTOR_100P}, |
| 563 {"mediaplayerVolumeSliderThumbDisabled", | |
| 564 IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_DISABLED, | |
| 565 ui::SCALE_FACTOR_100P}, | |
| 566 {"mediaplayerClosedCaption", | |
| 567 IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON, | |
| 568 ui::SCALE_FACTOR_100P}, | |
| 569 {"mediaplayerClosedCaptionNew", | 537 {"mediaplayerClosedCaptionNew", |
| 570 IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_NEW, | 538 IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_NEW, |
| 571 ui::SCALE_FACTOR_100P}, | 539 ui::SCALE_FACTOR_100P}, |
| 572 {"mediaplayerClosedCaptionDisabled", | |
| 573 IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_DISABLED, | |
| 574 ui::SCALE_FACTOR_100P}, | |
| 575 {"mediaplayerClosedCaptionDisabledNew", | 540 {"mediaplayerClosedCaptionDisabledNew", |
| 576 IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_DISABLED_NEW, | 541 IDR_MEDIAPLAYER_CLOSEDCAPTION_BUTTON_DISABLED_NEW, |
| 577 ui::SCALE_FACTOR_100P}, | 542 ui::SCALE_FACTOR_100P}, |
| 578 {"mediaplayerEnterFullscreen", | 543 {"mediaplayerEnterFullscreen", |
| 579 IDR_MEDIAPLAYER_ENTER_FULLSCREEN_BUTTON, | 544 IDR_MEDIAPLAYER_ENTER_FULLSCREEN_BUTTON, |
| 580 ui::SCALE_FACTOR_100P}, | 545 ui::SCALE_FACTOR_100P}, |
| 581 {"mediaplayerExitFullscreen", | 546 {"mediaplayerExitFullscreen", |
| 582 IDR_MEDIAPLAYER_EXIT_FULLSCREEN_BUTTON, | 547 IDR_MEDIAPLAYER_EXIT_FULLSCREEN_BUTTON, |
| 583 ui::SCALE_FACTOR_100P}, | 548 ui::SCALE_FACTOR_100P}, |
| 584 {"mediaplayerFullscreen", | |
| 585 IDR_MEDIAPLAYER_FULLSCREEN_BUTTON, | |
| 586 ui::SCALE_FACTOR_100P}, | |
| 587 {"mediaplayerCastOff", | |
| 588 IDR_MEDIAPLAYER_CAST_BUTTON_OFF, | |
| 589 ui::SCALE_FACTOR_100P}, | |
| 590 {"mediaplayerCastOn", | |
| 591 IDR_MEDIAPLAYER_CAST_BUTTON_ON, | |
| 592 ui::SCALE_FACTOR_100P}, | |
| 593 {"mediaplayerCastOffNew", | 549 {"mediaplayerCastOffNew", |
| 594 IDR_MEDIAPLAYER_CAST_BUTTON_OFF_NEW, | 550 IDR_MEDIAPLAYER_CAST_BUTTON_OFF_NEW, |
| 595 ui::SCALE_FACTOR_100P}, | 551 ui::SCALE_FACTOR_100P}, |
| 596 {"mediaplayerCastOnNew", | 552 {"mediaplayerCastOnNew", |
| 597 IDR_MEDIAPLAYER_CAST_BUTTON_ON_NEW, | 553 IDR_MEDIAPLAYER_CAST_BUTTON_ON_NEW, |
| 598 ui::SCALE_FACTOR_100P}, | 554 ui::SCALE_FACTOR_100P}, |
| 599 {"mediaplayerFullscreenDisabled", | |
| 600 IDR_MEDIAPLAYER_FULLSCREEN_BUTTON_DISABLED, | |
| 601 ui::SCALE_FACTOR_100P}, | |
| 602 {"mediaplayerOverlayCastOff", | |
| 603 IDR_MEDIAPLAYER_OVERLAY_CAST_BUTTON_OFF, | |
| 604 ui::SCALE_FACTOR_100P}, | |
| 605 {"mediaplayerOverlayCastOffNew", | 555 {"mediaplayerOverlayCastOffNew", |
| 606 IDR_MEDIAPLAYER_OVERLAY_CAST_BUTTON_OFF_NEW, | 556 IDR_MEDIAPLAYER_OVERLAY_CAST_BUTTON_OFF_NEW, |
| 607 ui::SCALE_FACTOR_100P}, | 557 ui::SCALE_FACTOR_100P}, |
| 608 {"mediaplayerOverlayPlay", | |
| 609 IDR_MEDIAPLAYER_OVERLAY_PLAY_BUTTON, | |
| 610 ui::SCALE_FACTOR_100P}, | |
| 611 {"mediaplayerOverlayPlayNew", | 558 {"mediaplayerOverlayPlayNew", |
| 612 IDR_MEDIAPLAYER_OVERLAY_PLAY_BUTTON_NEW, | 559 IDR_MEDIAPLAYER_OVERLAY_PLAY_BUTTON_NEW, |
| 613 ui::SCALE_FACTOR_100P}, | 560 ui::SCALE_FACTOR_100P}, |
| 614 {"mediaplayerTrackSelectionCheckmark", | |
| 615 IDR_MEDIAPLAYER_TRACKSELECTION_CHECKMARK, | |
| 616 ui::SCALE_FACTOR_100P}, | |
| 617 {"mediaplayerTrackSelectionCheckmarkNew", | 561 {"mediaplayerTrackSelectionCheckmarkNew", |
| 618 IDR_MEDIAPLAYER_TRACKSELECTION_CHECKMARK_NEW, | 562 IDR_MEDIAPLAYER_TRACKSELECTION_CHECKMARK_NEW, |
| 619 ui::SCALE_FACTOR_100P}, | 563 ui::SCALE_FACTOR_100P}, |
| 620 {"mediaplayerClosedCaptionsIcon", | |
| 621 IDR_MEDIAPLAYER_CLOSEDCAPTIONS_ICON, | |
| 622 ui::SCALE_FACTOR_100P}, | |
| 623 {"mediaplayerClosedCaptionsIconNew", | 564 {"mediaplayerClosedCaptionsIconNew", |
| 624 IDR_MEDIAPLAYER_CLOSEDCAPTIONS_ICON_NEW, | 565 IDR_MEDIAPLAYER_CLOSEDCAPTIONS_ICON_NEW, |
| 625 ui::SCALE_FACTOR_100P}, | 566 ui::SCALE_FACTOR_100P}, |
| 626 {"mediaplayerSubtitlesIcon", | |
| 627 IDR_MEDIAPLAYER_SUBTITLES_ICON, | |
| 628 ui::SCALE_FACTOR_100P}, | |
| 629 {"mediaplayerSubtitlesIconNew", | 567 {"mediaplayerSubtitlesIconNew", |
| 630 IDR_MEDIAPLAYER_SUBTITLES_ICON_NEW, | 568 IDR_MEDIAPLAYER_SUBTITLES_ICON_NEW, |
| 631 ui::SCALE_FACTOR_100P}, | 569 ui::SCALE_FACTOR_100P}, |
| 632 {"mediaplayerOverflowMenu", | 570 {"mediaplayerOverflowMenu", |
| 633 IDR_MEDIAPLAYER_OVERFLOW_MENU_ICON, | 571 IDR_MEDIAPLAYER_OVERFLOW_MENU_ICON, |
| 634 ui::SCALE_FACTOR_100P}, | 572 ui::SCALE_FACTOR_100P}, |
| 635 {"mediaplayerDownloadIcon", | 573 {"mediaplayerDownloadIcon", |
| 636 IDR_MEDIAPLAYER_DOWNLOAD_ICON, | 574 IDR_MEDIAPLAYER_DOWNLOAD_ICON, |
| 637 ui::SCALE_FACTOR_100P}, | 575 ui::SCALE_FACTOR_100P}, |
| 638 {"searchCancel", IDR_SEARCH_CANCEL, ui::SCALE_FACTOR_100P}, | 576 {"searchCancel", IDR_SEARCH_CANCEL, ui::SCALE_FACTOR_100P}, |
| 639 {"searchCancelPressed", IDR_SEARCH_CANCEL_PRESSED, ui::SCALE_FACTOR_100P}, | 577 {"searchCancelPressed", IDR_SEARCH_CANCEL_PRESSED, ui::SCALE_FACTOR_100P}, |
| 640 {"textAreaResizeCorner", IDR_TEXTAREA_RESIZER, ui::SCALE_FACTOR_100P}, | 578 {"textAreaResizeCorner", IDR_TEXTAREA_RESIZER, ui::SCALE_FACTOR_100P}, |
| 641 {"textAreaResizeCorner@2x", IDR_TEXTAREA_RESIZER, ui::SCALE_FACTOR_200P}, | 579 {"textAreaResizeCorner@2x", IDR_TEXTAREA_RESIZER, ui::SCALE_FACTOR_200P}, |
| 642 {"generatePassword", IDR_PASSWORD_GENERATION_ICON, ui::SCALE_FACTOR_100P}, | 580 {"generatePassword", IDR_PASSWORD_GENERATION_ICON, ui::SCALE_FACTOR_100P}, |
| 643 {"generatePasswordHover", | 581 {"generatePasswordHover", |
| 644 IDR_PASSWORD_GENERATION_ICON_HOVER, | 582 IDR_PASSWORD_GENERATION_ICON_HOVER, |
| 645 ui::SCALE_FACTOR_100P}, | 583 ui::SCALE_FACTOR_100P}, |
| 646 {"html.css", IDR_UASTYLE_HTML_CSS, ui::SCALE_FACTOR_NONE}, | 584 {"html.css", IDR_UASTYLE_HTML_CSS, ui::SCALE_FACTOR_NONE}, |
| 647 {"quirks.css", IDR_UASTYLE_QUIRKS_CSS, ui::SCALE_FACTOR_NONE}, | 585 {"quirks.css", IDR_UASTYLE_QUIRKS_CSS, ui::SCALE_FACTOR_NONE}, |
| 648 {"view-source.css", IDR_UASTYLE_VIEW_SOURCE_CSS, ui::SCALE_FACTOR_NONE}, | 586 {"view-source.css", IDR_UASTYLE_VIEW_SOURCE_CSS, ui::SCALE_FACTOR_NONE}, |
| 649 // Not limited to Android since it's used for mobile layouts in inspector. | 587 // Not limited to Android since it's used for mobile layouts in inspector. |
| 650 {"themeChromiumAndroid.css", | 588 {"themeChromiumAndroid.css", |
| 651 IDR_UASTYLE_THEME_CHROMIUM_ANDROID_CSS, | 589 IDR_UASTYLE_THEME_CHROMIUM_ANDROID_CSS, |
| 652 ui::SCALE_FACTOR_NONE}, | 590 ui::SCALE_FACTOR_NONE}, |
| 653 // Not limited to Android since it's used for mobile layouts in inspector. | 591 // Not limited to Android since it's used for mobile layouts in inspector. |
| 654 {"fullscreenAndroid.css", | 592 {"fullscreenAndroid.css", |
| 655 IDR_UASTYLE_FULLSCREEN_ANDROID_CSS, | 593 IDR_UASTYLE_FULLSCREEN_ANDROID_CSS, |
| 656 ui::SCALE_FACTOR_NONE}, | 594 ui::SCALE_FACTOR_NONE}, |
| 657 // Not limited to Android since it's used for mobile layouts in inspector. | 595 // Not limited to Android since it's used for mobile layouts in inspector. |
| 658 {"mediaControlsAndroid.css", | |
| 659 IDR_UASTYLE_MEDIA_CONTROLS_ANDROID_CSS, | |
| 660 ui::SCALE_FACTOR_NONE}, | |
| 661 // Not limited to Android since it's used for mobile layouts in inspector. | |
| 662 {"mediaControlsAndroidNew.css", | 596 {"mediaControlsAndroidNew.css", |
| 663 IDR_UASTYLE_MEDIA_CONTROLS_ANDROID_NEW_CSS, | 597 IDR_UASTYLE_MEDIA_CONTROLS_ANDROID_NEW_CSS, |
| 664 ui::SCALE_FACTOR_NONE}, | 598 ui::SCALE_FACTOR_NONE}, |
| 665 // Not limited to Linux since it's used for mobile layouts in inspector. | 599 // Not limited to Linux since it's used for mobile layouts in inspector. |
| 666 {"themeChromiumLinux.css", | 600 {"themeChromiumLinux.css", |
| 667 IDR_UASTYLE_THEME_CHROMIUM_LINUX_CSS, | 601 IDR_UASTYLE_THEME_CHROMIUM_LINUX_CSS, |
| 668 ui::SCALE_FACTOR_NONE}, | 602 ui::SCALE_FACTOR_NONE}, |
| 669 {"themeInputMultipleFields.css", | 603 {"themeInputMultipleFields.css", |
| 670 IDR_UASTYLE_THEME_INPUT_MULTIPLE_FIELDS_CSS, | 604 IDR_UASTYLE_THEME_INPUT_MULTIPLE_FIELDS_CSS, |
| 671 ui::SCALE_FACTOR_NONE}, | 605 ui::SCALE_FACTOR_NONE}, |
| 672 #if defined(OS_MACOSX) | 606 #if defined(OS_MACOSX) |
| 673 {"themeMac.css", IDR_UASTYLE_THEME_MAC_CSS, ui::SCALE_FACTOR_NONE}, | 607 {"themeMac.css", IDR_UASTYLE_THEME_MAC_CSS, ui::SCALE_FACTOR_NONE}, |
| 674 #endif | 608 #endif |
| 675 {"themeWin.css", IDR_UASTYLE_THEME_WIN_CSS, ui::SCALE_FACTOR_NONE}, | 609 {"themeWin.css", IDR_UASTYLE_THEME_WIN_CSS, ui::SCALE_FACTOR_NONE}, |
| 676 {"themeWinQuirks.css", | 610 {"themeWinQuirks.css", |
| 677 IDR_UASTYLE_THEME_WIN_QUIRKS_CSS, | 611 IDR_UASTYLE_THEME_WIN_QUIRKS_CSS, |
| 678 ui::SCALE_FACTOR_NONE}, | 612 ui::SCALE_FACTOR_NONE}, |
| 679 {"svg.css", IDR_UASTYLE_SVG_CSS, ui::SCALE_FACTOR_NONE}, | 613 {"svg.css", IDR_UASTYLE_SVG_CSS, ui::SCALE_FACTOR_NONE}, |
| 680 {"mathml.css", IDR_UASTYLE_MATHML_CSS, ui::SCALE_FACTOR_NONE}, | 614 {"mathml.css", IDR_UASTYLE_MATHML_CSS, ui::SCALE_FACTOR_NONE}, |
| 681 {"mediaControls.css", | |
| 682 IDR_UASTYLE_MEDIA_CONTROLS_CSS, | |
| 683 ui::SCALE_FACTOR_NONE}, | |
| 684 {"mediaControlsNew.css", | 615 {"mediaControlsNew.css", |
| 685 IDR_UASTYLE_MEDIA_CONTROLS_NEW_CSS, | 616 IDR_UASTYLE_MEDIA_CONTROLS_NEW_CSS, |
| 686 ui::SCALE_FACTOR_NONE}, | 617 ui::SCALE_FACTOR_NONE}, |
| 687 {"fullscreen.css", IDR_UASTYLE_FULLSCREEN_CSS, ui::SCALE_FACTOR_NONE}, | 618 {"fullscreen.css", IDR_UASTYLE_FULLSCREEN_CSS, ui::SCALE_FACTOR_NONE}, |
| 688 {"xhtmlmp.css", IDR_UASTYLE_XHTMLMP_CSS, ui::SCALE_FACTOR_NONE}, | 619 {"xhtmlmp.css", IDR_UASTYLE_XHTMLMP_CSS, ui::SCALE_FACTOR_NONE}, |
| 689 {"viewportAndroid.css", | 620 {"viewportAndroid.css", |
| 690 IDR_UASTYLE_VIEWPORT_ANDROID_CSS, | 621 IDR_UASTYLE_VIEWPORT_ANDROID_CSS, |
| 691 ui::SCALE_FACTOR_NONE}, | 622 ui::SCALE_FACTOR_NONE}, |
| 692 {"viewportTelevision.css", | 623 {"viewportTelevision.css", |
| 693 IDR_UASTYLE_VIEWPORT_TELEVISION_CSS, | 624 IDR_UASTYLE_VIEWPORT_TELEVISION_CSS, |
| (...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 954 return WebString::fromUTF8(ui::KeycodeConverter::DomKeyToKeyString( | 885 return WebString::fromUTF8(ui::KeycodeConverter::DomKeyToKeyString( |
| 955 static_cast<ui::DomKey>(dom_key))); | 886 static_cast<ui::DomKey>(dom_key))); |
| 956 } | 887 } |
| 957 | 888 |
| 958 int BlinkPlatformImpl::domKeyEnumFromString(const WebString& key_string) { | 889 int BlinkPlatformImpl::domKeyEnumFromString(const WebString& key_string) { |
| 959 return static_cast<int>( | 890 return static_cast<int>( |
| 960 ui::KeycodeConverter::KeyStringToDomKey(key_string.utf8())); | 891 ui::KeycodeConverter::KeyStringToDomKey(key_string.utf8())); |
| 961 } | 892 } |
| 962 | 893 |
| 963 } // namespace content | 894 } // namespace content |
| OLD | NEW |