Move more web widgets painting from webkit to chrome.

webkit/tools/test_shell/test_shell_win.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/tools/test_shell/test_shell.h"
 
 #include <windows.h>
 #include <commdlg.h>
 #include <objbase.h>
 #include <process.h>
@@ skipping 120 matching lines @@
 
 static base::StringPiece GetRawDataResource(HMODULE module, int resource_id) {
   void* data_ptr;
   size_t data_size;
   return base::GetDataResourceFromModule(module, resource_id, &data_ptr,
                                          &data_size)
       ? base::StringPiece(static_cast<char*>(data_ptr), data_size)
       : base::StringPiece();
 }
 
 // This is called indirectly by the network layer to access resources.

[tony, 2011/01/14 22:06:04]

We actually call TestShell::ResourceProvider, don't we?

[xiyuan, 2011/01/18 21:30:49]

Yep, you are right. Removed as suggested.

-base::StringPiece NetResourceProvider(int key) {
+base::StringPiece ResourceProvider(int key) {
   return GetRawDataResource(::GetModuleHandle(NULL), key);
 }
 
 }  // namespace
 
 // Initialize static member variable
 HINSTANCE TestShell::instance_handle_;
 
 /////////////////////////////////////////////////////////////////////////////
 // static methods on TestShell
@@ skipping 580 matching lines @@
   *result = FilePath(info.lpstrFile);
   return true;
 }
 
 // static
 void TestShell::ShowStartupDebuggingDialog() {
   MessageBox(NULL, L"attach to me?", L"test_shell", MB_OK);
 }
 
 // static
-base::StringPiece TestShell::NetResourceProvider(int key) {
+base::StringPiece TestShell::ResourceProvider(int key) {
   return GetRawDataResource(::GetModuleHandle(NULL), key);
 }
 
 
 /////////////////////////////////////////////////////////////////////////////
 // WebKit glue functions
 
 namespace webkit_glue {
 
 string16 GetLocalizedString(int message_id) {
@@ skipping 46 matching lines @@
   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:
   case IDR_INPUT_SPEECH:
   case IDR_INPUT_SPEECH_RECORDING:
   case IDR_INPUT_SPEECH_WAITING:
-    return NetResourceProvider(resource_id);
+    return ResourceProvider(resource_id);

[tony, 2011/01/14 22:06:04]

Can we just call TestShell::ResourceProvider here and remove the local
ResourceProvider function?

[xiyuan, 2011/01/18 21:30:49]

Done.

 
   default:
     break;
   }
 
   return base::StringPiece();
 }
 
 HCURSOR LoadCursor(int cursor_id) {
   return NULL;
 }
 
 bool EnsureFontLoaded(HFONT font) {
   return true;
 }
 
 bool DownloadUrl(const std::string& url, HWND caller_window) {
   return false;
 }
 
 }  // namespace webkit_glue