[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

[yurys at chromium.org]

The following commit has been merged in the webkit-1.1 branch:
commit e4cf5c225d690e797be868b9e9f85d53e984e1d8
Author: yurys at chromium.org <yurys at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 29 13:41:23 2010 +0000

    2010-01-29  Yury Semikhatsky  <yurys at chromium.org>
    
            Reviewed by Pavel Feldman.
    
            Add API methods for loading inspector utility scripts.
    
            https://bugs.webkit.org/show_bug.cgi?id=34326
    
            * public/WebDevToolsAgentClient.h:
            (WebKit::WebDevToolsAgentClient::injectedScriptSource):
            (WebKit::WebDevToolsAgentClient::injectedScriptDispatcherSource):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54057 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 9c02fd9..01c1381 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,15 @@
+2010-01-29  Yury Semikhatsky  <yurys at chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Add API methods for loading inspector utility scripts.
+
+        https://bugs.webkit.org/show_bug.cgi?id=34326
+
+        * public/WebDevToolsAgentClient.h:
+        (WebKit::WebDevToolsAgentClient::injectedScriptSource):
+        (WebKit::WebDevToolsAgentClient::injectedScriptDispatcherSource):
+
 2010-01-29  Darin Fisher  <darin at chromium.org>
 
         Reviewed by Adam Barth.
diff --git a/WebKit/chromium/public/WebDevToolsAgentClient.h b/WebKit/chromium/public/WebDevToolsAgentClient.h
index 7c18dc4..d78a6f1 100644
--- a/WebKit/chromium/public/WebDevToolsAgentClient.h
+++ b/WebKit/chromium/public/WebDevToolsAgentClient.h
@@ -31,6 +31,7 @@
 #ifndef WebDevToolsAgentClient_h
 #define WebDevToolsAgentClient_h
 
+#include "WebCString.h"
 #include "WebCommon.h"
 
 namespace WebKit {
@@ -52,6 +53,9 @@ public:
 
     WEBKIT_API static void sendMessageToFrontendOnIOThread(const WebDevToolsMessageData&);
 
+    virtual WebCString injectedScriptSource() { return WebCString(); }
+    virtual WebCString injectedScriptDispatcherSource() { return WebCString(); }
+
 protected:
     ~WebDevToolsAgentClient() { }
 };

-- 
WebKit Debian packaging