OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (C) 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2012 Google Inc. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
6 * met: | 6 * met: |
7 * | 7 * |
8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
(...skipping 14 matching lines...) Expand all Loading... | |
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
29 */ | 29 */ |
30 | 30 |
31 #include "config.h" | 31 #include "config.h" |
32 | 32 |
33 #include "V8CustomElementConstructor.h" | 33 #include "V8CustomElementConstructor.h" |
34 | 34 |
35 #include "V8Element.h" | |
35 #include "bindings/v8/CustomElementHelpers.h" | 36 #include "bindings/v8/CustomElementHelpers.h" |
36 #include "bindings/v8/V8Binding.h" | 37 #include "bindings/v8/V8Binding.h" |
37 #include "core/dom/CustomElementConstructor.h" | 38 #include "core/dom/CustomElementConstructor.h" |
38 | 39 |
39 namespace WebCore { | 40 namespace WebCore { |
40 | 41 |
41 v8::Handle<v8::Value> V8CustomElementConstructor::callAsFunctionCallback(const v 8::Arguments& args) | 42 v8::Handle<v8::Value> V8CustomElementConstructor::callAsFunctionCallback(const v 8::Arguments& args) |
42 { | 43 { |
43 if (!args.IsConstructCall()) | 44 if (!args.IsConstructCall()) |
44 return throwTypeError("DOM object constructor cannot be called as a func tion.", args.GetIsolate()); | 45 return throwTypeError("DOM object constructor cannot be called as a func tion.", args.GetIsolate()); |
45 if (ConstructorMode::current() == ConstructorMode::WrapExistingObject) | 46 if (ConstructorMode::current() == ConstructorMode::WrapExistingObject) |
46 return args.Holder(); | 47 return args.Holder(); |
47 | 48 |
48 CustomElementConstructor* impl = toNative(args.Holder()); | 49 CustomElementConstructor* impl = toNative(args.Holder()); |
49 ExceptionCode ec = 0; | 50 ExceptionCode ec = 0; |
50 RefPtr<Element> element = impl->createElement(ec); | 51 RefPtr<Element> element = impl->createElement(ec); |
51 if (ec) { | 52 if (ec) { |
52 setDOMException(ec, args.GetIsolate()); | 53 setDOMException(ec, args.GetIsolate()); |
53 return v8Undefined(); | 54 return v8Undefined(); |
54 } | 55 } |
55 // FIXME: is args.Holder() the right creation context? | 56 // FIXME: is args.Holder() the right creation context? |
56 return CustomElementHelpers::wrap(element.get(), args.Holder(), args.GetIsol ate()); | 57 return toV8(element.get(), args.Holder(), args.GetIsolate()); |
haraken
2013/05/01 18:49:12
What is this change for? I think the change looks
dominicc (has gone to gerrit)
2013/05/02 01:29:56
I want to simplify this so that it doesn't have in
| |
57 } | 58 } |
58 | 59 |
59 } // namespace WebCore | 60 } // namespace WebCore |
OLD | NEW |