[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

mihaip at chromium.org mihaip at chromium.org
Wed Dec 22 13:47:04 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit efe697bb75cae6cf63526f1da099736604544c64
Author: mihaip at chromium.org <mihaip at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Sep 27 04:56:58 2010 +0000

    2010-09-26  Mihai Parparita  <mihaip at chromium.org>
    
            Reviewed by Adam Barth.
    
            [Chromium] Remove no longer used WebView member functions
            https://bugs.webkit.org/show_bug.cgi?id=46515
    
            With http://crrev.com/60526 there's no longer any Chromium code calling
            the non-static versions of addUserScript and addUserStyleSheet.
    
            * public/WebView.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68367 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index cabfccc..e52e3b7 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,15 @@
+2010-09-26  Mihai Parparita  <mihaip at chromium.org>
+
+        Reviewed by Adam Barth.
+
+        [Chromium] Remove no longer used WebView member functions
+        https://bugs.webkit.org/show_bug.cgi?id=46515
+        
+        With http://crrev.com/60526 there's no longer any Chromium code calling
+        the non-static versions of addUserScript and addUserStyleSheet.
+
+        * public/WebView.h:
+
 2010-09-25  Nicolas Weber  <thakis at chromium.org>
 
         Reviewed by James Robinson.
diff --git a/WebKit/chromium/public/WebView.h b/WebKit/chromium/public/WebView.h
index fb4a2d6..7a8a4af 100644
--- a/WebKit/chromium/public/WebView.h
+++ b/WebKit/chromium/public/WebView.h
@@ -317,18 +317,6 @@ public:
                                     unsigned inactiveForegroundColor) = 0;
 
     // User scripts --------------------------------------------------------
-    // FIXME: These two methods are DEPRECATED. Remove once Chromium has been rolled.
-    virtual void addUserScript(const WebString& sourceCode, bool runAtStart)
-    {
-        addUserScript(sourceCode, WebVector<WebString>(),
-                      runAtStart ? UserScriptInjectAtDocumentStart : UserScriptInjectAtDocumentEnd,
-                      UserContentInjectInAllFrames);
-    }
-    virtual void addUserStyleSheet(const WebString& sourceCode)
-    {
-        addUserStyleSheet(sourceCode, WebVector<WebString>(), UserContentInjectInAllFrames);
-    }
-
     WEBKIT_API static void addUserScript(const WebString& sourceCode,
                                          const WebVector<WebString>& patterns,
                                          UserScriptInjectAt injectAt,

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list