Skip to content

Commit

Permalink
chromecast: Restore CastContentClient::GetDataResourceBytes
Browse files Browse the repository at this point in the history
Since 7c48a70 ("Compression of IDR_SECURITY_INTERSTITIAL_HTML and
modified compression function.") cast devices fail to boot in a crash
loop since CastContentClient::GetDataResourceBytes was removed
incorrectly. Add it back.

Bug: b/139161866
Test: boot

Change-Id: Iaaa5ac6a66823fbe0bc7df0132d56d66f0983712
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1776725
Reviewed-by: Luke Halliwell <halliwell@chromium.org>
Commit-Queue: Michael Spang <spang@chromium.org>
Auto-Submit: Michael Spang <spang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#692127}
  • Loading branch information
mspang authored and Commit Bot committed Aug 30, 2019
1 parent 69cd05f commit a06ba1d
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 0 deletions.
6 changes: 6 additions & 0 deletions chromecast/common/cast_content_client.cc
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,12 @@ base::StringPiece CastContentClient::GetDataResource(
resource_id, scale_factor);
}

base::RefCountedMemory* CastContentClient::GetDataResourceBytes(
int resource_id) {
return ui::ResourceBundle::GetSharedInstance().LoadDataResourceBytes(
resource_id);
}

gfx::Image& CastContentClient::GetNativeImageNamed(int resource_id) {
return ui::ResourceBundle::GetSharedInstance().GetNativeImageNamed(
resource_id);
Expand Down
1 change: 1 addition & 0 deletions chromecast/common/cast_content_client.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ class CastContentClient : public content::ContentClient {
base::string16 GetLocalizedString(int message_id) override;
base::StringPiece GetDataResource(int resource_id,
ui::ScaleFactor scale_factor) override;
base::RefCountedMemory* GetDataResourceBytes(int resource_id) override;
gfx::Image& GetNativeImageNamed(int resource_id) override;
#if defined(OS_ANDROID)
::media::MediaDrmBridgeClient* GetMediaDrmBridgeClient() override;
Expand Down

0 comments on commit a06ba1d

Please sign in to comment.