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

Unified Diff: android_webview/native/java_browser_view_renderer_helper.cc

Issue 1852513003: Convert //android_webview to use std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: git is hard Created 4 years, 9 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: android_webview/native/java_browser_view_renderer_helper.cc
diff --git a/android_webview/native/java_browser_view_renderer_helper.cc b/android_webview/native/java_browser_view_renderer_helper.cc
index 3a2ec0289b06ffc94de3e8c874d1514db098db50..348926d6c3e6dcb0cba85c6be9c6fd0c5c7f0ce0 100644
--- a/android_webview/native/java_browser_view_renderer_helper.cc
+++ b/android_webview/native/java_browser_view_renderer_helper.cc
@@ -87,7 +87,7 @@ class AuxiliaryCanvasHolder : public SoftwareCanvasHolder {
ScopedJavaLocalRef<jobject> jcanvas_;
ScopedJavaLocalRef<jobject> jbitmap_;
gfx::Vector2d scroll_;
- scoped_ptr<SkBitmap> bitmap_;
+ std::unique_ptr<SkBitmap> bitmap_;
skia::RefPtr<SkCanvas> canvas_;
DISALLOW_COPY_AND_ASSIGN(AuxiliaryCanvasHolder);
};
@@ -149,13 +149,13 @@ void RasterHelperSetAwDrawSWFunctionTable(AwDrawSWFunctionTable* table) {
}
// static
-scoped_ptr<SoftwareCanvasHolder> SoftwareCanvasHolder::Create(
+std::unique_ptr<SoftwareCanvasHolder> SoftwareCanvasHolder::Create(
jobject java_canvas,
const gfx::Vector2d& scroll_correction,
const gfx::Size& auxiliary_bitmap_size,
bool force_auxiliary_bitmap) {
JNIEnv* env = base::android::AttachCurrentThread();
- scoped_ptr<SoftwareCanvasHolder> holder;
+ std::unique_ptr<SoftwareCanvasHolder> holder;
if (!force_auxiliary_bitmap) {
holder.reset(new JavaCanvasHolder(env, java_canvas, scroll_correction));
}
« no previous file with comments | « android_webview/native/java_browser_view_renderer_helper.h ('k') | android_webview/native/net_init_native_callback.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698