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

Side by Side Diff: ui/android/resources/ui_resource_android.cc

Issue 731133002: Upstream ResourceManager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rename namespace 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:
View unified diff | Download patch
OLDNEW
(Empty)
1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file.
4
5 #include "ui/android/resources/ui_resource_android.h"
6
7 #include "base/logging.h"
no sievers 2014/12/02 00:25:06 nit: unused
Jaekyun Seok (inactive) 2014/12/02 03:13:13 DCHECK requires this.
8 #include "content/public/browser/android/ui_resource_provider.h"
9
10 namespace ui {
11
12 scoped_ptr<UIResourceAndroid> UIResourceAndroid::CreateFromJavaBitmap(
13 content::UIResourceProvider* provider,
14 jobject bitmap_object) {
15 if (!bitmap_object)
no sievers 2014/12/02 00:25:06 Why do we need to handle this? Should it be DCHECK
Jaekyun Seok (inactive) 2014/12/02 03:13:12 This method isn't used at all. I will remove it.
16 return make_scoped_ptr(new UIResourceAndroid(provider, SkBitmap()));
17
18 const gfx::JavaBitmap java_bitmap_lock(bitmap_object);
19 return UIResourceAndroid::CreateFromJavaBitmap(provider, java_bitmap_lock);
20 }
21
22 scoped_ptr<UIResourceAndroid> UIResourceAndroid::CreateFromJavaBitmap(
23 content::UIResourceProvider* provider,
24 const gfx::JavaBitmap& java_bitmap) {
25 SkBitmap skbitmap = gfx::CreateSkBitmapFromJavaBitmap(java_bitmap);
26 skbitmap.setImmutable();
27
28 return make_scoped_ptr(new UIResourceAndroid(provider, skbitmap));
29 }
30
31 UIResourceAndroid::~UIResourceAndroid() {
32 if (id_ && provider_)
33 provider_->DeleteUIResource(id_);
34 }
35
36 cc::UIResourceBitmap UIResourceAndroid::GetBitmap(cc::UIResourceId uid,
37 bool resource_lost) {
38 DCHECK(!bitmap_.empty());
39 return cc::UIResourceBitmap(bitmap_);
40 }
41
42 cc::UIResourceId UIResourceAndroid::id() {
43 if (id_)
44 return id_;
45 if (!provider_ || bitmap_.empty())
46 return 0;
47 id_ = provider_->CreateUIResource(this);
48 return id_;
49 }
50
51 void UIResourceAndroid::UIResourceIsInvalid() {
52 id_ = 0;
53 }
54
55 UIResourceAndroid::UIResourceAndroid(content::UIResourceProvider* provider,
56 const SkBitmap& skbitmap)
57 : provider_(provider), bitmap_(skbitmap), id_(0) {
58 }
59
60 } // namespace ui
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698