Index: experimental/SkV8Example/BaseContext.h |
diff --git a/experimental/SkV8Example/BaseContext.h b/experimental/SkV8Example/BaseContext.h |
index b7fe3815a6aedb30737ad5abbefe171451c45b2c..5462c857512302306fc558b626b530d2039ba9cc 100644 |
--- a/experimental/SkV8Example/BaseContext.h |
+++ b/experimental/SkV8Example/BaseContext.h |
@@ -14,8 +14,6 @@ |
#include "SkPaint.h" |
-using namespace v8; |
- |
class SkCanvas; |
class Global; |
@@ -39,46 +37,46 @@ public: |
virtual SkCanvas* getCanvas() = 0; |
// Add the Javascript attributes and methods that BaseContext implements to the ObjectTemplate. |
- void addAttributesAndMethods(Handle<ObjectTemplate> tmpl); |
+ void addAttributesAndMethods(v8::Handle<v8::ObjectTemplate> tmpl); |
protected: |
// Get the pointer out of obj. |
- static BaseContext* Unwrap(Handle<Object> obj); |
+ static BaseContext* Unwrap(v8::Handle<v8::Object> obj); |
Global* fGlobal; |
SkPaint fFillStyle; |
SkPaint fStrokeStyle; |
private: |
- static void GetStyle(Local<String> name, |
- const PropertyCallbackInfo<Value>& info, |
+ static void GetStyle(v8::Local<v8::String> name, |
+ const v8::PropertyCallbackInfo<v8::Value>& info, |
const SkPaint& style); |
- static void SetStyle(Local<String> name, Local<Value> value, |
- const PropertyCallbackInfo<void>& info, |
+ static void SetStyle(v8::Local<v8::String> name, v8::Local<v8::Value> value, |
+ const v8::PropertyCallbackInfo<void>& info, |
SkPaint& style); |
// JS Attributes |
- static void GetFillStyle(Local<String> name, |
- const PropertyCallbackInfo<Value>& info); |
- static void SetFillStyle(Local<String> name, Local<Value> value, |
- const PropertyCallbackInfo<void>& info); |
- static void GetStrokeStyle(Local<String> name, |
- const PropertyCallbackInfo<Value>& info); |
- static void SetStrokeStyle(Local<String> name, Local<Value> value, |
- const PropertyCallbackInfo<void>& info); |
- static void GetWidth(Local<String> name, |
- const PropertyCallbackInfo<Value>& info); |
- static void GetHeight(Local<String> name, |
- const PropertyCallbackInfo<Value>& info); |
+ static void GetFillStyle(v8::Local<v8::String> name, |
+ const v8::PropertyCallbackInfo<v8::Value>& info); |
+ static void SetFillStyle(v8::Local<v8::String> name, v8::Local<v8::Value> value, |
+ const v8::PropertyCallbackInfo<void>& info); |
+ static void GetStrokeStyle(v8::Local<v8::String> name, |
+ const v8::PropertyCallbackInfo<v8::Value>& info); |
+ static void SetStrokeStyle(v8::Local<v8::String> name, v8::Local<v8::Value> value, |
+ const v8::PropertyCallbackInfo<void>& info); |
+ static void GetWidth(v8::Local<v8::String> name, |
+ const v8::PropertyCallbackInfo<v8::Value>& info); |
+ static void GetHeight(v8::Local<v8::String> name, |
+ const v8::PropertyCallbackInfo<v8::Value>& info); |
// JS Methods |
- static void FillRect(const v8::FunctionCallbackInfo<Value>& args); |
- static void Stroke(const v8::FunctionCallbackInfo<Value>& args); |
- static void Fill(const v8::FunctionCallbackInfo<Value>& args); |
- static void Rotate(const v8::FunctionCallbackInfo<Value>& args); |
- static void Save(const v8::FunctionCallbackInfo<Value>& args); |
- static void Restore(const v8::FunctionCallbackInfo<Value>& args); |
- static void Translate(const v8::FunctionCallbackInfo<Value>& args); |
- static void ResetTransform(const v8::FunctionCallbackInfo<Value>& args); |
+ static void FillRect(const v8::FunctionCallbackInfo<v8::Value>& args); |
+ static void Stroke(const v8::FunctionCallbackInfo<v8::Value>& args); |
+ static void Fill(const v8::FunctionCallbackInfo<v8::Value>& args); |
+ static void Rotate(const v8::FunctionCallbackInfo<v8::Value>& args); |
+ static void Save(const v8::FunctionCallbackInfo<v8::Value>& args); |
+ static void Restore(const v8::FunctionCallbackInfo<v8::Value>& args); |
+ static void Translate(const v8::FunctionCallbackInfo<v8::Value>& args); |
+ static void ResetTransform(const v8::FunctionCallbackInfo<v8::Value>& args); |
}; |
#endif |