| Index: content/browser/renderer_host/render_widget_host_impl.cc
|
| diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
|
| index fa74f6f652194d53c5e07cd2fdb26bf78969e1c4..9a8361b22af7c976e514b3dce0ee3b954af7e8da 100644
|
| --- a/content/browser/renderer_host/render_widget_host_impl.cc
|
| +++ b/content/browser/renderer_host/render_widget_host_impl.cc
|
| @@ -305,7 +305,7 @@ int RenderWidgetHostImpl::SyntheticScrollMessageInterval() const {
|
| void RenderWidgetHostImpl::SetOverscrollControllerEnabled(bool enabled) {
|
| if (!enabled)
|
| overscroll_controller_.reset();
|
| - else if (!overscroll_controller_.get())
|
| + else if (!overscroll_controller_)
|
| overscroll_controller_.reset(new OverscrollController(this));
|
| }
|
|
|
| @@ -1028,7 +1028,7 @@ void RenderWidgetHostImpl::ForwardMouseEventImmediately(
|
| // more WM_MOUSEMOVE events than we wish to send to the renderer.
|
| if (mouse_event.type == WebInputEvent::MouseMove) {
|
| if (mouse_move_pending_) {
|
| - if (!next_mouse_move_.get()) {
|
| + if (!next_mouse_move_) {
|
| next_mouse_move_.reset(new WebMouseEvent(mouse_event));
|
| } else {
|
| // Accumulate movement deltas.
|
| @@ -1322,7 +1322,7 @@ void RenderWidgetHostImpl::RendererExited(base::TerminationStatus status,
|
| // Must reset these to ensure that gesture events work with a new renderer.
|
| gesture_event_filter_->Reset();
|
|
|
| - if (overscroll_controller_.get())
|
| + if (overscroll_controller_)
|
| overscroll_controller_->Reset();
|
|
|
| // Must reset these to ensure that keyboard events work with a new renderer.
|
| @@ -1828,7 +1828,7 @@ void RenderWidgetHostImpl::OnInputEventAck(
|
| mouse_move_pending_ = false;
|
|
|
| // now, we can send the next mouse move event
|
| - if (next_mouse_move_.get()) {
|
| + if (next_mouse_move_) {
|
| DCHECK(next_mouse_move_->type == WebInputEvent::MouseMove);
|
| ForwardMouseEvent(*next_mouse_move_);
|
| }
|
| @@ -1946,7 +1946,7 @@ void RenderWidgetHostImpl::TickActiveSmoothScrollGesture() {
|
|
|
| void RenderWidgetHostImpl::OnSelectRangeAck() {
|
| select_range_pending_ = false;
|
| - if (next_selection_range_.get()) {
|
| + if (next_selection_range_) {
|
| scoped_ptr<SelectionRange> next(next_selection_range_.Pass());
|
| SelectRange(next->start, next->end);
|
| }
|
| @@ -1954,7 +1954,7 @@ void RenderWidgetHostImpl::OnSelectRangeAck() {
|
|
|
| void RenderWidgetHostImpl::OnMsgMoveCaretAck() {
|
| move_caret_pending_ = false;
|
| - if (next_move_caret_.get()) {
|
| + if (next_move_caret_) {
|
| scoped_ptr<gfx::Point> next(next_move_caret_.Pass());
|
| MoveCaret(*next);
|
| }
|
| @@ -1963,7 +1963,7 @@ void RenderWidgetHostImpl::OnMsgMoveCaretAck() {
|
| void RenderWidgetHostImpl::ProcessWheelAck(bool processed) {
|
| mouse_wheel_pending_ = false;
|
|
|
| - if (overscroll_controller_.get())
|
| + if (overscroll_controller_)
|
| overscroll_controller_->ReceivedEventACK(current_wheel_event_, processed);
|
|
|
| // Now send the next (coalesced) mouse wheel event.
|
| @@ -1979,7 +1979,7 @@ void RenderWidgetHostImpl::ProcessWheelAck(bool processed) {
|
| }
|
|
|
| void RenderWidgetHostImpl::ProcessGestureAck(bool processed, int type) {
|
| - if (overscroll_controller_.get()) {
|
| + if (overscroll_controller_) {
|
| overscroll_controller_->ReceivedEventACK(
|
| gesture_event_filter_->GetGestureEventAwaitingAck(), processed);
|
| }
|
| @@ -2324,7 +2324,7 @@ void RenderWidgetHostImpl::ScrollFocusedEditableNodeIntoRect(
|
| void RenderWidgetHostImpl::SelectRange(const gfx::Point& start,
|
| const gfx::Point& end) {
|
| if (select_range_pending_) {
|
| - if (!next_selection_range_.get()) {
|
| + if (!next_selection_range_) {
|
| next_selection_range_.reset(new SelectionRange());
|
| }
|
| next_selection_range_->start = start;
|
|
|