base::Bind() conversion in renderer_host.

chrome/browser/renderer_host/render_widget_host_view_views.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 "chrome/browser/renderer_host/render_widget_host_view_views.h"
 
 #include <algorithm>
 #include <string>
 
+#include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/string_number_conversions.h"
-#include "base/task.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/native_web_keyboard_event_views.h"
 #include "chrome/common/render_messages.h"
 #include "content/browser/renderer_host/backing_store_skia.h"
 #include "content/browser/renderer_host/render_widget_host.h"
 #include "content/common/view_messages.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/common/result_codes.h"
@@ skipping 89 matching lines @@
       is_hidden_(false),
       is_loading_(false),
       native_cursor_(gfx::kNullCursor),
       is_showing_context_menu_(false),
       visually_deemphasized_(false),
       touch_event_(),
       text_input_type_(ui::TEXT_INPUT_TYPE_NONE),
       has_composition_text_(false),
       ALLOW_THIS_IN_INITIALIZER_LIST(touch_selection_controller_(
           views::TouchSelectionController::create(this))),
-      ALLOW_THIS_IN_INITIALIZER_LIST(update_touch_selection_(this)) {
+      ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
   set_focusable(true);
   host_->SetView(this);
 
 #if defined(TOUCH_UI)
   SetPaintToLayer(true);
   registrar_.Add(this,
                  chrome::NOTIFICATION_KEYBOARD_VISIBLE_BOUNDS_CHANGED,
                  content::NotificationService::AllSources());
 #endif
 }
@@ skipping 57 matching lines @@
   // If we receive any more paint messages while we are hidden, we want to
   // ignore them so we don't re-allocate the backing store.  We will paint
   // everything again when we become selected again.
   is_hidden_ = true;
 
   // If we have a renderer, then inform it that we are being hidden so it can
   // reduce its resource utilization.
   if (host_)
     host_->WasHidden();
 
-  if (!update_touch_selection_.empty())
-    update_touch_selection_.RevokeAll();
+  weak_factory_.InvalidateWeakPtrs();
 }
 
 void RenderWidgetHostViewViews::SetSize(const gfx::Size& size) {
   // This is called when webkit has sent us a Move message.
   int width = std::min(size.width(), kMaxWindowWidth);
   int height = std::min(size.height(), kMaxWindowHeight);
   if (requested_size_.width() != width ||
       requested_size_.height() != height) {
     requested_size_ = gfx::Size(width, height);
     views::View::SetBounds(x(), y(), width, height);
@@ skipping 189 matching lines @@
     input_method->OnCaretBoundsChanged(this);
 
   // TODO(sad): This is a workaround for a webkit bug:
   // https://bugs.webkit.org/show_bug.cgi?id=67464
   // Remove this when the bug gets fixed.
   //
   // Webkit can send spurious selection-change on text-input (e.g. when
   // inserting text at the beginning of a non-empty text control). But in those
   // cases, it does send the correct selection information quickly afterwards.
   // So delay the notification to the touch-selection controller.
-  if (update_touch_selection_.empty()) {
+  if (!weak_factory_.HasWeakPtrs()) {
     MessageLoop::current()->PostDelayedTask(FROM_HERE,
-        update_touch_selection_.NewRunnableMethod(
-          &RenderWidgetHostViewViews::UpdateTouchSelectionController),
+        base::Bind(
+          &RenderWidgetHostViewViews::UpdateTouchSelectionController,
+          weak_factory_.GetWeakPtr()),
         kTouchControllerUpdateDelay);
   }
 }
 
 void RenderWidgetHostViewViews::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
 #if defined(TOUCH_UI)
   if (type != chrome::NOTIFICATION_KEYBOARD_VISIBLE_BOUNDS_CHANGED) {
@@ skipping 738 matching lines @@
   for (std::vector< base::Callback<void(void)> >::const_iterator
       it = on_compositing_ended_callbacks_.begin();
       it != on_compositing_ended_callbacks_.end(); ++it) {
     it->Run();
   }
   on_compositing_ended_callbacks_.clear();
   compositor->RemoveObserver(this);
 }
 
 #endif