aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--gyp/utils.gypi2
-rw-r--r--gyp/views.gyp2
-rw-r--r--include/utils/SkTextBox.h (renamed from include/views/SkTextBox.h)0
-rw-r--r--src/utils/SkTextBox.cpp (renamed from src/views/SkTextBox.cpp)0
4 files changed, 2 insertions, 2 deletions
diff --git a/gyp/utils.gypi b/gyp/utils.gypi
index 7d40a8bf30..5148491054 100644
--- a/gyp/utils.gypi
+++ b/gyp/utils.gypi
@@ -37,6 +37,7 @@
'<(skia_include_path)/utils/SkRandom.h',
'<(skia_include_path)/utils/SkRTConf.h',
'<(skia_include_path)/utils/SkProxyCanvas.h',
+ '<(skia_include_path)/utils/SkTextBox.h',
'<(skia_include_path)/utils/SkWGL.h',
'<(skia_src_path)/utils/SkBase64.cpp',
@@ -86,6 +87,7 @@
'<(skia_src_path)/utils/SkSHA1.cpp',
'<(skia_src_path)/utils/SkSHA1.h',
'<(skia_src_path)/utils/SkRTConf.cpp',
+ '<(skia_src_path)/utils/SkTextBox.cpp',
'<(skia_src_path)/utils/SkTextureCompressor.cpp',
'<(skia_src_path)/utils/SkTextureCompressor.h',
'<(skia_src_path)/utils/SkTextureCompressor_Utils.h',
diff --git a/gyp/views.gyp b/gyp/views.gyp
index 6db85df2bd..f61c11a16e 100644
--- a/gyp/views.gyp
+++ b/gyp/views.gyp
@@ -33,7 +33,6 @@
'../include/views/SkOSWindow_Win.h',
'../include/views/SkStackViewLayout.h',
'../include/views/SkSystemEventTypes.h',
- '../include/views/SkTextBox.h',
'../include/views/SkTouchGesture.h',
'../include/views/SkView.h',
'../include/views/SkViewInflate.h',
@@ -49,7 +48,6 @@
'../src/views/SkStackViewLayout.cpp',
'../src/views/SkTagList.cpp',
'../src/views/SkTagList.h',
- '../src/views/SkTextBox.cpp',
'../src/views/SkTouchGesture.cpp',
'../src/views/SkView.cpp',
'../src/views/SkViewInflate.cpp',
diff --git a/include/views/SkTextBox.h b/include/utils/SkTextBox.h
index e217076fed..e217076fed 100644
--- a/include/views/SkTextBox.h
+++ b/include/utils/SkTextBox.h
diff --git a/src/views/SkTextBox.cpp b/src/utils/SkTextBox.cpp
index 55d75a64da..55d75a64da 100644
--- a/src/views/SkTextBox.cpp
+++ b/src/utils/SkTextBox.cpp