r10032 jmb - in /branches/jmb/new-cache/content: content.c content_protected.h

[netsurf at semichrome.net]

Author: jmb
Date: Sat Feb 13 06:00:15 2010
New Revision: 10032

URL: http://source.netsurf-browser.org?rev=10032&view=rev
Log:
Store quirks mode and fallback charset in content

Modified:
    branches/jmb/new-cache/content/content.c
    branches/jmb/new-cache/content/content_protected.h

Modified: branches/jmb/new-cache/content/content.c
URL: http://source.netsurf-browser.org/branches/jmb/new-cache/content/content.c?rev=10032&r1=10031&r2=10032&view=diff
==============================================================================
--- branches/jmb/new-cache/content/content.c (original)
+++ branches/jmb/new-cache/content/content.c Sat Feb 13 06:00:15 2010
@@ -403,10 +403,17 @@
 	LOG(("url %s -> %p", llcache_handle_get_url(llcache), c));
 
 	user_sentinel = talloc(c, struct content_user);
-	if (!user_sentinel) {
+	if (user_sentinel == NULL) {
 		talloc_free(c);
-		return 0;
+		return NULL;
 	}
+
+	c->fallback_charset = talloc_strdup(c, fallback_charset);
+	if (c->fallback_charset == NULL) {
+		talloc_free(c);
+		return NULL;
+	}
+
 	c->llcache = llcache;
 	c->dict = lwc_context_ref(dict);
 	c->type = CONTENT_UNKNOWN;
@@ -415,6 +422,7 @@
 	c->width = 0;
 	c->height = 0;
 	c->available_width = 0;
+	c->quirks = quirks;
 	c->refresh = 0;
 	c->bitmap = 0;
 	c->fresh = false;

Modified: branches/jmb/new-cache/content/content_protected.h
URL: http://source.netsurf-browser.org/branches/jmb/new-cache/content/content_protected.h?rev=10032&r1=10031&r2=10032&view=diff
==============================================================================
--- branches/jmb/new-cache/content/content_protected.h (original)
+++ branches/jmb/new-cache/content/content_protected.h Sat Feb 13 06:00:15 2010
@@ -103,6 +103,9 @@
 
 	int width, height;	/**< Dimensions, if applicable. */
 	int available_width;	/**< Available width (eg window width). */
+
+	bool quirks;		/**< Content is in quirks mode */
+	char *fallback_charset;	/**< Fallback charset, or NULL */
 
 	/** Data dependent on type. */
 	union {