diff options
| author |  epoger@google.com <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-09-14 18:42:01 +0000 |
|---|---|---|
| committer | epoger@google.com <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-09-14 18:42:01 +0000 |
| commit | 6a12178fb32146232912fc20abb463b430f9025d (patch) | |
| tree | feb780fb43f2de2a4181713344ff873f5e74e7b0 | |
| parent | 39362527e955948aa3325d91d00bd83df74cbe00 (diff) | |
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
| -rw-r--r-- | gyp/SampleApp.gyp | 1 | ||||
| -rw-r--r-- | gyp/iOSSampleApp.gyp | 1 | ||||
| -rw-r--r-- | samplecode/SampleApp.cpp | 2 | ||||
| -rw-r--r-- | samplecode/TransitionView.cpp | 7 |
4 files changed, 6 insertions, 5 deletions
diff --git a/gyp/SampleApp.gyp b/gyp/SampleApp.gyp index 0d65e8b0de..a2ee5c90b2 100644 --- 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 f9c8a582d2..5cd2c9c70b 100644 --- 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 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)); -}; +} |