Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(21)

Unified Diff: ui/android/resources/ui_resource_android.cc

Issue 1337703002: [Contextual Search] Add support for crushed sprites and animate the search provider icon (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Changes from newt@ review Created 5 years, 3 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:
View side-by-side diff with in-line comments
Download patch
Index: ui/android/resources/ui_resource_android.cc
diff --git a/ui/android/resources/ui_resource_android.cc b/ui/android/resources/ui_resource_android.cc
index bc85bb88666a50033e24bc5d439c364d9ce7d5ab..818b10249f13cadfdce2774172cd784c37f9e116 100644
--- a/ui/android/resources/ui_resource_android.cc
+++ b/ui/android/resources/ui_resource_android.cc
@@ -23,6 +23,14 @@ UIResourceAndroid::~UIResourceAndroid() {
provider_->DeleteUIResource(id_);
}
+const SkBitmap& UIResourceAndroid::GetSkBitmap() {
+ // TODO(twellington): Would it be better to use CreateSkBitmapFromJavaBitmap
+ // directly rather than exposing this method? I mostly did it this way because
pedro (no code reviews) 2015/09/29 01:14:40 I don't know the answer to this question.
Theresa 2015/10/01 01:57:31 Since this is going to undergo another major refac
+ // it was easy/quick to implement w/ our current contextual search code.
+ DCHECK(!bitmap_.empty());
+ return bitmap_;
+}
+
cc::UIResourceBitmap UIResourceAndroid::GetBitmap(cc::UIResourceId uid,
bool resource_lost) {
DCHECK(!bitmap_.empty());

Powered by Google App Engine
This is Rietveld 408576698