From: Alexander Butenko <a.butenka@gmail.com>
Date: Sun, 29 May 2011 02:57:31 +0000 (-0400)
Subject: Add URL cache in adblock extension
X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fc842d9751c84bf742b47d1ac6d0246bb53e92ff;p=midori

Add URL cache in adblock extension

We can bypass all tests on the second load of the URL.
---

diff --git a/extensions/adblock.c b/extensions/adblock.c
index 062a77eb..e40b533c 100644
--- a/extensions/adblock.c
+++ b/extensions/adblock.c
@@ -41,6 +41,7 @@
 
 static GHashTable* pattern;
 static GHashTable* keys;
+static GHashTable* urlcache;
 static gchar* blockcss = NULL;
 static gchar* blockcssprivate = NULL;
 static gchar* blockscript = NULL;
@@ -92,6 +93,9 @@ adblock_init_db ()
     keys = g_hash_table_new_full (g_str_hash, g_str_equal,
                    (GDestroyNotify)g_free,
                    (GDestroyNotify)g_regex_unref);
+    urlcache = g_hash_table_new_full (g_str_hash, g_str_equal,
+                   (GDestroyNotify)g_free,
+                   (GDestroyNotify)g_free);
     katze_assign (blockcss, g_strdup ("z-non-exist"));
     katze_assign (blockcssprivate, g_strdup (""));
 }
@@ -683,11 +687,27 @@ adblock_is_matched (const gchar*  opts,
                     const gchar*  req_uri,
                     const gchar*  page_uri)
 {
+    gboolean foundbykey;
+    gboolean foundbypattern;
+    gchar* value;
+
+    if ((value = g_hash_table_lookup (urlcache, req_uri)))
+    {
+        if (value[0] == '0')
+            return FALSE;
+        else
+            return TRUE;
+    }
 
-    if (adblock_is_matched_by_key (opts, req_uri, page_uri) == TRUE)
+    foundbykey = adblock_is_matched_by_key (opts, req_uri, page_uri);
+    foundbypattern = adblock_is_matched_by_pattern (req_uri, page_uri);
+    if (foundbykey == TRUE || foundbypattern == TRUE)
+    {
+        g_hash_table_insert (urlcache, g_strdup (req_uri), g_strdup("1"));
         return TRUE;
-    else
-        return adblock_is_matched_by_pattern (req_uri, page_uri);
+    }
+    g_hash_table_insert (urlcache, g_strdup (req_uri), g_strdup("0"));
+    return FALSE;
 }
 
 #if HAVE_WEBKIT_RESOURCE_REQUEST
@@ -1362,6 +1382,7 @@ adblock_deactivate_cb (MidoriExtension* extension,
     katze_assign (blockcss, NULL);
     katze_assign (blockcssprivate, NULL);
     g_hash_table_destroy (pattern);
+    g_hash_table_destroy (urlcache);
 }
 
 static void