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

Unified Diff: trunk/src/ui/gfx/android/java_bitmap.cc

Issue 25161002: Revert 225857 "gfx: Create a separate gfx component out of ui." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 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
« no previous file with comments | « trunk/src/ui/gfx/android/gfx_jni_registrar.cc ('k') | trunk/src/ui/gfx/gfx.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/ui/gfx/android/java_bitmap.cc
===================================================================
--- trunk/src/ui/gfx/android/java_bitmap.cc (revision 225858)
+++ trunk/src/ui/gfx/android/java_bitmap.cc (working copy)
@@ -39,11 +39,11 @@
// static
bool JavaBitmap::RegisterJavaBitmap(JNIEnv* env) {
- return RegisterNativesImpl(env);
+ return ui::RegisterNativesImpl(env);
}
static ScopedJavaLocalRef<jobject> CreateJavaBitmap(const gfx::Size& size) {
- return Java_BitmapHelper_createBitmap(AttachCurrentThread(),
+ return ui::Java_BitmapHelper_createBitmap(AttachCurrentThread(),
size.width(), size.height());
}
@@ -87,7 +87,7 @@
DCHECK(!size.IsEmpty());
JNIEnv* env = AttachCurrentThread();
ScopedJavaLocalRef<jstring> jname(env, env->NewStringUTF(name));
- ScopedJavaLocalRef<jobject> jobj(Java_BitmapHelper_decodeDrawableResource(
+ ScopedJavaLocalRef<jobject> jobj(ui::Java_BitmapHelper_decodeDrawableResource(
env, jname.obj(), size.width(), size.height()));
if (jobj.is_null())
return SkBitmap();
« no previous file with comments | « trunk/src/ui/gfx/android/gfx_jni_registrar.cc ('k') | trunk/src/ui/gfx/gfx.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698