diff options
-rw-r--r-- | gyp/animator.gyp | 1 | ||||
-rw-r--r-- | gyp/core.gypi | 2 | ||||
-rw-r--r-- | gyp/views.gyp | 1 | ||||
-rw-r--r-- | src/codec/SkCodecPriv.h | 1 | ||||
-rw-r--r-- | src/codec/SkPngCodec.cpp | 1 | ||||
-rw-r--r-- | src/core/SkUtils.h (renamed from include/core/SkUtils.h) | 18 | ||||
-rw-r--r-- | src/views/win/SkOSWindow_win.cpp | 3 |
7 files changed, 6 insertions, 21 deletions
diff --git a/gyp/animator.gyp b/gyp/animator.gyp index 9eb076b164..996cdfc9b3 100644 --- a/gyp/animator.gyp +++ b/gyp/animator.gyp @@ -21,6 +21,7 @@ 'include_dirs': [ '../include/animator', '../include/private', + '../src/core', '../src/utils', ], 'sources': [ diff --git a/gyp/core.gypi b/gyp/core.gypi index 67ed9d71e1..63c94448a1 100644 --- a/gyp/core.gypi +++ b/gyp/core.gypi @@ -301,6 +301,7 @@ '<(skia_src_path)/core/SkTypefacePriv.h', '<(skia_src_path)/core/SkUnPreMultiply.cpp', '<(skia_src_path)/core/SkUtils.cpp', + '<(skia_src_path)/core/SkUtils.h', '<(skia_src_path)/core/SkValidatingReadBuffer.cpp', '<(skia_src_path)/core/SkValidatingReadBuffer.h', '<(skia_src_path)/core/SkValidationUtils.h', @@ -397,7 +398,6 @@ '<(skia_include_path)/core/SkTypeface.h', '<(skia_include_path)/core/SkTypes.h', '<(skia_include_path)/core/SkUnPreMultiply.h', - '<(skia_include_path)/core/SkUtils.h', '<(skia_include_path)/core/SkWriter32.h', '<(skia_include_path)/core/SkXfermode.h', diff --git a/gyp/views.gyp b/gyp/views.gyp index af0b9010c2..e7ca4f1cea 100644 --- a/gyp/views.gyp +++ b/gyp/views.gyp @@ -23,6 +23,7 @@ '../include/private', '../include/views', '../include/views/unix', + '../src/core', '../src/gpu', ], 'sources': [ diff --git a/src/codec/SkCodecPriv.h b/src/codec/SkCodecPriv.h index 5d66118943..68be58b0b0 100644 --- a/src/codec/SkCodecPriv.h +++ b/src/codec/SkCodecPriv.h @@ -12,7 +12,6 @@ #include "SkColorTable.h" #include "SkImageInfo.h" #include "SkTypes.h" -#include "SkUtils.h" #ifdef SK_PRINT_CODEC_MESSAGES #define SkCodecPrintf SkDebugf diff --git a/src/codec/SkPngCodec.cpp b/src/codec/SkPngCodec.cpp index e7035c6e8a..f946876af2 100644 --- a/src/codec/SkPngCodec.cpp +++ b/src/codec/SkPngCodec.cpp @@ -16,6 +16,7 @@ #include "SkStream.h" #include "SkSwizzler.h" #include "SkTemplates.h" +#include "SkUtils.h" /////////////////////////////////////////////////////////////////////////////// // Callback functions diff --git a/include/core/SkUtils.h b/src/core/SkUtils.h index b5674ecead..332ea8da7e 100644 --- a/include/core/SkUtils.h +++ b/src/core/SkUtils.h @@ -90,22 +90,4 @@ inline bool SkUnichar_IsVariationSelector(SkUnichar uni) { return true; } -/////////////////////////////////////////////////////////////////////////////// - -class SkAutoTrace { -public: - /** NOTE: label contents are not copied, just the ptr is - retained, so DON'T DELETE IT. - */ - SkAutoTrace(const char label[]) : fLabel(label) { - SkDebugf("--- trace: %s Enter\n", fLabel); - } - ~SkAutoTrace() { - SkDebugf("--- trace: %s Leave\n", fLabel); - } -private: - const char* fLabel; -}; -#define SkAutoTrace(...) SK_REQUIRE_LOCAL_VAR(SkAutoTrace) - #endif diff --git a/src/views/win/SkOSWindow_win.cpp b/src/views/win/SkOSWindow_win.cpp index 4b7abb1e96..c451708cef 100644 --- a/src/views/win/SkOSWindow_win.cpp +++ b/src/views/win/SkOSWindow_win.cpp @@ -147,7 +147,8 @@ bool SkOSWindow::wndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) this->handleChar((SkUnichar) wParam); return true; case WM_CHAR: { - this->handleChar(SkUTF8_ToUnichar((char*)&wParam)); + const uint16_t* c = reinterpret_cast<uint16_t*>(&wParam); + this->handleChar(SkUTF16_NextUnichar(&c)); return true; } break; case WM_SIZE: { |