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 version 21.0.1180.91

Browse Source 
git-svn-id: https://chromiumembedded.googlecode.com/svn/branches/1180@793 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2012-09-24 17:32:34 +00:00
parent a080d1ce6d
commit d8ec4a25ff
4 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cef3/CHROMIUM_BUILD_COMPATIBILITY.txt
View File

@ -16,5 +16,5 @@
# http://dev.chromium.org/developers/how-tos/get-the-code # http://dev.chromium.org/developers/how-tos/get-the-code
{ {
'release_url': 'http://src.chromium.org/svn/releases/21.0.1180.18', 'release_url': 'http://src.chromium.org/svn/releases/21.0.1180.91',
} }

9
cef3/libcef/common/content_client.cc
View File

@ -91,6 +91,15 @@ base::StringPiece CefContentClient::GetDataResource(
return value; return value;
} }
gfx::Image& CefContentClient::GetNativeImageNamed(int resource_id) const {
gfx::Image& value =
ResourceBundle::GetSharedInstance().GetNativeImageNamed(resource_id);
if (value.IsEmpty())
LOG(ERROR) << "No native image available for id " << resource_id;
return value;
}
FilePath CefContentClient::GetPathForResourcePack( FilePath CefContentClient::GetPathForResourcePack(
const FilePath& pack_path, const FilePath& pack_path,
ui::ScaleFactor scale_factor) { ui::ScaleFactor scale_factor) {

1
cef3/libcef/common/content_client.h
View File

@ -33,6 +33,7 @@ class CefContentClient : public content::ContentClient,
virtual base::StringPiece GetDataResource( virtual base::StringPiece GetDataResource(
int resource_id, int resource_id,
ui::ScaleFactor scale_factor) const OVERRIDE; ui::ScaleFactor scale_factor) const OVERRIDE;
virtual gfx::Image& GetNativeImageNamed(int resource_id) const OVERRIDE;
CefRefPtr<CefApp> application() const { return application_; } CefRefPtr<CefApp> application() const { return application_; }

8
cef3/patch/patches/gritsettings.patch
View File

@ -1,17 +1,17 @@
Index: resource_ids Index: resource_ids
=================================================================== ===================================================================
--- resource_ids (revision 131752) --- resource_ids (revision 157234)
+++ resource_ids (working copy) +++ resource_ids (working copy)
@@ -16,6 +16,12 @@ @@ -16,6 +16,12 @@
{ {
"SRCDIR": "../..", "SRCDIR": "../..",
+ "cef/libcef/resources/cef_resources.grd": { + "cef/libcef/resources/cef_resources.grd": {
+ "includes": [26000], + "includes": [27000],
+ }, + },
+ "cef/libcef/resources/cef_strings.grd": { + "cef/libcef/resources/cef_strings.grd": {
+ "messages": [26500], + "messages": [27500],
+ }, + },
"chrome/browser/browser_resources.grd": { "chrome/browser/browser_resources.grd": {
"includes": [500], "includes": [500],
}, "structures": [750],