Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 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 10 matching lines...) Expand all Loading... | |
| 21 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | 21 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT |
| 22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
| 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
| 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| 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 #ifndef LayerRect_h | 31 #ifndef ScriptFunction_h |
| 32 #define LayerRect_h | 32 #define ScriptFunction_h |
| 33 | 33 |
| 34 #include "core/dom/ClientRect.h" | 34 #include "ScriptValue.h" |
| 35 #include "V8Binding.h" | |
|
abarth-chromium
2013/08/09 21:46:52
Please use paths from the Source directory
| |
| 36 #include "wtf/RefCounted.h" | |
| 35 | 37 |
|
abarth-chromium
2013/08/09 21:46:52
No need for this blank line.
| |
| 36 #include "wtf/PassRefPtr.h" | 38 #include <v8.h> |
| 37 #include "wtf/RefCounted.h" | |
| 38 #include "wtf/RefPtr.h" | |
| 39 | 39 |
| 40 namespace WebCore { | 40 namespace WebCore { |
| 41 | 41 |
| 42 class Node; | 42 // to use this class, |
|
abarth-chromium
2013/08/09 21:46:52
?
| |
| 43 class ScriptFunction : public RefCounted<ScriptFunction> { | |
| 44 public: | |
| 45 ScriptFunction() { } | |
| 46 virtual ~ScriptFunction() { } | |
| 43 | 47 |
| 44 class LayerRect : public RefCounted<LayerRect> { | 48 // override this |
| 45 public: | 49 virtual ScriptValue call(ScriptValue arg) { return ScriptValue(); } |
| 46 static PassRefPtr<LayerRect> create(PassRefPtr<Node> node, PassRefPtr<Client Rect> rect) | 50 |
| 51 v8::Handle<v8::Function> toV8(v8::Isolate* isolate) | |
| 47 { | 52 { |
| 48 return adoptRef(new LayerRect(node, rect)); | 53 if (m_function.isEmpty()) { |
| 54 ref(); | |
|
abarth-chromium
2013/08/09 21:46:52
Rather than calling ref() and deref(), maybe we sh
| |
| 55 m_function.set(isolate, v8::FunctionTemplate::New(&callCallback, v8: :External::New(this))->GetFunction()); | |
| 56 m_function.makeWeak(this, &weakCallback); | |
| 57 } | |
| 58 return m_function.newLocal(isolate); | |
| 49 } | 59 } |
| 50 | 60 |
| 51 Node* layerRootNode() const { return m_layerRootNode.get(); } | |
| 52 ClientRect* layerRelativeRect() const { return m_rect.get(); } | |
| 53 | |
| 54 private: | 61 private: |
| 55 LayerRect(PassRefPtr<Node> node, PassRefPtr<ClientRect> rect) | 62 static void weakCallback(v8::Isolate*, v8::Persistent<v8::Function>*, Script Function* self) |
| 56 : m_layerRootNode(node) | |
| 57 , m_rect(rect) | |
| 58 { | 63 { |
| 64 self->deref(); | |
|
abarth-chromium
2013/08/09 21:46:52
Don't we need to clear out m_function in this func
| |
| 59 } | 65 } |
| 60 | 66 |
| 61 RefPtr<Node> m_layerRootNode; | 67 static void callCallback(const v8::FunctionCallbackInfo<v8::Value>& args) |
| 62 RefPtr<ClientRect> m_rect; | 68 { |
| 69 v8::Isolate* isolate = args.GetIsolate(); | |
| 70 ASSERT(!args.Data().IsEmpty()); | |
| 71 ScriptFunction* function = static_cast<ScriptFunction*>(args.Data().As<v 8::External>()->Value()); | |
|
abarth-chromium
2013/08/09 21:46:52
We need to hold a RefPtr<ScriptFunction> here in c
| |
| 72 v8::Local<v8::Value> value = v8::Undefined(isolate); | |
| 73 if (args.Length() > 0) | |
| 74 value = args[0]; | |
|
abarth-chromium
2013/08/09 21:46:52
Can we use the ? : operator to avoid calling v8::U
alecflett
2013/08/13 20:37:11
Doing that now - I see why it was done the other w
| |
| 75 | |
| 76 ScriptValue result = function->call(ScriptValue(value)); | |
| 77 v8SetReturnValue(args, result.v8Value()); | |
| 78 } | |
| 79 | |
| 80 ScopedPersistent<v8::Function> m_function; | |
| 81 friend class RefCounted<ScriptFunction>; | |
| 63 }; | 82 }; |
| 64 | 83 |
| 65 } // namespace WebCore | 84 } // namespace WebCore |
| 66 | 85 |
| 67 #endif | 86 #endif |
| OLD | NEW |