Merge lp:~gue5t/midori/adblock-main-frame-2 into lp:midori

[gue5t gue5t]

Do not block the main webpage of a tab even if it is matched by adblock rules

Compare the provisional data source of the main frame with the URI we're requesting. If they match, and the request came from the main frame, then we know this request is the main page for the frame and should be allowed to pass through.

This was tested with easylist and <http://w3easy.org/templates/a_120x60.b>, which was matched by the rule "@@||w3easy.org/templates/*_120x60.", as well as with <http://www.twotoasts.de/index.php/2014/04/advertisements-and-two-little-kittens> which is blocked by the default adblock extension lists.

[Paweł Forysiuk (tuxator)]

review: Approve

=== modified file 'extensions/adblock/extension.vala'
--- extensions/adblock/extension.vala	2015-07-11 16:33:32 +0000
+++ extensions/adblock/extension.vala	2016-01-10 19:19:36 +0000
@@ -182,8 +182,15 @@
 #if !HAVE_WEBKIT2
         void resource_requested (WebKit.WebView web_view, WebKit.WebFrame frame,
             WebKit.WebResource resource, WebKit.NetworkRequest request, WebKit.NetworkResponse? response) {
-
-            if (request_handled (request.uri, web_view.uri)) {
+           
+            WebKit.WebFrame main_frame = web_view.get_main_frame ();
+
+            WebKit.WebDataSource? ds = main_frame.get_provisional_data_source ();
+            WebKit.NetworkRequest? main_frame_request = (ds != null) ? ds.get_request () : null;
+            string? main_frame_uri = (main_frame_request != null) ? main_frame_request.uri : null;
+
+            bool is_main_frame_request = (frame == main_frame) && (request.uri == main_frame_uri);
+            if (!is_main_frame_request && request_handled (request.uri, web_view.uri)) {
                 request.set_uri ("about:blank");
             }
         }