base::Bind() conversion for webkit.

webkit/glue/image_resource_fetcher.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/glue/image_resource_fetcher.h"
 
-#include "base/callback.h"
+#include "base/bind.h"

[csilv, 2011/11/21 21:26:31]

add #include "base/bind_helpers.h"

[dcheng, 2011/11/21 22:04:16]

Done.

 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "ui/gfx/size.h"
 #include "webkit/glue/image_decoder.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 using WebKit::WebFrame;
 using WebKit::WebURLRequest;
 using WebKit::WebURLResponse;
 
 namespace webkit_glue {
 
 ImageResourceFetcher::ImageResourceFetcher(
     const GURL& image_url,
     WebFrame* frame,
     int id,
     int image_size,
     WebURLRequest::TargetType target_type,
-    Callback* callback)
+    const Callback& callback)
     : callback_(callback),
       id_(id),
       image_url_(image_url),
       image_size_(image_size) {
   fetcher_.reset(new ResourceFetcher(
       image_url, frame, target_type,
-      NewCallback(this, &ImageResourceFetcher::OnURLFetchComplete)));
+      base::Bind(&ImageResourceFetcher::OnURLFetchComplete,
+                 base::Unretained(this))));
 }
 
 ImageResourceFetcher::~ImageResourceFetcher() {
   if (!fetcher_->completed())
     fetcher_->Cancel();
 }
 
 void ImageResourceFetcher::OnURLFetchComplete(
     const WebURLResponse& response,
     const std::string& data) {
   SkBitmap bitmap;
   if (!response.isNull() && response.httpStatusCode() == 200) {
     // Request succeeded, try to convert it to an image.
     ImageDecoder decoder(gfx::Size(image_size_, image_size_));
     bitmap = decoder.Decode(
         reinterpret_cast<const unsigned char*>(data.data()), data.size());
   } // else case:
     // If we get here, it means no image from server or couldn't decode the
     // response as an image. The delegate will see a null image, indicating
     // that an error occurred.
 
   // Take care to clear callback_ before running the callback as it may lead to
   // our destruction.
-  scoped_ptr<Callback> callback;
-  callback.swap(callback_);
-  callback->Run(this, bitmap);
+  Callback callback = callback_;
+  callback_.Reset();

[awong, 2011/11/21 21:46:56]

This works, but semantically is slightly funny.  I'd just do

// Take a reference to the callback as a stack variable
// before running the callback as it may lead to 
// our destruction.
Callback callback = callback_;
callback.Run(this, bitmap);

[dcheng, 2011/11/21 22:04:16]

Done.

+  callback.Run(this, bitmap);
 }
 
 }  // namespace webkit_glue