mirrors
/
netsurf
mirror of https://github.com/netsurf-browser/netsurf
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Initial implementation of document.createComment 

Improve robustness of jsobject to libdom object conversion in appendChild
This commit is contained in:
Vincent Sanders 2013-01-02 17:19:32 +00:00
parent 3f33f5327e
commit 1b8f9daa51
8 changed files with 168 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.sources.javascript
View File

@ -20,6 +20,7 @@ JSAPI_BINDING_location := javascript/jsapi/location.bnd
JSAPI_BINDING_htmlcollection := javascript/jsapi/htmlcollection.bnd
JSAPI_BINDING_nodelist := javascript/jsapi/nodelist.bnd
JSAPI_BINDING_text := javascript/jsapi/text.bnd
JSAPI_BINDING_comment := javascript/jsapi/comment.bnd
JSAPI_BINDING_node := javascript/jsapi/node.bnd
JSAPI_BINDING_event := javascript/jsapi/event.bnd

47
javascript/jsapi/comment.bnd Normal file
View File

@ -0,0 +1,47 @@
/* Binding to generate Comment interface
*
* Copyright 2012 Vincent Sanders <vince@netsurf-browser.org>
*
* This file is part of NetSurf, http://www.netsurf-browser.org/
*
* Released under the terms of the MIT License,
* http://www.opensource.org/licenses/mit-license
*/
webidlfile "html.idl";
hdrcomment "Copyright 2012 Vincent Sanders <vince@netsurf-browser.org>";
hdrcomment "This file is part of NetSurf, http://www.netsurf-browser.org/";
hdrcomment "Released under the terms of the MIT License,";
hdrcomment " http://www.opensource.org/licenses/mit-license";
preamble %{
#include <dom/dom.h>
#include "utils/config.h"
#include "utils/log.h"
#include "render/html_internal.h"
#include "javascript/jsapi.h"
#include "comment.h"
%}
#include "dom.bnd"
binding comment {
type js_libdom; /* the binding type */
interface Comment; /* Web IDL interface to generate */
private "dom_comment *" node;
private "struct html_content *" htmlc;
}
api finalise %{
if (private != NULL) {
dom_node_unref(private->node);
}
%}

31
javascript/jsapi/dom.bnd
View File

@ -10,6 +10,12 @@
webidlfile "dom.idl";
preamble %{
#include "comment.h"
#include "text.h"
#include "htmlelement.h"
%}
/* interface Node members */
getter nodeType %{
@ -74,7 +80,7 @@ getter textContent %{
}
%}
/* interface Node { Node appendChild(Node node); } */
operation appendChild %{
struct dom_node *result = NULL;
dom_exception exc;
@ -82,23 +88,32 @@ operation appendChild %{
struct jsclass_private *node_private;
dom_node_type node_type;
JSLOG("appending %p", node);
/* @todo: make this a distinct function jsapiobject_to_domnode() */
/* CAUTION this expects all Node objects private pointers to
* have private->node in the same place
*/
/* text */
node_private = JS_GetInstancePrivate(cx, node, &JSClass_Text, NULL);
if (node_private == NULL) {
if (node == NULL) {
node_private = NULL;
} else {
/* element */
node_private = JS_GetInstancePrivate(cx, node, &JSClass_HTMLElement, NULL);
if (node_private == NULL) {
/* text */
node_private = JS_GetInstancePrivate(cx, node, &JSClass_Text, NULL);
if (node_private == NULL) {
/* comment */
node_private = JS_GetInstancePrivate(cx, node, &JSClass_Comment, NULL);
}
}
}
if (node_private == NULL) {
/* type error? */
/* should cause Error: NOT_FOUND_ERR: DOM Exception 8 */
JSLOG("Error: NOT_FOUND_ERR: DOM Exception 8");
return JS_FALSE;
}
JSLOG("appending %p", node);
/* append the found element */
exc = dom_node_append_child(private->node, node_private->node, &result);
if (exc != DOM_NO_ERR) {

137
javascript/jsapi/htmldocument.bnd
View File

@ -8,8 +8,6 @@
* http://www.opensource.org/licenses/mit-license
*/
#include "dom.bnd"
webidlfile "html.idl";
hdrcomment "Copyright 2012 Vincent Sanders <vince@netsurf-browser.org>";
@ -20,7 +18,7 @@ hdrcomment " http://www.opensource.org/licenses/mit-license";
preamble %{
#include <dom/dom.h>
#include "utils/config.h"
#include "utils/log.h"
#include "utils/corestrings.h"
@ -38,6 +36,8 @@ preamble %{
%}
#include "dom.bnd"
binding document {
type js_libdom; /* the binding type */
@ -47,10 +47,10 @@ binding document {
* context structure.
*/
private "dom_document *" node;
private "struct html_content *" htmlc;
private "struct html_content *" htmlc;
/** location instantiated on first use */
property unshared location;
property unshared location;
/* events through a single interface */
property unshared type EventHandler;
@ -70,9 +70,9 @@ getter location %{
/* already created - return it */
return JS_TRUE;
}
jsret = jsapi_new_Location(cx,
NULL,
NULL,
jsret = jsapi_new_Location(cx,
NULL,
NULL,
llcache_handle_get_url(private->htmlc->base.llcache),
private->htmlc);
%}
@ -110,7 +110,7 @@ getter documentElement %{
/* document (html) element */
exc = dom_document_get_document_element(private->node, (void *)&element);
if (exc != DOM_NO_ERR) {
if (exc != DOM_NO_ERR) {
return JS_FALSE;
}
@ -122,11 +122,11 @@ getter documentElement %{
getter head %{
dom_node *element;
dom_node *head;
dom_exception exc;
dom_exception exc;
/* document (html) element */
exc = dom_document_get_document_element(private->node, &element);
if (exc != DOM_NO_ERR) {
if (exc != DOM_NO_ERR) {
return JS_FALSE;
}
@ -142,13 +142,13 @@ getter head %{
getter body %{
dom_node *element;
dom_node *body;
dom_exception exc;
dom_exception exc;
JSLOG("Getting your body");
/* document (html) element */
exc = dom_document_get_document_element(private->node, &element);
if (exc != DOM_NO_ERR) {
if (exc != DOM_NO_ERR) {
return JS_FALSE;
}
@ -167,58 +167,58 @@ getter body %{
operation getElementById %{
dom_string *elementId_dom;
dom_element *element;
dom_exception exc;
dom_exception exc;
exc = dom_string_create((unsigned char*)elementId, elementId_len, &elementId_dom);
if (exc != DOM_NO_ERR) {
return JS_FALSE;
}
if (exc != DOM_NO_ERR) {
return JS_FALSE;
}
exc = dom_document_get_element_by_id(private->node, elementId_dom, &element);
dom_string_unref(elementId_dom);
if (exc != DOM_NO_ERR) {
return JS_FALSE;
}
dom_string_unref(elementId_dom);
if (exc != DOM_NO_ERR) {
return JS_FALSE;
}
if (element != NULL) {
jsret = jsapi_new_HTMLElement(cx, NULL, NULL, element, private->htmlc);
}
if (element != NULL) {
jsret = jsapi_new_HTMLElement(cx, NULL, NULL, element, private->htmlc);
}
%}
/*
/*
*
* Dom 4 says this should return a htmlcollection, libdom currently
* returns DOM 3 spec of a nodelist
* returns DOM 3 spec of a nodelist
*/
operation getElementsByTagName %{
dom_string *localName_dom;
/* dom_html_collection *collection;*/
dom_nodelist *nodelist;
dom_exception exc;
/* dom_html_collection *collection;*/
dom_nodelist *nodelist;
dom_exception exc;
exc = dom_string_create((uint8_t *)localName, localName_len, &localName_dom);
if (exc != DOM_NO_ERR) {
return JS_FALSE;
}
if (exc != DOM_NO_ERR) {
return JS_FALSE;
}
exc = dom_document_get_elements_by_tag_name(private->node, localName_dom, /*&collection*/&nodelist);
dom_string_unref(localName_dom);
if (exc != DOM_NO_ERR) {
return JS_FALSE;
}
exc = dom_document_get_elements_by_tag_name(private->node, localName_dom, /*&collection*/&nodelist);
dom_string_unref(localName_dom);
if (exc != DOM_NO_ERR) {
return JS_FALSE;
}
if (/*collection*/nodelist != NULL) {
/*jsret = jsapi_new_HTMLCollection(cx,
NULL,
NULL,
collection,
private->htmlc);*/
jsret = jsapi_new_NodeList(cx,
NULL,
NULL,
nodelist,
private->htmlc);
}
if (/*collection*/nodelist != NULL) {
/*jsret = jsapi_new_HTMLCollection(cx,
NULL,
NULL,
collection,
private->htmlc);*/
jsret = jsapi_new_NodeList(cx,
NULL,
NULL,
nodelist,
private->htmlc);
}
%}
@ -228,10 +228,10 @@ operation write %{
}
%}
/* in dom Document */
/* interface Document (dom) { Text createTextNode(DOMString data); } */
operation createTextNode %{
dom_string *data_dom;
dom_exception exc;
dom_exception exc;
dom_text *text;
if (data != NULL) {
@ -255,10 +255,43 @@ operation createTextNode %{
%}
/* interface Document (dom) { Comment createComment(DOMString data); } */
operation createComment %{
dom_string *data_dom;
dom_exception exc;
dom_comment *comment;
if (data != NULL) {
JSLOG("Creating string \"%s\"", data);
exc = dom_string_create((unsigned char*)data,
data_len,
&data_dom);
if (exc != DOM_NO_ERR) {
return JS_FALSE;
}
JSLOG("Creating comment object for dom string \"%s\"",
dom_string_data(comment));
exc = dom_document_create_comment(private->node,
data_dom,
&comment);
dom_string_unref(data_dom);
if (exc != DOM_NO_ERR) {
return JS_FALSE;
}
jsret = jsapi_new_Comment(cx, NULL, NULL, comment, private->htmlc);
}
JSLOG("returning jsobject %p", jsret);
%}
/* in dom Document */
operation createElement %{
dom_string *localName_dom;
dom_exception exc;
dom_exception exc;
dom_element *element;
if (localName != NULL) {

4
javascript/jsapi/htmlelement.bnd
View File

@ -8,8 +8,6 @@
* http://www.opensource.org/licenses/mit-license
*/
#include "dom.bnd"
webidlfile "html.idl";
hdrcomment "Copyright 2012 Vincent Sanders <vince@netsurf-browser.org>";
@ -34,6 +32,8 @@ preamble %{
%}
#include "dom.bnd"
binding htmlelement {
type js_libdom; /* the binding type */

1
javascript/jsapi/navigator.bnd
View File

@ -8,7 +8,6 @@
* http://www.opensource.org/licenses/mit-license
*/
#include "dom.bnd"
webidlfile "html.idl";

4
javascript/jsapi/text.bnd
View File

@ -8,7 +8,6 @@
* http://www.opensource.org/licenses/mit-license
*/
#include "dom.bnd"
webidlfile "html.idl";
@ -27,10 +26,11 @@ preamble %{
#include "javascript/jsapi.h"
#include "text.h"
#include "htmlelement.h"
%}
#include "dom.bnd"
binding text {
type js_libdom; /* the binding type */

9
javascript/jsapi/window.bnd
View File

@ -8,7 +8,6 @@
* http://www.opensource.org/licenses/mit-license
*/
#include "dom.bnd"
webidlfile "html.idl";
@ -35,12 +34,15 @@ preamble %{
#include "nodelist.h"
#include "htmldocument.h"
#include "text.h"
#include "comment.h"
#include "htmlelement.h"
#include "window.h"
#include "location.h"
%}
#include "dom.bnd"
binding window {
type js_libdom; /* the binding type */
@ -150,6 +152,11 @@ api init %{
return NULL;
}
user_proto = jsapi_InitClass_Comment(cx, prototype);
if (user_proto == NULL) {
return NULL;
}
user_proto = jsapi_InitClass_Node(cx, prototype);
if (user_proto == NULL) {
return NULL;