diff options
author | tkent@chromium.org <tkent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-26 01:15:17 +0000 |
---|---|---|
committer | tkent@chromium.org <tkent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-26 01:15:17 +0000 |
commit | 1085e02a21de830fc77abdfdcaa1d8472a0d937a (patch) | |
tree | 3f4b2391e40a86223f61d6ccf6e3900693d382c2 | |
parent | 5f601a384fc70e3ee0e588f28506b73d1a72a77b (diff) | |
download | chromium_src-1085e02a21de830fc77abdfdcaa1d8472a0d937a.zip chromium_src-1085e02a21de830fc77abdfdcaa1d8472a0d937a.tar.gz chromium_src-1085e02a21de830fc77abdfdcaa1d8472a0d937a.tar.bz2 |
Fix input-speech related failures on DRT
Windows and Mac implementations lacked IDR_INPUT_SPEECH* handling.
This change fixes them by removing resource ID checking.
TEST=Some of LayoutTests/fast/speech/.
BUG=none
Review URL: http://codereview.chromium.org/6303017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72581 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | webkit/support/platform_support_mac.mm | 24 | ||||
-rw-r--r-- | webkit/support/platform_support_win.cc | 22 |
2 files changed, 5 insertions, 41 deletions
diff --git a/webkit/support/platform_support_mac.mm b/webkit/support/platform_support_mac.mm index 54319da..ef568bd 100644 --- a/webkit/support/platform_support_mac.mm +++ b/webkit/support/platform_support_mac.mm @@ -216,28 +216,10 @@ base::StringPiece GetDataResource(int resource_id) { } return resize_corner_data; } - - case IDR_SEARCH_CANCEL: - case IDR_SEARCH_CANCEL_PRESSED: - case IDR_SEARCH_MAGNIFIER: - case IDR_SEARCH_MAGNIFIER_RESULTS: - case IDR_MEDIA_PAUSE_BUTTON: - case IDR_MEDIA_PLAY_BUTTON: - case IDR_MEDIA_PLAY_BUTTON_DISABLED: - case IDR_MEDIA_SOUND_FULL_BUTTON: - case IDR_MEDIA_SOUND_NONE_BUTTON: - case IDR_MEDIA_SOUND_DISABLED: - case IDR_MEDIA_SLIDER_THUMB: - case IDR_MEDIA_VOLUME_SLIDER_THUMB: { - base::StringPiece res; - g_resource_data_pack->GetStringPiece(resource_id, &res); - return res; - } - - default: - break; } - return base::StringPiece(); + base::StringPiece res; + g_resource_data_pack->GetStringPiece(resource_id, &res); + return res; } } // namespace webkit_glue diff --git a/webkit/support/platform_support_win.cc b/webkit/support/platform_support_win.cc index c73d134..687ef0e 100644 --- a/webkit/support/platform_support_win.cc +++ b/webkit/support/platform_support_win.cc @@ -35,7 +35,7 @@ base::StringPiece GetRawDataResource(HMODULE module, int resource_id) { : base::StringPiece(); } -base::StringPiece NetResourceProvider(int key) { +base::StringPiece ResourceProvider(int key) { return GetRawDataResource(::GetModuleHandle(NULL), key); } @@ -99,27 +99,9 @@ base::StringPiece GetDataResource(int resource_id) { } return resize_corner_data; } - - case IDR_SEARCH_CANCEL: - case IDR_SEARCH_CANCEL_PRESSED: - case IDR_SEARCH_MAGNIFIER: - case IDR_SEARCH_MAGNIFIER_RESULTS: - case IDR_MEDIA_PAUSE_BUTTON: - case IDR_MEDIA_PLAY_BUTTON: - case IDR_MEDIA_PLAY_BUTTON_DISABLED: - case IDR_MEDIA_SOUND_FULL_BUTTON: - case IDR_MEDIA_SOUND_NONE_BUTTON: - case IDR_MEDIA_SOUND_DISABLED: - case IDR_MEDIA_SLIDER_THUMB: - case IDR_MEDIA_VOLUME_SLIDER_THUMB: - case IDR_DEVTOOLS_DEBUGGER_SCRIPT_JS: - return NetResourceProvider(resource_id); - - default: - break; } - return base::StringPiece(); + return ResourceProvider(resource_id); } } // namespace webkit_glue |