From 6a12178fb32146232912fc20abb463b430f9025d Mon Sep 17 00:00:00 2001 From: "epoger@google.com" Date: Fri, 14 Sep 2012 18:42:01 +0000 Subject: [PATCH] Add a header file for TransitionView.cpp committed from https://codereview.appspot.com/6492119/ for Thiago Farina git-svn-id: http://skia.googlecode.com/svn/trunk@5552 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gyp/SampleApp.gyp | 1 + gyp/iOSSampleApp.gyp | 1 + samplecode/SampleApp.cpp | 2 +- samplecode/TransitionView.cpp | 7 +++---- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/gyp/SampleApp.gyp b/gyp/SampleApp.gyp index 0d65e8b0d..a2ee5c90b 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 f9c8a582d..5cd2c9c70 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 f8f8111d4..cfdd4ae3a 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 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 19cb24d4c..b2b1b9d24 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)); -}; +}