summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
Diffstat (limited to 'webkit')
-rw-r--r--webkit/glue/webkit_glue_unittest.cc7
-rw-r--r--webkit/glue/webkitplatformsupport_impl.cc159
-rw-r--r--webkit/glue/webkitplatformsupport_impl.h10
-rw-r--r--webkit/support/platform_support_android.cc12
-rw-r--r--webkit/support/platform_support_linux.cc12
-rw-r--r--webkit/support/platform_support_mac.mm13
-rw-r--r--webkit/support/platform_support_win.cc8
-rw-r--r--webkit/support/test_webkit_platform_support.h6
-rw-r--r--webkit/tools/test_shell/test_shell_gtk.cc15
-rw-r--r--webkit/tools/test_shell/test_shell_mac.mm11
-rw-r--r--webkit/tools/test_shell/test_shell_webkit_init.h8
-rw-r--r--webkit/tools/test_shell/test_shell_win.cc11
12 files changed, 129 insertions, 143 deletions
diff --git a/webkit/glue/webkit_glue_unittest.cc b/webkit/glue/webkit_glue_unittest.cc
index 39b6208..f50b20e 100644
--- a/webkit/glue/webkit_glue_unittest.cc
+++ b/webkit/glue/webkit_glue_unittest.cc
@@ -100,12 +100,7 @@ class TestWebKitPlatformSupport
return string16();
}
- virtual base::StringPiece GetDataResource(int) OVERRIDE {
- return base::StringPiece();
- }
-
- virtual base::StringPiece GetImageResource(int resource_id,
- float scale_factor) OVERRIDE {
+ virtual base::StringPiece GetDataResource(int, ui::ScaleFactor) OVERRIDE {
return base::StringPiece();
}
diff --git a/webkit/glue/webkitplatformsupport_impl.cc b/webkit/glue/webkitplatformsupport_impl.cc
index 0849f76..73e2e08 100644
--- a/webkit/glue/webkitplatformsupport_impl.cc
+++ b/webkit/glue/webkitplatformsupport_impl.cc
@@ -29,14 +29,15 @@
#include "grit/webkit_chromium_resources.h"
#include "grit/webkit_resources.h"
#include "grit/webkit_strings.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebCookie.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebData.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrameClient.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginListBuilder.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebScreenInfo.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebCookie.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebData.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebVector.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebVector.h"
+#include "ui/base/layout.h"
#include "webkit/glue/webkit_glue.h"
#include "webkit/glue/websocketstreamhandle_impl.h"
#include "webkit/glue/webthread_impl.h"
@@ -369,7 +370,8 @@ WebData loadAudioSpatializationResource(WebKitPlatformSupportImpl* platform,
is_resource_index_good) {
const int kFirstAudioResourceIndex = IDR_AUDIO_SPATIALIZATION_T000_P000;
base::StringPiece resource =
- platform->GetDataResource(kFirstAudioResourceIndex + resource_index);
+ platform->GetDataResource(kFirstAudioResourceIndex + resource_index,
+ ui::SCALE_FACTOR_NONE);
return WebData(resource.data(), resource.size());
}
#endif // IDR_AUDIO_SPATIALIZATION_T000_P000
@@ -381,89 +383,108 @@ WebData loadAudioSpatializationResource(WebKitPlatformSupportImpl* platform,
struct DataResource {
const char* name;
int id;
- float scale_factor;
+ ui::ScaleFactor scale_factor;
};
const DataResource kDataResources[] = {
- { "missingImage", IDR_BROKENIMAGE, 1.0 },
- { "missingImage@2x", IDR_BROKENIMAGE, 2.0 },
+ { "missingImage", IDR_BROKENIMAGE, ui::SCALE_FACTOR_100P },
+ { "missingImage@2x", IDR_BROKENIMAGE, ui::SCALE_FACTOR_200P },
#if defined(OS_ANDROID)
- { "mediaFullscreen", IDR_MEDIA_FULLSCREEN_BUTTON, 1.0 },
+ { "mediaFullscreen", IDR_MEDIA_FULLSCREEN_BUTTON, ui::SCALE_FACTOR_100P },
#endif
- { "mediaPause", IDR_MEDIA_PAUSE_BUTTON, 1.0 },
- { "mediaPlay", IDR_MEDIA_PLAY_BUTTON, 1.0 },
- { "mediaPlayDisabled", IDR_MEDIA_PLAY_BUTTON_DISABLED, 1.0 },
- { "mediaSoundDisabled", IDR_MEDIA_SOUND_DISABLED, 1.0 },
- { "mediaSoundFull", IDR_MEDIA_SOUND_FULL_BUTTON, 1.0 },
- { "mediaSoundNone", IDR_MEDIA_SOUND_NONE_BUTTON, 1.0 },
- { "mediaSliderThumb", IDR_MEDIA_SLIDER_THUMB, 1.0 },
- { "mediaVolumeSliderThumb", IDR_MEDIA_VOLUME_SLIDER_THUMB, 1.0 },
- { "mediaplayerPause", IDR_MEDIAPLAYER_PAUSE_BUTTON, 1.0 },
- { "mediaplayerPauseHover", IDR_MEDIAPLAYER_PAUSE_BUTTON_HOVER, 1.0 },
- { "mediaplayerPauseDown", IDR_MEDIAPLAYER_PAUSE_BUTTON_DOWN, 1.0 },
- { "mediaplayerPlay", IDR_MEDIAPLAYER_PLAY_BUTTON, 1.0 },
- { "mediaplayerPlayHover", IDR_MEDIAPLAYER_PLAY_BUTTON_HOVER, 1.0 },
- { "mediaplayerPlayDown", IDR_MEDIAPLAYER_PLAY_BUTTON_DOWN, 1.0 },
- { "mediaplayerPlayDisabled", IDR_MEDIAPLAYER_PLAY_BUTTON_DISABLED, 1.0 },
- { "mediaplayerSoundLevel3", IDR_MEDIAPLAYER_SOUND_LEVEL3_BUTTON, 1.0 },
+ { "mediaPause", IDR_MEDIA_PAUSE_BUTTON, ui::SCALE_FACTOR_100P },
+ { "mediaPlay", IDR_MEDIA_PLAY_BUTTON, ui::SCALE_FACTOR_100P },
+ { "mediaPlayDisabled",
+ IDR_MEDIA_PLAY_BUTTON_DISABLED, ui::SCALE_FACTOR_100P },
+ { "mediaSoundDisabled", IDR_MEDIA_SOUND_DISABLED, ui::SCALE_FACTOR_100P },
+ { "mediaSoundFull", IDR_MEDIA_SOUND_FULL_BUTTON, ui::SCALE_FACTOR_100P },
+ { "mediaSoundNone", IDR_MEDIA_SOUND_NONE_BUTTON, ui::SCALE_FACTOR_100P },
+ { "mediaSliderThumb", IDR_MEDIA_SLIDER_THUMB, ui::SCALE_FACTOR_100P },
+ { "mediaVolumeSliderThumb",
+ IDR_MEDIA_VOLUME_SLIDER_THUMB, ui::SCALE_FACTOR_100P },
+ { "mediaplayerPause", IDR_MEDIAPLAYER_PAUSE_BUTTON, ui::SCALE_FACTOR_100P },
+ { "mediaplayerPauseHover",
+ IDR_MEDIAPLAYER_PAUSE_BUTTON_HOVER, ui::SCALE_FACTOR_100P },
+ { "mediaplayerPauseDown",
+ IDR_MEDIAPLAYER_PAUSE_BUTTON_DOWN, ui::SCALE_FACTOR_100P },
+ { "mediaplayerPlay", IDR_MEDIAPLAYER_PLAY_BUTTON, ui::SCALE_FACTOR_100P },
+ { "mediaplayerPlayHover",
+ IDR_MEDIAPLAYER_PLAY_BUTTON_HOVER, ui::SCALE_FACTOR_100P },
+ { "mediaplayerPlayDown",
+ IDR_MEDIAPLAYER_PLAY_BUTTON_DOWN, ui::SCALE_FACTOR_100P },
+ { "mediaplayerPlayDisabled",
+ IDR_MEDIAPLAYER_PLAY_BUTTON_DISABLED, ui::SCALE_FACTOR_100P },
+ { "mediaplayerSoundLevel3",
+ IDR_MEDIAPLAYER_SOUND_LEVEL3_BUTTON, ui::SCALE_FACTOR_100P },
{ "mediaplayerSoundLevel3Hover",
- IDR_MEDIAPLAYER_SOUND_LEVEL3_BUTTON_HOVER, 1.0 },
+ IDR_MEDIAPLAYER_SOUND_LEVEL3_BUTTON_HOVER, ui::SCALE_FACTOR_100P },
{ "mediaplayerSoundLevel3Down",
- IDR_MEDIAPLAYER_SOUND_LEVEL3_BUTTON_DOWN, 1.0 },
- { "mediaplayerSoundLevel2", IDR_MEDIAPLAYER_SOUND_LEVEL2_BUTTON, 1.0 },
+ IDR_MEDIAPLAYER_SOUND_LEVEL3_BUTTON_DOWN, ui::SCALE_FACTOR_100P },
+ { "mediaplayerSoundLevel2",
+ IDR_MEDIAPLAYER_SOUND_LEVEL2_BUTTON, ui::SCALE_FACTOR_100P },
{ "mediaplayerSoundLevel2Hover",
- IDR_MEDIAPLAYER_SOUND_LEVEL2_BUTTON_HOVER, 1.0 },
+ IDR_MEDIAPLAYER_SOUND_LEVEL2_BUTTON_HOVER, ui::SCALE_FACTOR_100P },
{ "mediaplayerSoundLevel2Down",
- IDR_MEDIAPLAYER_SOUND_LEVEL2_BUTTON_DOWN, 1.0 },
- { "mediaplayerSoundLevel1", IDR_MEDIAPLAYER_SOUND_LEVEL1_BUTTON, 1.0 },
+ IDR_MEDIAPLAYER_SOUND_LEVEL2_BUTTON_DOWN, ui::SCALE_FACTOR_100P },
+ { "mediaplayerSoundLevel1",
+ IDR_MEDIAPLAYER_SOUND_LEVEL1_BUTTON, ui::SCALE_FACTOR_100P },
{ "mediaplayerSoundLevel1Hover",
- IDR_MEDIAPLAYER_SOUND_LEVEL1_BUTTON_HOVER, 1.0 },
+ IDR_MEDIAPLAYER_SOUND_LEVEL1_BUTTON_HOVER, ui::SCALE_FACTOR_100P },
{ "mediaplayerSoundLevel1Down",
- IDR_MEDIAPLAYER_SOUND_LEVEL1_BUTTON_DOWN, 1.0 },
- { "mediaplayerSoundLevel0", IDR_MEDIAPLAYER_SOUND_LEVEL0_BUTTON, 1.0 },
+ IDR_MEDIAPLAYER_SOUND_LEVEL1_BUTTON_DOWN, ui::SCALE_FACTOR_100P },
+ { "mediaplayerSoundLevel0",
+ IDR_MEDIAPLAYER_SOUND_LEVEL0_BUTTON, ui::SCALE_FACTOR_100P },
{ "mediaplayerSoundLevel0Hover",
- IDR_MEDIAPLAYER_SOUND_LEVEL0_BUTTON_HOVER, 1.0 },
+ IDR_MEDIAPLAYER_SOUND_LEVEL0_BUTTON_HOVER, ui::SCALE_FACTOR_100P },
{ "mediaplayerSoundLevel0Down",
- IDR_MEDIAPLAYER_SOUND_LEVEL0_BUTTON_DOWN, 1.0 },
- { "mediaplayerSoundDisabled", IDR_MEDIAPLAYER_SOUND_DISABLED, 1.0 },
- { "mediaplayerSliderThumb", IDR_MEDIAPLAYER_SLIDER_THUMB, 1.0 },
- { "mediaplayerSliderThumbHover", IDR_MEDIAPLAYER_SLIDER_THUMB_HOVER, 1.0 },
- { "mediaplayerSliderThumbDown", IDR_MEDIAPLAYER_SLIDER_THUMB_DOWN, 1.0 },
- { "mediaplayerVolumeSliderThumb", IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB, 1.0 },
+ IDR_MEDIAPLAYER_SOUND_LEVEL0_BUTTON_DOWN, ui::SCALE_FACTOR_100P },
+ { "mediaplayerSoundDisabled",
+ IDR_MEDIAPLAYER_SOUND_DISABLED, ui::SCALE_FACTOR_100P },
+ { "mediaplayerSliderThumb",
+ IDR_MEDIAPLAYER_SLIDER_THUMB, ui::SCALE_FACTOR_100P },
+ { "mediaplayerSliderThumbHover",
+ IDR_MEDIAPLAYER_SLIDER_THUMB_HOVER, ui::SCALE_FACTOR_100P },
+ { "mediaplayerSliderThumbDown",
+ IDR_MEDIAPLAYER_SLIDER_THUMB_DOWN, ui::SCALE_FACTOR_100P },
+ { "mediaplayerVolumeSliderThumb",
+ IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB, ui::SCALE_FACTOR_100P },
{ "mediaplayerVolumeSliderThumbHover",
- IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_HOVER, 1.0 },
+ IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_HOVER, ui::SCALE_FACTOR_100P },
{ "mediaplayerVolumeSliderThumbDown",
- IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_DOWN, 1.0 },
+ IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_DOWN, ui::SCALE_FACTOR_100P },
{ "mediaplayerVolumeSliderThumbDisabled",
- IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_DISABLED, 1.0 },
- { "mediaplayerFullscreen", IDR_MEDIAPLAYER_FULLSCREEN_BUTTON, 1.0 },
+ IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_DISABLED, ui::SCALE_FACTOR_100P },
+ { "mediaplayerFullscreen",
+ IDR_MEDIAPLAYER_FULLSCREEN_BUTTON, ui::SCALE_FACTOR_100P },
{ "mediaplayerFullscreenHover",
- IDR_MEDIAPLAYER_FULLSCREEN_BUTTON_HOVER, 1.0 },
- { "mediaplayerFullscreenDown", IDR_MEDIAPLAYER_FULLSCREEN_BUTTON_DOWN, 1.0 },
+ IDR_MEDIAPLAYER_FULLSCREEN_BUTTON_HOVER, ui::SCALE_FACTOR_100P },
+ { "mediaplayerFullscreenDown",
+ IDR_MEDIAPLAYER_FULLSCREEN_BUTTON_DOWN, ui::SCALE_FACTOR_100P },
{ "mediaplayerFullscreenDisabled",
- IDR_MEDIAPLAYER_FULLSCREEN_BUTTON_DISABLED, 1.0 },
+ IDR_MEDIAPLAYER_FULLSCREEN_BUTTON_DISABLED, ui::SCALE_FACTOR_100P },
#if defined(OS_MACOSX)
- { "overhangPattern", IDR_OVERHANG_PATTERN, 1.0 },
+ { "overhangPattern", IDR_OVERHANG_PATTERN, ui::SCALE_FACTOR_100P },
#endif
- { "panIcon", IDR_PAN_SCROLL_ICON, 1.0 },
- { "searchCancel", IDR_SEARCH_CANCEL, 1.0 },
- { "searchCancelPressed", IDR_SEARCH_CANCEL_PRESSED, 1.0 },
- { "searchMagnifier", IDR_SEARCH_MAGNIFIER, 1.0 },
- { "searchMagnifierResults", IDR_SEARCH_MAGNIFIER_RESULTS, 1.0 },
- { "textAreaResizeCorner", IDR_TEXTAREA_RESIZER, 1.0 },
- { "textAreaResizeCorner@2x", IDR_TEXTAREA_RESIZER, 2.0 },
- { "tickmarkDash", IDR_TICKMARK_DASH, 1.0 },
- { "inputSpeech", IDR_INPUT_SPEECH, 1.0 },
- { "inputSpeechRecording", IDR_INPUT_SPEECH_RECORDING, 1.0 },
- { "inputSpeechWaiting", IDR_INPUT_SPEECH_WAITING, 1.0 },
- { "americanExpressCC", IDR_AUTOFILL_CC_AMEX, 1.0 },
- { "dinersCC", IDR_AUTOFILL_CC_DINERS, 1.0 },
- { "discoverCC", IDR_AUTOFILL_CC_DISCOVER, 1.0 },
- { "genericCC", IDR_AUTOFILL_CC_GENERIC, 1.0 },
- { "jcbCC", IDR_AUTOFILL_CC_JCB, 1.0 },
- { "masterCardCC", IDR_AUTOFILL_CC_MASTERCARD, 1.0 },
- { "soloCC", IDR_AUTOFILL_CC_SOLO, 1.0 },
- { "visaCC", IDR_AUTOFILL_CC_VISA, 1.0 },
+ { "panIcon", IDR_PAN_SCROLL_ICON, ui::SCALE_FACTOR_100P },
+ { "searchCancel", IDR_SEARCH_CANCEL, ui::SCALE_FACTOR_100P },
+ { "searchCancelPressed", IDR_SEARCH_CANCEL_PRESSED, ui::SCALE_FACTOR_100P },
+ { "searchMagnifier", IDR_SEARCH_MAGNIFIER, ui::SCALE_FACTOR_100P },
+ { "searchMagnifierResults",
+ IDR_SEARCH_MAGNIFIER_RESULTS, ui::SCALE_FACTOR_100P },
+ { "textAreaResizeCorner", IDR_TEXTAREA_RESIZER, ui::SCALE_FACTOR_100P },
+ { "textAreaResizeCorner@2x", IDR_TEXTAREA_RESIZER, ui::SCALE_FACTOR_200P },
+ { "tickmarkDash", IDR_TICKMARK_DASH, ui::SCALE_FACTOR_100P },
+ { "inputSpeech", IDR_INPUT_SPEECH, ui::SCALE_FACTOR_100P },
+ { "inputSpeechRecording", IDR_INPUT_SPEECH_RECORDING, ui::SCALE_FACTOR_100P },
+ { "inputSpeechWaiting", IDR_INPUT_SPEECH_WAITING, ui::SCALE_FACTOR_100P },
+ { "americanExpressCC", IDR_AUTOFILL_CC_AMEX, ui::SCALE_FACTOR_100P },
+ { "dinersCC", IDR_AUTOFILL_CC_DINERS, ui::SCALE_FACTOR_100P },
+ { "discoverCC", IDR_AUTOFILL_CC_DISCOVER, ui::SCALE_FACTOR_100P },
+ { "genericCC", IDR_AUTOFILL_CC_GENERIC, ui::SCALE_FACTOR_100P },
+ { "jcbCC", IDR_AUTOFILL_CC_JCB, ui::SCALE_FACTOR_100P },
+ { "masterCardCC", IDR_AUTOFILL_CC_MASTERCARD, ui::SCALE_FACTOR_100P },
+ { "soloCC", IDR_AUTOFILL_CC_SOLO, ui::SCALE_FACTOR_100P },
+ { "visaCC", IDR_AUTOFILL_CC_VISA, ui::SCALE_FACTOR_100P },
};
} // namespace
@@ -484,8 +505,8 @@ WebData WebKitPlatformSupportImpl::loadResource(const char* name) {
for (size_t i = 0; i < arraysize(kDataResources); ++i) {
if (!strcmp(name, kDataResources[i].name)) {
base::StringPiece resource =
- GetImageResource(kDataResources[i].id,
- kDataResources[i].scale_factor);
+ GetDataResource(kDataResources[i].id,
+ kDataResources[i].scale_factor);
return WebData(resource.data(), resource.size());
}
}
diff --git a/webkit/glue/webkitplatformsupport_impl.h b/webkit/glue/webkitplatformsupport_impl.h
index c58eb86..46dd048 100644
--- a/webkit/glue/webkitplatformsupport_impl.h
+++ b/webkit/glue/webkitplatformsupport_impl.h
@@ -10,6 +10,7 @@
#include "base/threading/thread_local_storage.h"
#include "base/timer.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebKitPlatformSupport.h"
+#include "ui/base/layout.h"
#include "webkit/glue/resource_loader_bridge.h"
#include "webkit/glue/webkit_glue_export.h"
@@ -119,13 +120,8 @@ class WEBKIT_GLUE_EXPORT WebKitPlatformSupportImpl :
// Returns the raw data for a resource. This resource must have been
// specified as BINDATA in the relevant .rc file.
- virtual base::StringPiece GetDataResource(int resource_id) = 0;
-
- // Returns the raw data for an image resource with a scale factor as close as
- // is available to |scale_factor|. This resource must have been specified as
- // BINDATA in the relevant .rc file.
- virtual base::StringPiece GetImageResource(int resource_id,
- float scale_factor) = 0;
+ virtual base::StringPiece GetDataResource(int resource_id,
+ ui::ScaleFactor scale_factor) = 0;
// Returns the list of plugins.
virtual void GetPlugins(bool refresh,
diff --git a/webkit/support/platform_support_android.cc b/webkit/support/platform_support_android.cc
index 79a9cd3..dd6c914 100644
--- a/webkit/support/platform_support_android.cc
+++ b/webkit/support/platform_support_android.cc
@@ -61,13 +61,9 @@ string16 TestWebKitPlatformSupport::GetLocalizedString(int message_id) {
return ResourceBundle::GetSharedInstance().GetLocalizedString(message_id);
}
-base::StringPiece TestWebKitPlatformSupport::GetDataResource(int resource_id) {
- return ResourceBundle::GetSharedInstance().GetRawDataResource(resource_id);
-}
-
-base::StringPiece TestWebKitPlatformSupport::GetImageResource(
+base::StringPiece TestWebKitPlatformSupport::GetDataResource(
int resource_id,
- float scale_factor) {
+ ui::ScaleFactor scale_factor) {
FilePath resources_path;
PathService::Get(base::DIR_EXE, &resources_path);
resources_path = resources_path.Append("DumpRenderTree_resources");
@@ -94,6 +90,6 @@ base::StringPiece TestWebKitPlatformSupport::GetImageResource(
}
}
- // TODO(flackr): Pass scale_factor to ResourceBundle.
- return ResourceBundle::GetSharedInstance().GetRawDataResource(resource_id);
+ return ResourceBundle::GetSharedInstance().GetRawDataResource(
+ resource_id, scale_factor);
}
diff --git a/webkit/support/platform_support_linux.cc b/webkit/support/platform_support_linux.cc
index e777546..c696443 100644
--- a/webkit/support/platform_support_linux.cc
+++ b/webkit/support/platform_support_linux.cc
@@ -45,13 +45,9 @@ string16 TestWebKitPlatformSupport::GetLocalizedString(int message_id) {
return ResourceBundle::GetSharedInstance().GetLocalizedString(message_id);
}
-base::StringPiece TestWebKitPlatformSupport::GetDataResource(int resource_id) {
- return ResourceBundle::GetSharedInstance().GetRawDataResource(resource_id);
-}
-
-base::StringPiece TestWebKitPlatformSupport::GetImageResource(
+base::StringPiece TestWebKitPlatformSupport::GetDataResource(
int resource_id,
- float scale_factor) {
+ ui::ScaleFactor scale_factor) {
FilePath resources_path;
PathService::Get(base::DIR_EXE, &resources_path);
resources_path = resources_path.Append("DumpRenderTree_resources");
@@ -78,6 +74,6 @@ base::StringPiece TestWebKitPlatformSupport::GetImageResource(
}
}
- // TODO(flackr): Pass scale_factor to ResourceBundle.
- return ResourceBundle::GetSharedInstance().GetRawDataResource(resource_id);
+ return ResourceBundle::GetSharedInstance().GetRawDataResource(
+ resource_id, scale_factor);
}
diff --git a/webkit/support/platform_support_mac.mm b/webkit/support/platform_support_mac.mm
index f26ae69..f7d4e33 100644
--- a/webkit/support/platform_support_mac.mm
+++ b/webkit/support/platform_support_mac.mm
@@ -103,7 +103,7 @@ void AfterInitialize(bool unit_test_mode) {
return; // We don't have a resource pack when running the unit-tests.
// Load a data pack.
- g_resource_data_pack = new ui::DataPack(ui::ResourceHandle::kScaleFactor100x);
+ g_resource_data_pack = new ui::DataPack(ui::SCALE_FACTOR_100P);
NSString* resource_path =
[base::mac::FrameworkBundle() pathForResource:@"DumpRenderTree"
ofType:@"pak"];
@@ -216,16 +216,9 @@ static FilePath GetResourcesFilePath() {
return path.AppendASCII("Resources");
}
-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(
+base::StringPiece TestWebKitPlatformSupport::GetDataResource(
int resource_id,
- float scale_factor) {
+ ui::ScaleFactor 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 c385ccc..249a533 100644
--- a/webkit/support/platform_support_win.cc
+++ b/webkit/support/platform_support_win.cc
@@ -72,13 +72,9 @@ string16 TestWebKitPlatformSupport::GetLocalizedString(int message_id) {
return string16(localized, length);
}
-base::StringPiece TestWebKitPlatformSupport::GetDataResource(int resource_id) {
- return ResourceProvider(resource_id);
-}
-
-base::StringPiece TestWebKitPlatformSupport::GetImageResource(
+base::StringPiece TestWebKitPlatformSupport::GetDataResource(
int resource_id,
- float scale_factor) {
+ ui::ScaleFactor scale_factor) {
switch (resource_id) {
case IDR_BROKENIMAGE: {
// Use webkit's broken image icon (16x16)
diff --git a/webkit/support/test_webkit_platform_support.h b/webkit/support/test_webkit_platform_support.h
index 238d008..b5c78ad 100644
--- a/webkit/support/test_webkit_platform_support.h
+++ b/webkit/support/test_webkit_platform_support.h
@@ -111,9 +111,9 @@ class TestWebKitPlatformSupport :
void setGamepadData(const WebKit::WebGamepads& data);
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 base::StringPiece GetDataResource(
+ int resource_id,
+ ui::ScaleFactor scale_factor) OVERRIDE;
virtual void GetPlugins(bool refresh,
std::vector<webkit::WebPluginInfo>* plugins) OVERRIDE;
virtual webkit_glue::ResourceLoaderBridge* CreateResourceLoader(
diff --git a/webkit/tools/test_shell/test_shell_gtk.cc b/webkit/tools/test_shell/test_shell_gtk.cc
index c99d070..a58d72f 100644
--- a/webkit/tools/test_shell/test_shell_gtk.cc
+++ b/webkit/tools/test_shell/test_shell_gtk.cc
@@ -23,9 +23,10 @@
#include "net/base/mime_util.h"
#include "net/base/net_util.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebPoint.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebPoint.h"
#include "ui/base/gtk/gtk_compat.h"
+#include "ui/base/layout.h"
#include "ui/base/resource/resource_bundle.h"
#include "webkit/glue/resource_loader_bridge.h"
#include "webkit/glue/webkit_glue.h"
@@ -559,7 +560,8 @@ void TestShell::ShowStartupDebuggingDialog() {
// static
base::StringPiece TestShell::ResourceProvider(int key) {
- return ResourceBundle::GetSharedInstance().GetRawDataResource(key);
+ return ResourceBundle::GetSharedInstance().GetRawDataResource(
+ key, ui::SCALE_FACTOR_NONE);
}
//-----------------------------------------------------------------------------
@@ -568,12 +570,9 @@ string16 TestShellWebKitInit::GetLocalizedString(int message_id) {
return ResourceBundle::GetSharedInstance().GetLocalizedString(message_id);
}
-base::StringPiece TestShellWebKitInit::GetDataResource(int resource_id) {
- return TestShell::ResourceProvider(resource_id);
-}
-
-base::StringPiece TestShellWebKitInit::GetImageResource(int resource_id,
- float scale_factor) {
+base::StringPiece TestShellWebKitInit::GetDataResource(
+ int resource_id,
+ ui::ScaleFactor scale_factor) {
switch (resource_id) {
case IDR_BROKENIMAGE:
resource_id = IDR_BROKENIMAGE_TESTSHELL;
diff --git a/webkit/tools/test_shell/test_shell_mac.mm b/webkit/tools/test_shell/test_shell_mac.mm
index 9c38d44..d9b6ac2 100644
--- a/webkit/tools/test_shell/test_shell_mac.mm
+++ b/webkit/tools/test_shell/test_shell_mac.mm
@@ -212,7 +212,7 @@ void TestShell::InitializeTestShell(bool layout_test_mode,
// mmap the data pack which holds strings used by WebCore. This is only
// a fatal error if we're bundled, which means we might be running layout
// tests. This is a harmless failure for test_shell_tests.
- g_resource_data_pack = new ui::DataPack(ui::ResourceHandle::kScaleFactor100x);
+ g_resource_data_pack = new ui::DataPack(ui::SCALE_FACTOR_100P);
NSString *resource_path =
[base::mac::FrameworkBundle() pathForResource:@"test_shell"
ofType:@"pak"];
@@ -630,12 +630,9 @@ string16 TestShellWebKitInit::GetLocalizedString(int message_id) {
return msg;
}
-base::StringPiece TestShellWebKitInit::GetDataResource(int resource_id) {
- return base::StringPiece();
-}
-
-base::StringPiece TestShellWebKitInit::GetImageResource(int resource_id,
- float scale_factor) {
+base::StringPiece TestShellWebKitInit::GetDataResource(
+ int resource_id,
+ ui::ScaleFactor scale_factor) {
switch (resource_id) {
case IDR_BROKENIMAGE: {
// Use webkit's broken image icon (16x16)
diff --git a/webkit/tools/test_shell/test_shell_webkit_init.h b/webkit/tools/test_shell/test_shell_webkit_init.h
index 09f696d..7f0eb93 100644
--- a/webkit/tools/test_shell/test_shell_webkit_init.h
+++ b/webkit/tools/test_shell/test_shell_webkit_init.h
@@ -10,8 +10,8 @@
#include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBFactory.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBKey.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBKeyPath.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSerializedScriptValue.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebStorageNamespace.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSerializedScriptValue.h"
#include "webkit/glue/webclipboard_impl.h"
#include "webkit/glue/webfileutilities_impl.h"
#include "webkit/glue/webkit_glue.h"
@@ -105,9 +105,9 @@ class TestShellWebKitInit : public webkit_glue::WebKitPlatformSupportImpl {
const WebKit::WebGraphicsContext3D::Attributes& attributes);
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 base::StringPiece GetDataResource(
+ int resource_id,
+ ui::ScaleFactor scale_factor) OVERRIDE;
virtual void GetPlugins(bool refresh,
std::vector<webkit::WebPluginInfo>* plugins) OVERRIDE;
virtual webkit_glue::ResourceLoaderBridge* CreateResourceLoader(
diff --git a/webkit/tools/test_shell/test_shell_win.cc b/webkit/tools/test_shell/test_shell_win.cc
index e56530b..70e1e05 100644
--- a/webkit/tools/test_shell/test_shell_win.cc
+++ b/webkit/tools/test_shell/test_shell_win.cc
@@ -21,8 +21,8 @@
#include "base/utf_string_conversions.h"
#include "base/win/resource_util.h"
#include "breakpad/src/client/windows/handler/exception_handler.h"
-#include "grit/webkit_resources.h"
#include "grit/webkit_chromium_resources.h"
+#include "grit/webkit_resources.h"
#include "net/base/net_module.h"
#include "net/url_request/url_request_file_job.h"
#include "skia/ext/bitmap_platform_device.h"
@@ -669,13 +669,10 @@ string16 TestShellWebKitInit::GetLocalizedString(int message_id) {
return string16(localized, length);
}
-base::StringPiece TestShellWebKitInit::GetDataResource(int resource_id) {
- return base::StringPiece();
-}
-
// TODO(tc): Convert this to using resources from test_shell.rc.
-base::StringPiece TestShellWebKitInit::GetImageResource(int resource_id,
- float scale_factor) {
+base::StringPiece TestShellWebKitInit::GetDataResource(
+ int resource_id,
+ ui::ScaleFactor scale_factor) {
switch (resource_id) {
case IDR_BROKENIMAGE: {
// Use webkit's broken image icon (16x16)
generated by cgit v1.1 at 2025-03-06 21:56:58 +0000