skia/ext/SkDiscardableMemory_chrome.cc - Issue 1124763003: Update from https://crrev.com/327068

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: skia/ext/SkDiscardableMemory_chrome.cc

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

Patch Set: update nacl, buildtools, fix display_change_notifier_unittest Created 5 years, 7 months 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: skia/ext/SkDiscardableMemory_chrome.cc

diff --git a/skia/ext/SkDiscardableMemory_chrome.cc b/skia/ext/SkDiscardableMemory_chrome.cc

index 5bb6928d13ceb18a1ffb5e1f6bea8020179d1f8b..1a98720bf36765f75e04b8899b60fffe0da00d54 100644

--- a/skia/ext/SkDiscardableMemory_chrome.cc

+++ b/skia/ext/SkDiscardableMemory_chrome.cc

@@ -14,7 +14,7 @@ bool SkDiscardableMemoryChrome::lock() {

}

void* SkDiscardableMemoryChrome::data() {

- return discardable_->Memory();

+ return discardable_->data();

}

void SkDiscardableMemoryChrome::unlock() {