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

Merge branch 'master' of git://git.netsurf-browser.org/netsurf 

Conflicts of doom:
	render/html.c
This commit is contained in:
Michael Drake 2013-02-22 13:24:36 +00:00
parent c2a718075a 5a307b5fa5
commit 7088908cc2
6 changed files with 594 additions and 481 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
amiga/filetype.c
View File

@ -194,6 +194,7 @@ nserror ami_mime_init(const char *mimefile)
ami_mime_list = NewObjList(); ami_mime_list = NewObjList();
rargs = AllocDosObjectTags(DOS_RDARGS,TAG_DONE); rargs = AllocDosObjectTags(DOS_RDARGS,TAG_DONE);
if(rargs == NULL) return NSERROR_NOMEM;
if(fh = FOpen(mimefile, MODE_OLDFILE, 0)) if(fh = FOpen(mimefile, MODE_OLDFILE, 0))
{ {
@ -251,10 +252,12 @@ nserror ami_mime_init(const char *mimefile)
if (lerror != lwc_error_ok) if (lerror != lwc_error_ok)
return NSERROR_NOMEM; return NSERROR_NOMEM;
} }
FreeArgs(rargs);
} }
} }
FClose(fh); FClose(fh);
} }
FreeDosObject(DOS_RDARGS, rargs);
} }
void ami_mime_free(void) void ami_mime_free(void)

4
render/form.c
View File

@ -212,6 +212,10 @@ struct form_control *form_new_control(void *node, form_control_type type)
*/ */
void form_add_control(struct form *form, struct form_control *control) void form_add_control(struct form *form, struct form_control *control)
{ {
if (form == NULL) {
return;
}
control->form = form; control->form = form;
if (form->controls != NULL) { if (form->controls != NULL) {

1047
render/html.c
View File

File diff suppressed because it is too large Load Diff

1
render/html.h
View File

@ -58,6 +58,7 @@ struct selection;
struct html_stylesheet { struct html_stylesheet {
/** Type of sheet */ /** Type of sheet */
enum { HTML_STYLESHEET_EXTERNAL, HTML_STYLESHEET_INTERNAL } type; enum { HTML_STYLESHEET_EXTERNAL, HTML_STYLESHEET_INTERNAL } type;
struct dom_node *node; /**< dom node associated with sheet */
union { union {
struct hlcache_handle *external; struct hlcache_handle *external;
struct content_css_data *internal; struct content_css_data *internal;

15
utils/corestrings.c
View File

@ -145,6 +145,10 @@ dom_string *corestring_dom_coords;
dom_string *corestring_dom_cuechange; dom_string *corestring_dom_cuechange;
dom_string *corestring_dom_dblclick; dom_string *corestring_dom_dblclick;
dom_string *corestring_dom_defer; dom_string *corestring_dom_defer;
dom_string *corestring_dom_DOMAttrModified;
dom_string *corestring_dom_DOMNodeInserted;
dom_string *corestring_dom_DOMNodeInsertedIntoDocument;
dom_string *corestring_dom_DOMSubtreeModified;
dom_string *corestring_dom_drag; dom_string *corestring_dom_drag;
dom_string *corestring_dom_dragend; dom_string *corestring_dom_dragend;
dom_string *corestring_dom_dragenter; dom_string *corestring_dom_dragenter;
@ -212,6 +216,7 @@ dom_string *corestring_dom_sizes;
dom_string *corestring_dom_src; dom_string *corestring_dom_src;
dom_string *corestring_dom_stalled; dom_string *corestring_dom_stalled;
dom_string *corestring_dom_storage; dom_string *corestring_dom_storage;
dom_string *corestring_dom_style;
dom_string *corestring_dom_submit; dom_string *corestring_dom_submit;
dom_string *corestring_dom_suspend; dom_string *corestring_dom_suspend;
dom_string *corestring_dom_target; dom_string *corestring_dom_target;
@ -369,6 +374,10 @@ void corestrings_fini(void)
CSS_DOM_STRING_UNREF(cuechange); CSS_DOM_STRING_UNREF(cuechange);
CSS_DOM_STRING_UNREF(dblclick); CSS_DOM_STRING_UNREF(dblclick);
CSS_DOM_STRING_UNREF(defer); CSS_DOM_STRING_UNREF(defer);
CSS_DOM_STRING_UNREF(DOMAttrModified);
CSS_DOM_STRING_UNREF(DOMNodeInserted);
CSS_DOM_STRING_UNREF(DOMNodeInsertedIntoDocument);
CSS_DOM_STRING_UNREF(DOMSubtreeModified);
CSS_DOM_STRING_UNREF(drag); CSS_DOM_STRING_UNREF(drag);
CSS_DOM_STRING_UNREF(dragend); CSS_DOM_STRING_UNREF(dragend);
CSS_DOM_STRING_UNREF(dragenter); CSS_DOM_STRING_UNREF(dragenter);
@ -436,6 +445,7 @@ void corestrings_fini(void)
CSS_DOM_STRING_UNREF(src); CSS_DOM_STRING_UNREF(src);
CSS_DOM_STRING_UNREF(stalled); CSS_DOM_STRING_UNREF(stalled);
CSS_DOM_STRING_UNREF(storage); CSS_DOM_STRING_UNREF(storage);
CSS_DOM_STRING_UNREF(style);
CSS_DOM_STRING_UNREF(submit); CSS_DOM_STRING_UNREF(submit);
CSS_DOM_STRING_UNREF(suspend); CSS_DOM_STRING_UNREF(suspend);
CSS_DOM_STRING_UNREF(target); CSS_DOM_STRING_UNREF(target);
@ -624,6 +634,10 @@ nserror corestrings_init(void)
CSS_DOM_STRING_INTERN(cuechange); CSS_DOM_STRING_INTERN(cuechange);
CSS_DOM_STRING_INTERN(dblclick); CSS_DOM_STRING_INTERN(dblclick);
CSS_DOM_STRING_INTERN(defer); CSS_DOM_STRING_INTERN(defer);
CSS_DOM_STRING_INTERN(DOMAttrModified);
CSS_DOM_STRING_INTERN(DOMNodeInserted);
CSS_DOM_STRING_INTERN(DOMNodeInsertedIntoDocument);
CSS_DOM_STRING_INTERN(DOMSubtreeModified);
CSS_DOM_STRING_INTERN(drag); CSS_DOM_STRING_INTERN(drag);
CSS_DOM_STRING_INTERN(dragend); CSS_DOM_STRING_INTERN(dragend);
CSS_DOM_STRING_INTERN(dragenter); CSS_DOM_STRING_INTERN(dragenter);
@ -691,6 +705,7 @@ nserror corestrings_init(void)
CSS_DOM_STRING_INTERN(src); CSS_DOM_STRING_INTERN(src);
CSS_DOM_STRING_INTERN(stalled); CSS_DOM_STRING_INTERN(stalled);
CSS_DOM_STRING_INTERN(storage); CSS_DOM_STRING_INTERN(storage);
CSS_DOM_STRING_INTERN(style);
CSS_DOM_STRING_INTERN(submit); CSS_DOM_STRING_INTERN(submit);
CSS_DOM_STRING_INTERN(suspend); CSS_DOM_STRING_INTERN(suspend);
CSS_DOM_STRING_INTERN(target); CSS_DOM_STRING_INTERN(target);

5
utils/corestrings.h
View File

@ -151,6 +151,10 @@ extern struct dom_string *corestring_dom_coords;
extern struct dom_string *corestring_dom_cuechange; extern struct dom_string *corestring_dom_cuechange;
extern struct dom_string *corestring_dom_dblclick; extern struct dom_string *corestring_dom_dblclick;
extern struct dom_string *corestring_dom_defer; extern struct dom_string *corestring_dom_defer;
extern struct dom_string *corestring_dom_DOMAttrModified;
extern struct dom_string *corestring_dom_DOMNodeInserted;
extern struct dom_string *corestring_dom_DOMNodeInsertedIntoDocument;
extern struct dom_string *corestring_dom_DOMSubtreeModified;
extern struct dom_string *corestring_dom_drag; extern struct dom_string *corestring_dom_drag;
extern struct dom_string *corestring_dom_dragend; extern struct dom_string *corestring_dom_dragend;
extern struct dom_string *corestring_dom_dragenter; extern struct dom_string *corestring_dom_dragenter;
@ -218,6 +222,7 @@ extern struct dom_string *corestring_dom_sizes;
extern struct dom_string *corestring_dom_src; extern struct dom_string *corestring_dom_src;
extern struct dom_string *corestring_dom_stalled; extern struct dom_string *corestring_dom_stalled;
extern struct dom_string *corestring_dom_storage; extern struct dom_string *corestring_dom_storage;
extern struct dom_string *corestring_dom_style;
extern struct dom_string *corestring_dom_submit; extern struct dom_string *corestring_dom_submit;
extern struct dom_string *corestring_dom_suspend; extern struct dom_string *corestring_dom_suspend;
extern struct dom_string *corestring_dom_target; extern struct dom_string *corestring_dom_target;