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

Unified Diff: chrome/browser/renderer_host/render_widget_host_view_views_touch.cc

Issue 8598024: Now that we are doing a hard-cut-over to Aura, remove a bunch of *Views based classes that are ob... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 1 month 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: chrome/browser/renderer_host/render_widget_host_view_views_touch.cc
===================================================================
--- chrome/browser/renderer_host/render_widget_host_view_views_touch.cc (revision 110826)
+++ chrome/browser/renderer_host/render_widget_host_view_views_touch.cc (working copy)
@@ -1,178 +0,0 @@
-// 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 <gdk/gdkx.h>
-#include <gtk/gtk.h>
-
-#include "base/logging.h"
-#include "content/browser/renderer_host/gtk_window_utils.h"
-#include "content/browser/renderer_host/render_widget_host.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/gtk/WebInputEventFactory.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebScreenInfo.h"
-#include "views/widget/widget.h"
-
-static const char kRenderWidgetHostViewKey[] = "__RENDER_WIDGET_HOST_VIEW__";
-
-using WebKit::WebInputEventFactory;
-using WebKit::WebTouchEvent;
-
-namespace {
-
-WebKit::WebTouchPoint::State TouchPointStateFromEvent(
- const views::TouchEvent* event) {
- switch (event->type()) {
- case ui::ET_TOUCH_PRESSED:
- return WebKit::WebTouchPoint::StatePressed;
- case ui::ET_TOUCH_RELEASED:
- return WebKit::WebTouchPoint::StateReleased;
- case ui::ET_TOUCH_MOVED:
- return WebKit::WebTouchPoint::StateMoved;
- case ui::ET_TOUCH_CANCELLED:
- return WebKit::WebTouchPoint::StateCancelled;
- default:
- return WebKit::WebTouchPoint::StateUndefined;
- }
-}
-
-WebKit::WebInputEvent::Type TouchEventTypeFromEvent(
- const views::TouchEvent* event) {
- switch (event->type()) {
- case ui::ET_TOUCH_PRESSED:
- return WebKit::WebInputEvent::TouchStart;
- case ui::ET_TOUCH_RELEASED:
- return WebKit::WebInputEvent::TouchEnd;
- case ui::ET_TOUCH_MOVED:
- return WebKit::WebInputEvent::TouchMove;
- case ui::ET_TOUCH_CANCELLED:
- return WebKit::WebInputEvent::TouchCancel;
- default:
- return WebKit::WebInputEvent::Undefined;
- }
-}
-
-inline void UpdateTouchParams(const views::TouchEvent& event,
- WebKit::WebTouchPoint* tpoint) {
- tpoint->radiusX = event.radius_x();
- tpoint->radiusY = event.radius_y();
- tpoint->rotationAngle = event.rotation_angle();
- tpoint->force = event.force();
-}
-
-void UpdateTouchPointPosition(const views::TouchEvent* event,
- const gfx::Point& origin,
- WebKit::WebTouchPoint* tpoint) {
- tpoint->position.x = event->x();
- tpoint->position.y = event->y();
-
- tpoint->screenPosition.x = tpoint->position.x + origin.x();
- tpoint->screenPosition.y = tpoint->position.y + origin.y();
-}
-
-} // namespace
-
-ui::TouchStatus RenderWidgetHostViewViews::OnTouchEvent(
- const views::TouchEvent& event) {
- if (!host_)
- return ui::TOUCH_STATUS_UNKNOWN;
-
- // Update the list of touch points first.
- WebKit::WebTouchPoint* point = NULL;
- ui::TouchStatus status = ui::TOUCH_STATUS_UNKNOWN;
-
- switch (event.type()) {
- case ui::ET_TOUCH_PRESSED:
- // Add a new touch point.
- if (touch_event_.touchesLength <
- WebTouchEvent::touchesLengthCap) {
- point = &touch_event_.touches[touch_event_.touchesLength++];
- point->id = event.identity();
-
- if (touch_event_.touchesLength == 1) {
- // A new touch sequence has started.
- status = ui::TOUCH_STATUS_START;
-
- // We also want the focus.
- RequestFocus();
-
- // Confirm existing composition text on touch press events, to make
- // sure the input caret won't be moved with an ongoing composition
- // text.
- FinishImeCompositionSession();
- }
- }
- break;
- case ui::ET_TOUCH_RELEASED:
- case ui::ET_TOUCH_CANCELLED:
- case ui::ET_TOUCH_MOVED: {
- // The touch point should have been added to the event from an earlier
- // _PRESSED event. So find that.
- // At the moment, only a maximum of 4 touch-points are allowed. So a
- // simple loop should be sufficient.
- for (unsigned i = 0; i < touch_event_.touchesLength; ++i) {
- point = touch_event_.touches + i;
- if (point->id == event.identity()) {
- break;
- }
- point = NULL;
- }
- break;
- }
- default:
- DLOG(WARNING) << "Unknown touch event " << event.type();
- break;
- }
-
- if (!point)
- return ui::TOUCH_STATUS_UNKNOWN;
-
- if (status != ui::TOUCH_STATUS_START)
- status = ui::TOUCH_STATUS_CONTINUE;
-
- UpdateTouchParams(event, point);
-
- // Update the location and state of the point.
- point->state = TouchPointStateFromEvent(&event);
- if (point->state == WebKit::WebTouchPoint::StateMoved) {
- // It is possible for badly written touch drivers to emit Move events even
- // when the touch location hasn't changed. In such cases, consume the event
- // and pretend nothing happened.
- if (point->position.x == event.x() && point->position.y == event.y()) {
- return status;
- }
- }
- UpdateTouchPointPosition(&event, GetMirroredPosition(), point);
-
- // Mark the rest of the points as stationary.
- for (unsigned i = 0; i < touch_event_.touchesLength; ++i) {
- WebKit::WebTouchPoint* iter = touch_event_.touches + i;
- if (iter != point) {
- iter->state = WebKit::WebTouchPoint::StateStationary;
- }
- }
-
- // Update the type of the touch event.
- touch_event_.type = TouchEventTypeFromEvent(&event);
- touch_event_.timeStampSeconds = base::Time::Now().ToDoubleT();
-
- // The event and all the touches have been updated. Dispatch.
- host_->ForwardTouchEvent(touch_event_);
-
- // If the touch was released, then remove it from the list of touch points.
- if (event.type() == ui::ET_TOUCH_RELEASED) {
- --touch_event_.touchesLength;
- for (unsigned i = point - touch_event_.touches;
- i < touch_event_.touchesLength;
- ++i) {
- touch_event_.touches[i] = touch_event_.touches[i + 1];
- }
- if (touch_event_.touchesLength == 0)
- status = ui::TOUCH_STATUS_END;
- } else if (event.type() == ui::ET_TOUCH_CANCELLED) {
- status = ui::TOUCH_STATUS_CANCEL;
- }
-
- return status;
-}

Powered by Google App Engine
This is Rietveld 408576698