Chromium Code Reviews| Index: experimental/SkV8Example/SkV8Example.h |
| diff --git a/experimental/SkV8Example/SkV8Example.h b/experimental/SkV8Example/SkV8Example.h |
| index 30737963f3b3b07f0ebddd17ba7f4cb49c0529ba..1d8462ba23d62ff84753452d7f5a50e9836c0e50 100644 |
| --- a/experimental/SkV8Example/SkV8Example.h |
| +++ b/experimental/SkV8Example/SkV8Example.h |
| @@ -13,17 +13,14 @@ |
| #include <v8.h> |
|
tfarina
2014/01/06 16:50:59
you can remove this
jcgregorio
2014/01/06 17:16:10
Done.
|
| #include "SkWindow.h" |
| -#include "SkPaint.h" |
| using namespace v8; |
|
tfarina
2014/01/06 16:50:59
and this, since you don't use any v8 types in this
jcgregorio
2014/01/06 17:16:10
Done.
|
| -class SkCanvas; |
| -class JsCanvas; |
| -class Global; |
| +class JsContext; |
| class SkV8ExampleWindow : public SkOSWindow { |
| public: |
| - SkV8ExampleWindow(void* hwnd, JsCanvas* canvas); |
| + SkV8ExampleWindow(void* hwnd, JsContext* canvas); |
| protected: |
| virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE; |
| @@ -34,66 +31,7 @@ protected: |
| private: |
| typedef SkOSWindow INHERITED; |
| - JsCanvas* fJsCanvas; |
| -}; |
| - |
| - |
| -// Provides the canvas implementation in JS, and the OnDraw() method in C++ |
| -// that's used to bridge from C++ to JS. Should be used in JS as: |
| -// |
| -// function onDraw(canvas) { |
| -// canvas.fillStyle="#FF0000"; |
| -// canvas.fillRect(x, y, w, h); |
| -// } |
| -class JsCanvas { |
| -public: |
| - JsCanvas(Global* global) |
| - : fGlobal(global) |
| - , fCanvas(NULL) |
| - { |
| - fFillStyle.setColor(SK_ColorRED); |
| - } |
| - ~JsCanvas(); |
| - |
| - // Parse the script. |
| - bool initialize(); |
| - |
| - // Call this with the SkCanvas you want onDraw to draw on. |
| - void onDraw(SkCanvas* canvas); |
| - |
| -private: |
| - // Implementation of the canvas.fillStyle field. |
| - static void GetFillStyle(Local<String> name, |
| - const PropertyCallbackInfo<Value>& info); |
| - static void SetFillStyle(Local<String> name, Local<Value> value, |
| - const PropertyCallbackInfo<void>& info); |
| - |
| - // Implementation of the canvas.fillRect() JS function. |
| - static void FillRect(const v8::FunctionCallbackInfo<Value>& args); |
| - |
| - // Get the pointer out of obj. |
| - static JsCanvas* Unwrap(Handle<Object> obj); |
| - |
| - // Create a template for JS object associated with JsCanvas, called lazily |
| - // by Wrap() and the results are stored in fCanvasTemplate; |
| - Handle<ObjectTemplate> makeCanvasTemplate(); |
| - |
| - // Wrap the 'this' pointer into an Object. Can be retrieved via Unwrap. |
| - Handle<Object> wrap(); |
| - |
| - Global* fGlobal; |
| - |
| - // Only valid when inside OnDraw(). |
| - SkCanvas* fCanvas; |
| - |
| - SkPaint fFillStyle; |
| - |
| - // A handle to the onDraw function defined in the script. |
| - Persistent<Function> fOnDraw; |
| - |
| - // The template for what a canvas object looks like. The canvas object is |
| - // what's passed into the JS onDraw() function. |
| - static Persistent<ObjectTemplate> fCanvasTemplate; |
| + JsContext* fJsContext; |
| }; |
| #endif |