summaryrefslogtreecommitdiffstats
path: root/WebCore/bindings/js/JSCSSValueCustom.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'WebCore/bindings/js/JSCSSValueCustom.cpp')
-rw-r--r--WebCore/bindings/js/JSCSSValueCustom.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/WebCore/bindings/js/JSCSSValueCustom.cpp b/WebCore/bindings/js/JSCSSValueCustom.cpp
index 88147d7..f544849 100644
--- a/WebCore/bindings/js/JSCSSValueCustom.cpp
+++ b/WebCore/bindings/js/JSCSSValueCustom.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2007, 2008 Apple Inc. All rights reserved.
+ * Copyright (C) 2007 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -27,9 +27,11 @@
#include "JSCSSValue.h"
#include "CSSPrimitiveValue.h"
+#include "CSSValue.h"
#include "CSSValueList.h"
#include "JSCSSPrimitiveValue.h"
#include "JSCSSValueList.h"
+#include "kjs_binding.h"
#if ENABLE(SVG)
#include "JSSVGColor.h"
@@ -38,16 +40,14 @@
#include "SVGPaint.h"
#endif
-using namespace KJS;
-
namespace WebCore {
-JSValue* toJS(ExecState* exec, CSSValue* value)
+KJS::JSValue* toJS(KJS::ExecState* exec, CSSValue* value)
{
if (!value)
- return jsNull();
+ return KJS::jsNull();
- DOMObject* ret = ScriptInterpreter::getDOMObject(value);
+ KJS::DOMObject* ret = KJS::ScriptInterpreter::getDOMObject(value);
if (ret)
return ret;
@@ -65,7 +65,7 @@ JSValue* toJS(ExecState* exec, CSSValue* value)
else
ret = new JSCSSValue(JSCSSValuePrototype::self(exec), value);
- ScriptInterpreter::putDOMObject(value, ret);
+ KJS::ScriptInterpreter::putDOMObject(value, ret);
return ret;
}