aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/views
diff options
context:
space:
mode:
authorGravatar djsollen <djsollen@google.com>2014-11-13 12:52:35 -0800
committerGravatar Commit bot <commit-bot@chromium.org>2014-11-13 12:52:35 -0800
commit0b17d6cb343cb71a3f548a02f0952c3592fc8c87 (patch)
tree0a5577be50cfbd238db7008c7d73f7cc7b9e58a6 /include/views
parent04f7e14b385118b8caa3ad7fcb30d64f4c32e677 (diff)
Cleanup public includes directory.
This CL updates various files in the includes directory to ensure that (1) they do not depend on headers in /src and (2) that they minimize their dependence on external headers. To ensure that we don't regress this behavior a new build target has been added to build a single cpp file that contains all* public includes and is compiled with only those directories in the include path. * The exception is those includes that depend on OS specific headers BUG=skia:2941 NOTRY=true Review URL: https://codereview.chromium.org/721903002
Diffstat (limited to 'include/views')
-rw-r--r--include/views/android/AndroidKeyToSkKey.h35
-rw-r--r--include/views/unix/XkeysToSkKeys.h38
-rw-r--r--include/views/unix/keysym2ucs.h15
3 files changed, 0 insertions, 88 deletions
diff --git a/include/views/android/AndroidKeyToSkKey.h b/include/views/android/AndroidKeyToSkKey.h
deleted file mode 100644
index 6bcb148b46..0000000000
--- a/include/views/android/AndroidKeyToSkKey.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-/*
- * Copyright 2011 Skia
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-
-#ifndef _ANDROID_TO_SKIA_KEYCODES_H
-#define _ANDROID_TO_SKIA_KEYCODES_H
-
-#include "android/keycodes.h"
-#include "SkKey.h"
-
-// Convert an Android keycode to an SkKey. This is an incomplete list, only
-// including keys used by the sample app.
-SkKey AndroidKeycodeToSkKey(int keycode) {
- switch (keycode) {
- case AKEYCODE_DPAD_LEFT:
- return kLeft_SkKey;
- case AKEYCODE_DPAD_RIGHT:
- return kRight_SkKey;
- case AKEYCODE_DPAD_UP:
- return kUp_SkKey;
- case AKEYCODE_DPAD_DOWN:
- return kDown_SkKey;
- case AKEYCODE_BACK:
- return kBack_SkKey;
- default:
- return kNONE_SkKey;
- }
-}
-
-#endif
diff --git a/include/views/unix/XkeysToSkKeys.h b/include/views/unix/XkeysToSkKeys.h
deleted file mode 100644
index 30eb97d396..0000000000
--- a/include/views/unix/XkeysToSkKeys.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-/*
- * Copyright 2011 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-#include "X11/Xlib.h"
-#include "X11/keysym.h"
-
-#include "SkKey.h"
-
-#ifndef XKEYS_TOSKKEYS_H
-#define XKEYS_TOSKKEYS_H
-
-SkKey XKeyToSkKey(KeySym keysym) {
- switch (keysym) {
- case XK_BackSpace:
- return kBack_SkKey;
- case XK_Return:
- return kOK_SkKey;
- case XK_Home:
- return kHome_SkKey;
- case XK_End:
- return kEnd_SkKey;
- case XK_Right:
- return kRight_SkKey;
- case XK_Left:
- return kLeft_SkKey;
- case XK_Down:
- return kDown_SkKey;
- case XK_Up:
- return kUp_SkKey;
- default:
- return kNONE_SkKey;
- }
-}
-#endif
diff --git a/include/views/unix/keysym2ucs.h b/include/views/unix/keysym2ucs.h
deleted file mode 100644
index 255a930539..0000000000
--- a/include/views/unix/keysym2ucs.h
+++ /dev/null
@@ -1,15 +0,0 @@
-
-/*
- * Copyright 2011 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-/*
- * This module converts keysym values into the corresponding ISO 10646-1
- * (UCS, Unicode) values.
- */
-
-#include <X11/X.h>
-
-long keysym2ucs(KeySym keysym);