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

Unified Diff: webkit/plugins/ppapi/event_conversion.cc

Issue 5828003: Move the Pepper implementation from webkit/glue/plugins/pepper_* to... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years 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
« no previous file with comments | « webkit/plugins/ppapi/event_conversion.h ('k') | webkit/plugins/ppapi/file_callbacks.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/plugins/ppapi/event_conversion.cc
===================================================================
--- webkit/plugins/ppapi/event_conversion.cc (revision 0)
+++ webkit/plugins/ppapi/event_conversion.cc (working copy)
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "webkit/glue/plugins/pepper_event_conversion.h"
+#include "webkit/plugins/ppapi/event_conversion.h"
#include "base/i18n/char_iterator.h"
#include "base/logging.h"
@@ -12,13 +12,16 @@
#include "base/utf_string_conversion_utils.h"
#include "ppapi/c/pp_input_event.h"
#include "third_party/WebKit/WebKit/chromium/public/WebInputEvent.h"
-#include "webkit/glue/plugins/pepper_common.h"
+#include "webkit/plugins/ppapi/common.h"
using WebKit::WebInputEvent;
using WebKit::WebKeyboardEvent;
using WebKit::WebMouseEvent;
using WebKit::WebMouseWheelEvent;
+namespace webkit {
+namespace ppapi {
+
namespace {
PP_InputEvent_Type ConvertEventTypes(WebInputEvent::Type wetype) {
@@ -144,11 +147,10 @@
result.u.wheel.wheel_ticks_x = mouse_wheel_event.wheelTicksX;
result.u.wheel.wheel_ticks_y = mouse_wheel_event.wheelTicksY;
result.u.wheel.scroll_by_page =
- pepper::BoolToPPBool(!!mouse_wheel_event.scrollByPage);
+ BoolToPPBool(!!mouse_wheel_event.scrollByPage);
pp_events->push_back(result);
}
-
WebKeyboardEvent* BuildKeyEvent(const PP_InputEvent& event) {
WebKeyboardEvent* key_event = new WebKeyboardEvent();
switch (event.type) {
@@ -239,8 +241,6 @@
} // namespace
-namespace pepper {
-
void CreatePPEvent(const WebInputEvent& event,
std::vector<PP_InputEvent>* pp_events) {
pp_events->clear();
@@ -297,5 +297,6 @@
return web_input_event.release();
}
+} // namespace ppapi
+} // namespace webkit
-} // namespace pepper
« no previous file with comments | « webkit/plugins/ppapi/event_conversion.h ('k') | webkit/plugins/ppapi/file_callbacks.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698