[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf

yurys at chromium.org yurys at chromium.org
Tue Jan 5 23:45:50 UTC 2010


The following commit has been merged in the webkit-1.1 branch:
commit 72cb8b341a8d03137fb5a818d0a6e77aee828fb9
Author: yurys at chromium.org <yurys at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 9 15:26:49 2009 +0000

    2009-12-09  Yury Semikhatsky  <yurys at chromium.org>
    
            Unreviewed, build fix.
    
            Add return statement to default implementation of hostIdentifier method
            introduced in http://trac.webkit.org/changeset/51897
    
            * public/WebDevToolsAgentClient.h:
            (WebKit::WebDevToolsAgentClient::hostIdentifier):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51900 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 3341e6c..e53d558 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,5 +1,15 @@
 2009-12-09  Yury Semikhatsky  <yurys at chromium.org>
 
+        Unreviewed, build fix.
+
+        Add return statement to default implementation of hostIdentifier method
+        introduced in http://trac.webkit.org/changeset/51897
+
+        * public/WebDevToolsAgentClient.h:
+        (WebKit::WebDevToolsAgentClient::hostIdentifier):
+
+2009-12-09  Yury Semikhatsky  <yurys at chromium.org>
+
         Reviewed by Pavel Feldman.
 
         Add declaration of static methods that allow to dispatch
diff --git a/WebKit/chromium/public/WebDevToolsAgentClient.h b/WebKit/chromium/public/WebDevToolsAgentClient.h
index b9ffde1..ec51654 100644
--- a/WebKit/chromium/public/WebDevToolsAgentClient.h
+++ b/WebKit/chromium/public/WebDevToolsAgentClient.h
@@ -51,7 +51,7 @@ public:
     virtual void forceRepaint() { }
 
     // Returns the identifier of the entity hosting this agent.
-    virtual int hostIdentifier() { }
+    virtual int hostIdentifier() { return -1; }
 
     // Notifies host upon runtime feature being enabled/disabled.
     virtual void runtimeFeatureStateChanged(const WebString& feature, bool enabled) { }

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list