bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium revision 140240.

Browse Source 
git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@701 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2012-06-21 20:35:13 +00:00
parent 93e1f9722b
commit c56def5569
15 changed files with 82 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cef1/libcef/browser_webkit_init.cc
View File

@@ -259,15 +259,12 @@ string16 BrowserWebKitInit::GetLocalizedString(int message_id) {
return _Context->GetLocalizedString(message_id);
}
base::StringPiece BrowserWebKitInit::GetDataResource(int resource_id) {
base::StringPiece BrowserWebKitInit::GetDataResource(
int resource_id,
ui::ScaleFactor scale_factor) {
return _Context->GetDataResource(resource_id);
}
base::StringPiece BrowserWebKitInit::GetImageResource(int resource_id,
float scale_factor) {
return GetDataResource(resource_id);
}
webkit_glue::ResourceLoaderBridge* BrowserWebKitInit::CreateResourceLoader(
const webkit_glue::ResourceLoaderBridge::RequestInfo& request_info) {
return BrowserResourceLoaderBridge::Create(request_info);