| Index: experimental/SkV8Example/JsContext.h
|
| diff --git a/experimental/SkV8Example/JsContext.h b/experimental/SkV8Example/JsContext.h
|
| index d3993ee6c7d3ecc3581b4903b919212b844b3371..60446f887fbd5786846836aa86e52af442301c3b 100644
|
| --- a/experimental/SkV8Example/JsContext.h
|
| +++ b/experimental/SkV8Example/JsContext.h
|
| @@ -15,8 +15,6 @@
|
| #include "SkPaint.h"
|
| #include "BaseContext.h"
|
|
|
| -using namespace v8;
|
| -
|
| class SkCanvas;
|
| class Global;
|
|
|
| @@ -47,14 +45,14 @@ public:
|
| private:
|
|
|
| // Wrap the 'this' pointer into an Object. Can be retrieved via Unwrap.
|
| - Handle<Object> wrap();
|
| + v8::Handle<v8::Object> wrap();
|
|
|
| // A handle to the onDraw function defined in the script.
|
| - Persistent<Function> fOnDraw;
|
| + v8::Persistent<v8::Function> fOnDraw;
|
|
|
| // The template for what a canvas context object looks like. The canvas
|
| // context object is what's passed into the JS onDraw() function.
|
| - static Persistent<ObjectTemplate> gContextTemplate;
|
| + static v8::Persistent<v8::ObjectTemplate> gContextTemplate;
|
|
|
| // Only valid when inside OnDraw().
|
| SkCanvas* fCanvas;
|
|
|