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

Side by Side Diff: android_webview/native/aw_picture.cc

Issue 1492703004: Pass method parameters as JavaParamRef in android_webview. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: forgot to test compile unit tests before uploading, whoops Created 5 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
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "android_webview/native/aw_picture.h" 5 #include "android_webview/native/aw_picture.h"
6 6
7 #include "android_webview/native/java_browser_view_renderer_helper.h" 7 #include "android_webview/native/java_browser_view_renderer_helper.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "jni/AwPicture_jni.h" 9 #include "jni/AwPicture_jni.h"
10 #include "third_party/skia/include/core/SkPicture.h" 10 #include "third_party/skia/include/core/SkPicture.h"
11 11
12 namespace android_webview { 12 namespace android_webview {
13 13
14 AwPicture::AwPicture(skia::RefPtr<SkPicture> picture) 14 AwPicture::AwPicture(skia::RefPtr<SkPicture> picture)
15 : picture_(picture) { 15 : picture_(picture) {
16 DCHECK(picture_); 16 DCHECK(picture_);
17 } 17 }
18 18
19 AwPicture::~AwPicture() {} 19 AwPicture::~AwPicture() {}
20 20
21 void AwPicture::Destroy(JNIEnv* env, jobject obj) { 21 void AwPicture::Destroy(JNIEnv* env, const JavaParamRef<jobject>& obj) {
22 delete this; 22 delete this;
23 } 23 }
24 24
25 jint AwPicture::GetWidth(JNIEnv* env, jobject obj) { 25 jint AwPicture::GetWidth(JNIEnv* env, const JavaParamRef<jobject>& obj) {
26 return picture_->cullRect().roundOut().width(); 26 return picture_->cullRect().roundOut().width();
27 } 27 }
28 28
29 jint AwPicture::GetHeight(JNIEnv* env, jobject obj) { 29 jint AwPicture::GetHeight(JNIEnv* env, const JavaParamRef<jobject>& obj) {
30 return picture_->cullRect().roundOut().height(); 30 return picture_->cullRect().roundOut().height();
31 } 31 }
32 32
33 void AwPicture::Draw(JNIEnv* env, jobject obj, jobject canvas) { 33 void AwPicture::Draw(JNIEnv* env,
34 const JavaParamRef<jobject>& obj,
35 const JavaParamRef<jobject>& canvas) {
34 const SkIRect bounds = picture_->cullRect().roundOut(); 36 const SkIRect bounds = picture_->cullRect().roundOut();
35 scoped_ptr<SoftwareCanvasHolder> canvas_holder = SoftwareCanvasHolder::Create( 37 scoped_ptr<SoftwareCanvasHolder> canvas_holder = SoftwareCanvasHolder::Create(
36 canvas, gfx::Vector2d(), gfx::Size(bounds.width(), bounds.height()), 38 canvas, gfx::Vector2d(), gfx::Size(bounds.width(), bounds.height()),
37 false); 39 false);
38 if (!canvas_holder || !canvas_holder->GetCanvas()) { 40 if (!canvas_holder || !canvas_holder->GetCanvas()) {
39 LOG(ERROR) << "Couldn't draw picture"; 41 LOG(ERROR) << "Couldn't draw picture";
40 return; 42 return;
41 } 43 }
42 picture_->playback(canvas_holder->GetCanvas()); 44 picture_->playback(canvas_holder->GetCanvas());
43 } 45 }
44 46
45 bool RegisterAwPicture(JNIEnv* env) { 47 bool RegisterAwPicture(JNIEnv* env) {
46 return RegisterNativesImpl(env); 48 return RegisterNativesImpl(env);
47 } 49 }
48 50
49 } // namespace android_webview 51 } // namespace android_webview
OLDNEW
« no previous file with comments | « android_webview/native/aw_picture.h ('k') | android_webview/native/aw_quota_manager_bridge_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698