Merge lp:~kalikiana/midori/webkit1.8.3b into lp:midori

[Cris Dywan]

Drop non-DOM style sheet injection code path

Drop non-DOM style sheet injection code path

[André Stösel (ivaldi)]

Looks good to me!

review: Approve

=== modified file 'midori/midori-tab.vala'
--- midori/midori-tab.vala	2013-05-19 09:33:02 +0000
+++ midori/midori-tab.vala	2013-06-21 23:25:28 +0000
@@ -109,7 +109,6 @@
 
         public void inject_stylesheet (string stylesheet) {
 #if !HAVE_WEBKIT2
-            #if HAVE_DOM
             var dom = web_view.get_dom_document ();
             try {
                 var style = dom.create_element ("style");
@@ -121,19 +120,6 @@
             catch (Error error) {
                 critical (_("Failed to inject stylesheet: %s"), error.message);
             }
-            #else
-            web_view.execute_script ("""
-                (function () {
-                var style = document.createElement ('style');
-                style.setAttribute ('type', 'text/css');
-                style.appendChild (document.createTextNode ('%s'));
-                var head = document.getElementsByTagName ('head')[0];
-                if (head) head.appendChild (style);
-                else document.documentElement.insertBefore
-                (style, document.documentElement.firstChild);
-                }) ();
-                """.printf (stylesheet));
-            #endif
 #endif
         }