OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "content/browser/renderer_host/render_widget_host_view_win.h" | 5 #include "content/browser/renderer_host/render_widget_host_view_win.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <map> | 8 #include <map> |
9 #include <peninputpanel_i.c> | 9 #include <peninputpanel_i.c> |
10 #include <stack> | 10 #include <stack> |
(...skipping 933 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
944 output->GetBitmap().getPixels()); | 944 output->GetBitmap().getPixels()); |
945 scoped_callback_runner.Release(); | 945 scoped_callback_runner.Release(); |
946 callback.Run(result); | 946 callback.Run(result); |
947 } | 947 } |
948 | 948 |
949 void RenderWidgetHostViewWin::SetBackground(const SkBitmap& background) { | 949 void RenderWidgetHostViewWin::SetBackground(const SkBitmap& background) { |
950 RenderWidgetHostViewBase::SetBackground(background); | 950 RenderWidgetHostViewBase::SetBackground(background); |
951 render_widget_host_->SetBackground(background); | 951 render_widget_host_->SetBackground(background); |
952 } | 952 } |
953 | 953 |
954 void RenderWidgetHostViewWin::ProcessTouchAck(bool processed) { | 954 void RenderWidgetHostViewWin::ProcessAckedTouchEvent( |
955 | 955 const WebKit::WebTouchEvent& touch, |
| 956 bool processed) { |
956 DCHECK(render_widget_host_->has_touch_handler() && | 957 DCHECK(render_widget_host_->has_touch_handler() && |
957 touch_events_enabled_); | 958 touch_events_enabled_); |
958 | 959 |
959 int touch_count = touch_state_->GetNextTouchCount(); | 960 int touch_count = touch_state_->GetNextTouchCount(); |
960 for (int i = 0; i < touch_count; ++i) { | 961 for (int i = 0; i < touch_count; ++i) { |
961 scoped_ptr<ui::GestureRecognizer::Gestures> gestures; | 962 scoped_ptr<ui::GestureRecognizer::Gestures> gestures; |
962 gestures.reset(gesture_recognizer_->AdvanceTouchQueue(this, processed)); | 963 gestures.reset(gesture_recognizer_->AdvanceTouchQueue(this, processed)); |
963 ProcessGestures(gestures.get()); | 964 ProcessGestures(gestures.get()); |
964 } | 965 } |
965 } | 966 } |
(...skipping 2133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3099 // receive a focus change in the context of a pointer down message, it means | 3100 // receive a focus change in the context of a pointer down message, it means |
3100 // that the pointer down message occurred on the edit field and we should | 3101 // that the pointer down message occurred on the edit field and we should |
3101 // display the on screen keyboard | 3102 // display the on screen keyboard |
3102 if (!received_focus_change_after_pointer_down_ && virtual_keyboard_) | 3103 if (!received_focus_change_after_pointer_down_ && virtual_keyboard_) |
3103 DisplayOnScreenKeyboardIfNeeded(); | 3104 DisplayOnScreenKeyboardIfNeeded(); |
3104 received_focus_change_after_pointer_down_ = false; | 3105 received_focus_change_after_pointer_down_ = false; |
3105 pointer_down_context_ = false; | 3106 pointer_down_context_ = false; |
3106 } | 3107 } |
3107 | 3108 |
3108 } // namespace content | 3109 } // namespace content |
OLD | NEW |