diff --git a/cef3/CHROMIUM_BUILD_COMPATIBILITY.txt b/cef3/CHROMIUM_BUILD_COMPATIBILITY.txt index 3e6458c5b..a01b3d62e 100644 --- a/cef3/CHROMIUM_BUILD_COMPATIBILITY.txt +++ b/cef3/CHROMIUM_BUILD_COMPATIBILITY.txt @@ -16,5 +16,5 @@ # 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', } diff --git a/cef3/libcef/common/content_client.cc b/cef3/libcef/common/content_client.cc index 1770cf2cc..dfe6d89ed 100644 --- a/cef3/libcef/common/content_client.cc +++ b/cef3/libcef/common/content_client.cc @@ -91,6 +91,15 @@ base::StringPiece CefContentClient::GetDataResource( 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( const FilePath& pack_path, ui::ScaleFactor scale_factor) { diff --git a/cef3/libcef/common/content_client.h b/cef3/libcef/common/content_client.h index 095d81b6d..8f562e9e2 100644 --- a/cef3/libcef/common/content_client.h +++ b/cef3/libcef/common/content_client.h @@ -33,6 +33,7 @@ class CefContentClient : public content::ContentClient, virtual base::StringPiece GetDataResource( int resource_id, ui::ScaleFactor scale_factor) const OVERRIDE; + virtual gfx::Image& GetNativeImageNamed(int resource_id) const OVERRIDE; CefRefPtr application() const { return application_; } diff --git a/cef3/patch/patches/gritsettings.patch b/cef3/patch/patches/gritsettings.patch index b9863299a..0dbe4df0d 100644 --- a/cef3/patch/patches/gritsettings.patch +++ b/cef3/patch/patches/gritsettings.patch @@ -1,17 +1,17 @@ Index: resource_ids =================================================================== ---- resource_ids (revision 131752) +--- resource_ids (revision 157234) +++ resource_ids (working copy) @@ -16,6 +16,12 @@ { "SRCDIR": "../..", + "cef/libcef/resources/cef_resources.grd": { -+ "includes": [26000], ++ "includes": [27000], + }, + "cef/libcef/resources/cef_strings.grd": { -+ "messages": [26500], ++ "messages": [27500], + }, "chrome/browser/browser_resources.grd": { "includes": [500], - }, + "structures": [750],