Add a header file for TransitionView.cpp

committed from https://codereview.appspot.com/6492119/ for Thiago Farina <tfarina@chromium.org>

git-svn-id: http://skia.googlecode.com/svn/trunk@5552 2bbb7eff-a529-9590-31e7-b0007b416f81

diff --git a/gyp/SampleApp.gyp b/gyp/SampleApp.gyp
index 0d65e8b0de1d3885f09c6610568869580fdce003..a2ee5c90b22b5670caaa6f510d1c403ac9ba0360 100644 (file)
--- a/gyp/SampleApp.gyp
+++ b/gyp/SampleApp.gyp
@@ -104,6 +104,7 @@
         '../samplecode/SampleXfermodes.cpp',
         '../samplecode/SampleXfermodesBlur.cpp',
         '../samplecode/TransitionView.cpp',
+        '../samplecode/TransitionView.h',
 
         # DrawingBoard
         #'../experimental/DrawingBoard/SkColorPalette.h',

diff --git a/gyp/iOSSampleApp.gyp b/gyp/iOSSampleApp.gyp
index f9c8a582d21fb36c9943babc5ec0fdea0222e2df..5cd2c9c70b202b718c7d3ae8d5ed9594e0e02d44 100644 (file)
--- a/gyp/iOSSampleApp.gyp
+++ b/gyp/iOSSampleApp.gyp
@@ -133,6 +133,7 @@
         '../src/utils/SkInterpolator.cpp',
         '../include/utils/SkInterpolator.h',
         '../samplecode/TransitionView.cpp',
+        '../samplecode/TransitionView.h',
       ],
       'sources!': [
         '../samplecode/SampleSkLayer.cpp', #relies on SkMatrix44 which doesn't compile

diff --git a/samplecode/SampleApp.cpp b/samplecode/SampleApp.cpp
index f8f8111d44cddaaa56b764e3df0b28bc70130c60..cfdd4ae3a5596317159221db866df78794af118a 100644 (file)
--- a/samplecode/SampleApp.cpp
+++ b/samplecode/SampleApp.cpp
@@ -37,6 +37,7 @@ class GrContext;
 
 #include "SkGPipe.h"
 #include "SamplePipeControllers.h"
+#include "TransitionView.h"
 
 SK_DEFINE_INST_COUNT(SampleWindow::DeviceManager)
 
@@ -80,7 +81,6 @@ SkTDArray<char> gTempDataStore;
 
 extern SkView* create_overview(int, const SkViewFactory*[]);
 extern bool is_overview(SkView* view);
-extern SkView* create_transition(SkView*, SkView*, int);
 extern bool is_transition(SkView* view);
 
 

diff --git a/samplecode/TransitionView.cpp b/samplecode/TransitionView.cpp
index 19cb24d4c3a87f1ce52740458ed24ece7319c9d2..b2b1b9d24f7e70024b5345665de72cf71cba40f9 100644 (file)
--- a/samplecode/TransitionView.cpp
+++ b/samplecode/TransitionView.cpp
@@ -4,6 +4,8 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
+#include "TransitionView.h"
+
 #include "SampleCode.h"
 #include "SkView.h"
 #include "SkCanvas.h"
@@ -186,9 +188,6 @@ private:
     typedef SampleView INHERITED;
 };
 
-// FIXME: this should go in a header
-SkView* create_transition(SkView* prev, SkView* next, int direction);
-
 SkView* create_transition(SkView* prev, SkView* next, int direction) {
     return SkNEW_ARGS(TransitionView, (prev, next, direction));
-};
+}