add NativeObject

blastrain · Sep 20, 2018 · 864da93 · 864da93
1 parent afea46c
commit 864da93
Show file tree

Hide file tree

Showing 148 changed files with 539 additions and 283 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -33,6 +33,7 @@ set(SOURCES src/application_cache.cc
 	src/element.cc
 	src/event.cc
 	src/event_target.cc
+	src/export.cc
 	src/external.cc
 	src/history.cc
 	src/hit_region_options.cc
@@ -63,6 +64,8 @@ set(SOURCES src/application_cache.cc
 	src/media_list.cc
 	src/mime_type.cc
 	src/mime_type_array.cc
+	src/native_array.cc
+	src/native_object.cc
 	src/navigator.cc
 	src/node.cc
 	src/node_filter.cc

diff --git a/include/array.h b/include/array.h
@@ -8,13 +8,9 @@ NAMESPACE_HTML5_BEGIN;
 class Array : public Object {
 public:
 
-    Array();
+    Array(emscripten::val v);
     virtual ~Array();
-    static Array *create();
-    void add(Object *o);
-
-private:
-    std::vector<Object *> arr;
+    static Array *create(emscripten::val v);
 };
 
 NAMESPACE_HTML5_END;
diff --git a/include/array_buffer.h b/include/array_buffer.h
@@ -6,7 +6,6 @@ NAMESPACE_HTML5_BEGIN;
 
 class ArrayBuffer : public Object {
 public:
-    emscripten::val v;
 
     HTML5_PROPERTY(ArrayBuffer, unsigned long, byteLength);
 

diff --git a/include/array_buffer_view.h b/include/array_buffer_view.h
@@ -8,7 +8,6 @@ class ArrayBuffer;
 
 class ArrayBufferView : public Object {
 public:
-    emscripten::val v;
 
     HTML5_PROPERTY_OBJECT(ArrayBufferView, ArrayBuffer, buffer);
     HTML5_PROPERTY(ArrayBufferView, unsigned long, byteLength);

diff --git a/include/attr.h b/include/attr.h
@@ -6,7 +6,6 @@ NAMESPACE_HTML5_BEGIN;
 
 class Attr : public Object {
 public:
-    emscripten::val v;
 
     HTML5_PROPERTY(Attr, std::string, localName);
     HTML5_PROPERTY(Attr, std::string, name);

diff --git a/include/audio_track.h b/include/audio_track.h
@@ -6,7 +6,6 @@ NAMESPACE_HTML5_BEGIN;
 
 class AudioTrack : public Object {
 public:
-    emscripten::val v;
 
     HTML5_PROPERTY(AudioTrack, bool, enabled);
     HTML5_PROPERTY(AudioTrack, std::string, id);

diff --git a/include/auto_release_pool.h b/include/auto_release_pool.h
@@ -5,21 +5,21 @@
 
 NAMESPACE_HTML5_BEGIN;
 
-class Object;
+class NativeObject;
 
 class AutoReleasePool {
 public:
 
     AutoReleasePool();
     ~AutoReleasePool();
     static AutoReleasePool *sharedInstance();
-    void addObject(Object *o);
+    void addObject(NativeObject *o);
     void clear();
-    bool contains(Object *o) const;
+    bool contains(NativeObject *o) const;
     void releaseObjects();
 
 private:
-    std::vector<Object *> objects;
+    std::vector<NativeObject *> objects;
 };
 
 NAMESPACE_HTML5_END;
diff --git a/include/bar_prop.h b/include/bar_prop.h
@@ -6,7 +6,6 @@ NAMESPACE_HTML5_BEGIN;
 
 class BarProp : public Object {
 public:
-    emscripten::val v;
     HTML5_PROPERTY(BarProp, bool, visible);
 
     BarProp(emscripten::val v);

diff --git a/include/blob.h b/include/blob.h
@@ -6,7 +6,6 @@ NAMESPACE_HTML5_BEGIN;
 
 class Blob : public Object {
 public:
-    emscripten::val v;
 
     HTML5_PROPERTY(Blob, unsigned long long, size);
     HTML5_PROPERTY(Blob, std::string, type);

diff --git a/include/canvas_gradient.h b/include/canvas_gradient.h
@@ -6,7 +6,6 @@ NAMESPACE_HTML5_BEGIN;
 
 class CanvasGradient : public Object {
 public:
-    emscripten::val v;
 
     CanvasGradient(emscripten::val v);
     virtual ~CanvasGradient();

diff --git a/include/canvas_pattern.h b/include/canvas_pattern.h
@@ -8,7 +8,6 @@ class SVGMatrix;
 
 class CanvasPattern : public Object {
 public:
-    emscripten::val v;
 
     CanvasPattern(emscripten::val v);
     virtual ~CanvasPattern();

diff --git a/include/console.h b/include/console.h
@@ -0,0 +1,23 @@
+#pragma once
+
+#include "libhtml5.h"
+
+NAMESPACE_HTML5_BEGIN;
+
+class Console : public Object {
+public:
+    emscripten::val v;
+
+    Console(emscripten::val v);
+    virtual ~Console();
+    static Console *create(emscripten::val v);
+    void assert(bool expr, std::string ...args);
+    void clear();
+    void count();
+    void count(std::string label);
+    void countReset();
+    void countReset(std::string label);
+    void dir(Object *o);
+};
+
+NAMESPACE_HTML5_END;
diff --git a/include/css_rule.h b/include/css_rule.h
@@ -21,8 +21,6 @@ class CSSRule : public Object {
         HOST_RULE      = 1001,
     };
 
-    emscripten::val v;
-
     HTML5_PROPERTY(CSSRule, std::string, cssText);
     HTML5_PROPERTY_OBJECT(CSSRule, CSSRule, parentRule);
     HTML5_PROPERTY_OBJECT(CSSRule, CSSStyleSheet, parentStyleSheet);

diff --git a/include/css_rule_list.h b/include/css_rule_list.h
@@ -8,7 +8,6 @@ class CSSRule;
 
 class CSSRuleList : public Object {
 public:
-    emscripten::val v;
 
     HTML5_PROPERTY(CSSRuleList, unsigned long, length);
 

diff --git a/include/css_style_declaration.h b/include/css_style_declaration.h
@@ -8,7 +8,6 @@ class CSSRule;
 
 class CSSStyleDeclaration : public Object {
 public:
-    emscripten::val v;
 
     HTML5_PROPERTY(CSSStyleDeclaration, std::string, cssFloat);
     HTML5_PROPERTY(CSSStyleDeclaration, std::string, cssText);

diff --git a/include/date.h b/include/date.h
@@ -6,7 +6,6 @@ NAMESPACE_HTML5_BEGIN;
 
 class Date : public Object {
 public:
-    emscripten::val v;
 
     Date(emscripten::val v);
     virtual ~Date();

diff --git a/include/document_type.h b/include/document_type.h
@@ -8,7 +8,6 @@ class Node;
 
 class DocumentType : public Object {
 public:
-    emscripten::val v;
 
     HTML5_PROPERTY(DocumentType, std::string, name);
     HTML5_PROPERTY(DocumentType, std::string, publicId);

diff --git a/include/dom_error.h b/include/dom_error.h
@@ -6,7 +6,6 @@ NAMESPACE_HTML5_BEGIN;
 
 class DOMError : public Object {
 public:
-    emscripten::val v;
 
     HTML5_PROPERTY(DOMError, std::string, message);
     HTML5_PROPERTY(DOMError, std::string, name);

diff --git a/include/dom_implementation.h b/include/dom_implementation.h
@@ -10,7 +10,6 @@ class DocumentType;
 
 class DOMImplementation : public Object {
 public:
-    emscripten::val v;
 
     DOMImplementation(emscripten::val v);
     virtual ~DOMImplementation();

diff --git a/include/dom_token_list.h b/include/dom_token_list.h
@@ -7,7 +7,6 @@ NAMESPACE_HTML5_BEGIN;
 
 class DOMTokenList : public Object {
 public:
-    emscripten::val v;
 
     HTML5_PROPERTY(DOMTokenList, unsigned long, length);
 

diff --git a/include/event.h b/include/event.h
@@ -16,8 +16,6 @@ class Event : public Object {
         BUBBLING_PHASE  = 3,
     };
 
-    emscripten::val v;
-
     HTML5_PROPERTY(Event, bool, bubbles);
     HTML5_PROPERTY(Event, bool, cancelable);
     HTML5_PROPERTY_OBJECT(Event, EventTarget, currentTarget);

diff --git a/include/event_target.h b/include/event_target.h
@@ -15,7 +15,6 @@ class Event;
 
 class EventTarget : public Object {
 public:
-    emscripten::val v;
 
     EventTarget(emscripten::val v);
     virtual ~EventTarget();

diff --git a/include/export.h b/include/export.h
@@ -0,0 +1,65 @@
+#pragma once
+
+// this is included by libhtml5.h
+
+NAMESPACE_HTML5_BEGIN;
+
+class Window;
+class Document;
+class ApplicationCache;
+class Document;
+class External;
+class Element;
+class History;
+class IDBFactory;
+class Storage;
+class Location;
+class BarProp;
+class Navigator;
+class Promise;
+class CSSStyleDeclaration;
+class HTMLImageElement;
+class HTMLVideoElement;
+class HTMLCanvasElement;
+class Blob;
+class ImageData;
+class CanvasRenderingContext2D;
+class ImageBitmap;
+class Transferable;
+class Performance;
+class WindowProxy;
+
+extern Window *window;
+extern Document *document;
+
+extern void alert(std::string message);
+extern std::string atob(std::string atob);
+extern void blur();
+extern std::string btoa(std::string btoa);
+extern void cancelAnimationFrame(long handle);
+extern void clearInterval(long handle);
+extern void clearTimeout(long handle);
+extern void close();
+extern bool confirm(std::string message);
+extern Promise *createImageBitmap(HTMLImageElement *image, long sx, long sy, long sw, long sh);
+extern Promise *createImageBitmap(HTMLVideoElement *image, long sx, long sy, long sw, long sh);
+extern Promise *createImageBitmap(HTMLCanvasElement *image, long sx, long sy, long sw, long sh);
+extern Promise *createImageBitmap(Blob *image, long sx, long sy, long sw, long sh);
+extern Promise *createImageBitmap(ImageData *image, long sx, long sy, long sw, long sh);
+extern Promise *createImageBitmap(CanvasRenderingContext2D *image, long sx, long sy, long sw, long sh);
+extern Promise *createImageBitmap(ImageBitmap *image, long sx, long sy, long sw, long sh);
+extern void focus();
+extern CSSStyleDeclaration *getComputedStyle(Element *elt, std::string pseudoElt);
+extern WindowProxy *getter(void *indexName);
+extern WindowProxy *open(std::string url, std::string target, std::string features, bool replace);
+extern void postMessage(void *message, std::string targetOrigin, std::vector<Transferable *> transfer);
+extern void print();
+extern std::string prompt(std::string message, std::string _default);
+extern long requestAnimationFrame(std::function<void(double)> *callback);
+extern long setInterval(std::function<void(void)> *handler, long timeout);
+extern long setTimeout(std::function<void(void)> *handler, long timeout);
+extern void stop();
+
+NAMESPACE_HTML5_END;
+
+extern void HTML5_INIT();
diff --git a/include/external.h b/include/external.h
@@ -6,7 +6,6 @@ NAMESPACE_HTML5_BEGIN;
 
 class External : public Object {
 public:
-    emscripten::val v;
 
     External(emscripten::val v);
     virtual ~External();

diff --git a/include/history.h b/include/history.h
@@ -6,7 +6,7 @@ NAMESPACE_HTML5_BEGIN;
 
 class History : public Object {
 public:
-    emscripten::val v;
+
     HTML5_READONLY_PROPERTY(History, long, length);
     //HTML5_PROPERTY(History, void *, state);
 

diff --git a/include/hit_region_options.h b/include/hit_region_options.h
@@ -10,7 +10,6 @@ class Element;
 
 class HitRegionOptions : public Object {
 public:
-    emscripten::val v;
 
     HTML5_PROPERTY_OBJECT(HitRegionOptions, Element, control);
     HTML5_PROPERTY(HitRegionOptions, std::string, cursor);

diff --git a/include/html_collection.h b/include/html_collection.h
@@ -8,7 +8,6 @@ class Element;
 
 class HTMLCollection : public Object {
 public:
-    emscripten::val v;
 
     HTML5_PROPERTY(HTMLCollection, unsigned long, length);
 

diff --git a/include/idb_environment.h b/include/idb_environment.h
@@ -8,7 +8,6 @@ class IDBFactory;
 
 class IDBEnvironment : public Object {
 public:
-    emscripten::val v;
 
     HTML5_PROPERTY(IDBEnvironment, IDBFactory *, indexedDB);
 

diff --git a/include/idb_factory.h b/include/idb_factory.h
@@ -8,7 +8,6 @@ class IDBOpenDBRequest;
 
 class IDBFactory : public Object {
 public:
-    emscripten::val v;
 
     IDBFactory(emscripten::val v);
     virtual ~IDBFactory();

diff --git a/include/idb_index.h b/include/idb_index.h
@@ -9,7 +9,6 @@ class IDBRequest;
 
 class IDBIndex : public Object {
 public:
-    emscripten::val v;
 
     HTML5_PROPERTY(IDBIndex, std::string, keyPath);
     HTML5_PROPERTY(IDBIndex, bool, multiEntry);

diff --git a/include/idb_index_parameters.h b/include/idb_index_parameters.h
@@ -6,7 +6,6 @@ NAMESPACE_HTML5_BEGIN;
 
 class IDBIndexParameters : public Object {
 public:
-    emscripten::val v;
 
     HTML5_PROPERTY(IDBIndexParameters, bool, multiEntry);
     HTML5_PROPERTY(IDBIndexParameters, bool, unique);

diff --git a/include/idb_object_store.h b/include/idb_object_store.h
@@ -10,7 +10,6 @@ class IDBTransaction;
 
 class IDBObjectStore : public Object {
 public:
-    emscripten::val v;
 
     HTML5_PROPERTY(IDBObjectStore, bool, autoIncrement);
     HTML5_PROPERTY(IDBObjectStore, std::string, keyPath);

diff --git a/include/image_bitmap.h b/include/image_bitmap.h
@@ -6,7 +6,6 @@ NAMESPACE_HTML5_BEGIN;
 
 class ImageBitmap : public Object {
 public:
-    emscripten::val v;
 
     HTML5_PROPERTY(ImageBitmap, unsigned long, height);
     HTML5_PROPERTY(ImageBitmap, unsigned long, width);

diff --git a/include/image_data.h b/include/image_data.h
@@ -8,7 +8,6 @@ class Uint8ClampedArray;
 
 class ImageData : public Object {
 public:
-    emscripten::val v;
 
     HTML5_PROPERTY_OBJECT(ImageData, Uint8ClampedArray, data);
     HTML5_PROPERTY(ImageData, unsigned long, height);
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,7 +6,6 @@ NAMESPACE_HTML5_BEGIN; @@
     class ArrayBuffer : public Object {
     public:
-        emscripten::val v;
         HTML5_PROPERTY(ArrayBuffer, unsigned long, byteLength);
@@ Expand Down @@