Skip to content

Commit

Permalink
Committing clang-format changes
Browse files Browse the repository at this point in the history
  • Loading branch information
openkraken-bot committed Jan 24, 2022
1 parent d80b528 commit a337c2e
Show file tree
Hide file tree
Showing 29 changed files with 158 additions and 217 deletions.
6 changes: 1 addition & 5 deletions bridge/bindings/qjs/bom/blob.cc
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ Blob* Blob::create(JSContext* ctx) {
// Let eventTarget instance inherit EventTarget prototype methods.
JS_SetPrototype(ctx, blob->toQuickJS(), prototype);
return blob;

}
Blob* Blob::create(JSContext* ctx, std::vector<uint8_t>&& data) {
return create(ctx);
Expand Down Expand Up @@ -259,9 +258,6 @@ uint8_t* Blob::bytes() {
}

void Blob::trace(JSRuntime* rt, JSValue val, JS_MarkFunc* mark_func) const {}
void Blob::dispose() const {

}

void Blob::dispose() const {}

} // namespace kraken::binding::qjs
14 changes: 5 additions & 9 deletions bridge/bindings/qjs/bom/blob.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ class Blob : public GarbageCollected<Blob> {
static JSValue constructor(ExecutionContext* context);
static JSValue prototype(ExecutionContext* context);

Blob() {};
Blob(std::vector<uint8_t>&& data): _size(data.size()), _data(std::move(data)) {};
Blob(std::vector<uint8_t>&& data, std::string& mime): mimeType(mime), _size(data.size()), _data(std::move(data)) {};
Blob(){};
Blob(std::vector<uint8_t>&& data) : _size(data.size()), _data(std::move(data)){};
Blob(std::vector<uint8_t>&& data, std::string& mime) : mimeType(mime), _size(data.size()), _data(std::move(data)){};

DEFINE_FUNCTION(arrayBuffer);
DEFINE_FUNCTION(slice);
Expand All @@ -40,7 +40,7 @@ class Blob : public GarbageCollected<Blob> {
DEFINE_PROTOTYPE_READONLY_PROPERTY(type);
DEFINE_PROTOTYPE_READONLY_PROPERTY(size);

void trace(JSRuntime *rt, JSValue val, JS_MarkFunc *mark_func) const override;
void trace(JSRuntime* rt, JSValue val, JS_MarkFunc* mark_func) const override;
void dispose() const override;

private:
Expand Down Expand Up @@ -110,11 +110,7 @@ auto blobCreator = [](JSContext* ctx, JSValueConst func_obj, JSValueConst this_v
return blob->toQuickJS();
};

const WrapperTypeInfo blobTypeInfo = {
"Blob",
nullptr,
blobCreator
};
const WrapperTypeInfo blobTypeInfo = {"Blob", nullptr, blobCreator};

} // namespace kraken::binding::qjs

Expand Down
2 changes: 1 addition & 1 deletion bridge/bindings/qjs/bom/dom_timer_coordinator.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@

#include <quickjs/quickjs.h>
#include <unordered_map>
#include "bindings/qjs/executing_context.h"
#include <vector>
#include "bindings/qjs/executing_context.h"

namespace kraken::binding::qjs {

Expand Down
8 changes: 2 additions & 6 deletions bridge/bindings/qjs/bom/location.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class Location : public GarbageCollected<Location> {
static Location* create(JSContext* ctx);
static JSValue reload(JSContext* ctx, JSValueConst this_val, int argc, JSValueConst* argv);

void trace(JSRuntime *rt, JSValue val, JS_MarkFunc *mark_func) const override;
void trace(JSRuntime* rt, JSValue val, JS_MarkFunc* mark_func) const override;
void dispose() const override;
};

Expand All @@ -35,11 +35,7 @@ auto locationCreator = [](JSContext* ctx, JSValueConst func_obj, JSValueConst th
return location->toQuickJS();
};

const WrapperTypeInfo locationTypeInfo = {
"Location",
nullptr,
locationCreator
};
const WrapperTypeInfo locationTypeInfo = {"Location", nullptr, locationCreator};

} // namespace kraken::binding::qjs

Expand Down
3 changes: 1 addition & 2 deletions bridge/bindings/qjs/bom/window.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ void bindWindow(std::unique_ptr<ExecutionContext>& context);

class Window : public EventTarget {
public:

Window();

static JSClassID classId;
Expand All @@ -42,7 +41,7 @@ class Window : public EventTarget {

DEFINE_PROTOTYPE_PROPERTY(onerror);

void trace(JSRuntime *rt, JSValue val, JS_MarkFunc *mark_func) const override;
void trace(JSRuntime* rt, JSValue val, JS_MarkFunc* mark_func) const override;

private:
Document* document();
Expand Down
7 changes: 3 additions & 4 deletions bridge/bindings/qjs/dom/comment_node.cc
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
namespace kraken::binding::qjs {

void bindCommentNode(std::unique_ptr<ExecutionContext>& context) {
// auto* constructor = Comment::instance(context.get());
// context->defineGlobalProperty("Comment", constructor->jsObject);
// auto* constructor = Comment::instance(context.get());
// context->defineGlobalProperty("Comment", constructor->jsObject);
}

JSClassID Comment::classId{0};
Expand All @@ -26,10 +26,9 @@ Comment* Comment::create(JSContext* ctx) {
JS_SetPrototype(ctx, comment->toQuickJS(), prototype);

return comment;

}

//Comment::Comment(ExecutionContext* context) : Node(context, "Comment") {
// Comment::Comment(ExecutionContext* context) : Node(context, "Comment") {
// std::call_once(kCommentInitFlag, []() { JS_NewClassID(&kCommentClassId); });
// JS_SetPrototype(m_ctx, m_prototypeObject, Node::instance(m_context)->prototype());
//}
Expand Down
22 changes: 8 additions & 14 deletions bridge/bindings/qjs/dom/comment_node.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ class Comment : public Node {
static JSValue constructor(ExecutionContext* context);
static JSValue prototype(ExecutionContext* context);

// static JSClassID kCommentClassId;
// static JSClassID classId();
// Comment() = delete;
// explicit Comment(ExecutionContext* context);
// static JSClassID kCommentClassId;
// static JSClassID classId();
// Comment() = delete;
// explicit Comment(ExecutionContext* context);

// JSValue instanceConstructor(JSContext* ctx, JSValue func_obj, JSValue this_val, int argc, JSValue* argv) override;
// JSValue instanceConstructor(JSContext* ctx, JSValue func_obj, JSValue this_val, int argc, JSValue* argv) override;

private:
DEFINE_PROTOTYPE_READONLY_PROPERTY(data);
Expand All @@ -36,18 +36,12 @@ class Comment : public Node {
friend CommentInstance;
};

auto commentCreator = [](JSContext* ctx, JSValueConst func_obj, JSValueConst this_val, int argc, JSValueConst* argv, int flags) -> JSValue {
};

auto commentCreator = [](JSContext* ctx, JSValueConst func_obj, JSValueConst this_val, int argc, JSValueConst* argv, int flags) -> JSValue {};

const WrapperTypeInfo commentTypeInfo = {
"Comment",
&nodeTypeInfo,
commentCreator
};
const WrapperTypeInfo commentTypeInfo = {"Comment", &nodeTypeInfo, commentCreator};

//
//class CommentInstance : public NodeInstance {
// class CommentInstance : public NodeInstance {
// public:
// CommentInstance() = delete;
// explicit CommentInstance(Comment* comment);
Expand Down
8 changes: 3 additions & 5 deletions bridge/bindings/qjs/dom/custom_event.cc
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
namespace kraken::binding::qjs {

void bindCustomEvent(std::unique_ptr<ExecutionContext>& context) {
// auto* constructor = CustomEvent::instance(context.get());
// context->defineGlobalProperty("CustomEvent", constructor->jsObject);
// auto* constructor = CustomEvent::instance(context.get());
// context->defineGlobalProperty("CustomEvent", constructor->jsObject);
}

JSClassID CustomEvent::classId{0};
Expand Down Expand Up @@ -89,9 +89,7 @@ JSValue CustomEvent::initCustomEvent(JSContext* ctx, JSValue this_val, int argc,
return JS_NULL;
}

JSValue CustomEvent::instanceConstructor(JSContext* ctx, JSValue func_obj, JSValue this_val, int argc, JSValue* argv) {

}
JSValue CustomEvent::instanceConstructor(JSContext* ctx, JSValue func_obj, JSValue this_val, int argc, JSValue* argv) {}

IMPL_PROPERTY_GETTER(CustomEvent, detail)(JSContext* ctx, JSValue this_val, int argc, JSValue* argv) {
auto* customEventInstance = static_cast<CustomEventInstance*>(JS_GetOpaque(this_val, Event::kEventClassID));
Expand Down
14 changes: 5 additions & 9 deletions bridge/bindings/qjs/dom/custom_event.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ class CustomEvent : public Event {
static JSValue constructor(ExecutionContext* context);
static JSValue prototype(ExecutionContext* context);

void trace(JSRuntime *rt, JSValue val, JS_MarkFunc *mark_func) const override;
void trace(JSRuntime* rt, JSValue val, JS_MarkFunc* mark_func) const override;
void dispose() const override;

// CustomEvent() = delete;
// explicit CustomEvent(JSValue eventType, JSValue eventInit);
// CustomEvent() = delete;
// explicit CustomEvent(JSValue eventType, JSValue eventInit);

DEFINE_PROTOTYPE_READONLY_PROPERTY(detail);
DEFINE_FUNCTION(initCustomEvent);
Expand All @@ -37,7 +37,7 @@ class CustomEvent : public Event {
JSValue m_detail{JS_NULL};
};

//class CustomEventInstance : public EventInstance {
// class CustomEventInstance : public EventInstance {
// public:
// explicit CustomEventInstance(CustomEvent* jsCustomEvent, JSAtom CustomEventType, JSValue eventInit);
// explicit CustomEventInstance(CustomEvent* jsCustomEvent, NativeCustomEvent* nativeCustomEvent);
Expand Down Expand Up @@ -66,11 +66,7 @@ auto customEventCreator = [](JSContext* ctx, JSValueConst func_obj, JSValueConst
return customEvent->toQuickJS();
};

const WrapperTypeInfo customEventTypeInfo = {
"CustomEvent",
&eventTypeInfo,
customEventCreator
};
const WrapperTypeInfo customEventTypeInfo = {"CustomEvent", &eventTypeInfo, customEventCreator};

} // namespace kraken::binding::qjs

Expand Down
122 changes: 62 additions & 60 deletions bridge/bindings/qjs/dom/document.cc
Original file line number Diff line number Diff line change
Expand Up @@ -103,63 +103,66 @@ JSValue Document::prototype(ExecutionContext* context) {

Document::Document() : Node() {
if (!document_registered) {
// defineElement("img", ImageElement::instance(m_context));
// defineElement("a", AnchorElement::instance(m_context));
// defineElement("canvas", CanvasElement::instance(m_context));
// defineElement("input", InputElement::instance(m_context));
// defineElement("object", ObjectElement::instance(m_context));
// defineElement("script", ScriptElement::instance(m_context));
// defineElement("template", TemplateElement::instance(m_context));
// defineElement("img", ImageElement::instance(m_context));
// defineElement("a", AnchorElement::instance(m_context));
// defineElement("canvas", CanvasElement::instance(m_context));
// defineElement("input", InputElement::instance(m_context));
// defineElement("object", ObjectElement::instance(m_context));
// defineElement("script", ScriptElement::instance(m_context));
// defineElement("template", TemplateElement::instance(m_context));
document_registered = true;
}

if (!event_registered) {
event_registered = true;
// Event::defineEvent(
// EVENT_INPUT, [](ExecutionContext* context, void* nativeEvent) -> EventInstance* { return new InputEventInstance(InputEvent::instance(context), reinterpret_cast<NativeEvent*>(nativeEvent)); });
// Event::defineEvent(EVENT_MEDIA_ERROR, [](ExecutionContext* context, void* nativeEvent) -> EventInstance* {
// return new MediaErrorEventInstance(MediaErrorEvent::instance(context), reinterpret_cast<NativeEvent*>(nativeEvent));
// });
// Event::defineEvent(EVENT_MESSAGE, [](ExecutionContext* context, void* nativeEvent) -> EventInstance* {
// return new MessageEventInstance(MessageEvent::instance(context), reinterpret_cast<NativeEvent*>(nativeEvent));
// });
// Event::defineEvent(
// EVENT_CLOSE, [](ExecutionContext* context, void* nativeEvent) -> EventInstance* { return new CloseEventInstance(CloseEvent::instance(context), reinterpret_cast<NativeEvent*>(nativeEvent)); });
// Event::defineEvent(EVENT_INTERSECTION_CHANGE, [](ExecutionContext* context, void* nativeEvent) -> EventInstance* {
// return new IntersectionChangeEventInstance(IntersectionChangeEvent::instance(context), reinterpret_cast<NativeEvent*>(nativeEvent));
// });
// Event::defineEvent(EVENT_TOUCH_START, [](ExecutionContext* context, void* nativeEvent) -> EventInstance* {
// return new TouchEventInstance(TouchEvent::instance(context), reinterpret_cast<NativeEvent*>(nativeEvent));
// });
// Event::defineEvent(EVENT_TOUCH_END, [](ExecutionContext* context, void* nativeEvent) -> EventInstance* {
// return new TouchEventInstance(TouchEvent::instance(context), reinterpret_cast<NativeEvent*>(nativeEvent));
// });
// Event::defineEvent(EVENT_TOUCH_MOVE, [](ExecutionContext* context, void* nativeEvent) -> EventInstance* {
// return new TouchEventInstance(TouchEvent::instance(context), reinterpret_cast<NativeEvent*>(nativeEvent));
// });
// Event::defineEvent(EVENT_TOUCH_CANCEL, [](ExecutionContext* context, void* nativeEvent) -> EventInstance* {
// return new TouchEventInstance(TouchEvent::instance(context), reinterpret_cast<NativeEvent*>(nativeEvent));
// });
// Event::defineEvent(EVENT_SWIPE, [](ExecutionContext* context, void* nativeEvent) -> EventInstance* {
// return new GestureEventInstance(GestureEvent::instance(context), reinterpret_cast<NativeEvent*>(nativeEvent));
// });
// Event::defineEvent(EVENT_PAN, [](ExecutionContext* context, void* nativeEvent) -> EventInstance* {
// return new GestureEventInstance(GestureEvent::instance(context), reinterpret_cast<NativeEvent*>(nativeEvent));
// });
// Event::defineEvent(EVENT_LONG_PRESS, [](ExecutionContext* context, void* nativeEvent) -> EventInstance* {
// return new GestureEventInstance(GestureEvent::instance(context), reinterpret_cast<NativeEvent*>(nativeEvent));
// });
// Event::defineEvent(EVENT_SCALE, [](ExecutionContext* context, void* nativeEvent) -> EventInstance* {
// return new GestureEventInstance(GestureEvent::instance(context), reinterpret_cast<NativeEvent*>(nativeEvent));
// });
// Event::defineEvent(
// EVENT_CLICK, [](ExecutionContext* context, void* nativeEvent) -> EventInstance* { return new MouseEventInstance(MouseEvent::instance(context), reinterpret_cast<NativeEvent*>(nativeEvent)); });
// Event::defineEvent(EVENT_CANCEL, [](ExecutionContext* context, void* nativeEvent) -> EventInstance* {
// return new MouseEventInstance(MouseEvent::instance(context), reinterpret_cast<NativeEvent*>(nativeEvent));
// });
// Event::defineEvent(EVENT_POPSTATE, [](ExecutionContext* context, void* nativeEvent) -> EventInstance* {
// return new PopStateEventInstance(PopStateEvent::instance(context), reinterpret_cast<NativeEvent*>(nativeEvent));
// });
// Event::defineEvent(
// EVENT_INPUT, [](ExecutionContext* context, void* nativeEvent) -> EventInstance* { return new InputEventInstance(InputEvent::instance(context),
// reinterpret_cast<NativeEvent*>(nativeEvent)); });
// Event::defineEvent(EVENT_MEDIA_ERROR, [](ExecutionContext* context, void* nativeEvent) -> EventInstance* {
// return new MediaErrorEventInstance(MediaErrorEvent::instance(context), reinterpret_cast<NativeEvent*>(nativeEvent));
// });
// Event::defineEvent(EVENT_MESSAGE, [](ExecutionContext* context, void* nativeEvent) -> EventInstance* {
// return new MessageEventInstance(MessageEvent::instance(context), reinterpret_cast<NativeEvent*>(nativeEvent));
// });
// Event::defineEvent(
// EVENT_CLOSE, [](ExecutionContext* context, void* nativeEvent) -> EventInstance* { return new CloseEventInstance(CloseEvent::instance(context),
// reinterpret_cast<NativeEvent*>(nativeEvent)); });
// Event::defineEvent(EVENT_INTERSECTION_CHANGE, [](ExecutionContext* context, void* nativeEvent) -> EventInstance* {
// return new IntersectionChangeEventInstance(IntersectionChangeEvent::instance(context), reinterpret_cast<NativeEvent*>(nativeEvent));
// });
// Event::defineEvent(EVENT_TOUCH_START, [](ExecutionContext* context, void* nativeEvent) -> EventInstance* {
// return new TouchEventInstance(TouchEvent::instance(context), reinterpret_cast<NativeEvent*>(nativeEvent));
// });
// Event::defineEvent(EVENT_TOUCH_END, [](ExecutionContext* context, void* nativeEvent) -> EventInstance* {
// return new TouchEventInstance(TouchEvent::instance(context), reinterpret_cast<NativeEvent*>(nativeEvent));
// });
// Event::defineEvent(EVENT_TOUCH_MOVE, [](ExecutionContext* context, void* nativeEvent) -> EventInstance* {
// return new TouchEventInstance(TouchEvent::instance(context), reinterpret_cast<NativeEvent*>(nativeEvent));
// });
// Event::defineEvent(EVENT_TOUCH_CANCEL, [](ExecutionContext* context, void* nativeEvent) -> EventInstance* {
// return new TouchEventInstance(TouchEvent::instance(context), reinterpret_cast<NativeEvent*>(nativeEvent));
// });
// Event::defineEvent(EVENT_SWIPE, [](ExecutionContext* context, void* nativeEvent) -> EventInstance* {
// return new GestureEventInstance(GestureEvent::instance(context), reinterpret_cast<NativeEvent*>(nativeEvent));
// });
// Event::defineEvent(EVENT_PAN, [](ExecutionContext* context, void* nativeEvent) -> EventInstance* {
// return new GestureEventInstance(GestureEvent::instance(context), reinterpret_cast<NativeEvent*>(nativeEvent));
// });
// Event::defineEvent(EVENT_LONG_PRESS, [](ExecutionContext* context, void* nativeEvent) -> EventInstance* {
// return new GestureEventInstance(GestureEvent::instance(context), reinterpret_cast<NativeEvent*>(nativeEvent));
// });
// Event::defineEvent(EVENT_SCALE, [](ExecutionContext* context, void* nativeEvent) -> EventInstance* {
// return new GestureEventInstance(GestureEvent::instance(context), reinterpret_cast<NativeEvent*>(nativeEvent));
// });
// Event::defineEvent(
// EVENT_CLICK, [](ExecutionContext* context, void* nativeEvent) -> EventInstance* { return new MouseEventInstance(MouseEvent::instance(context),
// reinterpret_cast<NativeEvent*>(nativeEvent)); });
// Event::defineEvent(EVENT_CANCEL, [](ExecutionContext* context, void* nativeEvent) -> EventInstance* {
// return new MouseEventInstance(MouseEvent::instance(context), reinterpret_cast<NativeEvent*>(nativeEvent));
// });
// Event::defineEvent(EVENT_POPSTATE, [](ExecutionContext* context, void* nativeEvent) -> EventInstance* {
// return new PopStateEventInstance(PopStateEvent::instance(context), reinterpret_cast<NativeEvent*>(nativeEvent));
// });
}
}

Expand Down Expand Up @@ -198,12 +201,12 @@ IMPL_FUNCTION(Document, createElement)(JSContext* ctx, JSValue this_val, int arg
}

auto document = static_cast<Document*>(JS_GetOpaque(this_val, Document::classId));
// auto* context = static_cast<ExecutionContext*>(JS_GetContextOpaque(ctx));
// std::string tagName = jsValueToStdString(ctx, tagNameValue);
// JSValue constructor = static_cast<Document*>(document->prototype())->getElementConstructor(document->context(), tagName);
//
// JSValue element = JS_CallConstructor(ctx, constructor, argc, argv);
// return element;
// auto* context = static_cast<ExecutionContext*>(JS_GetContextOpaque(ctx));
// std::string tagName = jsValueToStdString(ctx, tagNameValue);
// JSValue constructor = static_cast<Document*>(document->prototype())->getElementConstructor(document->context(), tagName);
//
// JSValue element = JS_CallConstructor(ctx, constructor, argc, argv);
// return element;
}

IMPL_FUNCTION(Document, createTextNode)(JSContext* ctx, JSValue this_val, int argc, JSValue* argv) {
Expand Down Expand Up @@ -555,8 +558,7 @@ Document::Document(Document* document) : Node(document, NodeType::DOCUMENT_NODE,
#endif
}

Document::~Document() {
}
Document::~Document() {}
void Document::removeElementById(JSAtom id, Element* element) {
if (m_elementMapById.count(id) > 0) {
auto& list = m_elementMapById[id];
Expand Down
Loading

0 comments on commit a337c2e

Please sign in to comment.