aboutsummaryrefslogtreecommitdiffhomepage
path: root/samplecode
diff options
context:
space:
mode:
Diffstat (limited to 'samplecode')
-rw-r--r--samplecode/SampleApp.cpp2
-rw-r--r--samplecode/TransitionView.cpp7
2 files changed, 4 insertions, 5 deletions
diff --git a/samplecode/SampleApp.cpp b/samplecode/SampleApp.cpp
index f8f8111d44..cfdd4ae3a5 100644
--- 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 19cb24d4c3..b2b1b9d24f 100644
--- 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));
-};
+}