cc/layers/ui_resource_layer.cc - Issue 822713002: Update from https://crrev.com/309415

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: cc/layers/ui_resource_layer.cc

Issue 822713002: Update from https://crrev.com/309415 (Closed) Base URL: https://github.com/domokit/mojo.git@master

Patch Set: Created 6 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: cc/layers/ui_resource_layer.cc

diff --git a/cc/layers/ui_resource_layer.cc b/cc/layers/ui_resource_layer.cc

index 9d711feb61e4054a17ca81d620a925fdaeca1613..fd107b1ed07813c791fbb0c590f28660d8024982 100644

--- a/cc/layers/ui_resource_layer.cc

+++ b/cc/layers/ui_resource_layer.cc

@@ -134,6 +134,9 @@ void UIResourceLayer::SetUIResourceId(UIResourceId resource_id) {

if (ui_resource_holder_ && ui_resource_holder_->id() == resource_id)

return;

+ if (!bitmap_.isNull())

+ bitmap_.reset();

if (resource_id)

ui_resource_holder_ = SharedUIResourceHolder::Create(resource_id);

else