Add scale factor and 2x resources from webkit and plumb through to ContentClient.

BUG=124158
TEST=Run debug chrome with --default-device-scale-factor=2 and view a textarea with scrollbars. The previously blank assets are now there and chrome no longer crashes.

Review URL: https://chromiumcodereview.appspot.com/10383006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136610 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 33 insertions, 1 deletions

diff --git a/webkit/support/platform_support_android.cc b/webkit/support/platform_support_android.cc
index 23ebe69..79a9cd3 100644
--- a/webkit/support/platform_support_android.cc
+++ b/webkit/support/platform_support_android.cc
@@ -62,6 +62,12 @@ string16 TestWebKitPlatformSupport::GetLocalizedString(int message_id) {
 }
 
 base::StringPiece TestWebKitPlatformSupport::GetDataResource(int resource_id) {
+  return ResourceBundle::GetSharedInstance().GetRawDataResource(resource_id);
+}
+
+base::StringPiece TestWebKitPlatformSupport::GetImageResource(
+    int resource_id,
+    float scale_factor) {
   FilePath resources_path;
   PathService::Get(base::DIR_EXE, &resources_path);
   resources_path = resources_path.Append("DumpRenderTree_resources");
@@ -88,5 +94,6 @@ base::StringPiece TestWebKitPlatformSupport::GetDataResource(int resource_id) {
     }
   }
 
+  // TODO(flackr): Pass scale_factor to ResourceBundle.
   return ResourceBundle::GetSharedInstance().GetRawDataResource(resource_id);
 }
diff --git a/webkit/support/platform_support_linux.cc b/webkit/support/platform_support_linux.cc
index 55d8517..e777546 100644
--- a/webkit/support/platform_support_linux.cc
+++ b/webkit/support/platform_support_linux.cc
@@ -46,6 +46,12 @@ string16 TestWebKitPlatformSupport::GetLocalizedString(int message_id) {
 }
 
 base::StringPiece TestWebKitPlatformSupport::GetDataResource(int resource_id) {
+  return ResourceBundle::GetSharedInstance().GetRawDataResource(resource_id);
+}
+
+base::StringPiece TestWebKitPlatformSupport::GetImageResource(
+    int resource_id,
+    float scale_factor) {
   FilePath resources_path;
   PathService::Get(base::DIR_EXE, &resources_path);
   resources_path = resources_path.Append("DumpRenderTree_resources");
@@ -72,5 +78,6 @@ base::StringPiece TestWebKitPlatformSupport::GetDataResource(int resource_id) {
     }
   }
 
+  // TODO(flackr): Pass scale_factor to ResourceBundle.
   return ResourceBundle::GetSharedInstance().GetRawDataResource(resource_id);
 }
diff --git a/webkit/support/platform_support_mac.mm b/webkit/support/platform_support_mac.mm
index 487d521..f26ae69 100644
--- a/webkit/support/platform_support_mac.mm
+++ b/webkit/support/platform_support_mac.mm
@@ -217,6 +217,15 @@ static FilePath GetResourcesFilePath() {
 }
 
 base::StringPiece TestWebKitPlatformSupport::GetDataResource(int resource_id) {
+  base::StringPiece res;
+  if (g_resource_data_pack)
+    g_resource_data_pack->GetStringPiece(resource_id, &res);
+  return res;
+}
+
+base::StringPiece TestWebKitPlatformSupport::GetImageResource(
+    int resource_id,
+    float scale_factor) {
   switch (resource_id) {
   case IDR_BROKENIMAGE: {
     // Use webkit's broken image icon (16x16)
diff --git a/webkit/support/platform_support_win.cc b/webkit/support/platform_support_win.cc
index 0d5eee2..c385ccc 100644
--- a/webkit/support/platform_support_win.cc
+++ b/webkit/support/platform_support_win.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -73,6 +73,12 @@ string16 TestWebKitPlatformSupport::GetLocalizedString(int message_id) {
 }
 
 base::StringPiece TestWebKitPlatformSupport::GetDataResource(int resource_id) {
+  return ResourceProvider(resource_id);
+}
+
+base::StringPiece TestWebKitPlatformSupport::GetImageResource(
+    int resource_id,
+    float scale_factor) {
   switch (resource_id) {
   case IDR_BROKENIMAGE: {
     // Use webkit's broken image icon (16x16)
@@ -100,5 +106,6 @@ base::StringPiece TestWebKitPlatformSupport::GetDataResource(int resource_id) {
   }
   }
 
+  // TODO(flackr): Pass scale_factor to ResourceProvider.
   return ResourceProvider(resource_id);
 }
diff --git a/webkit/support/test_webkit_platform_support.h b/webkit/support/test_webkit_platform_support.h
index a74e6b5f..238d008 100644
--- a/webkit/support/test_webkit_platform_support.h
+++ b/webkit/support/test_webkit_platform_support.h
@@ -112,6 +112,8 @@ class TestWebKitPlatformSupport :
 
   virtual string16 GetLocalizedString(int message_id) OVERRIDE;
   virtual base::StringPiece GetDataResource(int resource_id) OVERRIDE;
+  virtual base::StringPiece GetImageResource(int resource_id,
+                                             float scale_factor) OVERRIDE;
   virtual void GetPlugins(bool refresh,
                           std::vector<webkit::WebPluginInfo>* plugins) OVERRIDE;
   virtual webkit_glue::ResourceLoaderBridge* CreateResourceLoader(