Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / dom / Node.h

diff --git a/src/third_party/WebKit/Source/core/dom/Node.h b/src/third_party/WebKit/Source/core/dom/Node.h
index a6ec7bf..a388365 100644 (file)
--- a/src/third_party/WebKit/Source/core/dom/Node.h
+++ b/src/third_party/WebKit/Source/core/dom/Node.h
@@ -122,12 +122,12 @@ protected:
 #endif
 
 class Node : NODE_BASE_CLASSES {
+    DEFINE_EVENT_TARGET_REFCOUNTING_WILL_BE_REMOVED(TreeShared<Node>);
+    DEFINE_WRAPPERTYPEINFO();
+    WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(Node);
     friend class Document;
     friend class TreeScope;
     friend class TreeScopeAdopter;
-
-    DEFINE_EVENT_TARGET_REFCOUNTING_WILL_BE_REMOVED(TreeShared<Node>);
-    WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(Node);
 public:
     enum NodeType {
         ELEMENT_NODE = 1,
@@ -486,10 +486,6 @@ public:
     // Whether or not a selection can be started in this object
     virtual bool canStartSelection() const;
 
-    // Getting points into and out of screen space
-    FloatPoint convertToPage(const FloatPoint&) const;
-    FloatPoint convertFromPage(const FloatPoint&) const;
-
     // -----------------------------------------------------------------------------
     // Integration with rendering tree
 
@@ -664,6 +660,9 @@ public:
 
     unsigned lengthOfContents() const;
 
+    virtual v8::Handle<v8::Object> wrap(v8::Handle<v8::Object> creationContext, v8::Isolate*) OVERRIDE;
+    virtual v8::Handle<v8::Object> associateWithWrapper(const WrapperTypeInfo*, v8::Handle<v8::Object> wrapper, v8::Isolate*) OVERRIDE;
+
 private:
     enum NodeFlags {
         HasRareDataFlag = 1,
@@ -894,4 +893,4 @@ void showTree(const blink::Node*);
 void showNodePath(const blink::Node*);
 #endif
 
-#endif
+#endif // Node_h