diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-01 21:12:40 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-01 21:12:40 +0000 |
| commit | 4d8bb1a91681f8e48cc5e6b7ac29f3723eadf0d5 (patch) | |
| tree | e8e59794adf98f2de8f00299eb3c46fa40c94f02 /webkit | |
| parent | 9c55de8ff9f0f0f4dc907794266e7bbb21e75b66 (diff) | |
| download | chromium_src-4d8bb1a91681f8e48cc5e6b7ac29f3723eadf0d5.zip chromium_src-4d8bb1a91681f8e48cc5e6b7ac29f3723eadf0d5.tar.gz chromium_src-4d8bb1a91681f8e48cc5e6b7ac29f3723eadf0d5.tar.bz2 | |
Add method to load resources without scale
This removes a lot of necessary reference to SCALE_FACTOR_NONE, and eliminate layout.h
I'll cleanup ContentClient in separate CL.
BUG=156569
TEST=none. no functional change.
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=165444
Review URL: https://chromiumcodereview.appspot.com/11341003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165500 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/support/platform_support_android.cc | 2 | ||||
| -rw-r--r-- | webkit/support/platform_support_linux.cc | 2 | ||||
| -rw-r--r-- | webkit/tools/test_shell/test_shell_gtk.cc | 3 |
3 files changed, 3 insertions, 4 deletions
diff --git a/webkit/support/platform_support_android.cc b/webkit/support/platform_support_android.cc index 278e517..581f230d 100644 --- a/webkit/support/platform_support_android.cc +++ b/webkit/support/platform_support_android.cc @@ -118,6 +118,6 @@ base::StringPiece TestWebKitPlatformSupport::GetDataResource( } } - return ResourceBundle::GetSharedInstance().GetRawDataResource( + return ResourceBundle::GetSharedInstance().GetRawDataResourceForScale( resource_id, scale_factor); } diff --git a/webkit/support/platform_support_linux.cc b/webkit/support/platform_support_linux.cc index 0ee9310..fa795f9 100644 --- a/webkit/support/platform_support_linux.cc +++ b/webkit/support/platform_support_linux.cc @@ -71,6 +71,6 @@ base::StringPiece TestWebKitPlatformSupport::GetDataResource( } } - return ResourceBundle::GetSharedInstance().GetRawDataResource( + return ResourceBundle::GetSharedInstance().GetRawDataResourceForScale( resource_id, scale_factor); } diff --git a/webkit/tools/test_shell/test_shell_gtk.cc b/webkit/tools/test_shell/test_shell_gtk.cc index 82c3573..58093c4 100644 --- a/webkit/tools/test_shell/test_shell_gtk.cc +++ b/webkit/tools/test_shell/test_shell_gtk.cc @@ -560,8 +560,7 @@ void TestShell::ShowStartupDebuggingDialog() { // static base::StringPiece TestShell::ResourceProvider(int key) { - return ResourceBundle::GetSharedInstance().GetRawDataResource( - key, ui::SCALE_FACTOR_NONE); + return ResourceBundle::GetSharedInstance().GetRawDataResource(key); } //----------------------------------------------------------------------------- |