Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/d9a2c7b9c155256a322e66ce3aec6dfe0147941c
...commit
http://git.netsurf-browser.org/netsurf.git/commit/d9a2c7b9c155256a322e66ce3aec6dfe0147941c
...tree
http://git.netsurf-browser.org/netsurf.git/tree/d9a2c7b9c155256a322e66ce3aec6dfe0147941c
The branch, master has been updated
via d9a2c7b9c155256a322e66ce3aec6dfe0147941c (commit)
from 07c8ea22a5b1d8e10db20a24127332da8c7e2b72 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=d9a2c7b9c155256a322e66ce3aec6dfe0147941c
commit d9a2c7b9c155256a322e66ce3aec6dfe0147941c
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>
fix some doxygen errors
diff --git a/content/urldb.c b/content/urldb.c
index a26e785..60944f7 100644
--- a/content/urldb.c
+++ b/content/urldb.c
@@ -118,7 +118,7 @@
/**
* cookie entry.
*
- * \warn This *must* be kept in sync with the public interface in
+ * \warning This *must* be kept in sync with the public interface in
* netsurf/cookie_db.h
*/
struct cookie_internal_data {
diff --git a/desktop/knockout.c b/desktop/knockout.c
index ee66c17..7e964fc 100644
--- a/desktop/knockout.c
+++ b/desktop/knockout.c
@@ -609,7 +609,7 @@ knockout_plot_line(const struct redraw_context *ctx,
* rule.
*
* \param ctx The current redraw context.
- * \param style Style controlling the polygon plot.
+ * \param pstyle Style controlling the polygon plot.
* \param p verticies of polygon
* \param n number of verticies.
* \return NSERROR_OK on success else error code.
diff --git a/desktop/save_complete.c b/desktop/save_complete.c
index f8f0057..d6fb2fe 100644
--- a/desktop/save_complete.c
+++ b/desktop/save_complete.c
@@ -637,9 +637,9 @@ static bool
save_complete_handle_attr_value(save_complete_ctx *ctx,
*
* Attribute: Elements:
*
- * 1) data <object>
- * 2) href <a> <area> <link>
- * 3) src <script> <input> <frame> <iframe> <img>
+ * 1) data object
+ * 2) href a, area, link
+ * 3) src script, input, frame, iframe, img
* 4) background any (except those above)
*/
/* 1 */
diff --git a/frontends/cocoa/bitmap.m b/frontends/cocoa/bitmap.m
index 1ab8c3e..fe611f1 100644
--- a/frontends/cocoa/bitmap.m
+++ b/frontends/cocoa/bitmap.m
@@ -41,7 +41,16 @@
#define ALPHA_OFFSET (3)
static CGImageRef cocoa_prepare_bitmap( void *bitmap );
-static NSMapTable *cocoa_get_bitmap_cache( void );
+//static NSMapTable *cocoa_get_bitmap_cache( void );
+
+static inline NSMapTable *cocoa_get_bitmap_cache( void )
+{
+ static NSMapTable *cache = nil;
+ if (cache == nil) {
+ cache = NSCreateMapTable( NSNonOwnedPointerMapKeyCallBacks,
NSNonOwnedPointerMapValueCallBacks, 0 );
+ }
+ return cache;
+}
static int bitmap_get_width(void *bitmap)
{
@@ -179,14 +188,6 @@ CGImageRef cocoa_get_cgimage( void *bitmap )
return result;
}
-static inline NSMapTable *cocoa_get_bitmap_cache( void )
-{
- static NSMapTable *cache = nil;
- if (cache == nil) {
- cache = NSCreateMapTable( NSNonOwnedPointerMapKeyCallBacks,
NSNonOwnedPointerMapValueCallBacks, 0 );
- }
- return cache;
-}
static CGImageRef cocoa_prepare_bitmap( void *bitmap )
{
diff --git a/frontends/windows/filetype.c b/frontends/windows/filetype.c
index 4e7f2f4..d31434a 100644
--- a/frontends/windows/filetype.c
+++ b/frontends/windows/filetype.c
@@ -17,7 +17,8 @@
*/
/**
- * \file Fetch operation implementation for win32
+ * \file
+ * Fetch operation implementation for win32
*/
#include <stdlib.h>
diff --git a/render/html.h b/render/html.h
index b8429fd..30219a3 100644
--- a/render/html.h
+++ b/render/html.h
@@ -88,7 +88,7 @@ struct html_script {
};
-/** An object (<img>, <object>, etc.) in a CONTENT_HTML document. */
+/** An object (img, object, etc. tag) in a CONTENT_HTML document. */
struct content_html_object {
struct content *parent; /**< Parent document */
struct content_html_object *next; /**< Next in chain */
@@ -105,7 +105,7 @@ struct html_scrollbar_data {
struct box *box;
};
-/** Frame tree (<frameset>, <frame>) */
+/** Frame tree (frameset or frame tag) */
struct content_html_frames {
int cols; /** number of columns in frameset */
int rows; /** number of rows in frameset */
@@ -126,7 +126,7 @@ struct content_html_frames {
struct content_html_frames *children; /** [cols * rows] children */
};
-/** Inline frame list (<iframe>) */
+/** Inline frame list (iframe tag) */
struct content_html_iframe {
struct box *box;
diff --git a/render/html_redraw.c b/render/html_redraw.c
index 598e613..2f87306 100644
--- a/render/html_redraw.c
+++ b/render/html_redraw.c
@@ -567,6 +567,10 @@ static bool html_redraw_file(int x, int y, int width, int
height,
/**
* Plot background images.
*
+ * The reason for the presence of \a background is the backwards compatibility
+ * mess that is backgrounds on <body>. The background will be drawn
relative
+ * to \a box, using the background information contained within \a background.
+ *
* \param x coordinate of box
* \param y coordinate of box
* \param box box to draw background image of
@@ -576,10 +580,6 @@ static bool html_redraw_file(int x, int y, int width, int
height,
* \param background box containing background details (usually \a box)
* \param ctx current redraw context
* \return true if successful, false otherwise
- *
- * The reason for the presence of ::background is the backwards compatibility
- * mess that is backgrounds on <body>. The background will be drawn
relative
- * to \a box, using the background information contained within \a background.
*/
static bool html_redraw_background(int x, int y, struct box *box, float scale,
-----------------------------------------------------------------------
Summary of changes:
content/urldb.c | 2 +-
desktop/knockout.c | 2 +-
desktop/save_complete.c | 6 +++---
frontends/cocoa/bitmap.m | 19 ++++++++++---------
frontends/windows/filetype.c | 3 ++-
render/html.h | 6 +++---
render/html_redraw.c | 8 ++++----
7 files changed, 24 insertions(+), 22 deletions(-)
diff --git a/content/urldb.c b/content/urldb.c
index a26e785..60944f7 100644
--- a/content/urldb.c
+++ b/content/urldb.c
@@ -118,7 +118,7 @@
/**
* cookie entry.
*
- * \warn This *must* be kept in sync with the public interface in
+ * \warning This *must* be kept in sync with the public interface in
* netsurf/cookie_db.h
*/
struct cookie_internal_data {
diff --git a/desktop/knockout.c b/desktop/knockout.c
index ee66c17..7e964fc 100644
--- a/desktop/knockout.c
+++ b/desktop/knockout.c
@@ -609,7 +609,7 @@ knockout_plot_line(const struct redraw_context *ctx,
* rule.
*
* \param ctx The current redraw context.
- * \param style Style controlling the polygon plot.
+ * \param pstyle Style controlling the polygon plot.
* \param p verticies of polygon
* \param n number of verticies.
* \return NSERROR_OK on success else error code.
diff --git a/desktop/save_complete.c b/desktop/save_complete.c
index f8f0057..d6fb2fe 100644
--- a/desktop/save_complete.c
+++ b/desktop/save_complete.c
@@ -637,9 +637,9 @@ static bool
save_complete_handle_attr_value(save_complete_ctx *ctx,
*
* Attribute: Elements:
*
- * 1) data <object>
- * 2) href <a> <area> <link>
- * 3) src <script> <input> <frame> <iframe> <img>
+ * 1) data object
+ * 2) href a, area, link
+ * 3) src script, input, frame, iframe, img
* 4) background any (except those above)
*/
/* 1 */
diff --git a/frontends/cocoa/bitmap.m b/frontends/cocoa/bitmap.m
index 1ab8c3e..fe611f1 100644
--- a/frontends/cocoa/bitmap.m
+++ b/frontends/cocoa/bitmap.m
@@ -41,7 +41,16 @@
#define ALPHA_OFFSET (3)
static CGImageRef cocoa_prepare_bitmap( void *bitmap );
-static NSMapTable *cocoa_get_bitmap_cache( void );
+//static NSMapTable *cocoa_get_bitmap_cache( void );
+
+static inline NSMapTable *cocoa_get_bitmap_cache( void )
+{
+ static NSMapTable *cache = nil;
+ if (cache == nil) {
+ cache = NSCreateMapTable( NSNonOwnedPointerMapKeyCallBacks,
NSNonOwnedPointerMapValueCallBacks, 0 );
+ }
+ return cache;
+}
static int bitmap_get_width(void *bitmap)
{
@@ -179,14 +188,6 @@ CGImageRef cocoa_get_cgimage( void *bitmap )
return result;
}
-static inline NSMapTable *cocoa_get_bitmap_cache( void )
-{
- static NSMapTable *cache = nil;
- if (cache == nil) {
- cache = NSCreateMapTable( NSNonOwnedPointerMapKeyCallBacks,
NSNonOwnedPointerMapValueCallBacks, 0 );
- }
- return cache;
-}
static CGImageRef cocoa_prepare_bitmap( void *bitmap )
{
diff --git a/frontends/windows/filetype.c b/frontends/windows/filetype.c
index 4e7f2f4..d31434a 100644
--- a/frontends/windows/filetype.c
+++ b/frontends/windows/filetype.c
@@ -17,7 +17,8 @@
*/
/**
- * \file Fetch operation implementation for win32
+ * \file
+ * Fetch operation implementation for win32
*/
#include <stdlib.h>
diff --git a/render/html.h b/render/html.h
index b8429fd..30219a3 100644
--- a/render/html.h
+++ b/render/html.h
@@ -88,7 +88,7 @@ struct html_script {
};
-/** An object (<img>, <object>, etc.) in a CONTENT_HTML document. */
+/** An object (img, object, etc. tag) in a CONTENT_HTML document. */
struct content_html_object {
struct content *parent; /**< Parent document */
struct content_html_object *next; /**< Next in chain */
@@ -105,7 +105,7 @@ struct html_scrollbar_data {
struct box *box;
};
-/** Frame tree (<frameset>, <frame>) */
+/** Frame tree (frameset or frame tag) */
struct content_html_frames {
int cols; /** number of columns in frameset */
int rows; /** number of rows in frameset */
@@ -126,7 +126,7 @@ struct content_html_frames {
struct content_html_frames *children; /** [cols * rows] children */
};
-/** Inline frame list (<iframe>) */
+/** Inline frame list (iframe tag) */
struct content_html_iframe {
struct box *box;
diff --git a/render/html_redraw.c b/render/html_redraw.c
index 598e613..2f87306 100644
--- a/render/html_redraw.c
+++ b/render/html_redraw.c
@@ -567,6 +567,10 @@ static bool html_redraw_file(int x, int y, int width, int
height,
/**
* Plot background images.
*
+ * The reason for the presence of \a background is the backwards compatibility
+ * mess that is backgrounds on <body>. The background will be drawn
relative
+ * to \a box, using the background information contained within \a background.
+ *
* \param x coordinate of box
* \param y coordinate of box
* \param box box to draw background image of
@@ -576,10 +580,6 @@ static bool html_redraw_file(int x, int y, int width, int
height,
* \param background box containing background details (usually \a box)
* \param ctx current redraw context
* \return true if successful, false otherwise
- *
- * The reason for the presence of ::background is the backwards compatibility
- * mess that is backgrounds on <body>. The background will be drawn
relative
- * to \a box, using the background information contained within \a background.
*/
static bool html_redraw_background(int x, int y, struct box *box, float scale,
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
